summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/platex/base/plfonts.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/platex/base/plfonts.dtx')
-rw-r--r--Master/texmf-dist/source/platex/base/plfonts.dtx251
1 files changed, 200 insertions, 51 deletions
diff --git a/Master/texmf-dist/source/platex/base/plfonts.dtx b/Master/texmf-dist/source/platex/base/plfonts.dtx
index 78f54e1e6aa..bfe6e4913a5 100644
--- a/Master/texmf-dist/source/platex/base/plfonts.dtx
+++ b/Master/texmf-dist/source/platex/base/plfonts.dtx
@@ -3,7 +3,7 @@
%
% Copyright 1994-2006 ASCII Corporation.
% Copyright (c) 2010 ASCII MEDIA WORKS
-% Copyright (c) 2016-2018 Japanese TeX Development Community
+% Copyright (c) 2016-2019 Japanese TeX Development Community
%
% This file is part of the pLaTeX2e system (community edition).
% -------------------------------------------------------------
@@ -101,13 +101,25 @@
% \changes{v1.6r}{2018/07/25}{PDF$B$N$7$*$j$K%"%/%;%s%HJ8;z$,4^$^$l$k>l9g$KBP1~(B}
% \changes{v1.6r}{2018/07/25}{\cs{[no]fixcompositeaccent}$B%^%/%mDI2C(B}
% \changes{v1.6r}{2018/07/25}{$B%3!<%I@0M}(B}
+% \changes{v1.6s}{2019/08/13}{\cs{DeclareErrorKanjiFont}:
+% Don't set any \cs{k@...} macros
+% (sync with ltfssbas.dtx 2019/07/09 v3.2c)}
+% \changes{v1.6s}{2019/08/13}{Explicitly set some defaults
+% after \cs{DeclareErrorKanjiFont} change
+% (sync with ltfssini.dtx 2019/07/09 v3.1c)}
+% \changes{v1.6t}{2019/09/16}{Make \cs{strut}, \cs{tstrut} etc. robust
+% (sync with ltdefns.dtx 2019/08/27 v1.5f)}
+% \changes{v1.6t}{2019/09/16}{Make \cs{usefont} etc. robust
+% (sync with ltfssbas.dtx 2019/08/27 v3.2d)}
+% \changes{v1.6u}{2019/09/29}{Make \cs{userelfont} robust}
+% \changes{v1.6u}{2019/09/29}{Make \cs{adjustbaseline} robust}
% \fi
%
% \iffalse
%<*driver>
\NeedsTeXFormat{pLaTeX2e}
% \fi
-\ProvidesFile{plfonts.dtx}[2018/07/25 v1.6r pLaTeX New Font Selection Scheme]
+\ProvidesFile{plfonts.dtx}[2019/09/29 v1.6u pLaTeX New Font Selection Scheme]
% \iffalse
\documentclass{jltxdoc}
\GetFileInfo{plfonts.dtx}
@@ -181,7 +193,7 @@
%<*trace>
\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}
%</trace>
% \end{macrocode}
@@ -508,13 +520,13 @@
% \changes{v1.6f}{2017/02/20}{\cs{strutbox}$B$r=D2#N>BP1~$K(B}
% \begin{macrocode}
%<platexrelease>\plIncludeInRelease{2017/04/08}{\strutbox}
-%<platexrelease> {Add \strutbox}%
+%<platexrelease> {Macro definition of \strutbox}%
%<*plcore|platexrelease>
\def\strutbox{\iftdir\tstrutbox\else\ystrutbox\fi}
%</plcore|platexrelease>
%<platexrelease>\plEndIncludeInRelease
%<platexrelease>\plIncludeInRelease{0000/00/00}{\strutbox}
-%<platexrelease> {Add \strutbox}%
+%<platexrelease> {LaTeX2e original}%
%<platexrelease>\newbox\strutbox % emulation purpose only
%<platexrelease>\plEndIncludeInRelease
% \end{macrocode}
@@ -524,45 +536,73 @@
% $B%G%#%l%/%7%g%s$K1~$8$F(B|\ystrutbox|$B$H(B|\tstrutbox|$B$r;H$$J,$1$^$9!#(B
% ^^A |\strutbox|$B$O(B|\yoko|$B%G%#%l%/%7%g%s$GAH$^$l$F$$$^$9$N$G!"(B
% ^^A $B=DAH%\%C%/%9Fb$G(B|\unhcopy|$B$r$9$k$H%(%i!<$H$J$j$^$9!#(B
-% $B85!9$3$N%^%/%m$O(B\file{ltplain.dtx}$B$GDj5A$5$l$F$$$^$9!#(B
+% $B%*%j%8%J%k$N(B\LaTeX{}$B$G$O(B\file{ltplain.dtx}$B$GDj5A$5$l$F$$$^$9$,!"(B
+% \LaTeXe\ 2019-10-01$B0J9_$G$O$5$i$K(B\file{ltdefns.dtx}$B$G(B
+% |\MakeRobust|$B$rA0CV$5$l$k$?$a!"(Brobust$B$K$J$j$^$9!#(B
%
% \changes{v1.1c}{1995/08/24}{``\cs{centerling}~\cs{strut}''$B$NI}$,%<%m$K(B
% $B$J$C$F$7$^$&$N$r=$@5(B}
% \changes{v1.3h}{1999/08/09}{$B=DAH$N$H$-!"I}$N$"$k%\%C%/%9$K$J$C$F$7$^$&(B
% $B$N$r=$@5(B}
% \changes{v1.6f}{2017/02/20}{\cs{strutbox}$B$NBe$o$j$K(B\cs{ystrutbox}$B$r;HMQ(B}
+% \changes{v1.6t}{2019/09/16}{Make \cs{strut}, \cs{tstrut} etc. robust
+% (sync with ltdefns.dtx 2019/08/27 v1.5f)}
% \begin{macrocode}
-%<platexrelease>\plIncludeInRelease{2017/04/08}{\strut}
-%<platexrelease> {Use \ystrutbox}%
+%<platexrelease>\plIncludeInRelease{2019/10/01}{\strut}
+%<platexrelease> {Make robust}%
%<*plcore|platexrelease>
-\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}
%</plcore|platexrelease>
%<platexrelease>\plEndIncludeInRelease
-%<platexrelease>\plIncludeInRelease{0000/00/00}{\strut}
+%<platexrelease>\plIncludeInRelease{2017/04/08}{\strut}
%<platexrelease> {Use \ystrutbox}%
%<platexrelease>\def\strut{\relax
%<platexrelease> \ifydir
+%<platexrelease> \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi
+%<platexrelease> \else
+%<platexrelease> \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi
+%<platexrelease> \fi}
+%<platexrelease>\expandafter \let \csname strut \endcsname \@undefined
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\strut}
+%<platexrelease> {ASCII Corporation original}%
+%<platexrelease>\def\strut{\relax
+%<platexrelease> \ifydir
%<platexrelease> \ifmmode\copy\strutbox\else\unhcopy\strutbox\fi
%<platexrelease> \else
%<platexrelease> \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi
%<platexrelease> \fi}
+%<platexrelease>\expandafter \let \csname strut \endcsname \@undefined
%<platexrelease>\plEndIncludeInRelease
-%<*plcore>
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\tstrut}
% \begin{macro}{\zstrut}
% \begin{macrocode}
-\def\tstrut{\relax\hbox{\tate
+%<platexrelease>\plIncludeInRelease{2019/10/01}{\tstrut}
+%<platexrelease> {Make robust}%
+%<*plcore|platexrelease>
+\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}}
+%</plcore|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\tstrut}
+%<platexrelease> {ASCII Corporation original}%
+%<platexrelease>\def\tstrut{\relax\hbox{\tate
+%<platexrelease> \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi}}
+%<platexrelease>\def\zstrut{\relax\hbox{\tate
+%<platexrelease> \ifmmode\copy\zstrutbox\else\unhcopy\zstrutbox\fi}}
+%<platexrelease>\expandafter \let \csname tstrut \endcsname \@undefined
+%<platexrelease>\expandafter \let \csname zstrut \endcsname \@undefined
+%<platexrelease>\plEndIncludeInRelease
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -570,17 +610,23 @@
% \begin{macro}{\ystrut}
% \changes{v1.6f}{2017/02/20}{\cs{ystrut}$B$rDI2C(B}
% \begin{macrocode}
-%</plcore>
-%<platexrelease>\plIncludeInRelease{2017/04/08}{\ystrut}
-%<platexrelease> {Add \ystrut}%
+%<platexrelease>\plIncludeInRelease{2019/10/01}{\ystrut}
+%<platexrelease> {Make robust}%
%<*plcore|platexrelease>
-\def\ystrut{\relax\hbox{\yoko
+\DeclareRobustCommand\ystrut{\relax\hbox{\yoko
\ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi}}
%</plcore|platexrelease>
%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{2017/04/08}{\ystrut}
+%<platexrelease> {Add \ystrut}%
+%<platexrelease>\def\ystrut{\relax\hbox{\yoko
+%<platexrelease> \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi}}
+%<platexrelease>\expandafter \let \csname ystrut \endcsname \@undefined
+%<platexrelease>\plEndIncludeInRelease
%<platexrelease>\plIncludeInRelease{0000/00/00}{\ystrut}
%<platexrelease> {Add \ystrut}%
%<platexrelease>\let\ystrut\@undefined
+%<platexrelease>\expandafter \let \csname ystrut \endcsname \@undefined
%<platexrelease>\plEndIncludeInRelease
%<*plcore>
% \end{macrocode}
@@ -734,7 +780,7 @@
%</plcore|platexrelease>
%<platexrelease>\plEndIncludeInRelease
%<platexrelease>\plIncludeInRelease{0000/00/00}{\DeclareFontEncoding@}
-%<platexrelease> {UTF-8 Encoding}%
+%<platexrelease> {ASCII Corporation original}%
%<platexrelease>\def\DeclareFontEncoding@#1#2#3{%
%<platexrelease> \expandafter
%<platexrelease> \ifx\csname T@#1\endcsname\relax
@@ -925,12 +971,10 @@
% \end{macrocode}
% \end{macro}
%
-%
% \begin{macro}{\DeclareKanjiSubstitution}
-% \begin{macro}{\DeclareErrorKanjiFont}
% $BL\E*$NOBJ8%U%)%s%H$,8+$D$+$i$J$+$C$?$H$-$K;H$&%U%)%s%H$N@k8@$r$9$k(B
% $B%3%^%s%I$G$9!#(B
-% $B$=$l$>$l!"(B|\DeclareFontSubstitution|$B$H(B|\DeclareErrorFont|$B$KBP1~$7$^$9!#(B
+% |\DeclareFontSubstitution|$B$KBP1~$7$^$9!#(B
% \begin{macrocode}
\def\DeclareKanjiSubstitution#1#2#3#4{%
\expandafter\ifx\csname T@#1\endcsname\relax
@@ -953,7 +997,20 @@
\def\default@series{#3}%
\def\default@shape{#4}}%
\fi}
+\@onlypreamble\DeclareKanjiSubstitution
+% \end{macrocode}
+% \end{macro}
%
+% \begin{macro}{\DeclareErrorKanjiFont}
+% |\DeclareErrorFont|$B$KBP1~$9$k%3%^%s%I$G$9!#(B
+% \changes{v1.6s}{2019/08/13}{\cs{DeclareErrorKanjiFont}:
+% Don't set any \cs{k@...} macros
+% (sync with ltfssbas.dtx 2019/07/09 v3.2c)}
+% \begin{macrocode}
+%</plcore>
+%<platexrelease>\plIncludeInRelease{2019/10/01}{\DeclareErrorKanjiFont}
+%<platexrelease> {No side effects please}%
+%<*plcore|platexrelease>
\def\DeclareErrorKanjiFont#1#2#3#4#5{%
\xdef\error@kfontshape{%
\noexpand\expandafter\noexpand\split@name\noexpand\string
@@ -962,17 +1019,29 @@
\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
+ }
+%</plcore|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\DeclareErrorKanjiFont}
+%<platexrelease> {ASCII Corporation original}%
+%<platexrelease>\def\DeclareErrorKanjiFont#1#2#3#4#5{%
+%<platexrelease> \xdef\error@kfontshape{%
+%<platexrelease> \noexpand\expandafter\noexpand\split@name\noexpand\string
+%<platexrelease> \expandafter\noexpand\csname#1/#2/#3/#4/#5\endcsname
+%<platexrelease> \noexpand\@nil}%
+%<platexrelease> \gdef\default@k@family{#2}%
+%<platexrelease> \gdef\default@k@series{#3}%
+%<platexrelease> \gdef\default@k@shape{#4}%
+%<platexrelease> \global\let\k@family\default@k@family
+%<platexrelease> \global\let\k@series\default@k@series
+%<platexrelease> \global\let\k@shape\default@k@shape
+%<platexrelease> \gdef\f@size{#5}%
+%<platexrelease> \gdef\f@baselineskip{#5pt}}
+%<platexrelease>\plEndIncludeInRelease
+%<*plcore>
\@onlypreamble\DeclareErrorKanjiFont
% \end{macrocode}
% \end{macro}
-% \end{macro}
%
%
% \begin{macro}{\DeclareFixedFont}
@@ -1202,16 +1271,32 @@
%
%
% \begin{macro}{\if@knjcmd}
-% \begin{macro}{\userelfont}
% |\if@knjcmd|$B$O2$J8=qBN$r=>B0=qBN$K$9$k$+$I$&$+$N%U%i%0$G$9!#(B
% $B$3$N%U%i%0$,??$K$J$k$H!"2$J8=qBN$K=>B0=qBN$,;H$o$l$^$9!#(B
-% $B$3$N%U%i%0$O(B|\userelfont|$B%3%^%s%I$K$h$C$F!"(B\emph{$B??(B}$B$H$J$j$^$9!#(B
-% $B$=$7$F(B|\selectfont|$B<B9T8e$K$O(B\emph{$B56(B}$B$K=i4|2=$5$l$^$9!#(B
% \begin{macrocode}
\newif\if@knjcmd
-\def\userelfont{\@knjcmdtrue}
% \end{macrocode}
% \end{macro}
+%
+% \begin{macro}{\userelfont}
+% |\if@knjcmd|$B%U%i%0$O(B|\userelfont|$B%3%^%s%I$K$h$C$F!"(B\emph{$B??(B}$B$H$J$j$^$9!#(B
+% $B$=$7$F(B|\selectfont|$B<B9T8e$K$O(B\emph{$B56(B}$B$K=i4|2=$5$l$^$9!#(B
+% \changes{v1.6u}{2019/09/29}{Make \cs{userelfont} robust}
+% \begin{macrocode}
+%</plcore>
+%<platexrelease>\plIncludeInRelease{2019/10/01}{\userelfont}
+%<platexrelease> {Make robust}%
+%<*plcore|platexrelease>
+\DeclareRobustCommand\userelfont{\@knjcmdtrue}
+%</plcore|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\userelfont}
+%<platexrelease> {ASCII Corporation original}%
+%<platexrelease>\def\userelfont{\@knjcmdtrue}
+%<platexrelease>\expandafter \let \csname userelfont \endcsname \@undefined
+%<platexrelease>\plEndIncludeInRelease
+%<*plcore>
+% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\selectfont}
@@ -1359,7 +1444,7 @@
%</plcore|platexrelease|trace>
%<platexrelease|trace>\plEndIncludeInRelease
%<platexrelease|trace>\plIncludeInRelease{0000/00/00}{\set@fontsize}
-%<platexrelease|trace> {Construct \ystrutbox}%
+%<platexrelease|trace> {ASCII Corporation original}%
%<platexrelease|trace>\def\set@fontsize#1#2#3{%
%<platexrelease|trace> \@defaultunits\@tempdimb#2pt\relax\@nnil
%<platexrelease|trace> \edef\f@size{\strip@pt\@tempdimb}%
@@ -1424,7 +1509,7 @@
% $BA43Q6uGr!J(BEUC$B%3!<%I(B\texttt{0xA1A1}$B!K$O(BJFM$B$GFC<l$J%?%$%W$KJ,N`$5$l$k2DG=@-(B
% $B$,$"$k$?$a!"OBJ8=qBN$N4p=`$r!V4A!W!J(BJIS$B%3!<%I(B\texttt{0x3441}$B!K$XJQ99$7$^$7$?!#(B
% \changes{v1.6h}{2017/08/05}{$BOBJ8=qBN$N4p=`$rA43Q6uGr$+$i!V4A!W$KJQ99(B}
-%
+% \changes{v1.6u}{2019/09/29}{Make \cs{adjustbaseline} robust}
% \begin{macrocode}
\newbox\adjust@box
\newdimen\adjust@dimen
@@ -1432,10 +1517,10 @@
%
% \begin{macrocode}
%</plcore>
-%<platexrelease|trace>\plIncludeInRelease{2017/07/29}{\adjustbaseline}
-%<platexrelease|trace> {Change zenkaku reference}%
+%<platexrelease|trace>\plIncludeInRelease{2019/10/01}{\adjustbaseline}
+%<platexrelease|trace> {Make robust}%
%<*plcore|platexrelease|trace>
-\def\adjustbaseline{%
+\DeclareRobustCommand\adjustbaseline{%
% \end{macrocode}
% $BOBJ8%U%)%s%H$N4p=`CM$r@_Dj$7$^$9!#(B
% \begin{macrocode}
@@ -1475,9 +1560,36 @@
\fi}
%</plcore|platexrelease|trace>
%<platexrelease|trace>\plEndIncludeInRelease
-%<platexrelease|trace>\plIncludeInRelease{0000/00/00}{\adjustbaseline}
+%<platexrelease|trace>\plIncludeInRelease{2017/07/29}{\adjustbaseline}
%<platexrelease|trace> {Change zenkaku reference}%
%<platexrelease|trace>\def\adjustbaseline{%
+%<platexrelease|trace> \setbox\adjust@box\hbox{\char\jis"3441}%"
+%<platexrelease|trace> \cht\ht\adjust@box
+%<platexrelease|trace> \cdp\dp\adjust@box
+%<platexrelease|trace> \cwd\wd\adjust@box
+%<platexrelease|trace> \cvs\normalbaselineskip
+%<platexrelease|trace> \chs\cwd
+%<platexrelease|trace> \cHT\cht \advance\cHT\cdp
+%<platexrelease|trace> \iftdir
+%<platexrelease|trace> \setbox\adjust@box\hbox{\tbaselineshift\z@ M}%
+%<platexrelease|trace> \adjust@dimen\ht\adjust@box
+%<platexrelease|trace> \advance\adjust@dimen\dp\adjust@box
+%<platexrelease|trace> \advance\adjust@dimen-\cHT
+%<platexrelease|trace> \divide\adjust@dimen\tw@
+%<platexrelease|trace> \advance\adjust@dimen\cdp
+%<platexrelease|trace> \advance\adjust@dimen-\dp\adjust@box
+%<platexrelease|trace> \tbaselineshift\adjust@dimen
+%<*trace>
+%<platexrelease|trace> \ifnum \tracingfonts>\tw@
+%<platexrelease|trace> \typeout{baselineshift:\the\tbaselineshift}%
+%<platexrelease|trace> \fi
+%</trace>
+%<platexrelease|trace> \fi}
+%<platexrelease|trace>\expandafter \let \csname adjustbaseline \endcsname \@undefined
+%<platexrelease|trace>\plEndIncludeInRelease
+%<platexrelease|trace>\plIncludeInRelease{0000/00/00}{\adjustbaseline}
+%<platexrelease|trace> {ASCII Corporation original}%
+%<platexrelease|trace>\def\adjustbaseline{%
%<platexrelease|trace> \setbox\adjust@box\hbox{\char\euc"A1A1}%"
%<platexrelease|trace> \cht\ht\adjust@box
%<platexrelease|trace> \cdp\dp\adjust@box
@@ -1500,6 +1612,7 @@
%<platexrelease|trace> \fi
%</trace>
%<platexrelease|trace> \fi}
+%<platexrelease|trace>\expandafter \let \csname adjustbaseline \endcsname \@undefined
%<platexrelease|trace>\plEndIncludeInRelease
%<*plcore>
% \end{macrocode}
@@ -1820,20 +1933,48 @@
%
% |\usefont|$B%3%^%s%I$O!"Bh0l0z?t$G;XDj$5$l$k%(%s%3!<%I$K$h$C$F!"(B
% $BOBJ8$^$?$O2$J8%U%)%s%H$r@Z$jBX$($^$9!#(B
+% \changes{v1.6t}{2019/09/16}{Make \cs{usefont} etc. robust
+% (sync with ltfssbas.dtx 2019/08/27 v3.2d)}
% \begin{macrocode}
-\def\usekanji#1#2#3#4{%
+%</plcore>
+%<platexrelease>\plIncludeInRelease{2019/10/01}{\usefont}
+%<platexrelease> {Make robust}%
+%<*plcore|platexrelease>
+\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}%
\ifin@ \usekanji{#1}{#2}{#3}{#4}%
\else\useroman{#1}{#2}{#3}{#4}%
\fi}
+%</plcore|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\usefont}
+%<platexrelease> {ASCII Corporation original}%
+%<platexrelease>\def\usekanji#1#2#3#4{%
+%<platexrelease> \kanjiencoding{#1}\kanjifamily{#2}\kanjiseries{#3}\kanjishape{#4}%
+%<platexrelease> \selectfont\ignorespaces}
+%<platexrelease>\def\useroman#1#2#3#4{%
+%<platexrelease> \romanencoding{#1}\romanfamily{#2}\romanseries{#3}\romanshape{#4}%
+%<platexrelease> \selectfont\ignorespaces}
+%<platexrelease>\def\usefont#1#2#3#4{%
+%<platexrelease> \edef\tmp@item{{#1}}%
+%<platexrelease> \expandafter\expandafter\expandafter
+%<platexrelease> \inlist@\expandafter\tmp@item\expandafter{\kenc@list}%
+%<platexrelease> \ifin@ \usekanji{#1}{#2}{#3}{#4}%
+%<platexrelease> \else\useroman{#1}{#2}{#3}{#4}%
+%<platexrelease> \fi}
+%<platexrelease>\expandafter \let \csname usekanji \endcsname \@undefined
+%<platexrelease>\expandafter \let \csname useroman \endcsname \@undefined
+%<platexrelease>\expandafter \let \csname usefont \endcsname \@undefined
+%<platexrelease>\plEndIncludeInRelease
+%<*plcore>
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -1932,7 +2073,7 @@
%</plcore|platexrelease>
%<platexrelease>\plEndIncludeInRelease
%<platexrelease>\plIncludeInRelease{0000/00/00}{\textunderscore}
-%<platexrelease> {Baseline shift for \textunderscore}%
+%<platexrelease> {ASCII Corporation original}%
%<platexrelease>\DeclareTextCommandDefault{\textunderscore}{%
%<platexrelease> \leavevmode\kern.06em
%<platexrelease> \iftdir\raise-\tbaselineshift\fi
@@ -2125,7 +2266,7 @@
% \changes{v1.6c}{2016/06/06}{v1.6a$B$G$N8m$C$?:FDj5A$r:o=|(B(forum:1941)}
% \begin{macrocode}
%<platexrelease>\plIncludeInRelease{2016/06/10}{\@text@composite}
-%<platexrelease> {Fix for non-zero baselineshift (wrong)}%
+%<platexrelease> {Fix for non-zero baselineshift (revert)}%
%<platexrelease>\def\@text@composite#1#2#3\@text@composite{%
%<platexrelease> \expandafter\@text@composite@x
%<platexrelease> \csname\string#1-\string#2\endcsname}
@@ -2140,7 +2281,7 @@
%<platexrelease> \csname\string#1-\string#2\endcsname}
%<platexrelease>\plEndIncludeInRelease
%<platexrelease>\plIncludeInRelease{0000/00/00}{\@text@composite}
-%<platexrelease> {Fix for non-zero baselineshift (wrong)}%
+%<platexrelease> {LaTeX2e original}%
%<platexrelease>\def\@text@composite#1#2#3\@text@composite{%
%<platexrelease> \expandafter\@text@composite@x
%<platexrelease> \csname\string#1-\string#2\endcsname}
@@ -2443,7 +2584,7 @@
%<platexrelease>}
%<platexrelease>\plEndIncludeInRelease
%<platexrelease>\plIncludeInRelease{0000/00/00}{\check@nocorr@}
-%<platexrelease> {Italic correction before \textt...}%
+%<platexrelease> {ASCII Corporation original}%
%<platexrelease>\def \check@nocorr@ #1#2\nocorr#3\@nil {%
%<platexrelease> \let \check@icl \relax % changed from \maybe@ic
%<platexrelease> \def \check@icr {\ifvmode \else \aftergroup \maybe@ic \fi}%
@@ -2493,19 +2634,27 @@
% \begin{macrocode}
%<*pldefs>
\ProvidesFile{pldefs.ltx}
- [2018/02/04 v1.6l pLaTeX Kernel (Default settings)]
+ [2019/09/16 v1.6t pLaTeX Kernel (Default settings)]
%</pldefs>
% \end{macrocode}
%
% \subsection{$B%F%-%9%H%U%)%s%H(B}
% $B%F%-%9%H%U%)%s%H$N$?$a$NB0@-$d%(%i!<=qBN$J$I$N@k8@$G$9!#(B
% p\LaTeX{}$B$N%G%U%)%k%H$N2#AH%(%s%3!<%I$O(BJY1$B!"=DAH%(%s%3!<%I$O(BJT1$B$H$7$^$9!#(B
+%
+% \changes{v1.6s}{2019/08/13}{Explicitly set some defaults
+% after \cs{DeclareErrorKanjiFont} change
+% (sync with ltfssini.dtx 2019/07/09 v3.1c)}
% \noindent
% $B=D2#%(%s%3!<%I6&DL!'(B
% \begin{macrocode}
%<*pldefs>
\DeclareKanjiEncodingDefaults{}{}
\DeclareErrorKanjiFont{JY1}{mc}{m}{n}{10}
+\kanjifamily{mc}
+\kanjiseries{m}
+\kanjishape{n}
+\fontsize{10}{10}
% \end{macrocode}
% $B2#AH%(%s%3!<%I!'(B
% \begin{macrocode}
@@ -2705,7 +2854,7 @@
%</pldefs|platexrelease>
%<platexrelease>\plEndIncludeInRelease
%<platexrelease>\plIncludeInRelease{0000/00/00}{\<}
-%<platexrelease> {\inhibitglue in vertical mode}%
+%<platexrelease> {ASCII Corporation original}%
%<platexrelease>\def\<{\inhibitglue}
%<platexrelease>\plEndIncludeInRelease
%<*pldefs>