X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fmaster-project%2Freport.git;a=blobdiff_plain;f=pret-lam.lua;h=d44c5b3933b1302d60a8d9bd19d484dc43c4a6f2;hp=98244b0f421c5fe421ccb0578fec2ff1764d8612;hb=b2047c9f1622d62aecc6708dd19c38b14810f275;hpb=41753b358251eb737709bbc4172cb551ef41ef87

diff --git a/pret-lam.lua b/pret-lam.lua
index 98244b0..d44c5b3 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 = '\\sim'},
+    ['~'] = {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
@@ -32,7 +37,10 @@ local keywords = {
     ['case'] = {},
     ['of'] = {},
     ['let'] = {},
+    ['letrec'] = {},
+    ['letnonrec'] = {},
     ['in'] = {},
+    ['DEFAULT'] = {small = true},
 }
 
 local in_block = 0
@@ -101,7 +109,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
@@ -189,7 +197,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.
@@ -218,6 +226,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)