2016-07-25 21:54:00

6 files changed, 16 insertions, 8 deletions

diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 2141b8616..968c39179 100644
--- a/tex/context/base/mkiv/cont-new.mkiv
+++ b/tex/context/base/mkiv/cont-new.mkiv
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2016.07.25 17:40}
+\newcontextversion{2016.07.25 21:49}
 
 %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/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv
index b3e58ad75..84611e104 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -39,7 +39,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2016.07.25 17:40}
+\edef\contextversion{2016.07.25 21:49}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/mkiv/node-rul.lua b/tex/context/base/mkiv/node-rul.lua
index 216dc0967..b3caa5ccd 100644
--- a/tex/context/base/mkiv/node-rul.lua
+++ b/tex/context/base/mkiv/node-rul.lua
@@ -49,6 +49,7 @@ local disc_code     = nodecodes.disc
 local rule_code     = nodecodes.rule
 local boundary_code = nodecodes.boundary
 local dir_code      = nodecodes.dir
+local math_code     = nodecodes.math
 
 function nodes.striprange(first,last) -- todo: dir
     if first and last then -- just to be sure
@@ -154,8 +155,6 @@ local new_kern           = nodepool.kern
 --
 -- glyph rule unset whatsit glue margin_kern kern math disc
 
-local checkdir = true
-
 -- we assume {glyphruns} and no funny extra kerning, ok, maybe we need
 -- a dummy character as start and end; anyway we only collect glyphs
 --
@@ -221,6 +220,13 @@ local function processwords(attribute,data,flush,head,parent,skip) -- we have hl
                 if f then
                     l = n
                 end
+            elseif id == math_code then
+                -- otherwise not consistent: a $b$ c vs a $b+c$ d etc
+                -- we need a special (optional) go over math variant
+                if f then
+                    head, done = flush(head,f,l,d,level,parent,strip), true
+                    f, l, a = nil, nil, nil
+                end
             elseif id == hlist_code or id == vlist_code then
                 if f then
                     head, done = flush(head,f,l,d,level,parent,strip), true
@@ -230,10 +236,6 @@ local function processwords(attribute,data,flush,head,parent,skip) -- we have hl
                 if list then
                     setlist(n,(processwords(attribute,data,flush,list,n,skip))) -- watch ()
                 end
---             elseif checkdir and id == dir_code then -- only changes in dir, we assume proper boundaries
---                 if f and a then
---                     l = n
---                 end
             elseif id == dir_code then -- only changes in dir, we assume proper boundaries
                 if f then
                     l = n
diff --git a/tex/context/base/mkiv/node-rul.mkiv b/tex/context/base/mkiv/node-rul.mkiv
index 130ac9671..8eef40a18 100644
--- a/tex/context/base/mkiv/node-rul.mkiv
+++ b/tex/context/base/mkiv/node-rul.mkiv
@@ -146,6 +146,12 @@
      +\csname\??barattribute#1\ifcsname\??bar#1:\number\c_node_rules_index\s!parent\endcsname:\number\c_node_rules_index\fi\endcsname
    \relax}
 
+\unexpanded\def\resetbar
+  {\attribute\ruledattribute\attributeunsetvalue}
+
+\unexpanded\def\nobar
+  {\groupedcommand\resetbar\relax}
+
 \unexpanded\def\startbar[#1]%
   {\begingroup
    \node_rules_set{#1}%
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 72504da84..75daa0532 100644
--- a/tex/context/base/mkiv/status-files.pdf
+++ b/tex/context/base/mkiv/status-files.pdf
diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf
index 111a82393..0bc38badd 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf