From d2a6bb90e56a2836bb59477b8f27248aab9149f5 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Thu, 1 Oct 2020 03:04:13 +0000 Subject: CTAN sync 202010010304 --- language/japanese/platex/Makefile | 7 +- language/japanese/platex/README.md | 2 +- language/japanese/platex/exppl2e.pdf | Bin 143281 -> 137664 bytes language/japanese/platex/exppl2e.sty | 60 +------ language/japanese/platex/jclasses.dtx | 19 ++- language/japanese/platex/kinsoku.dtx | 8 +- language/japanese/platex/platex-en.pdf | Bin 146951 -> 147101 bytes language/japanese/platex/platex.dtx | 16 +- language/japanese/platex/platex.pdf | Bin 250767 -> 251155 bytes language/japanese/platex/platexrelease.ins | 3 +- language/japanese/platex/platexrelease.pdf | Bin 107343 -> 107347 bytes language/japanese/platex/plcore.dtx | 206 +++++++++++++++++++++-- language/japanese/platex/pldoc.pdf | Bin 836874 -> 852589 bytes language/japanese/platex/plexpl3.dtx | 125 ++++++++++++++ language/japanese/platex/plfmt.ins | 5 +- language/japanese/platex/plfonts.dtx | 258 +++++++++++++++++++++-------- language/japanese/platex/plnewsc15.tex | 126 ++++++++++++++ language/japanese/platex/plvers.dtx | 22 ++- language/japanese/ptex-base/README.md | 2 +- language/japanese/ptex-base/kinsoku.tex | 3 +- language/japanese/uplatex/Makefile | 3 +- language/japanese/uplatex/README.md | 2 +- language/japanese/uplatex/ujclasses.dtx | 20 ++- language/japanese/uplatex/ukinsoku.dtx | 8 +- language/japanese/uplatex/uplatex-en.pdf | Bin 116774 -> 113178 bytes language/japanese/uplatex/uplatex.dtx | 13 +- language/japanese/uplatex/uplatex.pdf | Bin 226444 -> 190137 bytes language/japanese/uplatex/upldoc.pdf | Bin 542292 -> 473882 bytes language/japanese/uplatex/uplvers.dtx | 4 +- language/japanese/uptex-base/README.md | 2 +- language/japanese/uptex-base/ukinsoku.tex | 3 +- 31 files changed, 738 insertions(+), 179 deletions(-) create mode 100644 language/japanese/platex/plexpl3.dtx create mode 100644 language/japanese/platex/plnewsc15.tex (limited to 'language/japanese') diff --git a/language/japanese/platex/Makefile b/language/japanese/platex/Makefile index fdabfd5d4f..e89d976fca 100644 --- a/language/japanese/platex/Makefile +++ b/language/japanese/platex/Makefile @@ -15,10 +15,10 @@ all: $(STRIPTARGET) $(PDFTARGET) 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 @@ INTRODOC_SRC = platex.dtx 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) diff --git a/language/japanese/platex/README.md b/language/japanese/platex/README.md index 8b3ea2ba2a..939337e9f2 100644 --- a/language/japanese/platex/README.md +++ b/language/japanese/platex/README.md @@ -64,6 +64,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)). ## Release Date -2020-04-12 +2020-09-30 Japanese TeX Development Community diff --git a/language/japanese/platex/exppl2e.pdf b/language/japanese/platex/exppl2e.pdf index c5bf43b742..f015c22b6e 100644 Binary files a/language/japanese/platex/exppl2e.pdf and b/language/japanese/platex/exppl2e.pdf differ diff --git a/language/japanese/platex/exppl2e.sty b/language/japanese/platex/exppl2e.sty index b5fc0cc2f3..3daa697b27 100644 --- a/language/japanese/platex/exppl2e.sty +++ b/language/japanese/platex/exppl2e.sty @@ -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@5(B} % % 2017/04/08$B$KF3F~:Q$_!#(B diff --git a/language/japanese/platex/jclasses.dtx b/language/japanese/platex/jclasses.dtx index 1ac4a591d2..d8edc5fa26 100644 --- a/language/japanese/platex/jclasses.dtx +++ b/language/japanese/platex/jclasses.dtx @@ -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} % - [2020/01/03 v1.8e + [2020/09/30 v1.8f % 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@file@percent{} \def\addcontentsline#1#2#3{% \protected@write\@auxout {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble -% \@temptokena{\rensuji{\thepage}}}% -% \@temptokena{\thepage}}% - {\string\@writefile{#1}% - {\protect\contentsline{#2}{#3}{\the\@temptokena}% +% \@temptokena{\rensuji{\thepage}}% +% \@temptokena{\thepage}% + }{\string\@writefile{#1}% + {\protect\contentsline{#2}{#3}{\the\@temptokena}{}% \protected@file@percent}}% } % \end{macrocode} diff --git a/language/japanese/platex/kinsoku.dtx b/language/japanese/platex/kinsoku.dtx index e59aa35056..6f5d1de5e3 100644 --- a/language/japanese/platex/kinsoku.dtx +++ b/language/japanese/platex/kinsoku.dtx @@ -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@_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@_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@_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 diff --git a/language/japanese/platex/platex-en.pdf b/language/japanese/platex/platex-en.pdf index 4506439d35..cabe7485d5 100644 Binary files a/language/japanese/platex/platex-en.pdf and b/language/japanese/platex/platex-en.pdf differ diff --git a/language/japanese/platex/platex.dtx b/language/japanese/platex/platex.dtx index fd595fe833..b1dd3b368a 100644 --- a/language/japanese/platex/platex.dtx +++ b/language/japanese/platex/platex.dtx @@ -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@_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$,l9g$K8B$j%l%8%9%??t$,(B65536$B8D$N$?$a!#(B} % \changes{v1.3d}{2019/10/19}{$B%3%T! \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,6 +794,70 @@ \unvbox\footins}\fi \ifvbox\@kludgeins\insert\@kludgeins{\unvbox\@kludgeins}\fi } +% +% \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@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} +%\plIncludeInRelease{2020/10/01}{\@vtryfc} +% {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}} +% +%\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 % \end{macrocode} % \end{macro} % @@ -798,6 +870,7 @@ % |\iftombow|$B$O%H%s%\$r=PNO$9$k$+$I$&$+!"(B|\iftombowdate|$B$O(BDVI$B$r:n@.$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@_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 @@ %\plEndIncludeInRelease %<*plcore> % \end{macrocode} -% \end{macro} +% \end{macro} % -% \begin{macro}{\@shipoutsetup} +% +% \subsection{$B=PNO%k!<%A%s(B} +% $B$3$3$Gl9g!'(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,40 +1526,137 @@ % |\@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} % -%\plIncludeInRelease{2019/10/01}{\AtBeginDvi} -% {Make robust}% +%\plIncludeInRelease{2020/10/01}{\AtBeginDvi} +% {Adapt to new shipout code}% %<*plcore|platexrelease> +\chardef\pltx@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@AtBeginDvi@untouched\@ne +%\DeclareRobustCommand \AtBeginDvi +% {\__shipout_add_firstpage_material:Nn \AtBeginDvi} +\fi: +\ExplSyntaxOff +\fi %--- expl3 available END +% for LaTeX2e 2020-02-02 PL5 or older +\ifnum\pltx@AtBeginDvi@untouched>\z@\else \DeclareRobustCommand \AtBeginDvi [1]{% \global \setbox \@begindvibox - \vbox{\yoko \unvbox \@begindvibox #1}% -} + \vbox{\yoko \unvbox \@begindvibox #1}}% +\fi +% done +\let\pltx@AtBeginDvi@untouched\@undefined % %\plEndIncludeInRelease +%\plIncludeInRelease{2019/10/01}{\AtBeginDvi} +% {Make robust}% +%\DeclareRobustCommand \AtBeginDvi [1]{% +% \global \setbox \@begindvibox +% \vbox{\yoko \unvbox \@begindvibox #1}} +%\plEndIncludeInRelease %\plIncludeInRelease{2016/07/01}{\AtBeginDvi} % {Fix for incompatible direction}% %\def \AtBeginDvi #1{% % \global \setbox \@begindvibox -% \vbox{\yoko \unvbox \@begindvibox #1}% -%} +% \vbox{\yoko \unvbox \@begindvibox #1}} %\expandafter \let \csname AtBeginDvi \endcsname \@undefined %\plEndIncludeInRelease %\plIncludeInRelease{0000/00/00}{\AtBeginDvi} % {LaTeX2e original}% %\def \AtBeginDvi #1{% % \global \setbox \@begindvibox -% \vbox{\unvbox \@begindvibox #1}% -%} +% \vbox{\unvbox \@begindvibox #1}} %\expandafter \let \csname AtBeginDvi \endcsname \@undefined %\plEndIncludeInRelease %<*plcore> % \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|$Bl9g$O(B|\__shipout_execute_cont:|$B$r2#AH%\%C%/%9(B\\ +% |\l__platex_shipout_dummy_box|$B$G3g$C$Fl9g$O;vA0$K2#AH2=$9$k!#(B +% \end{itemize} +% $BCm0U!'>e5-"($N%b!<%I$GMh$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 +%\plIncludeInRelease{2020/10/01}{\__shipout_execute_cont:} +% {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 +% +%\plEndIncludeInRelease +%\plIncludeInRelease{0000/00/00}{\__shipout_execute_cont:} +% {LaTeX2e original}% +%% do nothing +%\plEndIncludeInRelease +%<*plcore> +% \end{macrocode} +% \end{macro} +% % % \subsection{$B5SCm%^%/%m(B} % $B5SCm$rAH$_N)$F$kItJ,$N%^%/%m$r:FDj5A$7$^$9!#(B diff --git a/language/japanese/platex/pldoc.pdf b/language/japanese/platex/pldoc.pdf index c4041d1bfb..db9bc1fc32 100644 Binary files a/language/japanese/platex/pldoc.pdf and b/language/japanese/platex/pldoc.pdf differ diff --git a/language/japanese/platex/plexpl3.dtx b/language/japanese/platex/plexpl3.dtx new file mode 100644 index 0000000000..e023cd3303 --- /dev/null +++ b/language/japanese/platex/plexpl3.dtx @@ -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@.F|!'(B\filedate} +\begin{document} + \newcommand\Lpack[1]{\textsf{#1}} + \maketitle + \DocInput{\filename} +\end{document} +% +% \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@_$7$^$7$?!#(B +% +% \setcounter{StandardModuleDepth}{1} +% \StopEventually{} +% +% \section{$B%3!<%I(B} +% +% $B%Q%C%1!<%8$H$7$F@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~ +\NeedsTeXFormat{pLaTeX2e} +\RequirePackage{expl3} +\ProvidesExplPackage{plexpl3}{2020-09-28}{1.0} + {pTeX/upTeX-specific additions to expl3} +% +% \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\ifdefined\ExplSyntaxOn %--- expl3 available BEGIN +%\ExplSyntaxOn +%<*plcore|package> +\input plexpl3.ltx +% +%\ExplSyntaxOff +%\fi %--- expl3 available END +% \end{macrocode} +% +% \file{platexrelease}$B$N(Broll-forward$B$K$bEPO?$7$^$9!#(B +% \begin{macrocode} +%\plIncludeInRelease{2020/10/01}% +% {plexpl3}{Pre-load plexpl3}% +%\RequirePackage{plexpl3} +%\plEndIncludeInRelease +%\plIncludeInRelease{0000/00/00}% +% {plexpl3}{Not loading plexpl3}% +%% Nothing to do +%\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} +% +% \end{macrocode} +% +% \Finale +% +\endinput diff --git a/language/japanese/platex/plfmt.ins b/language/japanese/platex/plfmt.ins index bd64099ef5..0d23101cba 100644 --- a/language/japanese/platex/plfmt.ins +++ b/language/japanese/platex/plfmt.ins @@ -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 @@ This file is part of the pLaTeX2e system (community edition). \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 @@ This file is part of the pLaTeX2e system (community edition). \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 diff --git a/language/japanese/platex/plfonts.dtx b/language/japanese/platex/plfonts.dtx index 12efc700e8..e68de15a59 100644 --- a/language/japanese/platex/plfonts.dtx +++ b/language/japanese/platex/plfonts.dtx @@ -160,13 +160,19 @@ % \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 %<*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} %\plIncludeInRelease{2020/04/12}{\normalfont} % {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@series{\kanjiseriesdefault}% \edef\k@shape{\kanjishapedefault}% } -\fi +\fi % done +\else % --- for 2020-02-02 or older END & for 2020-10-01 BEGIN +%\DeclareRobustCommand\normalfont{% +% \fontencoding\encodingdefault +% \edef\f@family{\familydefault}% +% \edef\f@series{\seriesdefault}% +% \edef\f@shape{\shapedefault}% +% \UseHook{normalfont}% +% \@defaultfamilyhook % hookname from 2020/02 will vanish +% \selectfont} +\AddToHook{normalfont}{% + \kanjiencoding{\kanjiencodingdefault}% + \edef\k@family{\kanjifamilydefault}% + \edef\k@series{\kanjiseriesdefault}% + \edef\k@shape{\kanjishapedefault}% +} +\fi % --- for 2020-10-01 END \adjustbaseline \let\reset@font\normalfont % @@ -3071,7 +3098,7 @@ % % \begin{macro}{\expand@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@font@defaults{% @@ -3080,71 +3107,93 @@ % \edef\ttdef@ult{\ttdefault}% % \series@maybe@drop@one@m\bfdefault\bfdef@ult % !! changed 2020/02/25 v3.1j % \series@maybe@drop@one@m\mddefault\mddef@ult % !! changed 2020/02/25 v3.1j -% \edef\famdef@ult{\familydefault}% -% \@expandfontdefaultshook % !! added 2020/04/06 v3.1m +% %\edef\famdef@ult{\familydefault}% !! deleted 2020/04/13 v3.1n +% %\@expandfontdefaultshook % !! only in 2020/04/06 v3.1m +% \UseHook{expand@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@addto@macro| $B$GKvHxDI2C$GLdBj$J$$!#(B -% \begin{macrocode} -\ifx\expand@font@defaults\@undefined\else % 2020-02-02 +% \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@font@defaults|$B$*$h$S(B +% |\init@series@setup|$B$X$NDI2CFbMF$,JQ$o$j$^$9!#(B +% ^^A $B=>Mh$O(B |\init@series@setup| $B$+$i8F$S=P$5$l$k(B +% ^^A |\expand@font@defaults| $B$,(B |\famdef@ult| $B$r@_Dj$7$F$$$?!#(B +% ^^A $B?7HG$O(B |\init@series@setup| $B$+$i$b$O$d(B +% ^^A |\expand@font@defaults| $B$O8F$S=P$5$:!"Be$o$j$K(B +% ^^A |\init@series@setup| $B$G0lEY(B |\reset@font| $B$r +\ifx\AddToHook\@undefined % --- for 2020-02-02 BEGIN \g@addto@macro\expand@font@defaults{% \edef\mcdef@ult{\mcdefault}% \edef\gtdef@ult{\gtdefault}% \edef\kanjidef@ult{\kanjifamilydefault}% } -\fi +\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 % % \end{macrocode} -% % \end{macro} % % \begin{macro}{\bfseries} % \begin{macro}{\mdseries} % $B%U%!%_%j$4$H$N@_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@math@alphabet\bfseries\mathbf % \expand@font@defaults -% \ifx\bfdefault\bfdefault@previous\else +% \ifx\bfdefault\bfdefault@previous\else % new in 2020/03/19 v3.1k % \expandafter\def\expandafter\bfdefault % \expandafter{\bfdefault\@empty}% -% \let\bfseries@previous\bfdefault +% \let\bfdefault@previous\bfdefault % bugfix in 2020/09/30 v3.2d % \let\bfseries@rm\bfdef@ult % \let\bfseries@sf\bfdef@ult % \let\bfseries@tt\bfdef@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@family\rmdef@ult \fontseries\bfseries@rm % \else\ifx\f@family\sfdef@ult \fontseries\bfseries@sf % \else\ifx\f@family\ttdef@ult \fontseries\bfseries@tt % \else \fontseries\bfdefault % \fi\fi\fi +% \UseHook{bfseries}% !! new in 2020/08/21 v3.2b % \selectfont %} %\DeclareRobustCommand\mdseries{% % \not@math@alphabet\mdseries\relax % \expand@font@defaults -% \ifx\mddefault\mddefault@previous\else +% \ifx\mddefault\mddefault@previous\else % new in 2020/03/19 v3.1k % \expandafter\def\expandafter\mddefault % \expandafter{\mddefault\@empty}% -% \let\mdseries@previous\mddefault +% \let\mddefault@previous\mddefault % bugfix in 2020/09/30 v3.2d % \let\mdseries@rm\mddef@ult % \let\mdseries@sf\mddef@ult % \let\mdseries@tt\mddef@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@family\rmdef@ult \fontseries\mdseries@rm % \else\ifx\f@family\sfdef@ult \fontseries\mdseries@sf % \else\ifx\f@family\ttdef@ult \fontseries\mdseries@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@rm\@undefined % old -\let\pltx@fontseries@saved\@undefined -\let\pltx@patch@bfseries\@undefined -\let\pltx@patch@mdseries\@undefined -\else % 2020-02-02 -\let\pltx@fontseries@saved\fontseries -\def\pltx@patch@bfseries\not@math@alphabet#1#2#3\selectfont{% - \long\expandafter\def\csname bfseries \endcsname{% - \not@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@fontseries@saved % recover +\ifx\bfseries@rm\@undefined\else %<*2020-02-02|2020-10-01> +\ifx\AddToHook\@undefined % --- for 2020-02-02 BEGIN +\DeclareRobustCommand\bfseries{% + \not@math@alphabet\bfseries\mathbf + \expand@font@defaults + % changed \fontseries -> \romanseries + \ifx\f@family\rmdef@ult \romanseries\bfseries@rm + \else\ifx\f@family\sfdef@ult \romanseries\bfseries@sf + \else\ifx\f@family\ttdef@ult \romanseries\bfseries@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@family\mcdef@ult \kanjiseries\bfseries@mc \else\ifx\k@family\gtdef@ult \kanjiseries\bfseries@gt \else \kanjiseries\bfdefault \fi\fi +% \end{macrocode} +% $B$3$3$^$G!#(B +% \begin{macrocode} \selectfont - }% -} -\ifx\@setbfseriesdefaultshook\@undefined\else -\g@addto@macro\@setbfseriesdefaultshook{% - \let\bfseries@mc\bfdef@ult - \let\bfseries@gt\bfdef@ult } -\fi -\expandafter\expandafter\expandafter - \pltx@patch@bfseries\csname bfseries \endcsname -\def\pltx@patch@mdseries\not@math@alphabet#1#2#3\selectfont{% - \long\expandafter\def\csname mdseries \endcsname{% - \not@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@fontseries@saved % recover +\DeclareRobustCommand\mdseries{% + \not@math@alphabet\mdseries\relax + \expand@font@defaults + % changed \fontseries -> \romanseries + \ifx\f@family\rmdef@ult \romanseries\mdseries@rm + \else\ifx\f@family\sfdef@ult \romanseries\mdseries@sf + \else\ifx\f@family\ttdef@ult \romanseries\mdseries@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@family\mcdef@ult \kanjiseries\mdseries@mc \else\ifx\k@family\gtdef@ult \kanjiseries\mdseries@gt \else \kanjiseries\mddefault \fi\fi +% \end{macrocode} +% $B$3$3$^$G!#(B +% \begin{macrocode} \selectfont - }% } -\ifx\@setmdseriesdefaultshook\@undefined\else -\g@addto@macro\@setmdseriesdefaultshook{% +% \end{macrocode} +% $B \kanjiseries + \ifx\k@family\mcdef@ult \kanjiseries\bfseries@mc + \else\ifx\k@family\gtdef@ult \kanjiseries\bfseries@gt + \else \kanjiseries\bfdefault + \fi\fi +} +\AddToHook{mdseries/defaults}{% \let\mdseries@mc\mddef@ult \let\mdseries@gt\mddef@ult } -\fi -\expandafter\expandafter\expandafter - \pltx@patch@mdseries\csname mdseries \endcsname -\fi +\AddToHook{mdseries}{% + % changed \fontseries -> \kanjiseries + \ifx\k@family\mcdef@ult \kanjiseries\mdseries@mc + \else\ifx\k@family\gtdef@ult \kanjiseries\mdseries@gt + \else \kanjiseries\mddefault + \fi\fi +} +\fi % --- for 2020-10-01 END +\fi % % \end{macrocode} % \end{macro} % \end{macro} @@ -3333,23 +3403,32 @@ % % \begin{macro}{\init@series@setup} % |\begin{document}|$B$G +\ifx\AddToHook\@undefined % --- 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 }% -\fi +\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 + \mdseries + \let\kanjiseriesdefault\k@series + \fi + % !! sync with 2020/04/13 v3.1n END +}% +\fi % --- for 2020-10-01 END +\fi % +% \end{macrocode} +% \end{macro} +% +% +% \begin{macro}{\kanjiseriesdefault} +% \begin{macro}{\kanjiseriesdefault@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@after@pldefs{% +\expandafter\def\expandafter\kanjiseriesdefault + \expandafter{\kanjiseriesdefault\@empty} +\let\kanjiseriesdefault@kernel\kanjiseriesdefault} +\fi % --- for LaTeX2e 2020-10-01 or later END % \end{macrocode} % \end{macro} +% \end{macro} % % % \begin{macro}{\mcfamily} @@ -3593,14 +3707,16 @@ % $BJ8=q$N@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@table\process@table \def\kanjiprocess@table{% - \kanjiencoding{\kanjiencodingdefault}% - \kanjifamily{\kanjifamilydefault}% - \kanjiseries{\kanjiseriesdefault}% - \kanjishape{\kanjishapedefault}% + \kanjiencoding\kanjiencodingdefault + \edef\k@family{\kanjifamilydefault}% + \edef\k@series{\kanjiseriesdefault}% + \edef\k@shape{\kanjishapedefault}% } \def\process@table{% \romanprocess@table diff --git a/language/japanese/platex/plnewsc15.tex b/language/japanese/platex/plnewsc15.tex new file mode 100644 index 0000000000..9a8d3954af --- /dev/null +++ b/language/japanese/platex/plnewsc15.tex @@ -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 +$Be$NET9g$K$h$j!"=DAH%/%i%9$G$O(B +$B!V(B|\AtBeginShipout|$B$NCf?H$,30It?bD>%b!<%I$G}$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@D+$N%G%U%)%k%H!aL@D+$NCf;z(B + \documentclass{article} + % roman-medium-default -> roman-bold + % $BL@D+$NCf;z$N%G%U%)%k%H"*L@D+$NB@;z$X(B + % $B"(L@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@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@D+$N%G%U%)%k%H$OB@;z$K$J$C$?$+!)(B + + \mdseries + roman-medium is bold + $BL@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}$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@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@_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} diff --git a/language/japanese/platex/plvers.dtx b/language/japanese/platex/plvers.dtx index e85d8dca5d..af39ab9dc0 100644 --- a/language/japanese/platex/plvers.dtx +++ b/language/japanese/platex/plvers.dtx @@ -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 @@ %\edef\latexreleaseversion %\edef\p@known@latexreleaseversion %<*2ekernel|latexrelease|platexrelease> - {2020-02-02} + {2020-10-01} % % \end{macrocode} % @@ -190,7 +193,7 @@ % %\edef\platexreleaseversion %<*plcore|platexrelease> - {2020-04-12} + {2020-10-01} % %<*plcore> \def\ppatch@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%/$Ne=q$-$5$l$F$$$k$O$:$G$"$j!"(B|\kanjiprocess@table|$B$O(B % ^^A $B +\ifx\AddToHook\@undefined +% for LaTeX2e 2020-02-02 PL5 or older \expandafter\def\expandafter\process@table\expandafter{% \expandafter\p@warn@latexrelease\process@table} \begingroup \toks@\expandafter{\expandafter\p@warn@latexrelease\@begindocumenthook} \xdef\@begindocumenthook{\the\toks@} \endgroup +\else +% for LaTeX2e 2020-10-01 or later +\AddToHook{begindocument/before}{\p@warn@latexrelease} +\fi +% \def\p@warn@latexrelease{% \ifx\latexreleaseversion\@undefined\else \ifx\platexreleaseversion\@undefined diff --git a/language/japanese/ptex-base/README.md b/language/japanese/ptex-base/README.md index 3959a51083..393284f8b7 100644 --- a/language/japanese/ptex-base/README.md +++ b/language/japanese/ptex-base/README.md @@ -25,6 +25,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)). ## Release Date -2020-03-07 +2020-09-30 Japanese TeX Development Community diff --git a/language/japanese/ptex-base/kinsoku.tex b/language/japanese/ptex-base/kinsoku.tex index 2a8bbf3a3f..e056e34da9 100644 --- a/language/japanese/ptex-base/kinsoku.tex +++ b/language/japanese/ptex-base/kinsoku.tex @@ -1,4 +1,4 @@ -% (Last update: 2017/08/05 texjporg) +% (Last update: 2020/09/28 texjporg) % % $B9TF,!"9TKv6XB'%Q%i%a!<%?(B % @@ -243,6 +243,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 diff --git a/language/japanese/uplatex/Makefile b/language/japanese/uplatex/Makefile index 92d1388fa4..308634974c 100644 --- a/language/japanese/uplatex/Makefile +++ b/language/japanese/uplatex/Makefile @@ -4,7 +4,8 @@ DOCTARGET = uplatex upldoc \ PDFTARGET = $(addsuffix .pdf,$(DOCTARGET)) DVITARGET = $(addsuffix .dvi,$(DOCTARGET)) KANJI = -kanji=utf8 -FONTMAP = -f ipaex.map -f uptex-ipaex.map +#FONTMAP = -f ipaex.map -f uptex-ipaex.map +FONTMAP = -f haranoaji.map -f uptex-haranoaji.map TEXMF = $(shell kpsewhich -var-value=TEXMFHOME) default: $(STRIPTARGET) $(DVITARGET) diff --git a/language/japanese/uplatex/README.md b/language/japanese/uplatex/README.md index c7d913897a..5ddabeef57 100644 --- a/language/japanese/uplatex/README.md +++ b/language/japanese/uplatex/README.md @@ -20,6 +20,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)). ## Release Date -2020-02-02 +2020-09-30 Japanese TeX Development Community diff --git a/language/japanese/uplatex/ujclasses.dtx b/language/japanese/uplatex/ujclasses.dtx index 1cc6c91c99..08881f00b7 100644 --- a/language/japanese/uplatex/ujclasses.dtx +++ b/language/japanese/uplatex/ujclasses.dtx @@ -122,6 +122,10 @@ % \changes{v1.8e}{2020/01/03}{Normalize label fonts % (sync with classes.dtx 2019/12/20 v1.4l)} % \changes{v1.8e-u00}{2020/01/03}{p\LaTeX{}用に追随} +% \changes{v1.8f}{2020/09/30}{add a fourth argument for better +% hyperref compability +% (sync with ltsect.dtx 2020/07/27 v1.1e)} +% \changes{v1.8f-u00}{2020/09/30}{p\LaTeX{}用に追随} % \fi % % \iffalse @@ -151,7 +155,7 @@ %<11pt&bk>\ProvidesFile{utbk11.clo} %<12pt&bk>\ProvidesFile{utbk12.clo} % - [2020/01/03 v1.8e-u00 + [2020/09/30 v1.8f-u00 % Standard upLaTeX class] %<10pt|11pt|12pt> Standard upLaTeX file (size option)] %<*driver> @@ -4015,21 +4019,23 @@ % % \begin{macro}{\addcontentsline} % 縦組の場合にページ番号を|\rensuji|で囲むように変更します。 -% ^^A 横組のときにも`|\rensuji|'コマンドが出力されますが、 -% ^^A このコマンドによる影響はありません。 % % このマクロは\file{ltsect.dtx}で定義されています。 +% ^^A 命令 |\addcontentsline| と |\addtocontents| を組み合わせ % \changes{v1.8a}{2018/10/25}{ファイル書き出し時の行末文字対策 % (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@file@percent{} \def\addcontentsline#1#2#3{% \protected@write\@auxout {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble -% \@temptokena{\rensuji{\thepage}}}% -% \@temptokena{\thepage}}% - {\string\@writefile{#1}% - {\protect\contentsline{#2}{#3}{\the\@temptokena}% +% \@temptokena{\rensuji{\thepage}}% +% \@temptokena{\thepage}% + }{\string\@writefile{#1}% + {\protect\contentsline{#2}{#3}{\the\@temptokena}{}% \protected@file@percent}}% } % \end{macrocode} diff --git a/language/japanese/uplatex/ukinsoku.dtx b/language/japanese/uplatex/ukinsoku.dtx index a68ae8b0a7..70ce9c1280 100644 --- a/language/japanese/uplatex/ukinsoku.dtx +++ b/language/japanese/uplatex/ukinsoku.dtx @@ -7,7 +7,7 @@ % % Copyright (c) 2010 ASCII MEDIA WORKS % Copyright (c) 2016 Takuji Tanaka -% Copyright (c) 2016-2019 Japanese TeX Development Community +% Copyright (c) 2016-2020 Japanese TeX Development Community % % This file is part of the upLaTeX2e system (community edition). % -------------------------------------------------------------- @@ -32,13 +32,15 @@ % \changes{v1.0b-u04}{2019/01/29}{内部Unicode化されていることを確認} % \changes{v1.0b-u05}{2019/05/19}{up\TeX~v1.24の\cs{kcatcode}の既定値のバグ回避} % \changes{v1.0b-u06}{2019/09/22}{バグ回避コードがかえって有害なため除去} +% \changes{v1.0c}{2020/09/28}{!の\cs{inhibitxspcode}を設定} +% \changes{v1.0c-u06}{2020/09/28}{p\LaTeX{}の変更に追随} % \fi % % \iffalse %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{ukinsoku.dtx}[2019/09/22 v1.0b-u06 upLaTeX Kernel] +\ProvidesFile{ukinsoku.dtx}[2020/09/28 v1.0c-u06 upLaTeX Kernel] % \iffalse \documentclass{jltxdoc} \GetFileInfo{ukinsoku.dtx} @@ -484,6 +486,7 @@ % \end{tabular} % \end{center} % +% \changes{v1.0c}{2020/09/28}{!の\cs{inhibitxspcode}を設定} % \begin{macrocode} %% %% inhibitxspcode @@ -493,6 +496,7 @@ \inhibitxspcode`.=1 \inhibitxspcode`;=1 \inhibitxspcode`?=1 +\inhibitxspcode`!=1 \inhibitxspcode`)=1 \inhibitxspcode`(=2 \inhibitxspcode`]=1 diff --git a/language/japanese/uplatex/uplatex-en.pdf b/language/japanese/uplatex/uplatex-en.pdf index 78b74c10ca..4116f332f0 100644 Binary files a/language/japanese/uplatex/uplatex-en.pdf and b/language/japanese/uplatex/uplatex-en.pdf differ diff --git a/language/japanese/uplatex/uplatex.dtx b/language/japanese/uplatex/uplatex.dtx index 37783982d8..7f014b8b38 100644 --- a/language/japanese/uplatex/uplatex.dtx +++ b/language/japanese/uplatex/uplatex.dtx @@ -7,7 +7,7 @@ % % Copyright (c) 2010 ASCII MEDIA WORKS % Copyright (c) 2016 Takuji Tanaka -% Copyright (c) 2016-2019 Japanese TeX Development Community +% Copyright (c) 2016-2020 Japanese TeX Development Community % % This file is part of the upLaTeX2e system (community edition). % -------------------------------------------------------------- @@ -91,6 +91,7 @@ % \changes{v1.0y-u02}{2018/09/22}{最終更新日を\file{upldoc.pdf}に表示 % (based on platex.dtx 2018/09/22 v1.0y)} % \changes{v1.0y-u03}{2019/05/22}{ドキュメントを更新} +% \changes{v1.1b-u03}{2020/09/28}{defs読込後にフック追加} %\else % \changes{v1.0c-u00}{2011/05/07}{Created \upLaTeX\ version based on \pLaTeX\ one % (based on platex.dtx 1997/01/29 v1.0c)} @@ -130,6 +131,7 @@ % \changes{v1.0y-u02}{2018/09/22}{Show last update info on \file{upldoc.pdf} % (based on platex.dtx 2018/09/22 v1.0y)} % \changes{v1.0y-u03}{2019/05/22}{Update document.} +% \changes{v1.1b-u03}{2020/09/28}{Add hook after loading defs} %\fi % \fi % @@ -137,7 +139,7 @@ %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{uplatex.dtx}[2019/05/22 v1.0y-u03 upLaTeX document file] +\ProvidesFile{uplatex.dtx}[2020/09/28 v1.1b-u03 upLaTeX document file] % \iffalse \documentclass{jltxdoc} \usepackage{plext} @@ -466,16 +468,20 @@ % \TeX{}の入力ファイル検索パスに設定されている % ディレクトリに\file{upldefs.cfg}ファイルがある場合は、 % そのファイルを使います。 +% 読み込み後にコードが実行されるかもしれません。 % \changes{v1.0s-u01}{2017/12/05}{デフォルト設定ファイルの読み込みを % \file{uplcore.ltx}から\file{uplatex.ltx}へ移動 % (based on platex.dtx 2017/12/05 v1.0s)} +% \changes{v1.1b-u03}{2020/09/28}{defs読込後にフック追加} %\else % Load font-related default settings, \file{upldefs.ltx}. % If a file \file{upldefs.cfg} is found, then that file will be % used instead. +% Some code may be executed after loading. % \changes{v1.0s-u01}{2017/12/05}{Moved loading default settings % from \file{uplcore.ltx} to \file{uplatex.ltx} % (based on platex.dtx 2017/12/05 v1.0s)} +% \changes{v1.1b-u03}{2020/09/28}{Add hook after loading defs} %\fi % \begin{macrocode} \InputIfFileExists{upldefs.cfg} @@ -483,6 +489,7 @@ * Local config file upldefs.cfg used^^J% *************************************}}% {\input{upldefs.ltx}} +\ifx\code@after@pldefs\@undefined\else \code@after@pldefs \fi % \end{macrocode} % %\ifJAPANESE @@ -752,7 +759,7 @@ % current \upLaTeXe\ and older versions or original \pLaTeXe/\LaTeXe. % % \subsection{Compatibility with \pLaTeXe/\LaTeXe} -% \upLaTeXe\ is in most part upper compatible with \pLaTeXe, +% \upLaTeXe\ is in most part upward compatible with \pLaTeXe, % so you can move from \pLaTeXe\ to \upLaTeXe\ by simply replacing % the document class and some macros. However, the default Japanese % font metrics in \upLaTeXe\ is different from those in \pLaTeXe; diff --git a/language/japanese/uplatex/uplatex.pdf b/language/japanese/uplatex/uplatex.pdf index 9bebcac7e5..babf5d2202 100644 Binary files a/language/japanese/uplatex/uplatex.pdf and b/language/japanese/uplatex/uplatex.pdf differ diff --git a/language/japanese/uplatex/upldoc.pdf b/language/japanese/uplatex/upldoc.pdf index 9e1372c8ae..9d719a52f3 100644 Binary files a/language/japanese/uplatex/upldoc.pdf and b/language/japanese/uplatex/upldoc.pdf differ diff --git a/language/japanese/uplatex/uplvers.dtx b/language/japanese/uplatex/uplvers.dtx index 09078835be..d811788b13 100644 --- a/language/japanese/uplatex/uplvers.dtx +++ b/language/japanese/uplatex/uplvers.dtx @@ -130,11 +130,11 @@ % \begin{macro}{\ppatch@level} % up\LaTeXe{}のフォーマットファイル名とバージョンです。 % フォーマット名はp\LaTeXe{}のもの (\pfmtname) をそのまま引き継ぎ、 -% バージョンはp\LaTeXe{}のものの末尾に``u03''のようにサフィックスを付けます。 +% バージョンはp\LaTeXe{}のものの末尾に``u04''のようにサフィックスを付けます。 % \begin{macrocode} %<*plcore> %\def\pfmtname{pLaTeX2e} -\def\uppatch@level{u03} +\def\uppatch@level{u04} \edef\pfmtversion{\pfmtversion\uppatch@level} % % \end{macrocode} diff --git a/language/japanese/uptex-base/README.md b/language/japanese/uptex-base/README.md index b8168c0a58..076b69dcb9 100644 --- a/language/japanese/uptex-base/README.md +++ b/language/japanese/uptex-base/README.md @@ -17,6 +17,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)). ## Release Date -2020-02-29 +2020-09-30 Japanese TeX Development Community diff --git a/language/japanese/uptex-base/ukinsoku.tex b/language/japanese/uptex-base/ukinsoku.tex index 580789fdba..77dab250b3 100644 --- a/language/japanese/uptex-base/ukinsoku.tex +++ b/language/japanese/uptex-base/ukinsoku.tex @@ -1,4 +1,4 @@ -%% (Last update: 2019/09/22 ttk, texjporg) +%% (Last update: 2020/09/28 ttk, texjporg) %% \ifnum\ucs"3000="3000 \else \errhelp{Please try to run (e)uptex with option @@ -325,6 +325,7 @@ \inhibitxspcode`.=1 \inhibitxspcode`;=1 \inhibitxspcode`?=1 +\inhibitxspcode`!=1 \inhibitxspcode`)=1 \inhibitxspcode`(=2 \inhibitxspcode`]=1 -- cgit v1.2.3