X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fmaster-project%2Freport.git;a=blobdiff_plain;f=pret-lam.lua;h=43e8c8cc25f305ecf44b10e7d5a9b3b4311ca0ea;hp=6935043297ee5077a9e77495187b4ad0623e7662;hb=344fd4d4338685c0bc2e66d395edb9409965c438;hpb=8b0d89230c60a843886d36f392755e169b29a114 diff --git a/pret-lam.lua b/pret-lam.lua index 6935043..43e8c8c 100644 --- a/pret-lam.lua +++ b/pret-lam.lua @@ -17,14 +17,19 @@ local colors = { -- Symbols that should have a different representation local symbols = { - [' '] = {repr = '\\obs '}, + -- Note, the space we replace with is a Unicode non-breaking space + -- (U+00A0). + [' '] = {repr = ' '}, ['_'] = {repr = '\\_'}, - ['->'] = {repr = '\\rightarrow'}, + ['->'] = {repr = '→'}, + ['=>'] = {repr = '⇒'}, -- The default * sits very high above the baseline, \ast (u+2217) looks -- better. ['*'] = {repr = '\\ast'}, ['~'] = {repr = '\\HDLine[width=.20 * \\the\\textwidth]'}, ['|'] = {repr = '\\char' .. utf.byte('|')}, + -- Use ▶ from our roman font, since Iwona doesn't have the glyph + ['▶'] = {repr = '{\\rm{}▶}'}, } -- Keywords that should be bold @@ -35,7 +40,7 @@ local keywords = { ['letrec'] = {}, ['letnonrec'] = {}, ['in'] = {}, - ['DEFAULT'] = {}, + ['DEFAULT'] = {small = true}, } local in_block = 0 @@ -43,10 +48,15 @@ local submatches = {} local bases = {} -- Store the last line for each indent level local indentlines = {} --- The amount of indent of the first line, which we will strip of all --- subsequent lines. This allows the entire block to be indented as normal in --- the tex source code. -local first_indent + +function array_concat(a1, a2) + local res = a1 + for k,v in ipairs(a2) do + table.insert(res, v) + end + return res +end + -- See if str starts with a symbol, and return the remaining string and that -- symbol. If no symbol from the table is matched, just returns the first @@ -108,7 +118,7 @@ local function do_subscripts(word) submatches[#submatches+1] = "^(" .. base .. ")([%a%d])$" -- Seconde, the base with a longer prefix that includes at least -- one of +-, (to catch things like ri+1, but not return). - submatches[#submatches+1] = "^(" .. base .. ")([%a%d]*[%-%+%,]+[%a%d%-%+%,]*)$" + submatches[#submatches+1] = "^(" .. base .. ")([%a%d]*[%-%+,]+[%a%d%-%+,]*)$" end end return word @@ -133,17 +143,6 @@ end -- line4, and line is no longer in scope since it is replaced by line4. local function do_indent(line) newind, rest = utf.match(line, '^(%s*)(.*)') - - -- Store the first line's indent - if not first_indent then - first_indent = utf.len(newind) - end - - -- Strip the indent of the first line from this line's indent. - newind = utf.sub(newind, first_indent + 1) - -- Rebuild line, so we can still use it below - line = newind .. rest - prev = -1 -- Loop all the previous lines for indent, unused in pairs(indentlines) do @@ -207,14 +206,13 @@ function vis.begin_of_display() if in_block == 0 then -- Initially allow subscripts using _ or just appending a number (later, -- we will add extra patterns here. - submatches = {"^(%a*)_([%a%d,]+)$", "^(%a+)([%d,]+)$"} + submatches = {"^(%a*)_([%a%d,]+)$", "^(%a+)(%d[%d,]+)$"} -- This stores all the bases we've encountered so far (to prevent -- duplicates). For each of them there will be a pattern in submatches -- above. bases = {} end indentlines = {} - first_indent = nil end @@ -223,35 +221,58 @@ vis.begin_of_inline = vis.begin_of_display vis.end_of_inline = vis.end_of_display function vis.flush_line(str,nested) - local result, state = { }, 0 - local finish, change = buffers.finish_state, buffers.change_state - str = do_indent(str) - -- Set the colorscheme, which is used by finish_state and change_state - buffers.currentcolors = colors + buffers.flush_result(vis.do_line(str, false), nested) +end + +function vis.do_line(str, no_indent) + local result = {} + if not no_indent then + -- Allow ignore of the indentation stuff when we're calling ourselves + -- for a partial line. + str = do_indent(str) + end while str ~= "" do local found = false local word, symbol - -- See if the next token is a word - word, str = take_word(str) - if word then - if keywords[res] then - -- Make all keywords bold - word = "{\\bold " .. word .. "}" + local text, rest = utf.match(str, "^%-%-(.-)%-%-(.*)") + if text then + table.insert(result, '\\strikethrough{') + -- Recursively call ourselves to handle spaces gracefully. + result = array_concat(result, vis.do_line(text, true)) + table.insert(result, '}') + -- Eat the processed characters + str = rest + elseif utf.match(str, "^%-%-") then + table.insert(result, '{\\italic{--') + -- Recursively call ourselves to handle spaces gracefully. + result = array_concat(result, vis.do_line(utf.sub(str, 3), true)) + table.insert(result, '}}') + -- Done with this line + str = '' + else + -- See if the next token is a word + word, str = take_word(str) + if word then + if keywords[res] then + -- Make all keywords bold + word = "{\\bold " .. word .. "}" + if keywords[res].small then + word = "\\small" .. word -- Curlies were added above + end + else + -- Process any subscripts in the word + word = do_subscripts(word) + end + table.insert(result, word) else - -- Process any subscripts in the word - word = do_subscripts(word) + -- The next token is not a word, it must be a symbol + symbol, str = take_symbol(str) + table.insert(result, symbol) end - else - -- The next token is not a word, it must be a symbol - symbol, str = take_symbol(str) end - - -- Append the resulting token - result[#result+1] = word or symbol end - - state = finish(state, result) - buffers.flush_result(result,nested) + + return result end -- vim: set sw=4 sts=4 expandtab ai: