X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fmaster-project%2Freport.git;a=blobdiff_plain;f=pret-lam.lua;h=f14b962ba2cd162a8f9743e73aeef8e30b695776;hp=b882196ed522070743b40959e36a51940d8f5aee;hb=00c021ee84afe5e9271a59e0ccc22311406555ea;hpb=1c6eecb8f77839e208982f450d0ad90bd19e1177

diff --git a/pret-lam.lua b/pret-lam.lua
index b882196..f14b962 100644
--- a/pret-lam.lua
+++ b/pret-lam.lua
@@ -17,6 +17,7 @@ buffers.visualizers.lam.colors = {
     "prettyfour"
 }
 
+-- Symbols that should have a different representation
 buffers.visualizers.lam.symbols = {
     [' '] = {repr = '\\obs '},
     ['_'] = {repr = '\\_'},
@@ -24,8 +25,11 @@ buffers.visualizers.lam.symbols = {
     -- The default * sits very high above the baseline, \ast (u+2217) looks
     -- better.
     ['*'] = {repr = '\\ast'},
+    ['~'] = {repr = '\\sim'},
 }
 
+
+-- Keywords that should be bold
 buffers.visualizers.lam.keywords = {
     ['case'] = {},
     ['of'] = {},
@@ -33,13 +37,11 @@ buffers.visualizers.lam.keywords = {
     ['in'] = {},
 }
 
-
+-- 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
+-- character.  We can do a lookup directly, since symbols can be different in
+-- length, so we just loop over all symbols, trying them in turn.
 function buffers.visualizers.lam.take_symbol(str)
-    -- 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 character.
-    -- We can do a lookup directly, since symbols can be different in
-    -- length, so we just loop over all symbols, trying them in turn.
     for symbol,props in pairs(buffers.visualizers.lam.symbols) do
         -- Try to remove symbol from the start of str 
         symbol, newstr = utf.match(str, "^(" .. symbol .. ")(.*)")
@@ -61,36 +63,81 @@ end
 -- Take a single word from str, if posible. Returns the rest of the string and
 -- the word taken.
 function buffers.visualizers.lam.take_word(str)
-        res, newstr = utf.match(str, "^(%a+)(.*)")
+        -- A word must always start with a-z (in particular, λ is not a valid
+        -- start of a word).
+        res, newstr = utf.match(str, "^([a-zA-Z][%a%d_]+)(.*)")
         return res, newstr or str
 end
 
+-- Tries to match each of the patterns and returns the captures of the first
+-- matching pattern (up to 5 captures are supported). Returns nil when nothing
+-- matches.
+function buffers.visualizers.lam.match_mul(str, patterns)
+    for i, pat in ipairs(patterns) do
+        a, b, c, d, e = utf.match(str, pat)
+        if a then
+            return a, b, c, d, e
+        end
+    end
+    return nil
+end
+
+-- Find any subscripts in the given word and typeset them
+function buffers.visualizers.lam.do_subscripts(word)
+    local match_mul = buffers.visualizers.lam.match_mul
+    base, sub = match_mul(res, submatches)
+    if sub then
+        word = base .. "\\low{" .. sub .. "}"
+        -- After a word has been used as a base, allow subscripts
+        -- without _, even for non-numbers.
+        if not bases[base] then
+            -- Register that we've added this base
+            bases[base] = true
+            -- Add a pattern for this base
+            submatches[#submatches+1] = "^(" .. base .. ")([%a%d,]+)$"
+        end
+    end
+    return word
+end
+
+function buffers.visualizers.lam.begin_of_buffer(type, name)
+    -- Initially allow subscripts using _ or just appending a number (later,
+    -- we will add extra patterns here.
+    submatches = {"^(.*)_([%a%d,]+)$", "^(.*[^%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.
+    bases = {}
+end
+
 function buffers.visualizers.lam.flush_line(str,nested)
     local result, state = { }, 0
     local finish, change = buffers.finish_state, buffers.change_state
     local take_symbol = buffers.visualizers.lam.take_symbol
     local take_word = buffers.visualizers.lam.take_word
+    local do_subscripts = buffers.visualizers.lam.do_subscripts
     -- Set the colorscheme, which is used by finish_state and change_state
     buffers.currentcolors = buffers.visualizers.lam.colors
-
     while str ~= "" do
         local found = false
-        local res
+        local word, symbol
         -- See if the next token is a word
-        res, str = take_word(str)
-        if res then
+        word, str = take_word(str)
+        if word then
             if buffers.visualizers.lam.keywords[res] then
-                -- Make all keywors bold
-                res = "{\\bold " .. res ..  "}"
+                -- Make all keywords bold
+                word = "{\\bold " .. word ..  "}"
+            else
+                -- Process any subscripts in the word
+                word = do_subscripts(word)
             end
-            -- All other words are unmodified
         else
             -- The next token is not a word, it must be a symbol
-            res, str = take_symbol(str)
+            symbol, str = take_symbol(str)
         end
 
         -- Append the resulting token
-        result[#result+1] = res
+        result[#result+1] = word or symbol
     end
 
     state = finish(state, result)