Improve conclusions.

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

diff --git a/pret-lam.lua b/pret-lam.lua
index 86d7272c4f65615276747be84e1b0c39f6ef236f..d44c5b3933b1302d60a8d9bd19d484dc43c4a6f2 100644 (file)
--- a/pret-lam.lua
+++ b/pret-lam.lua
@@ -17,15 +17,19 @@ local colors = {
 
 -- Symbols that should have a different representation
 local symbols = {
 
 -- 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 = '\\_'},

-    ['->'] = {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('|')},
     -- 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
 }
 
 -- Keywords that should be bold


@@ -105,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])$"
             -- 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
         end
     end
     return word