X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fmaster-project%2Freport.git;a=blobdiff_plain;f=pret-lam.lua;h=d44c5b3933b1302d60a8d9bd19d484dc43c4a6f2;hp=53ea6191fdb12b1d111f9fb04405c3f58298f7ce;hb=b2047c9f1622d62aecc6708dd19c38b14810f275;hpb=2623fc848f36caddf9513b9e0dc37419a53d486c;ds=sidebyside

diff --git a/pret-lam.lua b/pret-lam.lua
index 53ea619..d44c5b3 100644
--- a/pret-lam.lua
+++ b/pret-lam.lua
@@ -17,15 +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('|')},
-    ['$'] = {repr = '\\char' .. utf.byte('$')},
+    -- Use ▶ from our roman font, since Iwona doesn't have the glyph
+    ['▶'] = {repr = '{\\rm{}▶}'},
 }
 
 -- Keywords that should be bold
@@ -36,7 +40,7 @@ local keywords = {
     ['letrec'] = {},
     ['letnonrec'] = {},
     ['in'] = {},
-    ['DEFAULT'] = {},
+    ['DEFAULT'] = {small = true},
 }
 
 local in_block = 0
@@ -44,10 +48,6 @@ 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
 
 -- 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
@@ -109,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
@@ -134,17 +134,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
@@ -215,7 +204,6 @@ function vis.begin_of_display()
         bases = {}
     end
     indentlines = {}
-    first_indent = nil
 end
     
 
@@ -238,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)