beta 2013.07.24 14:11

7 files changed, 58 insertions, 14 deletions

diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 096bd68e2..d77980ea4 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.24 13:41}
+\newcontextversion{2013.07.24 14:11}
 
 %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 845c06402..48e7e92d4 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 9574dcc6a..3d88a8a4b 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.24 13:41}
+\edef\contextversion{2013.07.24 14:11}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index c080184ad..d6a048831 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 fa056bf0b..feca5a6e1 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.24 13:41 MKIV beta  fmt: 2013.7.24  int: english/english
+ConTeXt  ver: 2013.07.24 14:11 MKIV beta  fmt: 2013.7.24  int: english/english
 
 system          > 'cont-new.mkiv' loaded
 (cont-new.mkiv)
diff --git a/tex/context/base/x-mathml.mkiv b/tex/context/base/x-mathml.mkiv
index b9a17d076..15c1694ff 100644
--- a/tex/context/base/x-mathml.mkiv
+++ b/tex/context/base/x-mathml.mkiv
@@ -2189,16 +2189,40 @@
 
 % todo: combine topaccent/over/bottomaccent/under check
 
-\definemathextensible [mathematics] [mml:overleftarrow]       ["2190] % ["27F5]
-\definemathextensible [mathematics] [mml:overrightarrow]      ["2192] % ["27F6]
-\definemathextensible [mathematics] [mml:overleftrightarrow]  ["27F7]
-\definemathextensible [mathematics] [mml:underleftarrow]      ["2190] % ["27F5]
-\definemathextensible [mathematics] [mml:underrightarrow]     ["2192] % ["27F6]
-\definemathextensible [mathematics] [mml:underleftrightarrow] ["27F7]
-
-\definemathtriplet    [mathematics] [mmlovertriplet]
-\definemathtriplet    [mathematics] [mmlundertriplet]
-\definemathtriplet    [mathematics] [mmldoubletriplet]
+\definemathextensible [\v!mathematics] [mml:overleftarrow]         ["2190] % ["27F5]
+\definemathextensible [\v!mathematics] [mml:overrightarrow]        ["2192] % ["27F6]
+\definemathextensible [\v!mathematics] [mml:overleftrightarrow]    ["27F7]
+\definemathextensible [\v!mathematics] [mml:overtwoheadrightarrow] ["27F9]
+\definemathextensible [\v!mathematics] [mml:overleftharpoondown]   ["21BD]
+\definemathextensible [\v!mathematics] [mml:overleftharpoonup]     ["21BC]
+\definemathextensible [\v!mathematics] [mml:overrightharpoondown]  ["21C1]
+\definemathextensible [\v!mathematics] [mml:overrightharpoonup]    ["21C0]
+
+\definemathextensible [\v!mathematics] [mml:underleftarrow]         ["2190] % ["27F5]
+\definemathextensible [\v!mathematics] [mml:underrightarrow]        ["2192] % ["27F6]
+\definemathextensible [\v!mathematics] [mml:underleftrightarrow]    ["27F7]
+\definemathextensible [\v!mathematics] [mml:undertwoheadrightarrow] ["27F9]
+\definemathextensible [\v!mathematics] [mml:underleftharpoondown]   ["21BD]
+\definemathextensible [\v!mathematics] [mml:underleftharpoonup]     ["21BC]
+\definemathextensible [\v!mathematics] [mml:underrightharpoondown]  ["21C1]
+\definemathextensible [\v!mathematics] [mml:underrightharpoonup]    ["21C0]
+
+\definemathtriplet   [\v!mathematics]  [mmlovertriplet]
+\definemathtriplet   [\v!mathematics]  [mmlundertriplet]
+\definemathtriplet   [\v!mathematics]  [mmldoubletriplet]
+
+% alternative:
+%
+% \definemathextensible [\v!mathematics] [mml:\utfchar{0x2190}] ["2190] % ["27F5]
+% \definemathextensible [\v!mathematics] [mml:\utfchar{0x2192}] ["2192] % ["27F6]
+% \definemathextensible [\v!mathematics] [mml:\utfchar{0x27F5}] ["2190] % ["27F5]
+% \definemathextensible [\v!mathematics] [mml:\utfchar{0x27F6}] ["2192] % ["27F6]
+% \definemathextensible [\v!mathematics] [mml:\utfchar{0x27F7}] ["27F7]
+% \definemathextensible [\v!mathematics] [mml:\utfchar{0x27F9}] ["27F9]
+% \definemathextensible [\v!mathematics] [mml:\utfchar{0x21BD}] ["21BD]
+% \definemathextensible [\v!mathematics] [mml:\utfchar{0x21BC}] ["21BC]
+% \definemathextensible [\v!mathematics] [mml:\utfchar{0x21C1}] ["21C1]
+% \definemathextensible [\v!mathematics] [mml:\utfchar{0x21C0}] ["21C0]
 
 \unexpanded\def\mmloverof#1{\mmlexecuteifdefined\mmlovercommand\relax{\mmlunexpandedfirst {#1}}\relax}
 \unexpanded\def\mmloveros#1{\mmlexecuteifdefined\mmlovercommand      {\mmlunexpandedsecond{#1}}\relax}
@@ -2224,6 +2248,26 @@
   % \limits % spoils spacing
 \stopxmlsetups
 
+% alternative:
+%
+% \startxmlsetups mml:mover
+%     \edef\mmlovertoken{\xmlraw{#1}{/mml:*[2]}}% /text()
+%     \doifelseutfmathabove\mmlovertoken {
+%         \edef\mmlovercommand{\utfmathcommandabove\mmlovertoken}
+%         \mmloverof{#1}
+%     } {
+%         \edef\mmlbasetoken{\xmlraw{#1}{/mml:*[1]/text()}}
+%         \ifcsname mml:\mmlbasetoken\endcsname
+%             \csname mml:\mmlbasetoken\endcsname{\mmlunexpandedsecond{#1}}\relax
+%         \else
+%             \edef\mmlbasecommand{\utfmathfiller\mmlbasetoken}
+%             \edef\mmlovercommand{\utfmathfiller\mmlovertoken}
+%             \mmlovertriplet{\mmloveros{#1}}{\mmloverbf{#1}}\relax
+%         \fi
+%     }
+%   % \limits % spoils spacing
+% \stopxmlsetups
+
 \unexpanded\def\mmlunderuf#1{\mmlexecuteifdefined\mmlundercommand\relax  {\mmlunexpandedfirst {#1}}\relax}
 \unexpanded\def\mmlunderus#1{\mmlexecuteifdefined\mmlundercommand        {\mmlunexpandedsecond{#1}}\relax}
 \unexpanded\def\mmlunderbf#1{\mmlexecuteifdefined\mmlbasecommand         {\mmlunexpandedfirst {#1}}\relax}
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 51e84d598..5b98b1938 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/13 13:41:05
+-- merge date  : 07/24/13 14:11:45
 
 do -- begin closure to overcome local limits and interference