csplain (16may14)

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

3 files changed, 15 insertions, 12 deletions

diff --git a/Master/texmf-dist/tex/csplain/opmac/opmac-bib-iso690.tex b/Master/texmf-dist/tex/csplain/opmac/opmac-bib-iso690.tex
index 983e748f569..66d1890a422 100644
--- a/Master/texmf-dist/tex/csplain/opmac/opmac-bib-iso690.tex
+++ b/Master/texmf-dist/tex/csplain/opmac/opmac-bib-iso690.tex
@@ -86,7 +86,7 @@
 \mtdef{bib.edition}        { ed.}                 { vyd.}             {}
 \mtdef{bib.bachthesis}     {Bachelor's Thesis}    {Bakalářská práce}  {Bakalárska práca}
 \mtdef{bib.masthesis}      {Master's Thesis}      {Diplomová práce}   {Diplomová práca}
-\mtdef{bib.phdthesis}      {Ph.D. Thesis}         {Dizertační práce}  {Dizertačná práca}
+\mtdef{bib.phdthesis}      {Ph.D. Thesis}         {Disertační práce}  {Dizertačná práca}
 \mtdef{bib.available}      {Available from }      {Dostupné na }      {}
 \mtdef{bib.availablealso}  {Available also from } {Dostupné též na }  {Dotupné tiež na }
 \mtdef{bib.citedate}       {cit.~}                {vid.~}             {}
diff --git a/Master/texmf-dist/tex/csplain/opmac/opmac-bib-simple.tex b/Master/texmf-dist/tex/csplain/opmac/opmac-bib-simple.tex
index 139e4ff6504..67f15a224e0 100644
--- a/Master/texmf-dist/tex/csplain/opmac/opmac-bib-simple.tex
+++ b/Master/texmf-dist/tex/csplain/opmac/opmac-bib-simple.tex
@@ -31,8 +31,8 @@
 
 \mtdef{bib.and}       {, and }    { a }     {}
 \mtdef{bib.edition}   {edition}   {vydání}  {vydanie}
-\mtdef{bib.phdthesis} {Master's thesis}   {Diplomová práce}   {Diplomová práca}
-\mtdef{bib.masterthesis} {Ph.D. thesis}   {Dizertační práce}  {Dizertačná práca}
+\mtdef{bib.masterthesis} {Master's Thesis}   {Diplomová práce}   {Diplomová práca}
+\mtdef{bib.phdthesis} {Ph.D. Thesis}   {Disertační práce}  {Dizertačná práca}
 
 \def\preurl{\hfil\break} 
 
diff --git a/Master/texmf-dist/tex/csplain/opmac/opmac.tex b/Master/texmf-dist/tex/csplain/opmac/opmac.tex
index b3824337d79..53350905185 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 2014c}
+\def\OPmacversion{May 2014d}
 \immediate\write16{This is OPmac (Olsak's Plain macros), version <\OPmacversion>}
 
 %%%%%%%%%%%%%% Basic macros, sec. 3.1 in opmac-d.pdf
@@ -325,7 +325,7 @@
 \def\titfont{\typobase\typoscale[\magstep4/\magstep4]\bf}
 \def\chapfont{\typobase\typoscale[\magstep3/\magstep3]\bfshape}
 \def\secfont{\typobase\typoscale[\magstep2/\magstep2]\bfshape}
-\def\seccfont{\typobase\typoscale[\magstep1/\magstep2]\bfshape}
+\def\seccfont{\typobase\typoscale[\magstep1/\magstep1]\bfshape}
 \def\bfshape{\let\tenit=\tenbi \boldmath \bf}
 
 \newcount\chapnum \newcount\secnum \newcount\seccnum \newcount\nonumnum
@@ -1186,14 +1186,14 @@
 
 \def\table{\vbox\bgroup \catcode`\|=12 \tableA}
 \def\tableA#1#2{\offinterlineskip \def\tmpa{}\tabdata={}\scantabdata#1\relax
-   \halign\expandafter{\the\tabdata\tabstrutA\cr#2\crcr}\egroup}
+   \halign\expandafter{\the\tabdata\cr#2\crcr}\egroup}
 
 \def\scantabdata#1{\let\next=\scantabdata
    \ifx\relax#1\let\next=\relax
    \else\ifx|#1\addtabvrule
-   \else\expandafter\ifx\csname tabdeclare#1\endcsname \relax
-     \opwarning{tab-declare letter #1 unknown, ignored}%
-        \else\expandafter \addtabitem\expandafter{\csname tabdeclare#1\endcsname}%
+      \else\expandafter\ifx\csname tabdeclare#1\endcsname \relax
+            \opwarning{tab-declare letter #1 unknown, ignored}%
+         \else\expandafter \addtabitem\expandafter{\csname tabdeclare#1\endcsname}%
    \fi\fi\fi \next
 }
 \def\tabdeclarec{\tabiteml\hfil##\unsskip\hfil\tabitemr}
@@ -1202,7 +1202,7 @@
 
 \def\unsskip{\ifdim\lastskip>0pt \unskip\fi}
 \def\addtabitem#1{\ifnum\colnum>0 \addtabdata{&}\addto\ddlinedata{&\dditem}\fi
-    \advance\colnum by1 \let\tmpa=\relax \expandafter\addtabdata\expandafter{#1}}
+    \advance\colnum by1 \let\tmpa=\relax \expandafter\addtabdata\expandafter{#1\tabstrutA}}
 \def\addtabdata#1{\expandafter\tabdata\expandafter{\the\tabdata#1}}
 \def\addtabvrule{\ifx\tmpa\vrule \addtabdata{\kern\vvkern}%
     \ifnum\colnum=0\def\vvleft{\vvitem}\else\addto\ddlinedata{\vvitem}\fi\fi
@@ -1212,7 +1212,7 @@
 \def\crll{\crcr\noalign{\hrule\kern\hhkern\hrule}}
 
 \def\crli{\crcr \omit \gdef\dditem{\omit\tablinefil}\gdef\vvitem{\tabvvline}%
-   \vvleft\tablinefil\ddlinedata\cr}
+   \vvleft\tablinefil\ddlinedata\crcr}
 \def\crlli{\crli\noalign{\kern\hhkern}\crli}
 \def\tablinefil{\leaders\hrule\hfil}
 \def\tabvvline{\vrule\kern\vvkern\vrule}
@@ -1725,7 +1725,10 @@ Apr. 2014  \nonumcitations, \ecite, \printbib, \lastbibnum introduced
 Apr. 2014b \nocite[*] bug removed, \insertmark corrected
 Apr. 2014c nowarn about old csplain if csplain isn't used
 May  2014  \hyphenchar\urlfont=-1, \urlspecchar introduced
-May  2014b \linkactive introduced (bug correction)
+May  2014b \linkactive introduced (bug fixing)
 May  2014c \maybebreak introduced
+May  2014d \seccfont bug fixed
+           \tabstrut inserted to each column in the \table
+
 
 %%%%%%%%%%%%%% End of opmac.tex