2015-05-13 19:26:00

10 files changed, 58 insertions, 17 deletions

diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 1e4e683e9..c6e42d6ce 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.05.13 13:04}
+\newcontextversion{2015.05.13 19:24}
 
 %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 61e0c872c..55a2d3b1e 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 05fbde607..7b34a3707 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.05.13 13:04}
+\edef\contextversion{2015.05.13 19:24}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/math-ini.mkiv b/tex/context/base/math-ini.mkiv
index 16efd35a3..79c9a6204 100644
--- a/tex/context/base/math-ini.mkiv
+++ b/tex/context/base/math-ini.mkiv
@@ -189,18 +189,52 @@
 \unexpanded\def\mathematics
   {\doifelsenextoptionalcs\math_m_yes\math_m_nop}
 
-\def\math_m_yes[#1]#2%
+\def\math_m_yes
   {\relax
    \ifmmode
-     #2%
+     \expandafter\math_m_yes_math
    \else
-     \normalstartimath
-     \edef\currentmathematics{#1}% check for valid
-     \the\everyswitchmathematics\relax
-     #2%
-     \normalstopimath
+     \expandafter\math_m_yes_text
+   \fi}
+
+\def\math_m_yes_math[#1]#2%
+  {#2}
+
+\def\math_m_yes_text[#1]%
+  {\begingroup
+   \edef\currentmathematics{#1}% check for valid
+   \edef\p_openup{\mathematicsparameter\c!openup}%
+   \ifx\p_openup\v!yes
+     \expandafter\math_m_yes_text_openedup
+   \else
+     \expandafter\math_m_yes_text_normal
    \fi}
 
+\def\math_m_yes_text_openedup#1%
+  {\setbox\scratchbox\hbox\bgroup
+      \normalstartimath
+      \the\everyswitchmathematics\relax
+      #1%
+      \normalstopimath
+   \egroup
+   \ifdim\ht\scratchbox>\strutht
+     \math_inline_openup_start_yes
+   \else\ifdim\dp\scratchbox>\strutdp
+     \math_inline_openup_start_yes
+   \else
+     \math_inline_openup_start_nop
+   \fi\fi
+   \unhbox\scratchbox % \normalstartimath#1\normalstopimath
+   \math_inline_openup_stop
+   \endgroup}
+
+\def\math_m_yes_text_normal#1%
+  {\normalstartimath
+   \the\everyswitchmathematics\relax
+   #1%
+   \normalstopimath
+   \endgroup}
+
 \def\math_m_nop#1%
   {\relax
    \ifmmode
@@ -213,6 +247,8 @@
 
 \let\m\mathematics
 
+% e.g.: \definemathematics[i:mp][setups=i:tight,openup=yes]
+
 \newmuskip\defaultthickmuskip  \defaultthickmuskip  5mu plus 5mu
 \newmuskip\defaultmedmuskip    \defaultmedmuskip    4mu plus 2mu minus 4mu
 \newmuskip\defaultthinmuskip   \defaultthinmuskip   3mu
diff --git a/tex/context/base/mult-def.mkiv b/tex/context/base/mult-def.mkiv
index b2fc1cfcf..d547a7b81 100644
--- a/tex/context/base/mult-def.mkiv
+++ b/tex/context/base/mult-def.mkiv
@@ -34,6 +34,8 @@
 
 % start todo in mult-def.lua:
 
+\def\c!openup            {openup}
+
 \def\v!serifnormal       {serifnormal}
 \def\v!serifbold         {serifbold}
 \def\v!sansnormal        {sansnormal}
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 84a3ebc91..77ffca6d6 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 cb6bcb95b..cc66c5103 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/strc-flt.mkvi b/tex/context/base/strc-flt.mkvi
index cf75d3338..be2958fbf 100644
--- a/tex/context/base/strc-flt.mkvi
+++ b/tex/context/base/strc-flt.mkvi
@@ -1133,11 +1133,11 @@
    \strc_floats_calculate_skip\d_strc_floats_bottom   {\rootfloatparameter\c!spaceafter     }%
    \strc_floats_calculate_skip\d_page_sides_topskip   {\rootfloatparameter\c!sidespacebefore}%
    \strc_floats_calculate_skip\d_page_sides_bottomskip{\rootfloatparameter\c!sidespaceafter }%
-   \global\d_strc_floats_margin   \rootfloatparameter\c!margin
-   \global\d_page_sided_leftshift \floatparameter    \c!leftmargindistance
-   \global\d_page_sided_rightshift\floatparameter    \c!rightmargindistance
-   \global\c_page_floats_n_of_top                    \rootfloatparameter\c!ntop
-   \global\c_page_floats_n_of_bottom                 \rootfloatparameter\c!nbottom
+   \global\d_strc_floats_margin     \rootfloatparameter\c!margin
+   \global\d_page_sided_leftshift   \floatparameter    \c!leftmargindistance
+   \global\d_page_sided_rightshift  \floatparameter    \c!rightmargindistance
+   \global\c_page_floats_n_of_top   \rootfloatparameter\c!ntop
+   \global\c_page_floats_n_of_bottom\rootfloatparameter\c!nbottom
    \endgroup}
 
 \unexpanded\def\betweenfloatblanko % assumes that spaceafter is present
diff --git a/tex/context/base/tabl-xtb.mkvi b/tex/context/base/tabl-xtb.mkvi
index a8f205f4a..73ba91045 100644
--- a/tex/context/base/tabl-xtb.mkvi
+++ b/tex/context/base/tabl-xtb.mkvi
@@ -351,8 +351,11 @@
 % in text flow: headers and footers only once
 
 \setvalue{\??xtableflushsplit\v!no}%
-  {\noindentation % better than \noindent (no \dontleavehmode here) % else no leftskip etc
-  %\ignorespaces
+  {% \noindent       % gives extra line after table
+   % \noindentation  % messes up the next indentation
+   % \dontleavehmode % no leftskip
+   \kern\zeropoint   % yet another guess
+   \ignorespaces
    \clf_x_table_flush
      method {\v!normal}%
    \relax
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index de74d99a4..446a41039 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  : 05/13/15 13:04:20
+-- merge date  : 05/13/15 19:24:50
 
 do -- begin closure to overcome local limits and interference