From 9cbfe27fd2b911631b45571e735e469718879e39 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 9 Feb 2020 22:04:24 +0000 Subject: platex (9feb20) git-svn-id: svn://tug.org/texlive/trunk@53732 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/platex/base/exppl2e.sty | 86 +++++++++++++++++++++- .../texmf-dist/tex/platex/base/platexrelease.sty | 24 +++--- Master/texmf-dist/tex/platex/base/plcore.ltx | 26 +++---- 3 files changed, 110 insertions(+), 26 deletions(-) (limited to 'Master/texmf-dist/tex/platex') diff --git a/Master/texmf-dist/tex/platex/base/exppl2e.sty b/Master/texmf-dist/tex/platex/base/exppl2e.sty index 8774d28fbd1..b28fa53dbbe 100644 --- a/Master/texmf-dist/tex/platex/base/exppl2e.sty +++ b/Master/texmf-dist/tex/platex/base/exppl2e.sty @@ -34,7 +34,7 @@ % case 1: This file must be a normal package \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{exppl2e} - [2020/02/02 v1.1e Experimental pLaTeX2e features] + [2020/02/09 v1.1f Experimental pLaTeX2e features] \PackageWarningNoLine{exppl2e}{% This is the unstable, experimental part of pLaTeX2e.\MessageBreak This package may contain:\MessageBreak @@ -352,6 +352,90 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % +% \section{NFSSのsize functionの日本語化} +% +% \begin{macro}{\inlist@} +% |\do@subst@correction|の日本語化に必要なので、 +% 比較する際に引数・リストとも\cs{detokenize}によって文字列化するようにしました。 +% \changes{v1.6x}{2020/02/05}{引数・リストとも\cs{detokenize}によって文字列化} +% \begin{macrocode} +\def\inlist@#1#2{% + \edef\reserved@a{% + \unexpanded{\def\in@@##1<}% + \detokenize{#1}% + \unexpanded{>##2##3\in@@{\ifx\in@##2\in@false\else\in@true\fi}\in@@}% + \detokenize{#2}% + \unexpanded{<}% + \detokenize{#1}% + \unexpanded{>\in@\in@@}}% + \reserved@a} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\do@subst@correction} +% \begin{macro}{\pltx@do@subst@correction@al} +% \begin{macro}{\pltx@do@subst@correction@yoko} +% \begin{macro}{\pltx@do@subst@correction@tate} +% |\font|は欧文フォントを返すため、\LaTeX{}の元の|\do@subst@correction|は +% 和文フォントに対して使えませんので、和文に対応させます。 +% \changes{v1.6x}{2020/02/05}{\cs{do@subst@correction}の日本語化} +% +% オリジナルの\LaTeX{}の定義は、欧文用として使います。 +% \begin{macrocode} +\def\pltx@do@subst@correction@al{% + \xdef\subst@correction{% + \font@name + \global\expandafter\font + \csname \curr@fontshape/\f@size\endcsname + \noexpand\fontname\font + \relax}% + \aftergroup\subst@correction +} +% \end{macrocode} +% 和文横組用と和文縦組用の定義では、それぞれ|\jfont|と|\tfont|を使います。 +% \begin{macrocode} +\def\pltx@do@subst@correction@yoko{% + \xdef\subst@correction{% + \font@name + \global\expandafter\jfont + \csname \curr@fontshape/\f@size\endcsname + \noexpand\fontname\jfont + \relax}% + \aftergroup\subst@correction +} +\def\pltx@do@subst@correction@tate{% + \xdef\subst@correction{% + \font@name + \global\expandafter\tfont + \csname \curr@fontshape/\f@size\endcsname + \noexpand\fontname\tfont + \relax}% + \aftergroup\subst@correction +} +% \end{macrocode} +% そして、エンコーディングに応じて3つの命令を使い分けます。 +% \begin{macrocode} +\def\do@subst@correction{% + \edef\tmp@item{{\f@encoding}}% + \expandafter\expandafter\expandafter + \inlist@\expandafter\tmp@item\expandafter{\kyenc@list}% + \ifin@\pltx@do@subst@correction@yoko + \else + \expandafter\expandafter\expandafter + \inlist@\expandafter\tmp@item\expandafter{\ktenc@list}% + \ifin@\pltx@do@subst@correction@tate\else + \pltx@do@subst@correction@al + \fi + \fi +} +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % \section{脚注の合印直後での改行を許可} % % 2016/09/03に導入済み。 diff --git a/Master/texmf-dist/tex/platex/base/platexrelease.sty b/Master/texmf-dist/tex/platex/base/platexrelease.sty index 20c8a9f2920..b0e161cf97a 100644 --- a/Master/texmf-dist/tex/platex/base/platexrelease.sty +++ b/Master/texmf-dist/tex/platex/base/platexrelease.sty @@ -517,14 +517,14 @@ of this package available from CTAN} \@nil } \def\merge@kanji@series@#1#2#3\@nil{% - \def\@reserveda{#3}% - \ifx\@reserveda\@empty + \def\reserved@a{#3}% + \ifx\reserved@a\@empty \set@target@series@kanji{#2}% \else \begingroup\let\f@encoding\k@encoding\let\f@family\k@family \maybe@load@fontshape\endgroup - \edef\@reserveda{\k@encoding /\k@family /#1/\k@shape}% - \ifcsname \@reserveda \endcsname + \edef\reserved@a{\k@encoding /\k@family /#1/\k@shape}% + \ifcsname \reserved@a \endcsname \set@target@series@kanji{#1}% \else \ifcsname \k@encoding /\k@family /#2/\k@shape \endcsname @@ -571,14 +571,14 @@ of this package available from CTAN} \@nil } \def\merge@kanji@shape@#1#2#3\@nil{% - \def\@reserveda{#3}% - \ifx\@reserveda\@empty + \def\reserved@a{#3}% + \ifx\reserved@a\@empty \edef\k@shape{#2}% \else \begingroup\let\f@encoding\k@encoding\let\f@family\k@family \maybe@load@fontshape\endgroup - \edef\@reserveda{\k@encoding /\k@family /\k@series/#1}% - \ifcsname \@reserveda\endcsname + \edef\reserved@a{\k@encoding /\k@family /\k@series/#1}% + \ifcsname \reserved@a\endcsname \edef\k@shape{#1}% \else \ifcsname \k@encoding /\k@family /\k@series/#2\endcsname @@ -768,8 +768,8 @@ of this package available from CTAN} } \def\@meta@family@list@kanji{\@elt{mc}\@elt{gt}} \def\update@series@target@value@kanji#1{% - \def\@reserveda{#1}% - \ifx\target@meta@family@value\@reserveda % rm -> rm do nothing + \def\reserved@a{#1}% + \ifx\target@meta@family@value\reserved@a % rm -> rm do nothing \else \expandafter\ifx\csname#1def@ult\endcsname\k@family \let\@elt\@gobble @@ -795,14 +795,14 @@ of this package available from CTAN} \fi\fi }% \fi -\ifx\prepare@family@series@update@kanji\@undefined % 2020-02-02 +\ifx\prepare@family@series@update@kanji\@undefined % old \DeclareRobustCommand\mcfamily {\not@math@alphabet\mcfamily\mathmc \kanjifamily\mcdefault\selectfont} \DeclareRobustCommand\gtfamily {\not@math@alphabet\gtfamily\mathgt \kanjifamily\gtdefault\selectfont} -\else +\else % 2020-02-02 \DeclareRobustCommand\mcfamily {\not@math@alphabet\mcfamily\mathmc \prepare@family@series@update@kanji{mc}\mcdefault\selectfont} diff --git a/Master/texmf-dist/tex/platex/base/plcore.ltx b/Master/texmf-dist/tex/platex/base/plcore.ltx index a5695148038..222f7c9d2fd 100644 --- a/Master/texmf-dist/tex/platex/base/plcore.ltx +++ b/Master/texmf-dist/tex/platex/base/plcore.ltx @@ -34,7 +34,7 @@ \def\pfmtname{pLaTeX2e} \def\pfmtversion {2020-02-02} -\def\ppatch@level{1} +\def\ppatch@level{2} \edef\platexBANNER{\noexpand\platexNILa \the\everyjob % LaTeX banner and delayed codes \noexpand\platexNILb} @@ -706,14 +706,14 @@ \@nil } \def\merge@kanji@series@#1#2#3\@nil{% - \def\@reserveda{#3}% - \ifx\@reserveda\@empty + \def\reserved@a{#3}% + \ifx\reserved@a\@empty \set@target@series@kanji{#2}% \else \begingroup\let\f@encoding\k@encoding\let\f@family\k@family \maybe@load@fontshape\endgroup - \edef\@reserveda{\k@encoding /\k@family /#1/\k@shape}% - \ifcsname \@reserveda \endcsname + \edef\reserved@a{\k@encoding /\k@family /#1/\k@shape}% + \ifcsname \reserved@a \endcsname \set@target@series@kanji{#1}% \else \ifcsname \k@encoding /\k@family /#2/\k@shape \endcsname @@ -760,14 +760,14 @@ \@nil } \def\merge@kanji@shape@#1#2#3\@nil{% - \def\@reserveda{#3}% - \ifx\@reserveda\@empty + \def\reserved@a{#3}% + \ifx\reserved@a\@empty \edef\k@shape{#2}% \else \begingroup\let\f@encoding\k@encoding\let\f@family\k@family \maybe@load@fontshape\endgroup - \edef\@reserveda{\k@encoding /\k@family /\k@series/#1}% - \ifcsname \@reserveda\endcsname + \edef\reserved@a{\k@encoding /\k@family /\k@series/#1}% + \ifcsname \reserved@a\endcsname \edef\k@shape{#1}% \else \ifcsname \k@encoding /\k@family /\k@series/#2\endcsname @@ -901,8 +901,8 @@ } \def\@meta@family@list@kanji{\@elt{mc}\@elt{gt}} \def\update@series@target@value@kanji#1{% - \def\@reserveda{#1}% - \ifx\target@meta@family@value\@reserveda % rm -> rm do nothing + \def\reserved@a{#1}% + \ifx\target@meta@family@value\reserved@a % rm -> rm do nothing \else \expandafter\ifx\csname#1def@ult\endcsname\k@family \let\@elt\@gobble @@ -928,14 +928,14 @@ \fi\fi }% \fi -\ifx\prepare@family@series@update@kanji\@undefined % 2020-02-02 +\ifx\prepare@family@series@update@kanji\@undefined % old \DeclareRobustCommand\mcfamily {\not@math@alphabet\mcfamily\mathmc \kanjifamily\mcdefault\selectfont} \DeclareRobustCommand\gtfamily {\not@math@alphabet\gtfamily\mathgt \kanjifamily\gtdefault\selectfont} -\else +\else % 2020-02-02 \DeclareRobustCommand\mcfamily {\not@math@alphabet\mcfamily\mathmc \prepare@family@series@update@kanji{mc}\mcdefault\selectfont} -- cgit v1.2.3