csplain (6may15)

git-svn-id: svn://tug.org/texlive/trunk@37235 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 9 insertions, 6 deletions

diff --git a/Master/texmf-dist/tex/csplain/opmac/opmac.tex b/Master/texmf-dist/tex/csplain/opmac/opmac.tex
index 342d3ef6a8a..6b53f3e57ac 100644
--- a/Master/texmf-dist/tex/csplain/opmac/opmac.tex
+++ b/Master/texmf-dist/tex/csplain/opmac/opmac.tex
@@ -105,7 +105,8 @@
 \def\sechook{}     % hook in \sec
 \def\secchook{}    % hook in \secc
 \def\cnvhook{}     % hook before conversion of outlines
-\def\pghook{}      % hook in \output rutine
+\def\prepghook{}   % hook before page building in \output routine
+\def\pghook{}      % next hook in \output routine
 \def\toclinehook{} % hook in \tocline
 \def\fnotehook{}   % hook in \fnote
 \def\mnotehook{}   % hook in \mnote
@@ -1262,7 +1263,7 @@
 \newcount\fnotenumlocal
 \newif\iflocfnum \locfnumtrue
 
-\def\fnote#1{\global\advance \fnotenum by1
+\long\def\fnote#1{\global\advance \fnotenum by1
    \leavevmode\openref\wref\Xfnote{}%
    \iflocfnum \isdefined{fn:\the\fnotenum}\iftrue
       \else\opwarning{unknown \noexpand\fnote mark. TeX me again}\fi\fi
@@ -1272,7 +1273,7 @@
    \isdefined{fn:\the\fnotenum}\iftrue\thefnote
    \else$^?$\opwarning{unknown \string\fnotemark. TeX me again}\fi}%
 }
-\def\fnotetext#1{\global\advance \fnotenum by1 \openref\wref\Xfnote{}%
+\long\def\fnotetext#1{\global\advance \fnotenum by1 \openref\wref\Xfnote{}%
    {\fnotehook\typobase\typoscale[800/800]\vfootnote\fnmarkx{#1}}%
 }
 \def\fnmarkx{\isdefined{fn:\the\fnotenum}\iftrue\thefnote\else$^?$\fi}
@@ -1287,11 +1288,11 @@
 \newcount\mnotenum    \mnotenum=0       % global counter of mnotes
 \newdimen\mnoteskip   \mnoteskip=0pt
 
-\def\mnote#1{\ifvmode \mnoteA{#1}\nobreak\vskip-\baselineskip
+\long\def\mnote#1{\ifvmode \mnoteA{#1}\nobreak\vskip-\baselineskip
    \else \strut\vadjust{\kern-\dp\strutbox \mnoteA{#1}\kern\dp\strutbox}%
    \fi
 }
-\def\mnoteA#1{\global\advance \mnotenum by1
+\long\def\mnoteA#1{\global\advance \mnotenum by1
    \ifx\mnotesfixed\undefined
       \isdefined{mn:\the\mnotenum}\iftrue
       \else\opwarning{unknown \noexpand\mnote side. TeX me again}\fi
@@ -1523,7 +1524,7 @@
 \def\endoutput{}
 
 \def\opmacoutput{%
-  \setbox0=\vbox{\ensureblacko{\makeheadline}\pagebody\ensureblacko{\makefootline}}%
+  \setbox0=\vbox{\prepghook\ensureblacko{\makeheadline}\pagebody\ensureblacko{\makefootline}}%
   \pghook \protectlist
   \shipout\box0 \advancepageno
   \ifnum\outputpenalty>-20000 \else\dosupereject\fi
@@ -1730,5 +1731,7 @@ Apr. 2015  \wtotoc, \Xtoc, \tocilabel, \pgilabel introduced.
            \fnotetext: \fnotehook inserted (bug fixing)
 May  2015  \itemhook introduced
            \REFversion introduced
+           \prepghook introduced
+           \mnote, \fnote redeclared as \long
 
 %%%%%%%%%%%%%% End of opmac.tex