Put DEFAULT in smallcaps in the lambda prettyprinter.

[matthijs/master-project/report.git] / pret-lam.lua

diff --git a/pret-lam.lua b/pret-lam.lua
index 7058f620f01d5a8f2298418e9842f1137e86210b..86d7272c4f65615276747be84e1b0c39f6ef236f 100644 (file)
--- a/pret-lam.lua
+++ b/pret-lam.lua
@@ -23,8 +23,9 @@ local symbols = {
     -- 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('|')},
+    ['$'] = {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)