From be879addb8eb3fe189fd4b75221345d682b3f213 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 2 Sep 2018 21:17:18 +0000 Subject: csplain (2sep18) git-svn-id: svn://tug.org/texlive/trunk@48552 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/csplain/opmac/opmac.tex | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'Master/texmf-dist/tex/csplain') diff --git a/Master/texmf-dist/tex/csplain/opmac/opmac.tex b/Master/texmf-dist/tex/csplain/opmac/opmac.tex index d6be966f0be..e25e013f751 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. 2018a} +\def\OPmacversion{May 2018} \immediate\write16{This is OPmac (Olsak's Plain macros), version <\OPmacversion>} %%%%%%%%%%%%%% Basic macros, sec. 3.1 in opmac-d.pdf @@ -324,7 +324,7 @@ %%%%%%%%%%%%%% Chapters, sections, subsections -- sec. 3.8 in opmac-d.pdf -\def\printchap#1{\vfil\break +\def\printchap#1{\vfill\supereject {\chapfont \noindent \mtext{chap} \dotocnum{\thetocnum}\par \nobreak\smallskip\noindent #1\nbpar}\mark{}% \nobreak \remskip\bigskipamount \firstnoindent @@ -355,6 +355,7 @@ \eoldef\chap#1{\ifnonum\else \global\advance\chapnum by1 \fi \chaphook {\globaldefs=1 \secnum=0 \seccnum=0 \tnum=0 \fnum=0 \dnum=0}\relax \edef\thechapnum{\the\chapnum}\let\thetocnum=\thechapnum + \edef\thesecnum{\othe\chapnum.\the\secnum}% \def\dotocnumafter{\wtotoc0\bfshape{#1}}% \printchap{#1}\resetnonumnotoc } @@ -913,7 +914,7 @@ \def\linkactive[#1:#2]#3#4{\leavevmode\pdfstartlink height.9em depth.3em \pdfborder{#1} goto name{#1:#2}\relax {#3#4}\pdfendlink } -\def\link[#1]#2#3{\leavevmode#3} +\def\link[#1]#2#3{\leavevmode{#3}} \def\urllink[#1:#2]#3{{\let~=\relax \let\\=\relax \let\{=\relax \let\}=\relax \leavevmode\pdfstartlink height.9em depth.3em @@ -921,10 +922,10 @@ {\def~{\nobreak\space}\urlcolor#3}\pdfendlink}% } \def\toclink#1{\toclinkA{#1}} -\def\pglink#1{\pgfolioA{#1}\relax} -\def\citelink#1#2{\leavevmode#2} -\def\reflink[#1]#2{\leavevmode#2} -\def\ulink[#1]#2{{\leavevmode#2}} +\def\pglink#1{\leavevmode{\pgfolioA{#1}}} +\def\citelink#1#2{\leavevmode{#2}} +\def\reflink[#1]#2{\leavevmode{#2}} +\def\ulink[#1]#2{\leavevmode{#2}} \def\urlcolor{} \def\hyperlinks#1#2{% @@ -1814,5 +1815,9 @@ Jun 2017 \begingroup...\endgroup trick introduced in \isinlist \fnotetext: \everypar={} added (bug correction) Mar. 2018 \frame: \relax after \kern\hhkern added (bug correction) Mar. 2018a \uv defined as \long +May 2018 \chap: \edef\thesecnum added (J. Sustek) + \printchap: \vfill\supereject instead \vfil\break + \link: argument in group in both: \hyperlinks on/off (J. Sustek) %%%%%%%%%%%%%% End of opmac.tex + -- cgit v1.2.3