X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fmaster-project%2Freport.git;a=blobdiff_plain;f=pret-lam.lua;h=9bf5b96bd390d922b2e1ec8f58ce4956706d5dd5;hp=ea07811759ae40920b5ef4d6a4f8e174a3e3fa1f;hb=3bc5509d94b45a3b0965d992d259091d3d822b42;hpb=1864c65fe74e332c5aca3ccb9878b98aa1aa93e7

diff --git a/pret-lam.lua b/pret-lam.lua
index ea07811..9bf5b96 100644
--- a/pret-lam.lua
+++ b/pret-lam.lua
@@ -6,7 +6,7 @@
 
 local utf = unicode.utf8
 
-vis = buffers.newvisualizer("lam")
+local vis = buffers.newvisualizer("lam")
 
 local colors = {
     "prettytwo",
@@ -24,9 +24,9 @@ local symbols = {
     -- better.
     ['*'] = {repr = '\\ast'},
     ['~'] = {repr = '\\sim'},
+    ['|'] = {repr = '\\char' .. utf.byte('|')},
 }
 
-
 -- Keywords that should be bold
 local keywords = {
     ['case'] = {},
@@ -101,14 +101,38 @@ local function do_subscripts(word)
     return word
 end
 
+local in_block = 0
+
+-- Mark the begin of a block of lambda formatted buffers or expressions. This
+-- means that, until you call end_of_block again, the subscript bases are
+-- shared. For example, if you have \lam{y1} some text \lam{yn} within a
+-- single block, the yn will properly get subscripted. Be sure to call
+-- end_of_block again!
+--
+-- Blocks can be partially nested, meaning that the block
+-- won't be closed until end_of_block was called exactly as often as
+-- begin_of_block. However, subscripts from the inner block can still
+-- influence subscripts in the outer block.
+function vis.begin_of_block()
+    vis.begin_of_display()
+    in_block = in_block + 1
+end
+
+-- Ends the current block
+function vis.end_of_block()
+    in_block = in_block - 1
+end
+
 function vis.begin_of_display()
-    -- Initially allow subscripts using _ or just appending a number (later,
-    -- we will add extra patterns here.
-    submatches = {"^(%a*)_([%a%d,]+)$", "^(%a+)(%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 = {}
+    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+)$"}
+        -- 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
 end
 
 -- Make things work for inline typeing (e.g., \type{}) as well.