diff options
Diffstat (limited to 'Master/texmf-dist/tex/csplain/opmac/opmac.tex')
-rw-r--r-- | Master/texmf-dist/tex/csplain/opmac/opmac.tex | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/Master/texmf-dist/tex/csplain/opmac/opmac.tex b/Master/texmf-dist/tex/csplain/opmac/opmac.tex index 4b6dc67c69e..fbd35930f14 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{Nov. 2015} +\def\OPmacversion{Mar. 2016} \immediate\write16{This is OPmac (Olsak's Plain macros), version <\OPmacversion>} %%%%%%%%%%%%%% Basic macros, sec. 3.1 in opmac-d.pdf @@ -252,7 +252,8 @@ \ifx\uselanguage\undefined \def\isolangset#1#2{}\else \message{OPmac: etex.src macros detected} - \def\isolangset#1#2{{\uselanguage{#1}\sxdef{lan:\the\language}{#2}}} + \def\isolangset#1#2{{\uselanguage{#1}\sxdef{lan:\the\language}{#2}% + \global\expandafter\chardef\csname#2Patt\endcsname=\language}} \isolangset{USenglish}{en} \isolangset{czech}{cs} \isolangset{slovak}{sk} \fi @@ -1211,12 +1212,13 @@ \ifpdftex \def\inspic #1 {\hbox{% \pdfximage \ifdim\picwidth=0pt \else width\picwidth\fi - \ifdim\picheight=0pt \else height\picheight\fi {\picdir#1}% + \ifdim\picheight=0pt \else height\picheight\fi \inspicpage {\picdir#1}% \pdfrefximage\pdflastximage}} \else \def\inspic #1 {\opwarning {The \noexpand\inspic is supported for PDF output only}} \fi +\def\inspicpage{} %%%%%%%%%%%%%%% transformation matrix -- sec. 3.21 in opmac-d.pdf @@ -1283,7 +1285,7 @@ {\fnotehook\typobase\typoscale[800/800]\vfootnote\fnmarkx{#1}}% } \def\fnmarkx{\isdefined{fn:\the\fnotenum}\iftrue\thefnote\else$^?$\fi} -\def\thefnote{$^{\locfnum}$)} +\def\thefnote{$^{\locfnum}$} \def\locfnum{\csname fn:\the\fnotenum\endcsname} \def\Xfnote{\advance\fnotenumlocal by1 \advance\fnotenum by1 @@ -1753,5 +1755,8 @@ Oct. 2015 \printttline, \ptthook introduced, \viprintline redesigned. Nov. 2015 \parskip=0 in \doverbinput, \vskip\parskip before first \ttskip \addto\prepghook instead \def\prepghook in \draft \mnote: ifvmode \hbox{\strut...} added +Jan. 2016 \inspicpage introduced + \isolangset: \chardef..Patt added +Mar. 2016 \thefnote default changed: ^{num}) -> ^{num} %%%%%%%%%%%%%% End of opmac.tex |