From 3e399d8526bd786d65f34c90728b33d02814da00 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 10 Feb 2020 03:02:26 +0000 Subject: CTAN sync 202002100302 --- language/japanese/platex/README.md | 2 +- language/japanese/platex/exppl2e.pdf | Bin 177606 -> 184087 bytes language/japanese/platex/exppl2e.sty | 86 ++++++++++++++++++++++++++++++++++- language/japanese/platex/pldoc.pdf | Bin 871349 -> 871372 bytes language/japanese/platex/plfonts.dtx | 26 ++++++----- language/japanese/platex/plvers.dtx | 2 +- 6 files changed, 101 insertions(+), 15 deletions(-) (limited to 'language') diff --git a/language/japanese/platex/README.md b/language/japanese/platex/README.md index 64c33cbabc..a280f048ac 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-02-04 +2020-02-09 Japanese TeX Development Community diff --git a/language/japanese/platex/exppl2e.pdf b/language/japanese/platex/exppl2e.pdf index 3773c6ad2f..d680a92a45 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 8774d28fbd..b28fa53dbb 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/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/language/japanese/platex/pldoc.pdf b/language/japanese/platex/pldoc.pdf index 92241bc1ca..66c32afe35 100644 Binary files a/language/japanese/platex/pldoc.pdf and b/language/japanese/platex/pldoc.pdf differ diff --git a/language/japanese/platex/plfonts.dtx b/language/japanese/platex/plfonts.dtx index b91a130c2b..f9f4799ebe 100644 --- a/language/japanese/platex/plfonts.dtx +++ b/language/japanese/platex/plfonts.dtx @@ -128,6 +128,8 @@ % \changes{v1.6v}{2020/02/01}{Set \cs{kanjishapedefault} explicitly to ``n'' % (sync with fontdef.dtx 2019/12/17 v3.0e)} % \changes{v1.6w}{2020/02/03}{巻き戻しのバグ修正} +% \changes{v1.6x}{2020/02/05}{一時コマンドの名前を統一 +% (sync with ltfssaxes.dtx 2020/02/05 v1.0b and ltfssini.dtx 2020/02/05 v3.1g)} % \fi % % \iffalse @@ -1974,14 +1976,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 @@ -2065,14 +2067,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 @@ -2369,8 +2371,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 @@ -2441,14 +2443,14 @@ % これらは、|\rmfamily|などに対応します。 % |\mathmc|と|\mathgt|は数式内で用いるときのコマンド名です。 % \begin{macrocode} -\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/language/japanese/platex/plvers.dtx b/language/japanese/platex/plvers.dtx index b354d4f4a6..81c78bebf1 100644 --- a/language/japanese/platex/plvers.dtx +++ b/language/japanese/platex/plvers.dtx @@ -195,7 +195,7 @@ {2020-02-02} % %<*plcore> -\def\ppatch@level{1} +\def\ppatch@level{2} % % \end{macrocode} % \end{macro} -- cgit v1.2.3