beta 2014.04.07 13:00

16 files changed, 215 insertions, 141 deletions

diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index c48611177..104973b46 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{2014.04.04 00:08}
+\newcontextversion{2014.04.07 13:00}
 
 %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 969fdfcda..e76e28122 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 627a00ac0..058d99f98 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -28,7 +28,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2014.04.04 00:08}
+\edef\contextversion{2014.04.07 13:00}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/core-sys.lua b/tex/context/base/core-sys.lua
index 009ec16ea..22b0e457c 100644
--- a/tex/context/base/core-sys.lua
+++ b/tex/context/base/core-sys.lua
@@ -94,7 +94,7 @@ statistics.register("result saved in file", function()
     -- suffix will be fetched from backend
     local outputfilename = environment.outputfilename or environment.jobname or tex.jobname or "<unset>"
     if tex.pdfoutput > 0 then
-        return format("%s.%s, compresslevel %s, objectcompreslevel %s",outputfilename,"pdf",tex.pdfcompresslevel, tex.pdfobjcompresslevel)
+        return format("%s.%s, compresslevel %s, objectcompresslevel %s",outputfilename,"pdf",tex.pdfcompresslevel, tex.pdfobjcompresslevel)
     else
         return format("%s.%s",outputfilename,"dvi") -- hard to imagine
     end
diff --git a/tex/context/base/font-con.lua b/tex/context/base/font-con.lua
index 09293895e..b43961ec6 100644
--- a/tex/context/base/font-con.lua
+++ b/tex/context/base/font-con.lua
@@ -290,14 +290,15 @@ constructors.nofsharedfonts = 0
 local sharednames           = { }
 
 function constructors.trytosharefont(target,tfmdata)
-    if constructors.sharefonts then
+    if constructors.sharefonts then -- not robust !
         local characters = target.characters
         local n = 1
         local t = { target.psname }
         local u = sortedkeys(characters)
         for i=1,#u do
+            local k = u[i]
             n = n + 1 ; t[n] = k
-            n = n + 1 ; t[n] = characters[u[i]].index or k
+            n = n + 1 ; t[n] = characters[k].index or k
         end
         local h = md5.HEX(concat(t," "))
         local s = sharednames[h]
@@ -452,8 +453,6 @@ function constructors.scale(tfmdata,specification)
     target.psname   = psname
     target.name     = name
     --
- -- inspect(properties)
-    --
     properties.fontname = fontname
     properties.fullname = fullname
     properties.filename = filename
@@ -826,7 +825,6 @@ function constructors.scale(tfmdata,specification)
         end
         targetcharacters[unicode] = chr
     end
-
     --
     constructors.aftercopyingcharacters(target,tfmdata)
     --
@@ -965,6 +963,7 @@ function constructors.finalize(tfmdata)
     --
     properties.finalized   = true
     --
+    --
     return tfmdata
 end
 
diff --git a/tex/context/base/font-ctx.lua b/tex/context/base/font-ctx.lua
index 13b1ac6a8..2bfcf3859 100644
--- a/tex/context/base/font-ctx.lua
+++ b/tex/context/base/font-ctx.lua
@@ -188,8 +188,9 @@ function constructors.trytosharefont(target,tfmdata)
                 local t = { target.psname }
                 local u = sortedkeys(characters)
                 for i=1,#u do
+                    local k = u[i]
                     n = n + 1 ; t[n] = k
-                    n = n + 1 ; t[n] = characters[u[i]].index or k
+                    n = n + 1 ; t[n] = characters[k].index or k
                 end
                 local checksum   = md5.HEX(concat(t," "))
                 local sharedname = shares[checksum]
diff --git a/tex/context/base/node-ltp.lua b/tex/context/base/node-ltp.lua
index 9f2491cfa..6ad5de140 100644
--- a/tex/context/base/node-ltp.lua
+++ b/tex/context/base/node-ltp.lua
@@ -1439,6 +1439,10 @@ local function post_line_break(par)
                 elseif id < math_code then
                     -- messy criterium
                     break
+elseif id == math_code then
+    -- keep the math node
+    setfield(next,"surround",0)
+    break
                 elseif id == kern_code and (subtype ~= userkern_code and not getattr(next,a_fontkern)) then
                     -- fontkerns and accent kerns as well as otf injections
                     break
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 670a0ca1d..144e7cbc6 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 dae52d6c4..2a573e315 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/strc-num.mkiv b/tex/context/base/strc-num.mkiv
index b0e36ffba..6802027e6 100644
--- a/tex/context/base/strc-num.mkiv
+++ b/tex/context/base/strc-num.mkiv
@@ -487,6 +487,7 @@
 
 % currentstructurecomponent => \strc_current_ or just \m_strc_
 
+
 \unexpanded\def\strc_counters_register_component#1#2#3#4#5#6#7[#8][#9]% maybe also nolist
   {\begingroup
    %
@@ -511,120 +512,153 @@
    \fi
    %
    \ifx\p_hascaption\v!yes
-     \xdef\currentstructurecomponentname           {#3\s!name}%
-     \xdef\currentstructurecomponentlevel          {#3\c!level}%
-     \edef\currentstructurecomponentexpansion      {#3\c!expansion}%
-     \xdef\currentstructurecomponentxmlsetup       {#3\c!xmlsetup}%
-     \xdef\currentstructurecomponentcatcodes       {#3\s!catcodes}%
-     \xdef\currentstructurecomponentlabel          {#3\c!label}%
-     \xdef\currentstructurecomponentreference      {#3\c!reference}%
-     \xdef\currentstructurecomponentreferenceprefix{#3\c!referenceprefix}%
-     \ifx\currentstructurecomponentexpansion\s!xml
-       \xmlstartraw
-         \xdef\currentstructurecomponenttitle   {#3\c!title}%
-         \xdef\currentstructurecomponentbookmark{#3\c!bookmark}%
-         \xdef\currentstructurecomponentmarking {#3\c!marking}%
-         \xdef\currentstructurecomponentlist    {#3\c!list}%
-       \xmlstopraw
-       \ifx\currentstructurecomponentlist\empty
-         \globallet\currentstructurecomponentlist\currentstructurecomponenttitle
-       \fi
-       \globallet\currentstructurecomponentcoding\s!xml
+     \strc_counters_register_component_list{#1}{#3}{#4}{#9}%
+   \else\ifx\currentstructurecomponentreference\empty
+     \strc_counters_register_component_none
+   \else
+     \strc_counters_register_component_page{#3}%
+   \fi\fi
+   \endgroup}
+
+\def\strc_counters_register_component_none
+  {\glet\m_strc_counters_last_registered_index      \relax
+   \glet\m_strc_counters_last_registered_attribute  \attributeunsetvalue
+   \glet\m_strc_counters_last_registered_synchronize\relax}
+
+\def\strc_counters_register_component_page#1%
+  {\xdef\currentstructurecomponentreference      {#1\c!reference}%
+   \xdef\currentstructurecomponentreferenceprefix{#1\c!referenceprefix}%
+   % maybe have a helper in strc-ref.mkvi
+   \setnextinternalreference
+   \ctxcommand{setreferenceattribute(% can be helper with less passed
+      "\s!page",
+      "\currentstructurecomponentreferenceprefix",
+      "\currentstructurecomponentreference",
+      {
+          references = {
+              internal = \nextinternalreference,
+              block    = "\currentsectionblock",
+              section  = structures.sections.currentid(),
+          },
+          metadata = {
+              kind = "page",
+          },
+      },
+      "\interactionparameter\c!focus")
+   }%
+   \xdef\m_strc_counters_last_registered_attribute  {\the\lastdestinationattribute}%
+   \glet\m_strc_counters_last_registered_index      \relax
+   \glet\m_strc_counters_last_registered_synchronize\relax}
+
+\def\strc_counters_register_component_list#1#2#3#4%
+  {\xdef\currentstructurecomponentname           {#2\s!name}%
+   \xdef\currentstructurecomponentlevel          {#2\c!level}%
+   \edef\currentstructurecomponentexpansion      {#2\c!expansion}%
+   \xdef\currentstructurecomponentxmlsetup       {#2\c!xmlsetup}%
+   \xdef\currentstructurecomponentcatcodes       {#2\s!catcodes}%
+   \xdef\currentstructurecomponentlabel          {#2\c!label}%
+   \xdef\currentstructurecomponentreference      {#2\c!reference}%
+   \xdef\currentstructurecomponentreferenceprefix{#2\c!referenceprefix}%
+   \ifx\currentstructurecomponentexpansion\s!xml
+     \xmlstartraw
+       \xdef\currentstructurecomponenttitle   {#2\c!title}%
+       \xdef\currentstructurecomponentbookmark{#2\c!bookmark}%
+       \xdef\currentstructurecomponentmarking {#2\c!marking}%
+       \xdef\currentstructurecomponentlist    {#2\c!list}%
+     \xmlstopraw
+     \ifx\currentstructurecomponentlist\empty
+       \globallet\currentstructurecomponentlist\currentstructurecomponenttitle
+     \fi
+     \globallet\currentstructurecomponentcoding\s!xml
+   \else
+     \ifx\currentstructurecomponentexpansion\v!yes
+       \xdef\currentstructurecomponenttitle   {#2\c!title}%
+       \xdef\currentstructurecomponentbookmark{#2\c!bookmark}%
+       \xdef\currentstructurecomponentmarking {#2\c!marking}%
+       \xdef\currentstructurecomponentlist    {#2\c!list}%
      \else
-       \ifx\currentstructurecomponentexpansion\v!yes
-         \xdef\currentstructurecomponenttitle   {#3\c!title}%
-         \xdef\currentstructurecomponentbookmark{#3\c!bookmark}%
-         \xdef\currentstructurecomponentmarking {#3\c!marking}%
-         \xdef\currentstructurecomponentlist    {#3\c!list}%
-       \else
-         \xdef\currentstructurecomponenttitle   {#4\c!title}%
-         \xdef\currentstructurecomponentbookmark{#4\c!bookmark}%
-         \xdef\currentstructurecomponentmarking {#4\c!marking}%
-         \xdef\currentstructurecomponentlist    {#4\c!list}%
-         \iflocation \ifx\currentstructurecomponentbookmark\empty
-           \begingroup
-           \simplifycommands
-           \xdef\currentstructurecomponentbookmark{\detokenize\expandafter{\normalexpanded{#3\c!title}}}%
-          \endgroup
-         \fi \fi
-       \fi
-       \ifx\currentstructurecomponentlist\empty
-         \globallet\currentstructurecomponentlist\currentstructurecomponenttitle
-       \fi
-       \globallet\currentstructurecomponentcoding\s!tex
+       \xdef\currentstructurecomponenttitle   {#3\c!title}%
+       \xdef\currentstructurecomponentbookmark{#3\c!bookmark}%
+       \xdef\currentstructurecomponentmarking {#3\c!marking}%
+       \xdef\currentstructurecomponentlist    {#3\c!list}%
+       \iflocation \ifx\currentstructurecomponentbookmark\empty
+         \begingroup
+         \simplifycommands
+         \xdef\currentstructurecomponentbookmark{\detokenize\expandafter{\normalexpanded{#2\c!title}}}%
+        \endgroup
+       \fi \fi
      \fi
-     %
-     \setnextinternalreference
-     \xdef\m_strc_counters_last_registered_index{\ctxcommand{addtolist{
-        metadata = {
-            kind     = "#1",
-            name     = "\currentname",
-            level    = structures.sections.currentlevel(),
-            catcodes  = \the\ifx\currentstructurecomponentcatcodes\empty\catcodetable\else\csname\currentstructurecomponentcatcodes\endcsname\fi,
-            coding    = "\currentstructurecomponentcoding",
-        \ifx\currentstructurecomponentcoding\s!xml
-            xmlroot   =  "\xmldocument",
-        \fi
-        \ifx\currentstructurecomponentxmlsetup\empty \else
-            xmlsetup  = "\currentstructurexmlsetup",
-        \fi
-        },
-        references = {
-            internal        = \nextinternalreference,
-            block           = "\currentsectionblock",
-            reference       = "\currentstructurecomponentreference",
-            referenceprefix = "\currentstructurecomponentreferenceprefix",
-            section         = structures.sections.currentid(),
-        },
-        titledata = {
-            label    = \!!bs\detokenize\expandafter{\currentstructurecomponentlabel    }\!!es,
-            title    = \!!bs\detokenize\expandafter{\currentstructurecomponenttitle    }\!!es,
-        \ifx\currentstructurecomponentbookmark\currentstructurecomponenttitle \else
-            bookmark = \!!bs\detokenize\expandafter{\currentstructurecomponentbookmark }\!!es,
-        \fi
-        \ifx\currentstructurecomponentmarking\currentstructurecomponenttitle \else
-            marking  = \!!bs\detokenize\expandafter{\currentstructurecomponentmarking  }\!!es,
-        \fi
-        \ifx\currentstructurecomponentlist\currentstructurecomponenttitle \else
-          list     = \!!bs\detokenize\expandafter{\currentstructurecomponentlist}\!!es,
-        \fi
-        },
+     \ifx\currentstructurecomponentlist\empty
+       \globallet\currentstructurecomponentlist\currentstructurecomponenttitle
+     \fi
+     \globallet\currentstructurecomponentcoding\s!tex
+   \fi
+   %
+   \setnextinternalreference
+   \xdef\m_strc_counters_last_registered_index{\ctxcommand{addtolist{
+      metadata = {
+          kind     = "#1",
+          name     = "\currentname",
+          level    = structures.sections.currentlevel(),
+          catcodes = \the\ifx\currentstructurecomponentcatcodes\empty\catcodetable\else\csname\currentstructurecomponentcatcodes\endcsname\fi,
+          coding   = "\currentstructurecomponentcoding",
+      \ifx\currentstructurecomponentcoding\s!xml
+          xmlroot  =  "\xmldocument",
+      \fi
+      \ifx\currentstructurecomponentxmlsetup\empty \else
+          xmlsetup = "\currentstructurexmlsetup",
+      \fi
+      },
+      references = {
+          internal        = \nextinternalreference,
+          block           = "\currentsectionblock",
+          reference       = "\currentstructurecomponentreference",
+          referenceprefix = "\currentstructurecomponentreferenceprefix",
+          section         = structures.sections.currentid(),
+      },
+      titledata = {
+          label    = \!!bs\detokenize\expandafter{\currentstructurecomponentlabel   }\!!es,
+          title    = \!!bs\detokenize\expandafter{\currentstructurecomponenttitle   }\!!es,
+      \ifx\currentstructurecomponentbookmark\currentstructurecomponenttitle \else
+          bookmark = \!!bs\detokenize\expandafter{\currentstructurecomponentbookmark}\!!es,
+      \fi
+      \ifx\currentstructurecomponentmarking\currentstructurecomponenttitle \else
+          marking  = \!!bs\detokenize\expandafter{\currentstructurecomponentmarking }\!!es,
+      \fi
+      \ifx\currentstructurecomponentlist\currentstructurecomponenttitle \else
+        list     = \!!bs\detokenize\expandafter{\currentstructurecomponentlist}\!!es,
+      \fi
+      },
     \ifx\p_hasnumber\v!yes
-        prefixdata = {
-            prefix        = "#3\c!prefix",
-            separatorset  = "#3\c!prefixseparatorset",
-            conversion    = \!!bs#3\c!prefixconversion\!!es,
-            conversionset = "#3\c!prefixconversionset",
-            set           = "#3\c!prefixset",
-        %   segments      = "#3\c!prefixsegments",
-            segments      = "\p_prefixsegments",
-            connector     = \!!bs#3\c!prefixconnector\!!es,
-        },
-        numberdata = { % more helpers here, like compact elsewhere
-            numbers       = structures.counters.compact("\currentcounter",nil,true),
-            group         = "#3\c!group",
-            groupsuffix   = \!!bs#3\c!groupsuffix\!!es,
-            counter       = "\currentcounter",
-            separatorset  = "#3\c!numberseparatorset",
-            conversion    = \!!bs#3\c!numberconversion\!!es,
-            conversionset = "#3\c!numberconversionset",
-            starter       = \!!bs#3\c!numberstarter\!!es,
-            stopper       = \!!bs#3\c!numberstopper\!!es,
-            segments      = "#3\c!numbersegments",
-        },
+      prefixdata = {
+          prefix        = "#2\c!prefix",
+          separatorset  = "#2\c!prefixseparatorset",
+          conversion    = \!!bs#2\c!prefixconversion\!!es,
+          conversionset = "#2\c!prefixconversionset",
+          set           = "#2\c!prefixset",
+      %   segments      = "#2\c!prefixsegments",
+          segments      = "\p_prefixsegments",
+          connector     = \!!bs#2\c!prefixconnector\!!es,
+      },
+      numberdata = { % more helpers here, like compact elsewhere
+          numbers       = structures.counters.compact("\currentcounter",nil,true),
+          group         = "#2\c!group",
+          groupsuffix   = \!!bs#2\c!groupsuffix\!!es,
+          counter       = "\currentcounter",
+          separatorset  = "#2\c!numberseparatorset",
+          conversion    = \!!bs#2\c!numberconversion\!!es,
+          conversionset = "#2\c!numberconversionset",
+          starter       = \!!bs#2\c!numberstarter\!!es,
+          stopper       = \!!bs#2\c!numberstopper\!!es,
+          segments      = "#2\c!numbersegments",
+      },
     \fi
-        userdata = \!!bs\detokenize{#9}\!!es % will be converted to table at the lua end
-       }
-     }}%
-     \ctxcommand{setinternalreference(nil,nil,\nextinternalreference)}%
-     \xdef\m_strc_counters_last_registered_attribute  {\the\lastdestinationattribute}%
-     \xdef\m_strc_counters_last_registered_synchronize{\ctxlatecommand{enhancelist(\m_strc_counters_last_registered_index)}}%
-   \else
-     \glet\m_strc_counters_last_registered_index      \relax
-     \glet\m_strc_counters_last_registered_attribute  \attributeunsetvalue
-     \glet\m_strc_counters_last_registered_synchronize\relax
-   \fi
-   \endgroup}
+      userdata = \!!bs\detokenize{#4}\!!es % will be converted to table at the lua end
+     }
+   }}%
+   \ctxcommand{setinternalreference(nil,nil,\nextinternalreference)}%
+   \xdef\m_strc_counters_last_registered_attribute  {\the\lastdestinationattribute}%
+   \xdef\m_strc_counters_last_registered_synchronize{\ctxlatecommand{enhancelist(\m_strc_counters_last_registered_index)}}}
 
 \let\m_strc_counters_last_registered_index      \relax
 \let\m_strc_counters_last_registered_attribute  \relax
diff --git a/tex/context/base/strc-ref.mkvi b/tex/context/base/strc-ref.mkvi
index cd307cc65..76d79b802 100644
--- a/tex/context/base/strc-ref.mkvi
+++ b/tex/context/base/strc-ref.mkvi
@@ -193,12 +193,12 @@
          \globallet\currentreferencecoding\s!tex
        \fi
        % beware, the structures.references.set writes a
-\setnextinternalreference
+       \setnextinternalreference
        \strc_references_start_destination_nodes
          \ctxcommand{setreferenceattribute("\currentreferencekind", "\referenceprefix","\currentreferencelabels",
            {
                 references = {
-internal = \nextinternalreference,
+                    internal = \nextinternalreference,
                     block    = "\currentsectionblock",
                     section  = structures.sections.currentid(),
                 },
@@ -243,9 +243,11 @@ internal = \nextinternalreference,
        \lastdestinationattribute\attributeunsetvalue
      \else
        \strc_references_start_destination_nodes
-         \ctxcommand{setreferenceattribute("\s!page", "\referenceprefix","\currentreferencelabels",
+\setnextinternalreference
+       \ctxcommand{setreferenceattribute("\s!page", "\referenceprefix","\currentreferencelabels",
             {
                 references = {
+                    internal = \nextinternalreference,
                     block    = "\currentsectionblock",
                     section  = structures.sections.currentid(),
                 },
@@ -264,9 +266,11 @@ internal = \nextinternalreference,
 \unexpanded\def\strc_references_direct_full#labels#text%
   {\ifreferencing
      \strc_references_start_destination_nodes
-       \ctxcommand{setreferenceattribute("\s!full", "\referenceprefix","#labels",
+\setnextinternalreference
+     \ctxcommand{setreferenceattribute("\s!full", "\referenceprefix","#labels",
          {
               references = {
+                  internal = \nextinternalreference,
                   block    = "\currentsectionblock",
                   section  = structures.sections.currentid(),
               },
diff --git a/tex/context/base/trac-deb.lua b/tex/context/base/trac-deb.lua
index c1c928f89..059bf5c0d 100644
--- a/tex/context/base/trac-deb.lua
+++ b/tex/context/base/trac-deb.lua
@@ -14,8 +14,8 @@ local tonumber, tostring = tonumber, tostring
 
 -- maybe tracers -> tracers.tex (and tracers.lua for current debugger)
 
-local report_tex  = logs.reporter("tex error")
-local report_lua  = logs.reporter("lua error")
+----- report_tex  = logs.reporter("tex error")
+----- report_lua  = logs.reporter("lua error")
 local report_nl   = logs.newline
 local report_str  = logs.writer
 
@@ -101,6 +101,16 @@ end
 
 local savedluaerror = nil
 
+local function errorreporter(luaerror)
+    if luaerror then
+        logs.enable("lua error") --
+        return logs.reporter("lua error")
+    else
+        logs.enable("tex error")
+        return logs.reporter("tex error")
+    end
+end
+
 function tracers.showlines(filename,linenumber,offset,luaerrorline)
     local data = io.loaddata(filename)
     if not data or data == "" then
@@ -153,12 +163,12 @@ local function processerror(offset)
     local inputstack   = resolvers.inputstack
     local filename     = inputstack[#inputstack] or status.filename
     local linenumber   = tonumber(status.linenumber) or 0
--- print(status.lasterrorstring)
--- print(status.lastluaerrorstring)
+ -- print(status.lasterrorstring)
+ -- print(status.lastluaerrorstring)
     local lasttexerror = status.lasterrorstring or "?"
     local lastluaerror = status.lastluaerrorstring or lasttexerror
-    local luaerrorline = match(lastluaerror,[[lua?]:.-(%d+)]]) or (lastluaerror and find(lastluaerror,"?:0:",1,true) and 0)
-    local report       = luaerrorline and report_lua or report_tex
+    local luaerrorline = match(lastluaerror,[[lua%]?:.-(%d+)]]) or (lastluaerror and find(lastluaerror,"?:0:",1,true) and 0)
+    local report       = errorreporter(luaerrorline)
     tracers.printerror {
         filename     = filename,
         linenumber   = linenumber,
@@ -178,7 +188,7 @@ function tracers.printerror(specification)
     local lastluaerror = specification.lastluaerror
     local luaerrorline = specification.luaerrorline
     local offset       = specification.offset
-    local report       = luaerrorline and report_lua or report_tex
+    local report       = errorreporter(luaerrorline)
     if not filename then
         report("error not related to input file: %s ...",lasttexerror)
     elseif type(filename) == "number" then
diff --git a/tex/context/base/trac-log.lua b/tex/context/base/trac-log.lua
index 0d0b66260..9435fef9b 100644
--- a/tex/context/base/trac-log.lua
+++ b/tex/context/base/trac-log.lua
@@ -535,9 +535,10 @@ local function setblocked(category,value)
             v.state = value
         end
     else
-        states = utilities.parsers.settings_to_hash(category)
+        states = utilities.parsers.settings_to_hash(category,type(states)=="table" and states or nil)
         for c, _ in next, states do
-            if data[c] then
+            local v = data[c]
+            if v then
                 v.state = value
             else
                 c = topattern(c,true,true)
diff --git a/tex/context/base/trac-vis.lua b/tex/context/base/trac-vis.lua
index 7460955eb..7e2413051 100644
--- a/tex/context/base/trac-vis.lua
+++ b/tex/context/base/trac-vis.lua
@@ -98,8 +98,10 @@ local unsetvalue          = attributes.unsetvalue
 
 local current_font        = font.current
 
-local exheights           = fonts.hashes.exheights
-local emwidths            = fonts.hashes.emwidths
+local fonthashes          = fonts.hashes
+local chardata            = fonthashes.characters
+local exheights           = fonthashes.exheights
+local emwidths            = fonthashes.emwidths
 local pt_factor           = number.dimenfactors.pt
 
 local nodepool            = nuts.pool
@@ -538,6 +540,7 @@ end
 
 local function ruledglyph(head,current,previous)
     local wd = getfield(current,"width")
+ -- local wd = chardata[getfield(current,"font")][getfield(current,"char")].width
     if wd ~= 0 then
         local ht = getfield(current,"height")
         local dp = getfield(current,"depth")
diff --git a/tex/generic/context/luatex/luatex-basics-nod.lua b/tex/generic/context/luatex/luatex-basics-nod.lua
index 50af40193..373dab5a8 100644
--- a/tex/generic/context/luatex/luatex-basics-nod.lua
+++ b/tex/generic/context/luatex/luatex-basics-nod.lua
@@ -54,7 +54,7 @@ nodes.handlers     = { }
 local nodecodes    = { } for k,v in next, node.types   () do nodecodes[string.gsub(v,"_","")] = k end
 local whatcodes    = { } for k,v in next, node.whatsits() do whatcodes[string.gsub(v,"_","")] = k end
 local glyphcodes   = { [0] = "character", "glyph", "ligature", "ghost", "left", "right" }
-local disccodes    = { [0] = "discretionary","explicit", "automatic", "regular", "first", "second" }
+local disccodes    = { [0] = "discretionary", "explicit", "automatic", "regular", "first", "second" }
 
 nodes.nodecodes    = nodecodes
 nodes.whatcodes    = whatcodes
@@ -67,11 +67,20 @@ local remove_node  = node.remove
 local new_node     = node.new
 local traverse_id  = node.traverse_id
 
-local math_code    = nodecodes.math
-
 nodes.handlers.protectglyphs   = node.protect_glyphs
 nodes.handlers.unprotectglyphs = node.unprotect_glyphs
 
+local math_code   = nodecodes.math
+local end_of_math = node.end_of_math
+
+function node.end_of_math(n)
+    if n.id == math_code and n.subtype == 1 then
+        return n
+    else
+        return end_of_math(n)
+    end
+end
+
 function nodes.remove(head, current, free_too)
    local t = current
    head, current = remove_node(head,current)
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index fa61668b0..466e7b1a4 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  : 04/04/14 00:08:59
+-- merge date  : 04/07/14 13:00:17
 
 do -- begin closure to overcome local limits and interference
 
@@ -3628,9 +3628,17 @@ local free_node=node.free
 local remove_node=node.remove
 local new_node=node.new
 local traverse_id=node.traverse_id
-local math_code=nodecodes.math
 nodes.handlers.protectglyphs=node.protect_glyphs
 nodes.handlers.unprotectglyphs=node.unprotect_glyphs
+local math_code=nodecodes.math
+local end_of_math=node.end_of_math
+function node.end_of_math(n)
+  if n.id==math_code and n.subtype==1 then
+    return n
+  else
+    return end_of_math(n)
+  end
+end
 function nodes.remove(head,current,free_too)
   local t=current
   head,current=remove_node(head,current)
@@ -3924,14 +3932,15 @@ constructors.sharefonts=false
 constructors.nofsharedfonts=0
 local sharednames={}
 function constructors.trytosharefont(target,tfmdata)
-  if constructors.sharefonts then
+  if constructors.sharefonts then 
     local characters=target.characters
     local n=1
     local t={ target.psname }
     local u=sortedkeys(characters)
     for i=1,#u do
+      local k=u[i]
       n=n+1;t[n]=k
-      n=n+1;t[n]=characters[u[i]].index or k
+      n=n+1;t[n]=characters[k].index or k
     end
     local h=md5.HEX(concat(t," "))
     local s=sharednames[h]