beta 2013.06.04 21:26

7 files changed, 48 insertions, 5 deletions

diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index fd400605a..07722a1be 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.06.04 20:27}
+\newcontextversion{2013.06.04 21:26}
 
 %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 60cf247f9..3a764f786 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 4e614882e..3f1d04775 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.06.04 20:27}
+\edef\contextversion{2013.06.04 21:26}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/math-frc.mkiv b/tex/context/base/math-frc.mkiv
index e11e79e82..65fa30942 100644
--- a/tex/context/base/math-frc.mkiv
+++ b/tex/context/base/math-frc.mkiv
@@ -102,6 +102,7 @@
 \setupmathfractions
   [\c!mathstyle=,
    \c!alternative=\v!inner,
+   \c!margin=\zeropoint,
    \c!rulethickness=.25\exheight,
    \c!left=0x2E,
    \c!right=0x2E,
@@ -111,9 +112,12 @@
     \setuevalue{\currentmathfraction}{\math_frac{\currentmathfraction}}%
 \to \everydefinemathfraction
 
+\newdimen\d_math_fraction_margin
+
 \unexpanded\def\math_frac#1%
   {\begingroup
    \edef\currentmathfraction{#1}%
+   \d_math_fraction_margin\mathfractionparameter\c!margin
    \edef\p_math_fractions_color{\mathfractionparameter\c!color}%
    \ifx\p_math_fractions_color\empty
      \expandafter\math_frac_normal
@@ -139,19 +143,58 @@
     \number\dimexpr\mathfractionparameter\c!rulethickness%
   )}}
 
-\setvalue{\??mathfractionalternative\v!inner}#1#2%
+% Having a \withmarginornot{#1}{#2} makes not much sense nor do
+% 4 tests or 4 redundant kerns (longer node lists plus possible
+% interference). A split in normal and margin also makes testing
+% easier. When left and right margins are needed we might merge
+% the variants again. After all, these are not real installers.
+
+\setvalue{\??mathfractionalternative\v!inner}%
+  {\ifcase\d_math_fraction_margin
+      \expandafter\math_fraction_inner_normal
+   \else
+      \expandafter\math_fraction_inner_margin
+   \fi}
+
+\def\math_fraction_inner_normal#1#2%
   {\Ustack{%
      {\usemathstyleparameter\mathfractionparameter{#1}}% we should store this one
      \math_frac_command
      {\usemathstyleparameter\mathfractionparameter{#2}}% and reuse it here
    }\endgroup}
 
-\setvalue{\??mathfractionalternative\v!outer}#1#2%
+\def\math_fraction_inner_margin#1#2%
+  {\Ustack{%
+     {\kern\d_math_fraction_margin
+      \usemathstyleparameter\mathfractionparameter{#1}% we should store this one
+      \kern\d_math_fraction_margin}%
+     \math_frac_command
+     {\kern\d_math_fraction_margin
+      \usemathstyleparameter\mathfractionparameter{#2}% and reuse it here
+      \kern\d_math_fraction_margin}%
+   }\endgroup}
+
+\setvalue{\??mathfractionalternative\v!outer}%
+  {\ifcase\d_math_fraction_margin
+      \expandafter\math_fraction_outer_normal
+   \else
+      \expandafter\math_fraction_outer_margin
+   \fi}
+
+\def\math_fraction_outer_normal#1#2%
   {\Ustack{%
      \usemathstyleparameter\mathfractionparameter
      {{#1}\math_frac_command{#2}}%
    }\endgroup}
 
+\def\math_fraction_outer_margin#1#2%
+  {\Ustack{%
+     \usemathstyleparameter\mathfractionparameter
+     {{\kern\d_math_fraction_margin#1\kern\d_math_fraction_margin}%
+      \math_frac_command
+      {\kern\d_math_fraction_margin#2\kern\d_math_fraction_margin}}%
+   }\endgroup}
+
 \definemathfraction[frac][\c!mathstyle=]
 
 \unexpanded\def\xfrac {\begingroup\let\xfrac\xxfrac\math_frac_alternative\scriptstyle}
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 6f130e506..7d9361d3e 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 f45bf9b08..b1227609f 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 183a32d39..0c51568e0 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  : 06/04/13 20:27:13
+-- merge date  : 06/04/13 21:26:55
 
 do -- begin closure to overcome local limits and interference