From 8123464ce27bdf9b1fde8215b58398b26c1498a1 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 13 Feb 2021 22:17:20 +0000 Subject: platex (13feb21) git-svn-id: svn://tug.org/texlive/trunk@57730 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/platex/base/platexrelease.dtx | 23 +- Master/texmf-dist/source/platex/base/plfonts.dtx | 307 ++++++++++++++++++++- Master/texmf-dist/source/platex/base/plvers.dtx | 2 +- 3 files changed, 314 insertions(+), 18 deletions(-) (limited to 'Master/texmf-dist/source/platex') diff --git a/Master/texmf-dist/source/platex/base/platexrelease.dtx b/Master/texmf-dist/source/platex/base/platexrelease.dtx index e76a387e2e8..842217c07cc 100644 --- a/Master/texmf-dist/source/platex/base/platexrelease.dtx +++ b/Master/texmf-dist/source/platex/base/platexrelease.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment %% File: platexrelease.dtx % -% Copyright (c) 2016-2020 Japanese TeX Development Community +% Copyright (c) 2016-2021 Japanese TeX Development Community % % This file is part of the pLaTeX2e system (community edition). % ------------------------------------------------------------- @@ -28,10 +28,12 @@ % (sync with latexrelease.dtx 2017/12/17 v1.0i)} % \changes{v1.0l}{2018/04/06}{Drop an extra period in warning message % (sync with latexrelease.dtx 2018/02/18 v1.0j)} -% \changes{v1.0m}{2018/05/22}{reset \cs{\requestedLaTeXdate} for +% \changes{v1.0m}{2018/05/22}{reset \cs{requestedpLaTeXdate} for % current and latest options % (sync with latexrelease.dtx 2018/05/08 v1.0k)} % \changes{v1.0n}{2020/03/28}{先にlatexreleaseが読み込まれていたら警告} +% \changes{v1.0o}{2021/02/13}{\cs{sourcepLaTeXdate} added +% (sync with latexrelease.dtx 2021/01/23 v1.0l)} % \fi % % \iffalse @@ -41,7 +43,7 @@ \ProvidesFile{platexrelease.dtx} % %\ProvidesPackage{platexrelease} - [2020/03/28 v1.0n latexrelease support for pLaTeX Kernel + [2021/02/13 v1.0o latexrelease support for pLaTeX Kernel (including releases up to \platexreleaseversion)] %<*driver> \documentclass{jltxdoc} @@ -200,7 +202,7 @@ % \section{コード} % % \Lpack{platexrelease}パッケージが読み込まれましたので、 -% 効率化のため|\begin{document|での確認コードを無効化します。 +% 効率化のため|\begin{document}|での確認コードを無効化します。 % (\file{plvers.dtx}の2020/03/28 v1.1u以降)。 % \begin{macrocode} %<*platexrelease> @@ -233,9 +235,19 @@ \fi % \end{macrocode} % +% \begin{macro}{\sourcepLaTeXdate} +% 元々のフォーマットの日付を保存します。 +% \changes{v1.0o}{2021/02/13}{\cs{sourcepLaTeXdate} added +% (sync with latexrelease.dtx 2021/01/23 v1.0l)} +% \begin{macrocode} +\edef\sourcepLaTeXdate{% + \expandafter\@parse@version\pfmtversion//00\@nil} +% \end{macrocode} +% \end{macro} +% % \Lpack{platexrelease}パッケージのオプションを定義します。コードは % \Lpack{latexrelease}のものをp\LaTeXe{}用に書き換えたものです。 -% \changes{v1.0m}{2018/05/22}{reset \cs{\requestedLaTeXdate} for +% \changes{v1.0m}{2018/05/22}{reset \cs{requestedpLaTeXdate} for % current and latest options % (sync with latexrelease.dtx 2018/05/08 v1.0k)} % \begin{macrocode} @@ -339,6 +351,7 @@ of this package available from CTAN} some critical bugs. We advise you to\MessageBreak select another format date} \plIncludeInRelease{2017/10/28}{\PackageWarning}{pLaTeX Info}% + % * <2020-10-01>+2 (prepare for LaTeX2e <2021-05-01>) % * <2020-10-01>+1 % * <2020-10-01> % * <2020-04-12> diff --git a/Master/texmf-dist/source/platex/base/plfonts.dtx b/Master/texmf-dist/source/platex/base/plfonts.dtx index 2ccf9c3790b..9eae7852a17 100644 --- a/Master/texmf-dist/source/platex/base/plfonts.dtx +++ b/Master/texmf-dist/source/platex/base/plfonts.dtx @@ -3,7 +3,7 @@ % % Copyright 1994-2006 ASCII Corporation. % Copyright (c) 2010 ASCII MEDIA WORKS -% Copyright (c) 2016-2020 Japanese TeX Development Community +% Copyright (c) 2016-2021 Japanese TeX Development Community % % This file is part of the pLaTeX2e system (community edition). % ------------------------------------------------------------- @@ -167,13 +167,21 @@ % \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}{フックシステムの有無判定を改良} +% \changes{v1.7j}{2020/12/29}{Drop ``m'' for latex2e issue 453 +% (sync with ltfssbas.dtx 2020/12/10 v3.2h)} +% \changes{v1.7k}{2021/01/10}{Distangle series and shape update (latex2e/444) +% (sync with ltfssaxes.dtx 2020/12/22 v1.0h)} +% \changes{v1.7k}{2021/01/10}{Execute delayed series and shape updates (latex2e/444) +% (sync with ltfsstrc.dtx 2020/12/22 v3.0n)} +% \changes{v1.7k}{2021/01/10}{Adjust start values for series and shape (latex2e/444) +% (sync with ltfssini.dtx 2020/12/06 v3.2f)} % \fi % % \iffalse %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{plfonts.dtx}[2020/10/07 v1.7i pLaTeX New Font Selection Scheme] +\ProvidesFile{plfonts.dtx}[2021/01/10 v1.7k pLaTeX New Font Selection Scheme] % \iffalse \documentclass{jltxdoc} \GetFileInfo{plfonts.dtx} @@ -306,7 +314,7 @@ %<*trace> \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{ptrace} - [2020/03/26 v1.7e Standard pLaTeX package (font tracing)] + [2021/01/10 v1.7k Standard pLaTeX package (font tracing)] \RequirePackageWithOptions{tracefnt} % % \end{macrocode} @@ -1779,7 +1787,7 @@ % % \subsubsection{フォントの選択} % \begin{macro}{\selectfont} -% |\selectfont|のオリジナルからの変更部分は、次の3点です。 +% |\selectfont|のオリジナルからの変更部分は、次の3点です。 % \begin{itemize} % \item 和文書体を変更する部分 % \item 従属書体に変更する部分 @@ -1790,13 +1798,121 @@ % \changes{v1.2}{1995/11/22}{エラーフォントに対応した} % \changes{v1.3n}{2004/08/10}{和文エンコーディングの切り替えを有効化} % \changes{v1.7e}{2020/03/26}{縦横エンコーディングのセット化確認} -% |\selectfont|コマンドは、まず、和文フォントを切り替えます。 % \begin{macrocode} % %\plIncludeInRelease{2020/04/12}{\selectfont} % {Check \KanjiEncodingPair}% %<*plcore|platexrelease|trace> +\ifx\delayed@f@adjustment\@undefined % --- for <= 2020-10-01 BEGIN +%% +\DeclareRobustCommand\selectfont{% + \let\tmp@error@fontshape\error@fontshape + \let\error@fontshape\error@kfontshape + \edef\tmp@item{{\k@encoding}}% + \expandafter\expandafter\expandafter + \inlist@\expandafter\tmp@item\expandafter{\kyenc@list}% + \ifin@ + \let\cy@encoding\k@encoding + \ensure@KanjiEncodingPair{t}% + \edef\ct@encoding{\csname t@enc@\k@encoding\endcsname}% + \else + \expandafter\expandafter\expandafter + \inlist@\expandafter\tmp@item\expandafter{\ktenc@list}% + \ifin@ + \let\ct@encoding\k@encoding + \ensure@KanjiEncodingPair{y}% + \edef\cy@encoding{\csname y@enc@\k@encoding\endcsname}% + \else + \@latex@error{KANJI Encoding scheme `\k@encoding' unknown}\@eha + \fi + \fi + \let\font\tfont + \let\k@encoding\ct@encoding + \xdef\font@name{\csname\curr@kfontshape/\f@size\endcsname}% + \pickup@font + \font@name + \let\font\jfont + \let\k@encoding\cy@encoding + \xdef\font@name{\csname\curr@kfontshape/\f@size\endcsname}% + \pickup@font + \font@name + \expandafter\def\expandafter\k@encoding\tmp@item + \kenc@update + \let\error@fontshape\tmp@error@fontshape + \if@knjcmd \@knjcmdfalse + \expandafter\ifx + \csname rel@\k@encoding/\k@family/\k@series/\k@shape\endcsname\relax + \expandafter\ifx + \csname rel@\k@encoding/\k@family/\k@series/all\endcsname\relax + \else + \csname rel@\k@encoding/\k@family/\k@series/all\endcsname + \fi + \else + \csname rel@\k@encoding/\k@family/\k@series/\k@shape\endcsname + \fi + \fi + \let\font\afont + \xdef\font@name{\csname\curr@fontshape/\f@size\endcsname}% + \pickup@font + \font@name +% \ifnum \tracingfonts>\tw@ +% \@font@info{Roman:Switching to \font@name}\fi + \enc@update + \ifx\f@linespread\baselinestretch \else + \set@fontsize\baselinestretch\f@size\f@baselineskip + \fi + \size@update} +%% +\else % --- for <= 2020-10-01 END & for >= 2021-05-01 BEGIN +%% \DeclareRobustCommand\selectfont{% +% \end{macrocode} +% 最初に、遅らせていたシリーズ・シェイプの値更新を行います。 +% \changes{v1.7k}{2021/01/10}{Execute delayed series and shape updates (latex2e/444) +% (sync with ltfsstrc.dtx 2020/12/22 v3.0n)} +% \begin{macrocode} + % !! sync with ltfsstrc.dtx 2020/12/22 v3.0n BEGIN + \ifx\delayed@k@adjustment\@empty + \else + \let\k@shape@saved\k@shape + \let\k@series@saved\k@series + \delayed@k@adjustment + \begingroup\let\f@encoding\k@encoding\let\f@family\k@family + \maybe@load@fontshape\endgroup + \ifcsname \k@encoding/\k@family/\k@series/\k@shape \endcsname + \else + \let\k@shape\k@shape@saved + \let\k@series\k@series@saved + \let\delayed@merge@kanji@shape\merge@kanji@shape + \let\delayed@merge@kanji@series\merge@kanji@series + \delayed@k@adjustment + \let\delayed@merge@kanji@shape\merge@kanji@shape@without@substitution + \let\delayed@merge@kanji@series\merge@kanji@series@without@substitution + \fi + \let\delayed@k@adjustment\@empty + \fi + \ifx\delayed@f@adjustment\@empty + \else + \let\f@shape@saved\f@shape + \let\f@series@saved\f@series + \delayed@f@adjustment + \maybe@load@fontshape + \ifcsname \f@encoding/\f@family/\f@series/\f@shape \endcsname + \else + \let\f@shape\f@shape@saved + \let\f@series\f@series@saved + \let\delayed@merge@font@shape\merge@font@shape + \let\delayed@merge@font@series\merge@font@series + \delayed@f@adjustment + \let\delayed@merge@font@shape\merge@font@shape@without@substitution + \let\delayed@merge@font@series\merge@font@series@without@substitution + \fi + \let\delayed@f@adjustment\@empty + \fi + % !! sync with ltfsstrc.dtx 2020/12/22 v3.0n END +% \end{macrocode} +% p\LaTeXe{}の|\selectfont|コマンドは、まず、和文フォントを切り替えます。 +% \begin{macrocode} \let\tmp@error@fontshape\error@fontshape \let\error@fontshape\error@kfontshape \edef\tmp@item{{\k@encoding}}% @@ -1855,15 +1971,13 @@ \xdef\font@name{\csname\curr@fontshape/\f@size\endcsname}% \pickup@font \font@name -% \ifnum \tracingfonts>\tw@ -% \@font@info{Roman:Switching to \font@name}\fi + \UseHook{selectfont}% since LaTeX2e 2021-05-01 \enc@update % \end{macrocode} % 最後に、サイズが変更されていれば、ベースラインの調整などを行ないます。 % 英語版の|\selectfont|では最初に行なっていますが、 % p\LaTeXe{}ではベースラインシフトの調整をするために、 % 書体を確定しなければならないため、一番最後に行ないます -% % \changes{v1.1b}{1995/04/26}{ベースラインの調整をサイズ変更時に % 行なうようにした} % \begin{macrocode} @@ -1871,6 +1985,8 @@ \set@fontsize\baselinestretch\f@size\f@baselineskip \fi \size@update} +%% +\fi % --- for >= 2021-05-01 END % %\plEndIncludeInRelease %\plIncludeInRelease{0000/00/00}{\selectfont} @@ -2510,6 +2626,21 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}{\delayed@k@adjustment} +% \LaTeXe~2021-05-01で追加された|\delayed@f@adjustment|の和文版です。 +% \changes{v1.7k}{2021/01/10}{Distangle series and shape update (latex2e/444) +% (sync with ltfssaxes.dtx 2020/12/22 v1.0h)} +% \begin{macrocode} +%<*plcore|platexrelease> +\ifx\delayed@f@adjustment\@undefined % old + \let\delayed@k@adjustment\@undefined +\else % 2021-05-01 + \let\delayed@k@adjustment\@empty +\fi +% +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\romanseries} % \begin{macro}{\kanjiseries} % \begin{macro}{\fontseries} @@ -2519,6 +2650,10 @@ % 2019年までは無条件に指定されたとおりのシリーズを選択していましたが、 % \LaTeXe~2020-02-02以降では、|\DeclareFontSeriesChangeRule|によって % 宣言された「シリーズ更新規則」に基づきシリーズを選択します。 +% +% \LaTeXe~2021-05-01以降では、シリーズの更新を|\selectfont|まで遅らせます。 +% \changes{v1.7k}{2021/01/10}{Distangle series and shape update (latex2e/444) +% (sync with ltfssaxes.dtx 2020/12/22 v1.0h)} % \begin{macrocode} %<*plcore|platexrelease> \ifx\fontseriesforce\@undefined % old @@ -2526,9 +2661,19 @@ \DeclareRobustCommand\kanjiseries[1]{\edef\k@series{#1}} \DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}} \else % 2020-02-02 +\ifx\delayed@f@adjustment\@undefined % --- for <= 2020-10-01 BEGIN \DeclareRobustCommand\romanseries[1]{\@forced@seriesfalse\merge@font@series{#1}} \DeclareRobustCommand\kanjiseries[1]{\@forced@seriesfalse\merge@kanji@series{#1}} \DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}} +\else % --- for <= 2020-10-01 END & for >= 2021-05-01 BEGIN +\DeclareRobustCommand\romanseries[1]{\@forced@seriesfalse + \expandafter\def\expandafter\delayed@f@adjustment\expandafter + {\delayed@f@adjustment\delayed@merge@font@series{#1}}} +\DeclareRobustCommand\kanjiseries[1]{\@forced@seriesfalse + \expandafter\def\expandafter\delayed@k@adjustment\expandafter + {\delayed@k@adjustment\delayed@merge@kanji@series{#1}}} +\DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}} +\fi % --- for >= 2021-05-01 END \fi % \end{macrocode} % \end{macro} @@ -2548,9 +2693,19 @@ \let\romanseriesforce\@undefined \let\kanjiseriesforce\@undefined \else % 2020-02-02 +\ifx\delayed@f@adjustment\@undefined % --- for <= 2020-10-01 BEGIN \DeclareRobustCommand\romanseriesforce[1]{\@forced@seriestrue\edef\f@series{#1}} \DeclareRobustCommand\kanjiseriesforce[1]{\@forced@seriestrue\edef\k@series{#1}} \DeclareRobustCommand\fontseriesforce[1]{\kanjiseriesforce{#1}\romanseriesforce{#1}} +\else % --- for <= 2020-10-01 END & for >= 2021-05-01 BEGIN +\DeclareRobustCommand\romanseriesforce[1]{\@forced@seriestrue + \expandafter\def\expandafter\delayed@f@adjustment\expandafter + {\delayed@f@adjustment\edef\f@series{#1}}} +\DeclareRobustCommand\kanjiseriesforce[1]{\@forced@seriestrue + \expandafter\def\expandafter\delayed@k@adjustment\expandafter + {\delayed@k@adjustment\edef\k@series{#1}}} +\DeclareRobustCommand\fontseriesforce[1]{\kanjiseriesforce{#1}\romanseriesforce{#1}} +\fi % --- for >= 2021-05-01 END \fi % \end{macrocode} % \end{macro} @@ -2584,8 +2739,13 @@ % \begin{macrocode} \set@target@series@kanji{#2}% \else +%^^A [TODO] BEGIN +%^^A LaTeX2e 2021-05-01 では |\maybe@load@fontshape| は削除される。 +%^^A 理由:処理が |\selectfont| まで遅れるので不要とのこと。 +%^^A しかし、なぜか ltfssaxes.dtx で rollback の対処が無いような? \begingroup\let\f@encoding\k@encoding\let\f@family\k@family \maybe@load@fontshape\endgroup +%^^A [TODO] END \edef\reserved@a{\k@encoding /\k@family /#1/\k@shape}% \ifcsname \reserved@a \endcsname % \end{macrocode} @@ -2614,6 +2774,40 @@ \series@maybe@drop@one@m\k@series\k@series } \fi +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% +% \begin{macro}{\merge@kanji@series@without@substitution} +% \begin{macro}{\merge@kanji@series@without@substitution@} +% \begin{macro}{\delayed@merge@kanji@series} +% \cs{merge@font@series@without@substitution}の和文版です。 +% \changes{v1.7k}{2021/01/10}{Distangle series and shape update (latex2e/444) +% (sync with ltfssaxes.dtx 2020/12/22 v1.0h)} +% \begin{macrocode} +\ifx\merge@font@series@without@substitution\@undefined % old +\let\merge@kanji@series@without@substitution\@undefined +\let\merge@kanji@series@without@substitution@\@undefined +\let\delayed@merge@kanji@series\@undefined +\else % 2021-05-01 +\def\merge@kanji@series@without@substitution#1{% + \expandafter\expandafter\expandafter + \merge@kanji@series@without@substitution@ + \csname series@\k@series @#1\endcsname + {#1}% + \@nil +} +\def\merge@kanji@series@without@substitution@#1#2#3\@nil{% + \def\reserved@a{#3}% + \ifx\reserved@a\@empty + \set@target@series@kanji{#2}% + \else + \set@target@series@kanji{#1}% + \fi +} +\let\delayed@merge@kanji@series\merge@kanji@series@without@substitution +\fi % % \end{macrocode} % \end{macro} @@ -2667,6 +2861,10 @@ % 2019年までは無条件に指定されたとおりのシェイプを選択していましたが、 % \LaTeXe~2020-02-02以降では、|\DeclareFontShapeChangeRule|によって % 宣言された「シェイプ更新規則」に基づきシェイプを選択します。 +% +% \LaTeXe~2021-05-01以降では、シェイプの更新を|\selectfont|まで遅らせます。 +% \changes{v1.7k}{2021/01/10}{Distangle series and shape update (latex2e/444) +% (sync with ltfssaxes.dtx 2020/12/22 v1.0h)} % \begin{macrocode} %\plIncludeInRelease{2020/04/12}{\fontshape} % {No \k@shape update if unavailable}% @@ -2679,12 +2877,25 @@ \edef\f@shape{#1}% } \else % 2020-02-02 +\ifx\delayed@f@adjustment\@undefined % --- for <= 2020-10-01 BEGIN \DeclareRobustCommand\romanshape[1]{\merge@font@shape{#1}} \DeclareRobustCommand\kanjishape[1]{\merge@kanji@shape{#1}} \DeclareRobustCommand\fontshape[1]{% \@shape@roman@kanjitrue \kanjishape{#1}\romanshape{#1}% \@shape@roman@kanjifalse} +\else % --- for <= 2020-10-01 END & for >= 2021-05-01 BEGIN +\DeclareRobustCommand\romanshape[1]{% + \expandafter\def\expandafter\delayed@f@adjustment\expandafter + {\delayed@f@adjustment\delayed@merge@font@shape{#1}}} +\DeclareRobustCommand\kanjishape[1]{% + \expandafter\def\expandafter\delayed@k@adjustment\expandafter + {\delayed@k@adjustment\delayed@merge@kanji@shape{#1}}} +\DeclareRobustCommand\fontshape[1]{% + \@shape@roman@kanjitrue + \kanjishape{#1}\romanshape{#1}% + \@shape@roman@kanjifalse} +\fi % --- for >= 2021-05-01 END \fi % %\plEndIncludeInRelease @@ -2719,12 +2930,27 @@ \let\romanshapeforce\@undefined \let\kanjishapeforce\@undefined \else % 2020-02-02 +\ifx\delayed@f@adjustment\@undefined % --- for <= 2020-10-01 BEGIN \DeclareRobustCommand\romanshapeforce[1]{\edef\f@shape{#1}} \DeclareRobustCommand\kanjishapeforce[1]{\edef\k@shape{#1}} \DeclareRobustCommand\fontshapeforce[1]{% \set@safe@kanji@shape{#1}{}% \edef\f@shape{#1}% } +\else % --- for <= 2020-10-01 END & for >= 2021-05-01 BEGIN +\DeclareRobustCommand\romanshapeforce[1]{% + \expandafter\def\expandafter\delayed@f@adjustment\expandafter + {\delayed@f@adjustment\edef\f@shape{#1}}} +\DeclareRobustCommand\kanjishapeforce[1]{% + \expandafter\def\expandafter\delayed@k@adjustment\expandafter + {\delayed@k@adjustment\edef\k@shape{#1}}} +\DeclareRobustCommand\fontshapeforce[1]{% + \expandafter\def\expandafter\delayed@k@adjustment\expandafter + {\delayed@k@adjustment\set@safe@kanji@shape{#1}{}}% + \expandafter\def\expandafter\delayed@f@adjustment\expandafter + {\delayed@f@adjustment\edef\f@shape{#1}}% +} +\fi % --- for >= 2021-05-01 END \fi % %\plEndIncludeInRelease @@ -2776,8 +3002,13 @@ \edef\k@shape{#2}% \fi \else +%^^A [TODO] BEGIN +%^^A LaTeX2e 2021-05-01 では |\maybe@load@fontshape| は削除される。 +%^^A 理由:処理が |\selectfont| まで遅れるので不要とのこと。 +%^^A しかし、なぜか ltfssaxes.dtx で rollback の対処が無いような? \begingroup\let\f@encoding\k@encoding\let\f@family\k@family \maybe@load@fontshape\endgroup +%^^A [TODO] END \edef\reserved@a{\k@encoding /\k@family /\k@series/#1}% \ifcsname \reserved@a\endcsname % \end{macrocode} @@ -2851,6 +3082,42 @@ % \end{macro} % \end{macro} % +% \begin{macro}{\merge@kanji@shape@without@substitution} +% \begin{macro}{\merge@kanji@shape@without@substitution@} +% \begin{macro}{\delayed@merge@kanji@shape} +% \cs{merge@font@shape@without@substitution}の和文版です。 +% \changes{v1.7k}{2021/01/10}{Distangle series and shape update (latex2e/444) +% (sync with ltfssaxes.dtx 2020/12/22 v1.0h)} +% \begin{macrocode} +%<*plcore|platexrelease> +\ifx\merge@font@shape@without@substitution\@undefined % old +\let\merge@kanji@shape@without@substitution\@undefined +\let\merge@kanji@shape@without@substitution@\@undefined +\let\delayed@merge@kanji@shape\@undefined +\else % 2021-05-01 +\def\merge@kanji@shape@without@substitution#1{% + \expandafter\expandafter\expandafter + \merge@kanji@shape@without@substitution@ + \csname shape@\k@shape @#1\endcsname + {#1}% + \@nil +} +\def\merge@kanji@shape@without@substitution@#1#2#3\@nil{% + \def\reserved@a{#3}% + \ifx\reserved@a\@empty + \edef\k@shape{#2}% + \else + \edef\k@shape{#1}% + \fi +} +\let\delayed@merge@kanji@shape\merge@kanji@shape@without@substitution +\fi +% +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% % \begin{macro}{\set@safe@kanji@shape} % \begin{macro}{\@kanji@shape@nochange@info} % 和文シェープが利用可能かどうか予めチェックしてから設定します。 @@ -2896,10 +3163,13 @@ % (sync with ltfssbas.dtx 2019/08/27 v3.2d)} % \changes{v1.6v}{2020/02/01}{Don't call \cs{fontseries} or \cs{fontshape} % (sync with ltfssbas.dtx 2019/12/17 v3.2e)} +% \changes{v1.7j}{2020/12/29}{Drop ``m'' for latex2e issue 453 +% (sync with ltfssbas.dtx 2020/12/10 v3.2h)} % \begin{macrocode} %\plIncludeInRelease{2020/02/02}{\usefont} % {Don't call \fontseries or \fontshape}% %<*plcore|platexrelease> +\ifx\set@target@series\@undefined \DeclareRobustCommand\usekanji[4]{\kanjiencoding{#1}% \edef\k@family{#2}% \edef\k@series{#3}% @@ -2910,6 +3180,18 @@ \edef\f@series{#3}% \edef\f@shape{#4}\selectfont \ignorespaces} +\else +\DeclareRobustCommand\usekanji[4]{\kanjiencoding{#1}% + \edef\k@family{#2}% + \set@target@series@kanji{#3}% + \edef\k@shape{#4}\selectfont + \ignorespaces} +\DeclareRobustCommand\useroman[4]{\romanencoding{#1}% + \edef\f@family{#2}% + \set@target@series{#3}% + \edef\f@shape{#4}\selectfont + \ignorespaces} +\fi \DeclareRobustCommand\usefont[4]{% \edef\tmp@item{{#1}}% \expandafter\expandafter\expandafter @@ -4424,17 +4706,18 @@ % \begin{macrocode} %<*pldefs> \ProvidesFile{pldefs.ltx} - [2020/02/01 v1.6v pLaTeX Kernel (Default settings)] + [2021/01/10 v1.7k pLaTeX Kernel (Default settings)] % % \end{macrocode} % % \subsection{テキストフォント} % テキストフォントのための属性やエラー書体などの宣言です。 % p\LaTeX{}のデフォルトの横組エンコードはJY1、縦組エンコードはJT1とします。 -% % \changes{v1.6s}{2019/08/13}{Explicitly set some defaults % after \cs{DeclareErrorKanjiFont} change % (sync with ltfssini.dtx 2019/07/09 v3.1c)} +% \changes{v1.7k}{2021/01/10}{Adjust start values for series and shape (latex2e/444) +% (sync with ltfssini.dtx 2020/12/06 v3.2f)} % \noindent % 縦横エンコード共通: % \begin{macrocode} @@ -4442,8 +4725,8 @@ \DeclareKanjiEncodingDefaults{}{} \DeclareErrorKanjiFont{JY1}{mc}{m}{n}{10} \kanjifamily{mc} -\kanjiseries{m} -\kanjishape{n} +\def\k@series{m} % \kanjiseries{m} +\def\k@shape{n} % \kanjishape{n} \fontsize{10}{10} % \end{macrocode} % 横組エンコード: diff --git a/Master/texmf-dist/source/platex/base/plvers.dtx b/Master/texmf-dist/source/platex/base/plvers.dtx index 9ee65a40041..ee268af6a32 100644 --- a/Master/texmf-dist/source/platex/base/plvers.dtx +++ b/Master/texmf-dist/source/platex/base/plvers.dtx @@ -197,7 +197,7 @@ {2020-10-01} % %<*plcore> -\def\ppatch@level{1} +\def\ppatch@level{2} % % \end{macrocode} % \end{macro} -- cgit v1.2.3