diff options
author | Karl Berry <karl@freefriends.org> | 2018-09-22 20:59:59 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-09-22 20:59:59 +0000 |
commit | f2735cd0c7d339056ebced0b410c14666b2e4812 (patch) | |
tree | 670ed36fea35bbafe2d0372707693859074635eb /Master/texmf-dist/tex/platex | |
parent | 0be74c88f9c61d90bc43e1644a980723e0bd6b8f (diff) |
platex (22sep18)
git-svn-id: svn://tug.org/texlive/trunk@48735 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/platex')
-rw-r--r-- | Master/texmf-dist/tex/platex/base/plext.sty | 55 |
1 files changed, 35 insertions, 20 deletions
diff --git a/Master/texmf-dist/tex/platex/base/plext.sty b/Master/texmf-dist/tex/platex/base/plext.sty index 91b85699afd..69482194e17 100644 --- a/Master/texmf-dist/tex/platex/base/plext.sty +++ b/Master/texmf-dist/tex/platex/base/plext.sty @@ -15,19 +15,19 @@ %% File: plext.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{plext} - [2017/07/21 v1.2h pLaTeX package file (community edition)] + [2018/09/20 v1.2j pLaTeX package file (community edition)] \newif\if@rotsw \def\array{\let\@acol\@arrayacol \let\@classz\@arrayclassz \let\@classiv\@arrayclassiv \let\\\@arraycr\let\@halignto\@empty\X@tabarray} \def\tabular{\let\@halignto\@empty\X@tabular} \@namedef{tabular*}{\@ifnextchar<%> - {\@stabular}{\@stabular<Z>}} + {\p@stabular}{\p@stabular<Z>}} \def\X@tabarray{\@ifnextchar<%> {\p@tabarray}{\p@tabarray<Z>}} \def\X@tabular{\@ifnextchar<%> {\p@tabular}{\p@tabular<Z>}} -\def\@stabular<#1>#2{% +\def\p@stabular<#1>#2{% \setlength\dimen@{#2}% \edef\@halignto{to\the\dimen@}\p@tabular<#1>} \def\p@tabular<#1>{\leavevmode \null\hbox \bgroup $\let\@acol\@tabacol @@ -35,7 +35,10 @@ \let\@classiv\@tabclassiv \let\\\@tabularcr\p@tabarray<#1>} \def\p@tabarray<#1>{\m@th\@ifnextchar[%] {\p@array<#1>}{\p@array<#1>[c]}} -\def\p@array<#1>[#2]#3{\setbox\@arstrutbox\hbox{% +\def\p@array<#1>[#2]#3{% + \fork@array@option<#1>[#2]\@begin@alignbox + \bgroup\box@dir\adjustbaseline + \setbox\@arstrutbox\hbox{% \iftdir \if #1y\relax\yoko \vrule\@height\arraystretch\ht\strutbox @@ -56,15 +59,16 @@ \@depth\arraystretch\dp\strutbox \@width\z@ \fi \fi}% - \fork@array@option<#1>[#2]% \@mkpream{#3}\edef\@preamble{\ialign \noexpand\@halignto \bgroup \tabskip\z@skip \@arstrut \@preamble \tabskip\z@skip \cr}% \let\@startpbox\@@startpbox \let\@endpbox\@@endpbox \let\tabularnewline\\% - \@begin@alignbox\bgroup\box@dir\adjustbaseline \let\par\@empty - \let\@sharp##\let\protect\relax - \lineskip\z@skip\baselineskip\z@skip\@preamble} + \let\@sharp##% + \set@typeset@protect + \lineskip\z@skip\baselineskip\z@skip + \ifhmode \@preamerr\z@ \@@par\fi + \@preamble} \def\endarray{\crcr\egroup\egroup\@end@alignbox} \def\endtabular{\crcr\egroup\egroup\@end@alignbox $\egroup\null} \expandafter \let \csname endtabular*\endcsname = \endtabular @@ -178,11 +182,11 @@ }\hrule width\floatwidth height\floatruletick depth\z@}} \def\DeclareLayoutCaption#1<#2>(#3)[#4#5]{% \expandafter - \ifx\csname #1@layoutcaption\endcsname\relax \else + \ifx\csname #1@layoutc@ption\endcsname\relax \else \@latex@info{Redeclaring capiton layout setting of '#1'}% \fi \expandafter - \gdef\csname #1@layoutcaption\endcsname{% + \gdef\csname #1@layoutc@ption\endcsname{% \if Z\caption@dir\def\caption@dir{#2}\fi \ifdim\captionwidth=\z@ \captionwidth=#3\relax\fi \if Z\caption@posa\def\caption@posa{#4}\fi @@ -202,12 +206,21 @@ \@ifnextchar[{\@iilayoutcaption}{\relax}} \def\@iilayoutcaption[#1#2]{% \def\caption@posa{#1}\def\caption@posb{#2}} -\def\pcaption{\refstepcounter\@captype \@dblarg{\@pcaption\@captype}} +\def\pcaption{% + \ifx\@captype\@undefined + \@latex@error{\noexpand\pcaption outside float}\@ehd + \expandafter\@gobble + \else + \refstepcounter\@captype + \expandafter\@firstofone + \fi + {\@dblarg{\@pcaption\@captype}}% +} \long\def\@pcaption#1[#2]#3{% \addcontentsline{\csname ext@#1\endcsname}{#1}{% \protect\numberline{\csname the#1\endcsname}{\ignorespaces#2}}% \ifvoid\@floatbox - \latex@error{Use with `\protect\layoutfloat'.}\@eha + \@latex@error{Use \noexpand\pcaption with `\string\layoutfloat'}\@eha \fi \make@pcaptionbox{#3}% \@pboxswfalse @@ -215,22 +228,23 @@ \if l\caption@posb\box\@captionbox\kern\captionfloatsep\fi \if t\caption@posa\vtop \else\if b\caption@posa\vbox - \else\ifmmode\vcenter \else\@pboxswtrue $\vcenter \fi\fi\fi + \else\@pboxswtrue $\vcenter \fi\fi {\if u\caption@posb\box\@captionbox\kern\captionfloatsep\fi \unvbox\@floatbox \if d\caption@posb\kern\captionfloatsep\box\@captionbox\fi}% + \if@pboxsw \m@th$\fi \if r\caption@posb\kern\captionfloatsep\box\@captionbox\fi - \if@pboxsw \m@th$\fi \if r\float@pos\else\hss\fi}}% + \if r\float@pos\else\hss\fi}}% \par\vskip.25\baselineskip \box\@tempboxa} \def\make@pcaptionbox#1{% \expandafter - \ifx\csname\@captype @layoutcaption\endcsname\relax - \@latex@warning{Default caption layout of `\@captype' unknown.}% + \ifx\csname\@captype @layoutc@ption\endcsname\relax + \@latex@warning{Default caption layout of `\@captype' unknown}% \def\caption@dir{Z}\captionwidth\z@ \def\caption@posa{Z}\def\caption@posb{Z}% \else - \csname \@captype @layoutcaption\endcsname + \csname \@captype @layoutc@ption\endcsname \fi \@rotswfalse \@tempswafalse \iftdir\if y\caption@dir \let\captiondir\yoko \@tempswatrue @@ -246,7 +260,7 @@ \if@tempswa \@tempdima\ht0 \else\@tempdima\wd0 \fi \ifdim\@tempdima>\captionwidth \@tempdima\captionwidth \fi \@pboxswfalse - \setbox0\hbox{\if@rotsw\ifmmode\@rotswfalse \else $\fi\fi + \setbox0\hbox{\if@rotsw $\fi \if u\caption@posb\vbox \else\if d\caption@posb\vbox \else\if t\caption@posa\vtop @@ -500,7 +514,7 @@ \def\@rensuji{\@ifnextchar[{\@@rensuji}{\@@rensuji[c]}} \def\@@rensuji[#1]#2{% \ifvmode\leavevmode\fi - \ifydir\hbox{#2}\else + \iftdir\ifmdir\hbox{#2}\else \hskip\rensujiskip \ifnot@advanceline\not@advancelinefalse\else \setbox\z@\hbox{\yoko#2}% @@ -515,7 +529,8 @@ \else\vtop{\hbox to1zw{\yoko#2\hss}}% \fi\fi \hskip\rensujiskip -\fi} + \fi\else\hbox{#2}\fi +} \let\Rensuji\rensuji \let\prensuji\rensuji \def\Kanji#1{\expandafter\@Kanji\csname c@#1\endcsname} |