1 files changed, 9 insertions, 5 deletions
diff --git a/Master/texmf-dist/tex/csplain/opmac/opmac.tex b/Master/texmf-dist/tex/csplain/opmac/opmac.tex
index 9894fe70c73..6c4e4036e3c 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{May 2015}  
+\def\OPmacversion{Jun 2015}  
 \immediate\write16{This is OPmac (Olsak's Plain macros), version <\OPmacversion>}
 
 %%%%%%%%%%%%%% Basic macros, sec. 3.1 in opmac-d.pdf
@@ -134,7 +134,7 @@
       \opwarning{No multilanguage support (csplain is recommended)}
    \fi
    % macros from csplain, file csfontsm.tex:
-   \font\tenbi=csbxti10 \def\bi{\tenbi}
+   \font\tenbi=cmbxti10 \def\bi{\tenbi}
    \def\letfont#1#2{\ifx#2=\expandafter\letfont\expandafter#1\else
      \expandafter\font\expandafter#1\expandafter\rfontskipat\fontname#2 \relax\space \fi}
    \def\rfontskipat#1{\ifx#1"\expandafter\rfskipatX\else\expandafter\rfskipatN\expandafter#1\fi}
@@ -951,9 +951,9 @@
    \replacestrings{\{}{{\char`\{}}%
    \replacestrings{\}}{{\char`\}}}%
    \replacestrings{&}{{\urlbskip\char`\& \urlskip}}%
-   \def\|{}\ulink[#1]{\urlfont\tmpb}%
+   \def\|{}\ulink[#1]{\urlfont\tmpb\null}%
 }}
-\def\urlfont{\tt \hyphenchar\the\font=-1 \let\|=\urlspecchar}
+\def\urlfont{\tt \let\|=\urlspecchar}
 \def\urlspecchar{\penalty10 }
 \def\urlskip{\null\nobreak\hskip0pt plus0.05em\relax}
 \def\urlbskip{\penalty100 \hskip0pt plus0.05em\relax}
@@ -1297,7 +1297,7 @@
       \isdefined{mn:\the\mnotenum}\iftrue
       \else\opwarning{unknown \noexpand\mnote side. TeX me again}\fi
       \edef\tmp{\csname mn:\the\mnotenum\endcsname}%
-      \openref\wref\Xmnote{}%
+      \openref\wref\Xmnote{}\ifvmode\nobreak\fi
    \else \let\tmp=\mnotesfixed \fi
    \expandafter\ifx\tmp \left
       \hbox to0pt{\kern-\mnotesize \kern-\mnoteindent
@@ -1733,5 +1733,9 @@ May  2015  \itemhook introduced
            \REFversion introduced
            \prepghook introduced, \draft redefined using \prepghook
            \mnote, \fnote redeclared as \long
+Jun  2015  \urlfont: \hyphenchar=-1 removed (bug fixed)
+           \mnote: \nobreak after \wref added (bug fixed)
+           csbxti10 -> cmbxti10, corrected for non-csplain users
+
 
 %%%%%%%%%%%%%% End of opmac.tex