csplain

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

1 files changed, 31 insertions, 16 deletions

diff --git a/Master/texmf-dist/tex/csplain/opmac/opmac.tex b/Master/texmf-dist/tex/csplain/opmac/opmac.tex
index d7ada7a3d28..6eb8d355ea4 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{Oct. 2013}
+\def\OPmacversion{Nov. 2013}
 
 \immediate\write16{This is OPmac (Olsak's Plain macros), version <\OPmacversion>}
 
@@ -224,16 +224,23 @@
 
 \def\mtext#1{\csname mt:#1:\csname lan:\the\language\endcsname\endcsname}
 
-\sdef{mt:chap:en}{Chapter}  \sdef{mt:chap:cz}{Kapitola}  \sdef{mt:chap:sk}{Kapitola}
-\sdef{mt:t:en}{Table}       \sdef{mt:t:cz}{Tabulka}      \sdef{mt:t:sk}{Tabu\v lka}
-\sdef{mt:f:en}{Figure}      \sdef{mt:f:cz}{Obr\'azek}    \sdef{mt:f:sk}{Obr\'azok}
+\sdef{mt:chap:en}{Chapter}  \sdef{mt:chap:cs}{Kapitola}  \sdef{mt:chap:sk}{Kapitola}
+\sdef{mt:t:en}{Table}       \sdef{mt:t:cs}{Tabulka}      \sdef{mt:t:sk}{Tabu\v lka}
+\sdef{mt:f:en}{Figure}      \sdef{mt:f:cs}{Obr\'azek}    \sdef{mt:f:sk}{Obr\'azok}
 
 \ifx\r\undefined \csname csaccents\endcsname \fi
 
 \sdef{lan:0}{en}  \sdef{lan:100}{en} \sdef{lan:101}{en}
-\sdef{lan:5}{cz}  \sdef{lan:15}{cz}  \sdef{lan:115}{cz}
+\sdef{lan:5}{cs}  \sdef{lan:15}{cs}  \sdef{lan:115}{cs}
 \sdef{lan:6}{sk}  \sdef{lan:16}{sk}  \sdef{lan:116}{sk}
 
+\ifx\uselanguage\undefined \else \message{OPmac: eTeX detected}
+  \bgroup
+     \uselanguage{czech}  \sxdef{lan:\the\language}{cs}
+     \uselanguage{slovak} \sxdef{lan:\the\language}{sk}
+  \egroup
+\fi
+
 %%%%%%%%%%%%%% REF file, sec 3.6 in opmac-d.pdf
 
 \newwrite\reffile
@@ -873,7 +880,7 @@
 \def\XpdfcolorK#1{\def\pdflastcolorK{#1}}
 \let\pdflastcolork=\pdfblackcolor \let\pdflastcolorK=\pdfblackcolor
 
-\def\Xpage#1{\lastpage=#1 \fnotenumlocal=0
+\def\Xpage#1{\ifnum\lastpage=#1 \else \lastpage=#1 \fnotenumlocal=0
    \ifx\pdflastcolork\pdfblackcolor\else
       \isdefined{pgc:#1}\iftrue \else \sxdef{pgc:#1}{}\fi
       {\let\setpgcolor=\relax \sxdef{pgc:#1}%
@@ -881,7 +888,7 @@
    \ifx\pdflastcolorK\pdfblackcolor\else
       \isdefined{pgc:#1}\iftrue \else \sxdef{pgc:#1}{}\fi
       {\let\setpgcolor=\relax \sxdef{pgc:#1}%
-            {\csname pgc:#1\endcsname\setpgcolor K{\pdflastcolorK}}}\fi
+            {\csname pgc:#1\endcsname\setpgcolor K{\pdflastcolorK}}}\fi\fi
 }
 \def\setpgcolor#1#2{\pdfliteral{#2 #1}}
 
@@ -1147,10 +1154,13 @@
          \ifnum\tmpnum<\vinolines\space
          \vireadline \advance\tmpnum by1 \repeat      %% skip line
    \tmpnum=0 \ifnum\vidolines=0 \tmpnum=-1 \fi
-   \loop \ifeof\vifile \tmpnum=\vidolines\space \fi
-         \ifnum\tmpnum<\vidolines\space
-         \vireadline \penalty\ttpenalty \viprintline  %% print line
-             \ifnum\vidolines=0 \else\advance\tmpnum by1 \fi \repeat
+   \ifeof\vifile \tmpnum=\vidolines\space \fi
+   \loop \ifnum\tmpnum<\vidolines\space
+            \vireadline 
+            \ifeof\vifile \tmpnum=\vidolines\space \else
+               \penalty\ttpenalty \viprintline \fi  %% print line
+            \ifnum\vidolines=0 \else\advance\tmpnum by1 \fi 
+            \repeat
    \egroup\par\ttskip\testparB
 }
 \def\vireadline{\read\vifile to \tmp \global\advance\viline by1 }
@@ -1195,10 +1205,10 @@
     \ifnum\colnum=0\def\vvleft{\vvitem}\else\addto\ddlinedata{\vvitem}\fi\fi
     \let\tmpa=\vrule \addtabdata{\vrule}}
 
-\def\crl{\cr\noalign{\hrule}}
-\def\crll{\cr\noalign{\hrule\kern\hhkern\hrule}}
+\def\crl{\crcr\noalign{\hrule}}
+\def\crll{\crcr\noalign{\hrule\kern\hhkern\hrule}}
 
-\def\crli{\cr \omit \gdef\dditem{\omit\tablinefil}\gdef\vvitem{\tabvvline}%
+\def\crli{\crcr \omit \gdef\dditem{\omit\tablinefil}\gdef\vvitem{\tabvvline}%
    \vvleft\tablinefil\ddlinedata\cr}
 \def\crlli{\crli\noalign{\kern\hhkern}\crli}
 \def\tablinefil{\leaders\hrule\hfil}
@@ -1214,7 +1224,7 @@
 \def\rulewidthA{\edef\hrule{\orihrule height\the\tmpdim}%
                 \edef\vrule{\orivrule width\the\tmpdim}}
 
-\def\frame#1{\setbox0=\hbox{#1}\setbox1=\vbox{\hrule}%
+\long\def\frame#1{\setbox0=\hbox{#1}\setbox1=\vbox{\hrule}%
    \tmpdim=\dp0 \advance\tmpdim by\ht1 \advance\tmpdim by\hhkern
    \vbox{\hrule\hbox{\vrule\kern\vvkern
          \vbox{\kern\hhkern\box0\kern\hhkern}\kern\vvkern\vrule}%
@@ -1656,6 +1666,11 @@ Oct. 2013  /Border .6
            \typobase introduced
            \typoscale[20000/] ``too large dimension'' ... solved 
            \activettchar reimplemented
+Nov. 2013  \Xpage: \ifnum\lastpage=#1 \else inserted
+           \frame is defined as \long
+           multilanuage: cz -> cs changed (by ISO 639-1)
+           \cr -> \crcr in \crl, \crll and \crli
+           \doverbinput: \ifeof\vifile added (bug ``empty line at EOF'' corrected)
+           eTeX support for multilang added.
 
 %%%%%%%%%%%%%% End of opmac.tex
-