beta 2013.07.23 09:41

9 files changed, 60 insertions, 98 deletions

diff --git a/tex/context/base/char-def.lua b/tex/context/base/char-def.lua
index 22c498ddd..86e6eef2a 100644
--- a/tex/context/base/char-def.lua
+++ b/tex/context/base/char-def.lua
@@ -74061,16 +74061,20 @@ characters.data={
  },
  [0x27F6]={
   category="sm",
+  comment="the parent hack is needed for mathml",
   description="LONG RIGHTWARDS ARROW",
   direction="on",
   linebreak="al",
   mathclass="relation",
   mathextensible="r",
+  mathfiller="rightarrowfill",
   mathname="longrightarrow",
+  mathparent=0x2192,
   unicodeslot=0x27F6,
  },
  [0x27F7]={
   category="sm",
+  comment="the parent hack is needed for mathml",
   description="LONG LEFT RIGHT ARROW",
   direction="on",
   linebreak="al",
@@ -74078,6 +74082,7 @@ characters.data={
   mathextensible="h",
   mathfiller="leftrightarrowfill",
   mathname="longleftrightarrow",
+  mathparent=0x2190,
   unicodeslot=0x27F7,
  },
  [0x27F8]={
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index dee646123..9968828a6 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.07.20 13:31}
+\newcontextversion{2013.07.23 09:41}
 
 %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 581fcb652..ff115de20 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 6cd2879c7..aba14e2f7 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.07.20 13:31}
+\edef\contextversion{2013.07.23 09:41}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/math-ini.lua b/tex/context/base/math-ini.lua
index 80d99d26d..a969ab414 100644
--- a/tex/context/base/math-ini.lua
+++ b/tex/context/base/math-ini.lua
@@ -335,6 +335,12 @@ local function utfmathaccent(chr,default,asked1,asked2)
             return true
         end
         local ms = cd.mathspec
+        if not ms then
+            local mp = cd.mathparent
+            if mp then
+                ms = chardata[mp].mathspec
+            end
+        end
         if ms then
             for i=1,#ms do
                 local msi = ms[i]
@@ -369,9 +375,6 @@ local function utfmathstretch(chr, default) -- "h", "v", "b", ""
 end
 
 local function utfmathcommand(chr,default,asked1,asked2)
---     local cd = chardata[utfbyte(chr)]
---     local cmd = cd and cd.mathname
---     return cmd or default or ""
     local cd = chardata[utfbyte(chr)]
     if not cd then
         return default or ""
@@ -383,12 +386,21 @@ local function utfmathcommand(chr,default,asked1,asked2)
             return mn
         end
         local ms = cd.mathspec
+        if not ms then
+            local mp = cd.mathparent
+            if mp then
+                ms = chardata[mp].mathspec
+            end
+        end
         if ms then
             for i=1,#ms do
                 local msi = ms[i]
                 local mn = msi.name
-                if mn and (msi.class == asked1 or msi.class == asked2) then
-                    return mn
+                if mn then
+                    local mc = msi.class
+                    if mc == asked1 or mc == asked2 then
+                        return mn
+                    end
                 end
             end
         end
@@ -437,11 +449,11 @@ function commands.utfmathcommandabove(asked) context(utfmathcommand(asked,nil,"t
 function commands.utfmathcommandbelow(asked) context(utfmathcommand(asked,nil,"botaccent","under")) end
 
 function commands.doifelseutfmathabove(chr)
-    commands.doifelse(utfmathaccent(chr,nil,asked,"topaccent","over"))
+    commands.doifelse(utfmathaccent(chr,nil,"topaccent","over"))
 end
 
 function commands.doifelseutfmathbelow(chr)
-    commands.doifelse(utfmathaccent(chr,nil,asked,"botaccent","under"))
+    commands.doifelse(utfmathaccent(chr,nil,"botaccent","under"))
 end
 
 -- helpers
diff --git a/tex/context/base/math-stc.mkvi b/tex/context/base/math-stc.mkvi
index 5a7ba85ec..943fcd710 100644
--- a/tex/context/base/math-stc.mkvi
+++ b/tex/context/base/math-stc.mkvi
@@ -660,8 +660,12 @@
 
 \definemathextensible [\v!reverse] [xrel]                ["002D]
 \definemathextensible [\v!reverse] [xequal]              ["003D]
-\definemathextensible [\v!reverse] [xleftarrow]          ["2190]
-\definemathextensible [\v!reverse] [xrightarrow]         ["2192]
+\definemathextensible [\v!reverse] [xleftarrow]          ["2190] % ["27F5]
+\definemathextensible [\v!reverse] [xrightarrow]         ["2192] % ["27F6]
+\definemathextensible [\v!reverse] [xleftrightarrow]     ["27F7]
+\definemathextensible [\v!reverse] [xLeftarrow]          ["27F8]
+\definemathextensible [\v!reverse] [xRightarrow]         ["27F9]
+\definemathextensible [\v!reverse] [xLeftrightarrow]     ["27FA]
 \definemathextensible [\v!reverse] [xtwoheadleftarrow]   ["219E]
 \definemathextensible [\v!reverse] [xtwoheadrightarrow]  ["21A0]
 \definemathextensible [\v!reverse] [xmapsto]             ["21A6]
@@ -675,15 +679,15 @@
 \definemathextensible [\v!reverse] [xleftrightharpoons]  ["21CB]
 \definemathextensible [\v!reverse] [xrightleftharpoons]  ["21CC]
 \definemathextensible [\v!reverse] [xtriplerel]          ["2261]
-\definemathextensible [\v!reverse] [xleftrightarrow]     ["27F7]
-\definemathextensible [\v!reverse] [xLeftarrow]          ["27F8]
-\definemathextensible [\v!reverse] [xRightarrow]         ["27F9]
-\definemathextensible [\v!reverse] [xLeftrightarrow]     ["27FA]
 
 \definemathextensible [\v!mathematics] [mrel]                ["002D]
 \definemathextensible [\v!mathematics] [mequal]              ["003D]
-\definemathextensible [\v!mathematics] [mleftarrow]          ["2190]
-\definemathextensible [\v!mathematics] [mrightarrow]         ["2192]
+\definemathextensible [\v!mathematics] [mleftarrow]          ["2190] % ["27F5]
+\definemathextensible [\v!mathematics] [mrightarrow]         ["2192] % ["27F6]
+\definemathextensible [\v!mathematics] [mleftrightarrow]     ["27F7]
+\definemathextensible [\v!mathematics] [mLeftarrow]          ["27F8]
+\definemathextensible [\v!mathematics] [mRightarrow]         ["27F9]
+\definemathextensible [\v!mathematics] [mLeftrightarrow]     ["27FA]
 \definemathextensible [\v!mathematics] [mtwoheadleftarrow]   ["219E]
 \definemathextensible [\v!mathematics] [mtwoheadrightarrow]  ["21A0]
 \definemathextensible [\v!mathematics] [mmapsto]             ["21A6]
@@ -697,18 +701,18 @@
 \definemathextensible [\v!mathematics] [mleftrightharpoons]  ["21CB]
 \definemathextensible [\v!mathematics] [mrightleftharpoons]  ["21CC]
 \definemathextensible [\v!mathematics] [mtriplerel]          ["2261]
-\definemathextensible [\v!mathematics] [mleftrightarrow]     ["27F7]
-\definemathextensible [\v!mathematics] [mLeftarrow]          ["27F8]
-\definemathextensible [\v!mathematics] [mRightarrow]         ["27F9]
-\definemathextensible [\v!mathematics] [mLeftrightarrow]     ["27FA]
 
 \definemathextensible [\v!text] [trel]                ["002D]
 \definemathextensible [\v!text] [tequal]              ["003D]
-\definemathextensible [\v!text] [tleftarrow]          ["2190]
-\definemathextensible [\v!text] [trightarrow]         ["2192]
+\definemathextensible [\v!text] [tmapsto]             ["21A6]
+\definemathextensible [\v!text] [tleftarrow]          ["2190] % ["27F5]
+\definemathextensible [\v!text] [trightarrow]         ["2192] % ["27F6]
+\definemathextensible [\v!text] [tleftrightarrow]     ["27F7]
+\definemathextensible [\v!text] [tLeftarrow]          ["27F8]
+\definemathextensible [\v!text] [tRightarrow]         ["27F9]
+\definemathextensible [\v!text] [tLeftrightarrow]     ["27FA]
 \definemathextensible [\v!text] [ttwoheadleftarrow]   ["219E]
 \definemathextensible [\v!text] [ttwoheadrightarrow]  ["21A0]
-\definemathextensible [\v!text] [tmapsto]             ["21A6]
 \definemathextensible [\v!text] [thookleftarrow]      ["21A9]
 \definemathextensible [\v!text] [thookrightarrow]     ["21AA]
 \definemathextensible [\v!text] [tleftharpoondown]    ["21BD]
@@ -719,30 +723,26 @@
 \definemathextensible [\v!text] [tleftrightharpoons]  ["21CB]
 \definemathextensible [\v!text] [trightleftharpoons]  ["21CC]
 \definemathextensible [\v!text] [ttriplerel]          ["2261]
-\definemathextensible [\v!text] [tleftrightarrow]     ["27F7]
-\definemathextensible [\v!text] [tLeftarrow]          ["27F8]
-\definemathextensible [\v!text] [tRightarrow]         ["27F9]
-\definemathextensible [\v!text] [tLeftrightarrow]     ["27FA]
 
-\definemathoverextensible [\v!top] [overleftarrow]         ["2190]
-\definemathoverextensible [\v!top] [overrightarrow]        ["2192]
+\definemathoverextensible [\v!top] [overleftarrow]         ["2190] % ["27F5]
+\definemathoverextensible [\v!top] [overrightarrow]        ["2192] % ["27F6]
+\definemathoverextensible [\v!top] [overleftrightarrow]    ["27F7]
+\definemathoverextensible [\v!top] [overtwoheadleftarrow]  ["27F8]
+\definemathoverextensible [\v!top] [overtwoheadrightarrow] ["27F9]
 \definemathoverextensible [\v!top] [overleftharpoondown]   ["21BD]
 \definemathoverextensible [\v!top] [overleftharpoonup]     ["21BC]
 \definemathoverextensible [\v!top] [overrightharpoondown]  ["21C1]
 \definemathoverextensible [\v!top] [overrightharpoonup]    ["21C0]
-\definemathoverextensible [\v!top] [overleftrightarrow]    ["27F7]
-\definemathoverextensible [\v!top] [overtwoheadleftarrow]  ["27F8]
-\definemathoverextensible [\v!top] [overtwoheadrightarrow] ["27F9]
 
-\definemathunderextensible [\v!bottom] [underleftarrow]         ["2190]
-\definemathunderextensible [\v!bottom] [underrightarrow]        ["2192]
+\definemathunderextensible [\v!bottom] [underleftarrow]         ["2190] % ["27F5]
+\definemathunderextensible [\v!bottom] [underrightarrow]        ["2192] % ["27F6]
+\definemathunderextensible [\v!bottom] [underleftrightarrow]    ["27F7]
+\definemathunderextensible [\v!bottom] [undertwoheadleftarrow]  ["27F8]
+\definemathunderextensible [\v!bottom] [undertwoheadrightarrow] ["27F9]
 \definemathunderextensible [\v!bottom] [underleftharpoondown]   ["21BD]
 \definemathunderextensible [\v!bottom] [underleftharpoonup]     ["21BC]
 \definemathunderextensible [\v!bottom] [underrightharpoondown]  ["21C1]
 \definemathunderextensible [\v!bottom] [underrightharpoonup]    ["21C0]
-\definemathunderextensible [\v!bottom] [underleftrightarrow]    ["27F7]
-\definemathunderextensible [\v!bottom] [undertwoheadleftarrow]  ["27F8]
-\definemathunderextensible [\v!bottom] [undertwoheadrightarrow] ["27F9]
 
 % We don't use overline and underline. This is one of the overlooked aspects of
 % unicode cq. opentype math: why treat rules different than e.g. arrows and
@@ -806,7 +806,7 @@
       #3%
       \endgroup}}
 
-% These will be defined in char-def as well:
+% These will be defined in char-def as well once we have \leaders<number>
 
 \unexpanded\def\rightarrowfill        {\math_stackers_hacked_fill \relbar                   \relbar                      \rightarrow}
 \unexpanded\def\leftarrowfill         {\math_stackers_hacked_fill \leftarrow                \relbar                      \relbar    }
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 589c2b66b..da2053120 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
diff --git a/tex/context/base/status-lua.log b/tex/context/base/status-lua.log
index 2fa958598..4270c47c4 100644
--- a/tex/context/base/status-lua.log
+++ b/tex/context/base/status-lua.log
@@ -1,6 +1,6 @@
 (cont-yes.mkiv
 
-ConTeXt  ver: 2013.07.20 13:31 MKIV beta  fmt: 2013.7.20  int: english/english
+ConTeXt  ver: 2013.07.23 09:41 MKIV beta  fmt: 2013.7.23  int: english/english
 
 system          > 'cont-new.mkiv' loaded
 (cont-new.mkiv)
@@ -13,24 +13,7 @@ interface       > macros > processed mkvi file 'c:/data/develop/context/sources/
 system          > files > jobname 's-inf-03', input './s-inf-03.mkiv', result 'status-lua.pdf'
 fonts           > latin modern fonts are not preloaded
 languages       > language 'en' is active
-(c:/data/develop/context/texmf/tex/context/base/s-inf-03.mkiv (c:/data/develop/context/sources/type-loc.mkiv) (type-imp-dejavu.mkiv) (type-imp-xits.mkiv (type-imp-texgyre.mkiv))
-fonts           > otf loading > loading 'c:/data/develop/tex-context/tex/texmf/fonts/truetype/public/dejavu/DejaVuSansMono.ttf', hash 'dejavusansmono'
-fonts           > otf loading > loading done
-fonts           > otf loading > file size: 333636
-fonts           > encoding > loading (extended) adobe glyph list
-fonts           > otf loading > saving 'c:/data/develop/tex-context/tex/texmf/fonts/truetype/public/dejavu/DejaVuSansMono.ttf' in cache
-system          > lua > compiling 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/dejavusansmono.tma' into 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/dejavusansmono.tmc'
-system          > lua > dumping 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/dejavusansmono.tma' into 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/dejavusansmono.tmc' stripped
-fonts           > otf loading > preprocessing and caching time 0.219, packtime 0.031
-{c:/data/develop/tex-context/tex/texmf-context/fonts/map/pdftex/context/mkiv-base.map}
-fonts           > otf loading > loading 'c:/data/develop/tex-context/tex/texmf/fonts/truetype/public/dejavu/DejaVuSansMono-Bold.ttf', hash 'dejavusansmono-bold'
-fonts           > otf loading > loading done
-fonts           > otf loading > file size: 313856
-fonts           > otf loading > saving 'c:/data/develop/tex-context/tex/texmf/fonts/truetype/public/dejavu/DejaVuSansMono-Bold.ttf' in cache
-system          > lua > compiling 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/dejavusansmono-bold.tma' into 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/dejavusansmono-bold.tmc'
-system          > lua > dumping 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/dejavusansmono-bold.tma' into 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/dejavusansmono-bold.tmc' stripped
-fonts           > otf loading > preprocessing and caching time 0.203, packtime 0.016
-(virtual://buffer.noname.1
+(c:/data/develop/context/texmf/tex/context/base/s-inf-03.mkiv (c:/data/develop/context/sources/type-loc.mkiv) (type-imp-dejavu.mkiv) (type-imp-xits.mkiv (type-imp-texgyre.mkiv)){c:/data/develop/tex-context/tex/texmf-context/fonts/map/pdftex/context/mkiv-base.map} (virtual://buffer.noname.1
 references      > unknown reference '[][]'
 references      > unknown reference '[][attributes]'
 references      > unknown reference '[][backends]'
@@ -92,42 +75,4 @@ references      > unknown reference '[][mathematics]'
 references      > unknown reference '[][mbox]'
 references      > unknown reference '[][md5]'
 references      > unknown reference '[][metapost]'
-references      > unknown reference '[][mime]'
-references      > unknown reference '[][moduledata]'
-references      > unknown reference '[][modules]'
-references      > unknown reference '[][mplib]'
-references      > unknown reference '[][noads]'
-references      > unknown reference '[][node]'
-references      > unknown reference '[][nodes]'
-references      > unknown reference '[][number]'
-references      > unknown reference '[][os]'
-references      > unknown reference '[][package]'
-references      > unknown reference '[][pagebuilders]'
-references      > unknown reference '[][parametersets]'
-references      > unknown reference '[][pdf]'
-references      > unknown reference '[][pdfscanner]'
-references      > unknown reference '[][physics]'
-references      > unknown reference '[][profiler]'
-references      > unknown reference '[][regimes]'
-references      > unknown reference '[][resolvers]'
-references      > unknown reference '[][scripts]'
-references      > unknown reference '[][set]'
-references      > unknown reference '[][socket]'
-references      > unknown reference '[][sorters]'
-references      > unknown reference '[][statistics]'
-references      > unknown reference '[][status]'
-references      > unknown reference '[][storage]'
-references      > unknown reference '[][streams]'
-references      > unknown reference '[][string]'
-references      > unknown reference '[][structures]'
-references      > unknown reference '[][table]'
-references      > unknown reference '[][tex]'
-references      > unknown reference '[][texconfig]'
-references      > unknown reference '[][texio]'
-references      > unknown reference '[][thirddata]'
-references      > unknown reference '[][token]'
-references      > unknown reference '[][tokens]'
-references      > unknown reference '[][tracers]'
-references      > unknown reference '[][trackers]'
-references      > unknown reference '[][typesetters]'
-references
\ No newline at end of file
+references      > unknown reference '[][mime]'
\ No newline at end of file
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 399135592..a904feeea 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/20/13 13:31:51
+-- merge date  : 07/23/13 09:41:21
 
 do -- begin closure to overcome local limits and interference