diff options
Diffstat (limited to 'Master/texmf-dist/tex/platex/base/plcore.ltx')
-rw-r--r-- | Master/texmf-dist/tex/platex/base/plcore.ltx | 43 |
1 files changed, 20 insertions, 23 deletions
diff --git a/Master/texmf-dist/tex/platex/base/plcore.ltx b/Master/texmf-dist/tex/platex/base/plcore.ltx index b8237ce7aa9..3dcc6d0e942 100644 --- a/Master/texmf-dist/tex/platex/base/plcore.ltx +++ b/Master/texmf-dist/tex/platex/base/plcore.ltx @@ -33,7 +33,7 @@ \fi \def\pfmtname{pLaTeX2e} \def\pfmtversion - {2019-04-06} + {2019-10-01} \def\ppatch@level{0} \edef\platexBANNER{\noexpand\platexNILa \the\everyjob % LaTeX banner and delayed codes @@ -69,7 +69,8 @@ \def\plIncludeInRelease#1{% \if@plincludeinrelease \PackageError{platexrelease} - {mis-matched \string\plIncludeInRelease}{}% + {mis-matched \string\plIncludeInRelease}% + {There is an \string\plEndIncludeRelease\space missing}% \@plincludeinreleasefalse \fi \kernel@ifnextchar[% @@ -108,7 +109,7 @@ #2#3\@end@check@plIncludeInRelease{% \ifx\@check@plIncludeInRelease#2\else \PackageError{platexrelease} - {skipped \string\plIncludeInRelease}{}% + {skipped \string\plIncludeInRelease\space for tag \string#2}{}% \fi} %% File: plfonts.dtx \let\k@encoding\@empty @@ -152,17 +153,17 @@ \newbox\zstrutbox \newbox\ystrutbox \def\strutbox{\iftdir\tstrutbox\else\ystrutbox\fi} -\def\strut{\relax - \ifydir - \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi - \else +\DeclareRobustCommand\strut{\relax + \iftdir \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi + \else + \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi \fi} -\def\tstrut{\relax\hbox{\tate +\DeclareRobustCommand\tstrut{\relax\hbox{\tate \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi}} -\def\zstrut{\relax\hbox{\tate +\DeclareRobustCommand\zstrut{\relax\hbox{\tate \ifmmode\copy\zstrutbox\else\unhcopy\zstrutbox\fi}} -\def\ystrut{\relax\hbox{\yoko +\DeclareRobustCommand\ystrut{\relax\hbox{\yoko \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi}} \def\DeclareFontEncoding{% \begingroup @@ -350,6 +351,7 @@ \def\default@series{#3}% \def\default@shape{#4}}% \fi} +\@onlypreamble\DeclareKanjiSubstitution \def\DeclareErrorKanjiFont#1#2#3#4#5{% \xdef\error@kfontshape{% \noexpand\expandafter\noexpand\split@name\noexpand\string @@ -358,12 +360,7 @@ \gdef\default@k@family{#2}% \gdef\default@k@series{#3}% \gdef\default@k@shape{#4}% - \global\let\k@family\default@k@family - \global\let\k@series\default@k@series - \global\let\k@shape\default@k@shape - \gdef\f@size{#5}% - \gdef\f@baselineskip{#5pt}} -\@onlypreamble\DeclareKanjiSubstitution + } \@onlypreamble\DeclareErrorKanjiFont \def\DeclareFixedFont#1#2#3#4#5#6{% \begingroup @@ -460,7 +457,7 @@ \fi } \newif\if@knjcmd -\def\userelfont{\@knjcmdtrue} +\DeclareRobustCommand\userelfont{\@knjcmdtrue} \DeclareRobustCommand\selectfont{% \let\tmp@error@fontshape\error@fontshape \let\error@fontshape\error@kfontshape @@ -538,7 +535,7 @@ \let\size@update\relax}} \newbox\adjust@box \newdimen\adjust@dimen -\def\adjustbaseline{% +\DeclareRobustCommand\adjustbaseline{% \setbox\adjust@box\hbox{\char\jis"3441}%" \cht\ht\adjust@box \cdp\dp\adjust@box @@ -685,13 +682,13 @@ \DeclareRobustCommand\romanshape[1]{\edef\f@shape{#1}} \DeclareRobustCommand\kanjishape[1]{\edef\k@shape{#1}} \DeclareRobustCommand\fontshape[1]{\kanjishape{#1}\romanshape{#1}} -\def\usekanji#1#2#3#4{% +\DeclareRobustCommand\usekanji[4]{% \kanjiencoding{#1}\kanjifamily{#2}\kanjiseries{#3}\kanjishape{#4}% \selectfont\ignorespaces} -\def\useroman#1#2#3#4{% +\DeclareRobustCommand\useroman[4]{% \romanencoding{#1}\romanfamily{#2}\romanseries{#3}\romanshape{#4}% \selectfont\ignorespaces} -\def\usefont#1#2#3#4{% +\DeclareRobustCommand\usefont[4]{% \edef\tmp@item{{#1}}% \expandafter\expandafter\expandafter \inlist@\expandafter\tmp@item\expandafter{\kenc@list}% @@ -1142,7 +1139,7 @@ \stepcounter{page}% \let\firstmark\botmark } -\def \AtBeginDvi #1{% +\DeclareRobustCommand \AtBeginDvi [1]{% \global \setbox \@begindvibox \vbox{\yoko \unvbox \@begindvibox #1}% } @@ -1305,7 +1302,7 @@ \csname bm@#3\endcsname}% \if@pboxsw \m@th$\null\fi% !!! \@end@tempboxa} -\def\underline#1{% +\DeclareRobustCommand\underline[1]{% \relax \ifmmode\@@underline{#1}% \else \leavevmode\null$\@@underline{\hbox{#1}}\m@th$\null\relax\fi} |