From 444777025f3a155713c06d0270871348833d2024 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 14 Mar 2021 23:21:10 +0000 Subject: csplain (14mar21) (branch) git-svn-id: svn://tug.org/texlive/branches/branch2020.0@58367 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/csplain/base/csplain.ini | 5 ++++- Master/texmf-dist/tex/csplain/opmac/opmac-bib.tex | 7 ++++--- Master/texmf-dist/tex/csplain/opmac/opmac.tex | 9 +++++---- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Master/texmf-dist/tex/csplain/base/csplain.ini b/Master/texmf-dist/tex/csplain/base/csplain.ini index 3a9587a7d40..6e5627f0cc1 100644 --- a/Master/texmf-dist/tex/csplain/base/csplain.ini +++ b/Master/texmf-dist/tex/csplain/base/csplain.ini @@ -12,7 +12,7 @@ \input plaina4 % \hsize and \vsize for A4 \everyjob=\expandafter{\the\everyjob - \message{The format: csplain .} + \message{The format: csplain .} \message{The cs-fonts are preloaded and A4 size implicitly defined.}} \ifx\xprncode\undefined \else %% The encTeX is detected \count255=128 % All codes > 128 are printable: @@ -277,6 +277,9 @@ file extcode.tex renamed to il2code.tex (suggested by Jan Kasprzak) Feb. 2020 * hyphen.lan: skip loading patters when missing file + Mar. 2021 +* opmac-bib.tex: \ifx\citelist\emtpty -- bug fixed + COPYRIGHT ========= diff --git a/Master/texmf-dist/tex/csplain/opmac/opmac-bib.tex b/Master/texmf-dist/tex/csplain/opmac/opmac-bib.tex index 3a1b244590a..83d038f7c97 100644 --- a/Master/texmf-dist/tex/csplain/opmac/opmac-bib.tex +++ b/Master/texmf-dist/tex/csplain/opmac/opmac-bib.tex @@ -1,6 +1,6 @@ % opmac-bib %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Petr Olsak, version Feb. 2018 (beta) +% Petr Olsak, version Mar. 2021 (beta) % This is module for OPmac macros, see http://petr.olsak.net/opmac.html % The command: @@ -41,6 +41,8 @@ % The \usebib command: \def\usebib/#1 (#2) #3 {% + \let\citeI=\relax \xdef\citelist{\citelist\citelistB}% + \global\let\addcitelist=\writeXcite \ifx\citelist\empty \opwarning{No cited items. \noexpand\usebib ignored}% \else @@ -51,8 +53,6 @@ \def\opmacbibstyle{#2}% \input opmac-bib-#2 \bibtexhook - \let\citeI=\relax \xdef\citelist{\citelist\citelistB}% - \global\let\addcitelist=\writeXcite \def\tmp##1[*]##2\relax{\def\tmp{##2}}\expandafter\tmp\citelist[*]\relax \ifx\tmp\empty\else % there was \nocite[*] used. \setbox0=\vbox{\def\citelist{}\adef@{\readbibentry}% @@ -329,5 +329,6 @@ Apr. 2014: released Jan. 2016: "first entry wins" implemented Apr. 2016: \readentry -> \readbibentry, \usebib->\MakeReference Feb. 2018: \input librarian does not create \jobname.lbr +Mar. 2021: \citelistB added before \ifx\citelist: bug fixed %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% end of the opmac-bib.tex diff --git a/Master/texmf-dist/tex/csplain/opmac/opmac.tex b/Master/texmf-dist/tex/csplain/opmac/opmac.tex index 1b3220b4c5a..7542b7ff831 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{Apr. 2020} +\def\OPmacversion{May 2020} \immediate\write16{This is OPmac (Olsak's Plain macros), version <\OPmacversion>} %%%%%%%%%%%%%% Basic macros, sec. 3.1 in opmac-d.pdf @@ -46,7 +46,7 @@ \expandafter\tmp#1\endlistsep#2\end } \long\def\isnextchar#1#2#3{\begingroup\toks0={\endgroup#2}\toks1={\endgroup#3}% - \let\tmp=#1\futurelet\next\isnextcharA + \let\tmp= #1\futurelet\next\isnextcharA } \def\isnextcharA{\the\toks\ifx\tmp\next0\else1\fi\space} @@ -1193,7 +1193,7 @@ \def\paramtabdeclarep#1{\tabiteml\vtop{\hsize=#1\relax \baselineskip=\normalbaselineskip \lineskiplimit=0pt \noindent##\unsskip \vbox to0pt{\vss\hbox{\tabstrutA}}}\tabitemr} -\def\unsskip{\ifdim\lastskip>0pt \unskip\fi} +\def\unsskip{\ifmmode\else\ifdim\lastskip>0pt \unskip\fi\fi} \def\addtabitem{\ifnum\colnum>0 \addtabdata{&}\addto\ddlinedata{&\dditem}\fi \advance\colnum by1 \let\tmpa=\relax} \def\addtabdata#1{\tabdata\expandafter{\the\tabdata#1}} @@ -1863,6 +1863,7 @@ 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) +May 2020 \isnextchar: \let\tmp=#1 -> \let\tmp= #1 (#1 should be space) + \unsskip: \ifmmode\else added. %%%%%%%%%%%%%% End of opmac.tex - -- cgit v1.2.3