summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-06-04 21:23:54 +0000
committerKarl Berry <karl@freefriends.org>2019-06-04 21:23:54 +0000
commit661876bf089d7ae8f5efc378a9008834ba17895e (patch)
treed03a48e2bd721f037e865d42cf131ed7a980e3a5
parent26f0425caf9e7bc6a85e6be03b00189d7848b2eb (diff)
csplain (4jun19)
git-svn-id: svn://tug.org/texlive/trunk@51317 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/tex/csplain/opmac/opmac.tex24
1 files changed, 10 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/csplain/opmac/opmac.tex b/Master/texmf-dist/tex/csplain/opmac/opmac.tex
index b29dd860057..263d8ed0a83 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{May 2019}
+\def\OPmacversion{Jun. 2019}
\immediate\write16{This is OPmac (Olsak's Plain macros), version <\OPmacversion>}
%%%%%%%%%%%%%% Basic macros, sec. 3.1 in opmac-d.pdf
@@ -1166,7 +1166,7 @@
\def\scantabdata#1{\let\next=\scantabdata
\ifx\relax#1\let\next=\relax
\else\ifx|#1\addtabvrule
- \else\ifx[#1\def\next{\scantabdataE}%
+ \else\ifx(#1\def\next{\scantabdataE}%
\else\isinlist{123456789}#1\iftrue \def\next{\scantabdataC#1}%
\else \expandafter\ifx\csname tabdeclare#1\endcsname \relax
\expandafter\ifx\csname paramtabdeclare#1\endcsname \relax
@@ -1180,7 +1180,7 @@
\def\scantabdataC {\def\tmpb{}\afterassignment\scantabdataD \tmpnum=}
\def\scantabdataD#1{\loop \ifnum\tmpnum>0 \advance\tmpnum by-1 \addto\tmpb{#1}\repeat
\expandafter\scantabdata\tmpb}
-\def\scantabdataE#1]{\addtabdata{#1}\scantabdata}
+\def\scantabdataE#1){\addtabdata{#1}\scantabdata}
\def\tabdeclarec{\tabiteml\hfil##\unsskip\hfil\tabitemr}
\def\tabdeclarel{\tabiteml##\unsskip\hfil\tabitemr}
\def\tabdeclarer{\tabiteml\hfil##\unsskip\tabitemr}
@@ -1224,16 +1224,11 @@
\vbox to\tmpdim{}\ddlinedata \crcr \noalign{\gdef\tabstrutA{\tabstrut}}}
\def\mspan{\omit \tabdata={\tabstrut}\let\tmpa=\relax \afterassignment\mspanA \mscount=}
-\def\mspanA[#1]{\loop \ifnum\mscount>1 \csname span\endcsname \omit \advance\mscount by-1 \repeat
- \mspanB#1\relax}
-\def\mspanB#1{\ifx\relax#1\def\tmpa{\def\tmpa####1}%
- \expandafter\tmpa\expandafter{\the\tabdata\ignorespaces}\expandafter\tmpa\else
- \ifx |#1\ifx\tmpa\vrule\addtabdata{\kern\vvkern}\fi \addtabdata{\vrule}\let\tmpa=\vrule
- \else \let\tmpa=\relax
- \ifx c#1\addtabdata{\tabiteml\hfil\ignorespaces##1\unsskip\hfil\tabitemr}\fi
- \ifx l#1\addtabdata{\tabiteml\ignorespaces##1\unsskip\hfil\tabitemr}\fi
- \ifx r#1\addtabdata{\tabiteml\hfil\ignorespaces##1\unsskip\tabitemr}\fi
- \fi \expandafter\mspanB \fi}
+\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=\hbox{\unhbox8 \unskip \global\setbox8=\lastbox}%
+ \unhbox8 \ignorespaces}
\newdimen\drulewidth \drulewidth=0.4pt
\let\orihrule=\hrule \let\orivrule=\vrule
@@ -1858,7 +1853,8 @@ Mar. 2019 Style declarations \report and \letter added.
\boxlines added.
\titskip introduced.
\fnote corrected: \iflocfnum\openref.
-May 2019 \table declarator [] added.
+May 2019 \table declarator () added.
+Jun. 2019 \mspan improved.
%%%%%%%%%%%%%% End of opmac.tex