diff options
Diffstat (limited to 'Master/texmf-dist/source')
| -rw-r--r-- | Master/texmf-dist/source/platex/base/Makefile | 94 | ||||
| -rw-r--r-- | Master/texmf-dist/source/platex/base/platex.dtx | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/source/platex/base/platexrelease.dtx | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/source/platex/base/platexrelease.ins | 1 | ||||
| -rw-r--r-- | Master/texmf-dist/source/platex/base/plext.dtx | 65 | ||||
| -rw-r--r-- | Master/texmf-dist/source/platex/base/plfonts.dtx | 51 | ||||
| -rw-r--r-- | Master/texmf-dist/source/platex/base/plvers.dtx | 29 |
7 files changed, 165 insertions, 81 deletions
diff --git a/Master/texmf-dist/source/platex/base/Makefile b/Master/texmf-dist/source/platex/base/Makefile index e89d976fca2..df52b9b90a9 100644 --- a/Master/texmf-dist/source/platex/base/Makefile +++ b/Master/texmf-dist/source/platex/base/Makefile @@ -4,10 +4,14 @@ DOCTARGET = platex platexrelease pldoc exppl2e \ platex-en #pldoc-en PDFTARGET = $(addsuffix .pdf,$(DOCTARGET)) DVITARGET = $(addsuffix .dvi,$(DOCTARGET)) +TEXMF = $(shell kpsewhich -var-value=TEXMFHOME) + KANJI = -kanji=jis #FONTMAP = -f ipaex.map -f ptex-ipaex.map FONTMAP = -f haranoaji.map -f ptex-haranoaji.map -TEXMF = $(shell kpsewhich -var-value=TEXMFHOME) +LTX = platex $(KANJI) +DPX = dvipdfmx $(FONTMAP) +MDX = mendex -J default: $(STRIPTARGET) $(DVITARGET) strip: $(STRIPTARGET) @@ -44,66 +48,79 @@ PLDOC_SRC = $(PLFMT_SRC) $(PLCLS_SRC) $(PL209_SRC) jltxdoc.dtx platex.ltx: $(PLFMT_SRC) rm -f $(PLFMT) - platex $(KANJI) plfmt.ins + $(LTX) plfmt.ins rm plfmt.log jarticle.cls: $(PLCLS_SRC) rm -f $(PLCLS) - platex $(KANJI) plcls.ins + $(LTX) plcls.ins rm plcls.log pl209.def: $(PL209_SRC) rm -f $(PL209) - platex $(KANJI) pl209.ins + $(LTX) pl209.ins rm pl209.log platexrelease.sty: $(PLREL_SRC) rm -f $(PLREL) - platex $(KANJI) platexrelease.ins + $(LTX) platexrelease.ins rm platexrelease.log jltxdoc.cls: jltxdoc.dtx rm -f jltxdoc.cls pldoc.tex Xins.ins - platex $(KANJI) pldocs.ins + $(LTX) pldocs.ins rm pldocs.log pldoc.tex Xins.ins platex.dvi: $(INTRODOC_SRC) rm -f platex.cfg - platex $(KANJI) platex.dtx - mendex -J -f -s gglo.ist -o platex.gls platex.glo - platex $(KANJI) platex.dtx + $(LTX) platex.dtx + $(MDX) -f -s gglo.ist -o platex.gls platex.glo + $(LTX) platex.dtx rm platex.aux platex.log rm platex.glo platex.gls platex.ilg platexrelease.dvi: $(PLRELDOC_SRC) rm -f platex.cfg - platex $(KANJI) platexrelease.dtx - platex $(KANJI) platexrelease.dtx + $(LTX) platexrelease.dtx + $(LTX) platexrelease.dtx rm platexrelease.aux platexrelease.log pldoc.dvi: $(PLDOC_SRC) rm -f platex.cfg rm -f jltxdoc.cls pldoc.tex Xins.ins - platex $(KANJI) pldocs.ins - rm -f mkpldoc*.sh dstcheck.pl - platex $(KANJI) Xins.ins - sh mkpldoc.sh + $(LTX) pldocs.ins + # + #rm -f mkpldoc*.sh dstcheck.pl + #$(LTX) Xins.ins + #sh mkpldoc.sh + #rm mkpldoc*.sh dstcheck.pl + # + rm -f pldoc.toc pldoc.idx pldoc.glo + echo "" > ltxdoc.cfg + $(LTX) pldoc.tex + $(MDX) -s gind.ist -d pldoc.dic -o pldoc.ind pldoc.idx + $(MDX) -f -s gglo.ist -o pldoc.gls pldoc.glo + echo "\includeonly{}" > ltxdoc.cfg + $(LTX) pldoc.tex + echo "" > ltxdoc.cfg + $(LTX) pldoc.tex + # rm *.aux *.log pldoc.toc pldoc.idx pldoc.ind pldoc.ilg rm pldoc.glo pldoc.gls pldoc.tex Xins.ins - rm ltxdoc.cfg pldoc.dic mkpldoc*.sh dstcheck.pl + rm ltxdoc.cfg pldoc.dic exppl2e.dvi: exppl2e.sty rm -f platex.cfg - platex $(KANJI) exppl2e.sty - platex $(KANJI) exppl2e.sty + $(LTX) exppl2e.sty + $(LTX) exppl2e.sty rm exppl2e.aux exppl2e.log platex-en.dvi: $(INTRODOC_SRC) # built-in echo in shell is troublesome, so use perl instead perl -e "print \"\\\\newif\\\\ifJAPANESE\\n"\" >platex.cfg - platex -jobname=platex-en $(KANJI) platex.dtx - mendex -J -f -s gglo.ist -o platex-en.gls platex-en.glo - platex -jobname=platex-en $(KANJI) platex.dtx + $(LTX) -jobname=platex-en platex.dtx + $(MDX) -f -s gglo.ist -o platex-en.gls platex-en.glo + $(LTX) -jobname=platex-en platex.dtx rm platex-en.aux platex-en.log rm platex-en.glo platex-en.gls platex-en.ilg rm platex.cfg @@ -112,27 +129,40 @@ pldoc-en.dvi: $(PLDOC_SRC) # built-in echo in shell is troublesome, so use perl instead perl -e "print \"\\\\newif\\\\ifJAPANESE\\n"\" >platex.cfg rm -f jltxdoc.cls pldoc.tex Xins.ins - platex $(KANJI) pldocs.ins - rm -f mkpldoc*.sh dstcheck.pl - platex $(KANJI) Xins.ins - sh mkpldoc-en.sh + $(LTX) pldocs.ins + # + #rm -f mkpldoc*.sh dstcheck.pl + #$(LTX) Xins.ins + #sh mkpldoc-en.sh + #rm mkpldoc*.sh dstcheck.pl + # + rm -f pldoc-en.toc pldoc-en.idx pldoc-en.glo + echo "" > ltxdoc.cfg + $(LTX) -jobname=pldoc-en pldoc.tex + $(MDX) -s gind.ist -d pldoc.dic -o pldoc-en.ind pldoc-en.idx + $(MDX) -f -s gglo.ist -o pldoc-en.gls pldoc-en.glo + echo "\includeonly{}" > ltxdoc.cfg + $(LTX) -jobname=pldoc-en pldoc.tex + echo "" > ltxdoc.cfg + $(LTX) -jobname=pldoc-en pldoc.tex + # rm *.aux *.log pldoc-en.toc pldoc-en.idx pldoc-en.ind pldoc-en.ilg rm pldoc-en.glo pldoc-en.gls pldoc.tex Xins.ins - rm ltxdoc.cfg pldoc.dic mkpldoc*.sh dstcheck.pl + rm ltxdoc.cfg pldoc.dic rm platex.cfg platex.pdf: platex.dvi - dvipdfmx $(FONTMAP) $< + $(DPX) $< platexrelease.pdf: platexrelease.dvi - dvipdfmx $(FONTMAP) $< + $(DPX) $< pldoc.pdf: pldoc.dvi - dvipdfmx $(FONTMAP) $< + $(DPX) $< exppl2e.pdf: exppl2e.dvi - dvipdfmx $(FONTMAP) $< + $(DPX) $< platex-en.pdf: platex-en.dvi - dvipdfmx $(FONTMAP) $< + $(DPX) $< pldoc-en.pdf: pldoc-en.dvi - dvipdfmx $(FONTMAP) $< + $(DPX) $< .PHONY: install clean cleanstrip cleanall cleandoc install: diff --git a/Master/texmf-dist/source/platex/base/platex.dtx b/Master/texmf-dist/source/platex/base/platex.dtx index b1dd3b368a0..77e5e036d41 100644 --- a/Master/texmf-dist/source/platex/base/platex.dtx +++ b/Master/texmf-dist/source/platex/base/platex.dtx @@ -1766,13 +1766,13 @@ exit; % % \bibitem{ajt2008okumura} % Haruhiko Okumura, -% \newblock \pTeX\ and Japanese Typesetting +% \newblock ``{\em \pTeX\ and Japanese Typesetting}''. % \newblock The Asian Journal of \TeX, Volume~2, No.~1, 2008.\\ % (\texttt{http://ajt.ktug.org/2008/0201okumura.pdf}) % % \bibitem{tb29hamano} % Hisato Hamano, -% \newblock Vertical Typesetting with \TeX. +% \newblock ``{\em Vertical Typesetting with \TeX}''. % \newblock TUGboat issue 11:3, 1990.\\ % (\texttt{https://tug.org/TUGboat/tb11-3/tb29hamano.pdf}) % diff --git a/Master/texmf-dist/source/platex/base/platexrelease.dtx b/Master/texmf-dist/source/platex/base/platexrelease.dtx index c31d8c0d20b..e76a387e2e8 100644 --- a/Master/texmf-dist/source/platex/base/platexrelease.dtx +++ b/Master/texmf-dist/source/platex/base/platexrelease.dtx @@ -339,6 +339,8 @@ of this package available from CTAN} some critical bugs. We advise you to\MessageBreak select another format date} \plIncludeInRelease{2017/10/28}{\PackageWarning}{pLaTeX Info}% + % * <2020-10-01>+1 + % * <2020-10-01> % * <2020-04-12> % * <2020-02-02>+3 % * <2020-02-02>+2 diff --git a/Master/texmf-dist/source/platex/base/platexrelease.ins b/Master/texmf-dist/source/platex/base/platexrelease.ins index 7b4d7df208f..b1ed64c87ee 100644 --- a/Master/texmf-dist/source/platex/base/platexrelease.ins +++ b/Master/texmf-dist/source/platex/base/platexrelease.ins @@ -18,6 +18,7 @@ This file is part of the pLaTeX2e system (community edition). \file{platexrelease.sty}{ \from{plvers.dtx}{platexrelease} \from{platexrelease.dtx}{platexrelease} + \from{plvers.dtx}{plhookrelease}%% specific! \from{plexpl3.dtx}{platexrelease} \from{plfonts.dtx}{platexrelease} \from{plcore.dtx}{platexrelease}} diff --git a/Master/texmf-dist/source/platex/base/plext.dtx b/Master/texmf-dist/source/platex/base/plext.dtx index 438cf7c0433..023a3db05eb 100644 --- a/Master/texmf-dist/source/platex/base/plext.dtx +++ b/Master/texmf-dist/source/platex/base/plext.dtx @@ -3,7 +3,7 @@ % % Copyright 2001 ASCII Corporation. % Copyright (c) 2010 ASCII MEDIA WORKS -% Copyright (c) 2016-2019 Japanese TeX Development Community +% Copyright (c) 2016-2020 Japanese TeX Development Community % % This file is part of the pLaTeX2e system (community edition). % ------------------------------------------------------------- @@ -83,6 +83,9 @@ % $BD>8r$9$k>l9g$K!"?<$5$rK:$l$F$$$?%P%0=$@5(B (forum:2506, issue~76)} % \changes{v1.2l}{2019/09/29}{Make \cs{bou} robust} % \changes{v1.2l}{2019/09/29}{Make \cs{kasen} robust} +% \changes{v1.2m}{2020/10/07}{$B%^%/%mDI2C(B} +% \changes{v1.2m}{2020/10/07}{Use \cs{@defaultunitsset} (gh/372) +% (sync with ltpictur.dtx 2020/08/14 v1.2a)} % \fi % % \iffalse @@ -91,7 +94,7 @@ \ProvidesFile{plext.dtx} %</driver> %<package>\ProvidesPackage{plext} - [2019/09/29 v1.2l pLaTeX package file (community edition)] + [2020/10/07 v1.2m pLaTeX package file (community edition)] %<*driver> \documentclass{jltxdoc} \usepackage{plext} @@ -754,12 +757,12 @@ % \end{macrocode} % $B:G8e$K(B|\@captionbox|$B$rAH$_N)$F$^$9!#(B % -% $B0LCV#2%*%W%7%g%s$,(B`|u|'$B$+(B`|d|'$B$N>l9g!"(B +% $B0LCV(B2$B%*%W%7%g%s$,(B`|u|'$B$+(B`|d|'$B$N>l9g!"(B % $B$3$N%\%C%/%9$NI}$r%U%m!<%H%*%V%8%'%/%H$NI}$HF1$8D9$5$K$7!"(B -% $B0LCV#1%*%W%7%g%s$G$NB7$($KAH$_N)$F$^$9!#(B +% $B0LCV(B1$B%*%W%7%g%s$G$NB7$($KAH$_N)$F$^$9!#(B % -% $B0LCV#2%*%W%7%g%s$,(B`|l|'$B$+(B`|r|'$B$N>l9g$O!"%-%c%W%7%g%s$NI}$G$9!#(B -% $B$3$N$H$-$N0LCV#1%*%W%7%g%s$NB7$($O!"$3$NA0$NCJ3,$G=`Hw$r$7$F$*$-!"(B +% $B0LCV(B2$B%*%W%7%g%s$,(B`|l|'$B$+(B`|r|'$B$N>l9g$O!"%-%c%W%7%g%s$NI}$G$9!#(B +% $B$3$N$H$-$N0LCV(B1$B%*%W%7%g%s$NB7$($O!"$3$NA0$NCJ3,$G=`Hw$r$7$F$*$-!"(B % |\@pcaption|$B$G:G=*E*$K%U%m!<%H%*%V%8%'%/%H$HAH$_9g$o$;$k$H$-$K$J$5$l$^$9!#(B % \begin{macrocode} \let\to@captionboxwidth\relax @@ -1176,32 +1179,52 @@ \newdimen\save@tbaselineshift \newdimen\@picwd % \end{macrocode} -% |\picture|$B$NFbIt7A<0$G$9!##3AHL\$N0z?t$O!"86E@:BI8$G$9!#(B +% \end{macro} +% +% \begin{macro}{\X@picture@dimens} +% $B?^7ANN0h$N@#K!CM$rD4@0$9$kL?Na$r@Z$j=P$7$^$7$?!#(B +% $B4pK\AH$NAH$_J}8~$HD>8r$9$k>l9g$O!"9b$5$HI}$rF~$lBX$($^$9!#(B +% \changes{v1.2m}{2020/10/07}{$B%^%/%mDI2C(B} +% \begin{macrocode} +\ifx\@defaultunitsset\@undefined % old + \def\X@picture@dimens#1#2#3#4{% + \@picwd=#1\unitlength \@picht=#2\unitlength + \@tempdima=#3\unitlength \@tempdimb=#4\unitlength + } +\else % 2020-10-01 + \def\X@picture@dimens#1#2#3#4{% + \@defaultunitsset\@picwd{#1}\unitlength + \@defaultunitsset\@picht{#2}\unitlength + \@defaultunitsset\@tempdima{#3}\unitlength + \@defaultunitsset\@tempdimb{#4}\unitlength + } +\fi +% \end{macrocode} +% |\picture|$B$NFbIt7A<0$G$9!#(B3$BAHL\$N0z?t$O!"86E@:BI8$G$9!#(B +% \changes{v1.2m}{2020/10/07}{Use \cs{@defaultunitsset} (gh/372) +% (sync with ltpictur.dtx 2020/08/14 v1.2a)} % \begin{macrocode} \def\@@picture<#1>(#2,#3)(#4,#5){% \save@ybaselineshift\ybaselineshift \save@tbaselineshift\tbaselineshift \iftdir \if#1y\let\box@dir\yoko - \@picwd=#3\unitlength \@picht=#2\unitlength - \@tempdima=#5\unitlength \@tempdimb=#4\unitlength + \X@picture@dimens{#3}{#2}{#5}{#4}% \else\let\box@dir\tate - \@picwd=#2\unitlength \@picht=#3\unitlength - \@tempdima=#4\unitlength \@tempdimb=#5\unitlength + \X@picture@dimens{#2}{#3}{#4}{#5}% \fi \else \if#1t\let\box@dir\tate - \@picwd=#3\unitlength \@picht=#2\unitlength - \@tempdima=#5\unitlength \@tempdimb=#4\unitlength + \X@picture@dimens{#3}{#2}{#5}{#4}% \else\let\box@dir\yoko - \@picwd=#2\unitlength \@picht=#3\unitlength - \@tempdima=#4\unitlength \@tempdimb=#5\unitlength + \X@picture@dimens{#2}{#3}{#4}{#5}% \fi \fi - \setbox\@picbox\hbox to\@picwd\bgroup\box@dir - \hskip-\@tempdima\lower\@tempdimb\hbox\bgroup - \ybaselineshift\z@ \tbaselineshift\z@ - \ignorespaces} + \setbox\@picbox\hb@xt@\@picwd\bgroup\box@dir + \hskip-\@tempdima + \lower\@tempdimb\hbox\bgroup + \ybaselineshift\z@ \tbaselineshift\z@ + \ignorespaces} % \end{macrocode} % \end{macro} % @@ -1263,7 +1286,7 @@ % $B!XF|K\8l(B\LaTeXe{}$B%V%C%/!Y$r;2>H$7$F$/$@$5$$!#(B % $B$J$*!"K5E@$K;H$&J8;z$O(B\file{pldefs.ltx}$B$GDj5A$5$l$F$$$^$9!#(B % -% $B$J$*!"O"?t;z%3%^%s%I$O#3<oN`$"$j$^$7$?$,!"(B +% $B$J$*!"O"?t;z%3%^%s%I$O(B3$B<oN`$"$j$^$7$?$,!"(B % |\rensuji|$B%3%^%s%I0l$D$K$^$H$a$^$7$?!#(B % $B?7$7$$O"?t;z%3%^%s%I$O<!$N9=J8$H$J$j$^$9!#(B % @@ -1285,7 +1308,7 @@ % \end{macrocode} % % |\rensujiskip|$B$OO"?t;z$NA08e$KF~$k%"%-$G$9!#(B -% $B%G%U%)%k%H$O!"8=:_$NJ8;z$NI}$N#4J,$N#1$r4p=`$K$7$F$$$^$9!#(B +% $B%G%U%)%k%H$O!"8=:_$NJ8;z$NI}$N(B4$BJ,$N(B1$B$r4p=`$K$7$F$$$^$9!#(B % \begin{macrocode} \newskip\rensujiskip \rensujiskip=0.25\chs plus.25zw minus.25zw diff --git a/Master/texmf-dist/source/platex/base/plfonts.dtx b/Master/texmf-dist/source/platex/base/plfonts.dtx index e68de15a597..2ccf9c3790b 100644 --- a/Master/texmf-dist/source/platex/base/plfonts.dtx +++ b/Master/texmf-dist/source/platex/base/plfonts.dtx @@ -166,13 +166,14 @@ % (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)} +% \changes{v1.7i}{2020/10/07}{$B%U%C%/%7%9%F%`$NM-L5H=Dj$r2~NI(B} % \fi % % \iffalse %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{plfonts.dtx}[2020/09/28 v1.7h pLaTeX New Font Selection Scheme] +\ProvidesFile{plfonts.dtx}[2020/10/07 v1.7i pLaTeX New Font Selection Scheme] % \iffalse \documentclass{jltxdoc} \GetFileInfo{plfonts.dtx} @@ -2976,11 +2977,12 @@ % \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)} +% \changes{v1.7i}{2020/10/07}{$B%U%C%/%7%9%F%`$NM-L5H=Dj$r2~NI(B} % \begin{macrocode} %<platexrelease>\plIncludeInRelease{2020/04/12}{\normalfont} %<platexrelease> {Use \@defaultfamilyhook}% %<*plcore|platexrelease> -\ifx\AddToHook\@undefined % --- for 2020-02-02 or older BEGIN +\ifnum\pltx@newhook@avail=\z@ % --- for <= 2020-02-02 BEGIN \ifx\@defaultfamilyhook\@undefined % old \DeclareRobustCommand\normalfont{% \kanjiencoding{\kanjiencodingdefault}% @@ -3007,14 +3009,14 @@ \edef\k@shape{\kanjishapedefault}% } \fi % done -\else % --- for 2020-02-02 or older END & for 2020-10-01 BEGIN +\else % --- for <= 2020-02-02 END & for >= 2020-10-01 BEGIN %<platexrelease>\DeclareRobustCommand\normalfont{% %<platexrelease> \fontencoding\encodingdefault %<platexrelease> \edef\f@family{\familydefault}% %<platexrelease> \edef\f@series{\seriesdefault}% %<platexrelease> \edef\f@shape{\shapedefault}% %<platexrelease> \UseHook{normalfont}% -%<platexrelease> \@defaultfamilyhook % hookname from 2020/02 will vanish +%<platexrelease> \@defaultfamilyhook % hookname from 2020/02 will vanish %<platexrelease> \selectfont} \AddToHook{normalfont}{% \kanjiencoding{\kanjiencodingdefault}% @@ -3022,7 +3024,7 @@ \edef\k@series{\kanjiseriesdefault}% \edef\k@shape{\kanjishapedefault}% } -\fi % --- for 2020-10-01 END +\fi % --- for >= 2020-10-01 END \adjustbaseline \let\reset@font\normalfont %</plcore|platexrelease> @@ -3124,22 +3126,23 @@ % ^^A $B$=$l$K4p$E$$$F(B |\seriesdefault| $B$r@_Dj$9$k!#(B % \changes{v1.7h}{2020/09/28}{New hook management interface % (sync with ltfssini.dtx 2020/08/21 v3.2b)} +% \changes{v1.7i}{2020/10/07}{$B%U%C%/%7%9%F%`$NM-L5H=Dj$r2~NI(B} % \begin{macrocode} -\ifx\expand@font@defaults\@undefined\else %<*2020-02-02|2020-10-01> -\ifx\AddToHook\@undefined % --- for 2020-02-02 BEGIN +\ifx\expand@font@defaults\@undefined\else %<*2020-02-02|2020-10-01|.> +\ifnum\pltx@newhook@avail=\z@ % --- for == 2020-02-02 BEGIN \g@addto@macro\expand@font@defaults{% \edef\mcdef@ult{\mcdefault}% \edef\gtdef@ult{\gtdefault}% \edef\kanjidef@ult{\kanjifamilydefault}% } -\else % --- for 2020-02-02 END & for 2020-10-01 BEGIN +\else % --- for == 2020-02-02 END & for >= 2020-10-01 BEGIN \AddToHook{expand@font@defaults}{% \edef\mcdef@ult{\mcdefault}% \edef\gtdef@ult{\gtdefault}% %\edef\kanjidef@ult{\kanjifamilydefault}% !! sync with 2020/04/13 v3.1n } -\fi % --- for 2020-10-01 END -\fi %</2020-02-02|2020-10-01> +\fi % --- for >= 2020-10-01 END +\fi %</2020-02-02|2020-10-01|.> % \end{macrocode} % \end{macro} % @@ -3201,8 +3204,8 @@ % 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@rm\@undefined\else %<*2020-02-02|2020-10-01> -\ifx\AddToHook\@undefined % --- for 2020-02-02 BEGIN +\ifx\bfseries@rm\@undefined\else %<*2020-02-02|2020-10-01|.> +\ifnum\pltx@newhook@avail=\z@ % --- for == 2020-02-02 BEGIN \DeclareRobustCommand\bfseries{% \not@math@alphabet\bfseries\mathbf \expand@font@defaults @@ -3251,8 +3254,9 @@ % $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)} +% \changes{v1.7i}{2020/10/07}{$B%U%C%/%7%9%F%`$NM-L5H=Dj$r2~NI(B} % \begin{macrocode} -\else % --- for 2020-02-02 END & for 2020-10-01 BEGIN +\else % --- for == 2020-02-02 END & for >= 2020-10-01 BEGIN \AddToHook{bfseries/defaults}{% \let\bfseries@mc\bfdef@ult \let\bfseries@gt\bfdef@ult @@ -3275,8 +3279,8 @@ \else \kanjiseries\mddefault \fi\fi } -\fi % --- for 2020-10-01 END -\fi %</2020-02-02|2020-10-01> +\fi % --- for >= 2020-10-01 END +\fi %</2020-02-02|2020-10-01|.> % \end{macrocode} % \end{macro} % \end{macro} @@ -3441,16 +3445,17 @@ % \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)} +% \changes{v1.7i}{2020/10/07}{$B%U%C%/%7%9%F%`$NM-L5H=Dj$r2~NI(B} % \begin{macrocode} \expandafter\ifx\csname init@series@setup\endcsname\relax -\else %<*2020-02-02|2020-10-01> -\ifx\AddToHook\@undefined % --- for 2020-02-02 BEGIN +\else %<*2020-02-02|2020-10-01|.> +\ifnum\pltx@newhook@avail=\z@ % --- for == 2020-02-02 BEGIN \g@addto@macro\init@series@setup{% \ifx\kanjidef@ult\mcdef@ult \mcfamily \else\ifx\kanjidef@ult\gtdef@ult \gtfamily \fi\fi }% -\else % --- for 2020-02-02 END & for 2020-10-01 BEGIN +\else % --- for == 2020-02-02 END & for >= 2020-10-01 BEGIN \g@addto@macro\init@series@setup{% % !! sync with 2020/04/13 v3.1n BEGIN \ifx\kanjiseriesdefault\kanjiseriesdefault@kernel @@ -3459,8 +3464,8 @@ \fi % !! sync with 2020/04/13 v3.1n END }% -\fi % --- for 2020-10-01 END -\fi %</2020-02-02|2020-10-01> +\fi % --- for >= 2020-10-01 END +\fi %</2020-02-02|2020-10-01|.> % \end{macrocode} % \end{macro} % @@ -3473,14 +3478,14 @@ % $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)} +% \changes{v1.7i}{2020/10/07}{$B%U%C%/%7%9%F%`$NM-L5H=Dj$r2~NI(B} % \begin{macrocode} -\ifx\AddToHook\@undefined -\else % --- for LaTeX2e 2020-10-01 or later BEGIN +\ifnum\pltx@newhook@avail>\z@ % --- for >= 2020-10-01 BEGIN \def\code@after@pldefs{% \expandafter\def\expandafter\kanjiseriesdefault \expandafter{\kanjiseriesdefault\@empty} \let\kanjiseriesdefault@kernel\kanjiseriesdefault} -\fi % --- for LaTeX2e 2020-10-01 or later END +\fi % --- for >= 2020-10-01 END % \end{macrocode} % \end{macro} % \end{macro} diff --git a/Master/texmf-dist/source/platex/base/plvers.dtx b/Master/texmf-dist/source/platex/base/plvers.dtx index af39ab9dc09..9ee65a40041 100644 --- a/Master/texmf-dist/source/platex/base/plvers.dtx +++ b/Master/texmf-dist/source/platex/base/plvers.dtx @@ -98,12 +98,13 @@ % \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} +% \changes{v1.1x}{2020/10/07}{$B%U%C%/%7%9%F%`$,MxMQ2DG=$+$I$&$+H=Dj(B} % \fi % % \iffalse %<*driver> % \fi -\ProvidesFile{plvers.dtx}[2020/09/30 v1.1w pLaTeX Kernel (Version Info)] +\ProvidesFile{plvers.dtx}[2020/10/07 v1.1x pLaTeX Kernel (Version Info)] % \iffalse \documentclass{jltxdoc} \GetFileInfo{plvers.dtx} @@ -196,7 +197,7 @@ {2020-10-01} %</plcore|platexrelease> %<*plcore> -\def\ppatch@level{0} +\def\ppatch@level{1} %</plcore> % \end{macrocode} % \end{macro} @@ -347,6 +348,28 @@ % \changes{v1.1n}{2018/10/31}{\LaTeXe{}$B$H(Bp\LaTeXe{}$B$N99?7%?%$%_%s%0$:$lBP:v$r(B % \file{plvers.dtx} (plfinal) $B$+$i(B\file{plcore.dtx}$B$X0\F0(B} % +% \subsection{$B%U%C%/%7%9%F%`$,MxMQ2DG=$+$I$&$+(B} +% \begin{macro}{\pltx@newhook@avail} +% $B%U%)!<%^%C%H:n@.;~!J(B\file{latex.ltx}$B$NFI9~8e$9$0!K$H!"(B +% platexrelease$B%Q%C%1!<%8Fb!J(Blatexrelease$B%Q%C%1!<%8FI9~8e$9$0!K$G(B +% $B$=$l$>$lH=Dj$9$kI,MW$,$"$j$^$9!#(B +% ^^A $BK\Ev$O!V(B|\AddToHook| $B$,Dj5A:Q$_$+$I$&$+!W$r;H$$$?$$$,(B +% ^^A \begin{itemize} +% ^^A \item Format date 2020-02-02 or older: undefined +% ^^A \item Format date 2020-10-01 or newer: available +% ^^A \item ... under \texttt{latexrelease} rollback: defined but no-op +% ^^A \end{itemize} +% ^^A $B$H$$$&FC<l$J(Brollback$B$KBP=h$9$k$?$a!"(B|\fmtversion|$B$GH=Dj$9$k!#(B +% ^^A $BC1$J$k(Bif-$B%H!<%/%s$O!VFI$_Ht$P$7!W$N9MN8$,LLE]$J$N$G;H$o$J$$!#(B +% \changes{v1.1x}{2020/10/07}{$B%U%C%/%7%9%F%`$,MxMQ2DG=$+$I$&$+H=Dj(B} +% \begin{macrocode} +%<*plcore|plhookrelease> +\chardef\pltx@newhook@avail=\z@ +\@ifl@t@r\fmtversion{2020/10/01}{\chardef\pltx@newhook@avail=\@ne}{} +%</plcore|plhookrelease> +% \end{macrocode} +% \end{macro} +% % % \section{latexrelease$B%Q%C%1!<%8$X$NBP1~(B} % @@ -462,7 +485,7 @@ % \changes{v1.1v}{2020/09/28}{$B?7$7$$%U%C%/$r3hMQ(B} % \begin{macrocode} %<*plfinal> -\ifx\AddToHook\@undefined +\ifnum\pltx@newhook@avail=\z@ % for LaTeX2e 2020-02-02 PL5 or older \expandafter\def\expandafter\process@table\expandafter{% \expandafter\p@warn@latexrelease\process@table} |