From 596a3dc5c1274eac48547d1d431f12f5ceaf4d43 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 5 Oct 2015 20:59:08 +0000 Subject: csplain (5oct15) git-svn-id: svn://tug.org/texlive/trunk@38559 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/csplain/opmac/opmac.tex | 36 +++++++++++++-------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/Master/texmf-dist/tex/csplain/opmac/opmac.tex b/Master/texmf-dist/tex/csplain/opmac/opmac.tex index 78a97213930..b90f07f5eda 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{Sep. 2015} +\def\OPmacversion{Oct. 2015} \immediate\write16{This is OPmac (Olsak's Plain macros), version <\OPmacversion>} %%%%%%%%%%%%%% Basic macros, sec. 3.1 in opmac-d.pdf @@ -82,6 +82,7 @@ \mathchardef\ttpenalty=100 % penalty between lines in \begtt, \verbinput \def\tthook{} % hook in \begtt, \verbinput \def\intthook{} % hook in in-text verbatim +\def\ptthook{} % hook in \begtt, \verbinput for post-processing \def\iiskip{\medskip} % space above and below \begitems...\enditems \def\itemhook{} % hook in \startitem @@ -1050,16 +1051,17 @@ \tthook\relax \ifnum\ttline<0 \else \tenrm \thefontscale[700]\let\sevenrm=\thefont - \everypar={\global\advance\ttline by1 - \llap{\sevenrm\the\ttline\kern.9em}}\fi - \def\par##1{\endgraf\ifx##1\egroup\else\penalty\ttpenalty\leavevmode\fi ##1} + \everypar\expandafter{\the\everypar \global\advance\ttline by1 \printttline}\fi + \def\par##1{\endgraf\ifx##1\egroup\else\penalty\ttpenalty\leavevmode\fi ##1}% \obeylines \startverb} {\catcode`\|=0 \catcode`\\=12 -|gdef|startverb#1\endtt{|tt#1|egroup|par|ttskip|testparA}} +|gdef|startverb#1\endtt{|tt|ptthook#1|egroup|par|ttskip|testparA}} \def\testparA{\expandafter\testparB\romannumeral-`\.} \def\testparB{\futurelet\tmpa\testparC} \def\testparC{\ifx\tmpa\par\else\afternoindent\fi} +\def\printttline{\llap{\sevenrm\the\ttline\kern.9em}} + \def\activettchar#1{% \ifx\savedttchar\undefined\else \catcode\savedttchar=\savedttcharc \fi \chardef\savedttchar=`#1% @@ -1123,29 +1125,25 @@ \parindent=\ttindent \tthook\relax \ifnum\ttline<-1 \else - \tenrm \thefontscale[700]\let\sevenrm=\thefont \fi - \tmpnum=0 \tt + \tenrm \thefontscale[700]\let\sevenrm=\thefont + \everypar\expandafter{\the\everypar \glob\advance\ttline by1 \printttline}\fi + \def\par##1{\endgraf\ifx##1\egroup\else\penalty\ttpenalty\leavevmode\fi ##1}% + \obeylines \tmpnum=0 \lccode`\~=`\^^M \lowercase{\def\tmpb{~}}% \loop \ifeof\vifile \tmpnum=\vinolines\space \fi \ifnum\tmpnum<\vinolines\space \vireadline \advance\tmpnum by1 \repeat %% skip line + \ifnum\ttline=-1 \ttline=\viline \let\glob=\relax \else\let\glob=\global \fi \tmpnum=0 \ifnum\vidolines=0 \tmpnum=-1 \fi \ifeof\vifile \tmpnum=\vidolines\space \fi \loop \ifnum\tmpnum<\vidolines\space \vireadline - \ifeof\vifile \tmpnum=\vidolines\space \else - \penalty\ttpenalty \viprintline \fi %% print line + \ifeof\vifile \tmpnum=\vidolines\space \else \viprintline \fi %% print line \ifnum\vidolines=0 \else\advance\tmpnum by1 \fi \repeat - \egroup\par\ttskip\testparB + \tt\expandafter\ptthook\tmpb\egroup\par\ttskip\testparA } \def\vireadline{\read\vifile to \tmp \global\advance\viline by1 } -\def\viprintline{\indent - \ifnum \ttline<-1 \else - \llap{\sevenrm\ifnum\ttline<0 \the\viline \else - \global\advance\ttline by1 \the\ttline \fi \kern.9em}% - \fi - \tmp\par % print the line from \tmp -} +\def\viprintline{\expandafter\addto\expandafter\tmpb\expandafter{\tmp}} %%%%%%%%%%%%%% \table -- sec. 3.19 in opmac-d.pdf @@ -1749,6 +1747,8 @@ Jul. 2015 \openref: \def\wref -> \gdef\wref (bug fixed) \hyperlinks when non-pdftex prints warning Sep. 2015 \sortingdata introduced, \isolangset introduced. \toasciidata introduced. - \dosorting: local \iisort changes + \dosorting: local \iisort changes. +Oct. 2015 \printttline, \ptthook introduced, \viprintline redesigned. + \everypar\expandafter{\the\everypar...} in \begtt, \doverbinput. %%%%%%%%%%%%%% End of opmac.tex -- cgit v1.2.3