texlive[56486] Master/texmf-dist: platex (30sep20)
commits+karl at tug.org
commits+karl at tug.org
Wed Sep 30 23:25:54 CEST 2020
Revision: 56486
http://tug.org/svn/texlive?view=revision&revision=56486
Author: karl
Date: 2020-09-30 23:25:54 +0200 (Wed, 30 Sep 2020)
Log Message:
-----------
platex (30sep20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/platex/base/README.md
trunk/Master/texmf-dist/doc/platex/base/exppl2e.pdf
trunk/Master/texmf-dist/doc/platex/base/platex-en.pdf
trunk/Master/texmf-dist/doc/platex/base/platex.pdf
trunk/Master/texmf-dist/doc/platex/base/platexrelease.pdf
trunk/Master/texmf-dist/doc/platex/base/pldoc.pdf
trunk/Master/texmf-dist/source/platex/base/Makefile
trunk/Master/texmf-dist/source/platex/base/jclasses.dtx
trunk/Master/texmf-dist/source/platex/base/kinsoku.dtx
trunk/Master/texmf-dist/source/platex/base/platex.dtx
trunk/Master/texmf-dist/source/platex/base/platexrelease.ins
trunk/Master/texmf-dist/source/platex/base/plcore.dtx
trunk/Master/texmf-dist/source/platex/base/plfmt.ins
trunk/Master/texmf-dist/source/platex/base/plfonts.dtx
trunk/Master/texmf-dist/source/platex/base/plvers.dtx
trunk/Master/texmf-dist/tex/platex/base/exppl2e.sty
trunk/Master/texmf-dist/tex/platex/base/jarticle.cls
trunk/Master/texmf-dist/tex/platex/base/jbk10.clo
trunk/Master/texmf-dist/tex/platex/base/jbk11.clo
trunk/Master/texmf-dist/tex/platex/base/jbk12.clo
trunk/Master/texmf-dist/tex/platex/base/jbook.cls
trunk/Master/texmf-dist/tex/platex/base/jreport.cls
trunk/Master/texmf-dist/tex/platex/base/jsize10.clo
trunk/Master/texmf-dist/tex/platex/base/jsize11.clo
trunk/Master/texmf-dist/tex/platex/base/jsize12.clo
trunk/Master/texmf-dist/tex/platex/base/jt1gt.fd
trunk/Master/texmf-dist/tex/platex/base/jt1mc.fd
trunk/Master/texmf-dist/tex/platex/base/jy1gt.fd
trunk/Master/texmf-dist/tex/platex/base/jy1mc.fd
trunk/Master/texmf-dist/tex/platex/base/kinsoku.tex
trunk/Master/texmf-dist/tex/platex/base/pfltrace.sty
trunk/Master/texmf-dist/tex/platex/base/platex.ltx
trunk/Master/texmf-dist/tex/platex/base/platexrelease.sty
trunk/Master/texmf-dist/tex/platex/base/plcore.ltx
trunk/Master/texmf-dist/tex/platex/base/pldefs.ltx
trunk/Master/texmf-dist/tex/platex/base/plext.sty
trunk/Master/texmf-dist/tex/platex/base/ptrace.sty
trunk/Master/texmf-dist/tex/platex/base/tarticle.cls
trunk/Master/texmf-dist/tex/platex/base/tbk10.clo
trunk/Master/texmf-dist/tex/platex/base/tbk11.clo
trunk/Master/texmf-dist/tex/platex/base/tbk12.clo
trunk/Master/texmf-dist/tex/platex/base/tbook.cls
trunk/Master/texmf-dist/tex/platex/base/treport.cls
trunk/Master/texmf-dist/tex/platex/base/tsize10.clo
trunk/Master/texmf-dist/tex/platex/base/tsize11.clo
trunk/Master/texmf-dist/tex/platex/base/tsize12.clo
Added Paths:
-----------
trunk/Master/texmf-dist/source/platex/base/plexpl3.dtx
trunk/Master/texmf-dist/source/platex/base/plnewsc15.tex
trunk/Master/texmf-dist/tex/platex/base/plexpl3.ltx
trunk/Master/texmf-dist/tex/platex/base/plexpl3.sty
Modified: trunk/Master/texmf-dist/doc/platex/base/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/platex/base/README.md 2020-09-30 21:25:20 UTC (rev 56485)
+++ trunk/Master/texmf-dist/doc/platex/base/README.md 2020-09-30 21:25:54 UTC (rev 56486)
@@ -64,6 +64,6 @@
## Release Date
-2020-04-12
+2020-09-30
Japanese TeX Development Community
Modified: trunk/Master/texmf-dist/doc/platex/base/exppl2e.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/platex/base/platex-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/platex/base/platex.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/platex/base/platexrelease.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/platex/base/pldoc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/platex/base/Makefile
===================================================================
--- trunk/Master/texmf-dist/source/platex/base/Makefile 2020-09-30 21:25:20 UTC (rev 56485)
+++ trunk/Master/texmf-dist/source/platex/base/Makefile 2020-09-30 21:25:54 UTC (rev 56486)
@@ -15,10 +15,10 @@
PLFMT = platex.ltx plcore.ltx kinsoku.tex pldefs.ltx \
jy1mc.fd jy1gt.fd jt1mc.fd jt1gt.fd plext.sty \
- ptrace.sty pfltrace.sty
+ ptrace.sty pfltrace.sty plexpl3.sty plexpl3.ltx
PLFMT_SRC = platex.dtx plvers.dtx plfonts.dtx plcore.dtx \
- kinsoku.dtx plext.dtx
+ kinsoku.dtx plext.dtx plexpl3.dtx
PLCLS = jarticle.cls jreport.cls jbook.cls jsize10.clo \
jsize11.clo jsize12.clo jbk10.clo jbk11.clo jbk12.clo \
@@ -40,8 +40,7 @@
PLRELDOC_SRC = platexrelease.dtx
-PLDOC_SRC = platex.dtx plvers.dtx plfonts.dtx plcore.dtx plext.dtx \
- pl209.dtx kinsoku.dtx jclasses.dtx jltxdoc.dtx
+PLDOC_SRC = $(PLFMT_SRC) $(PLCLS_SRC) $(PL209_SRC) jltxdoc.dtx
platex.ltx: $(PLFMT_SRC)
rm -f $(PLFMT)
Modified: trunk/Master/texmf-dist/source/platex/base/jclasses.dtx
===================================================================
--- trunk/Master/texmf-dist/source/platex/base/jclasses.dtx 2020-09-30 21:25:20 UTC (rev 56485)
+++ trunk/Master/texmf-dist/source/platex/base/jclasses.dtx 2020-09-30 21:25:54 UTC (rev 56486)
@@ -105,6 +105,9 @@
% (sync with classes.dtx 2019/10/25 v1.4k)}
% \changes{v1.8e}{2020/01/03}{Normalize label fonts
% (sync with classes.dtx 2019/12/20 v1.4l)}
+% \changes{v1.8f}{2020/09/30}{add a fourth argument for better
+% hyperref compability
+% (sync with ltsect.dtx 2020/07/27 v1.1e)}
% \fi
%
% \iffalse
@@ -134,7 +137,7 @@
%<11pt&bk>\ProvidesFile{tbk11.clo}
%<12pt&bk>\ProvidesFile{tbk12.clo}
%</tate>
- [2020/01/03 v1.8e
+ [2020/09/30 v1.8f
%<article|report|book> Standard pLaTeX class]
%<10pt|11pt|12pt> Standard pLaTeX file (size option)]
%<*driver>
@@ -3997,21 +4000,23 @@
%
% \begin{macro}{\addcontentsline}
% $B=DAH$N>l9g$K%Z!<%8HV9f$r(B|\rensuji|$B$G0O$`$h$&$KJQ99$7$^$9!#(B
-% ^^A $B2#AH$N$H$-$K$b(B`|\rensuji|'$B%3%^%s%I$,=PNO$5$l$^$9$,!"(B
-% ^^A $B$3$N%3%^%s%I$K$h$k1F6A$O$"$j$^$;$s!#(B
%
% $B$3$N%^%/%m$O(B\file{ltsect.dtx}$B$GDj5A$5$l$F$$$^$9!#(B
+% ^^A $BL?Na(B |\addcontentsline| $B$H(B |\addtocontents| $B$rAH$_9g$o$;(B
% \changes{v1.8a}{2018/10/25}{$B%U%!%$%k=q$-=P$7;~$N9TKvJ8;zBP:v(B
% (sync with ltsect.dtx 2018/09/26 v1.1c)}
+% \changes{v1.8f}{2020/09/30}{add a fourth argument for better
+% hyperref compability
+% (sync with ltsect.dtx 2020/07/27 v1.1e)}
% \begin{macrocode}
\providecommand*\protected at file@percent{}
\def\addcontentsline#1#2#3{%
\protected at write\@auxout
{\let\label\@gobble \let\index\@gobble \let\glossary\@gobble
-%<tate> \@temptokena{\rensuji{\thepage}}}%
-%<yoko> \@temptokena{\thepage}}%
- {\string\@writefile{#1}%
- {\protect\contentsline{#2}{#3}{\the\@temptokena}%
+%<tate> \@temptokena{\rensuji{\thepage}}%
+%<yoko> \@temptokena{\thepage}%
+ }{\string\@writefile{#1}%
+ {\protect\contentsline{#2}{#3}{\the\@temptokena}{}%
\protected at file@percent}}%
}
% \end{macrocode}
Modified: trunk/Master/texmf-dist/source/platex/base/kinsoku.dtx
===================================================================
--- trunk/Master/texmf-dist/source/platex/base/kinsoku.dtx 2020-09-30 21:25:20 UTC (rev 56485)
+++ trunk/Master/texmf-dist/source/platex/base/kinsoku.dtx 2020-09-30 21:25:54 UTC (rev 56486)
@@ -3,7 +3,7 @@
%
% Copyright 1995 ASCII Corporation.
% Copyright (c) 2010 ASCII MEDIA WORKS
-% Copyright (c) 2016-2017 Japanese TeX Development Community
+% Copyright (c) 2016-2020 Japanese TeX Development Community
%
% This file is part of the pLaTeX2e system (community edition).
% -------------------------------------------------------------
@@ -17,6 +17,7 @@
% $B$N$?$a$K(B128--256$B$NJ8;z$r(B\texttt{\cs{xspcode}=3}$B$K at _Dj(B}
% \changes{v1.0b}{2017/08/05}{$B!s!"!u!"(B\%$B!"(B\&$B$N6XB'%Z%J%k%F%#$,(B
% $B8m$C$F$$$?$N$r=$@5!J(Bpost $\rightarrow$ pre$B!K(B}
+% \changes{v1.0c}{2020/09/28}{$B!*$N(B\cs{inhibitxspcode}$B$r at _Dj(B}
% \fi
%
% \setcounter{StandardModuleDepth}{1}
@@ -26,7 +27,8 @@
%<*driver>
\NeedsTeXFormat{pLaTeX2e}
% \fi
-\ProvidesFile{kinsoku.dtx}[2017/08/05 v1.0b pLaTeX Kernel (community edition)]
+\ProvidesFile{kinsoku.dtx}
+ [2020/09/28 v1.0c pLaTeX Kernel (community edition)]
% \iffalse
\documentclass{jltxdoc}
\GetFileInfo{kinsoku.dtx}
@@ -348,6 +350,7 @@
% \end{tabular}
% \end{center}
%
+% \changes{v1.0c}{2020/09/28}{$B!*$N(B\cs{inhibitxspcode}$B$r at _Dj(B}
% \begin{macrocode}
\inhibitxspcode`$B!"(B=1
\inhibitxspcode`$B!#(B=1
@@ -355,6 +358,7 @@
\inhibitxspcode`$B!%(B=1
\inhibitxspcode`$B!((B=1
\inhibitxspcode`$B!)(B=1
+\inhibitxspcode`$B!*(B=1
\inhibitxspcode`$B!K(B=1
\inhibitxspcode`$B!J(B=2
\inhibitxspcode`$B!O(B=1
Modified: trunk/Master/texmf-dist/source/platex/base/platex.dtx
===================================================================
--- trunk/Master/texmf-dist/source/platex/base/platex.dtx 2020-09-30 21:25:20 UTC (rev 56485)
+++ trunk/Master/texmf-dist/source/platex/base/platex.dtx 2020-09-30 21:25:54 UTC (rev 56486)
@@ -86,6 +86,8 @@
% \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}
% \changes{v1.1}{2020/03/24}{$B%I%-%e%a%s%H$r99?7(B}
+% \changes{v1.1a}{2020/09/26}{\file{plexpl3.dtx}$B$rDI2C(B}
+% \changes{v1.1b}{2020/09/28}{defs$BFI9~8e$K%U%C%/DI2C(B}
%\else
% \changes{v1.0}{1995/05/08}{first edition}
% \changes{v1.0a}{1995/08/25}{Added 'Compatibility', `Usage of \dst{}'
@@ -130,6 +132,8 @@
% \changes{v1.0y}{2018/09/22}{Show last update info on \file{pldoc.pdf}}
% \changes{v1.0z}{2019/09/29}{Fix typos in document.}
% \changes{v1.1}{2020/03/24}{Update document.}
+% \changes{v1.1a}{2020/09/26}{Add \file{plexpl3.dtx}}
+% \changes{v1.1b}{2020/09/28}{Add hook after loading defs}
%\fi
% \fi
%
@@ -137,7 +141,7 @@
%<*driver>
\NeedsTeXFormat{pLaTeX2e}
% \fi
-\ProvidesFile{platex.dtx}[2020/03/24 v1.1 pLaTeX document file]
+\ProvidesFile{platex.dtx}[2020/09/28 v1.1b pLaTeX document file]
% \iffalse
\documentclass{jltxdoc}
\usepackage{plext}
@@ -527,14 +531,18 @@
% \TeX{}$B$NF~NO%U%!%$%k8!:w%Q%9$K at _Dj$5$l$F$$$k(B
% $B%G%#%l%/%H%j$K(B\file{pldefs.cfg}$B%U%!%$%k$,$"$k>l9g$O!"(B
% $B$=$N%U%!%$%k$r;H$$$^$9!#(B
+% $BFI$_9~$_8e$K%3!<%I$,<B9T$5$l$k$+$b$7$l$^$;$s!#(B
% \changes{v1.0s}{2017/12/05}{$B%G%U%)%k%H at _Dj%U%!%$%k$NFI$_9~$_$r(B
% \file{plcore.ltx}$B$+$i(B\file{platex.ltx}$B$X0\F0(B}
+% \changes{v1.1b}{2020/09/28}{defs$BFI9~8e$K%U%C%/DI2C(B}
%\else
% Load font-related default settings, \file{pldefs.ltx}.
% If a file \file{pldefs.cfg} is found, then that file will be
% used instead.
+% Some code may be executed after loading.
% \changes{v1.0s}{2017/12/05}{Moved loading default settings
% from \file{plcore.ltx} to \file{platex.ltx}}
+% \changes{v1.1b}{2020/09/28}{Add hook after loading defs}
%\fi
% \begin{macrocode}
\InputIfFileExists{pldefs.cfg}
@@ -542,6 +550,7 @@
* Local config file pldefs.cfg used^^J%
*************************************}}%
{\input{pldefs.ltx}}
+\ifx\code at after@pldefs\@undefined\else \code at after@pldefs \fi
% \end{macrocode}
%
%\ifJAPANESE
@@ -1264,6 +1273,7 @@
\let\ProvidesClass\ProvidesFile
\let\ProvidesPackage\ProvidesFile
\input{plvers.dtx}
+ \input{plexpl3.dtx}
\input{plfonts.dtx}
\input{plcore.dtx}
\input{plext.dtx}
@@ -1279,8 +1289,10 @@
% \end{macrocode}
%\ifJAPANESE
% $B$3$3$+$i$,K\J8%Z!<%8$H$J$j$^$9!#(B
+% \changes{v1.1a}{2020/09/26}{\file{plexpl3.dtx}$B$rDI2C(B}
%\else
% Here starts the document body.
+% \changes{v1.1a}{2020/09/26}{Add \file{plexpl3.dtx}}
%\fi
% \begin{macrocode}
\begin{document}
@@ -1293,6 +1305,8 @@
\DocInclude{plvers} % pLaTeX version
+\DocInclude{plexpl3} % additions to expl3
+
\DocInclude{plfonts} % NFSS2 commands
\DocInclude{plcore} % kernel commands
Modified: trunk/Master/texmf-dist/source/platex/base/platexrelease.ins
===================================================================
--- trunk/Master/texmf-dist/source/platex/base/platexrelease.ins 2020-09-30 21:25:20 UTC (rev 56485)
+++ trunk/Master/texmf-dist/source/platex/base/platexrelease.ins 2020-09-30 21:25:54 UTC (rev 56486)
@@ -7,7 +7,7 @@
\preamble
-Copyright (c) 2016-2018 Japanese TeX Development Community
+Copyright (c) 2016-2020 Japanese TeX Development Community
This file is part of the pLaTeX2e system (community edition).
-------------------------------------------------------------
@@ -18,6 +18,7 @@
\file{platexrelease.sty}{
\from{plvers.dtx}{platexrelease}
\from{platexrelease.dtx}{platexrelease}
+ \from{plexpl3.dtx}{platexrelease}
\from{plfonts.dtx}{platexrelease}
\from{plcore.dtx}{platexrelease}}
}
Modified: trunk/Master/texmf-dist/source/platex/base/plcore.dtx
===================================================================
--- trunk/Master/texmf-dist/source/platex/base/plcore.dtx 2020-09-30 21:25:20 UTC (rev 56485)
+++ trunk/Master/texmf-dist/source/platex/base/plcore.dtx 2020-09-30 21:25:54 UTC (rev 56486)
@@ -124,6 +124,13 @@
% FAM256$B3HD%$"$j$N>l9g$K8B$j%l%8%9%??t$,(B65536$B8D$N$?$a!#(B}
% \changes{v1.3d}{2019/10/19}{$B%3%T!<K:$l(B}
% \changes{v1.3e}{2020/03/05}{$B9g;z=hM}$rM^;_$7$D$D(B\cs{xkanjiskip}$B$OA^F~(B}
+% \changes{v1.3f}{2020/09/26}{\cs{AtBeginDvi}$B$r:FDj5A$7$J$$(B
+% (checked ltshipout.dtx 2020/09/21 v1.0c)}
+% \changes{v1.3f}{2020/09/26}{\cs{__shipout_execute_cont:}$B$r:FDj5A(B
+% (checked ltshipout.dtx 2020/09/21 v1.0c)}
+% \changes{v1.3g}{2020/09/28}{$B=DAH$G6u$N%U%m!<%H$@$1$N%Z!<%8$N(B
+% $B%U%C%?(B(Issue 78)}
+% \changes{v1.3g}{2020/09/28}{\file{plexpl3}$B$GDj5A$7$?L?Na$r;HMQ(B}
% \fi
%
% \iffalse
@@ -130,7 +137,7 @@
%<*driver>
\NeedsTeXFormat{pLaTeX2e}
% \fi
-\ProvidesFile{plcore.dtx}[2020/03/05 v1.3e pLaTeX core file]
+\ProvidesFile{plcore.dtx}[2020/09/28 v1.3g pLaTeX core file]
% \iffalse
\documentclass{jltxdoc}
\GetFileInfo{plcore.dtx}
@@ -156,6 +163,7 @@
% \item $B2~9T(B
% \item $B%*%V%8%'%/%H$N=PNO=g=x(B
% \item $B%H%s%\(B
+% \item $B=PNO%k!<%A%s(B
% \item $B5SCm%^%/%m(B
% \item $BAj8_;2>H(B
% \item $B5?;w%?%$%WF~NO(B
@@ -786,10 +794,74 @@
\unvbox\footins}\fi
\ifvbox\@kludgeins\insert\@kludgeins{\unvbox\@kludgeins}\fi
}
+%</plcore>
% \end{macrocode}
% \end{macro}
%
%
+% \begin{macro}{\@vtryfc}
+% \LaTeXe\ 2017/01/01$B0J9_$G$O!"Nc$($P(B
+%\begin{verbatim}
+% \documentclass{tarticle}
+% \begin{document}
+% \begin{figure}
+% \end{figure}
+% \clearpage
+% a
+% \end{document}
+%\end{verbatim}
+% $B$N$h$&$K$9$k$H!V6u$N%U%m!<%H!W$@$1$N6uGr%Z!<%8$,H/@8$7$^$9!#(B
+% $B$3$N$H$-!"=DAH%/%i%9$G$O%U%C%?$,;}$A>e$,$C$F$7$^$&$N$G!"(B
+% $BBP:v$7$^$9!#(B(Issue \#78)
+%
+% $B$J$*!"(B\LaTeXe\ 2015/01/01--2016/03/31 patch level 3$B$G$O(B
+%\begin{verbatim}
+% ! Output loop---100 consecutive dead cycles.
+%\end{verbatim}
+% $B$N%(%i!<$,=P$F$$$^$7$?!#(B
+% $B$=$l$h$j at N$NHG$G$O6uGr%Z!<%8$OH/@8$7$^$;$s!#(B
+%
+% $BBP:vJ}K!$O!"(B\file{ltoutput.dtx}$B$GDj5A$5$l$F$$$k(B|\@vtryfc|$B$K(B
+% |\ifydir\else\hskip\z@\fi|$B$NDI2C$G$9!J(B|\@makecol|$B$HF1MM!K!#(B
+% \changes{v1.3g}{2020/09/28}{$B=DAH$G6u$N%U%m!<%H$@$1$N%Z!<%8$N(B
+% $B%U%C%?(B(Issue 78)}
+% \begin{macrocode}
+%<platexrelease>\plIncludeInRelease{2020/10/01}{\@vtryfc}
+%<platexrelease> {Empty float}%
+%<*plcore|platexrelease>
+\def\@vtryfc #1{%
+ \global\setbox\@outputbox\vbox{\ifydir\else\hskip\z@\fi}%
+ \let\@elt\@wtryfc
+ \@flsucceed
+ \global\setbox\@outputbox \vbox to\@colht{%
+ \vskip \@fptop
+ \vskip -\@fpsep
+ \unvbox \@outputbox
+ \vskip \@fpbot}%
+ \let\@elt\relax
+ \xdef #1{\@failedlist\@flfail}%
+ \xdef\@freelist{\@freelist\@flsucceed}}
+%</plcore|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\@vtryfc}
+%<platexrelease> {LaTeX2e original}%
+%<platexrelease>\def\@vtryfc #1{%
+%<platexrelease> \global\setbox\@outputbox\vbox{}%
+%<platexrelease> \let\@elt\@wtryfc
+%<platexrelease> \@flsucceed
+%<platexrelease> \global\setbox\@outputbox \vbox to\@colht{%
+%<platexrelease> \vskip \@fptop
+%<platexrelease> \vskip -\@fpsep
+%<platexrelease> \unvbox \@outputbox
+%<platexrelease> \vskip \@fpbot}%
+%<platexrelease> \let\@elt\relax
+%<platexrelease> \xdef #1{\@failedlist\@flfail}%
+%<platexrelease> \xdef\@freelist{\@freelist\@flsucceed}}
+%<platexrelease>\plEndIncludeInRelease
+% \end{macrocode}
+% \end{macro}
+%
+%
% \subsection{$B%H%s%\(B}
% $B$3$3$G$O%H%s%\$r=PNO$9$k$?$a$N%^%/%m$rDj5A$7$F$$$^$9!#(B
%
@@ -798,6 +870,7 @@
% |\iftombow|$B$O%H%s%\$r=PNO$9$k$+$I$&$+!"(B|\iftombowdate|$B$O(BDVI$B$r:n at .$7$?(B
% $BF|IU$r%H%s%\$NOF$K=PNO$9$k$+$I$&$+$r<($9$?$a$KMQ$$$^$9!#(B
% \begin{macrocode}
+%<*plcore>
\newif\iftombow \tombowfalse
\newif\iftombowdate \tombowdatetrue
% \end{macrocode}
@@ -1139,7 +1212,7 @@
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\@tombowreset@@paper}
+% \begin{macro}{\@tombowreset@@paper}
% $B%H%s%\=PNO%*%W%7%g%s$,;XDj$5$l$F$$$k>l9g$K(B
% $BMQ;f%5%$%:$r:F at _Dj$9$kL?Na$G$9!#(B
% |\@outputpage|$B$X2C$($kJQ99$r4J7i$K$9$k$?$a!"J,N%$7$?>e$G(B
@@ -1169,17 +1242,21 @@
%<platexrelease>\plEndIncludeInRelease
%<*plcore>
% \end{macrocode}
-% \end{macro}
+% \end{macro}
%
-% \begin{macro}{\@shipoutsetup}
+%
+% \subsection{$B=PNO%k!<%A%s(B}
+% $B$3$3$G<B:]$K%H%s%\$r=PNO$7$^$9!#(B
+%
+% \begin{macro}{\@shipoutsetup}
% \changes{v1.1i}{1998/02/03}{Command removed}
% |\@outputpage|$BFb$KA^F~$7$?$N$G:o=|$7$^$7$?!#(B
-% \end{macro}
+% \end{macro}
%
% \begin{macro}{\@outputpage}
% |\textwidth|$B$H(B|\textheight|$B$N8r49$O!"(B|\@shipoutsetup|$BFb$G$O9T$J$$$^$;$s!#(B
% $B$J$<$J$i!"(B|\@shipoutsetup|$B%^%/%m$,<B9T$5$l$k$H$-$O!"(B
-% |\shipout|$B$5$l$k(Bvbox$B$NCf$G$"$j!"$3$N$H$-$O2#AH%b!<%I$G$9$N$G!"(B
+% |\shipout|$B$5$l$k(B|\vbox|$B$NCf$G$"$j!"$3$N$H$-$O2#AH%b!<%I$G$9$N$G!"(B
% $B$D$M$K(B|\iftdir|$B$O56$HH=CG$5$l!"=D$H2#$N%5%$%:$r8r49$G$-$J$$$+$i$G$9!#(B
%
% $B$J$*!"$3$NJQ99$r%m!<%+%k$J$b$N$K$9$k$?$a$K!"(B
@@ -1434,6 +1511,10 @@
% \end{macro}
%
% \begin{macro}{\AtBeginDvi}
+% \LaTeXe{}$B$N%P!<%8%g%s$,(B2020-02-02$B$^$G$N>l9g!'(B
+% |\AtBeginDvi|$B$,!V(B|\unvbox|$B$7$F$+$i:F$S(B|\vbox|$B$9$k!W$H$$$&F0:n$N$?$a!"(B
+% $B:FDj5A$,I,MW$G$9!#(B
+% \begin{quote}
% p\LaTeX{}$B$N=PNO%k!<%A%s$N(B|\@outputpage|$B$G$O!"(B|\shipout|$B$9$k(Bvbox$B$NCf?H$K(B
% |\yoko|$B$r;XDj$7$F$$$^$9!#$3$N$?$a!"(B|\AtBeginDocument{\AtBeginDvi{}}|$B$H$$$&(B
% $B%3!<%I$r=q$/$H(B\texttt{Incompatible direction list can't be unboxed.}$B$H$$$&(B
@@ -1445,26 +1526,53 @@
% |\@begindvibox|$B$O!J6u$G$J$$8B$j!K>o$K2#AH$G$J$1$l$P$J$i$J$$(B
% \end{center}
% $B$H2>Dj$7$^$9!#$3$N2>Dj$K=>$$!"(B|\AtBeginDvi|$B$r:FDj5A$7$^$9!#(B
+% \end{quote}
% \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)}
+%
+% \LaTeXe~2020-10-01$B0J9_!'(B|\AtBeginDvi|$B$O%U%C%/$K$I$s$I$s%3!<%I$rDI2C$7$F(B
+% $B$$$/$@$1$G$9$N$G!":FDj5A$OITMW$G$9!#0lJ}!"Be$o$j$K(B
+% |\__shipout_execute_cont:|$B$r:FDj5A$9$kI,MW$,$"$j$^$9!#(B
+% \changes{v1.3f}{2020/09/26}{\cs{AtBeginDvi}$B$r:FDj5A$7$J$$(B
+% (checked ltshipout.dtx 2020/09/21 v1.0c)}
% \begin{macrocode}
%</plcore>
-%<platexrelease>\plIncludeInRelease{2019/10/01}{\AtBeginDvi}
-%<platexrelease> {Make robust}%
+%<platexrelease>\plIncludeInRelease{2020/10/01}{\AtBeginDvi}
+%<platexrelease> {Adapt to new shipout code}%
%<*plcore|platexrelease>
+\chardef\pltx at AtBeginDvi@untouched\z@
+% for LaTeX2e 2020-10-01 or later
+\ifdefined\ExplSyntaxOn %--- expl3 available BEGIN
+\ExplSyntaxOn
+\if_cs_exist:N \__shipout_add_firstpage_material:Nn
+ \chardef\pltx at AtBeginDvi@untouched\@ne
+%<platexrelease>\DeclareRobustCommand \AtBeginDvi
+%<platexrelease> {\__shipout_add_firstpage_material:Nn \AtBeginDvi}
+\fi:
+\ExplSyntaxOff
+\fi %--- expl3 available END
+% for LaTeX2e 2020-02-02 PL5 or older
+\ifnum\pltx at AtBeginDvi@untouched>\z@\else
\DeclareRobustCommand \AtBeginDvi [1]{%
\global \setbox \@begindvibox
- \vbox{\yoko \unvbox \@begindvibox #1}%
-}
+ \vbox{\yoko \unvbox \@begindvibox #1}}%
+\fi
+% done
+\let\pltx at AtBeginDvi@untouched\@undefined
%</plcore|platexrelease>
%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{2019/10/01}{\AtBeginDvi}
+%<platexrelease> {Make robust}%
+%<platexrelease>\DeclareRobustCommand \AtBeginDvi [1]{%
+%<platexrelease> \global \setbox \@begindvibox
+%<platexrelease> \vbox{\yoko \unvbox \@begindvibox #1}}
+%<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> \vbox{\yoko \unvbox \@begindvibox #1}}
%<platexrelease>\expandafter \let \csname AtBeginDvi \endcsname \@undefined
%<platexrelease>\plEndIncludeInRelease
%<platexrelease>\plIncludeInRelease{0000/00/00}{\AtBeginDvi}
@@ -1471,8 +1579,7 @@
%<platexrelease> {LaTeX2e original}%
%<platexrelease>\def \AtBeginDvi #1{%
%<platexrelease> \global \setbox \@begindvibox
-%<platexrelease> \vbox{\unvbox \@begindvibox #1}%
-%<platexrelease>}
+%<platexrelease> \vbox{\unvbox \@begindvibox #1}}
%<platexrelease>\expandafter \let \csname AtBeginDvi \endcsname \@undefined
%<platexrelease>\plEndIncludeInRelease
%<*plcore>
@@ -1479,7 +1586,78 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{shipout-execute-cont}
+% \LaTeXe~2020-10-01$B0J9_!'(B\file{ltshipout.dtx}$B$,%Y!<%9$G$9!#(B
+% $B$?$@$7!"=DAH%/%i%9$G$bDL$k$h$&$K$9$k$?$a!"0J2<$NJ}K!$r:N$j$^$9!#(B
+% \begin{itemize}
+% \item |\shipout|$B<B9T;~$NAHJ}8~$,2#AH$J$i!"(B|\yoko|$B$r<B9T$;$:$=$N$^$^!#(B
+% \item $B2#AH$G$J$$>l9g$O(B|\__shipout_execute_cont:|$B$r2#AH%\%C%/%9(B\\
+% |\l__platex_shipout_dummy_box|$B$G3g$C$F<B9T$9$k!J"(!K!#(B
+% \item |\l_shipout_box|$B$,2#AH$G$J$$>l9g$O;vA0$K2#AH2=$9$k!#(B
+% \end{itemize}
+% $BCm0U!'>e5-"($N<BAu$K$h$j!"=DAH%/%i%9$G$O(B
+% $B!V(B|\AtBeginShipout|$B$NCf?H$,30It?bD>%b!<%I$G<B9T$5$l$k$3$H!W$r(B
+% $BA[Dj$7$?;HMQ!JNc!'(Bplatex-tools issue \#15$B!K$O%5%]!<%H$5$l$^$;$s!#(B
+% ^^A $B=>Mh$N(B\file{pxatbegshi}$B%Q%C%1!<%8$K$bF1MM$N@)Ls$,$"$j$^$7$?!#(B
+% ^^A $BK\Ev$O!"=hM}=*N;;~$K(B|\box\l__platex_shipout_dummy_box|$B$7$F(B
+% ^^A $B%a%$%s?bD>%j%9%H$KCf?H$rLa$7$?$$$N$G$9$,!"(B
+% ^^A $B$J$<$+L58B%k!<%W$,5/$-$k$?$a<B9T$7$F$$$^$;$s!#(B
+% \changes{v1.3f}{2020/09/26}{\cs{shipout-execute-cont}$B$r:FDj5A(B
+% (checked ltshipout.dtx 2020/09/21 v1.0c)}
+% \changes{v1.3g}{2020/09/28}{\file{plexpl3}$B$GDj5A$7$?L?Na$r;HMQ(B}
+% \begin{macrocode}
+%</plcore>
+%<platexrelease>\plIncludeInRelease{2020/10/01}{\__shipout_execute_cont:}
+%<platexrelease> {Adapt to new shipout code}%
+%<*plcore|platexrelease>
+\ifdefined\ExplSyntaxOn %--- expl3 available BEGIN
+\ExplSyntaxOn
+\if_cs_exist:N \__shipout_execute_cont:
+\cs_new_eq:NN \__platex_original_shipout_execute_cont: \__shipout_execute_cont:
+\box_new:N \l__platex_shipout_dummy_box
+\cs_set:Npn \__shipout_execute_cont:
+ {
+ % if \l_shipout_box is not a \yoko-box (= horizontal writing),
+ % then make it a \yoko-box behorehand.
+ \platex_if_box_yoko:NF \l_shipout_box {
+ \vbox_set:Nn \l_shipout_box
+ {
+ \platex_direction_yoko:
+ \box_use:N \l_shipout_box
+ }
+ }
+ % if the current direction is not \yoko,
+ % then enclose \__shipout_execute_cont: with
+ % a dummy \yoko-box named \l__platex_shipout_dummy_box.
+ \platex_if_direction_yoko:TF {
+ \__platex_original_shipout_execute_cont:
+ }{
+ \vbox_set:Nn \l__platex_shipout_dummy_box
+ {
+ \platex_direction_yoko:
+ \__platex_original_shipout_execute_cont:
+ }
+ % [Limitation] the code above may discard some contents,
+ % so we'd like to put it back by \box\l__platex_shipout_dummy_box.
+ % however, an infinite loop occurs if we uncomment the line below
+ % so we can't.
+ %\box_use:N \l__platex_shipout_dummy_box
+ }
+ }
+\fi:
+\ExplSyntaxOff
+\fi %--- expl3 available END
+%</plcore|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\__shipout_execute_cont:}
+%<platexrelease> {LaTeX2e original}%
+%<platexrelease>% do nothing
+%<platexrelease>\plEndIncludeInRelease
+%<*plcore>
+% \end{macrocode}
+% \end{macro}
%
+%
% \subsection{$B5SCm%^%/%m(B}
% $B5SCm$rAH$_N)$F$kItJ,$N%^%/%m$r:FDj5A$7$^$9!#(B
% $B<g$J=$@5E@$O!"=DAH%b!<%I$G$NF0:n$NDI2C$G$9!#(B
Added: trunk/Master/texmf-dist/source/platex/base/plexpl3.dtx
===================================================================
--- trunk/Master/texmf-dist/source/platex/base/plexpl3.dtx (rev 0)
+++ trunk/Master/texmf-dist/source/platex/base/plexpl3.dtx 2020-09-30 21:25:54 UTC (rev 56486)
@@ -0,0 +1,125 @@
+% \iffalse meta-comment
+%% File: plexpl3.dtx
+%
+% Copyright (c) 2020 Japanese TeX Development Community
+%
+% This file is part of the pLaTeX2e system (community edition).
+% -------------------------------------------------------------
+%
+% \fi
+%
+%
+% \iffalse
+% \changes{v1.0}{2020/09/28}{$B=iHG!'(Bp\TeX{}$B$N>r7oJ8$rDj5A(B}
+% \fi
+%
+% \iffalse
+%<*driver>
+\NeedsTeXFormat{pLaTeX2e}
+\ProvidesFile{plexpl3.dtx}[2020/09/28 v1.0 expl3 additions]
+\documentclass{jltxdoc}
+\GetFileInfo{plexpl3.dtx}
+\author{Japanese \TeX\ Development Community}
+\title{The \textsf{plexpl3} package}
+\date{$B:n at .F|!'(B\filedate}
+\begin{document}
+ \newcommand\Lpack[1]{\textsf{#1}}
+ \maketitle
+ \DocInput{\filename}
+\end{document}
+%</driver>
+% \fi
+%
+% \LaTeX3 (expl3)$B$GMQ0U$5$l$F$$$J$$!V(Bp\TeX{}$B7ONs$NFH<+5!G=!W$r(B
+% expl3$B$NJ8K!$G;H$($k$h$&$K$9$k%3!<%I$G$9!#(B
+% p\LaTeXe~2020-10-01$B$G?7 at _$7$^$7$?!#(B
+%
+% \setcounter{StandardModuleDepth}{1}
+% \StopEventually{}
+%
+% \section{$B%3!<%I(B}
+%
+% $B%Q%C%1!<%8$H$7$F at k8@$7$^$9!#(B
+% $B$3$l$G!"(Bp\LaTeXe~2020-04-12$B0JA0$G$b(B
+% \file{plexpl3.sty}$B$H(B\file{plexpl3.ltx}$B$@$1(B
+% $BF~<j$9$l$PF1Ey$N5!G=$,;H$($^$9!#(B
+% \begin{macrocode}
+%<*package>
+\NeedsTeXFormat{pLaTeX2e}
+\RequirePackage{expl3}
+\ProvidesExplPackage{plexpl3}{2020-09-28}{1.0}
+ {pTeX/upTeX-specific additions to expl3}
+%</package>
+% \end{macrocode}
+%
+% \LaTeXe~2020-02-02$B0J9_$G$O(B\file{expl3}$B$,I8=`$G(B
+% $B%U%)!<%^%C%H$KFI$_9~$^$l$F$$$^$9!#$3$N>l9g$O(B
+% \file{plexpl3}$B$N5!G=$r%U%)!<%^%C%H$K<h$j9~$_$^$9!#(B
+% \begin{macrocode}
+%<plcore>\ifdefined\ExplSyntaxOn %--- expl3 available BEGIN
+%<plcore>\ExplSyntaxOn
+%<*plcore|package>
+\input plexpl3.ltx
+%</plcore|package>
+%<plcore>\ExplSyntaxOff
+%<plcore>\fi %--- expl3 available END
+% \end{macrocode}
+%
+% \file{platexrelease}$B$N(Broll-forward$B$K$bEPO?$7$^$9!#(B
+% \begin{macrocode}
+%<platexrelease>\plIncludeInRelease{2020/10/01}%
+%<platexrelease> {plexpl3}{Pre-load plexpl3}%
+%<platexrelease>\RequirePackage{plexpl3}
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}%
+%<platexrelease> {plexpl3}{Not loading plexpl3}%
+%<platexrelease>% Nothing to do
+%<platexrelease>\plEndIncludeInRelease
+% \end{macrocode}
+%
+% $B0J2<$N%3!<%I$O(B\file{plexpl3.ltx}$B$K=q$-=P$7$^$9!#(B
+% $B%U%)!<%^%C%H$H%Q%C%1!<%8$+$i$N=EJ#FI$_9~$_$O6X;_$7$^$9!#(B
+% \begin{macrocode}
+%<*code>
+\cs_if_exist:NT \__platex_expl_loaded:
+ {
+ \GenericInfo{}
+ {Skipping:~ plexpl3~ code~ already~ part~ of~ the~ format}%
+ \endinput
+ }
+\cs_new:Npn \__platex_expl_loaded: { }
+% \end{macrocode}
+%
+% \section{p\TeX{}$B7ONs$N>r7oJ8(B}
+%
+% p\TeX{}$B7ONs$N>r7oJ8$r(Bexpl3$B$NJ8K!$K$7$^$9!#(B
+% \changes{v1.0}{2020/09/28}{$B=iHG!'(Bp\TeX{}$B$N>r7oJ8$rDj5A(B}
+% \begin{macrocode}
+%% additions to l3box.dtx: writing directions (pTeX/upTeX-specific)
+\cs_set_eq:NN \platex_direction_yoko: \tex_yoko:D
+\cs_set_eq:NN \platex_direction_tate: \tex_tate:D
+\cs_set_eq:NN \platex_direction_dtou: \tex_dtou:D
+%
+\prg_new_conditional:Npnn \platex_if_direction_yoko: { p, T, F, TF }
+ { \tex_ifydir:D \prg_return_true: \else: \prg_return_false: \fi: }
+\prg_new_conditional:Npnn \platex_if_direction_tate: { p, T, F, TF }
+ { \tex_iftdir:D \prg_return_true: \else: \prg_return_false: \fi: }
+\prg_new_conditional:Npnn \platex_if_direction_dtou: { p, T, F, TF }
+ { \tex_ifddir:D \prg_return_true: \else: \prg_return_false: \fi: }
+%
+\prg_new_conditional:Npnn \platex_if_box_yoko:N #1 { p, T, F, TF }
+ { \tex_ifybox:D #1 \prg_return_true: \else: \prg_return_false: \fi: }
+\prg_new_conditional:Npnn \platex_if_box_tate:N #1 { p, T, F, TF }
+ { \tex_iftbox:D #1 \prg_return_true: \else: \prg_return_false: \fi: }
+\prg_new_conditional:Npnn \platex_if_box_dtou:N #1 { p, T, F, TF }
+ { \tex_ifdbox:D #1 \prg_return_true: \else: \prg_return_false: \fi: }
+% \end{macrocode}
+%
+% $B0J>e$G$9!#(B
+% \begin{macrocode}
+%</code>
+% \end{macrocode}
+%
+% \Finale
+%
+\endinput
Property changes on: trunk/Master/texmf-dist/source/platex/base/plexpl3.dtx
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/source/platex/base/plfmt.ins
===================================================================
--- trunk/Master/texmf-dist/source/platex/base/plfmt.ins 2020-09-30 21:25:20 UTC (rev 56485)
+++ trunk/Master/texmf-dist/source/platex/base/plfmt.ins 2020-09-30 21:25:54 UTC (rev 56486)
@@ -8,7 +8,7 @@
\preamble
Copyright (c) 2010 ASCII MEDIA WORKS
-Copyright (c) 2016-2018 Japanese TeX Development Community
+Copyright (c) 2016-2020 Japanese TeX Development Community
This file is part of the pLaTeX2e system (community edition).
-------------------------------------------------------------
@@ -18,6 +18,7 @@
\generate{
\file{platex.ltx}{\from{platex.dtx}{plcore}}
\file{plcore.ltx}{\from{plvers.dtx}{plcore}
+ \from{plexpl3.dtx}{plcore}
\from{plfonts.dtx}{plcore}
\from{plcore.dtx}{plcore}
\from{plvers.dtx}{plfinal}}
@@ -30,6 +31,8 @@
\file{plext.sty}{\from{plext.dtx}{package}}
\file{ptrace.sty}{\from{plfonts.dtx}{trace}}
\file{pfltrace.sty}{\from{plcore.dtx}{fltrace,trace}}
+ \file{plexpl3.sty}{\from{plexpl3.dtx}{package}}
+ \file{plexpl3.ltx}{\from{plexpl3.dtx}{code}}
}
\endbatchfile
Modified: trunk/Master/texmf-dist/source/platex/base/plfonts.dtx
===================================================================
--- trunk/Master/texmf-dist/source/platex/base/plfonts.dtx 2020-09-30 21:25:20 UTC (rev 56485)
+++ trunk/Master/texmf-dist/source/platex/base/plfonts.dtx 2020-09-30 21:25:54 UTC (rev 56486)
@@ -160,6 +160,12 @@
% \changes{v1.7f}{2020/04/07}{Support legacy use of \cs{bfdefault}
% and \cs{mddefault}, use \cs{@setYYseriesdefaultshook}
% (sync with ltfssini.dtx 2020/03/19 v3.1k and 2020/04/06 v3.1m)}
+% \changes{v1.7g}{2020/04/14}{Small update for speed.
+% (sync with ltfssdcl.dtx 2020/04/13 v3.0v)}
+% \changes{v1.7h}{2020/09/28}{Handling \cs{seriesdefault} changes
+% (sync with ltfssini.dtx 2020/04/13 v3.1n)}
+% \changes{v1.7h}{2020/09/28}{New hook management interface
+% (sync with ltfssini.dtx 2020/08/21 v3.2b)}
% \fi
%
% \iffalse
@@ -166,7 +172,7 @@
%<*driver>
\NeedsTeXFormat{pLaTeX2e}
% \fi
-\ProvidesFile{plfonts.dtx}[2020/04/07 v1.7f pLaTeX New Font Selection Scheme]
+\ProvidesFile{plfonts.dtx}[2020/09/28 v1.7h pLaTeX New Font Selection Scheme]
% \iffalse
\documentclass{jltxdoc}
\GetFileInfo{plfonts.dtx}
@@ -2966,10 +2972,15 @@
% $B$J$j$^$7$?!#(Bltfssini.dtx 1995/10/16 v3.0f$B$NJQ99$b;29M!#!K(B
% \changes{v1.7a}{2020/03/06}{\cs{@defaultfamilyhook}$B$r3hMQ(B
% (sync with ltfssini.dtx 2020/02/10 v3.1h)}
+%
+% \LaTeXe~2020-10-01$B$G$O(B|\AddToHook|$B$,;H$($^$9!#(B
+% \changes{v1.7h}{2020/09/28}{New hook management interface
+% (sync with ltfssini.dtx 2020/08/21 v3.2b)}
% \begin{macrocode}
%<platexrelease>\plIncludeInRelease{2020/04/12}{\normalfont}
%<platexrelease> {Use \@defaultfamilyhook}%
%<*plcore|platexrelease>
+\ifx\AddToHook\@undefined % --- for 2020-02-02 or older BEGIN
\ifx\@defaultfamilyhook\@undefined % old
\DeclareRobustCommand\normalfont{%
\kanjiencoding{\kanjiencodingdefault}%
@@ -2995,7 +3006,23 @@
\edef\k at series{\kanjiseriesdefault}%
\edef\k at shape{\kanjishapedefault}%
}
-\fi
+\fi % done
+\else % --- for 2020-02-02 or older END & for 2020-10-01 BEGIN
+%<platexrelease>\DeclareRobustCommand\normalfont{%
+%<platexrelease> \fontencoding\encodingdefault
+%<platexrelease> \edef\f at family{\familydefault}%
+%<platexrelease> \edef\f at series{\seriesdefault}%
+%<platexrelease> \edef\f at shape{\shapedefault}%
+%<platexrelease> \UseHook{normalfont}%
+%<platexrelease> \@defaultfamilyhook % hookname from 2020/02 will vanish
+%<platexrelease> \selectfont}
+\AddToHook{normalfont}{%
+ \kanjiencoding{\kanjiencodingdefault}%
+ \edef\k at family{\kanjifamilydefault}%
+ \edef\k at series{\kanjiseriesdefault}%
+ \edef\k at shape{\kanjishapedefault}%
+}
+\fi % --- for 2020-10-01 END
\adjustbaseline
\let\reset at font\normalfont
%</plcore|platexrelease>
@@ -3071,7 +3098,7 @@
%
% \begin{macro}{\expand at font@defaults}
% $B%U%!%_%j$N%G%U%)%k%H$r40A4E83+$7$^$9!#(B
-% $B$^$:!"%*%j%8%J%k$N(B\LaTeX{}$B$NDj5A!J(Bltfssini.dtx 2020/04/06 v3.1m$B0J9_!K$r(B
+% $B$^$:!"%*%j%8%J%k$N(B\LaTeX{}$B$NDj5A!J(Bltfssini.dtx 2020/08/21 v3.2b$B0J9_!K$r(B
% $B:\$;$F$*$-$^$9!#(B
% \begin{macrocode}
%\def\expand at font@defaults{%
@@ -3080,42 +3107,60 @@
% \edef\ttdef at ult{\ttdefault}%
% \series at maybe@drop at one@m\bfdefault\bfdef at ult % !! changed 2020/02/25 v3.1j
% \series at maybe@drop at one@m\mddefault\mddef at ult % !! changed 2020/02/25 v3.1j
-% \edef\famdef at ult{\familydefault}%
-% \@expandfontdefaultshook % !! added 2020/04/06 v3.1m
+% %\edef\famdef at ult{\familydefault}% !! deleted 2020/04/13 v3.1n
+% %\@expandfontdefaultshook % !! only in 2020/04/06 v3.1m
+% \UseHook{expand at font@defaults}% !! new in 2020/08/21 v3.2b
%}
% \end{macrocode}
% p\LaTeX{}$B$G$O!"0J2<$N%3!<%I$rKvHx$KDI2C$7$^$9!#(B
-% ^^A ltfssini.dtx 2020/04/06 v3.1m $B$K4p$E$1$P(B |\@expandfontdefaultshook| $B$r(B
-% ^^A $B;H$&$3$H$b$G$-$k$,!"$H$j$"$($:(B |\g at addto@macro| $B$GKvHxDI2C$GLdBj$J$$!#(B
+% \file{ltfssini.dtx} 2020/04/13 v3.1n$B$G(B|latex3/latex2e#315|$BBP:v$,(B
+% $BF~$j$^$7$?$N$G!"$=$NA08e$G(B|\expand at font@defaults|$B$*$h$S(B
+% |\init at series@setup|$B$X$NDI2CFbMF$,JQ$o$j$^$9!#(B
+% ^^A $B=>Mh$O(B |\init at series@setup| $B$+$i8F$S=P$5$l$k(B
+% ^^A |\expand at font@defaults| $B$,(B |\famdef at ult| $B$r at _Dj$7$F$$$?!#(B
+% ^^A $B?7HG$O(B |\init at series@setup| $B$+$i$b$O$d(B
+% ^^A |\expand at font@defaults| $B$O8F$S=P$5$:!"Be$o$j$K(B
+% ^^A |\init at series@setup| $B$G0lEY(B |\reset at font| $B$r<B9T$7!"(B
+% ^^A $B$=$l$K4p$E$$$F(B |\seriesdefault| $B$r at _Dj$9$k!#(B
+% \changes{v1.7h}{2020/09/28}{New hook management interface
+% (sync with ltfssini.dtx 2020/08/21 v3.2b)}
% \begin{macrocode}
-\ifx\expand at font@defaults\@undefined\else % 2020-02-02
+\ifx\expand at font@defaults\@undefined\else %<*2020-02-02|2020-10-01>
+\ifx\AddToHook\@undefined % --- for 2020-02-02 BEGIN
\g at addto@macro\expand at font@defaults{%
\edef\mcdef at ult{\mcdefault}%
\edef\gtdef at ult{\gtdefault}%
\edef\kanjidef at ult{\kanjifamilydefault}%
}
-\fi
+\else % --- for 2020-02-02 END & for 2020-10-01 BEGIN
+\AddToHook{expand at font@defaults}{%
+ \edef\mcdef at ult{\mcdefault}%
+ \edef\gtdef at ult{\gtdefault}%
+ %\edef\kanjidef at ult{\kanjifamilydefault}% !! sync with 2020/04/13 v3.1n
+}
+\fi % --- for 2020-10-01 END
+\fi %</2020-02-02|2020-10-01>
% \end{macrocode}
-%
% \end{macro}
%
% \begin{macro}{\bfseries}
% \begin{macro}{\mdseries}
% $B%U%!%_%j$4$H$N at _DjCM$r;2>H$7$^$9!#(B
-% $B$^$:!"%*%j%8%J%k$N(B\LaTeX{}$B$NDj5A!J(Bltfssini.dtx 2020/04/06 v3.1m$B0J9_!K$r(B
+% $B$^$:!"%*%j%8%J%k$N(B\LaTeX{}$B$NDj5A!J(Bltfssini.dtx 2020/09/30 v3.2d$B0J9_!K$r(B
% $B:\$;$F$*$-$^$9!#(B
% \begin{macrocode}
%\DeclareRobustCommand\bfseries{%
% \not at math@alphabet\bfseries\mathbf
% \expand at font@defaults
-% \ifx\bfdefault\bfdefault at previous\else
+% \ifx\bfdefault\bfdefault at previous\else % new in 2020/03/19 v3.1k
% \expandafter\def\expandafter\bfdefault
% \expandafter{\bfdefault\@empty}%
-% \let\bfseries at previous\bfdefault
+% \let\bfdefault at previous\bfdefault % bugfix in 2020/09/30 v3.2d
% \let\bfseries at rm\bfdef at ult
% \let\bfseries at sf\bfdef at ult
% \let\bfseries at tt\bfdef at ult
-% \@setbfseriesdefaultshook % !! added 2020/04/06 v3.1m
+% %\@setbfseriesdefaultshook % !! only in 2020/04/06 v3.1m
+% \UseHook{bfseries/defaults}% !! new in 2020/08/21 v3.2b
% \fi
% \ifx\f at family\rmdef at ult \fontseries\bfseries at rm
% \else\ifx\f at family\sfdef at ult \fontseries\bfseries at sf
@@ -3122,19 +3167,21 @@
% \else\ifx\f at family\ttdef at ult \fontseries\bfseries at tt
% \else \fontseries\bfdefault
% \fi\fi\fi
+% \UseHook{bfseries}% !! new in 2020/08/21 v3.2b
% \selectfont
%}
%\DeclareRobustCommand\mdseries{%
% \not at math@alphabet\mdseries\relax
% \expand at font@defaults
-% \ifx\mddefault\mddefault at previous\else
+% \ifx\mddefault\mddefault at previous\else % new in 2020/03/19 v3.1k
% \expandafter\def\expandafter\mddefault
% \expandafter{\mddefault\@empty}%
-% \let\mdseries at previous\mddefault
+% \let\mddefault at previous\mddefault % bugfix in 2020/09/30 v3.2d
% \let\mdseries at rm\mddef at ult
% \let\mdseries at sf\mddef at ult
% \let\mdseries at tt\mddef at ult
-% \@setmdseriesdefaultshook % !! added 2020/04/06 v3.1m
+% %\@setmdseriesdefaultshook % !! only in 2020/04/06 v3.1m
+% \UseHook{mdseries/defaults}% !! new in 2020/08/21 v3.2b
% \fi
% \ifx\f at family\rmdef at ult \fontseries\mdseries at rm
% \else\ifx\f at family\sfdef at ult \fontseries\mdseries at sf
@@ -3141,10 +3188,12 @@
% \else\ifx\f at family\ttdef at ult \fontseries\mdseries at tt
% \else \fontseries\mddefault
% \fi\fi\fi
+% \UseHook{mdseries}% !! new in 2020/08/21 v3.2b
% \selectfont
%}
% \end{macrocode}
% $B0J2<$G(Bp\LaTeX{}$BMQ$K:FDj5A$7$^$9!#(B
+% $B$^$:(B\LaTeXe~2020-02-02$B%Y!<%9!#(B
% \changes{v1.6y}{2020/02/24}{Make the \cs{ifx} selection outside of
% \cs{fontseries} argument so that it is not done several times
% (sync with ltfssini.dtx 2020/02/18 v3.1i)}
@@ -3152,61 +3201,82 @@
% and \cs{mddefault}, use \cs{@setYYseriesdefaultshook}
% (sync with ltfssini.dtx 2020/03/19 v3.1k and 2020/04/06 v3.1m)}
% \begin{macrocode}
-\ifx\bfseries at rm\@undefined % old
-\let\pltx at fontseries@saved\@undefined
-\let\pltx at patch@bfseries\@undefined
-\let\pltx at patch@mdseries\@undefined
-\else % 2020-02-02
-\let\pltx at fontseries@saved\fontseries
-\def\pltx at patch@bfseries\not at math@alphabet#1#2#3\selectfont{%
- \long\expandafter\def\csname bfseries \endcsname{%
- \not at math@alphabet#1#2% should be \bfseries\mathbf
- % \fontseries of pLaTeX tries to change both Latin and Japanese;
- % here we want only Latin, so use \romanseries
- \let\fontseries\romanseries
- #3% contains \fontseries and \@setbfseriesdefaultshook
- \let\fontseries\pltx at fontseries@saved % recover
+\ifx\bfseries at rm\@undefined\else %<*2020-02-02|2020-10-01>
+\ifx\AddToHook\@undefined % --- for 2020-02-02 BEGIN
+\DeclareRobustCommand\bfseries{%
+ \not at math@alphabet\bfseries\mathbf
+ \expand at font@defaults
+ % changed \fontseries -> \romanseries
+ \ifx\f at family\rmdef at ult \romanseries\bfseries at rm
+ \else\ifx\f at family\sfdef at ult \romanseries\bfseries at sf
+ \else\ifx\f at family\ttdef at ult \romanseries\bfseries at tt
+ \else \romanseries\bfdefault
+ \fi\fi\fi
+% \end{macrocode}
+% $B$3$3$+$i$,(Bp\LaTeX{}$B$K$h$kDI2C%3!<%I$G$9!#(B
+% \begin{macrocode}
% changed \fontseries -> \kanjiseries
\ifx\k at family\mcdef at ult \kanjiseries\bfseries at mc
\else\ifx\k at family\gtdef at ult \kanjiseries\bfseries at gt
\else \kanjiseries\bfdefault
\fi\fi
+% \end{macrocode}
+% $B$3$3$^$G!#(B
+% \begin{macrocode}
\selectfont
- }%
}
-\ifx\@setbfseriesdefaultshook\@undefined\else
-\g at addto@macro\@setbfseriesdefaultshook{%
- \let\bfseries at mc\bfdef at ult
- \let\bfseries at gt\bfdef at ult
-}
-\fi
-\expandafter\expandafter\expandafter
- \pltx at patch@bfseries\csname bfseries \endcsname
-\def\pltx at patch@mdseries\not at math@alphabet#1#2#3\selectfont{%
- \long\expandafter\def\csname mdseries \endcsname{%
- \not at math@alphabet#1#2% should be \mdseries\relax
- % \fontseries of pLaTeX tries to change both Latin and Japanese;
- % here we want only Latin, so use \romanseries
- \let\fontseries\romanseries
- #3% contains \fontseries and \@setmdseriesdefaultshook
- \let\fontseries\pltx at fontseries@saved % recover
+\DeclareRobustCommand\mdseries{%
+ \not at math@alphabet\mdseries\relax
+ \expand at font@defaults
+ % changed \fontseries -> \romanseries
+ \ifx\f at family\rmdef at ult \romanseries\mdseries at rm
+ \else\ifx\f at family\sfdef at ult \romanseries\mdseries at sf
+ \else\ifx\f at family\ttdef at ult \romanseries\mdseries at tt
+ \else \romanseries\mddefault
+ \fi\fi\fi
+% \end{macrocode}
+% $B$3$3$+$i$,(Bp\LaTeX{}$B$K$h$kDI2C%3!<%I$G$9!#(B
+% \begin{macrocode}
% changed \fontseries -> \kanjiseries
\ifx\k at family\mcdef at ult \kanjiseries\mdseries at mc
\else\ifx\k at family\gtdef at ult \kanjiseries\mdseries at gt
\else \kanjiseries\mddefault
\fi\fi
+% \end{macrocode}
+% $B$3$3$^$G!#(B
+% \begin{macrocode}
\selectfont
- }%
}
-\ifx\@setmdseriesdefaultshook\@undefined\else
-\g at addto@macro\@setmdseriesdefaultshook{%
+% \end{macrocode}
+% $B<!$K(B\LaTeXe~2020-10-01$B%Y!<%9!#(B|\AddToHook|$B$G==J,$G$9!#(B
+% \changes{v1.7h}{2020/09/28}{New hook management interface
+% (sync with ltfssini.dtx 2020/08/21 v3.2b)}
+% \begin{macrocode}
+\else % --- for 2020-02-02 END & for 2020-10-01 BEGIN
+\AddToHook{bfseries/defaults}{%
+ \let\bfseries at mc\bfdef at ult
+ \let\bfseries at gt\bfdef at ult
+}
+\AddToHook{bfseries}{%
+ % changed \fontseries -> \kanjiseries
+ \ifx\k at family\mcdef at ult \kanjiseries\bfseries at mc
+ \else\ifx\k at family\gtdef at ult \kanjiseries\bfseries at gt
+ \else \kanjiseries\bfdefault
+ \fi\fi
+}
+\AddToHook{mdseries/defaults}{%
\let\mdseries at mc\mddef at ult
\let\mdseries at gt\mddef at ult
}
-\fi
-\expandafter\expandafter\expandafter
- \pltx at patch@mdseries\csname mdseries \endcsname
-\fi
+\AddToHook{mdseries}{%
+ % changed \fontseries -> \kanjiseries
+ \ifx\k at family\mcdef at ult \kanjiseries\mdseries at mc
+ \else\ifx\k at family\gtdef at ult \kanjiseries\mdseries at gt
+ \else \kanjiseries\mddefault
+ \fi\fi
+}
+\fi % --- for 2020-10-01 END
+\fi %</2020-02-02|2020-10-01>
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -3333,23 +3403,32 @@
%
% \begin{macro}{\init at series@setup}
% |\begin{document}|$B$G<B9T$5$l$k=i4|2=$G$9!#(B
-% $B$^$:!"%*%j%8%J%k$N(B\LaTeX{}$B$NDj5A$r:\$;$F$*$-$^$9!#(B
+% $B$^$:!"%*%j%8%J%k$N(B\LaTeX{}$B$NDj5A!J(Bltfssini.dtx 2020/04/13 v3.1n$B0J9_!K$r(B
+% $B:\$;$F$*$-$^$9!#(B
% \begin{macrocode}
%\def\init at series@setup{%
% \ifx\bfseries at rm@kernel\bfseries at rm
-% \expandafter\in@\expandafter{\rmdefault}{cmr,cmss,cmtt,lcmss,lcmtt,lmr,lmss,lmtt}%
+% \expandafter\in@\expandafter{\rmdefault}%
+% {cmr,cmss,cmtt,lcmss,lcmtt,lmr,lmss,lmtt}%
% \ifin@ \else \def\bfseries at rm{b}\fi\fi
% \ifx\bfseries at sf@kernel\bfseries at sf
-% \expandafter\in@\expandafter{\sfdefault}{cmr,cmss,cmtt,lcmss,lcmtt,lmr,lmss,lmtt}%
+% \expandafter\in@\expandafter{\sfdefault}%
+% {cmr,cmss,cmtt,lcmss,lcmtt,lmr,lmss,lmtt}%
% \ifin@ \else \def\bfseries at sf{b}\fi\fi
% \ifx\bfseries at tt@kernel\bfseries at tt
-% \expandafter\in@\expandafter{\ttdefault}{cmr,cmss,cmtt,lcmss,lcmtt,lmr,lmss,lmtt}%
+% \expandafter\in@\expandafter{\ttdefault}%
+% {cmr,cmss,cmtt,lcmss,lcmtt,lmr,lmss,lmtt}%
% \ifin@ \else \def\bfseries at tt{b}\fi\fi
-% \expand at font@defaults
-% \ifx\famdef at ult\rmdef at ult \rmfamily
-% \else\ifx\famdef at ult\sfdef at ult \sffamily
-% \else\ifx\famdef at ult\ttdef at ult \ttfamily
-% \fi\fi\fi
+% %\expand at font@defaults % !! deleted in 2020/04/13 v3.1n BEGIN
+% %\ifx\famdef at ult\rmdef at ult \rmfamily % !! CONT
+% %\else\ifx\famdef at ult\sfdef at ult \sffamily % !! CONT
+% %\else\ifx\famdef at ult\ttdef at ult \ttfamily % !! CONT
+% %\fi\fi\fi % !! deleted in 2020/04/13 v3.1n END
+% \reset at font % !! added in 2020/04/13 v3.1n BEGIN
+% \ifx\seriesdefault\seriesdefault at kernel % !! CONT
+% \mdseries % !! CONT
+% \let\seriesdefault\f at series % !! CONT
+% \fi % !! added in 2020/04/13 v3.1n END
%}%
% \end{macrocode}
% $B$3$3$+$i$,(Bp\LaTeX{}$B$K$h$kDI2C%3!<%I$G$9!#(B
@@ -3360,18 +3439,53 @@
% \end{itemize}
% $B$K$J$k$3$H$KCm0U$7$^$9!#(B
% \changes{v1.6w}{2020/02/03}{$B4,$-La$7$N%P%0=$@5(B}
+% \changes{v1.7h}{2020/09/28}{Handling \cs{seriesdefault} changes
+% (sync with ltfssini.dtx 2020/04/13 v3.1n)}
% \begin{macrocode}
-\expandafter\ifx\csname init at series@setup\endcsname\relax\else % 2020-02-02
+\expandafter\ifx\csname init at series@setup\endcsname\relax
+\else %<*2020-02-02|2020-10-01>
+\ifx\AddToHook\@undefined % --- for 2020-02-02 BEGIN
\g at addto@macro\init at series@setup{%
\ifx\kanjidef at ult\mcdef at ult \mcfamily
\else\ifx\kanjidef at ult\gtdef at ult \gtfamily
\fi\fi
}%
-\fi
+\else % --- for 2020-02-02 END & for 2020-10-01 BEGIN
+\g at addto@macro\init at series@setup{%
+ % !! sync with 2020/04/13 v3.1n BEGIN
+ \ifx\kanjiseriesdefault\kanjiseriesdefault at kernel
+ \mdseries
+ \let\kanjiseriesdefault\k at series
+ \fi
+ % !! sync with 2020/04/13 v3.1n END
+}%
+\fi % --- for 2020-10-01 END
+\fi %</2020-02-02|2020-10-01>
% \end{macrocode}
% \end{macro}
%
%
+% \begin{macro}{\kanjiseriesdefault}
+% \begin{macro}{\kanjiseriesdefault at kernel}
+% |\kanjiseriesdefault|$B$,(B\file{pldefs.ltx}$B$^$?$O(B\file{pldefs.cfg}$B$G(B
+% $BDj5A$5$l$?8e$K!"$=$NKvHx$K(B|\@empty|$B$rDI2C$7$^$9!#(B
+% $B$3$l$OE83+;~$K>CLG$7$^$9$,!"J8=q$N%W%j%"%s%V%k$GJL$NCM$K(B
+% $BJQ99$5$l$?$+$I$&$+8!CN$G$-$k$h$&$K$J$j$^$9!#(B
+% \changes{v1.7h}{2020/09/28}{Handling \cs{seriesdefault} changes
+% (sync with ltfssini.dtx 2020/04/13 v3.1n)}
+% \begin{macrocode}
+\ifx\AddToHook\@undefined
+\else % --- for LaTeX2e 2020-10-01 or later BEGIN
+\def\code at after@pldefs{%
+\expandafter\def\expandafter\kanjiseriesdefault
+ \expandafter{\kanjiseriesdefault\@empty}
+\let\kanjiseriesdefault at kernel\kanjiseriesdefault}
+\fi % --- for LaTeX2e 2020-10-01 or later END
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+%
% \begin{macro}{\mcfamily}
% \begin{macro}{\gtfamily}
% $BOBJ8=qBN$rL at D+BN$K$9$k(B|\mcfamily|$B$H%4%7%C%/BN$K$9$k(B|\gtfamily|$B$rDj5A$7$^$9!#(B
@@ -3593,14 +3707,16 @@
% $BJ8=q$N at hF,$G!"OBJ8%G%U%)%k%H%U%)%s%H$NJQ99$,H?1G$5$l$J$$$N$r=$@5$7$^$9!#(B
% \changes{v1.3g}{1999/04/05}{plpatch.ltx$B$NFbMF$rH?1G!#(B
% $B$"$j$,$H$&!";3K\$5$s!#(B}
+% \changes{v1.7g}{2020/04/14}{Small update for speed.
+% (sync with ltfssdcl.dtx 2020/04/13 v3.0v)}
% \begin{macrocode}
%<*plcore>
\let\romanprocess at table\process at table
\def\kanjiprocess at table{%
- \kanjiencoding{\kanjiencodingdefault}%
- \kanjifamily{\kanjifamilydefault}%
- \kanjiseries{\kanjiseriesdefault}%
- \kanjishape{\kanjishapedefault}%
+ \kanjiencoding\kanjiencodingdefault
+ \edef\k at family{\kanjifamilydefault}%
+ \edef\k at series{\kanjiseriesdefault}%
+ \edef\k at shape{\kanjishapedefault}%
}
\def\process at table{%
\romanprocess at table
Added: trunk/Master/texmf-dist/source/platex/base/plnewsc15.tex
===================================================================
--- trunk/Master/texmf-dist/source/platex/base/plnewsc15.tex (rev 0)
+++ trunk/Master/texmf-dist/source/platex/base/plnewsc15.tex 2020-09-30 21:25:54 UTC (rev 56486)
@@ -0,0 +1,126 @@
+%% <2020-10-01>
+\documentclass{plnews}
+
+\publicationyear{2020}% $BH/9TG/(B
+\publicationmonth{10}% $BH/9T7n(B
+\publicationissue{c15}% $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{<2020-10-01>}$B$K$D$$$F!"(B
+\pLaTeXe\ \texttt{<2020-04-12>}$B$+$i$N99?72U=j$r(B
+$B$^$H$a$^$7$?!#(Bu\pLaTeXe{}$B$bF1;~$K99?7$7$F$/$@$5$$!#(B
+
+
+\section{\LaTeXe\ \texttt{<2020-10-01>}$BBP1~(B}
+$B"*;29M!'(B|texjporg/platex#94|
+
+$B?7$7$$(B\LaTeXe\ \texttt{<2020-10-01>}$B$G$O!"(B
+$B%U%C%/$NJ}<0(B(A hook management system)$B$,0lHL2=$5$l$^$7$?(B
+$B!J(B\file{ltnews32}, \file{lthooks-doc}$B$b;2>H!K!#(B
+$B8E$/$+$i8DJL$KDj5A$5$l$F$$$?%U%C%/!J(B|\@begindocumenthook|$BEy!K$d(B
+\LaTeXe\ \texttt{<2020-02-02>}$B$GDI2C$5$l$?(BNFSS$B$N%U%C%/(B
+$B!J(B|\@defaultfamilyhook|, |\@sffamilyhook|$BEy!K$b:F9=@.$5$l$?$?$a!"(B
+$BBP1~$r;\$7$^$7$?!#(B
+
+$B$5$i$K!"%Z!<%8=PNO$K4X$o$k%3%^%s%I$b0l?7$5$l$^$7$?(B
+$B!J(B\file{ltnews32}, \file{ltshipout-doc}$B$b;2>H!K!#FC$K(B
+\begin{itemize}
+\item |\AtBeginDvi|$B$NDj5AJQ99(B
+\item |atbegshi|/|everyshi|$BAjEv$N5!G=$N%+!<%M%k2=(B
+\end{itemize}
+$B$,(B\pLaTeXe{}$B$K$b1F6A$7$^$9$N$G!"BP1~$r;\$7$^$7$?!#(B
+$B$3$l$K$h$j!"(B|pxatbegshi|/|pxeveryshi|$B%Q%C%1!<%8$KAjEv$9$k(B
+$B5!G=!J(B|plautopatch|$B%Q%C%1!<%8$b;2>H!K$,(B\pLaTeXe{}$B%+!<%M%k$K(B
+$B<h$j9~$^$l$?$3$H$K$J$j$^$9!#(B
+
+$BCm0U!'<BAu>e$NET9g$K$h$j!"=DAH%/%i%9$G$O(B
+$B!V(B|\AtBeginShipout|$B$NCf?H$,30It?bD>%b!<%I$G<B9T$5$l$k$3$H!W$r(B
+$BA[Dj$7$?;HMQ$O(B\emph{$B%5%]!<%H$5$l$^$;$s(B}$B!#(B
+$B!JNc!'(B|aminophen/platex-tools#15|$B!K(B
+
+
+\section{$B?7(BNFSS$B$NDI2C=$@5(B}
+$BA02s$N(B\LaTeXe\ \texttt{<2020-02-02>}$B$GBgI}$K3HD%$5$l$?(B
+NFSS$B!J%U%)%s%HA*Br$N;EAH$_!K$N?75!G=$K$D$$$F!"(B
+\LaTeXe\ \texttt{<2020-10-01>}$B$GDI2C=$@5$,F~$j$^$7$?$N$G(B
+$BDI?o$7$^$7$?!#!J;29M!'(B|latex3/latex2e#315|$B!K(B
+
+$B6qBNE*$K$O!V(B|\DeclareFontSeriesDefault|$B$N;XDj$,(B
+|\normalfont|$B$KH?1G$5$l$J$$LdBj!W$X$N=$@5$G$9!#(B
+$B:F8=Nc$O0J2<$r;2>H$7$F$/$@$5$$!#(B
+\begin{verbatim}
+ % roman-default = roman-medium
+ % $BL at D+$N%G%U%)%k%H!aL at D+$NCf;z(B
+ \documentclass{article}
+ % roman-medium-default -> roman-bold
+ % $BL at D+$NCf;z$N%G%U%)%k%H"*L at D+$NB@;z$X(B
+ % $B"(L at D+$NB@;z$O%4%7%C%/$NCf;z$KCV49$5$l$k(B
+ \DeclareFontSeriesDefault[rm]{md}{b}
+ \DeclareFontSeriesDefault[mc]{md}{b}
+ \begin{document}
+ roman-default is bold
+ $BL at D+$N%G%U%)%k%H$OB@;z$K$J$C$?(B
+
+ \normalfont % 2020-02-02: $BB@;z$K$J$i$J$+$C$?(B
+ roman-default is bold?
+ $BL at D+$N%G%U%)%k%H$OB@;z$K$J$C$?$+!)(B
+
+ \mdseries
+ roman-medium is bold
+ $BL at D+$N%_%G%#%"%`$OB@;z$K$J$C$?(B
+ \end{document}
+\end{verbatim}
+
+
+\section{expl3$BJ8K!$N(B\pLaTeX{}$BHG(B}
+\LaTeXe\ \texttt{<2020-02-02>}$B$G(Bexpl3$B$,%U%)!<%^%C%H$K(B
+$BAH$_9~$^$l$?$3$H$r<u$1!"(B
+\pLaTeX{}$B$G$b(B\pTeX{}$B7ONs$NDI2C5!G=$r(Bexpl3$BJ8K!$KB'$C$F(B
+$BMxMQ$7$d$9$/$9$k$?$a!"K\%j%j!<%9$G?7 at _$7$^$7$?!#(B
+\pLaTeXe\ \texttt{<2020-10-01>}$B$G$O!"$3$N5!G=$r(B
+$B%U%)!<%^%C%H$KAH$_9~$s$G$"$j$^$9!#(B
+
+$B8=;~E@$G$O!"AHJ}8~JQ99!J(B|\tate|$BEy!K$HAHJ}8~H=Dj!J(B|\iftdir|$BEy!K$r(B
+$B%i%C%W$9$k%3%^%s%I$rMQ0U$7$F$"$j$^$9!#>\:Y$O(B
+\file{pldoc.pdf}$B$N(B``plexpl3.dtx''$B$N at a$r;2>H$7$F$/$@$5$$!#(B
+
+
+\section{$B%P%0=$@5(B}
+\begin{itemize}
+ \item \LaTeXe~2017/01/01$B0J9_$G6u$N%U%m!<%H$@$1$N%Z!<%8$,(B
+ $BH/@8$7$?>l9g!"=DAH%/%i%9$G$O%U%C%?$N0LCV$,;}$A>e$,$C$F$$$?$N$G(B
+ $B=$@5$7$^$7$?!#(B(|#78|)
+ \item $B6XB'%Q%i%a!<%?@_Dj%U%!%$%k(B(kinsoku.tex)$B$K(B
+ |\inhibitxspcode`$B!*(B=1|$B$N at _Dj$,H4$1$F$$$?$N$GDI2C$7$^$7$?!#(B
+ (|ptex-base#8|)
+\end{itemize}
+
+
+\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
+$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}
Property changes on: trunk/Master/texmf-dist/source/platex/base/plnewsc15.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/source/platex/base/plvers.dtx
===================================================================
--- trunk/Master/texmf-dist/source/platex/base/plvers.dtx 2020-09-30 21:25:20 UTC (rev 56485)
+++ trunk/Master/texmf-dist/source/platex/base/plvers.dtx 2020-09-30 21:25:54 UTC (rev 56486)
@@ -96,12 +96,14 @@
% \changes{v1.1s}{2020/03/14}{\LaTeX\ \texttt{!<2020-02-02!> PL5}$BHGBP1~3NG'(B}
% \changes{v1.1t}{2020/03/25}{$B%P%J!<$N:F9=C[$r8zN(2=(B}
% \changes{v1.1u}{2020/03/28}{latexrelease$BMxMQ;~$N7Y9p$rAa$a$?(B}
+% \changes{v1.1v}{2020/09/28}{$B?7$7$$%U%C%/$r3hMQ(B}
+% \changes{v1.1w}{2020/09/30}{\LaTeX\ \texttt{!<2020-10-01!>}$BHGBP1~3NG'(B}
% \fi
%
% \iffalse
%<*driver>
% \fi
-\ProvidesFile{plvers.dtx}[2020/03/28 v1.1u pLaTeX Kernel (Version Info)]
+\ProvidesFile{plvers.dtx}[2020/09/30 v1.1w pLaTeX Kernel (Version Info)]
% \iffalse
\documentclass{jltxdoc}
\GetFileInfo{plvers.dtx}
@@ -141,6 +143,7 @@
% \changes{v1.1q}{2019/10/01}{\LaTeX\ \texttt{!<2019-10-01!>}$BHGBP1~3NG'(B}
% \changes{v1.1r}{2020/02/01}{\LaTeX\ \texttt{!<2020-02-02!>}$BHGBP1~3NG'(B}
% \changes{v1.1s}{2020/03/14}{\LaTeX\ \texttt{!<2020-02-02!> PL5}$BHGBP1~3NG'(B}
+% \changes{v1.1w}{2020/09/30}{\LaTeX\ \texttt{!<2020-10-01!>}$BHGBP1~3NG'(B}
% \begin{macrocode}
%<*2ekernel>
%\def\fmtname{LaTeX2e}
@@ -149,7 +152,7 @@
%<latexrelease>\edef\latexreleaseversion
%<platexrelease>\edef\p at known@latexreleaseversion
%<*2ekernel|latexrelease|platexrelease>
- {2020-02-02}
+ {2020-10-01}
%</2ekernel|latexrelease|platexrelease>
% \end{macrocode}
%
@@ -190,7 +193,7 @@
%</plcore>
%<platexrelease>\edef\platexreleaseversion
%<*plcore|platexrelease>
- {2020-04-12}
+ {2020-10-01}
%</plcore|platexrelease>
%<*plcore>
\def\ppatch at level{0}
@@ -441,7 +444,7 @@
% $B>e=q$-$5$l!"F0:n$,2u$l$F$7$^$$$^$9$N$G!"7Y9p$r=P$7$^$9!#(B
% \changes{v1.0s}{2016/02/01}{latexrelease$BMxMQ;~$K7Y9p$r=P$9$h$&$K$7$?(B}
%
-% $B0JA0$O(B|\AtBeginDocument|$B$r;H$C$F(B|\@begindocumenthook|$B$NKvHx$K(B
+% $BEv=i$O(B|\AtBeginDocument|$B$r;H$C$F(B|\@begindocumenthook|$B$NKvHx$K(B
% $B7Y9pJ8$rF~$l$F$$$^$7$?$,!"(B\LaTeXe~2020-02-02$B0J9_$KIUB0$N(B
% latexrelease$B%Q%C%1!<%8$G4,$-La$9$H%U%C%/$N<B9T$h$jAa$$CJ3,(B
% $B!J6qBNE*$K$O(B|\process at table|$BFb$N(B|\kanjiprocess at table|$B<B9TCf!K$G(B
@@ -453,8 +456,14 @@
% ^^A $B>e=q$-$5$l$F$$$k$O$:$G$"$j!"(B|\kanjiprocess at table|$B$O(B
% ^^A $B<B9T$5$l$J$$$N$G%(%i!<$O=P$J$$!#(B
% \changes{v1.1u}{2020/03/28}{latexrelease$BMxMQ;~$N7Y9p$rAa$a$?(B}
+%
+% \LaTeXe~2020-10-01$B0J9_$G$O(B|\process at table|$B$h$jAa$/<B9T$5$l$k(B
+% $B%U%C%/$,MQ0U$5$l$?$N$G!"$3$l$rMxMQ$7$^$9!#(B
+% \changes{v1.1v}{2020/09/28}{$B?7$7$$%U%C%/$r3hMQ(B}
% \begin{macrocode}
%<*plfinal>
+\ifx\AddToHook\@undefined
+% for LaTeX2e 2020-02-02 PL5 or older
\expandafter\def\expandafter\process at table\expandafter{%
\expandafter\p at warn@latexrelease\process at table}
\begingroup
@@ -461,6 +470,11 @@
\toks@\expandafter{\expandafter\p at warn@latexrelease\@begindocumenthook}
\xdef\@begindocumenthook{\the\toks@}
\endgroup
+\else
+% for LaTeX2e 2020-10-01 or later
+\AddToHook{begindocument/before}{\p at warn@latexrelease}
+\fi
+%
\def\p at warn@latexrelease{%
\ifx\latexreleaseversion\@undefined\else
\ifx\platexreleaseversion\@undefined
Modified: trunk/Master/texmf-dist/tex/platex/base/exppl2e.sty
===================================================================
--- trunk/Master/texmf-dist/tex/platex/base/exppl2e.sty 2020-09-30 21:25:20 UTC (rev 56485)
+++ trunk/Master/texmf-dist/tex/platex/base/exppl2e.sty 2020-09-30 21:25:54 UTC (rev 56486)
@@ -34,7 +34,7 @@
% case 1: This file must be a normal package
\NeedsTeXFormat{pLaTeX2e}
\ProvidesPackage{exppl2e}
- [2020/02/10 v1.1g Experimental pLaTeX2e features]
+ [2020/09/28 v1.1h Experimental pLaTeX2e features]
\PackageWarningNoLine{exppl2e}{%
This is the unstable, experimental part of pLaTeX2e.\MessageBreak
This package may contain:\MessageBreak
@@ -238,58 +238,6 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% \section{$B6u$N%Z!<%8(B}
-%
-% $B8=;~E@$G$OJ]N1$7$F$$$^$9!#(B
-% $B;29M!'(BGitHub:texjporg/platex\#78
-%
-% \LaTeXe\ 2017/01/01$B0J9_$G$O!"Nc$($P(B
-%\begin{verbatim}
-% \documentclass{tarticle}
-% \begin{document}
-% \begin{figure}
-% \end{figure}
-% \clearpage
-% a
-% \end{document}
-%\end{verbatim}
-% $B$N$h$&$K$9$k$H!V6u$N%U%m!<%H!W$@$1$N6uGr%Z!<%8$rH/@8$5$;$k$3$H$,(B
-% $B$G$-$^$9!#$3$N>l9g!"=DAH%/%i%9$rMQ$$$F$$$k$H%U%C%?$,;}$A>e$,$j$^$9!#(B
-%
-% $B$J$*!"(B\LaTeXe\ 2015/01/01$B!A(B2016/03/31 patch level 3$B$G$O(B
-%\begin{verbatim}
-% ! Output loop---100 consecutive dead cycles.
-%\end{verbatim}
-% $B$N%(%i!<$,=P$F!"$=$l0JA0$G$O6uGr%Z!<%8$OH/@8$7$^$;$s!#(B
-%
-% $B%U%m!<%H$G$J$$6uGr%Z!<%8$G%Z!<%8%U%C%?$,;}$A>e$,$kLdBj$X$O!"(B
-% |\@makecol|$B$N(B|\iftdir\vbox{\hskip\z@}\fi|$B$GBP=h$7$F$"$j$^$9$,!"(B
-% $B%U%m!<%H$,$"$k6uGr%Z!<%8$G$O(B|\@makecol|$B$,8F$P$l$J$$$3$H$+$i(B
-% $BBP:v$,8z$$$F$$$^$;$s!#$?$@!"%U%m!<%H$,6u$G$"$k>u67$O(B
-% $B85!9IT<+A3$J$N$G!"8=:_$O%5%]!<%H$7$F$$$^$;$s!#(B
-%
-% $B$b$7BP:v$9$k$3$H$K$J$l$P!"2<5-$N%3!<%I$r;HMQ$7$^$9!#(B
-% \begin{macro}{\@vtryfc}
-% \file{ltoutput.dtx}$B$GDj5A$5$l$F$$$k(B|\@vtryfc|$B$K(B
-% |\iftdir\hskip\z@\fi|$B$rDI2C$7$F$"$j$^$9!#(B
-% \begin{macrocode}
-\def\@vtryfc #1{%
- \global\setbox\@outputbox\vbox{\iftdir\hskip\z@\fi}%
- \let\@elt\@wtryfc
- \@flsucceed
- \global\setbox\@outputbox \vbox to\@colht{%
- \vskip \@fptop
- \vskip -\@fpsep
- \unvbox \@outputbox
- \vskip \@fpbot}%
- \let\@elt\relax
- \xdef #1{\@failedlist\@flfail}%
- \xdef\@freelist{\@freelist\@flsucceed}}
-% \end{macrocode}
-% \end{macro}
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
% \section{$B;YCl(B}
%
% \begin{macro}{\strut}
@@ -360,6 +308,12 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
+% \section{$B6u$N%U%m!<%H$@$1$N%Z!<%8(B}
+%
+% 2020/10/01$B$KF3F~:Q$_!#(B
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
% \section{\cs{textunderscore}$B$N%Y!<%9%i%$%sJd at 5(B}
%
% 2017/04/08$B$KF3F~:Q$_!#(B
Modified: trunk/Master/texmf-dist/tex/platex/base/jarticle.cls
===================================================================
--- trunk/Master/texmf-dist/tex/platex/base/jarticle.cls 2020-09-30 21:25:20 UTC (rev 56485)
+++ trunk/Master/texmf-dist/tex/platex/base/jarticle.cls 2020-09-30 21:25:54 UTC (rev 56486)
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{jarticle}
- [2020/01/03 v1.8e
+ [2020/09/30 v1.8f
Standard pLaTeX class]
\newcounter{@paper}
\newif\if at landscape \@landscapefalse
@@ -670,9 +670,9 @@
\def\addcontentsline#1#2#3{%
\protected at write\@auxout
{\let\label\@gobble \let\index\@gobble \let\glossary\@gobble
- \@temptokena{\thepage}}%
- {\string\@writefile{#1}%
- {\protect\contentsline{#2}{#3}{\the\@temptokena}%
+ \@temptokena{\thepage}%
+ }{\string\@writefile{#1}%
+ {\protect\contentsline{#2}{#3}{\the\@temptokena}{}%
\protected at file@percent}}%
}
\newcommand{\tableofcontents}{%
Modified: trunk/Master/texmf-dist/tex/platex/base/jbk10.clo
===================================================================
--- trunk/Master/texmf-dist/tex/platex/base/jbk10.clo 2020-09-30 21:25:20 UTC (rev 56485)
+++ trunk/Master/texmf-dist/tex/platex/base/jbk10.clo 2020-09-30 21:25:54 UTC (rev 56486)
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{jbk10.clo}
- [2020/01/03 v1.8e
+ [2020/09/30 v1.8f
Standard pLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{15}%
Modified: trunk/Master/texmf-dist/tex/platex/base/jbk11.clo
===================================================================
--- trunk/Master/texmf-dist/tex/platex/base/jbk11.clo 2020-09-30 21:25:20 UTC (rev 56485)
+++ trunk/Master/texmf-dist/tex/platex/base/jbk11.clo 2020-09-30 21:25:54 UTC (rev 56486)
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{jbk11.clo}
- [2020/01/03 v1.8e
+ [2020/09/30 v1.8f
Standard pLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{15.5}%
Modified: trunk/Master/texmf-dist/tex/platex/base/jbk12.clo
===================================================================
--- trunk/Master/texmf-dist/tex/platex/base/jbk12.clo 2020-09-30 21:25:20 UTC (rev 56485)
+++ trunk/Master/texmf-dist/tex/platex/base/jbk12.clo 2020-09-30 21:25:54 UTC (rev 56486)
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{jbk12.clo}
- [2020/01/03 v1.8e
+ [2020/09/30 v1.8f
Standard pLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{16.5}%
Modified: trunk/Master/texmf-dist/tex/platex/base/jbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/platex/base/jbook.cls 2020-09-30 21:25:20 UTC (rev 56485)
+++ trunk/Master/texmf-dist/tex/platex/base/jbook.cls 2020-09-30 21:25:54 UTC (rev 56486)
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{jbook}
- [2020/01/03 v1.8e
+ [2020/09/30 v1.8f
Standard pLaTeX class]
\newcounter{@paper}
\newif\if at landscape \@landscapefalse
@@ -763,9 +763,9 @@
\def\addcontentsline#1#2#3{%
\protected at write\@auxout
{\let\label\@gobble \let\index\@gobble \let\glossary\@gobble
- \@temptokena{\thepage}}%
- {\string\@writefile{#1}%
- {\protect\contentsline{#2}{#3}{\the\@temptokena}%
+ \@temptokena{\thepage}%
+ }{\string\@writefile{#1}%
+ {\protect\contentsline{#2}{#3}{\the\@temptokena}{}%
\protected at file@percent}}%
}
\newcommand{\tableofcontents}{%
Modified: trunk/Master/texmf-dist/tex/platex/base/jreport.cls
===================================================================
--- trunk/Master/texmf-dist/tex/platex/base/jreport.cls 2020-09-30 21:25:20 UTC (rev 56485)
+++ trunk/Master/texmf-dist/tex/platex/base/jreport.cls 2020-09-30 21:25:54 UTC (rev 56486)
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{jreport}
- [2020/01/03 v1.8e
+ [2020/09/30 v1.8f
Standard pLaTeX class]
\newcounter{@paper}
\newif\if at landscape \@landscapefalse
@@ -759,9 +759,9 @@
\def\addcontentsline#1#2#3{%
\protected at write\@auxout
{\let\label\@gobble \let\index\@gobble \let\glossary\@gobble
- \@temptokena{\thepage}}%
- {\string\@writefile{#1}%
- {\protect\contentsline{#2}{#3}{\the\@temptokena}%
+ \@temptokena{\thepage}%
+ }{\string\@writefile{#1}%
+ {\protect\contentsline{#2}{#3}{\the\@temptokena}{}%
\protected at file@percent}}%
}
\newcommand{\tableofcontents}{%
Modified: trunk/Master/texmf-dist/tex/platex/base/jsize10.clo
===================================================================
--- trunk/Master/texmf-dist/tex/platex/base/jsize10.clo 2020-09-30 21:25:20 UTC (rev 56485)
+++ trunk/Master/texmf-dist/tex/platex/base/jsize10.clo 2020-09-30 21:25:54 UTC (rev 56486)
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{jsize10.clo}
- [2020/01/03 v1.8e
+ [2020/09/30 v1.8f
Standard pLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{15}%
Modified: trunk/Master/texmf-dist/tex/platex/base/jsize11.clo
===================================================================
--- trunk/Master/texmf-dist/tex/platex/base/jsize11.clo 2020-09-30 21:25:20 UTC (rev 56485)
+++ trunk/Master/texmf-dist/tex/platex/base/jsize11.clo 2020-09-30 21:25:54 UTC (rev 56486)
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{jsize11.clo}
- [2020/01/03 v1.8e
+ [2020/09/30 v1.8f
Standard pLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{15.5}%
Modified: trunk/Master/texmf-dist/tex/platex/base/jsize12.clo
===================================================================
--- trunk/Master/texmf-dist/tex/platex/base/jsize12.clo 2020-09-30 21:25:20 UTC (rev 56485)
+++ trunk/Master/texmf-dist/tex/platex/base/jsize12.clo 2020-09-30 21:25:54 UTC (rev 56486)
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{jsize12.clo}
- [2020/01/03 v1.8e
+ [2020/09/30 v1.8f
Standard pLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{16.5}%
Modified: trunk/Master/texmf-dist/tex/platex/base/jt1gt.fd
===================================================================
--- trunk/Master/texmf-dist/tex/platex/base/jt1gt.fd 2020-09-30 21:25:20 UTC (rev 56485)
+++ trunk/Master/texmf-dist/tex/platex/base/jt1gt.fd 2020-09-30 21:25:54 UTC (rev 56486)
@@ -7,7 +7,7 @@
%% plfonts.dtx (with options: `JT1gt')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016-2018 Japanese TeX Development Community
+%% Copyright (c) 2016-2020 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
Modified: trunk/Master/texmf-dist/tex/platex/base/jt1mc.fd
===================================================================
--- trunk/Master/texmf-dist/tex/platex/base/jt1mc.fd 2020-09-30 21:25:20 UTC (rev 56485)
+++ trunk/Master/texmf-dist/tex/platex/base/jt1mc.fd 2020-09-30 21:25:54 UTC (rev 56486)
@@ -7,7 +7,7 @@
%% plfonts.dtx (with options: `JT1mc')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016-2018 Japanese TeX Development Community
+%% Copyright (c) 2016-2020 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
Modified: trunk/Master/texmf-dist/tex/platex/base/jy1gt.fd
===================================================================
--- trunk/Master/texmf-dist/tex/platex/base/jy1gt.fd 2020-09-30 21:25:20 UTC (rev 56485)
+++ trunk/Master/texmf-dist/tex/platex/base/jy1gt.fd 2020-09-30 21:25:54 UTC (rev 56486)
@@ -7,7 +7,7 @@
%% plfonts.dtx (with options: `JY1gt')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016-2018 Japanese TeX Development Community
+%% Copyright (c) 2016-2020 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
Modified: trunk/Master/texmf-dist/tex/platex/base/jy1mc.fd
===================================================================
--- trunk/Master/texmf-dist/tex/platex/base/jy1mc.fd 2020-09-30 21:25:20 UTC (rev 56485)
+++ trunk/Master/texmf-dist/tex/platex/base/jy1mc.fd 2020-09-30 21:25:54 UTC (rev 56486)
@@ -7,7 +7,7 @@
%% plfonts.dtx (with options: `JY1mc')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016-2018 Japanese TeX Development Community
+%% Copyright (c) 2016-2020 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
Modified: trunk/Master/texmf-dist/tex/platex/base/kinsoku.tex
===================================================================
--- trunk/Master/texmf-dist/tex/platex/base/kinsoku.tex 2020-09-30 21:25:20 UTC (rev 56485)
+++ trunk/Master/texmf-dist/tex/platex/base/kinsoku.tex 2020-09-30 21:25:54 UTC (rev 56486)
@@ -7,7 +7,7 @@
%% kinsoku.dtx (with options: `plcore')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016-2018 Japanese TeX Development Community
+%% Copyright (c) 2016-2020 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
@@ -247,6 +247,7 @@
\inhibitxspcode`$B!%(B=1
\inhibitxspcode`$B!((B=1
\inhibitxspcode`$B!)(B=1
+\inhibitxspcode`$B!*(B=1
\inhibitxspcode`$B!K(B=1
\inhibitxspcode`$B!J(B=2
\inhibitxspcode`$B!O(B=1
Modified: trunk/Master/texmf-dist/tex/platex/base/pfltrace.sty
===================================================================
--- trunk/Master/texmf-dist/tex/platex/base/pfltrace.sty 2020-09-30 21:25:20 UTC (rev 56485)
+++ trunk/Master/texmf-dist/tex/platex/base/pfltrace.sty 2020-09-30 21:25:54 UTC (rev 56486)
@@ -7,7 +7,7 @@
%% plcore.dtx (with options: `fltrace,trace')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016-2018 Japanese TeX Development Community
+%% Copyright (c) 2016-2020 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
Modified: trunk/Master/texmf-dist/tex/platex/base/platex.ltx
===================================================================
--- trunk/Master/texmf-dist/tex/platex/base/platex.ltx 2020-09-30 21:25:20 UTC (rev 56485)
+++ trunk/Master/texmf-dist/tex/platex/base/platex.ltx 2020-09-30 21:25:54 UTC (rev 56486)
@@ -7,7 +7,7 @@
%% platex.dtx (with options: `plcore')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016-2018 Japanese TeX Development Community
+%% Copyright (c) 2016-2020 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
@@ -28,6 +28,7 @@
* Local config file pldefs.cfg used^^J%
*************************************}}%
{\input{pldefs.ltx}}
+\ifx\code at after@pldefs\@undefined\else \code at after@pldefs \fi
\everyjob\expandafter{%
\the\everyjob
\IfFileExists{platex.cfg}{%
Modified: trunk/Master/texmf-dist/tex/platex/base/platexrelease.sty
===================================================================
--- trunk/Master/texmf-dist/tex/platex/base/platexrelease.sty 2020-09-30 21:25:20 UTC (rev 56485)
+++ trunk/Master/texmf-dist/tex/platex/base/platexrelease.sty 2020-09-30 21:25:54 UTC (rev 56486)
@@ -6,10 +6,11 @@
%%
%% plvers.dtx (with options: `platexrelease')
%% platexrelease.dtx (with options: `platexrelease')
+%% plexpl3.dtx (with options: `platexrelease')
%% plfonts.dtx (with options: `platexrelease')
%% plcore.dtx (with options: `platexrelease')
%%
-%% Copyright (c) 2016-2018 Japanese TeX Development Community
+%% Copyright (c) 2016-2020 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
@@ -16,9 +17,9 @@
%%
%% File: plvers.dtx
\edef\p at known@latexreleaseversion
- {2020-02-02}
+ {2020-10-01}
\edef\platexreleaseversion
- {2020-04-12}
+ {2020-10-01}
\newif\if at plincludeinrelease
\@plincludeinreleasefalse
\def\plIncludeInRelease#1{%
@@ -202,6 +203,15 @@
\plIncludeInRelease{0000/00/00}{\PackageWarning}{pLaTeX Info}%
% * <2006/11/10>
\plEndIncludeInRelease
+%% File: plexpl3.dtx
+\plIncludeInRelease{2020/10/01}%
+ {plexpl3}{Pre-load plexpl3}%
+\RequirePackage{plexpl3}
+\plEndIncludeInRelease
+\plIncludeInRelease{0000/00/00}%
+ {plexpl3}{Not loading plexpl3}%
+% Nothing to do
+\plEndIncludeInRelease
%% File: plfonts.dtx
\plIncludeInRelease{2020/04/12}{\inlist@}
{Detokenize}%
@@ -1224,6 +1234,7 @@
\plEndIncludeInRelease
\plIncludeInRelease{2020/04/12}{\normalfont}
{Use \@defaultfamilyhook}%
+\ifx\AddToHook\@undefined % --- for 2020-02-02 or older BEGIN
\ifx\@defaultfamilyhook\@undefined % old
\DeclareRobustCommand\normalfont{%
\kanjiencoding{\kanjiencodingdefault}%
@@ -1249,7 +1260,23 @@
\edef\k at series{\kanjiseriesdefault}%
\edef\k at shape{\kanjishapedefault}%
}
-\fi
+\fi % done
+\else % --- for 2020-02-02 or older END & for 2020-10-01 BEGIN
+\DeclareRobustCommand\normalfont{%
+ \fontencoding\encodingdefault
+ \edef\f at family{\familydefault}%
+ \edef\f at series{\seriesdefault}%
+ \edef\f at shape{\shapedefault}%
+ \UseHook{normalfont}%
+ \@defaultfamilyhook % hookname from 2020/02 will vanish
+ \selectfont}
+\AddToHook{normalfont}{%
+ \kanjiencoding{\kanjiencodingdefault}%
+ \edef\k at family{\kanjifamilydefault}%
+ \edef\k at series{\kanjiseriesdefault}%
+ \edef\k at shape{\kanjishapedefault}%
+}
+\fi % --- for 2020-10-01 END
\adjustbaseline
\let\reset at font\normalfont
\plEndIncludeInRelease
@@ -1294,27 +1321,32 @@
\edef\mdseries at mc{\mddefault}% m
\edef\mdseries at gt{\mddefault}% m
\fi
-\ifx\expand at font@defaults\@undefined\else % 2020-02-02
+\ifx\expand at font@defaults\@undefined\else %<*2020-02-02|2020-10-01>
+\ifx\AddToHook\@undefined % --- for 2020-02-02 BEGIN
\g at addto@macro\expand at font@defaults{%
\edef\mcdef at ult{\mcdefault}%
\edef\gtdef at ult{\gtdefault}%
\edef\kanjidef at ult{\kanjifamilydefault}%
}
-\fi
-\ifx\bfseries at rm\@undefined % old
-\let\pltx at fontseries@saved\@undefined
-\let\pltx at patch@bfseries\@undefined
-\let\pltx at patch@mdseries\@undefined
-\else % 2020-02-02
-\let\pltx at fontseries@saved\fontseries
-\def\pltx at patch@bfseries\not at math@alphabet#1#2#3\selectfont{%
- \long\expandafter\def\csname bfseries \endcsname{%
- \not at math@alphabet#1#2% should be \bfseries\mathbf
- % \fontseries of pLaTeX tries to change both Latin and Japanese;
- % here we want only Latin, so use \romanseries
- \let\fontseries\romanseries
- #3% contains \fontseries and \@setbfseriesdefaultshook
- \let\fontseries\pltx at fontseries@saved % recover
+\else % --- for 2020-02-02 END & for 2020-10-01 BEGIN
+\AddToHook{expand at font@defaults}{%
+ \edef\mcdef at ult{\mcdefault}%
+ \edef\gtdef at ult{\gtdefault}%
+ %\edef\kanjidef at ult{\kanjifamilydefault}% !! sync with 2020/04/13 v3.1n
+}
+\fi % --- for 2020-10-01 END
+\fi %</2020-02-02|2020-10-01>
+\ifx\bfseries at rm\@undefined\else %<*2020-02-02|2020-10-01>
+\ifx\AddToHook\@undefined % --- for 2020-02-02 BEGIN
+\DeclareRobustCommand\bfseries{%
+ \not at math@alphabet\bfseries\mathbf
+ \expand at font@defaults
+ % changed \fontseries -> \romanseries
+ \ifx\f at family\rmdef at ult \romanseries\bfseries at rm
+ \else\ifx\f at family\sfdef at ult \romanseries\bfseries at sf
+ \else\ifx\f at family\ttdef at ult \romanseries\bfseries at tt
+ \else \romanseries\bfdefault
+ \fi\fi\fi
% changed \fontseries -> \kanjiseries
\ifx\k at family\mcdef at ult \kanjiseries\bfseries at mc
\else\ifx\k at family\gtdef at ult \kanjiseries\bfseries at gt
@@ -1321,24 +1353,16 @@
\else \kanjiseries\bfdefault
\fi\fi
\selectfont
- }%
}
-\ifx\@setbfseriesdefaultshook\@undefined\else
-\g at addto@macro\@setbfseriesdefaultshook{%
- \let\bfseries at mc\bfdef at ult
- \let\bfseries at gt\bfdef at ult
-}
-\fi
-\expandafter\expandafter\expandafter
- \pltx at patch@bfseries\csname bfseries \endcsname
-\def\pltx at patch@mdseries\not at math@alphabet#1#2#3\selectfont{%
- \long\expandafter\def\csname mdseries \endcsname{%
- \not at math@alphabet#1#2% should be \mdseries\relax
- % \fontseries of pLaTeX tries to change both Latin and Japanese;
- % here we want only Latin, so use \romanseries
- \let\fontseries\romanseries
- #3% contains \fontseries and \@setmdseriesdefaultshook
- \let\fontseries\pltx at fontseries@saved % recover
+\DeclareRobustCommand\mdseries{%
+ \not at math@alphabet\mdseries\relax
+ \expand at font@defaults
+ % changed \fontseries -> \romanseries
+ \ifx\f at family\rmdef at ult \romanseries\mdseries at rm
+ \else\ifx\f at family\sfdef at ult \romanseries\mdseries at sf
+ \else\ifx\f at family\ttdef at ult \romanseries\mdseries at tt
+ \else \romanseries\mddefault
+ \fi\fi\fi
% changed \fontseries -> \kanjiseries
\ifx\k at family\mcdef at ult \kanjiseries\mdseries at mc
\else\ifx\k at family\gtdef at ult \kanjiseries\mdseries at gt
@@ -1345,17 +1369,32 @@
\else \kanjiseries\mddefault
\fi\fi
\selectfont
- }%
}
-\ifx\@setmdseriesdefaultshook\@undefined\else
-\g at addto@macro\@setmdseriesdefaultshook{%
+\else % --- for 2020-02-02 END & for 2020-10-01 BEGIN
+\AddToHook{bfseries/defaults}{%
+ \let\bfseries at mc\bfdef at ult
+ \let\bfseries at gt\bfdef at ult
+}
+\AddToHook{bfseries}{%
+ % changed \fontseries -> \kanjiseries
+ \ifx\k at family\mcdef at ult \kanjiseries\bfseries at mc
+ \else\ifx\k at family\gtdef at ult \kanjiseries\bfseries at gt
+ \else \kanjiseries\bfdefault
+ \fi\fi
+}
+\AddToHook{mdseries/defaults}{%
\let\mdseries at mc\mddef at ult
\let\mdseries at gt\mddef at ult
}
-\fi
-\expandafter\expandafter\expandafter
- \pltx at patch@mdseries\csname mdseries \endcsname
-\fi
+\AddToHook{mdseries}{%
+ % changed \fontseries -> \kanjiseries
+ \ifx\k at family\mcdef at ult \kanjiseries\mdseries at mc
+ \else\ifx\k at family\gtdef at ult \kanjiseries\mdseries at gt
+ \else \kanjiseries\mddefault
+ \fi\fi
+}
+\fi % --- for 2020-10-01 END
+\fi %</2020-02-02|2020-10-01>
\ifx\prepare at family@series at update\@undefined % old
\let\prepare at family@series at update@kanji\@undefined
\let\@meta at family@list at kanji\@undefined
@@ -1435,13 +1474,32 @@
\fi
}
\fi
-\expandafter\ifx\csname init at series@setup\endcsname\relax\else % 2020-02-02
+\expandafter\ifx\csname init at series@setup\endcsname\relax
+\else %<*2020-02-02|2020-10-01>
+\ifx\AddToHook\@undefined % --- for 2020-02-02 BEGIN
\g at addto@macro\init at series@setup{%
\ifx\kanjidef at ult\mcdef at ult \mcfamily
\else\ifx\kanjidef at ult\gtdef at ult \gtfamily
\fi\fi
}%
-\fi
+\else % --- for 2020-02-02 END & for 2020-10-01 BEGIN
+\g at addto@macro\init at series@setup{%
+ % !! sync with 2020/04/13 v3.1n BEGIN
+ \ifx\kanjiseriesdefault\kanjiseriesdefault at kernel
+ \mdseries
+ \let\kanjiseriesdefault\k at series
+ \fi
+ % !! sync with 2020/04/13 v3.1n END
+}%
+\fi % --- for 2020-10-01 END
+\fi %</2020-02-02|2020-10-01>
+\ifx\AddToHook\@undefined
+\else % --- for LaTeX2e 2020-10-01 or later BEGIN
+\def\code at after@pldefs{%
+\expandafter\def\expandafter\kanjiseriesdefault
+ \expandafter{\kanjiseriesdefault\@empty}
+\let\kanjiseriesdefault at kernel\kanjiseriesdefault}
+\fi % --- for LaTeX2e 2020-10-01 or later END
\ifx\prepare at family@series at update@kanji\@undefined % old
\DeclareRobustCommand\mcfamily
{\not at math@alphabet\mcfamily\mathmc
@@ -2231,6 +2289,36 @@
\global \maxdepth \@maxdepth
}
\plEndIncludeInRelease
+\plIncludeInRelease{2020/10/01}{\@vtryfc}
+ {Empty float}%
+\def\@vtryfc #1{%
+ \global\setbox\@outputbox\vbox{\ifydir\else\hskip\z@\fi}%
+ \let\@elt\@wtryfc
+ \@flsucceed
+ \global\setbox\@outputbox \vbox to\@colht{%
+ \vskip \@fptop
+ \vskip -\@fpsep
+ \unvbox \@outputbox
+ \vskip \@fpbot}%
+ \let\@elt\relax
+ \xdef #1{\@failedlist\@flfail}%
+ \xdef\@freelist{\@freelist\@flsucceed}}
+\plEndIncludeInRelease
+\plIncludeInRelease{0000/00/00}{\@vtryfc}
+ {LaTeX2e original}%
+\def\@vtryfc #1{%
+ \global\setbox\@outputbox\vbox{}%
+ \let\@elt\@wtryfc
+ \@flsucceed
+ \global\setbox\@outputbox \vbox to\@colht{%
+ \vskip \@fptop
+ \vskip -\@fpsep
+ \unvbox \@outputbox
+ \vskip \@fpbot}%
+ \let\@elt\relax
+ \xdef #1{\@failedlist\@flfail}%
+ \xdef\@freelist{\@freelist\@flsucceed}}
+\plEndIncludeInRelease
\plIncludeInRelease{2018/05/20}{\@tombowbleed}{Macro added}%
\def\@tombowbleed{3mm}
\plEndIncludeInRelease
@@ -2627,19 +2715,36 @@
\let\firstmark\botmark
}
\plEndIncludeInRelease
+\plIncludeInRelease{2020/10/01}{\AtBeginDvi}
+ {Adapt to new shipout code}%
+\chardef\pltx at AtBeginDvi@untouched\z@
+\ifdefined\ExplSyntaxOn %--- expl3 available BEGIN
+\ExplSyntaxOn
+\if_cs_exist:N \__shipout_add_firstpage_material:Nn
+ \chardef\pltx at AtBeginDvi@untouched\@ne
+\DeclareRobustCommand \AtBeginDvi
+ {\__shipout_add_firstpage_material:Nn \AtBeginDvi}
+\fi:
+\ExplSyntaxOff
+\fi %--- expl3 available END
+\ifnum\pltx at AtBeginDvi@untouched>\z@\else
+\DeclareRobustCommand \AtBeginDvi [1]{%
+ \global \setbox \@begindvibox
+ \vbox{\yoko \unvbox \@begindvibox #1}}%
+\fi
+\let\pltx at AtBeginDvi@untouched\@undefined
+\plEndIncludeInRelease
\plIncludeInRelease{2019/10/01}{\AtBeginDvi}
{Make robust}%
\DeclareRobustCommand \AtBeginDvi [1]{%
\global \setbox \@begindvibox
- \vbox{\yoko \unvbox \@begindvibox #1}%
-}
+ \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}%
-}
+ \vbox{\yoko \unvbox \@begindvibox #1}}
\expandafter \let \csname AtBeginDvi \endcsname \@undefined
\plEndIncludeInRelease
\plIncludeInRelease{0000/00/00}{\AtBeginDvi}
@@ -2646,10 +2751,53 @@
{LaTeX2e original}%
\def \AtBeginDvi #1{%
\global \setbox \@begindvibox
- \vbox{\unvbox \@begindvibox #1}%
-}
+ \vbox{\unvbox \@begindvibox #1}}
\expandafter \let \csname AtBeginDvi \endcsname \@undefined
\plEndIncludeInRelease
+\plIncludeInRelease{2020/10/01}{\__shipout_execute_cont:}
+ {Adapt to new shipout code}%
+\ifdefined\ExplSyntaxOn %--- expl3 available BEGIN
+\ExplSyntaxOn
+\if_cs_exist:N \__shipout_execute_cont:
+\cs_new_eq:NN \__platex_original_shipout_execute_cont: \__shipout_execute_cont:
+\box_new:N \l__platex_shipout_dummy_box
+\cs_set:Npn \__shipout_execute_cont:
+ {
+ % if \l_shipout_box is not a \yoko-box (= horizontal writing),
+ % then make it a \yoko-box behorehand.
+ \platex_if_box_yoko:NF \l_shipout_box {
+ \vbox_set:Nn \l_shipout_box
+ {
+ \platex_direction_yoko:
+ \box_use:N \l_shipout_box
+ }
+ }
+ % if the current direction is not \yoko,
+ % then enclose \__shipout_execute_cont: with
+ % a dummy \yoko-box named \l__platex_shipout_dummy_box.
+ \platex_if_direction_yoko:TF {
+ \__platex_original_shipout_execute_cont:
+ }{
+ \vbox_set:Nn \l__platex_shipout_dummy_box
+ {
+ \platex_direction_yoko:
+ \__platex_original_shipout_execute_cont:
+ }
+ % [Limitation] the code above may discard some contents,
+ % so we'd like to put it back by \box\l__platex_shipout_dummy_box.
+ % however, an infinite loop occurs if we uncomment the line below
+ % so we can't.
+ %\box_use:N \l__platex_shipout_dummy_box
+ }
+ }
+\fi:
+\ExplSyntaxOff
+\fi %--- expl3 available END
+\plEndIncludeInRelease
+\plIncludeInRelease{0000/00/00}{\__shipout_execute_cont:}
+ {LaTeX2e original}%
+% do nothing
+\plEndIncludeInRelease
\plIncludeInRelease{2016/04/17}{\@makefnmark}
{Remove extra \xkanjiskip}%
\renewcommand\@makefnmark{%
Modified: trunk/Master/texmf-dist/tex/platex/base/plcore.ltx
===================================================================
--- trunk/Master/texmf-dist/tex/platex/base/plcore.ltx 2020-09-30 21:25:20 UTC (rev 56485)
+++ trunk/Master/texmf-dist/tex/platex/base/plcore.ltx 2020-09-30 21:25:54 UTC (rev 56486)
@@ -5,12 +5,13 @@
%% The original source files were:
%%
%% plvers.dtx (with options: `plcore')
+%% plexpl3.dtx (with options: `plcore')
%% plfonts.dtx (with options: `plcore')
%% plcore.dtx (with options: `plcore')
%% plvers.dtx (with options: `plfinal')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016-2018 Japanese TeX Development Community
+%% Copyright (c) 2016-2020 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
@@ -33,7 +34,7 @@
\fi
\def\pfmtname{pLaTeX2e}
\def\pfmtversion
- {2020-04-12}
+ {2020-10-01}
\def\ppatch at level{0}
\edef\platexBANNER{\noexpand\platexNILa
\the\everyjob % LaTeX banner and delayed codes
@@ -98,6 +99,12 @@
\PackageError{platexrelease}
{skipped \string\plIncludeInRelease\space for tag \string#2}{}%
\fi}
+%% File: plexpl3.dtx
+\ifdefined\ExplSyntaxOn %--- expl3 available BEGIN
+\ExplSyntaxOn
+\input plexpl3.ltx
+\ExplSyntaxOff
+\fi %--- expl3 available END
%% File: plfonts.dtx
\let\k at encoding\@empty
\let\ck at encoding\@empty
@@ -980,6 +987,7 @@
\ifin@ \usekanji{#1}{#2}{#3}{#4}%
\else\useroman{#1}{#2}{#3}{#4}%
\fi}
+\ifx\AddToHook\@undefined % --- for 2020-02-02 or older BEGIN
\ifx\@defaultfamilyhook\@undefined % old
\DeclareRobustCommand\normalfont{%
\kanjiencoding{\kanjiencodingdefault}%
@@ -998,7 +1006,15 @@
\edef\k at series{\kanjiseriesdefault}%
\edef\k at shape{\kanjishapedefault}%
}
-\fi
+\fi % done
+\else % --- for 2020-02-02 or older END & for 2020-10-01 BEGIN
+\AddToHook{normalfont}{%
+ \kanjiencoding{\kanjiencodingdefault}%
+ \edef\k at family{\kanjifamilydefault}%
+ \edef\k at series{\kanjiseriesdefault}%
+ \edef\k at shape{\kanjishapedefault}%
+}
+\fi % --- for 2020-10-01 END
\adjustbaseline
\let\reset at font\normalfont
\ifx\bfseries at rm\@undefined % old
@@ -1012,27 +1028,32 @@
\edef\mdseries at mc{\mddefault}% m
\edef\mdseries at gt{\mddefault}% m
\fi
-\ifx\expand at font@defaults\@undefined\else % 2020-02-02
+\ifx\expand at font@defaults\@undefined\else %<*2020-02-02|2020-10-01>
+\ifx\AddToHook\@undefined % --- for 2020-02-02 BEGIN
\g at addto@macro\expand at font@defaults{%
\edef\mcdef at ult{\mcdefault}%
\edef\gtdef at ult{\gtdefault}%
\edef\kanjidef at ult{\kanjifamilydefault}%
}
-\fi
-\ifx\bfseries at rm\@undefined % old
-\let\pltx at fontseries@saved\@undefined
-\let\pltx at patch@bfseries\@undefined
-\let\pltx at patch@mdseries\@undefined
-\else % 2020-02-02
-\let\pltx at fontseries@saved\fontseries
-\def\pltx at patch@bfseries\not at math@alphabet#1#2#3\selectfont{%
- \long\expandafter\def\csname bfseries \endcsname{%
- \not at math@alphabet#1#2% should be \bfseries\mathbf
- % \fontseries of pLaTeX tries to change both Latin and Japanese;
- % here we want only Latin, so use \romanseries
- \let\fontseries\romanseries
- #3% contains \fontseries and \@setbfseriesdefaultshook
- \let\fontseries\pltx at fontseries@saved % recover
+\else % --- for 2020-02-02 END & for 2020-10-01 BEGIN
+\AddToHook{expand at font@defaults}{%
+ \edef\mcdef at ult{\mcdefault}%
+ \edef\gtdef at ult{\gtdefault}%
+ %\edef\kanjidef at ult{\kanjifamilydefault}% !! sync with 2020/04/13 v3.1n
+}
+\fi % --- for 2020-10-01 END
+\fi %</2020-02-02|2020-10-01>
+\ifx\bfseries at rm\@undefined\else %<*2020-02-02|2020-10-01>
+\ifx\AddToHook\@undefined % --- for 2020-02-02 BEGIN
+\DeclareRobustCommand\bfseries{%
+ \not at math@alphabet\bfseries\mathbf
+ \expand at font@defaults
+ % changed \fontseries -> \romanseries
+ \ifx\f at family\rmdef at ult \romanseries\bfseries at rm
+ \else\ifx\f at family\sfdef at ult \romanseries\bfseries at sf
+ \else\ifx\f at family\ttdef at ult \romanseries\bfseries at tt
+ \else \romanseries\bfdefault
+ \fi\fi\fi
% changed \fontseries -> \kanjiseries
\ifx\k at family\mcdef at ult \kanjiseries\bfseries at mc
\else\ifx\k at family\gtdef at ult \kanjiseries\bfseries at gt
@@ -1039,24 +1060,16 @@
\else \kanjiseries\bfdefault
\fi\fi
\selectfont
- }%
}
-\ifx\@setbfseriesdefaultshook\@undefined\else
-\g at addto@macro\@setbfseriesdefaultshook{%
- \let\bfseries at mc\bfdef at ult
- \let\bfseries at gt\bfdef at ult
-}
-\fi
-\expandafter\expandafter\expandafter
- \pltx at patch@bfseries\csname bfseries \endcsname
-\def\pltx at patch@mdseries\not at math@alphabet#1#2#3\selectfont{%
- \long\expandafter\def\csname mdseries \endcsname{%
- \not at math@alphabet#1#2% should be \mdseries\relax
- % \fontseries of pLaTeX tries to change both Latin and Japanese;
- % here we want only Latin, so use \romanseries
- \let\fontseries\romanseries
- #3% contains \fontseries and \@setmdseriesdefaultshook
- \let\fontseries\pltx at fontseries@saved % recover
+\DeclareRobustCommand\mdseries{%
+ \not at math@alphabet\mdseries\relax
+ \expand at font@defaults
+ % changed \fontseries -> \romanseries
+ \ifx\f at family\rmdef at ult \romanseries\mdseries at rm
+ \else\ifx\f at family\sfdef at ult \romanseries\mdseries at sf
+ \else\ifx\f at family\ttdef at ult \romanseries\mdseries at tt
+ \else \romanseries\mddefault
+ \fi\fi\fi
% changed \fontseries -> \kanjiseries
\ifx\k at family\mcdef at ult \kanjiseries\mdseries at mc
\else\ifx\k at family\gtdef at ult \kanjiseries\mdseries at gt
@@ -1063,17 +1076,32 @@
\else \kanjiseries\mddefault
\fi\fi
\selectfont
- }%
}
-\ifx\@setmdseriesdefaultshook\@undefined\else
-\g at addto@macro\@setmdseriesdefaultshook{%
+\else % --- for 2020-02-02 END & for 2020-10-01 BEGIN
+\AddToHook{bfseries/defaults}{%
+ \let\bfseries at mc\bfdef at ult
+ \let\bfseries at gt\bfdef at ult
+}
+\AddToHook{bfseries}{%
+ % changed \fontseries -> \kanjiseries
+ \ifx\k at family\mcdef at ult \kanjiseries\bfseries at mc
+ \else\ifx\k at family\gtdef at ult \kanjiseries\bfseries at gt
+ \else \kanjiseries\bfdefault
+ \fi\fi
+}
+\AddToHook{mdseries/defaults}{%
\let\mdseries at mc\mddef at ult
\let\mdseries at gt\mddef at ult
}
-\fi
-\expandafter\expandafter\expandafter
- \pltx at patch@mdseries\csname mdseries \endcsname
-\fi
+\AddToHook{mdseries}{%
+ % changed \fontseries -> \kanjiseries
+ \ifx\k at family\mcdef at ult \kanjiseries\mdseries at mc
+ \else\ifx\k at family\gtdef at ult \kanjiseries\mdseries at gt
+ \else \kanjiseries\mddefault
+ \fi\fi
+}
+\fi % --- for 2020-10-01 END
+\fi %</2020-02-02|2020-10-01>
\ifx\prepare at family@series at update\@undefined % old
\let\prepare at family@series at update@kanji\@undefined
\let\@meta at family@list at kanji\@undefined
@@ -1153,13 +1181,32 @@
\fi
}
\fi
-\expandafter\ifx\csname init at series@setup\endcsname\relax\else % 2020-02-02
+\expandafter\ifx\csname init at series@setup\endcsname\relax
+\else %<*2020-02-02|2020-10-01>
+\ifx\AddToHook\@undefined % --- for 2020-02-02 BEGIN
\g at addto@macro\init at series@setup{%
\ifx\kanjidef at ult\mcdef at ult \mcfamily
\else\ifx\kanjidef at ult\gtdef at ult \gtfamily
\fi\fi
}%
-\fi
+\else % --- for 2020-02-02 END & for 2020-10-01 BEGIN
+\g at addto@macro\init at series@setup{%
+ % !! sync with 2020/04/13 v3.1n BEGIN
+ \ifx\kanjiseriesdefault\kanjiseriesdefault at kernel
+ \mdseries
+ \let\kanjiseriesdefault\k at series
+ \fi
+ % !! sync with 2020/04/13 v3.1n END
+}%
+\fi % --- for 2020-10-01 END
+\fi %</2020-02-02|2020-10-01>
+\ifx\AddToHook\@undefined
+\else % --- for LaTeX2e 2020-10-01 or later BEGIN
+\def\code at after@pldefs{%
+\expandafter\def\expandafter\kanjiseriesdefault
+ \expandafter{\kanjiseriesdefault\@empty}
+\let\kanjiseriesdefault at kernel\kanjiseriesdefault}
+\fi % --- for LaTeX2e 2020-10-01 or later END
\ifx\prepare at family@series at update@kanji\@undefined % old
\DeclareRobustCommand\mcfamily
{\not at math@alphabet\mcfamily\mathmc
@@ -1317,10 +1364,10 @@
\pltx at reset@catcode at trick
\let\romanprocess at table\process at table
\def\kanjiprocess at table{%
- \kanjiencoding{\kanjiencodingdefault}%
- \kanjifamily{\kanjifamilydefault}%
- \kanjiseries{\kanjiseriesdefault}%
- \kanjishape{\kanjishapedefault}%
+ \kanjiencoding\kanjiencodingdefault
+ \edef\k at family{\kanjifamilydefault}%
+ \edef\k at series{\kanjiseriesdefault}%
+ \edef\k at shape{\kanjishapedefault}%
}
\def\process at table{%
\romanprocess at table
@@ -1605,6 +1652,18 @@
\unvbox\footins}\fi
\ifvbox\@kludgeins\insert\@kludgeins{\unvbox\@kludgeins}\fi
}
+\def\@vtryfc #1{%
+ \global\setbox\@outputbox\vbox{\ifydir\else\hskip\z@\fi}%
+ \let\@elt\@wtryfc
+ \@flsucceed
+ \global\setbox\@outputbox \vbox to\@colht{%
+ \vskip \@fptop
+ \vskip -\@fpsep
+ \unvbox \@outputbox
+ \vskip \@fpbot}%
+ \let\@elt\relax
+ \xdef #1{\@failedlist\@flfail}%
+ \xdef\@freelist{\@freelist\@flsucceed}}
\newif\iftombow \tombowfalse
\newif\iftombowdate \tombowdatetrue
\newdimen\@tombowwidth
@@ -1763,10 +1822,57 @@
\stepcounter{page}%
\let\firstmark\botmark
}
+\chardef\pltx at AtBeginDvi@untouched\z@
+\ifdefined\ExplSyntaxOn %--- expl3 available BEGIN
+\ExplSyntaxOn
+\if_cs_exist:N \__shipout_add_firstpage_material:Nn
+ \chardef\pltx at AtBeginDvi@untouched\@ne
+\fi:
+\ExplSyntaxOff
+\fi %--- expl3 available END
+\ifnum\pltx at AtBeginDvi@untouched>\z@\else
\DeclareRobustCommand \AtBeginDvi [1]{%
\global \setbox \@begindvibox
- \vbox{\yoko \unvbox \@begindvibox #1}%
-}
+ \vbox{\yoko \unvbox \@begindvibox #1}}%
+\fi
+\let\pltx at AtBeginDvi@untouched\@undefined
+\ifdefined\ExplSyntaxOn %--- expl3 available BEGIN
+\ExplSyntaxOn
+\if_cs_exist:N \__shipout_execute_cont:
+\cs_new_eq:NN \__platex_original_shipout_execute_cont: \__shipout_execute_cont:
+\box_new:N \l__platex_shipout_dummy_box
+\cs_set:Npn \__shipout_execute_cont:
+ {
+ % if \l_shipout_box is not a \yoko-box (= horizontal writing),
+ % then make it a \yoko-box behorehand.
+ \platex_if_box_yoko:NF \l_shipout_box {
+ \vbox_set:Nn \l_shipout_box
+ {
+ \platex_direction_yoko:
+ \box_use:N \l_shipout_box
+ }
+ }
+ % if the current direction is not \yoko,
+ % then enclose \__shipout_execute_cont: with
+ % a dummy \yoko-box named \l__platex_shipout_dummy_box.
+ \platex_if_direction_yoko:TF {
+ \__platex_original_shipout_execute_cont:
+ }{
+ \vbox_set:Nn \l__platex_shipout_dummy_box
+ {
+ \platex_direction_yoko:
+ \__platex_original_shipout_execute_cont:
+ }
+ % [Limitation] the code above may discard some contents,
+ % so we'd like to put it back by \box\l__platex_shipout_dummy_box.
+ % however, an infinite loop occurs if we uncomment the line below
+ % so we can't.
+ %\box_use:N \l__platex_shipout_dummy_box
+ }
+ }
+\fi:
+\ExplSyntaxOff
+\fi %--- expl3 available END
\renewcommand\@makefnmark{%
\ifydir \hbox{}\hbox{\@textsuperscript{\normalfont\@thefnmark}}\hbox{}%
\else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi}
@@ -1960,6 +2066,7 @@
\let\document at default@language\m at ne
\fi
%% File: plvers.dtx
+\ifx\AddToHook\@undefined
\expandafter\def\expandafter\process at table\expandafter{%
\expandafter\p at warn@latexrelease\process at table}
\begingroup
@@ -1966,6 +2073,9 @@
\toks@\expandafter{\expandafter\p at warn@latexrelease\@begindocumenthook}
\xdef\@begindocumenthook{\the\toks@}
\endgroup
+\else
+\AddToHook{begindocument/before}{\p at warn@latexrelease}
+\fi
\def\p at warn@latexrelease{%
\ifx\latexreleaseversion\@undefined\else
\ifx\platexreleaseversion\@undefined
Modified: trunk/Master/texmf-dist/tex/platex/base/pldefs.ltx
===================================================================
--- trunk/Master/texmf-dist/tex/platex/base/pldefs.ltx 2020-09-30 21:25:20 UTC (rev 56485)
+++ trunk/Master/texmf-dist/tex/platex/base/pldefs.ltx 2020-09-30 21:25:54 UTC (rev 56486)
@@ -7,7 +7,7 @@
%% plfonts.dtx (with options: `pldefs,xpt')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016-2018 Japanese TeX Development Community
+%% Copyright (c) 2016-2020 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
Added: trunk/Master/texmf-dist/tex/platex/base/plexpl3.ltx
===================================================================
--- trunk/Master/texmf-dist/tex/platex/base/plexpl3.ltx (rev 0)
+++ trunk/Master/texmf-dist/tex/platex/base/plexpl3.ltx 2020-09-30 21:25:54 UTC (rev 56486)
@@ -0,0 +1,41 @@
+%%
+%% This is file `plexpl3.ltx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% plexpl3.dtx (with options: `code')
+%%
+%% Copyright (c) 2010 ASCII MEDIA WORKS
+%% Copyright (c) 2016-2020 Japanese TeX Development Community
+%%
+%% This file is part of the pLaTeX2e system (community edition).
+%% -------------------------------------------------------------
+%%
+%% File: plexpl3.dtx
+\cs_if_exist:NT \__platex_expl_loaded:
+ {
+ \GenericInfo{}
+ {Skipping:~ plexpl3~ code~ already~ part~ of~ the~ format}%
+ \endinput
+ }
+\cs_new:Npn \__platex_expl_loaded: { }
+%% additions to l3box.dtx: writing directions (pTeX/upTeX-specific)
+\cs_set_eq:NN \platex_direction_yoko: \tex_yoko:D
+\cs_set_eq:NN \platex_direction_tate: \tex_tate:D
+\cs_set_eq:NN \platex_direction_dtou: \tex_dtou:D
+\prg_new_conditional:Npnn \platex_if_direction_yoko: { p, T, F, TF }
+ { \tex_ifydir:D \prg_return_true: \else: \prg_return_false: \fi: }
+\prg_new_conditional:Npnn \platex_if_direction_tate: { p, T, F, TF }
+ { \tex_iftdir:D \prg_return_true: \else: \prg_return_false: \fi: }
+\prg_new_conditional:Npnn \platex_if_direction_dtou: { p, T, F, TF }
+ { \tex_ifddir:D \prg_return_true: \else: \prg_return_false: \fi: }
+\prg_new_conditional:Npnn \platex_if_box_yoko:N #1 { p, T, F, TF }
+ { \tex_ifybox:D #1 \prg_return_true: \else: \prg_return_false: \fi: }
+\prg_new_conditional:Npnn \platex_if_box_tate:N #1 { p, T, F, TF }
+ { \tex_iftbox:D #1 \prg_return_true: \else: \prg_return_false: \fi: }
+\prg_new_conditional:Npnn \platex_if_box_dtou:N #1 { p, T, F, TF }
+ { \tex_ifdbox:D #1 \prg_return_true: \else: \prg_return_false: \fi: }
+\endinput
+%%
+%% End of file `plexpl3.ltx'.
Property changes on: trunk/Master/texmf-dist/tex/platex/base/plexpl3.ltx
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/platex/base/plexpl3.sty
===================================================================
--- trunk/Master/texmf-dist/tex/platex/base/plexpl3.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/platex/base/plexpl3.sty 2020-09-30 21:25:54 UTC (rev 56486)
@@ -0,0 +1,23 @@
+%%
+%% This is file `plexpl3.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% plexpl3.dtx (with options: `package')
+%%
+%% Copyright (c) 2010 ASCII MEDIA WORKS
+%% Copyright (c) 2016-2020 Japanese TeX Development Community
+%%
+%% This file is part of the pLaTeX2e system (community edition).
+%% -------------------------------------------------------------
+%%
+%% File: plexpl3.dtx
+\NeedsTeXFormat{pLaTeX2e}
+\RequirePackage{expl3}
+\ProvidesExplPackage{plexpl3}{2020-09-28}{1.0}
+ {pTeX/upTeX-specific additions to expl3}
+\input plexpl3.ltx
+\endinput
+%%
+%% End of file `plexpl3.sty'.
Property changes on: trunk/Master/texmf-dist/tex/platex/base/plexpl3.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/platex/base/plext.sty
===================================================================
--- trunk/Master/texmf-dist/tex/platex/base/plext.sty 2020-09-30 21:25:20 UTC (rev 56485)
+++ trunk/Master/texmf-dist/tex/platex/base/plext.sty 2020-09-30 21:25:54 UTC (rev 56486)
@@ -7,7 +7,7 @@
%% plext.dtx (with options: `package')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016-2018 Japanese TeX Development Community
+%% Copyright (c) 2016-2020 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
Modified: trunk/Master/texmf-dist/tex/platex/base/ptrace.sty
===================================================================
--- trunk/Master/texmf-dist/tex/platex/base/ptrace.sty 2020-09-30 21:25:20 UTC (rev 56485)
+++ trunk/Master/texmf-dist/tex/platex/base/ptrace.sty 2020-09-30 21:25:54 UTC (rev 56486)
@@ -7,7 +7,7 @@
%% plfonts.dtx (with options: `trace')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016-2018 Japanese TeX Development Community
+%% Copyright (c) 2016-2020 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
Modified: trunk/Master/texmf-dist/tex/platex/base/tarticle.cls
===================================================================
--- trunk/Master/texmf-dist/tex/platex/base/tarticle.cls 2020-09-30 21:25:20 UTC (rev 56485)
+++ trunk/Master/texmf-dist/tex/platex/base/tarticle.cls 2020-09-30 21:25:54 UTC (rev 56486)
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{tarticle}
- [2020/01/03 v1.8e
+ [2020/09/30 v1.8f
Standard pLaTeX class]
\newcounter{@paper}
\newif\if at landscape \@landscapefalse
@@ -674,9 +674,9 @@
\def\addcontentsline#1#2#3{%
\protected at write\@auxout
{\let\label\@gobble \let\index\@gobble \let\glossary\@gobble
- \@temptokena{\rensuji{\thepage}}}%
- {\string\@writefile{#1}%
- {\protect\contentsline{#2}{#3}{\the\@temptokena}%
+ \@temptokena{\rensuji{\thepage}}%
+ }{\string\@writefile{#1}%
+ {\protect\contentsline{#2}{#3}{\the\@temptokena}{}%
\protected at file@percent}}%
}
\newcommand{\tableofcontents}{%
Modified: trunk/Master/texmf-dist/tex/platex/base/tbk10.clo
===================================================================
--- trunk/Master/texmf-dist/tex/platex/base/tbk10.clo 2020-09-30 21:25:20 UTC (rev 56485)
+++ trunk/Master/texmf-dist/tex/platex/base/tbk10.clo 2020-09-30 21:25:54 UTC (rev 56486)
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{tbk10.clo}
- [2020/01/03 v1.8e
+ [2020/09/30 v1.8f
Standard pLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{17}%
Modified: trunk/Master/texmf-dist/tex/platex/base/tbk11.clo
===================================================================
--- trunk/Master/texmf-dist/tex/platex/base/tbk11.clo 2020-09-30 21:25:20 UTC (rev 56485)
+++ trunk/Master/texmf-dist/tex/platex/base/tbk11.clo 2020-09-30 21:25:54 UTC (rev 56486)
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{tbk11.clo}
- [2020/01/03 v1.8e
+ [2020/09/30 v1.8f
Standard pLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{17}%
Modified: trunk/Master/texmf-dist/tex/platex/base/tbk12.clo
===================================================================
--- trunk/Master/texmf-dist/tex/platex/base/tbk12.clo 2020-09-30 21:25:20 UTC (rev 56485)
+++ trunk/Master/texmf-dist/tex/platex/base/tbk12.clo 2020-09-30 21:25:54 UTC (rev 56486)
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{tbk12.clo}
- [2020/01/03 v1.8e
+ [2020/09/30 v1.8f
Standard pLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{18}%
Modified: trunk/Master/texmf-dist/tex/platex/base/tbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/platex/base/tbook.cls 2020-09-30 21:25:20 UTC (rev 56485)
+++ trunk/Master/texmf-dist/tex/platex/base/tbook.cls 2020-09-30 21:25:54 UTC (rev 56486)
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{tbook}
- [2020/01/03 v1.8e
+ [2020/09/30 v1.8f
Standard pLaTeX class]
\newcounter{@paper}
\newif\if at landscape \@landscapefalse
@@ -767,9 +767,9 @@
\def\addcontentsline#1#2#3{%
\protected at write\@auxout
{\let\label\@gobble \let\index\@gobble \let\glossary\@gobble
- \@temptokena{\rensuji{\thepage}}}%
- {\string\@writefile{#1}%
- {\protect\contentsline{#2}{#3}{\the\@temptokena}%
+ \@temptokena{\rensuji{\thepage}}%
+ }{\string\@writefile{#1}%
+ {\protect\contentsline{#2}{#3}{\the\@temptokena}{}%
\protected at file@percent}}%
}
\newcommand{\tableofcontents}{%
Modified: trunk/Master/texmf-dist/tex/platex/base/treport.cls
===================================================================
--- trunk/Master/texmf-dist/tex/platex/base/treport.cls 2020-09-30 21:25:20 UTC (rev 56485)
+++ trunk/Master/texmf-dist/tex/platex/base/treport.cls 2020-09-30 21:25:54 UTC (rev 56486)
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{treport}
- [2020/01/03 v1.8e
+ [2020/09/30 v1.8f
Standard pLaTeX class]
\newcounter{@paper}
\newif\if at landscape \@landscapefalse
@@ -763,9 +763,9 @@
\def\addcontentsline#1#2#3{%
\protected at write\@auxout
{\let\label\@gobble \let\index\@gobble \let\glossary\@gobble
- \@temptokena{\rensuji{\thepage}}}%
- {\string\@writefile{#1}%
- {\protect\contentsline{#2}{#3}{\the\@temptokena}%
+ \@temptokena{\rensuji{\thepage}}%
+ }{\string\@writefile{#1}%
+ {\protect\contentsline{#2}{#3}{\the\@temptokena}{}%
\protected at file@percent}}%
}
\newcommand{\tableofcontents}{%
Modified: trunk/Master/texmf-dist/tex/platex/base/tsize10.clo
===================================================================
--- trunk/Master/texmf-dist/tex/platex/base/tsize10.clo 2020-09-30 21:25:20 UTC (rev 56485)
+++ trunk/Master/texmf-dist/tex/platex/base/tsize10.clo 2020-09-30 21:25:54 UTC (rev 56486)
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{tsize10.clo}
- [2020/01/03 v1.8e
+ [2020/09/30 v1.8f
Standard pLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{17}%
Modified: trunk/Master/texmf-dist/tex/platex/base/tsize11.clo
===================================================================
--- trunk/Master/texmf-dist/tex/platex/base/tsize11.clo 2020-09-30 21:25:20 UTC (rev 56485)
+++ trunk/Master/texmf-dist/tex/platex/base/tsize11.clo 2020-09-30 21:25:54 UTC (rev 56486)
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{tsize11.clo}
- [2020/01/03 v1.8e
+ [2020/09/30 v1.8f
Standard pLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{17}%
Modified: trunk/Master/texmf-dist/tex/platex/base/tsize12.clo
===================================================================
--- trunk/Master/texmf-dist/tex/platex/base/tsize12.clo 2020-09-30 21:25:20 UTC (rev 56485)
+++ trunk/Master/texmf-dist/tex/platex/base/tsize12.clo 2020-09-30 21:25:54 UTC (rev 56486)
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{tsize12.clo}
- [2020/01/03 v1.8e
+ [2020/09/30 v1.8f
Standard pLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{18}%
More information about the tex-live-commits
mailing list.