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

diff --git a/pret-lam.lua b/pret-lam.lua
index 94dd810..b882196 100644
--- a/pret-lam.lua
+++ b/pret-lam.lua
@@ -17,45 +17,82 @@ buffers.visualizers.lam.colors = {
     "prettyfour"
 }
 
-buffers.visualizers.lam.tokens = {
+buffers.visualizers.lam.symbols = {
     [' '] = {repr = '\\obs '},
     ['_'] = {repr = '\\_'},
     ['->'] = {repr = '\\rightarrow'},
-    ['case'] = {style = 'bold'},
-    ['of'] = {style = 'bold'},
-    ['let'] = {style = 'bold'},
+    -- The default * sits very high above the baseline, \ast (u+2217) looks
+    -- better.
+    ['*'] = {repr = '\\ast'},
 }
 
+buffers.visualizers.lam.keywords = {
+    ['case'] = {},
+    ['of'] = {},
+    ['let'] = {},
+    ['in'] = {},
+}
+
+
+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 .. ")(.*)")
+        if symbol then
+            -- Return this tokens repr, or just the token if it has no
+            -- repr.
+            res = props.repr or symbol
+            -- Enclose the token in {\style .. }
+            if props.style then
+                res = "{\\" .. props.style ..  " " .. res ..  "}"
+            end
+            return res, newstr
+        end
+    end
+    -- No symbol found, just return the first character
+    return utf.match(str, "^(.)(.*)")
+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+)(.*)")
+        return res, newstr or str
+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
     -- Set the colorscheme, which is used by finish_state and change_state
     buffers.currentcolors = buffers.visualizers.lam.colors
 
     while str ~= "" do
-        found = false
-        for tok,props in pairs(buffers.visualizers.lam.tokens) do
-            -- Try to remove tok from the start of str 
-            str, count = utf.gsub(str, "^" .. tok, "")
-            if count ~= 0 then
-                -- Replace the token with the repr, or just itself
-                result[#result+1] = props.repr or tok
-                -- Enclose the token in {\style .. }
-                if props.style then
-                    result[#result] = "{\\" .. props.style ..
-                                        " " .. result[#result] ..
-                                        "}"
-                end
-                -- We found a token, now start over
-                found = true
-                break
+        local found = false
+        local res
+        -- See if the next token is a word
+        res, str = take_word(str)
+        if res then
+            if buffers.visualizers.lam.keywords[res] then
+                -- Make all keywors bold
+                res = "{\\bold " .. res ..  "}"
             end
+            -- All other words are unmodified
+        else
+            -- The next token is not a word, it must be a symbol
+            res, str = take_symbol(str)
         end
-        if not found then
-            result[#result+1] = utf.sub(str, 1, 1)
-            str = utf.sub(str, 2)
-        end
+
+        -- Append the resulting token
+        result[#result+1] = res
     end
+
     state = finish(state, result)
     buffers.flush_result(result,nested)
 end