diff options
| author | Karl Berry <karl@freefriends.org> | 2019-10-01 21:17:27 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2019-10-01 21:17:27 +0000 |
| commit | f3e77606f13c3ff3c0915bd4860c3486948400c6 (patch) | |
| tree | 205a7815ba1653b80a41f838d5e54f72921e63ff | |
| parent | ce806fd00d3a423032a0fb09ab6cd6a7f2b4cccd (diff) | |
platex (1oct19)
git-svn-id: svn://tug.org/texlive/trunk@52243 c570f23f-e606-0410-a88d-b1316a301751
19 files changed, 603 insertions, 143 deletions
diff --git a/Master/texmf-dist/doc/platex/base/README.md b/Master/texmf-dist/doc/platex/base/README.md index 652a868b461..6e501ec1594 100644 --- a/Master/texmf-dist/doc/platex/base/README.md +++ b/Master/texmf-dist/doc/platex/base/README.md @@ -61,6 +61,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)). ## Release Date -2019-04-06 +2019-10-01 Japanese TeX Development Community diff --git a/Master/texmf-dist/doc/platex/base/exppl2e.pdf b/Master/texmf-dist/doc/platex/base/exppl2e.pdf Binary files differindex f9d04581f3b..408b5d000fb 100644 --- a/Master/texmf-dist/doc/platex/base/exppl2e.pdf +++ b/Master/texmf-dist/doc/platex/base/exppl2e.pdf diff --git a/Master/texmf-dist/doc/platex/base/platex-en.pdf b/Master/texmf-dist/doc/platex/base/platex-en.pdf Binary files differindex 99c3e7200e1..4bae13686eb 100644 --- a/Master/texmf-dist/doc/platex/base/platex-en.pdf +++ b/Master/texmf-dist/doc/platex/base/platex-en.pdf diff --git a/Master/texmf-dist/doc/platex/base/platex.pdf b/Master/texmf-dist/doc/platex/base/platex.pdf Binary files differindex 5cb716ebaf7..d07bd853c28 100644 --- a/Master/texmf-dist/doc/platex/base/platex.pdf +++ b/Master/texmf-dist/doc/platex/base/platex.pdf diff --git a/Master/texmf-dist/doc/platex/base/platexrelease.pdf b/Master/texmf-dist/doc/platex/base/platexrelease.pdf Binary files differindex df2e838e323..2dc9289fe01 100644 --- a/Master/texmf-dist/doc/platex/base/platexrelease.pdf +++ b/Master/texmf-dist/doc/platex/base/platexrelease.pdf diff --git a/Master/texmf-dist/doc/platex/base/pldoc.pdf b/Master/texmf-dist/doc/platex/base/pldoc.pdf Binary files differindex 2d845301aaa..2252277b8c6 100644 --- a/Master/texmf-dist/doc/platex/base/pldoc.pdf +++ b/Master/texmf-dist/doc/platex/base/pldoc.pdf diff --git a/Master/texmf-dist/source/platex/base/platex.dtx b/Master/texmf-dist/source/platex/base/platex.dtx index e559bdc473d..dabac8c871b 100644 --- a/Master/texmf-dist/source/platex/base/platex.dtx +++ b/Master/texmf-dist/source/platex/base/platex.dtx @@ -3,7 +3,7 @@ % % Copyright 1995,1996 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). % ------------------------------------------------------------- @@ -84,6 +84,7 @@ % \changes{v1.0x}{2018/09/03}{platexcheat$B$K8@5Z(B} % \changes{v1.0x}{2018/09/03}{plautopatch$B$K8@5Z(B} % \changes{v1.0y}{2018/09/22}{$B:G=*99?7F|$r(B\file{pldoc.pdf}$B$KI=<((B} +% \changes{v1.0z}{2019/09/29}{$B%?%$%]=$@5(B} %\else % \changes{v1.0}{1995/05/08}{first edition} % \changes{v1.0a}{1995/08/25}{Added 'Compatibility', `Usage of \dst{}' @@ -126,6 +127,7 @@ % \changes{v1.0x}{2018/09/03}{Mention platexcheat (Japanese only).} % \changes{v1.0x}{2018/09/03}{Mention plautopatch.} % \changes{v1.0y}{2018/09/22}{Show last update info on \file{pldoc.pdf}} +% \changes{v1.0z}{2019/09/29}{Fix typos in document.} %\fi % \fi % @@ -133,7 +135,7 @@ %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{platex.dtx}[2018/09/22 v1.0y pLaTeX document file] +\ProvidesFile{platex.dtx}[2019/09/29 v1.0z pLaTeX document file] % \iffalse \documentclass{jltxdoc} \usepackage{plext} @@ -197,11 +199,13 @@ % \changes{v1.0k}{2016/05/21}{$BJQ99MzNr$b=PNO$9$k$h$&$K$7$?(B} % \changes{v1.0q}{2017/11/29}{$B1Q8lHG%I%-%e%a%s%H$rDI2C(B} % \changes{v1.0x}{2018/09/03}{$B%I%-%e%a%s%H$r99?7(B} +% \changes{v1.0z}{2019/09/29}{$B%?%$%]=$@5(B} %\else % \changes{v1.0f}{2016/04/12}{Update document.} % \changes{v1.0k}{2016/05/21}{Print also changes.} % \changes{v1.0q}{2017/11/29}{New English documentation added!} % \changes{v1.0x}{2018/09/03}{Update document.} +% \changes{v1.0z}{2019/09/29}{Fix typos in document.} %\fi %\ifJAPANESE % \begin{chuui} @@ -213,17 +217,19 @@ % $BCm0U$7$F$/$@$5$$!#(B % \end{chuui} %\else -% \begin{chuui}[] -% This document provides a brief description of \pLaTeXe, the Japanese -% extended version of \LaTeXe. Current maintainer of -% \pLaTeXe\ is Japanese \TeX\ Development Community. -% \end{chuui} +% ^^A \begin{chuui}[] +% ^^A This document provides a brief description of \pLaTeXe, the Japanese +% ^^A extended version of \LaTeXe. Current maintainer of +% ^^A \pLaTeXe\ is Japanese \TeX\ Development Community. +% ^^A \end{chuui} %\fi % %\ifJAPANESE -% 2010$BG/0J9_!"%"%9%-!<(B\pTeX{}$B$O!"9q:]E*$K9-$/;H$o$l$F$$$k(B\TeX\ Live$B$H$$$&(B -% $B%G%#%9%H%j%S%e!<%7%g%s$K<h$j9~$^$l!"$=$3$GFH<+$N2~NI$d;EMMJQ99$,2C$($i$l(B -% $B$F$-$^$7$?!#:G6a!J(B2011$BG/0J9_!K$N(B\TeX\ Live$B$d(BW32\TeX{}$B$G$O!"(B\pLaTeX{}$B$b(B +% 2010$BG/0J9_!"%"%9%-!<(B\pTeX\footnote{$B%"%9%-!<F|K\8l(B\pTeX: +% \texttt{https://asciidwango.github.io/ptex/}}$B$O!"(B +% $B9q:]E*$K9-$/;H$o$l$F$$$k(B\TeX\ Live$B$H$$$&%G%#%9%H%j%S%e!<%7%g%s$K(B +% $B<h$j9~$^$l!"$=$3$GFH<+$N2~NI$d;EMMJQ99$,2C$($i$l$F$-$^$7$?!#(B +% $B:G6a!J(B2011$BG/0J9_!K$N(B\TeX\ Live$B$d(BW32\TeX{}$B$G$O!"(B\pLaTeX{}$B$b(B % $B85!9$N(B\pTeX{}$B$G$O$J$/!"$=$N3HD%HG(B\epTeX{}$B$r%(%s%8%s$KMQ$$$k$h$&$K$J$C$F(B % $B$$$^$9!#$^$?!"(B\pLaTeX{}$B$N%Y!<%9$G$"$k(B\LaTeX{}$B$b99?7$,?J$a$i$l$F$$$^$9!#(B % @@ -245,23 +251,24 @@ % \def\JLaTeX{\leavevmode\lower.5ex\hbox{J}\kern-.15em\LaTeX} % \pLaTeX\ is a Japanese \LaTeX\ format, which is adjusted/extended % to be more suitable for writing Japanese documents. -% It requires \pTeX, a \TeX\ engine with extensions for -% Japanese typesetting, which is designed for high-quality +% It requires \pTeX\footnote{The \pTeX\ website: +% \texttt{https://asciidwango.github.io/ptex/} (in Japanese)}, +% a \TeX\ engine with extensions for Japanese typesetting, +% which is designed for high-quality % Japanese book ``p''ublishing.\footnote{There is another % old implementation of Japanese \LaTeX, called % \JLaTeX\ (not available in \TeX\ Live). % Also, MiK\TeX\ has another program \texttt{platex}, but -% it has nothing to do with our Japanese \pLaTeX!} The developent of -% both \pTeX\ and \pLaTeX\ was done by ASCII Corporation (and its -% successor ASCII Media Works\footnote{The \pTeX\ website: -% \texttt{http://ascii.asciimw.jp/pb/ptex/} (closed in 2016).}), -% so they are often refered to as ``ASCII \pTeX'' and ``ASCII \pLaTeX'' +% it has nothing to do with our Japanese \pLaTeX!} +% Both \pTeX\ and \pLaTeX\ were developed by ASCII Corporation +% (and its successor ASCII Media Works), +% so they are often referred to as ``ASCII \pTeX'' and ``ASCII \pLaTeX'' % respectively. % % In 2010, ASCII \pTeX\ was incorporated into the % world-wide \TeX\ distribution, \TeX\ Live. Since then, \pTeX\ has % been maintained/improved/changed along with \TeX\ Live sources. -% In recent versions of \TeX\ Live and W32\TeX\ (arround 2011), +% In recent versions of \TeX\ Live and W32\TeX\ (around 2011), % the default engine of \pLaTeX\ changed from original \pTeX\ to % \epTeX\ (\pTeX\ with \eTeX\ extension). % Also, the original \LaTeX\ itself is also frequently updated. @@ -1241,7 +1248,7 @@ all others indicate the places where it is used.} \edef\@date{\@date\space Pre-Release\patchdate} \fi\fi -% Add the last update info, in case formate date unchanged +% Add the last update info, in case format date unchanged % Note: \@ifl@t@r can be used only in preamble. \def\lastupd@te{0000/00/00} \begingroup diff --git a/Master/texmf-dist/source/platex/base/platexrelease.dtx b/Master/texmf-dist/source/platex/base/platexrelease.dtx index 2defdcf9489..d230ade5fd2 100644 --- a/Master/texmf-dist/source/platex/base/platexrelease.dtx +++ b/Master/texmf-dist/source/platex/base/platexrelease.dtx @@ -307,9 +307,8 @@ of this package available from CTAN} % % \section{$BCm0U!'(Bp\LaTeXe{}$B$N%P%0>pJs(B} % -% $B0J2<$NF|IU$N(Bp\LaTeXe{}$B$K$O(Bcritical$B$J%P%0$,$"$k$3$H$r!"(B -% $BF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#$,GD0.$7$F$$$^$9!#(B -% $B%(%_%e%l!<%H$7$h$&$H9M$($F$$$k>l9g$O!"Cm0U$7$F$/$@$5$$!#(B +% $B2a5n$N(Bp\LaTeXe{}$B$K$O2?EY$+(Bcritical$B$J%P%0$,$"$C$?$?$a!"(B +% $B$=$N%P!<%8%g%s$r%(%_%e%l!<%H$7$?>l9g$K7Y9p$,=P$k$h$&$K$7$^$9!#(B % \changes{v1.0d}{2016/06/08}{p\LaTeX\ \texttt{!<2016/04/17!>}$BHG$H(B % p\LaTeX\ \texttt{!<2016/05/07!>}$BHG$K7Y9p(B} % \changes{v1.0e}{2016/06/30}{p\LaTeX\ \texttt{!<2016/06/10!>}$BHG$K7Y9p(B} @@ -324,6 +323,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 diff --git a/Master/texmf-dist/source/platex/base/plcore.dtx b/Master/texmf-dist/source/platex/base/plcore.dtx index d71af9c45f7..8f38335c096 100644 --- a/Master/texmf-dist/source/platex/base/plcore.dtx +++ b/Master/texmf-dist/source/platex/base/plcore.dtx @@ -116,13 +116,17 @@ % (sync with ltfinal 2018/08/24 v2.1f)} % \changes{v1.3b}{2019/02/08}{$BCf1{B7$($N%;%k$G$N(B\cs{unskip}$BBP:v(B % (sync with lttab 2018/12/30 v1.1p)} +% \changes{v1.3c}{2019/09/16}{Make \cs{AtBeginDvi} robust +% (sync with ltoutput.dtx 2019/08/27 v1.4e)} +% \changes{v1.3c}{2019/09/16}{Make \cs{underline} robust +% (sync with ltboxes.dtx 2019/08/27 v1.3b)} % \fi % % \iffalse %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{plcore.dtx}[2019/02/08 v1.3b pLaTeX core file] +\ProvidesFile{plcore.dtx}[2019/09/16 v1.3c pLaTeX core file] % \iffalse \documentclass{jltxdoc} \GetFileInfo{plcore.dtx} @@ -1438,23 +1442,34 @@ % \end{center} % $B$H2>Dj$7$^$9!#$3$N2>Dj$K=>$$!"(B|\AtBeginDvi|$B$r:FDj5A$7$^$9!#(B % \changes{v1.2f}{2016/06/30}{\cs{@begindvibox}$B$r>o$K2#AH$K(B} +% \changes{v1.3c}{2019/09/16}{Make \cs{AtBeginDvi} robust +% (sync with ltoutput.dtx 2019/08/27 v1.4e)} % \begin{macrocode} %</plcore> -%<platexrelease>\plIncludeInRelease{2016/07/01}{\AtBeginDvi} -%<platexrelease> {Fix for incompatible direction}% +%<platexrelease>\plIncludeInRelease{2019/10/01}{\AtBeginDvi} +%<platexrelease> {Make robust}% %<*plcore|platexrelease> -\def \AtBeginDvi #1{% +\DeclareRobustCommand \AtBeginDvi [1]{% \global \setbox \@begindvibox \vbox{\yoko \unvbox \@begindvibox #1}% } %</plcore|platexrelease> %<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{2016/07/01}{\AtBeginDvi} +%<platexrelease> {Fix for incompatible direction}% +%<platexrelease>\def \AtBeginDvi #1{% +%<platexrelease> \global \setbox \@begindvibox +%<platexrelease> \vbox{\yoko \unvbox \@begindvibox #1}% +%<platexrelease>} +%<platexrelease>\expandafter \let \csname AtBeginDvi \endcsname \@undefined +%<platexrelease>\plEndIncludeInRelease %<platexrelease>\plIncludeInRelease{0000/00/00}{\AtBeginDvi} %<platexrelease> {LaTeX2e original}% %<platexrelease>\def \AtBeginDvi #1{% %<platexrelease> \global \setbox \@begindvibox %<platexrelease> \vbox{\unvbox \@begindvibox #1}% %<platexrelease>} +%<platexrelease>\expandafter \let \csname AtBeginDvi \endcsname \@undefined %<platexrelease>\plEndIncludeInRelease %<*plcore> % \end{macrocode} @@ -2275,22 +2290,33 @@ % \begin{macro}{\underline} % $B2<@~$r0z$/L?Na$G$9!#$b$H$O(B\file{ltboxes.dtx}$B$GDj5A$5$l$F$$$^$9!#(B % \changes{v1.2c}{2016/02/28}{1.2b$B$HF1MM$N=$@5$r(B\cs{underline}$BL?Na$K$b9T$C$?(B} +% \changes{v1.3c}{2019/09/16}{Make \cs{underline} robust +% (sync with ltboxes.dtx 2019/08/27 v1.3b)} % \begin{macrocode} -%<platexrelease>\plIncludeInRelease{2016/04/17}{\underline} -%<platexrelease> {Remove extra \xkanjiskip}% +%<platexrelease>\plIncludeInRelease{2019/10/01}{\underline} +%<platexrelease> {Make robust}% %<*plcore|platexrelease> -\def\underline#1{% +\DeclareRobustCommand\underline[1]{% \relax \ifmmode\@@underline{#1}% \else \leavevmode\null$\@@underline{\hbox{#1}}\m@th$\null\relax\fi} %</plcore|platexrelease> %<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{2016/04/17}{\underline} +%<platexrelease> {Remove extra \xkanjiskip}% +%<platexrelease>\def\underline#1{% +%<platexrelease> \relax +%<platexrelease> \ifmmode\@@underline{#1}% +%<platexrelease> \else \leavevmode\null$\@@underline{\hbox{#1}}\m@th$\null\relax\fi} +%<platexrelease>\expandafter \let \csname underline \endcsname \@undefined +%<platexrelease>\plEndIncludeInRelease %<platexrelease>\plIncludeInRelease{0000/00/00}{\underline} %<platexrelease> {LaTeX2e original}% %<platexrelease>\def\underline#1{% %<platexrelease> \relax %<platexrelease> \ifmmode\@@underline{#1}% %<platexrelease> \else $\@@underline{\hbox{#1}}\m@th$\relax\fi} +%<platexrelease>\expandafter \let \csname underline \endcsname \@undefined %<platexrelease>\plEndIncludeInRelease % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/source/platex/base/plext.dtx b/Master/texmf-dist/source/platex/base/plext.dtx index 8dbce770027..438cf7c0433 100644 --- a/Master/texmf-dist/source/platex/base/plext.dtx +++ b/Master/texmf-dist/source/platex/base/plext.dtx @@ -3,7 +3,7 @@ % % Copyright 2001 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). % ------------------------------------------------------------- @@ -81,6 +81,8 @@ % $BJQ99(B (forum:2506, issue~76)} % \changes{v1.2k}{2018/10/07}{$B%-%c%W%7%g%s$NAH$_J}8~$,4pK\AH$NAH$_J}8~$H(B % $BD>8r$9$k>l9g$K!"?<$5$rK:$l$F$$$?%P%0=$@5(B (forum:2506, issue~76)} +% \changes{v1.2l}{2019/09/29}{Make \cs{bou} robust} +% \changes{v1.2l}{2019/09/29}{Make \cs{kasen} robust} % \fi % % \iffalse @@ -89,7 +91,7 @@ \ProvidesFile{plext.dtx} %</driver> %<package>\ProvidesPackage{plext} - [2018/10/07 v1.2k pLaTeX package file (community edition)] + [2019/09/29 v1.2l pLaTeX package file (community edition)] %<*driver> \documentclass{jltxdoc} \usepackage{plext} @@ -1380,8 +1382,9 @@ \def\boutenchar{\char\euc"A1A2} % \end{macrocode} % +% \changes{v1.2l}{2019/09/29}{Make \cs{bou} robust} % \begin{macrocode} -\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 @@ -1412,8 +1415,9 @@ % $B=DAH%b!<%I$G$b!"2sE>%b!<%I$N(B|\parbox|$B$J$I$G;H$o$l$?$H$-$K$O!"(B % $B$d$O$j0z?t$r(B|\underline|$B$KEO$7$^$9!#(B % $B$3$l0J30$N>l9g$O!"0z?t$N>e$KD>@~$r0z$-$^$9!#(B +% \changes{v1.2l}{2019/09/29}{Make \cs{kasen} robust} % \begin{macrocode} -\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/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> diff --git a/Master/texmf-dist/source/platex/base/plnewsc13.tex b/Master/texmf-dist/source/platex/base/plnewsc13.tex new file mode 100644 index 00000000000..c58a5bd961c --- /dev/null +++ b/Master/texmf-dist/source/platex/base/plnewsc13.tex @@ -0,0 +1,91 @@ +%% <2019-04-06> and <2019-10-01> +\documentclass{plnews} + +\publicationyear{2019}% $BH/9TG/(B +\publicationmonth{10}% $BH/9T7n(B +\publicationissue{c13}% $BHV9f(B +\author{$BF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#!J(B\texttt{https://texjp.org/}$B!K(B} + +\def\cs#1{\texttt{\char92\nobreak #1}} +\def\pTeX{p\kern-.15em\TeX} +\def\eTeX{$\varepsilon$-\TeX} +\def\epTeX{$\varepsilon$-\pTeX} +\def\pLaTeX{p\kern-.05em\LaTeX} +\def\pLaTeXe{p\kern-.05em\LaTeXe} +\xspcode`\\=1 + +\begin{document} + +\maketitle + +$B%3%_%e%K%F%#HG(B\pLaTeXe\ \texttt{<2019-04-06>}$B$*$h$S(B +\texttt{<2019-10-01>}$B$K$D$$$F!"(B +\pLaTeXe\ \texttt{<2018-12-01>}$B$+$i$N99?72U=j$r$^$H$a$^$9!#(B + + +\section{$BI8=`%/%i%9$N?7859fBP1~(B} +\pLaTeXe\ \texttt{<2019-04-06>}$B$G$O!"IUB0$NI8=`%/%i%9(B +(jarticle, jbook, jreport, tarticle, tbook, treport)$B$G(B +\cs{$BOBNq(B} $B$r;XDj$7$?>l9g$N(B \cs{today} $B$K$D$$$F!"(B +2019$BG/(B5$B7n(B1$BF|$+$i;\9TM=Dj$N?7859f!VNaOB!W$KBP1~$7$^$7$?!#(B +\begin{itemize} +\item {\year=2019 \month=4 \day=30 + \$B@>Nq(B\today $\rightarrow$ \$BOBNq(B\today} +\item {\year=2019 \month=5 \day=1 + \$B@>Nq(B\today $\rightarrow$ \$BOBNq(B\today} +\item {\year=2020 \month=1 \day=2 + \$B@>Nq(B\today $\rightarrow$ \$BOBNq(B\today} +\end{itemize} +$B$^$?!"=D?t<0%G%#%l%/%7%g%s$G(B \cs{today} $B$r;H$C$?>l9g!"(B +$B=>Mh$O=DAH$HF1$8$/4A?t;z$KJQ49$5$l$F$$$^$7$?$,!"(B +$B$3$N%P!<%8%g%s$+$i$O;;MQ?t;z$H$7$^$7$?!#(B + + +\section{\LaTeXe\ \texttt{<2019-10-01>}$BBP1~(B} +$B%*%j%8%J%k$N(B\LaTeX $B$K9g$o$;$k$?$a!"(B\pLaTeX $B$X$b(B +$B$$$/$D$+=$@5$r2C$($^$7$?!#(B + +\pLaTeXe\ \texttt{<2019-04-06>}$B;~E@$G$O(B +\begin{itemize} +\item $BI=AH$_!J(Btabular$B4D6-!K$N%^%/%m$NHy=$@5(B +\end{itemize} +$B$KBP1~$7$^$7$?!#(B + +\pLaTeXe\ \texttt{<2019-10-01>}$B;~E@$G$O!"$5$i$K(B +\begin{itemize} +\item \cs{DeclareErrorKanjiFont}$B$,(B\cs{k@family}$BEy$rDj5A$7$J$$(B + $B$h$&$K!J(B\cs{DeclareErrorFont}$B$KDI?o!K(B +\item $B%f!<%6MQ%3%^%s%I$r(Brobust$B$K(B + \begin{itemize} + \item \cs{strut}$B4X78(B (\cs{\{t,z,y\}strut}) + \item \cs{usefont}$B4X78(B (\cs{use\{roman,kanji\}}) + \item \cs{userelfont}, \cs{adjustbaseline} + \item \cs{AtBeginDvi}, \cs{underline} + \item plext$B%Q%C%1!<%8$N(B\cs{bou}, \cs{kasen} + \end{itemize} +\end{itemize} +$B$K$bBP1~$7$^$7$?!#(B + +\section{$B3+H/HG$N%F%9%H$N$*4j$$(B} +$B:#8e(B\pLaTeX{}$B$KF3F~$9$k$+$b$7$l$J$$=$@5%Q%C%A$d;EMMJQ99$N%F%9%H$K(B +$B$46(NO$/$@$5$$!#(B\TeX{}$B%U%!%$%k$NKAF,!J(B|\documentclass|$B$h$jA0!K$G(B +\begin{verbatim} + \RequirePackage{exppl2e} +\end{verbatim} +$B$H=q$/$3$H$G!"8=:_$N3+H/HG$r%F%9%H$9$k$3$H$,$G$-$^$9!#(B +$B8=:_$O(B +\begin{itemize} + \item $B;YCl%3%^%s%I$GMQ$$$i$l$k(B|\strut|$B$N5sF0(B + \item $B6u$N%U%m!<%H$@$1$N%Z!<%8$,H/@8$7$?>l9g$N=hM}(B +\end{itemize} +$B$K4X$9$k%Q%C%A$,F~$C$F$$$^$9!#(B + +$B>\:Y$O(B\file{exppl2e.pdf}$B$r;2>H$7$F$/$@$5$$!#$3$3$K$O!"(B +$B$=$NB>$N(B\pLaTeXe{}$B$N4{CN$N@)Ls;v9`$b5-:\$7$F$$$^$9!#(B +\TeX\ Forum$B$d(BGitHub$B$N(BIssue$B$G$N%P%0Js9p$d$40U8+$r4?7^$7$^$9!#(B +\begin{itemize} +\item \texttt{https://github.com/texjporg/platex} +\item \texttt{https://github.com/texjporg/uplatex} +\end{itemize} + +\end{document} diff --git a/Master/texmf-dist/source/platex/base/plvers.dtx b/Master/texmf-dist/source/platex/base/plvers.dtx index 9944cbfc1c9..e465f2dab7d 100644 --- a/Master/texmf-dist/source/platex/base/plvers.dtx +++ b/Master/texmf-dist/source/platex/base/plvers.dtx @@ -65,9 +65,9 @@ % \changes{v1.1}{2016/09/14}{$B5/F0;~$N%P%J!<$r<hF@$9$k%3!<%I$r2~NI(B} % \changes{v1.1a}{2017/02/20}{\LaTeX\ \texttt{!<2017/01/01!>}$BHGBP1~3NG'(B} % \changes{v1.1b}{2017/03/19}{\cs{l@nohyphenation}$B$NDj5A$rJ]>Z(B -% (sync with ltfinal 2017/03/09 v2.0t)} +% (sync with ltfinal.dtx 2017/03/09 v2.0t)} % \changes{v1.1b}{2017/03/19}{\cs{document@default@language}$B$NDj5A$rJ]>Z(B -% (sync with ltfinal 2017/03/09 v2.0t)} +% (sync with ltfinal.dtx 2017/03/09 v2.0t)} % \changes{v1.1c}{2017/04/23}{\LaTeX\ \texttt{!<2017-04-15!>}$BHGBP1~3NG'(B} % \changes{v1.1d}{2017/09/24}{$B%Q%C%A%l%Y%k$,Ii$N?t$N>l9g$r(Bpre-release$B07$$$X(B} % \changes{v1.1e}{2017/11/09}{\file{latexrelease}$B$H(B @@ -78,7 +78,7 @@ % \cs{pfmtname}, \cs{pfmtversion}, \cs{ppatch@level}$B$rE83+$7$J$$$h$&$K(B} % \changes{v1.1h}{2018/01/10}{Modify \cs{plIncludeInRelease} code % to check matching \cs{plEndIncluderelease} -% (sync with ltvers 2018/01/08 v1.1a)} +% (sync with ltvers.dtx 2018/01/08 v1.1a)} % \changes{v1.1i}{2018/03/31}{\LaTeXe\ 2017-04-15$B0J9_I,?\(B} % \changes{v1.1j}{2018/04/07}{\LaTeX\ \texttt{!<2018-04-01!>}$BHGBP1~3NG'(B} % \changes{v1.1k}{2018/04/08}{$B%P%J!<D4@a$N%3!<%I$r:G8e(B(plfinal)$B$G$O$J$/(B @@ -89,12 +89,15 @@ % \changes{v1.1n}{2018/10/31}{\LaTeXe{}$B$H(Bp\LaTeXe{}$B$N99?7%?%$%_%s%0$:$lBP:v$r(B % \file{plvers.dtx} (plfinal) $B$+$i(B\file{plcore.dtx}$B$X0\F0(B} % \changes{v1.1o}{2018/12/01}{\LaTeX\ \texttt{!<2018-12-01!>}$BHGBP1~3NG'(B} +% \changes{v1.1p}{2019/09/16}{$B%(%i!<%a%C%;!<%8$r99?7(B +% (sync with ltvers.dtx 2019/07/01 v1.1c)} +% \changes{v1.1q}{2019/10/01}{\LaTeX\ \texttt{!<2019-10-01!>}$BHGBP1~3NG'(B} % \fi % % \iffalse %<*driver> % \fi -\ProvidesFile{plvers.dtx}[2018/12/01 v1.1o pLaTeX Kernel (Version Info)] +\ProvidesFile{plvers.dtx}[2019/10/01 v1.1q pLaTeX Kernel (Version Info)] % \iffalse \documentclass{jltxdoc} \GetFileInfo{plvers.dtx} @@ -132,6 +135,7 @@ % \changes{v1.1c}{2017/04/23}{\LaTeX\ \texttt{!<2017-04-15!>}$BHGBP1~3NG'(B} % \changes{v1.1j}{2018/04/07}{\LaTeX\ \texttt{!<2018-04-01!>}$BHGBP1~3NG'(B} % \changes{v1.1o}{2018/12/01}{\LaTeX\ \texttt{!<2018-12-01!>}$BHGBP1~3NG'(B} +% \changes{v1.1q}{2019/10/01}{\LaTeX\ \texttt{!<2019-10-01!>}$BHGBP1~3NG'(B} % % $B$3$N%P!<%8%g%s$N(Bp\LaTeXe{}$B$O!"<!$N%P!<%8%g%s$N(B\LaTeX{}\footnote{% % \LaTeX\ authors: Johannes Braams, David Carlisle, Alan Jeffrey, @@ -145,7 +149,7 @@ %<latexrelease>\edef\latexreleaseversion %<platexrelease>\edef\p@known@latexreleaseversion %<*2ekernel|latexrelease|platexrelease> - {2018-12-01} + {2019-10-01} %</2ekernel|latexrelease|platexrelease> % \end{macrocode} % @@ -186,7 +190,7 @@ %</plcore> %<platexrelease>\edef\platexreleaseversion %<*plcore|platexrelease> - {2019-04-06} + {2019-10-01} %</plcore|platexrelease> %<*plcore> \def\ppatch@level{0} @@ -345,9 +349,9 @@ % ^^A $B!J%O%$%U%M!<%7%g%s4XO"%Q%i%a!<%?$NDj5A!K$O!"(B % ^^A \file{plvers.dtx}$B$+$i(B\file{plcore.dtx}$B$X0\F0$7$^$7$?!#(B % \changes{v1.1b}{2017/03/19}{\cs{l@nohyphenation}$B$NDj5A$rJ]>Z(B -% (sync with ltfinal 2017/03/09 v2.0t)} +% (sync with ltfinal.dtx 2017/03/09 v2.0t)} % \changes{v1.1b}{2017/03/19}{\cs{document@default@language}$B$NDj5A$rJ]>Z(B -% (sync with ltfinal 2017/03/09 v2.0t)} +% (sync with ltfinal.dtx 2017/03/09 v2.0t)} % \changes{v1.1n}{2018/10/31}{\LaTeXe{}$B$H(Bp\LaTeXe{}$B$N99?7%?%$%_%s%0$:$lBP:v$r(B % \file{plvers.dtx} (plfinal) $B$+$i(B\file{plcore.dtx}$B$X0\F0(B} % @@ -362,7 +366,9 @@ % \cs{platexrelease}$B$N%(%_%e%l!<%HFbIt=hM}$rJ,N%(B} % \changes{v1.1h}{2018/01/10}{Modify \cs{plIncludeInRelease} code % to check matching \cs{plEndIncluderelease} -% (sync with ltvers 2018/01/08 v1.1a)} +% (sync with ltvers.dtx 2018/01/08 v1.1a)} +% \changes{v1.1p}{2019/09/16}{$B%(%i!<%a%C%;!<%8$r99?7(B +% (sync with ltvers.dtx 2019/07/01 v1.1c)} % % \iffalse % $BHwK:O?!'(B\LaTeX{}$B$G$O(B\cs{if@includeinrelease}$B$NDj5A$r(B @@ -378,7 +384,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[% @@ -431,7 +438,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} %</plcore|platexrelease> % \end{macrocode} 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 %% |