X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fmaster-project%2Freport.git;a=blobdiff_plain;f=pret-lam.lua;h=86d7272c4f65615276747be84e1b0c39f6ef236f;hp=568da7f565fbe7f28f7f63bf2f6986924baa418b;hb=db2dce12a0b9b988be956104b908e28375bbfd1c;hpb=0d14e5623d3d5fac4dd3485939c0c5ea9d62abba diff --git a/pret-lam.lua b/pret-lam.lua index 568da7f..86d7272 100644 --- a/pret-lam.lua +++ b/pret-lam.lua @@ -25,6 +25,7 @@ local symbols = { ['*'] = {repr = '\\ast'}, ['~'] = {repr = '\\HDLine[width=.20 * \\the\\textwidth]'}, ['|'] = {repr = '\\char' .. utf.byte('|')}, + ['$'] = {repr = '\\char' .. utf.byte('$')}, } -- Keywords that should be bold @@ -35,6 +36,7 @@ local keywords = { ['letrec'] = {}, ['letnonrec'] = {}, ['in'] = {}, + ['DEFAULT'] = {small = true}, } local in_block = 0 @@ -191,7 +193,7 @@ 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,]+)$"} -- 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. @@ -220,6 +222,9 @@ function vis.flush_line(str,nested) 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)