beta 2013.06.07 12:25

20 files changed, 573 insertions, 503 deletions

diff --git a/tex/context/base/buff-ver.mkiv b/tex/context/base/buff-ver.mkiv
index 430834a30..48be6b67b 100644
--- a/tex/context/base/buff-ver.mkiv
+++ b/tex/context/base/buff-ver.mkiv
@@ -378,7 +378,9 @@
    \catcode\leftbraceasciicode \begingroupcatcode
    \catcode\rightbraceasciicode\endgroupcatcode
    #1%
+   \bgroup % else wrong font for #2
    \aftergroup#2%
+   \aftergroup\egroup
    \let\nexttoken}
 
 \unexpanded\def\tex{\buff_verbatim_special_type\texescape        \relax}
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 3d46180c1..60a4e45f8 100644
--- a/tex/context/base/cont-new.mkiv
+++ b/tex/context/base/cont-new.mkiv
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2013.06.04 23:52}
+\newcontextversion{2013.06.07 12:25}
 
 %D This file is loaded at runtime, thereby providing an excellent place for
 %D hacks, patches, extensions and new features.
diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index 2a86c5b8c..c5561b93e 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 8a4d44cde..3eb8c9a76 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -25,7 +25,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2013.06.04 23:52}
+\edef\contextversion{2013.06.07 12:25}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/font-otn.lua b/tex/context/base/font-otn.lua
index 5da0cf798..f462c0db4 100644
--- a/tex/context/base/font-otn.lua
+++ b/tex/context/base/font-otn.lua
@@ -2093,24 +2093,24 @@ local function featuresprocessor(head,font,attr)
         checkstep(head)
     end
 
-    tfmdata                = fontdata[font]
-    descriptions           = tfmdata.descriptions
-    characters             = tfmdata.characters
-    resources              = tfmdata.resources
+    tfmdata         = fontdata[font]
+    descriptions    = tfmdata.descriptions
+    characters      = tfmdata.characters
+    resources       = tfmdata.resources
 
-    marks                  = resources.marks
-    anchorlookups          = resources.lookup_to_anchor
-    lookuptable            = resources.lookups
-    lookuptypes            = resources.lookuptypes
+    marks           = resources.marks
+    anchorlookups   = resources.lookup_to_anchor
+    lookuptable     = resources.lookups
+    lookuptypes     = resources.lookuptypes
 
-    currentfont            = font
-    rlmode                 = 0
+    currentfont     = font
+    rlmode          = 0
 
-    local sequences        = resources.sequences
-    local done             = false
-    local datasets         = otf.dataset(tfmdata,font,attr)
+    local sequences = resources.sequences
+    local done      = false
+    local datasets  = otf.dataset(tfmdata,font,attr)
 
-    local dirstack = { } -- could move outside function
+    local dirstack  = { } -- could move outside function
 
     -- We could work on sub start-stop ranges instead but I wonder if there is that
     -- much speed gain (experiments showed that it made not much sense) and we need
@@ -2120,245 +2120,233 @@ local function featuresprocessor(head,font,attr)
     -- Keeping track of the headnode is needed for devanagari (I generalized it a bit
     -- so that multiple cases are also covered.)
 
---     for s=1,#sequences do
---         local dataset = datasets[s]
---         if dataset then
---             featurevalue = dataset[1] -- todo: pass to function instead of using a global
---             if featurevalue then -- never false
-
-for s=1,#datasets do
-    local dataset = datasets[s]
-    featurevalue = dataset[1] -- todo: pass to function instead of using a global
-
-                local sequence  = dataset[5] -- sequences[s] -- also dataset[5]
-                local rlparmode = 0
-                local topstack  = 0
-                local success   = false
-                local attribute = dataset[2]
-                local chain     = dataset[3] -- sequence.chain or 0
-                local typ       = sequence.type
-                local subtables = sequence.subtables
-                if chain < 0 then
-                    -- this is a limited case, no special treatments like 'init' etc
-                    local handler = handlers[typ]
-                    -- we need to get rid of this slide! probably no longer needed in latest luatex
-                    local start = find_node_tail(head) -- slow (we can store tail because there's always a skip at the end): todo
+    for s=1,#datasets do
+        local dataset = datasets[s]
+        featurevalue = dataset[1] -- todo: pass to function instead of using a global
+
+        local sequence  = dataset[5] -- sequences[s] -- also dataset[5]
+        local rlparmode = 0
+        local topstack  = 0
+        local success   = false
+        local attribute = dataset[2]
+        local chain     = dataset[3] -- sequence.chain or 0
+        local typ       = sequence.type
+        local subtables = sequence.subtables
+        if chain < 0 then
+            -- this is a limited case, no special treatments like 'init' etc
+            local handler = handlers[typ]
+            -- we need to get rid of this slide! probably no longer needed in latest luatex
+            local start = find_node_tail(head) -- slow (we can store tail because there's always a skip at the end): todo
+            while start do
+                local id = start.id
+                if id == glyph_code then
+                    if start.font == font and start.subtype<256 then
+                        local a = start[0]
+                        if a then
+                            a = a == attr
+                        else
+                            a = true
+                        end
+                        if a then
+                            for i=1,#subtables do
+                                local lookupname = subtables[i]
+                                local lookupcache = lookuphash[lookupname]
+                                if lookupcache then
+                                    local lookupmatch = lookupcache[start.char]
+                                    if lookupmatch then
+                                        head, start, success = handler(head,start,dataset[4],lookupname,lookupmatch,sequence,lookuphash,i)
+                                        if success then
+                                            break
+                                        end
+                                    end
+                                else
+                                    report_missing_cache(typ,lookupname)
+                                end
+                            end
+                            if start then start = start.prev end
+                        else
+                            start = start.prev
+                        end
+                    else
+                        start = start.prev
+                    end
+                else
+                    start = start.prev
+                end
+            end
+        else
+            local handler = handlers[typ]
+            local ns = #subtables
+            local start = head -- local ?
+            rlmode = 0 -- to be checked ?
+            if ns == 1 then -- happens often
+                local lookupname = subtables[1]
+                local lookupcache = lookuphash[lookupname]
+                if not lookupcache then -- also check for empty cache
+                    report_missing_cache(typ,lookupname)
+                else
                     while start do
                         local id = start.id
                         if id == glyph_code then
                             if start.font == font and start.subtype<256 then
                                 local a = start[0]
                                 if a then
-                                    a = a == attr
+                                    a = (a == attr) and (not attribute or start[a_state] == attribute)
                                 else
-                                    a = true
+                                    a = not attribute or start[a_state] == attribute
                                 end
                                 if a then
-                                    for i=1,#subtables do
-                                        local lookupname = subtables[i]
-                                        local lookupcache = lookuphash[lookupname]
-                                        if lookupcache then
-                                            local lookupmatch = lookupcache[start.char]
-                                            if lookupmatch then
-                                                head, start, success = handler(head,start,dataset[4],lookupname,lookupmatch,sequence,lookuphash,i)
-                                                if success then
-                                                    break
-                                                end
-                                            end
-                                        else
-                                            report_missing_cache(typ,lookupname)
+                                    local lookupmatch = lookupcache[start.char]
+                                    if lookupmatch then
+                                        -- sequence kan weg
+                                        local ok
+                                        head, start, ok = handler(head,start,dataset[4],lookupname,lookupmatch,sequence,lookuphash,1)
+                                        if ok then
+                                            success = true
                                         end
                                     end
-                                    if start then start = start.prev end
+                                    if start then start = start.next end
                                 else
-                                    start = start.prev
+                                    start = start.next
                                 end
+                            elseif id == math_code then
+                                start = end_of_math(start).next
                             else
-                                start = start.prev
+                                start = start.next
                             end
-                        else
-                            start = start.prev
-                        end
-                    end
-                else
-                    local handler = handlers[typ]
-                    local ns = #subtables
-                    local start = head -- local ?
-                    rlmode = 0 -- to be checked ?
-                    if ns == 1 then -- happens often
-                        local lookupname = subtables[1]
-                        local lookupcache = lookuphash[lookupname]
-                        if not lookupcache then -- also check for empty cache
-                            report_missing_cache(typ,lookupname)
-                        else
-                            while start do
-                                local id = start.id
-                                if id == glyph_code then
-                                    if start.font == font and start.subtype<256 then
-                                        local a = start[0]
-                                        if a then
-                                            a = (a == attr) and (not attribute or start[a_state] == attribute)
-                                        else
-                                            a = not attribute or start[a_state] == attribute
-                                        end
-                                        if a then
-                                            local lookupmatch = lookupcache[start.char]
-                                            if lookupmatch then
-                                                -- sequence kan weg
-                                                local ok
-                                                head, start, ok = handler(head,start,dataset[4],lookupname,lookupmatch,sequence,lookuphash,1)
-                                                if ok then
-                                                    success = true
-                                                end
-                                            end
-                                            if start then start = start.next end
-                                        else
-                                            start = start.next
-                                        end
-                                    elseif id == math_code then
-                                        start = end_of_math(start).next
-                                    else
-                                        start = start.next
-                                    end
-                                elseif id == whatsit_code then -- will be function
-                                    local subtype = start.subtype
-                                    if subtype == dir_code then
-                                        local dir = start.dir
-                                        if     dir == "+TRT" or dir == "+TLT" then
-                                            topstack = topstack + 1
-                                            dirstack[topstack] = dir
-                                        elseif dir == "-TRT" or dir == "-TLT" then
-                                            topstack = topstack - 1
-                                        end
-                                        local newdir = dirstack[topstack]
-                                        if newdir == "+TRT" then
-                                            rlmode = -1
-                                        elseif newdir == "+TLT" then
-                                            rlmode = 1
-                                        else
-                                            rlmode = rlparmode
-                                        end
-                                        if trace_directions then
-                                            report_process("directions after txtdir %a: parmode %a, txtmode %a, # stack %a, new dir %a",dir,rlparmode,rlmode,topstack,newdir)
-                                        end
-                                    elseif subtype == localpar_code then
-                                        local dir = start.dir
-                                        if dir == "TRT" then
-                                            rlparmode = -1
-                                        elseif dir == "TLT" then
-                                            rlparmode = 1
-                                        else
-                                            rlparmode = 0
-                                        end
-                                        rlmode = rlparmode
-                                        if trace_directions then
-                                            report_process("directions after pardir %a: parmode %a, txtmode %a",dir,rlparmode,rlmode)
-                                        end
-                                    end
-                                    start = start.next
-                                elseif id == math_code then
-                                    start = end_of_math(start).next
+                        elseif id == whatsit_code then -- will be function
+                            local subtype = start.subtype
+                            if subtype == dir_code then
+                                local dir = start.dir
+                                if     dir == "+TRT" or dir == "+TLT" then
+                                    topstack = topstack + 1
+                                    dirstack[topstack] = dir
+                                elseif dir == "-TRT" or dir == "-TLT" then
+                                    topstack = topstack - 1
+                                end
+                                local newdir = dirstack[topstack]
+                                if newdir == "+TRT" then
+                                    rlmode = -1
+                                elseif newdir == "+TLT" then
+                                    rlmode = 1
                                 else
-                                    start = start.next
+                                    rlmode = rlparmode
+                                end
+                                if trace_directions then
+                                    report_process("directions after txtdir %a: parmode %a, txtmode %a, # stack %a, new dir %a",dir,rlparmode,rlmode,topstack,newdir)
+                                end
+                            elseif subtype == localpar_code then
+                                local dir = start.dir
+                                if dir == "TRT" then
+                                    rlparmode = -1
+                                elseif dir == "TLT" then
+                                    rlparmode = 1
+                                else
+                                    rlparmode = 0
+                                end
+                                rlmode = rlparmode
+                                if trace_directions then
+                                    report_process("directions after pardir %a: parmode %a, txtmode %a",dir,rlparmode,rlmode)
                                 end
                             end
+                            start = start.next
+                        elseif id == math_code then
+                            start = end_of_math(start).next
+                        else
+                            start = start.next
                         end
-                    else
-                        while start do
-                            local id = start.id
-                            if id == glyph_code then
-                                if start.font == font and start.subtype<256 then
-                                    local a = start[0]
-                                    if a then
-                                        a = (a == attr) and (not attribute or start[a_state] == attribute)
-                                    else
-                                        a = not attribute or start[a_state] == attribute
-                                    end
-                                    if a then
-                                        for i=1,ns do
-                                            local lookupname = subtables[i]
-                                            local lookupcache = lookuphash[lookupname]
-                                            if lookupcache then
-                                                local lookupmatch = lookupcache[start.char]
-                                                if lookupmatch then
-                                                    -- we could move all code inline but that makes things even more unreadable
-                                                    local ok
-                                                    head, start, ok = handler(head,start,dataset[4],lookupname,lookupmatch,sequence,lookuphash,i)
-                                                    if ok then
-                                                        success = true
-                                                        break
-                                                    elseif not start then
-                                                        -- don't ask why ... shouldn't happen
-                                                        break
-                                                    end
-                                                end
-                                            else
-                                                report_missing_cache(typ,lookupname)
+                    end
+                end
+            else
+                while start do
+                    local id = start.id
+                    if id == glyph_code then
+                        if start.font == font and start.subtype<256 then
+                            local a = start[0]
+                            if a then
+                                a = (a == attr) and (not attribute or start[a_state] == attribute)
+                            else
+                                a = not attribute or start[a_state] == attribute
+                            end
+                            if a then
+                                for i=1,ns do
+                                    local lookupname = subtables[i]
+                                    local lookupcache = lookuphash[lookupname]
+                                    if lookupcache then
+                                        local lookupmatch = lookupcache[start.char]
+                                        if lookupmatch then
+                                            -- we could move all code inline but that makes things even more unreadable
+                                            local ok
+                                            head, start, ok = handler(head,start,dataset[4],lookupname,lookupmatch,sequence,lookuphash,i)
+                                            if ok then
+                                                success = true
+                                                break
+                                            elseif not start then
+                                                -- don't ask why ... shouldn't happen
+                                                break
                                             end
                                         end
-                                        if start then start = start.next end
                                     else
-                                        start = start.next
-                                    end
-                                else
-                                    start = start.next
-                                end
-                            elseif id == whatsit_code then
-                                local subtype = start.subtype
-                                if subtype == dir_code then
-                                    local dir = start.dir
-                                    if     dir == "+TRT" or dir == "+TLT" then
-                                        topstack = topstack + 1
-                                        dirstack[topstack] = dir
-                                    elseif dir == "-TRT" or dir == "-TLT" then
-                                        topstack = topstack - 1
-                                    end
-                                    local newdir = dirstack[topstack]
-                                    if newdir == "+TRT" then
-                                        rlmode = -1
-                                    elseif newdir == "+TLT" then
-                                        rlmode = 1
-                                    else
-                                        rlmode = rlparmode
-                                    end
-                                    if trace_directions then
-                                        report_process("directions after txtdir %a: parmode %a, txtmode %a, # stack %a, new dir %a",dir,rlparmode,rlmode,topstack,newdir)
-                                    end
-                                elseif subtype == localpar_code then
-                                    local dir = start.dir
-                                    if dir == "TRT" then
-                                        rlparmode = -1
-                                    elseif dir == "TLT" then
-                                        rlparmode = 1
-                                    else
-                                        rlparmode = 0
-                                    end
-                                    rlmode = rlparmode
-                                    if trace_directions then
-                                        report_process("directions after pardir %a: parmode %a, txtmode %a",dir,rlparmode,rlmode)
+                                        report_missing_cache(typ,lookupname)
                                     end
                                 end
-                                start = start.next
-                            elseif id == math_code then
-                                start = end_of_math(start).next
+                                if start then start = start.next end
                             else
                                 start = start.next
                             end
+                        else
+                            start = start.next
+                        end
+                    elseif id == whatsit_code then
+                        local subtype = start.subtype
+                        if subtype == dir_code then
+                            local dir = start.dir
+                            if     dir == "+TRT" or dir == "+TLT" then
+                                topstack = topstack + 1
+                                dirstack[topstack] = dir
+                            elseif dir == "-TRT" or dir == "-TLT" then
+                                topstack = topstack - 1
+                            end
+                            local newdir = dirstack[topstack]
+                            if newdir == "+TRT" then
+                                rlmode = -1
+                            elseif newdir == "+TLT" then
+                                rlmode = 1
+                            else
+                                rlmode = rlparmode
+                            end
+                            if trace_directions then
+                                report_process("directions after txtdir %a: parmode %a, txtmode %a, # stack %a, new dir %a",dir,rlparmode,rlmode,topstack,newdir)
+                            end
+                        elseif subtype == localpar_code then
+                            local dir = start.dir
+                            if dir == "TRT" then
+                                rlparmode = -1
+                            elseif dir == "TLT" then
+                                rlparmode = 1
+                            else
+                                rlparmode = 0
+                            end
+                            rlmode = rlparmode
+                            if trace_directions then
+                                report_process("directions after pardir %a: parmode %a, txtmode %a",dir,rlparmode,rlmode)
+                            end
                         end
+                        start = start.next
+                    elseif id == math_code then
+                        start = end_of_math(start).next
+                    else
+                        start = start.next
                     end
                 end
-                if success then
-                    done = true
-                end
-                if trace_steps then -- ?
-                    registerstep(head)
-                end
-
---             end
---         else
---          -- report_process("warning, no dataset %a",s)
---         end
-
+            end
+        end
+        if success then
+            done = true
+        end
+        if trace_steps then -- ?
+            registerstep(head)
+        end
     end
     return head, done
 end
diff --git a/tex/context/base/l-lpeg.lua b/tex/context/base/l-lpeg.lua
index 99b4bbb13..7be86d38f 100644
--- a/tex/context/base/l-lpeg.lua
+++ b/tex/context/base/l-lpeg.lua
@@ -79,13 +79,22 @@ patterns.endofstring   = endofstring
 patterns.beginofstring = alwaysmatched
 patterns.alwaysmatched = alwaysmatched
 
-local digit, sign      = R('09'), S('+-')
+local sign             = S('+-')
+local zero             = P('0')
+local digit            = R('09')
+local octdigit         = R("07")
+local lowercase        = R("az")
+local uppercase        = R("AZ")
+local underscore       = P("_")
+local hexdigit         = digit + lowercase + uppercase
 local cr, lf, crlf     = P("\r"), P("\n"), P("\r\n")
 local newline          = crlf + S("\r\n") -- cr + lf
 local escaped          = P("\\") * anything
 local squote           = P("'")
 local dquote           = P('"')
 local space            = P(" ")
+local period           = P(".")
+local comma            = P(",")
 
 local utfbom_32_be     = P('\000\000\254\255')
 local utfbom_32_le     = P('\255\254\000\000')
@@ -143,23 +152,8 @@ local collapser        = Cs(spacer^0/"" * nonspacer^0 * ((spacer^0/" " * nonspac
 patterns.stripper      = stripper
 patterns.collapser     = collapser
 
-patterns.digit         = digit
-patterns.sign          = sign
-patterns.cardinal      = sign^0 * digit^1
-patterns.integer       = sign^0 * digit^1
-patterns.unsigned      = digit^0 * P('.') * digit^1
-patterns.float         = sign^0 * patterns.unsigned
-patterns.cunsigned     = digit^0 * P(',') * digit^1
-patterns.cfloat        = sign^0 * patterns.cunsigned
-patterns.number        = patterns.float + patterns.integer
-patterns.cnumber       = patterns.cfloat + patterns.integer
-patterns.oct           = P("0") * R("07")^1
-patterns.octal         = patterns.oct
-patterns.HEX           = P("0x") * R("09","AF")^1
-patterns.hex           = P("0x") * R("09","af")^1
-patterns.hexadecimal   = P("0x") * R("09","AF","af")^1
-patterns.lowercase     = R("az")
-patterns.uppercase     = R("AZ")
+patterns.lowercase     = lowercase
+patterns.uppercase     = uppercase
 patterns.letter        = patterns.lowercase + patterns.uppercase
 patterns.space         = space
 patterns.tab           = P("\t")
@@ -167,12 +161,12 @@ patterns.spaceortab    = patterns.space + patterns.tab
 patterns.newline       = newline
 patterns.emptyline     = newline^1
 patterns.equal         = P("=")
-patterns.comma         = P(",")
-patterns.commaspacer   = P(",") * spacer^0
-patterns.period        = P(".")
+patterns.comma         = comma
+patterns.commaspacer   = comma * spacer^0
+patterns.period        = period
 patterns.colon         = P(":")
 patterns.semicolon     = P(";")
-patterns.underscore    = P("_")
+patterns.underscore    = underscore
 patterns.escaped       = escaped
 patterns.squote        = squote
 patterns.dquote        = dquote
@@ -187,7 +181,33 @@ patterns.singlequoted  = squote * patterns.nosquote * squote
 patterns.doublequoted  = dquote * patterns.nodquote * dquote
 patterns.quoted        = patterns.doublequoted + patterns.singlequoted
 
-patterns.propername    = R("AZ","az","__") * R("09","AZ","az", "__")^0 * endofstring
+patterns.digit         = digit
+patterns.octdigit      = octdigit
+patterns.hexdigit      = hexdigit
+patterns.sign          = sign
+patterns.cardinal      = digit^1
+patterns.integer       = sign^-1 * digit^1
+patterns.unsigned      = digit^0 * period * digit^1
+patterns.float         = sign^-1 * patterns.unsigned
+patterns.cunsigned     = digit^0 * comma * digit^1
+patterns.cfloat        = sign^-1 * patterns.cunsigned
+patterns.number        = patterns.float + patterns.integer
+patterns.cnumber       = patterns.cfloat + patterns.integer
+patterns.oct           = zero * octdigit^1
+patterns.octal         = patterns.oct
+patterns.HEX           = zero * P("X") * (digit+uppercase)^1
+patterns.hex           = zero * P("x") * (digit+lowercase)^1
+patterns.hexadecimal   = zero * S("xX") * hexdigit^1
+
+patterns.hexafloat     = sign^-1
+                       * zero * S("xX")
+                       * (hexdigit^0 * period * hexdigit^1 + hexdigit^1 * period * hexdigit^0 + hexdigit^1)
+                       * (S("pP") * sign^-1 * hexdigit^1)^-1
+patterns.decafloat     = sign^-1
+                       * (digit^0 * period * digit^1 + digit^1 * period * digit^0 + digit^1)
+                       *  S("eE") * sign^-1 * digit^1
+
+patterns.propername    = (uppercase + lowercase + underscore) * (uppercase + lowercase + underscore + digit)^0 * endofstring
 
 patterns.somecontent   = (anything - newline - space)^1 -- (utf8char - newline - space)^1
 patterns.beginline     = #(1-newline)
@@ -854,9 +874,9 @@ end
 
 -- moved here (before util-str)
 
-local digit         = R("09")
-local period        = P(".")
-local zero          = P("0")
+----- digit         = R("09")
+----- period        = P(".")
+----- zero          = P("0")
 local trailingzeros = zero^0 * -digit -- suggested by Roberto R
 local case_1        = period * trailingzeros / ""
 local case_2        = period * (digit - trailingzeros)^1 * (trailingzeros / "")
diff --git a/tex/context/base/l-os.lua b/tex/context/base/l-os.lua
index 05ca0acdc..a4c0ac820 100644
--- a/tex/context/base/l-os.lua
+++ b/tex/context/base/l-os.lua
@@ -172,19 +172,21 @@ if not os.times then -- ?
     end
 end
 
-os.gettimeofday = os.gettimeofday or os.clock
 
-local startuptime = os.gettimeofday()
+local gettimeofday = os.gettimeofday or os.clock
+os.gettimeofday    = gettimeofday
+
+local startuptime = gettimeofday()
 
 function os.runtime()
-    return os.gettimeofday() - startuptime
+    return gettimeofday() - startuptime
 end
 
---~ print(os.gettimeofday()-os.time())
---~ os.sleep(1.234)
---~ print (">>",os.runtime())
---~ print(os.date("%H:%M:%S",os.gettimeofday()))
---~ print(os.date("%H:%M:%S",os.time()))
+-- print(os.gettimeofday()-os.time())
+-- os.sleep(1.234)
+-- print (">>",os.runtime())
+-- print(os.date("%H:%M:%S",os.gettimeofday()))
+-- print(os.date("%H:%M:%S",os.time()))
 
 -- no need for function anymore as we have more clever code and helpers now
 -- this metatable trickery might as well disappear
diff --git a/tex/context/base/l-pdfview.lua b/tex/context/base/l-pdfview.lua
index 6e0259299..fc3875ef4 100644
--- a/tex/context/base/l-pdfview.lua
+++ b/tex/context/base/l-pdfview.lua
@@ -45,7 +45,7 @@ if os.type == "windows" then
         ['sumatra'] = false,
     }
 
-    pdfview.method = "acrobat" -- no longer usefull due to green pop up line and clasing reader/full
+    pdfview.method = "acrobat" -- no longer useful due to green pop up line and clasing reader/full
     pdfview.method = "sumatra"
 
     runner = function(cmd)
@@ -56,18 +56,22 @@ else
 
     opencalls = {
         ['default'] = "pdfopen", -- we could pass the default here
-        ['okular']  = 'okular --unique'
+        ['okular']  = 'okular --unique',
+        ['sumatra'] = 'wine "sumatrapdf.exe" -reuse-instance -bg-color 0xCCCCCC',
     }
     closecalls= {
         ['default'] = "pdfclose --file",
         ['okular']  = false,
+        ['sumatra'] = false,
     }
     allcalls = {
         ['default'] = "pdfclose --all",
         ['okular']  = false,
+        ['sumatra'] = false,
     }
 
     pdfview.method = "okular"
+    pdfview.method = "sumatra"
 
     runner = function(cmd)
         os.execute(cmd .. " 1>/dev/null 2>/dev/null &")
diff --git a/tex/context/base/l-table.lua b/tex/context/base/l-table.lua
index 9a1b97fff..493a82084 100644
--- a/tex/context/base/l-table.lua
+++ b/tex/context/base/l-table.lua
@@ -16,6 +16,9 @@ local lpegmatch, patterns = lpeg.match, lpeg.patterns
 local floor = math.floor
 
 -- extra functions, some might go (when not used)
+--
+-- we could serialize using %a but that won't work well is in the code we mostly use
+-- floats and as such we get unequality e.g. in version comparisons
 
 local stripper = patterns.stripper
 
@@ -487,7 +490,7 @@ local function do_serialize(root,name,depth,level,indexed)
                     handle(format("%s %s,",depth,tostring(v)))
                 elseif t == "function" then
                     if functions then
-                        handle(format('%s load(%q),',depth,dump(v)))
+                        handle(format('%s load(%q),',depth,dump(v))) -- maybe strip
                     else
                         handle(format('%s "function",',depth))
                     end
@@ -607,8 +610,8 @@ local function do_serialize(root,name,depth,level,indexed)
                 end
             elseif t == "function" then
                 if functions then
-                    local f = getinfo(v).what == "C" and dump(dummy) or dump(v)
-                 -- local f = getinfo(v).what == "C" and dump(function(...) return v(...) end) or dump(v)
+                    local f = getinfo(v).what == "C" and dump(dummy) or dump(v) -- maybe strip
+                 -- local f = getinfo(v).what == "C" and dump(function(...) return v(...) end) or dump(v) -- maybe strip
                     if tk == "number" then
                         if hexify then
                             handle(format("%s [0x%04X]=load(%q),",depth,k,f))
@@ -806,7 +809,7 @@ end
 --                        handle(formatters["%w %S,"](level,v))
 --                    elseif t == "function" then
 --                        if functions then
---                            handle(formatters['%w load(%q),'](level,dump(v)))
+--                            handle(formatters['%w load(%q),'](level,dump(v))) -- maybe strip
 --                        else
 --                            handle(formatters['%w "function",'](level))
 --                        end
@@ -926,8 +929,8 @@ end
 --                    end
 --                elseif t == "function" then
 --                    if functions then
---                        local f = getinfo(v).what == "C" and dump(dummy) or dump(v)
---                     -- local f = getinfo(v).what == "C" and dump(function(...) return v(...) end) or dump(v)
+--                        local f = getinfo(v).what == "C" and dump(dummy) or dump(v) -- maybe strip
+--                     -- local f = getinfo(v).what == "C" and dump(function(...) return v(...) end) or dump(v) -- maybe strip
 --                        if tk == "number" then
 --                            if hexify then
 --                                handle(formatters["%w [%04H]=load(%q),"](level,k,f))
diff --git a/tex/context/base/node-pro.lua b/tex/context/base/node-pro.lua
index 60f2d8a72..7bfcf6d4a 100644
--- a/tex/context/base/node-pro.lua
+++ b/tex/context/base/node-pro.lua
@@ -66,12 +66,36 @@ processors.tracer = tracer
 
 processors.enabled = true -- this will become a proper state (like trackers)
 
-function processors.pre_linebreak_filter(head,groupcode,size,packtype,direction)
+-- function processors.pre_linebreak_filter(head,groupcode,size,packtype,direction)
+--     local first, found = first_glyph(head) -- they really need to be glyphs
+--     if found then
+--         if trace_callbacks then
+--             local before = nodes.count(head,true)
+--             local head, done = actions(head,groupcode,size,packtype,direction) -- todo : pass first
+--             local after = nodes.count(head,true)
+--             if done then
+--                 tracer("pre_linebreak","changed",head,groupcode,before,after,true)
+--             else
+--                 tracer("pre_linebreak","unchanged",head,groupcode,before,after,true)
+--             end
+--             return done and head or true
+--         else
+--             local head, done = actions(head,groupcode,size,packtype,direction) -- todo : pass first
+--             return done and head or true
+--         end
+--     elseif trace_callbacks then
+--         local n = nodes.count(head,false)
+--         tracer("pre_linebreak","no chars",head,groupcode,n,n)
+--     end
+--     return true
+-- end
+
+function processors.pre_linebreak_filter(head,groupcode)
     local first, found = first_glyph(head) -- they really need to be glyphs
     if found then
         if trace_callbacks then
             local before = nodes.count(head,true)
-            local head, done = actions(head,groupcode,size,packtype,direction) -- todo : pass first
+            local head, done = actions(head,groupcode)
             local after = nodes.count(head,true)
             if done then
                 tracer("pre_linebreak","changed",head,groupcode,before,after,true)
@@ -80,7 +104,7 @@ function processors.pre_linebreak_filter(head,groupcode,size,packtype,direction)
             end
             return done and head or true
         else
-            local head, done = actions(head,groupcode,size,packtype,direction) -- todo : pass first
+            local head, done = actions(head,groupcode)
             return done and head or true
         end
     elseif trace_callbacks then
diff --git a/tex/context/base/node-tsk.lua b/tex/context/base/node-tsk.lua
index b426c6e24..43c477f48 100644
--- a/tex/context/base/node-tsk.lua
+++ b/tex/context/base/node-tsk.lua
@@ -318,7 +318,8 @@ end
 
 tasks.new {
     name      = "processors",
-    arguments = 4,
+    arguments = 5, -- often only the first is used, and the last three are only passed in hpack filter
+--  arguments = 2,
     processor = nodeprocessor,
     sequence  = {
         "before",      -- for users
diff --git a/tex/context/base/page-brk.mkiv b/tex/context/base/page-brk.mkiv
index ac1fffd6b..d1520b6ce 100644
--- a/tex/context/base/page-brk.mkiv
+++ b/tex/context/base/page-brk.mkiv
@@ -228,7 +228,7 @@
 
 \installpagebreakmethod \v!quadruple % not yet ok inside columnsets
   {\ifdoublesided
-     \ifnum\numexpr\realpageno/4\relax=\numexpr\realpageno/2\relax\else
+     \ifnum\numexpr\realpageno/\plusfour\relax=\numexpr\realpageno/\plustwo\relax\else
        \page_breaks_handle_direct\v!yes
        \page_breaks_handle_direct\v!empty
        \page_breaks_handle_direct\v!empty
diff --git a/tex/context/base/page-mix.mkiv b/tex/context/base/page-mix.mkiv
index 2328b8678..ef26c5f70 100644
--- a/tex/context/base/page-mix.mkiv
+++ b/tex/context/base/page-mix.mkiv
@@ -557,9 +557,9 @@
      \hskip\d_page_mix_leftskip
      \page_mix_hbox to \d_page_mix_max_width \bgroup
        \dorecurse\c_page_mix_n_of_columns{%
+       % \inheritedmixedcolumnsframed{\page_mix_command_package_column}% needs reset of strut, align, setups etc
          \setbox\scratchbox\page_mix_command_package_column % needs packaging anyway
          \inheritedmixedcolumnsframedbox\currentmixedcolumns\scratchbox
-       % \inheritedmixedcolumnsframed{\page_mix_command_package_column}% needs reset of strut, align, setups etc
          \ifnum\recurselevel<\c_page_mix_n_of_columns
            \page_mix_command_inject_separator
          \fi
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index ccecc78e4..c4de827c9 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index c1acf2982..1c9fabde3 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/util-prs.lua b/tex/context/base/util-prs.lua
index 9d2ffcc3e..9b2a2b04c 100644
--- a/tex/context/base/util-prs.lua
+++ b/tex/context/base/util-prs.lua
@@ -9,8 +9,9 @@ if not modules then modules = { } end modules ['util-prs'] = {
 local lpeg, table, string = lpeg, table, string
 local P, R, V, S, C, Ct, Cs, Carg, Cc, Cg, Cf, Cp = lpeg.P, lpeg.R, lpeg.V, lpeg.S, lpeg.C, lpeg.Ct, lpeg.Cs, lpeg.Carg, lpeg.Cc, lpeg.Cg, lpeg.Cf, lpeg.Cp
 local lpegmatch, lpegpatterns = lpeg.match, lpeg.patterns
-local concat, format, gmatch, find = table.concat, string.format, string.gmatch, string.find
+local concat, gmatch, find = table.concat, string.gmatch, string.find
 local tostring, type, next, rawset = tostring, type, next, rawset
+local mod, div = math.mod, math.div
 
 utilities         = utilities or {}
 local parsers     = utilities.parsers or { }
@@ -590,3 +591,16 @@ end
 -- }
 --
 -- inspect(utilities.parsers.mergehashes(t,"aa, bb, cc"))
+
+function utilities.parsers.runtime(time)
+    if not time then
+        time = os.runtime()
+    end
+    local days = div(time,24*60*60)
+    time = mod(time,24*60*60)
+    local hours = div(time,60*60)
+    time = mod(time,60*60)
+    local minutes = div(time,60)
+    local seconds = mod(time,60)
+    return days, hours, minutes, seconds
+end
diff --git a/tex/context/base/util-seq.lua b/tex/context/base/util-seq.lua
index 27f95f0ee..4e042de59 100644
--- a/tex/context/base/util-seq.lua
+++ b/tex/context/base/util-seq.lua
@@ -296,7 +296,7 @@ function sequencers.nodeprocessor(t,nofarguments) -- todo: handle 'kind' in plug
         args = ",one"
     elseif nofarguments == 2 then
         args = ",one,two"
-    elseif nofarguments == 3 then
+    elseif nofarguments == 3 then -- from here on probably slower than ...
         args = ",one,two,three"
     elseif nofarguments == 4 then
         args = ",one,two,three,four"
diff --git a/tex/context/base/util-str.lua b/tex/context/base/util-str.lua
index 638995772..10456a729 100644
--- a/tex/context/base/util-str.lua
+++ b/tex/context/base/util-str.lua
@@ -195,12 +195,14 @@ end
 -- points           %p      number (scaled points)
 -- basepoints       %b      number (scaled points)
 -- table concat     %...t   table
+-- table concat     %{.}t   table
 -- serialize        %...T   sequenced (no nested tables)
+-- serialize        %{.}T   sequenced (no nested tables)
 -- boolean (logic)  %l      boolean
 -- BOOLEAN          %L      boolean
 -- whitespace       %...w
 -- automatic        %...a   'whatever' (string, table, ...)
--- automatic        %...a   "whatever" (string, table, ...)
+-- automatic        %...A   "whatever" (string, table, ...)
 
 local n = 0
 
@@ -298,7 +300,7 @@ setmetatable(arguments, { __index =
 })
 
 local prefix_any = C((S("+- .") + R("09"))^0)
-local prefix_tab = C((1-R("az","AZ","09","%%"))^0)
+local prefix_tab = P("{") * C((1-P("}"))^0) * P("}") + C((1-R("az","AZ","09","%%"))^0)
 
 -- we've split all cases as then we can optimize them (let's omit the fuzzy u)
 
@@ -608,8 +610,8 @@ local builder = Cs { "start",
     ["b"] = (prefix_any * P("b")) / format_b, -- %b => 12.342bp / maybe: B (and more units)
     ["t"] = (prefix_tab * P("t")) / format_t, -- %t => concat
     ["T"] = (prefix_tab * P("T")) / format_T, -- %t => sequenced
-    ["l"] = (prefix_tab * P("l")) / format_l, -- %l => boolean
-    ["L"] = (prefix_tab * P("L")) / format_L, -- %L => BOOLEAN
+    ["l"] = (prefix_any * P("l")) / format_l, -- %l => boolean
+    ["L"] = (prefix_any * P("L")) / format_L, -- %L => BOOLEAN
     ["I"] = (prefix_any * P("I")) / format_I, -- %I => signed integer
     --
     ["w"] = (prefix_any * P("w")) / format_w, -- %w => n spaces (optional prefix is added)
diff --git a/tex/context/base/util-tpl.lua b/tex/context/base/util-tpl.lua
index 7a6abefd6..511076b8d 100644
--- a/tex/context/base/util-tpl.lua
+++ b/tex/context/base/util-tpl.lua
@@ -96,8 +96,8 @@ local quotedescapers = {
     end,
 }
 
-lpeg.patterns.sqlescape = sqlescape
-lpeg.patterns.sqlescape = sqlquotedescape
+lpeg.patterns.sqlescape       = sqlescape
+lpeg.patterns.sqlquotedescape = sqlquotedescape
 
 local luaescaper       = escapers.lua
 local quotedluaescaper = quotedescapers.lua
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 53228d116..3f3294c4a 100644
--- a/tex/generic/context/luatex/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
 -- merged file : luatex-fonts-merged.lua
 -- parent file : luatex-fonts.lua
--- merge date  : 06/04/13 23:52:52
+-- merge date  : 06/07/13 12:25:27
 
 do -- begin closure to overcome local limits and interference
 
@@ -110,13 +110,22 @@ patterns.anything=anything
 patterns.endofstring=endofstring
 patterns.beginofstring=alwaysmatched
 patterns.alwaysmatched=alwaysmatched
-local digit,sign=R('09'),S('+-')
+local sign=S('+-')
+local zero=P('0')
+local digit=R('09')
+local octdigit=R("07")
+local lowercase=R("az")
+local uppercase=R("AZ")
+local underscore=P("_")
+local hexdigit=digit+lowercase+uppercase
 local cr,lf,crlf=P("\r"),P("\n"),P("\r\n")
 local newline=crlf+S("\r\n") 
 local escaped=P("\\")*anything
 local squote=P("'")
 local dquote=P('"')
 local space=P(" ")
+local period=P(".")
+local comma=P(",")
 local utfbom_32_be=P('\000\000\254\255')
 local utfbom_32_le=P('\255\254\000\000')
 local utfbom_16_be=P('\255\254')
@@ -155,23 +164,8 @@ local stripper=spacer^0*C((spacer^0*nonspacer^1)^0)
 local collapser=Cs(spacer^0/""*nonspacer^0*((spacer^0/" "*nonspacer^1)^0))
 patterns.stripper=stripper
 patterns.collapser=collapser
-patterns.digit=digit
-patterns.sign=sign
-patterns.cardinal=sign^0*digit^1
-patterns.integer=sign^0*digit^1
-patterns.unsigned=digit^0*P('.')*digit^1
-patterns.float=sign^0*patterns.unsigned
-patterns.cunsigned=digit^0*P(',')*digit^1
-patterns.cfloat=sign^0*patterns.cunsigned
-patterns.number=patterns.float+patterns.integer
-patterns.cnumber=patterns.cfloat+patterns.integer
-patterns.oct=P("0")*R("07")^1
-patterns.octal=patterns.oct
-patterns.HEX=P("0x")*R("09","AF")^1
-patterns.hex=P("0x")*R("09","af")^1
-patterns.hexadecimal=P("0x")*R("09","AF","af")^1
-patterns.lowercase=R("az")
-patterns.uppercase=R("AZ")
+patterns.lowercase=lowercase
+patterns.uppercase=uppercase
 patterns.letter=patterns.lowercase+patterns.uppercase
 patterns.space=space
 patterns.tab=P("\t")
@@ -179,12 +173,12 @@ patterns.spaceortab=patterns.space+patterns.tab
 patterns.newline=newline
 patterns.emptyline=newline^1
 patterns.equal=P("=")
-patterns.comma=P(",")
-patterns.commaspacer=P(",")*spacer^0
-patterns.period=P(".")
+patterns.comma=comma
+patterns.commaspacer=comma*spacer^0
+patterns.period=period
 patterns.colon=P(":")
 patterns.semicolon=P(";")
-patterns.underscore=P("_")
+patterns.underscore=underscore
 patterns.escaped=escaped
 patterns.squote=squote
 patterns.dquote=dquote
@@ -197,7 +191,26 @@ patterns.unspacer=((patterns.spacer^1)/"")^0
 patterns.singlequoted=squote*patterns.nosquote*squote
 patterns.doublequoted=dquote*patterns.nodquote*dquote
 patterns.quoted=patterns.doublequoted+patterns.singlequoted
-patterns.propername=R("AZ","az","__")*R("09","AZ","az","__")^0*endofstring
+patterns.digit=digit
+patterns.octdigit=octdigit
+patterns.hexdigit=hexdigit
+patterns.sign=sign
+patterns.cardinal=digit^1
+patterns.integer=sign^-1*digit^1
+patterns.unsigned=digit^0*period*digit^1
+patterns.float=sign^-1*patterns.unsigned
+patterns.cunsigned=digit^0*comma*digit^1
+patterns.cfloat=sign^-1*patterns.cunsigned
+patterns.number=patterns.float+patterns.integer
+patterns.cnumber=patterns.cfloat+patterns.integer
+patterns.oct=zero*octdigit^1
+patterns.octal=patterns.oct
+patterns.HEX=zero*P("X")*(digit+uppercase)^1
+patterns.hex=zero*P("x")*(digit+lowercase)^1
+patterns.hexadecimal=zero*S("xX")*hexdigit^1
+patterns.hexafloat=sign^-1*zero*S("xX")*(hexdigit^0*period*hexdigit^1+hexdigit^1*period*hexdigit^0+hexdigit^1)*(S("pP")*sign^-1*hexdigit^1)^-1
+patterns.decafloat=sign^-1*(digit^0*period*digit^1+digit^1*period*digit^0+digit^1)*S("eE")*sign^-1*digit^1
+patterns.propername=(uppercase+lowercase+underscore)*(uppercase+lowercase+underscore+digit)^0*endofstring
 patterns.somecontent=(anything-newline-space)^1 
 patterns.beginline=#(1-newline)
 patterns.longtostring=Cs(whitespace^0/""*nonwhitespace^0*((whitespace^0/" "*(patterns.quoted+nonwhitespace)^1)^0))
@@ -666,9 +679,6 @@ end
 function lpeg.times(pattern,n)
   return P(nextstep(n,2^16,{ "start",["1"]=pattern }))
 end
-local digit=R("09")
-local period=P(".")
-local zero=P("0")
 local trailingzeros=zero^0*-digit 
 local case_1=period*trailingzeros/""
 local case_2=period*(digit-trailingzeros)^1*(trailingzeros/"")
@@ -1168,7 +1178,7 @@ local function do_serialize(root,name,depth,level,indexed)
           handle(format("%s %s,",depth,tostring(v)))
         elseif t=="function" then
           if functions then
-            handle(format('%s load(%q),',depth,dump(v)))
+            handle(format('%s load(%q),',depth,dump(v))) 
           else
             handle(format('%s "function",',depth))
           end
@@ -2613,7 +2623,7 @@ setmetatable(arguments,{ __index=function(t,k)
   end
 })
 local prefix_any=C((S("+- .")+R("09"))^0)
-local prefix_tab=C((1-R("az","AZ","09","%%"))^0)
+local prefix_tab=P("{")*C((1-P("}"))^0)*P("}")+C((1-R("az","AZ","09","%%"))^0)
 local format_s=function(f)
   n=n+1
   if f and f~="" then
@@ -2863,8 +2873,8 @@ local builder=Cs { "start",
   ["b"]=(prefix_any*P("b"))/format_b,
   ["t"]=(prefix_tab*P("t"))/format_t,
   ["T"]=(prefix_tab*P("T"))/format_T,
-  ["l"]=(prefix_tab*P("l"))/format_l,
-  ["L"]=(prefix_tab*P("L"))/format_L,
+  ["l"]=(prefix_any*P("l"))/format_l,
+  ["L"]=(prefix_any*P("L"))/format_L,
   ["I"]=(prefix_any*P("I"))/format_I,
   ["w"]=(prefix_any*P("w"))/format_w,
   ["W"]=(prefix_any*P("W"))/format_W,
@@ -10005,227 +10015,227 @@ local function featuresprocessor(head,font,attr)
   local done=false
   local datasets=otf.dataset(tfmdata,font,attr)
   local dirstack={}
-for s=1,#datasets do
-  local dataset=datasets[s]
-  featurevalue=dataset[1] 
-        local sequence=dataset[5] 
-        local rlparmode=0
-        local topstack=0
-        local success=false
-        local attribute=dataset[2]
-        local chain=dataset[3] 
-        local typ=sequence.type
-        local subtables=sequence.subtables
-        if chain<0 then
-          local handler=handlers[typ]
-          local start=find_node_tail(head) 
+  for s=1,#datasets do
+    local dataset=datasets[s]
+    featurevalue=dataset[1] 
+    local sequence=dataset[5] 
+    local rlparmode=0
+    local topstack=0
+    local success=false
+    local attribute=dataset[2]
+    local chain=dataset[3] 
+    local typ=sequence.type
+    local subtables=sequence.subtables
+    if chain<0 then
+      local handler=handlers[typ]
+      local start=find_node_tail(head) 
+      while start do
+        local id=start.id
+        if id==glyph_code then
+          if start.font==font and start.subtype<256 then
+            local a=start[0]
+            if a then
+              a=a==attr
+            else
+              a=true
+            end
+            if a then
+              for i=1,#subtables do
+                local lookupname=subtables[i]
+                local lookupcache=lookuphash[lookupname]
+                if lookupcache then
+                  local lookupmatch=lookupcache[start.char]
+                  if lookupmatch then
+                    head,start,success=handler(head,start,dataset[4],lookupname,lookupmatch,sequence,lookuphash,i)
+                    if success then
+                      break
+                    end
+                  end
+                else
+                  report_missing_cache(typ,lookupname)
+                end
+              end
+              if start then start=start.prev end
+            else
+              start=start.prev
+            end
+          else
+            start=start.prev
+          end
+        else
+          start=start.prev
+        end
+      end
+    else
+      local handler=handlers[typ]
+      local ns=#subtables
+      local start=head 
+      rlmode=0 
+      if ns==1 then 
+        local lookupname=subtables[1]
+        local lookupcache=lookuphash[lookupname]
+        if not lookupcache then 
+          report_missing_cache(typ,lookupname)
+        else
           while start do
             local id=start.id
             if id==glyph_code then
               if start.font==font and start.subtype<256 then
                 local a=start[0]
                 if a then
-                  a=a==attr
+                  a=(a==attr) and (not attribute or start[a_state]==attribute)
                 else
-                  a=true
+                  a=not attribute or start[a_state]==attribute
                 end
                 if a then
-                  for i=1,#subtables do
-                    local lookupname=subtables[i]
-                    local lookupcache=lookuphash[lookupname]
-                    if lookupcache then
-                      local lookupmatch=lookupcache[start.char]
-                      if lookupmatch then
-                        head,start,success=handler(head,start,dataset[4],lookupname,lookupmatch,sequence,lookuphash,i)
-                        if success then
-                          break
-                        end
-                      end
-                    else
-                      report_missing_cache(typ,lookupname)
+                  local lookupmatch=lookupcache[start.char]
+                  if lookupmatch then
+                    local ok
+                    head,start,ok=handler(head,start,dataset[4],lookupname,lookupmatch,sequence,lookuphash,1)
+                    if ok then
+                      success=true
                     end
                   end
-                  if start then start=start.prev end
+                  if start then start=start.next end
                 else
-                  start=start.prev
+                  start=start.next
                 end
+              elseif id==math_code then
+                start=end_of_math(start).next
               else
-                start=start.prev
+                start=start.next
               end
-            else
-              start=start.prev
-            end
-          end
-        else
-          local handler=handlers[typ]
-          local ns=#subtables
-          local start=head 
-          rlmode=0 
-          if ns==1 then 
-            local lookupname=subtables[1]
-            local lookupcache=lookuphash[lookupname]
-            if not lookupcache then 
-              report_missing_cache(typ,lookupname)
-            else
-              while start do
-                local id=start.id
-                if id==glyph_code then
-                  if start.font==font and start.subtype<256 then
-                    local a=start[0]
-                    if a then
-                      a=(a==attr) and (not attribute or start[a_state]==attribute)
-                    else
-                      a=not attribute or start[a_state]==attribute
-                    end
-                    if a then
-                      local lookupmatch=lookupcache[start.char]
-                      if lookupmatch then
-                        local ok
-                        head,start,ok=handler(head,start,dataset[4],lookupname,lookupmatch,sequence,lookuphash,1)
-                        if ok then
-                          success=true
-                        end
-                      end
-                      if start then start=start.next end
-                    else
-                      start=start.next
-                    end
-                  elseif id==math_code then
-                    start=end_of_math(start).next
-                  else
-                    start=start.next
-                  end
-                elseif id==whatsit_code then 
-                  local subtype=start.subtype
-                  if subtype==dir_code then
-                    local dir=start.dir
-                    if   dir=="+TRT" or dir=="+TLT" then
-                      topstack=topstack+1
-                      dirstack[topstack]=dir
-                    elseif dir=="-TRT" or dir=="-TLT" then
-                      topstack=topstack-1
-                    end
-                    local newdir=dirstack[topstack]
-                    if newdir=="+TRT" then
-                      rlmode=-1
-                    elseif newdir=="+TLT" then
-                      rlmode=1
-                    else
-                      rlmode=rlparmode
-                    end
-                    if trace_directions then
-                      report_process("directions after txtdir %a: parmode %a, txtmode %a, # stack %a, new dir %a",dir,rlparmode,rlmode,topstack,newdir)
-                    end
-                  elseif subtype==localpar_code then
-                    local dir=start.dir
-                    if dir=="TRT" then
-                      rlparmode=-1
-                    elseif dir=="TLT" then
-                      rlparmode=1
-                    else
-                      rlparmode=0
-                    end
-                    rlmode=rlparmode
-                    if trace_directions then
-                      report_process("directions after pardir %a: parmode %a, txtmode %a",dir,rlparmode,rlmode)
-                    end
-                  end
-                  start=start.next
-                elseif id==math_code then
-                  start=end_of_math(start).next
+            elseif id==whatsit_code then 
+              local subtype=start.subtype
+              if subtype==dir_code then
+                local dir=start.dir
+                if   dir=="+TRT" or dir=="+TLT" then
+                  topstack=topstack+1
+                  dirstack[topstack]=dir
+                elseif dir=="-TRT" or dir=="-TLT" then
+                  topstack=topstack-1
+                end
+                local newdir=dirstack[topstack]
+                if newdir=="+TRT" then
+                  rlmode=-1
+                elseif newdir=="+TLT" then
+                  rlmode=1
                 else
-                  start=start.next
+                  rlmode=rlparmode
+                end
+                if trace_directions then
+                  report_process("directions after txtdir %a: parmode %a, txtmode %a, # stack %a, new dir %a",dir,rlparmode,rlmode,topstack,newdir)
+                end
+              elseif subtype==localpar_code then
+                local dir=start.dir
+                if dir=="TRT" then
+                  rlparmode=-1
+                elseif dir=="TLT" then
+                  rlparmode=1
+                else
+                  rlparmode=0
+                end
+                rlmode=rlparmode
+                if trace_directions then
+                  report_process("directions after pardir %a: parmode %a, txtmode %a",dir,rlparmode,rlmode)
                 end
               end
+              start=start.next
+            elseif id==math_code then
+              start=end_of_math(start).next
+            else
+              start=start.next
             end
-          else
-            while start do
-              local id=start.id
-              if id==glyph_code then
-                if start.font==font and start.subtype<256 then
-                  local a=start[0]
-                  if a then
-                    a=(a==attr) and (not attribute or start[a_state]==attribute)
-                  else
-                    a=not attribute or start[a_state]==attribute
-                  end
-                  if a then
-                    for i=1,ns do
-                      local lookupname=subtables[i]
-                      local lookupcache=lookuphash[lookupname]
-                      if lookupcache then
-                        local lookupmatch=lookupcache[start.char]
-                        if lookupmatch then
-                          local ok
-                          head,start,ok=handler(head,start,dataset[4],lookupname,lookupmatch,sequence,lookuphash,i)
-                          if ok then
-                            success=true
-                            break
-                          elseif not start then
-                            break
-                          end
-                        end
-                      else
-                        report_missing_cache(typ,lookupname)
+          end
+        end
+      else
+        while start do
+          local id=start.id
+          if id==glyph_code then
+            if start.font==font and start.subtype<256 then
+              local a=start[0]
+              if a then
+                a=(a==attr) and (not attribute or start[a_state]==attribute)
+              else
+                a=not attribute or start[a_state]==attribute
+              end
+              if a then
+                for i=1,ns do
+                  local lookupname=subtables[i]
+                  local lookupcache=lookuphash[lookupname]
+                  if lookupcache then
+                    local lookupmatch=lookupcache[start.char]
+                    if lookupmatch then
+                      local ok
+                      head,start,ok=handler(head,start,dataset[4],lookupname,lookupmatch,sequence,lookuphash,i)
+                      if ok then
+                        success=true
+                        break
+                      elseif not start then
+                        break
                       end
                     end
-                    if start then start=start.next end
-                  else
-                    start=start.next
-                  end
-                else
-                  start=start.next
-                end
-              elseif id==whatsit_code then
-                local subtype=start.subtype
-                if subtype==dir_code then
-                  local dir=start.dir
-                  if   dir=="+TRT" or dir=="+TLT" then
-                    topstack=topstack+1
-                    dirstack[topstack]=dir
-                  elseif dir=="-TRT" or dir=="-TLT" then
-                    topstack=topstack-1
-                  end
-                  local newdir=dirstack[topstack]
-                  if newdir=="+TRT" then
-                    rlmode=-1
-                  elseif newdir=="+TLT" then
-                    rlmode=1
-                  else
-                    rlmode=rlparmode
-                  end
-                  if trace_directions then
-                    report_process("directions after txtdir %a: parmode %a, txtmode %a, # stack %a, new dir %a",dir,rlparmode,rlmode,topstack,newdir)
-                  end
-                elseif subtype==localpar_code then
-                  local dir=start.dir
-                  if dir=="TRT" then
-                    rlparmode=-1
-                  elseif dir=="TLT" then
-                    rlparmode=1
                   else
-                    rlparmode=0
-                  end
-                  rlmode=rlparmode
-                  if trace_directions then
-                    report_process("directions after pardir %a: parmode %a, txtmode %a",dir,rlparmode,rlmode)
+                    report_missing_cache(typ,lookupname)
                   end
                 end
-                start=start.next
-              elseif id==math_code then
-                start=end_of_math(start).next
+                if start then start=start.next end
               else
                 start=start.next
               end
+            else
+              start=start.next
+            end
+          elseif id==whatsit_code then
+            local subtype=start.subtype
+            if subtype==dir_code then
+              local dir=start.dir
+              if   dir=="+TRT" or dir=="+TLT" then
+                topstack=topstack+1
+                dirstack[topstack]=dir
+              elseif dir=="-TRT" or dir=="-TLT" then
+                topstack=topstack-1
+              end
+              local newdir=dirstack[topstack]
+              if newdir=="+TRT" then
+                rlmode=-1
+              elseif newdir=="+TLT" then
+                rlmode=1
+              else
+                rlmode=rlparmode
+              end
+              if trace_directions then
+                report_process("directions after txtdir %a: parmode %a, txtmode %a, # stack %a, new dir %a",dir,rlparmode,rlmode,topstack,newdir)
+              end
+            elseif subtype==localpar_code then
+              local dir=start.dir
+              if dir=="TRT" then
+                rlparmode=-1
+              elseif dir=="TLT" then
+                rlparmode=1
+              else
+                rlparmode=0
+              end
+              rlmode=rlparmode
+              if trace_directions then
+                report_process("directions after pardir %a: parmode %a, txtmode %a",dir,rlparmode,rlmode)
+              end
             end
+            start=start.next
+          elseif id==math_code then
+            start=end_of_math(start).next
+          else
+            start=start.next
           end
         end
-        if success then
-          done=true
-        end
-        if trace_steps then 
-          registerstep(head)
-        end
+      end
+    end
+    if success then
+      done=true
+    end
+    if trace_steps then 
+      registerstep(head)
+    end
   end
   return head,done
 end