diff options
| author | Karl Berry <karl@freefriends.org> | 2020-04-12 21:29:46 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2020-04-12 21:29:46 +0000 |
| commit | f79df4a5b3a9094b4d64efa0e295b54d1f854869 (patch) | |
| tree | 4da1f643db3f3ab193dfe48fb0c2693cd90711e7 /Master/texmf-dist/tex | |
| parent | 321ccf46e86d034685420aa1c5faa90cc6d543e4 (diff) | |
csplain (12apr20)
git-svn-id: svn://tug.org/texlive/trunk@54699 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
| -rw-r--r-- | Master/texmf-dist/tex/csplain/opmac/opmac.tex | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Master/texmf-dist/tex/csplain/opmac/opmac.tex b/Master/texmf-dist/tex/csplain/opmac/opmac.tex index 9bcdea6a2ea..1b3220b4c5a 100644 --- a/Master/texmf-dist/tex/csplain/opmac/opmac.tex +++ b/Master/texmf-dist/tex/csplain/opmac/opmac.tex @@ -5,7 +5,7 @@ %% The history of versions is at the end of this file, after \endpinput \ifx\OPmacversion\undefined \else \endinput \fi -\def\OPmacversion{Jul. 2019} +\def\OPmacversion{Apr. 2020} \immediate\write16{This is OPmac (Olsak's Plain macros), version <\OPmacversion>} %%%%%%%%%%%%%% Basic macros, sec. 3.1 in opmac-d.pdf @@ -1232,7 +1232,7 @@ \def\mspan{\omit \tabdata={\tabstrut}\let\tmpa=\relax \afterassignment\mspanA \mscount=} \def\mspanA[#1]#2{\loop \ifnum\mscount>1 \csname span\endcsname \omit \advance\mscount -1 \repeat \colnum=0 \def\tmpa{}\tabdata={}\scantabdata#1\relax - \setbox0=\vbox{\halign\expandafter{\the\tabdata\cr#2\crcr}\global\setbox8=\lastbox}% + \setbox0=\vbox{\halign\expandafter{\the\tabdata\cr#2\cr}\global\setbox8=\lastbox}% \setbox0=\hbox{\unhbox8 \unskip \global\setbox8=\lastbox}% \unhbox8 \ignorespaces} @@ -1337,7 +1337,7 @@ \newdimen\mnoteskip \mnoteskip=0pt \long\def\mnote#1{\ifvmode \hbox{\vbox to\ht\strutbox{}\mnoteA{#1}}\nobreak\vskip-\baselineskip - \else \strut\vadjust{\kern-\dp\strutbox \mnoteA{#1}\kern\dp\strutbox}% + \else \lower\dp\strutbox\hbox{}\vadjust{\kern-\dp\strutbox \mnoteA{#1}\kern\dp\strutbox}% \fi } \long\def\mnoteA#1{\global\advance \mnotenum by1 @@ -1861,6 +1861,8 @@ May 2019 \table declarator () added. Jun. 2019 \mspan improved. Jul. 2019 \fnoteG introduced, \fnotemark bug fixed (if \runningfnotes). \colorstackcnt=0 used, \setrgbcolor, \formatcmyk, \formatrgb introduced. +Apr. 2020 \mnote: \strut -> \lower\dp\strutbox\hbox{} + \mspan: \cr#2\crcr -> \cr#2\cr (empty text must be formated too) %%%%%%%%%%%%%% End of opmac.tex |