X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fmaster-project%2Freport.git;a=blobdiff_plain;f=pret-lam.lua;h=3cc01af4ec20358b0bfe064410254e9e1be64160;hp=97a53761a9247af6f11d76b4ebe721f431a99967;hb=b92b16b7e4ab854699bcd151bad0be7c5d73c0ae;hpb=0726312509c9a708eb4ecc0ac36b6b67eba45ad5

diff --git a/pret-lam.lua b/pret-lam.lua
index 97a5376..3cc01af 100644
--- a/pret-lam.lua
+++ b/pret-lam.lua
@@ -28,7 +28,8 @@ local symbols = {
     ['*'] = {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
@@ -108,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
@@ -196,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[%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.