summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-10-01 21:17:27 +0000
committerKarl Berry <karl@freefriends.org>2019-10-01 21:17:27 +0000
commitf3e77606f13c3ff3c0915bd4860c3486948400c6 (patch)
tree205a7815ba1653b80a41f838d5e54f72921e63ff /Master/texmf-dist/tex
parentce806fd00d3a423032a0fb09ab6cd6a7f2b4cccd (diff)
platex (1oct19)
git-svn-id: svn://tug.org/texlive/trunk@52243 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/platex/base/exppl2e.sty4
-rw-r--r--Master/texmf-dist/tex/platex/base/platexrelease.sty179
-rw-r--r--Master/texmf-dist/tex/platex/base/plcore.ltx43
-rw-r--r--Master/texmf-dist/tex/platex/base/pldefs.ltx6
-rw-r--r--Master/texmf-dist/tex/platex/base/plext.sty6
-rw-r--r--Master/texmf-dist/tex/platex/base/ptrace.sty32
6 files changed, 223 insertions, 47 deletions
diff --git a/Master/texmf-dist/tex/platex/base/exppl2e.sty b/Master/texmf-dist/tex/platex/base/exppl2e.sty
index b4eadb72265..9fab0c5b09f 100644
--- a/Master/texmf-dist/tex/platex/base/exppl2e.sty
+++ b/Master/texmf-dist/tex/platex/base/exppl2e.sty
@@ -34,7 +34,7 @@
% case 1: This file must be a normal package
\NeedsTeXFormat{pLaTeX2e}
\ProvidesPackage{exppl2e}
- [2018/12/02 v1.1c Experimental pLaTeX2e features]
+ [2019/09/16 v1.1d Experimental pLaTeX2e features]
\PackageWarningNoLine{exppl2e}{%
This is the unstable, experimental part of pLaTeX2e.\MessageBreak
This package may contain:\MessageBreak
@@ -296,7 +296,7 @@
% \cs{strut}$B$r=D?t<0%G%#%l%/%7%g%s$G;H$C$?>l9g$X$N=$@5!#(B
% \begin{macrocode}
%% \strut $B$N2~NIHG(B
-\def\strut{\relax
+\DeclareRobustCommand\strut{\relax
\iftdir
\ifmdir
%% [$B=D?t<0%G%#%l%/%7%g%s(B]
diff --git a/Master/texmf-dist/tex/platex/base/platexrelease.sty b/Master/texmf-dist/tex/platex/base/platexrelease.sty
index d522fa1ee87..ffd149cdd99 100644
--- a/Master/texmf-dist/tex/platex/base/platexrelease.sty
+++ b/Master/texmf-dist/tex/platex/base/platexrelease.sty
@@ -16,15 +16,16 @@
%%
%% File: plvers.dtx
\edef\p@known@latexreleaseversion
- {2018-12-01}
+ {2019-10-01}
\edef\platexreleaseversion
- {2019-04-06}
+ {2019-10-01}
\newif\if@plincludeinrelease
\@plincludeinreleasefalse
\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[%
@@ -63,7 +64,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: platexrelease.dtx
\NeedsTeXFormat{pLaTeX2e}
@@ -133,6 +134,7 @@ of this package available from CTAN}
some critical bugs. We advise you to\MessageBreak
select another format date}
\plIncludeInRelease{2017/10/28}{\PackageWarning}{pLaTeX Info}%
+ % * <2019-10-01>
% * <2019-04-06>
% * <2018-12-01>
% * <2018-07-28>+1
@@ -196,13 +198,22 @@ of this package available from CTAN}
\let\ystrutbox\@undefined
\plEndIncludeInRelease
\plIncludeInRelease{2017/04/08}{\strutbox}
- {Add \strutbox}%
+ {Macro definition of \strutbox}%
\def\strutbox{\iftdir\tstrutbox\else\ystrutbox\fi}
\plEndIncludeInRelease
\plIncludeInRelease{0000/00/00}{\strutbox}
- {Add \strutbox}%
+ {LaTeX2e original}%
\newbox\strutbox % emulation purpose only
\plEndIncludeInRelease
+\plIncludeInRelease{2019/10/01}{\strut}
+ {Make robust}%
+\DeclareRobustCommand\strut{\relax
+ \iftdir
+ \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi
+ \else
+ \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi
+ \fi}
+\plEndIncludeInRelease
\plIncludeInRelease{2017/04/08}{\strut}
{Use \ystrutbox}%
\def\strut{\relax
@@ -211,24 +222,49 @@ of this package available from CTAN}
\else
\ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi
\fi}
+\expandafter \let \csname strut \endcsname \@undefined
\plEndIncludeInRelease
\plIncludeInRelease{0000/00/00}{\strut}
- {Use \ystrutbox}%
+ {ASCII Corporation original}%
\def\strut{\relax
\ifydir
\ifmmode\copy\strutbox\else\unhcopy\strutbox\fi
\else
\ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi
\fi}
+\expandafter \let \csname strut \endcsname \@undefined
+\plEndIncludeInRelease
+\plIncludeInRelease{2019/10/01}{\tstrut}
+ {Make robust}%
+\DeclareRobustCommand\tstrut{\relax\hbox{\tate
+ \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi}}
+\DeclareRobustCommand\zstrut{\relax\hbox{\tate
+ \ifmmode\copy\zstrutbox\else\unhcopy\zstrutbox\fi}}
+\plEndIncludeInRelease
+\plIncludeInRelease{0000/00/00}{\tstrut}
+ {ASCII Corporation original}%
+\def\tstrut{\relax\hbox{\tate
+ \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi}}
+\def\zstrut{\relax\hbox{\tate
+ \ifmmode\copy\zstrutbox\else\unhcopy\zstrutbox\fi}}
+\expandafter \let \csname tstrut \endcsname \@undefined
+\expandafter \let \csname zstrut \endcsname \@undefined
+\plEndIncludeInRelease
+\plIncludeInRelease{2019/10/01}{\ystrut}
+ {Make robust}%
+\DeclareRobustCommand\ystrut{\relax\hbox{\yoko
+ \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi}}
\plEndIncludeInRelease
\plIncludeInRelease{2017/04/08}{\ystrut}
{Add \ystrut}%
\def\ystrut{\relax\hbox{\yoko
\ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi}}
+\expandafter \let \csname ystrut \endcsname \@undefined
\plEndIncludeInRelease
\plIncludeInRelease{0000/00/00}{\ystrut}
{Add \ystrut}%
\let\ystrut\@undefined
+\expandafter \let \csname ystrut \endcsname \@undefined
\plEndIncludeInRelease
\plIncludeInRelease{2018/04/01}{\DeclareFontEncoding@}
{UTF-8 Encoding}%
@@ -279,7 +315,7 @@ of this package available from CTAN}
\fi
\plEndIncludeInRelease
\plIncludeInRelease{0000/00/00}{\DeclareFontEncoding@}
- {UTF-8 Encoding}%
+ {ASCII Corporation original}%
\def\DeclareFontEncoding@#1#2#3{%
\expandafter
\ifx\csname T@#1\endcsname\relax
@@ -299,6 +335,43 @@ of this package available from CTAN}
}
\let\DeclareFontEncoding@saved\@undefined
\plEndIncludeInRelease
+\plIncludeInRelease{2019/10/01}{\DeclareErrorKanjiFont}
+ {No side effects please}%
+\def\DeclareErrorKanjiFont#1#2#3#4#5{%
+ \xdef\error@kfontshape{%
+ \noexpand\expandafter\noexpand\split@name\noexpand\string
+ \expandafter\noexpand\csname#1/#2/#3/#4/#5\endcsname
+ \noexpand\@nil}%
+ \gdef\default@k@family{#2}%
+ \gdef\default@k@series{#3}%
+ \gdef\default@k@shape{#4}%
+ }
+\plEndIncludeInRelease
+\plIncludeInRelease{0000/00/00}{\DeclareErrorKanjiFont}
+ {ASCII Corporation original}%
+\def\DeclareErrorKanjiFont#1#2#3#4#5{%
+ \xdef\error@kfontshape{%
+ \noexpand\expandafter\noexpand\split@name\noexpand\string
+ \expandafter\noexpand\csname#1/#2/#3/#4/#5\endcsname
+ \noexpand\@nil}%
+ \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}}
+\plEndIncludeInRelease
+\plIncludeInRelease{2019/10/01}{\userelfont}
+ {Make robust}%
+\DeclareRobustCommand\userelfont{\@knjcmdtrue}
+\plEndIncludeInRelease
+\plIncludeInRelease{0000/00/00}{\userelfont}
+ {ASCII Corporation original}%
+\def\userelfont{\@knjcmdtrue}
+\expandafter \let \csname userelfont \endcsname \@undefined
+\plEndIncludeInRelease
\plIncludeInRelease{2017/04/08}{\set@fontsize}
{Construct \ystrutbox}%
\def\set@fontsize#1#2#3{%
@@ -325,7 +398,7 @@ of this package available from CTAN}
\let\size@update\relax}}
\plEndIncludeInRelease
\plIncludeInRelease{0000/00/00}{\set@fontsize}
- {Construct \ystrutbox}%
+ {ASCII Corporation original}%
\def\set@fontsize#1#2#3{%
\@defaultunits\@tempdimb#2pt\relax\@nnil
\edef\f@size{\strip@pt\@tempdimb}%
@@ -349,6 +422,27 @@ of this package available from CTAN}
\@height.7\baselineskip \@depth.3\baselineskip}%
\let\size@update\relax}}
\plEndIncludeInRelease
+\plIncludeInRelease{2019/10/01}{\adjustbaseline}
+ {Make robust}%
+\DeclareRobustCommand\adjustbaseline{%
+ \setbox\adjust@box\hbox{\char\jis"3441}%"
+ \cht\ht\adjust@box
+ \cdp\dp\adjust@box
+ \cwd\wd\adjust@box
+ \cvs\normalbaselineskip
+ \chs\cwd
+ \cHT\cht \advance\cHT\cdp
+ \iftdir
+ \setbox\adjust@box\hbox{\tbaselineshift\z@ M}%
+ \adjust@dimen\ht\adjust@box
+ \advance\adjust@dimen\dp\adjust@box
+ \advance\adjust@dimen-\cHT
+ \divide\adjust@dimen\tw@
+ \advance\adjust@dimen\cdp
+ \advance\adjust@dimen-\dp\adjust@box
+ \tbaselineshift\adjust@dimen
+ \fi}
+\plEndIncludeInRelease
\plIncludeInRelease{2017/07/29}{\adjustbaseline}
{Change zenkaku reference}%
\def\adjustbaseline{%
@@ -369,9 +463,10 @@ of this package available from CTAN}
\advance\adjust@dimen-\dp\adjust@box
\tbaselineshift\adjust@dimen
\fi}
+\expandafter \let \csname adjustbaseline \endcsname \@undefined
\plEndIncludeInRelease
\plIncludeInRelease{0000/00/00}{\adjustbaseline}
- {Change zenkaku reference}%
+ {ASCII Corporation original}%
\def\adjustbaseline{%
\setbox\adjust@box\hbox{\char\euc"A1A1}%"
\cht\ht\adjust@box
@@ -390,6 +485,42 @@ of this package available from CTAN}
\advance\adjust@dimen-\dp\adjust@box
\tbaselineshift\adjust@dimen
\fi}
+\expandafter \let \csname adjustbaseline \endcsname \@undefined
+\plEndIncludeInRelease
+\plIncludeInRelease{2019/10/01}{\usefont}
+ {Make robust}%
+\DeclareRobustCommand\usekanji[4]{%
+ \kanjiencoding{#1}\kanjifamily{#2}\kanjiseries{#3}\kanjishape{#4}%
+ \selectfont\ignorespaces}
+\DeclareRobustCommand\useroman[4]{%
+ \romanencoding{#1}\romanfamily{#2}\romanseries{#3}\romanshape{#4}%
+ \selectfont\ignorespaces}
+\DeclareRobustCommand\usefont[4]{%
+ \edef\tmp@item{{#1}}%
+ \expandafter\expandafter\expandafter
+ \inlist@\expandafter\tmp@item\expandafter{\kenc@list}%
+ \ifin@ \usekanji{#1}{#2}{#3}{#4}%
+ \else\useroman{#1}{#2}{#3}{#4}%
+ \fi}
+\plEndIncludeInRelease
+\plIncludeInRelease{0000/00/00}{\usefont}
+ {ASCII Corporation original}%
+\def\usekanji#1#2#3#4{%
+ \kanjiencoding{#1}\kanjifamily{#2}\kanjiseries{#3}\kanjishape{#4}%
+ \selectfont\ignorespaces}
+\def\useroman#1#2#3#4{%
+ \romanencoding{#1}\romanfamily{#2}\romanseries{#3}\romanshape{#4}%
+ \selectfont\ignorespaces}
+\def\usefont#1#2#3#4{%
+ \edef\tmp@item{{#1}}%
+ \expandafter\expandafter\expandafter
+ \inlist@\expandafter\tmp@item\expandafter{\kenc@list}%
+ \ifin@ \usekanji{#1}{#2}{#3}{#4}%
+ \else\useroman{#1}{#2}{#3}{#4}%
+ \fi}
+\expandafter \let \csname usekanji \endcsname \@undefined
+\expandafter \let \csname useroman \endcsname \@undefined
+\expandafter \let \csname usefont \endcsname \@undefined
\plEndIncludeInRelease
\plIncludeInRelease{2017/04/08}{\textunderscore}
{Baseline shift for \textunderscore}%
@@ -401,7 +532,7 @@ of this package available from CTAN}
\vbox{\hrule\@width.3em}}
\plEndIncludeInRelease
\plIncludeInRelease{0000/00/00}{\textunderscore}
- {Baseline shift for \textunderscore}%
+ {ASCII Corporation original}%
\DeclareTextCommandDefault{\textunderscore}{%
\leavevmode\kern.06em
\iftdir\raise-\tbaselineshift\fi
@@ -510,7 +641,7 @@ of this package available from CTAN}
\let\pltx@isletter\@undefined
\plEndIncludeInRelease
\plIncludeInRelease{2016/06/10}{\@text@composite}
- {Fix for non-zero baselineshift (wrong)}%
+ {Fix for non-zero baselineshift (revert)}%
\def\@text@composite#1#2#3\@text@composite{%
\expandafter\@text@composite@x
\csname\string#1-\string#2\endcsname}
@@ -525,7 +656,7 @@ of this package available from CTAN}
\csname\string#1-\string#2\endcsname}
\plEndIncludeInRelease
\plIncludeInRelease{0000/00/00}{\@text@composite}
- {Fix for non-zero baselineshift (wrong)}%
+ {LaTeX2e original}%
\def\@text@composite#1#2#3\@text@composite{%
\expandafter\@text@composite@x
\csname\string#1-\string#2\endcsname}
@@ -728,7 +859,7 @@ of this package available from CTAN}
}
\plEndIncludeInRelease
\plIncludeInRelease{0000/00/00}{\check@nocorr@}
- {Italic correction before \textt...}%
+ {ASCII Corporation original}%
\def \check@nocorr@ #1#2\nocorr#3\@nil {%
\let \check@icl \relax % changed from \maybe@ic
\def \check@icr {\ifvmode \else \aftergroup \maybe@ic \fi}%
@@ -777,7 +908,7 @@ of this package available from CTAN}
\fi
\plEndIncludeInRelease
\plIncludeInRelease{0000/00/00}{\<}
- {\inhibitglue in vertical mode}%
+ {ASCII Corporation original}%
\def\<{\inhibitglue}
\plEndIncludeInRelease
%% File: plcore.dtx
@@ -1400,12 +1531,20 @@ of this package available from CTAN}
\let\firstmark\botmark
}
\plEndIncludeInRelease
+\plIncludeInRelease{2019/10/01}{\AtBeginDvi}
+ {Make robust}%
+\DeclareRobustCommand \AtBeginDvi [1]{%
+ \global \setbox \@begindvibox
+ \vbox{\yoko \unvbox \@begindvibox #1}%
+}
+\plEndIncludeInRelease
\plIncludeInRelease{2016/07/01}{\AtBeginDvi}
{Fix for incompatible direction}%
\def \AtBeginDvi #1{%
\global \setbox \@begindvibox
\vbox{\yoko \unvbox \@begindvibox #1}%
}
+\expandafter \let \csname AtBeginDvi \endcsname \@undefined
\plEndIncludeInRelease
\plIncludeInRelease{0000/00/00}{\AtBeginDvi}
{LaTeX2e original}%
@@ -1413,6 +1552,7 @@ of this package available from CTAN}
\global \setbox \@begindvibox
\vbox{\unvbox \@begindvibox #1}%
}
+\expandafter \let \csname AtBeginDvi \endcsname \@undefined
\plEndIncludeInRelease
\plIncludeInRelease{2016/04/17}{\@makefnmark}
{Remove extra \xkanjiskip}%
@@ -1865,12 +2005,20 @@ of this package available from CTAN}
\if@pboxsw \m@th$\fi
\@end@tempboxa}
\plEndIncludeInRelease
+\plIncludeInRelease{2019/10/01}{\underline}
+ {Make robust}%
+\DeclareRobustCommand\underline[1]{%
+ \relax
+ \ifmmode\@@underline{#1}%
+ \else \leavevmode\null$\@@underline{\hbox{#1}}\m@th$\null\relax\fi}
+\plEndIncludeInRelease
\plIncludeInRelease{2016/04/17}{\underline}
{Remove extra \xkanjiskip}%
\def\underline#1{%
\relax
\ifmmode\@@underline{#1}%
\else \leavevmode\null$\@@underline{\hbox{#1}}\m@th$\null\relax\fi}
+\expandafter \let \csname underline \endcsname \@undefined
\plEndIncludeInRelease
\plIncludeInRelease{0000/00/00}{\underline}
{LaTeX2e original}%
@@ -1878,6 +2026,7 @@ of this package available from CTAN}
\relax
\ifmmode\@@underline{#1}%
\else $\@@underline{\hbox{#1}}\m@th$\relax\fi}
+\expandafter \let \csname underline \endcsname \@undefined
\plEndIncludeInRelease
\plIncludeInRelease{2018/03/09}%
{\e@alloc@chardef}{Extended Allocation (FAM256)}%
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}
diff --git a/Master/texmf-dist/tex/platex/base/pldefs.ltx b/Master/texmf-dist/tex/platex/base/pldefs.ltx
index 8e9db2bb726..7612c6a0499 100644
--- a/Master/texmf-dist/tex/platex/base/pldefs.ltx
+++ b/Master/texmf-dist/tex/platex/base/pldefs.ltx
@@ -14,9 +14,13 @@
%%
%% File: plfonts.dtx
\ProvidesFile{pldefs.ltx}
- [2018/02/04 v1.6l pLaTeX Kernel (Default settings)]
+ [2019/09/16 v1.6t pLaTeX Kernel (Default settings)]
\DeclareKanjiEncodingDefaults{}{}
\DeclareErrorKanjiFont{JY1}{mc}{m}{n}{10}
+\kanjifamily{mc}
+\kanjiseries{m}
+\kanjishape{n}
+\fontsize{10}{10}
\DeclareYokoKanjiEncoding{JY1}{}{}
\DeclareKanjiSubstitution{JY1}{mc}{m}{n}
\DeclareTateKanjiEncoding{JT1}{}{}
diff --git a/Master/texmf-dist/tex/platex/base/plext.sty b/Master/texmf-dist/tex/platex/base/plext.sty
index bfab42a6416..e69f58c05a8 100644
--- a/Master/texmf-dist/tex/platex/base/plext.sty
+++ b/Master/texmf-dist/tex/platex/base/plext.sty
@@ -15,7 +15,7 @@
%% File: plext.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesPackage{plext}
- [2018/10/07 v1.2k pLaTeX package file (community edition)]
+ [2019/09/29 v1.2l pLaTeX package file (community edition)]
\newif\if@rotsw
\def\array{\let\@acol\@arrayacol \let\@classz\@arrayclassz
\let\@classiv\@arrayclassiv
@@ -538,7 +538,7 @@
\def\@Kanji#1{\kansuji #1}
\def\kanji{\iftdir\expandafter\kansuji\fi}
\def\boutenchar{\char\euc"A1A2}
-\def\bou#1{\ifvmode\leavevmode\fi\@bou#1\end}
+\DeclareRobustCommand\bou[1]{\ifvmode\leavevmode\fi\@bou#1\end}
\def\@bou#1{%
\ifx#1\end \let\next=\relax
\else
@@ -557,7 +557,7 @@
\fi
\let\next=\@bou
\fi\next}
-\def\kasen#1{%
+\DeclareRobustCommand\kasen[1]{%
\ifydir\underline{#1}%
\else\if@rotsw\underline{#1}\else
\setbox\z@\hbox{#1}\leavevmode\raise.7zw
diff --git a/Master/texmf-dist/tex/platex/base/ptrace.sty b/Master/texmf-dist/tex/platex/base/ptrace.sty
index 7f7d3836922..45d5ecd800d 100644
--- a/Master/texmf-dist/tex/platex/base/ptrace.sty
+++ b/Master/texmf-dist/tex/platex/base/ptrace.sty
@@ -15,7 +15,7 @@
%% File: plfonts.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesPackage{ptrace}
- [2017/08/05 v1.6h Standard pLaTeX package (font tracing)]
+ [2019/09/16 v1.6t Standard pLaTeX package (font tracing)]
\RequirePackageWithOptions{tracefnt}
\DeclareRobustCommand\selectfont{%
\let\tmp@error@fontshape\error@fontshape
@@ -108,7 +108,7 @@
\let\size@update\relax}}
\plEndIncludeInRelease
\plIncludeInRelease{0000/00/00}{\set@fontsize}
- {Construct \ystrutbox}%
+ {ASCII Corporation original}%
\def\set@fontsize#1#2#3{%
\@defaultunits\@tempdimb#2pt\relax\@nnil
\edef\f@size{\strip@pt\@tempdimb}%
@@ -142,6 +142,30 @@
\fi
\let\size@update\relax}}
\plEndIncludeInRelease
+\plIncludeInRelease{2019/10/01}{\adjustbaseline}
+ {Make robust}%
+\DeclareRobustCommand\adjustbaseline{%
+ \setbox\adjust@box\hbox{\char\jis"3441}%"
+ \cht\ht\adjust@box
+ \cdp\dp\adjust@box
+ \cwd\wd\adjust@box
+ \cvs\normalbaselineskip
+ \chs\cwd
+ \cHT\cht \advance\cHT\cdp
+ \iftdir
+ \setbox\adjust@box\hbox{\tbaselineshift\z@ M}%
+ \adjust@dimen\ht\adjust@box
+ \advance\adjust@dimen\dp\adjust@box
+ \advance\adjust@dimen-\cHT
+ \divide\adjust@dimen\tw@
+ \advance\adjust@dimen\cdp
+ \advance\adjust@dimen-\dp\adjust@box
+ \tbaselineshift\adjust@dimen
+ \ifnum \tracingfonts>\tw@
+ \typeout{baselineshift:\the\tbaselineshift}%
+ \fi
+ \fi}
+\plEndIncludeInRelease
\plIncludeInRelease{2017/07/29}{\adjustbaseline}
{Change zenkaku reference}%
\def\adjustbaseline{%
@@ -165,9 +189,10 @@
\typeout{baselineshift:\the\tbaselineshift}%
\fi
\fi}
+\expandafter \let \csname adjustbaseline \endcsname \@undefined
\plEndIncludeInRelease
\plIncludeInRelease{0000/00/00}{\adjustbaseline}
- {Change zenkaku reference}%
+ {ASCII Corporation original}%
\def\adjustbaseline{%
\setbox\adjust@box\hbox{\char\euc"A1A1}%"
\cht\ht\adjust@box
@@ -189,6 +214,7 @@
\typeout{baselineshift:\the\tbaselineshift}
\fi
\fi}
+\expandafter \let \csname adjustbaseline \endcsname \@undefined
\plEndIncludeInRelease
\endinput
%%