csplain (19jul15)

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

1 files changed, 13 insertions, 12 deletions

diff --git a/Master/texmf-dist/tex/csplain/opmac/opmac.tex b/Master/texmf-dist/tex/csplain/opmac/opmac.tex
index 6c4e4036e3c..7425f1be088 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{Jun 2015}  
+\def\OPmacversion{Jul. 2015}  
 \immediate\write16{This is OPmac (Olsak's Plain macros), version <\OPmacversion>}
 
 %%%%%%%%%%%%%% Basic macros, sec. 3.1 in opmac-d.pdf
@@ -279,7 +279,7 @@
 }
 \def\openrefA#1{%
    \immediate\openout\reffile=\jobname.ref
-   \def\wref##1##2{\write\reffile{\string##1##2}}%
+   \gdef\wref##1##2{\write\reffile{\string##1##2}}%
    \immediate\write\reffile {\percent\percent\space OPmac - REF file (#1)}%
    \immediate\wref\Xrefversion{{\REFversion}}%
 }
@@ -902,7 +902,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{#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
@@ -911,9 +911,9 @@
 }
 \def\toclink#1{\toclinkA{#1}}
 \def\pglink#1{\pgfolioA{#1}\relax}
-\def\citelink#1#2{#2}
-\def\reflink[#1]#2{#2}
-\def\ulink[#1]#2{{#2}}
+\def\citelink#1#2{\leavevmode#2}
+\def\reflink[#1]#2{\leavevmode#2}
+\def\ulink[#1]#2{{\leavevmode#2}}
 \def\urlcolor{}
 
 \def\hyperlinks#1#2{%
@@ -1520,8 +1520,9 @@
 \def\begoutput{%
    \immediate\wref\Xpage{{\the\pageno}}%
    \def\nl{ }\def\fnote##1{}\def\fnotemark##1{}%
+   \prephoffset
 }
-\def\endoutput{}
+\def\endoutput{} \def\prephoffset{}
 
 \def\opmacoutput{%
   \setbox0=\vbox{\prepghook\ensureblacko{\makeheadline}\pagebody\ensureblacko{\makefootline}}%
@@ -1555,7 +1556,6 @@
 
 \newdimen\pgwidth  \newdimen\pgheight  \pgwidth=0pt
 \newdimen\shiftoffset
-\newif\ifmarginshook  \marginshookfalse
 
 \def\margins/#1 #2 (#3,#4,#5,#6)#7 {\def\tmp{#7}%
    \ifx\tmp\empty
@@ -1582,11 +1582,10 @@
                     \advance\vsize -#5\tmp \advance\vsize -#6\tmp
                     \advance\voffset #5\tmp
       \fi\fi
-      \if 1#1\shiftoffset=0pt \else \if 2#1% double-page layout
+      \if 1#1\shiftoffset=0pt \def\prephoffset{}\else \if 2#1% double-page layout
          \shiftoffset=\pgwidth \advance\shiftoffset -\hsize
          \advance\shiftoffset -2\hoffset \advance\shiftoffset -2in
-         \ifmarginshook \else \marginshooktrue
-            \addto\pghook{\ifodd\pageno \else \advance\hoffset \shiftoffset \fi}\fi
+         \def\prephoffset{\ifodd\pageno \else \advance\hoffset \shiftoffset \fi}%
       \else \opwarning{use \string\margins/1 or \string\margins/2}%
    \fi\fi\fi
 }
@@ -1736,6 +1735,8 @@ May  2015  \itemhook introduced
 Jun  2015  \urlfont: \hyphenchar=-1 removed (bug fixed)
            \mnote: \nobreak after \wref added (bug fixed)
            csbxti10 -> cmbxti10, corrected for non-csplain users
-
+           default \ulink: \leavevmode added (bug fixed)
+Jul. 2015  \openref: \def\wref -> \gdef\wref (bug fixed)
+           \margins/2: \prephoffset introduced (bug fixed)
 
 %%%%%%%%%%%%%% End of opmac.tex