12 files changed, 100 insertions, 74 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 6ee88f2f5..7576a8c48 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.08.30 02:05}
+\newcontextversion{2013.08.30 13:54}
 
 %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 bac9fd8d7..b66a85c8d 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 f790d3ce0..5837a7f47 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.08.30 02:05}
+\edef\contextversion{2013.08.30 13:54}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/math-ali.mkiv b/tex/context/base/math-ali.mkiv
index db960de26..911a0d430 100644
--- a/tex/context/base/math-ali.mkiv
+++ b/tex/context/base/math-ali.mkiv
@@ -25,7 +25,7 @@
 %D Modules may provide additional alignment features. The following
 %D mechanisms are provided by the core.
 
-% n>1 #### needed, strange # interaction in recurse
+% n>1 ### needed, strange # interaction in recurse
 
 \newtoks\c_math_align_a
 \newtoks\c_math_align_b
@@ -39,9 +39,9 @@
 \def\math_build_eqalign_step
   {\ifnum\recurselevel>\plusone
     %\appendtoks
-    %  \tabskip\mathalignmentparameter\c!distance&\tabskip\zeropoint
+    %  \tabskip\mathalignmentparameter\c!distance\aligntab\tabskip\zeropoint
     %\to\scratchtoks
-     \scratchtoks\expandafter{\the\scratchtoks\tabskip\mathalignmentparameter\c!distance&\tabskip\zeropoint}%
+     \scratchtoks\expandafter{\the\scratchtoks\tabskip\mathalignmentparameter\c!distance\aligntab\tabskip\zeropoint}%
    \fi
    \normalexpanded{\scratchtoks{\the\scratchtoks\the\c_math_align_a}}%
    \dorecurse{\numexpr\mathalignmentparameter\c!n-\plusone\relax}
@@ -56,9 +56,9 @@
   {\emptyhbox
    \mskip\thinmuskip
    \vcenter
-     {\openup\displayopenupvalue % was: \openup\jot
+     {\math_openup\displayopenupvalue % was: \openup\jot
       \mathsurround\zeropoint
-      \ialign{\strut\hfil$\displaystyle{##}$&$\displaystyle{{}##{}}$\hfil\crcr#1\crcr}}%
+      \ialign{\strut\hfil$\displaystyle{\alignmark\alignmark}$\aligntab$\displaystyle{{}\alignmark\alignmark{}}$\hfil\crcr#1\crcr}}%
    \mskip\thinmuskip}
 
 % preamble is scanned for tabskips so we need the span to prevent an error message
@@ -68,14 +68,14 @@
 % use zeroskipplusfill
 
 \def\math_prepare_r_eqalign_no
-  {\c_math_align_a{\strut\math_first_in_eqalign\hfil\math_left_of_equalign\span\math_math_in_eqalign{##}\math_right_of_eqalign\tabskip\zeropoint}%
-   \c_math_align_b{&\math_next_in_eqalign\math_left_of_equalign\span\math_math_in_eqalign{##}\math_right_of_eqalign\tabskip\zeropoint}%
+  {\c_math_align_a{\strut\math_first_in_eqalign\hfil\math_left_of_equalign\span\math_math_in_eqalign{\alignmark\alignmark}\math_right_of_eqalign\tabskip\zeropoint}%
+   \c_math_align_b{\aligntab\math_next_in_eqalign\math_left_of_equalign\span\math_math_in_eqalign{\alignmark\alignmark}\math_right_of_eqalign\tabskip\zeropoint}%
    \ifnum\mathraggedstatus=\plusone
-     \c_math_align_c{\hfil&\span\math_text_in_eqalign{##}\tabskip\zeropoint}%
+     \c_math_align_c{\hfil\aligntab\span\math_text_in_eqalign{\alignmark\alignmark}\tabskip\zeropoint}%
    \else\ifnum\mathraggedstatus=\plusthree
-     \c_math_align_c{\hfil\tabskip\zeropoint\s!plus 1\s!fill&\span\math_text_in_eqalign{##}\tabskip\zeropoint}%
+     \c_math_align_c{\hfil\tabskip\zeropoint\s!plus 1\s!fill\aligntab\span\math_text_in_eqalign{\alignmark\alignmark}\tabskip\zeropoint}%
    \else
-     \c_math_align_c{\hfil\tabskip\centering&\llap{\span\math_text_in_eqalign{##}}\tabskip\zeropoint}%
+     \c_math_align_c{\hfil\tabskip\centering\aligntab\llap{\span\math_text_in_eqalign{\alignmark\alignmark}}\tabskip\zeropoint}%
    \fi\fi
    \global\mathnumberstatus\zerocount
    \math_build_eqalign
@@ -83,15 +83,15 @@
    \tabskip\centering}
 
 \def\math_prepare_l_eqalign_no
-  {\c_math_align_a{\strut\math_first_in_eqalign\hfil\math_left_of_equalign\span\math_math_in_eqalign{##}\math_right_of_eqalign\tabskip\zeropoint}%
-   \c_math_align_b{&\math_next_in_eqalign\math_left_of_equalign\span\math_math_in_eqalign{##}\math_right_of_eqalign\tabskip\zeropoint}%
+  {\c_math_align_a{\strut\math_first_in_eqalign\hfil\math_left_of_equalign\span\math_math_in_eqalign{\alignmark\alignmark}\math_right_of_eqalign\tabskip\zeropoint}%
+   \c_math_align_b{\aligntab\math_next_in_eqalign\math_left_of_equalign\span\math_math_in_eqalign{\alignmark\alignmark}\math_right_of_eqalign\tabskip\zeropoint}%
    % problem: number is handled after rest and so ends up in the margin
    \ifnum\mathraggedstatus=\plusone
-     \c_math_align_c{\hfil&\kern-\displaywidth\rlap{\span\math_text_in_eqalign{##}}\tabskip\displaywidth}%
+     \c_math_align_c{\hfil\aligntab\kern-\displaywidth\rlap{\span\math_text_in_eqalign{\alignmark\alignmark}}\tabskip\displaywidth}%
    \else\ifnum\mathraggedstatus=\plusthree
-     \c_math_align_c{\hfil\tabskip\zeropoint\s!plus 1\s!fill&\kern-\displaywidth\span\math_rlap{\span\math_text_in_eqalign{##}}\tabskip\displaywidth}%
+     \c_math_align_c{\hfil\tabskip\zeropoint\s!plus 1\s!fill\aligntab\kern-\displaywidth\span\math_rlap{\span\math_text_in_eqalign{\alignmark\alignmark}}\tabskip\displaywidth}%
    \else
-     \c_math_align_c{\hfil\tabskip\centering&\kern-\displaywidth\rlap{\span\math_text_in_eqalign{##}}\tabskip\displaywidth}%
+     \c_math_align_c{\hfil\tabskip\centering\aligntab\kern-\displaywidth\rlap{\span\math_text_in_eqalign{\alignmark\alignmark}}\tabskip\displaywidth}%
    \fi\fi
    \global\mathnumberstatus\zerocount
    \math_build_eqalign
@@ -192,7 +192,7 @@
    \c_math_eqalign_column\zerocount
    \processcommacommand
      [\mathalignmentparameter\c!align]
-     {\advance\c_math_eqalign_column\plusone\doseteqaligncolumn}% takes argument
+     {\advance\c_math_eqalign_column\plusone\math_eqalign_set_column}% takes argument
    \global\c_math_eqalign_column\plusone
    \dostarttagged\t!math\empty
    \dostarttagged\t!mathtable\currentmathalignment
@@ -286,7 +286,7 @@
      \fi
    \fi}
 
-\def\doseteqaligncolumn#1% we could just add to the preamble (as with other alignments)
+\def\math_eqalign_set_column#1% we could just add to the preamble (as with other alignments)
   {\expandafter\let\csname\??mathalignmentvariant\number\c_math_eqalign_column\expandafter\endcsname
      \csname\??mathalignmentvariant\ifcsname\??mathalignmentvariant#1\endcsname#1\else\v!normal\fi\endcsname}
 
@@ -594,6 +594,8 @@
     \setvalue  {\e!stop \currentmathmatrix}{\math_matrix_stop}% no u else lookahead problem
 \to \everydefinemathmatrix
 
+\let\math_matrix_NC\relax
+
 \unexpanded\def\math_matrix_start#1%
   {\begingroup
    \edef\currentmathmatrix{#1}%
@@ -607,12 +609,12 @@
    \math_matrix_align_method_analyze
    \mathmatrixleft
    \mathmatrixbox\bgroup
-   \pushmacro\domatrixNC
+   \pushmacro\math_matrix_NC
    \let\endmath\relax
-   \def\NC{\domatrixNC}%
-   \def\MC{\domatrixNC\ifmmode\else$\def\endmath{$}\fi}%
-   \global\let\domatrixNC\dodomatrixNC
-   \def\NR{\endmath\global\let\domatrixNC\dodomatrixNC\crcr}%
+   \def\NC{\math_matrix_NC}%
+   \def\MC{\math_matrix_NC\ifmmode\else\startimath\let\endmath\stopimath\fi}%
+   \global\let\math_matrix_NC\math_matrix_NC_indeed
+   \def\NR{\endmath\global\let\math_matrix_NC\math_matrix_NC_indeed\crcr}%
    \normalbaselines
    \mathsurround\zeropoint
    \everycr\emptytoks
@@ -620,8 +622,8 @@
    \c_math_eqalign_column\zerocount
    \processcommacommand
      [\mathmatrixparameter\c!align]
-     {\advance\c_math_eqalign_column\plusone\doseteqaligncolumn}% was \dosetmatrixcolumn
-   \scratchcounter=\ifnum\c_math_eqalign_column>\zerocount \c_math_eqalign_column \else \plusone \fi
+     {\advance\c_math_eqalign_column\plusone\math_eqalign_set_column}%
+   \scratchcounter\ifnum\c_math_eqalign_column>\zerocount \c_math_eqalign_column \else \plusone \fi
    \global\c_math_eqalign_column\plusone
    \math_matrix_prepare}
 
@@ -630,7 +632,7 @@
    \mathstrut\crcr
    \noalign{\kern-\baselineskip}%
    \egroup
-   \popmacro\domatrixNC
+   \popmacro\math_matrix_NC
    \egroup
    \mathmatrixright
    \endgroup}
@@ -640,13 +642,13 @@
 
 \def\math_matrix_prepare
   {\c_math_align_a{\strut\math_first_in_eqalign\math_left_of_equalign\span
-            \math_text_in_eqalign{\mathmatrixparameter\c!style##}\math_right_of_eqalign}%
-   \c_math_align_b{&\hskip\mathmatrixparameter\c!distance
+            \math_text_in_eqalign{\mathmatrixparameter\c!style\alignmark\alignmark}\math_right_of_eqalign}%
+   \c_math_align_b{\aligntab\hskip\mathmatrixparameter\c!distance
             \math_next_in_eqalign\math_left_of_equalign\span
-            \math_text_in_eqalign{\mathmatrixparameter\c!style##}\math_right_of_eqalign}%
-   \c_math_align_c{&&\hskip\mathmatrixparameter\c!distance
+            \math_text_in_eqalign{\mathmatrixparameter\c!style\alignmark\alignmark}\math_right_of_eqalign}%
+   \c_math_align_c{\aligntab\aligntab\hskip\mathmatrixparameter\c!distance
             \math_left_of_equalign\span
-            \math_text_in_eqalign{\mathmatrixparameter\c!style##}\math_right_of_eqalign}%
+            \math_text_in_eqalign{\mathmatrixparameter\c!style\alignmark\alignmark}\math_right_of_eqalign}%
    \scratchtoks\emptytoks
    \normalexpanded{\scratchtoks{\the\scratchtoks\the\c_math_align_a}}%
    \dorecurse{\numexpr\scratchcounter-\plusone\relax}
@@ -654,8 +656,8 @@
    \normalexpanded{\scratchtoks{\the\scratchtoks\the\c_math_align_c}}%
    \halign \expandafter \bgroup\the\scratchtoks \crcr}
 
-\unexpanded\def\dodomatrixNC
-  {\gdef\domatrixNC{\endmath&}}
+\unexpanded\def\math_matrix_NC_indeed
+  {\gdef\math_matrix_NC{\endmath\aligntab}}
 
 \installcorenamespace{mathmatrixalignmethod}
 
@@ -877,16 +879,16 @@
    \lineskip\mathstackvgap
    \lineskiplimit\lineskip
    \let\stopmathmode\relax
-   \def\NC{\domatrixNC}%
-   \def\MC{\domatrixNC\startmathmode}%
-   \global\let\domatrixNC\dodomatrixNC
+   \def\NC{\math_matrix_NC}%
+   \def\MC{\math_matrix_NC\startmathmode}%
+   \global\let\math_matrix_NC\math_matrix_NC_indeed
    \def\NR
      {\stopmathmode
-      \global\let\domatrixNC\dodomatrixNC
+      \global\let\math_matrix_NC\math_matrix_NC_indeed
       \crcr}%
    \mathsurround\zeropoint
    \everycr\emptytoks
-   \halign\bgroup\hfil$\scriptstyle##$\hfil\crcr}
+   \halign\bgroup\hfil$\scriptstyle\alignmark\alignmark$\hfil\crcr}
 
 \def\stopsubstack
   {\crcr
diff --git a/tex/context/base/math-ini.mkiv b/tex/context/base/math-ini.mkiv
index 0ef206075..7b2766c45 100644
--- a/tex/context/base/math-ini.mkiv
+++ b/tex/context/base/math-ini.mkiv
@@ -1660,7 +1660,7 @@
 %
 % \def\displ@y
 %   {\global\dt@ptrue
-%    \openup\displayopenupvalue % was \openup\jot
+%    \math_openup\displayopenupvalue % was \openup\jot
 %    \everycr
 %      {\noalign
 %         {\ifdt@p
@@ -1681,7 +1681,7 @@
 
 \unexpanded\def\math_display_align_hack % I don't like the global, maybe we should push and pop
   {\global\let\math_display_align_hack_indeed\math_display_align_hack_remove_skip
-   \openup\displayopenupvalue % was \openup\jot
+   \math_openup\displayopenupvalue % was \math_openup\jot
    \everycr{\noalign{\math_display_align_hack_indeed}}}
 
 \def\math_display_align_hack_remove_skip
diff --git a/tex/context/base/math-map.lua b/tex/context/base/math-map.lua
index 3d9ae23f4..8d301ac33 100644
--- a/tex/context/base/math-map.lua
+++ b/tex/context/base/math-map.lua
@@ -60,30 +60,30 @@ local mathematics         = mathematics
 -- it otherwise.
 
 mathematics.gaps = {
-    [0x1D455] = 0x0210E, -- H
-    [0x1D49D] = 0x0212C, -- script B
-    [0x1D4A0] = 0x02130, -- script E
-    [0x1D4A1] = 0x02131, -- script F
-    [0x1D4A3] = 0x0210B, -- script H
-    [0x1D4A4] = 0x02110, -- script I
-    [0x1D4A7] = 0x02112, -- script L
-    [0x1D4A8] = 0x02133, -- script M
-    [0x1D4AD] = 0x0211B, -- script R
-    [0x1D4BA] = 0x0212F, -- script e
-    [0x1D4BC] = 0x0210A, -- script g
-    [0x1D4C4] = 0x02134, -- script o
-    [0x1D506] = 0x0212D, -- fraktur C
-    [0x1D50B] = 0x0210C, -- fraktur H
-    [0x1D50C] = 0x02111, -- fraktur I
-    [0x1D515] = 0x0211C, -- fraktur R
-    [0x1D51D] = 0x02128, -- fraktur Z
-    [0x1D53A] = 0x02102, -- bb C
-    [0x1D53F] = 0x0210D, -- bb H
-    [0x1D545] = 0x02115, -- bb N
-    [0x1D547] = 0x02119, -- bb P
-    [0x1D548] = 0x0211A, -- bb Q
-    [0x1D549] = 0x0211D, -- bb R
-    [0x1D551] = 0x02124, -- bb Z
+    [0x1D455] = 0x0210E, -- ℎ h
+    [0x1D49D] = 0x0212C, -- ℬ script B
+    [0x1D4A0] = 0x02130, -- ℰ script E
+    [0x1D4A1] = 0x02131, -- ℱ script F
+    [0x1D4A3] = 0x0210B, -- ℋ script H
+    [0x1D4A4] = 0x02110, -- ℐ script I
+    [0x1D4A7] = 0x02112, -- ℒ script L
+    [0x1D4A8] = 0x02133, -- ℳ script M
+    [0x1D4AD] = 0x0211B, -- ℛ script R
+    [0x1D4BA] = 0x0212F, -- ℯ script e
+    [0x1D4BC] = 0x0210A, -- ℊ script g
+    [0x1D4C4] = 0x02134, -- ℴ script o
+    [0x1D506] = 0x0212D, -- ℭ fraktur C
+    [0x1D50B] = 0x0210C, -- ℌ fraktur H
+    [0x1D50C] = 0x02111, -- ℑ fraktur I
+    [0x1D515] = 0x0211C, -- ℜ fraktur R
+    [0x1D51D] = 0x02128, -- ℨ fraktur Z
+    [0x1D53A] = 0x02102, -- ℂ bb C
+    [0x1D53F] = 0x0210D, -- ℍ bb H
+    [0x1D545] = 0x02115, -- ℕ bb N
+    [0x1D547] = 0x02119, -- ℙ bb P
+    [0x1D548] = 0x0211A, -- ℚ bb Q
+    [0x1D549] = 0x0211D, -- ℝ bb R
+    [0x1D551] = 0x02124, -- ℤ bb Z
 }
 
 local function fillinmathgaps(tfmdata,key,value)
diff --git a/tex/context/base/math-pln.mkiv b/tex/context/base/math-pln.mkiv
index b862bb4cb..5e4c43c81 100644
--- a/tex/context/base/math-pln.mkiv
+++ b/tex/context/base/math-pln.mkiv
@@ -87,13 +87,31 @@
 \unexpanded\def\pmatrix#1%
   {\left(\matrix{#1}\right)}
 
-\unexpanded\def\openup
-  {\afterassignment\math_openup\scratchdimen=}
-
-\def\math_openup
-  {\advance\lineskip     \scratchdimen
-   \advance\baselineskip \scratchdimen
-   \advance\lineskiplimit\scratchdimen}
+% \unexpanded\def\openup
+%   {\afterassignment\math_openup\scratchdimen=}
+%
+% \def\math_openup
+%   {\advance\lineskip     \scratchdimen
+%    \advance\baselineskip \scratchdimen
+%    \advance\lineskiplimit\scratchdimen}
+
+\let\math_closeup\relax
+
+\unexpanded\def\math_openup
+  {\afterassignment\math_openup_indeed\scratchdimen}
+
+\def\math_openup_indeed
+  {\unexpanded\edef\math_closeup
+     {\lineskip     \the\lineskip
+      \baselineskip \the\baselineskip
+      \lineskiplimit\the\lineskiplimit
+      \relax}%
+   \advance \lineskip      \scratchdimen
+   \advance \baselineskip  \scratchdimen
+   \advance \lineskiplimit \scratchdimen}
+
+\let\openup  \math_openup
+\def\closeup{\math_closeup} % dynamic
 
 \unexpanded\def\displaylines#1%
   {\the\mathdisplayaligntweaks
diff --git a/tex/context/base/mult-low.lua b/tex/context/base/mult-low.lua
index 1e6d407cc..48e262578 100644
--- a/tex/context/base/mult-low.lua
+++ b/tex/context/base/mult-low.lua
@@ -186,6 +186,8 @@ return {
         "scratchtoks", "globalscratchtoks",
         "scratchbox", "globalscratchbox",
         --
+        "normalbaselineskip", "normallineskip", "normallineskiplimit",
+        --
         "availablehsize", "localhsize", "setlocalhsize",
         --
         "nextbox", "dowithnextbox", "dowithnextboxcs", "dowithnextboxcontent", "dowithnextboxcontentcs",
diff --git a/tex/context/base/spac-ver.mkiv b/tex/context/base/spac-ver.mkiv
index 3b60c28bb..f535a59f6 100644
--- a/tex/context/base/spac-ver.mkiv
+++ b/tex/context/base/spac-ver.mkiv
@@ -715,6 +715,10 @@
 \unexpanded\def\setmaxdepth
   {\maxdepth\systemmaxdepthfactor\globalbodyfontsize}
 
+\let\normalbaselineskip \relax \newskip \normalbaselineskip  % these got lost in the transition to mkiv due
+\let\normallineskip     \relax \newskip \normallineskip      % to auto-\normal* definitions and registers
+\let\normallineskiplimit\relax \newdimen\normallineskiplimit % being protected
+
 \unexpanded\def\normalbaselines
   {\baselineskip \normalbaselineskip
    \lineskip     \normallineskip
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 3d3141a9d..4c9813bb0 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 ad4439c3e..ee670733e 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.08.30 02:05 MKIV beta  fmt: 2013.8.30  int: english/english
+ConTeXt  ver: 2013.08.30 13:54 MKIV beta  fmt: 2013.8.30  int: english/english
 
 system          > 'cont-new.mkiv' loaded
 (cont-new.mkiv)
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index d07790368..311cc9428 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  : 08/30/13 02:05:28
+-- merge date  : 08/30/13 13:54:46
 
 do -- begin closure to overcome local limits and interference