2015-07-24 11:34:00

10 files changed, 57 insertions, 39 deletions

diff --git a/tex/context/base/char-def.lua b/tex/context/base/char-def.lua
index 31412940e..132d007d5 100644
--- a/tex/context/base/char-def.lua
+++ b/tex/context/base/char-def.lua
@@ -63870,6 +63870,7 @@ characters.data={
   linebreak="al",
   mathclass="relation",
   mathname="colonequals",
+  mathpair={ 0x3A, 0x3D },
   mirror=0x2255,
   unicodeslot=0x2254,
  },
@@ -63880,6 +63881,7 @@ characters.data={
   linebreak="al",
   mathclass="relation",
   mathname="equalscolon",
+  mathpair={ 0x3D, 0x3A },
   mirror=0x2254,
   unicodeslot=0x2255,
  },
@@ -64032,6 +64034,7 @@ characters.data={
   description="LESS-THAN OR EQUAL TO",
   direction="on",
   linebreak="ai",
+  mathpair={ 0x3C, 0x3D },
   mathspec={
    {
     class="relation",
@@ -64052,6 +64055,7 @@ characters.data={
   description="GREATER-THAN OR EQUAL TO",
   direction="on",
   linebreak="ai",
+  mathpair={ 0x3E, 0x3D },
   mathspec={
    {
     class="relation",
diff --git a/tex/context/base/char-utf.lua b/tex/context/base/char-utf.lua
index 381602ede..327529c32 100644
--- a/tex/context/base/char-utf.lua
+++ b/tex/context/base/char-utf.lua
@@ -166,7 +166,7 @@ characters.decomposed = decomposed
 --     characters.initialize = function() end -- when used outside tex
 -- end
 
-local function initialize()
+local function initialize() -- maybe in tex mode store in format !
     local data = characters.data
     local function backtrack(v,last,target)
         local vs = v.specials
@@ -177,6 +177,22 @@ local function initialize()
             backtrack(data[one],second,target)
         end
     end
+    local function setpair(one,two,unicode,first,second,combination)
+        local mps = mathpairs[one]
+        if not mps then
+            mps = { [two] = unicode }
+            mathpairs[one] = mps
+        else
+            mps[two] = unicode
+        end
+        local mps = mathpairs[first]
+        if not mps then
+            mps = { [second] = combination }
+            mathpairs[first] = mps
+        else
+            mps[second] = combination
+        end
+    end
     for unicode, v in next, data do
         local vs = v.specials
         if vs and #vs == 3 and vs[1] == "char" then
@@ -196,22 +212,15 @@ local function initialize()
             end
             --
             if v.mathclass or v.mathspec then
-                local mps = mathpairs[two]
-                if not mps then
-                    mps = { [one] = unicode }
-                    mathpairs[two] = mps
-                else
-                    mps[one] = unicode -- here unicode
-                end
-                local mps = mathpairs[second]
-                if not mps then
-                    mps = { [first] = combination }
-                    mathpairs[second] = mps
-                else
-                    mps[first] = combination
-                end
+                setpair(two,one,unicode,second,first,combination) -- watch order
             end
         end
+        local mp = v.mathpair
+        if mp then
+            local one, two = mp[1], mp[2]
+            local first, second, combination = utfchar(one), utfchar(two), utfchar(unicode)
+            setpair(one,two,unicode,first,second,combination)
+        end
     end
     initialize = false
     characters.initialize = function() end
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index d6cbc3787..2f43a840c 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{2015.07.24 10:27}
+\newcontextversion{2015.07.24 11:32}
 
 %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 1b435f700..ffbb94d31 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 6bc5fa157..2a190cd07 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -39,7 +39,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2015.07.24 10:27}
+\edef\contextversion{2015.07.24 11:32}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/math-noa.lua b/tex/context/base/math-noa.lua
index 8e0c7e0ed..973e44a77 100644
--- a/tex/context/base/math-noa.lua
+++ b/tex/context/base/math-noa.lua
@@ -134,6 +134,9 @@ local fencecodes          = nodes.fencecodes
 
 local noad_ord            = noadcodes.ord
 local noad_rel            = noadcodes.rel
+local noad_bin            = noadcodes.bin
+local noad_open           = noadcodes.open
+local noad_close          = noadcodes.close
 local noad_punct          = noadcodes.punct
 local noad_opdisplaylimits= noadcodes.opdisplaylimits
 local noad_oplimits       = noadcodes.oplimits
@@ -1304,7 +1307,7 @@ implement {
 
 local collapse = { } processors.collapse = collapse
 
-local mathpairs = characters.mathpairs
+local mathpairs = characters.mathpairs -- next will move to char-def
 
 mathpairs[0x2032] = { [0x2032] = 0x2033, [0x2033] = 0x2034, [0x2034] = 0x2057 } -- (prime,prime) (prime,doubleprime) (prime,tripleprime)
 mathpairs[0x2033] = { [0x2032] = 0x2034, [0x2033] = 0x2057 }                    -- (doubleprime,prime) (doubleprime,doubleprime)
@@ -1334,6 +1337,8 @@ local movesub = {
 local validpair = {
     [noad_rel]             = true,
     [noad_ord]             = true,
+    [noad_bin]             = true, -- new
+    [noad_punct]           = true, -- new
     [noad_opdisplaylimits] = true,
     [noad_oplimits]        = true,
     [noad_opnolimits]      = true,
@@ -1507,19 +1512,19 @@ end
 local classes = { }
 
 local colors = {
-    [noadcodes.rel]             = "trace:dr",
-    [noadcodes.ord]             = "trace:db",
-    [noadcodes.bin]             = "trace:dg",
-    [noadcodes.open]            = "trace:dm",
-    [noadcodes.close]           = "trace:dm",
-    [noadcodes.punct]           = "trace:dc",
- -- [noadcodes.opdisplaylimits] = "",
- -- [noadcodes.oplimits]        = "",
- -- [noadcodes.opnolimits]      = "",
- -- [noadcodes.inner            = "",
- -- [noadcodes.under            = "",
- -- [noadcodes.over             = "",
- -- [noadcodes.vcenter          = "",
+    [noad_rel]             = "trace:dr",
+    [noad_ord]             = "trace:db",
+    [noad_bin]             = "trace:dg",
+    [noad_open]            = "trace:dm",
+    [noad_close]           = "trace:dm",
+    [noad_punct]           = "trace:dc",
+ -- [noad_opdisplaylimits] = "",
+ -- [noad_oplimits]        = "",
+ -- [noad_opnolimits]      = "",
+ -- [noad_inner            = "",
+ -- [noad_under            = "",
+ -- [noad_over             = "",
+ -- [noad_vcenter          = "",
 }
 
 classes[math_char] = function(pointer,what,n,parent)
@@ -1559,11 +1564,11 @@ do
     mathematics.domains = categories
 
     local permitted     = {
-        ordinary    = noadcodes.ord,
-        binary      = noadcodes.bin,
-        relation    = noadcodes.rel,
-        punctuation = noadcodes.punct,
-        inner       = noadcodes.inner,
+        ordinary    = noad_ord,
+        binary      = noad_bin,
+        relation    = noad_rel,
+        punctuation = noad_punct,
+        inner       = noad_inner,
     }
 
     function mathematics.registerdomain(data)
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index aca3000d8..23fac86da 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 188a7d8b5..9ecf10fdc 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/task-ini.lua b/tex/context/base/task-ini.lua
index b5c58b008..d941fa178 100644
--- a/tex/context/base/task-ini.lua
+++ b/tex/context/base/task-ini.lua
@@ -91,13 +91,13 @@ appendaction("shipouts",     "finishers",   "attributes.viewerlayers.handler")
 appendaction("math",         "normalizers", "noads.handlers.showtree",  nil, "nohead")
 
 appendaction("math",         "normalizers", "noads.handlers.unscript",  nil, "nohead")            -- always on (maybe disabled)
-appendaction("math",         "normalizers", "noads.handlers.domains",   nil, "nohead")            -- disabled
 appendaction("math",         "normalizers", "noads.handlers.variants",  nil, "nohead")            -- always on
 appendaction("math",         "normalizers", "noads.handlers.relocate",  nil, "nohead")            -- always on
 appendaction("math",         "normalizers", "noads.handlers.families",  nil, "nohead")            -- always on
 
 appendaction("math",         "normalizers", "noads.handlers.render",    nil, "nohead")            -- always on
-appendaction("math",         "normalizers", "noads.handlers.collapse",  nil, "nohead")            -- always on
+appendaction("math",         "normalizers", "noads.handlers.collapse",  nil, "nohead") -- * first -- always on
+appendaction("math",         "normalizers", "noads.handlers.domains",   nil, "nohead") -- * last  -- disabled
 appendaction("math",         "normalizers", "noads.handlers.autofences")               -- head !  -- always on
 appendaction("math",         "normalizers", "noads.handlers.resize",    nil, "nohead")            -- always on
 ------------("math",         "normalizers", "noads.handlers.respace",   nil, "nohead")            -- always on
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index ad2e985b8..07364248d 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  : 07/24/15 10:27:12
+-- merge date  : 07/24/15 11:32:23
 
 do -- begin closure to overcome local limits and interference