summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-06-02 21:42:23 +0000
committerKarl Berry <karl@freefriends.org>2019-06-02 21:42:23 +0000
commitf4e717d92727b812fc8f490894bb49fc780e862f (patch)
tree683d8e069b1bad65b9cd84e564a05063b89cf1e4 /Master
parent523cc75f55a82d090d308107bb5b08b7b535979b (diff)
csplain (2jun19)
git-svn-id: svn://tug.org/texlive/trunk@51296 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/tex/csplain/opmac/opmac.tex23
1 files changed, 13 insertions, 10 deletions
diff --git a/Master/texmf-dist/tex/csplain/opmac/opmac.tex b/Master/texmf-dist/tex/csplain/opmac/opmac.tex
index 408e3bbf345..b29dd860057 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{Mar. 2019}
+\def\OPmacversion{May 2019}
\immediate\write16{This is OPmac (Olsak's Plain macros), version <\OPmacversion>}
%%%%%%%%%%%%%% Basic macros, sec. 3.1 in opmac-d.pdf
@@ -1166,20 +1166,21 @@
\def\scantabdata#1{\let\next=\scantabdata
\ifx\relax#1\let\next=\relax
\else\ifx|#1\addtabvrule
- \else\isinlist{123456789}#1\iftrue \def\next{\scantabdataC#1}%
- \else \expandafter\ifx\csname tabdeclare#1\endcsname \relax
- \expandafter\ifx\csname paramtabdeclare#1\endcsname \relax
- \opwarning{tab-declarator "#1" unknown, ignored}%
- \else \def\next{\expandafter \scantabdataB \csname paramtabdeclare#1\endcsname}\fi
- \else \def\next{\expandafter\scantabdataA \csname tabdeclare#1\endcsname}%
- \fi\fi\fi\fi \next
+ \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
+ \opwarning{tab-declarator "#1" unknown, ignored}%
+ \else \def\next{\expandafter\scantabdataB\csname paramtabdeclare#1\endcsname}\fi
+ \else \def\next{\expandafter\scantabdataA \csname tabdeclare#1\endcsname}%
+ \fi\fi\fi\fi\fi \next
}
\def\scantabdataA#1{\addtabitem \expandafter\addtabdata\expandafter{#1\tabstrutA}\scantabdata}
\def\scantabdataB#1#2{\addtabitem\expandafter\addtabdata\expandafter{#1{#2}\tabstrutA}\scantabdata}
\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
-}
+ \expandafter\scantabdata\tmpb}
+\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}
@@ -1857,6 +1858,8 @@ Mar. 2019 Style declarations \report and \letter added.
\boxlines added.
\titskip introduced.
\fnote corrected: \iflocfnum\openref.
+May 2019 \table declarator [] added.
+
%%%%%%%%%%%%%% End of opmac.tex