csplain (4may15)

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

1 files changed, 17 insertions, 13 deletions

diff --git a/Master/texmf-dist/tex/csplain/opmac/opmac.tex b/Master/texmf-dist/tex/csplain/opmac/opmac.tex
index 7fc3f8c0c64..342d3ef6a8a 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. 2015}
+\def\OPmacversion{May 2015}  
 \immediate\write16{This is OPmac (Olsak's Plain macros), version <\OPmacversion>}
 
 %%%%%%%%%%%%%% Basic macros, sec. 3.1 in opmac-d.pdf
@@ -84,6 +84,7 @@
 \def\intthook{}             % hook in in-text verbatim
 
 \def\iiskip{\medskip}     % space above and below \begitems...\enditems
+\def\itemhook{}           % hook in \startitem
 \def\bibskip{\smallskip}  % space between bibitems
 
 \def\tabstrut{\strut}     % strut in the \table
@@ -267,21 +268,22 @@
   \ifeof\testin \else
     \closein\testin
     \input \jobname.ref
-    \fnotenum=0 \mnotenum=0 
-    \immediate\openout\reffile=\jobname.ref
-    \def\wref##1##2{\write\reffile{\string##1##2}}
-    \immediate\write\reffile {\percent\percent\space OPmac - REF file}
+    \fnotenum=0 \mnotenum=0
+    \openrefA{\string\inputref}%
   \fi
 }
 \def\openref{%
-  \ifx\wref\wrefrelax
-     \immediate\openout\reffile=\jobname.ref
-     \gdef\wref##1##2{\write\reffile{\string##1##2}}%
-     \immediate\write\reffile
-       {\percent\percent\space OPmac - REF file (\string\openref)}%
-  \fi
+  \ifx\wref\wrefrelax \openrefA{\string\openref}\fi
   \gdef\openref{}%
 }
+\def\openrefA#1{%
+   \immediate\openout\reffile=\jobname.ref
+   \def\wref##1##2{\write\reffile{\string##1##2}}%
+   \immediate\write\reffile {\percent\percent\space OPmac - REF file (#1)}%
+   \immediate\wref\Xrefversion{{\REFversion}}%
+}
+\def\REFversion{2}
+\def\Xrefversion#1{\ifnum#1=\REFversion\relax \else \endinput \fi}
 
 %%%%%%%%%%%%%% \label, \ref, \pgref, sec. 3.7 in opmac-d.pdf
 
@@ -441,7 +443,7 @@
 \def\enditems{\par\egroup\iiskip}
 
 \def\startitem{\par \advance\itemnum by1
-   \noindent\llap{\printitem}\ignorespaces}
+   \itemhook \noindent\llap{\printitem}\ignorespaces}
 \def\normalitem{$\bullet$\enspace}
 
 \def\style#1{\expandafter\let\expandafter\printitem\csname item:#1\endcsname
@@ -1725,6 +1727,8 @@ Apr. 2015  \wtotoc, \Xtoc, \tocilabel, \pgilabel introduced.
            \outlinesC introduced
            \setpagedimensC corrected: \truedimen
            \opwarnig about missing \hyperlinks in \outlines added.
-           \fnotetext: \fnotehook inserted (bug removing)
+           \fnotetext: \fnotehook inserted (bug fixing)
+May  2015  \itemhook introduced
+           \REFversion introduced
 
 %%%%%%%%%%%%%% End of opmac.tex