stable 2006.01.27 13:58

1 files changed, 49 insertions, 37 deletions

diff --git a/tex/context/base/math-pln.tex b/tex/context/base/math-pln.tex
index 73c12c973..b8148491f 100644
--- a/tex/context/base/math-pln.tex
+++ b/tex/context/base/math-pln.tex
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=math-pln,
-%D        version=2001.11.16, 
+%D        version=2001.11.16,
 %D          title=\CONTEXT\ System Macros,
 %D       subtitle=Efficient \PLAIN\ \TEX\ loading,
 %D         author=Hans Hagen,
@@ -8,17 +8,17 @@
 %D      copyright={PRAGMA / Hans Hagen \& Ton Otten}]
 %C
 %C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for 
-%C details. 
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
 
-%D This is a temporary module, some of this code will move to 
-%D the other math modules. 
+%D This is a temporary module, some of this code will move to
+%D the other math modules.
 
-\unprotect 
+\unprotect
 
 \def\m@th{\mathsurround\z@}
 
-\newbox\rootbox 
+\newbox\rootbox
 
 \def\root#1\of%
   {\setbox\rootbox\hbox{$\m@th\scriptscriptstyle{#1}$}%
@@ -27,7 +27,7 @@
 \def\r@@t#1#2% will be overloaded
   {\setbox\z@\hbox{$\m@th#1\sqrt{#2}$}\dimen@\ht\z@
    \advance\dimen@-\dp\z@
-   \mkern5mu\raise.6\dimen@\copy\rootbox 
+   \mkern5mu\raise.6\dimen@\copy\rootbox
    \mkern-10mu\box\z@}
 
 \def\mathhexbox#1#2#3%
@@ -38,13 +38,13 @@
   {\leavevmode
    \vtop
      {\baselineskip\z@skip \lineskip.25ex%
-      \ialign{##\crcr#1\crcr}}} 
+      \ialign{##\crcr#1\crcr}}}
 
 \def\o@lign
   {\lineskiplimit\z@ \oalign}
 
 \def\ooalign % chars over each other
-  {\lineskiplimit-\maxdimen 
+  {\lineskiplimit-\maxdimen
    \oalign}
 
 {\catcode`p=12 \catcode`t=12 \gdef\\#1pt{#1}} \let\getf@ctor=\\
@@ -52,9 +52,9 @@
 \def\sh@ft#1% kern by #1 times the current slant
   {\dimen@#1%
    \kern\expandafter\getf@ctor\the\fontdimen1\font
-   \dimen@} 
+   \dimen@}
 
-% \def\copyright % will be overloaded 
+% \def\copyright % will be overloaded
 %   {{\ooalign{\hfil\raise.07ex\hbox{c}\hfil\crcr\Orb}}}
 
 \def\dots
@@ -76,11 +76,11 @@
    \cleaders\hbox{$\mkern-2mu\smash-\mkern-2mu$}\hfill
    \mkern-7mu\smash-$}
 
-% must go to math-tex 
+% must go to math-tex
 
-\mathchardef\braceld="37A 
+\mathchardef\braceld="37A
 \mathchardef\bracerd="37B
-\mathchardef\bracelu="37C 
+\mathchardef\bracelu="37C
 \mathchardef\braceru="37D
 
 \def\downbracefill
@@ -95,7 +95,7 @@
 
 \def\bye{\par\vfill\supereject\end}
 
-\let\sp=^ 
+\let\sp=^
 \let\sb=_
 \def\,{\mskip\thinmuskip}
 \def\>{\mskip\medmuskip}
@@ -110,14 +110,14 @@
 
 % \def\pr@m@s
 %   {\ifx'\next
-%      \let\nxt\pr@@@s 
+%      \let\nxt\pr@@@s
 %    \else
 %      \ifx^\next
 %        \let\nxt\pr@@@t
 %      \else
 %        \let\nxt\egroup
 %      \fi
-%    \fi 
+%    \fi
 %    \nxt}
 
 \def\pr@m@s
@@ -130,7 +130,7 @@
    \fi\fi}
 
 \def\pr@@@s#1%
-  {\prim@s} 
+  {\prim@s}
 
 \def\pr@@@t#1#2%
   {#2\egroup}
@@ -258,7 +258,7 @@
 % \setbox0=\hbox{\tenex B} \p@renwd=\wd0 % width of the big left (
 
 \def\bordermatrix#1%
-  {\begingroup 
+  {\begingroup
    \m@th
    \setbox\z@\vbox
      {\def\cr{\crcr\noalign{\kern2\p@\global\let\cr\endline}}%
@@ -279,18 +279,30 @@
    \vbox{\kern\ht\@ne\box\tw@}%
    \endgroup}
 
-\def\openup{\afterassignment\@penup\dimen@=}
+% \def\openup{\afterassignment\@penup\dimen@=}
+%
+% \def\@penup{\advance\lineskip\dimen@
+%   \advance\baselineskip\dimen@
+%   \advance\lineskiplimit\dimen@}
 
-\def\@penup{\advance\lineskip\dimen@
-  \advance\baselineskip\dimen@
-  \advance\lineskiplimit\dimen@}
+\def\openup
+  {\afterassignment\doopenup\scratchdimen=}
+
+\def\doopenup
+  {\advance\lineskip     \scratchdimen
+   \advance\baselineskip \scratchdimen
+   \advance\lineskiplimit\scratchdimen}
+
+% \def\jot{.25\bodyfontsize} % plain tex: 3 pt (todo: better name and configurable)
+
+\def\displayopenupvalue{.25\bodyfontsize}
 
 \def\eqalign#1%
   {\null
    \,%
    \vcenter
-     {\openup
-      \jot\m@th
+     {\openup\displayopenupvalue % was \openup\jot
+      \m@th
       \ialign
         {\strut\hfil$\displaystyle{##}$&$\displaystyle{{}##}$\hfil\crcr
          #1\crcr}}%
@@ -300,32 +312,32 @@
 
 \def\displ@y
   {\global\dt@ptrue
-   \openup\jot\m@th
+   \openup\displayopenupvalue % was \openup\jot
    \everycr
      {\noalign
-        {\ifdt@p 
-           \global\dt@pfalse 
+        {\ifdt@p
+           \global\dt@pfalse
            \ifdim\prevdepth>-1000\p@
-             \vskip-\lineskiplimit 
-             \vskip\normallineskiplimit 
+             \vskip-\lineskiplimit
+             \vskip\normallineskiplimit
            \fi
-         \else 
-           \penalty\interdisplaylinepenalty 
+         \else
+           \penalty\interdisplaylinepenalty
          \fi}}}
 
 \def\@lign % restore inside \displ@y
   {\tabskip\z@skip
-   \everycr{}} 
+   \everycr{}}
 
 \def\displaylines#1%
-  {\displ@y 
+  {\displ@y
    \tabskip\z@skip
    \halign
      {\hbox to \displaywidth{$\@lign\hfil\displaystyle##\hfil$}\crcr
       #1\crcr}}
 
 \def\eqalignno#1%
-  {\displ@y 
+  {\displ@y
    \tabskip\centering
    \halign to \displaywidth
      {\hfil$\@lign\displaystyle{##}$\tabskip\z@skip
@@ -334,7 +346,7 @@
       #1\crcr}}
 
 \def\leqalignno#1%
-  {\displ@y 
+  {\displ@y
    \tabskip\centering
    \halign to \displaywidth
      {\hfil$\@lign\displaystyle{##}$\tabskip\z@skip