2018-04-13 15:02:00

1 files changed, 27 insertions, 12 deletions

diff --git a/tex/context/base/mkiv/math-ini.mkiv b/tex/context/base/mkiv/math-ini.mkiv
index 17d900d74..9dfc317dd 100644
--- a/tex/context/base/mkiv/math-ini.mkiv
+++ b/tex/context/base/mkiv/math-ini.mkiv
@@ -1273,9 +1273,13 @@
 
 %D Memory saver:
 
+\def\math_basics_check_compact
+  {\doifelse{\mathematicsparameter\c!compact}\v!yes
+     \enabledirectives\disabledirectives[math.virtual.optional]}
+
 \appendtoks
     \ifx\currentmathematics\empty
-        \doifelse{\mathematicsparameter\c!compact}\v!yes\enabledirectives\disabledirectives[math.virtual.optional]%
+        \math_basics_check_compact % less tracing
     \fi
 \to \everysetupmathematics
 
@@ -1311,18 +1315,31 @@
 %D \HL
 %D \stoptabulate
 
+% We will use proper constants when we go numbers instead of XXX.
+
 \newconditional\c_math_right_to_left
 
+\installcorenamespace{mathaligndirection}
+
+\setvalue{\??mathaligndirection           r2l}{\settrue\c_math_right_to_left}
+\setvalue{\??mathaligndirection\v!righttoleft}{\settrue\c_math_right_to_left}
+
 \appendtoks
-    \doifelse{\mathematicsparameter\c!align}{r2l}\settrue\setfalse\c_math_right_to_left
+    \ifcsname\??mathaligndirection\mathematicsparameter\c!align\endcsname
+      \lastnamedcs
+    \else
+      \setfalse\c_math_right_to_left
+    \fi
 \to \everyswitchmathematics
 
 \unexpanded\def\math_basics_synchronize_direction
   {\mathdir T\ifconditional\c_math_right_to_left R\else L\fi T}
 
+% Not \everymathematics as it comes too late and I'm not in the mood for a mixed mode
+% kludge now (should be a property of beginmath nodes and passed to callbacks).
+
 \appendtoks
     \math_basics_synchronize_direction
-%to \everymathematics % comes too late and I'm not in the mood for a mixed mode kludge now (should be a property of beginmath nodes and passed to callbacks)
 \to \everyswitchmathematics
 
 % experimental (needed for an article)
@@ -1337,11 +1354,6 @@
 \letvalue{\??mathbidi\v!yes}\math_bidi_enable
 \letvalue{\??mathbidi\v!no }\math_bidi_disable
 
-% \appendtoks
-%     \edef\p_bidi{\mathematicsparameter\c!bidi}%
-%     \csname\??mathbidi\ifcsname\??mathbidi\p_bidi\endcsname\p_bidi\else\v!no\fi\endcsname
-% \to \everysetupmathematics
-
 \appendtoks
     \edef\p_bidi{\mathematicsparameter\c!bidi}% still needed ?
     \ifcsname\??mathbidi\p_bidi\endcsname\lastnamedcs\else\math_bidi_disable\fi
@@ -2468,10 +2480,13 @@
 
 % I need to decide:
 %
-%mathscriptboxmode\zerocount % no kerning
-%mathscriptboxmode\plusone   % lists
-\mathscriptboxmode\plustwo   % lists and boxes
-%mathscriptboxmode\plusthree % lists and boxes with \boundary=1 (also for testing and demo)
+%mathscriptboxmode \zerocount % no kerning
+%mathscriptboxmode \plusone   % lists
+\mathscriptboxmode \plustwo   % lists and boxes
+\mathscriptcharmode\plusone   % lists and boxes
+%mathscriptboxmode \plusthree % lists and boxes with \boundary=1 (also for testing and demo)
+
+\mathrulethicknessmode\plusone
 
 \unexpanded\def\mathtext  {\mathortext{\math_text_choice_font\relax}\hbox}
 \unexpanded\def\mathword  {\mathortext{\math_text_choice_word\relax}\hbox}