X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fmaster-project%2Freport.git;a=blobdiff_plain;f=pret-lam.lua;h=6935043297ee5077a9e77495187b4ad0623e7662;hp=6c1ee96a2b39899a1b45f832c8766e7b917c68b2;hb=8b0d89230c60a843886d36f392755e169b29a114;hpb=f26456b7c1ca8bb42a8ea540f5953d039a465b48 diff --git a/pret-lam.lua b/pret-lam.lua index 6c1ee96..6935043 100644 --- a/pret-lam.lua +++ b/pret-lam.lua @@ -35,6 +35,7 @@ local keywords = { ['letrec'] = {}, ['letnonrec'] = {}, ['in'] = {}, + ['DEFAULT'] = {}, } local in_block = 0 @@ -42,6 +43,10 @@ local submatches = {} local bases = {} -- Store the last line for each indent level local indentlines = {} +-- The amount of indent of the first line, which we will strip of all +-- subsequent lines. This allows the entire block to be indented as normal in +-- the tex source code. +local first_indent -- 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 @@ -128,6 +133,17 @@ end -- line4, and line is no longer in scope since it is replaced by line4. local function do_indent(line) newind, rest = utf.match(line, '^(%s*)(.*)') + + -- Store the first line's indent + if not first_indent then + first_indent = utf.len(newind) + end + + -- Strip the indent of the first line from this line's indent. + newind = utf.sub(newind, first_indent + 1) + -- Rebuild line, so we can still use it below + line = newind .. rest + prev = -1 -- Loop all the previous lines for indent, unused in pairs(indentlines) do @@ -198,6 +214,7 @@ function vis.begin_of_display() bases = {} end indentlines = {} + first_indent = nil end