From 134e64d92eebf7907b76a7262be7f360b9b134aa Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 2 Feb 2020 22:31:00 +0000 Subject: platex (2feb20) git-svn-id: svn://tug.org/texlive/trunk@53638 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/platex/base/LICENSE | 2 +- Master/texmf-dist/doc/platex/base/README.md | 35 +- Master/texmf-dist/doc/platex/base/exppl2e.pdf | Bin 172706 -> 177606 bytes Master/texmf-dist/doc/platex/base/pldoc.pdf | Bin 850926 -> 867066 bytes Master/texmf-dist/source/platex/base/jclasses.dtx | 31 +- Master/texmf-dist/source/platex/base/plfonts.dtx | 677 +++++++++++++++++---- Master/texmf-dist/source/platex/base/plvers.dtx | 12 +- Master/texmf-dist/tex/platex/base/exppl2e.sty | 26 +- Master/texmf-dist/tex/platex/base/jarticle.cls | 13 +- Master/texmf-dist/tex/platex/base/jbk10.clo | 6 +- Master/texmf-dist/tex/platex/base/jbk11.clo | 6 +- Master/texmf-dist/tex/platex/base/jbk12.clo | 6 +- Master/texmf-dist/tex/platex/base/jbook.cls | 13 +- Master/texmf-dist/tex/platex/base/jreport.cls | 13 +- Master/texmf-dist/tex/platex/base/jsize10.clo | 6 +- Master/texmf-dist/tex/platex/base/jsize11.clo | 6 +- Master/texmf-dist/tex/platex/base/jsize12.clo | 6 +- .../texmf-dist/tex/platex/base/platexrelease.sty | 350 ++++++++++- Master/texmf-dist/tex/platex/base/plcore.ltx | 281 ++++++++- Master/texmf-dist/tex/platex/base/pldefs.ltx | 15 +- Master/texmf-dist/tex/platex/base/tarticle.cls | 13 +- Master/texmf-dist/tex/platex/base/tbk10.clo | 6 +- Master/texmf-dist/tex/platex/base/tbk11.clo | 6 +- Master/texmf-dist/tex/platex/base/tbk12.clo | 6 +- Master/texmf-dist/tex/platex/base/tbook.cls | 13 +- Master/texmf-dist/tex/platex/base/treport.cls | 13 +- Master/texmf-dist/tex/platex/base/tsize10.clo | 6 +- Master/texmf-dist/tex/platex/base/tsize11.clo | 6 +- Master/texmf-dist/tex/platex/base/tsize12.clo | 6 +- 29 files changed, 1330 insertions(+), 249 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/platex/base/LICENSE b/Master/texmf-dist/doc/platex/base/LICENSE index 5c1490cdb86..cd23b4d446f 100644 --- a/Master/texmf-dist/doc/platex/base/LICENSE +++ b/Master/texmf-dist/doc/platex/base/LICENSE @@ -1,5 +1,5 @@ Copyright (c) 2010 ASCII MEDIA WORKS -Copyright (c) 2016-2019 Japanese TeX Development Community +Copyright (c) 2016-2020 Japanese TeX Development Community All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/doc/platex/base/README.md b/Master/texmf-dist/doc/platex/base/README.md index e50ca3f7ff8..f5e1b1d9292 100644 --- a/Master/texmf-dist/doc/platex/base/README.md +++ b/Master/texmf-dist/doc/platex/base/README.md @@ -1,13 +1,17 @@ # platex -The bundle provides pLaTeX2e and miscellaneous macros for pTeX and e-pTeX. +The bundle provides pLaTeX2e format and miscellaneous macros +for pTeX and e-pTeX. +This is a community edition maintained by +[Japanese TeX Development Community](http://texjp.org), +which forked from the original ASCII edition (ptex-texmf-2.5). -The bundle is a community edition forked from the original ASCII edition -(ptex-texmf-2.5). The GitHub repository +## Repository -- https://github.com/texjporg/platex +The bundle is maintained on GitHub: +https://github.com/texjporg/platex -is now maintained by [Japanese TeX Development Community](http://texjp.org). +If you have issues, please let us know from the above page. The original ASCII edition can be obtained from: @@ -15,15 +19,21 @@ The original ASCII edition can be obtained from: ## Changes from the original ASCII edition -See the documents (platex.pdf, pldoc.pdf, platexrelease.pdf) for more information. +The original ASCII edition (pLaTeX2e 2006/11/10) was based on +pTeX-3.1.10 and LaTeX2e 2005/12/01. +The community edition (this package) has the following advantages: -- Fix macros which are inconsistent with the latest e-pTeX - (e.g. \footnote, tabular, \parbox, \underline). - Fix several bugs in pLaTeX2e format and packages. +- Fix macros which are inconsistent with the latest pTeX + (e.g. \footnote, tabular, \parbox, \underline). +- Support LaTeX2e 2015/01/01 and later versions. - Add platexrelease.sty. As with the latexrelease package, this package enables us to use the old versions of pLaTeX2e (from 2006/11/10 the ASCII edition). +See the documents (platex.pdf, pldoc.pdf, platexrelease.pdf) +for more information. + ## Documentation A brief exposition of pLaTeX2e is provided in platex.pdf. @@ -47,13 +57,6 @@ All the text files containing Japanese characters in this repository are encoded in ISO-2022-JP. This is because ISO-2022-JP encoded texts are most suitable for the traditional pTeX engine. -## Repository - -The bundle is maintained on GitHub: -https://github.com/texjporg/platex - -If you have issues, please let us know from the above page. - ## License The bundle may be distributed and/or modified under the terms of @@ -61,6 +64,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)). ## Release Date -2019-10-21 +2020-02-02 Japanese TeX Development Community diff --git a/Master/texmf-dist/doc/platex/base/exppl2e.pdf b/Master/texmf-dist/doc/platex/base/exppl2e.pdf index 408b5d000fb..3773c6ad2f0 100644 Binary files a/Master/texmf-dist/doc/platex/base/exppl2e.pdf and b/Master/texmf-dist/doc/platex/base/exppl2e.pdf differ diff --git a/Master/texmf-dist/doc/platex/base/pldoc.pdf b/Master/texmf-dist/doc/platex/base/pldoc.pdf index 183733ad599..5f4e8180167 100644 Binary files a/Master/texmf-dist/doc/platex/base/pldoc.pdf and b/Master/texmf-dist/doc/platex/base/pldoc.pdf differ diff --git a/Master/texmf-dist/source/platex/base/jclasses.dtx b/Master/texmf-dist/source/platex/base/jclasses.dtx index cf77787d310..1ac4a591d20 100644 --- a/Master/texmf-dist/source/platex/base/jclasses.dtx +++ b/Master/texmf-dist/source/platex/base/jclasses.dtx @@ -3,7 +3,7 @@ % % Copyright 1995-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). % ------------------------------------------------------------- @@ -100,6 +100,11 @@ % \changes{v1.8b}{2019/04/02}{新元号対応} % \changes{v1.8c}{2019/10/17}{フォントサイズ変更命令をrobustに % (sync with classes.dtx 2019/08/27 v1.4j)} +% \changes{v1.8d}{2019/10/25}{Don't use \cs{MakeRobust} if +% in rollback prior to 2015 +% (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)} % \fi % % \iffalse @@ -129,7 +134,7 @@ %<11pt&bk>\ProvidesFile{tbk11.clo} %<12pt&bk>\ProvidesFile{tbk12.clo} % - [2019/10/17 v1.8c + [2020/01/03 v1.8e % Standard pLaTeX class] %<10pt|11pt|12pt> Standard pLaTeX file (size option)] %<*driver> @@ -617,10 +622,17 @@ % カーネルの定義を|\renewcommand|した後に|\MakeRobust|を使っている理由は、 % ログに |LaTeX Info: Redefining \normalsize on input line ...| という % メッセージを出したくないからです。 +% ただし、\textsf{latexrelease}パッケージで2015/01/01より +% 昔の日付に巻き戻っている場合は|\MakeRobust|が定義されていません。 % \changes{v1.8c}{2019/10/17}{フォントサイズ変更命令をrobustに % (sync with classes.dtx 2019/08/27 v1.4j)} +% \changes{v1.8d}{2019/10/25}{Don't use \cs{MakeRobust} if +% in rollback prior to 2015 +% (sync with classes.dtx 2019/10/25 v1.4k)} % \begin{macrocode} -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi % \end{macrocode} % \end{macro} % \end{macro} @@ -3347,17 +3359,20 @@ % itemize環境のそれぞれの項目のラベルは、 % |\labelenumi| \ldots\ |\labelenumiv|で生成されます。 % \changes{v1.1a}{1997/01/28}{Bug fix: \cs{labelitemii}.} +% \changes{v1.8e}{2020/01/03}{Normalize label fonts +% (sync with classes.dtx 2019/12/20 v1.4l)} % \begin{macrocode} -\newcommand{\labelitemi}{\textbullet} +\newcommand{\labelitemi}{\labelitemfont \textbullet} \newcommand{\labelitemii}{% \iftdir - {\textcircled{~}} + {\labelitemfont \textcircled{~}} \else - {\normalfont\bfseries\textendash} + {\labelitemfont \bfseries\textendash} \fi } -\newcommand{\labelitemiii}{\textasteriskcentered} -\newcommand{\labelitemiv}{\textperiodcentered} +\newcommand{\labelitemiii}{\labelitemfont \textasteriskcentered} +\newcommand{\labelitemiv}{\labelitemfont \textperiodcentered} +\newcommand\labelitemfont{\normalfont} % \end{macrocode} % \end{macro} % \end{macro} diff --git a/Master/texmf-dist/source/platex/base/plfonts.dtx b/Master/texmf-dist/source/platex/base/plfonts.dtx index bfe6e4913a5..fead9278ea1 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-2019 Japanese TeX Development Community +% Copyright (c) 2016-2020 Japanese TeX Development Community % % This file is part of the pLaTeX2e system (community edition). % ------------------------------------------------------------- @@ -113,13 +113,27 @@ % (sync with ltfssbas.dtx 2019/08/27 v3.2d)} % \changes{v1.6u}{2019/09/29}{Make \cs{userelfont} robust} % \changes{v1.6u}{2019/09/29}{Make \cs{adjustbaseline} robust} +% \changes{v1.6v}{2020/02/01}{New commands \cs{fontseriesforce} etc. +% (sync with ltfssaxes.dtx 2019/12/16 v1.0a)} +% \changes{v1.6v}{2020/02/01}{New commands \cs{fontshapeforce} etc. +% (sync with ltfssaxes.dtx 2019/12/16 v1.0a)} +% \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.6v}{2020/02/01}{\LaTeX{}がmweightsパッケージを基にした +% シリーズのカスタム設定を導入したので、これをサポート +% (sync with ltfssini.dtx 2019/12/17 v3.1e)} +% \changes{v1.6v}{2020/02/01}{Support \cs{emph} sequences +% (sync with ltfssini.dtx 2019/12/17 v3.1e)} +% \changes{v1.6v}{2020/02/01}{定義をpldefsからplcoreへ移動} +% \changes{v1.6v}{2020/02/01}{Set \cs{kanjishapedefault} explicitly to ``n'' +% (sync with fontdef.dtx 2019/12/17 v3.0e)} % \fi % % \iffalse %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{plfonts.dtx}[2019/09/29 v1.6u pLaTeX New Font Selection Scheme] +\ProvidesFile{plfonts.dtx}[2020/02/01 v1.6v pLaTeX New Font Selection Scheme] % \iffalse \documentclass{jltxdoc} \GetFileInfo{plfonts.dtx} @@ -1799,10 +1813,10 @@ % 登録されていれば、この引数は和文ファミリではありませんので、 % |\@notkfam|フラグを真にして、欧文ファミリのルーチンに移ります。 % -% このとき、|\efam@list|を調べるのではないことに注意をしてください。 -% |\efam@list|を調べ、これにないファミリを和文ファミリであるとすると、 +% このとき、|\ffam@list|を調べるのではないことに注意をしてください。 +% |\ffam@list|を調べ、これにないファミリを和文ファミリであるとすると、 % たとえば、欧文ナールファミリが定義されているけれども、和文ナールファミリ -% が未定義の場合、|\fontfamily{nar}|という指定は、|nar|が|\efam@list|にだけ、 +% が未定義の場合、|\fontfamily{nar}|という指定は、|nar|が|\ffam@list|にだけ、 % 登録されているため、和文書体をナールにすることができません。 % % 逆に、|\kfam@list|に登録されていないからといって、|\k@family|に|nar|を設定 @@ -1889,6 +1903,7 @@ \if@notkfam\if@notffam \edef\k@family{#1}\edef\f@family{#1}% \fi\fi} +% % \end{macrocode} % \end{macro} % \end{macro} @@ -1900,10 +1915,86 @@ % \begin{macro}{\fontseries} % 書体のシリーズを指定するコマンドです。 % |\fontseries|コマンドは和欧文の両方に影響します。 +% \LaTeXe~2020-02-02では|\merge@font@series|を使います。 % \begin{macrocode} +%<*plcore|platexrelease> +\ifx\fontseriesforce\@undefined % old \DeclareRobustCommand\romanseries[1]{\edef\f@series{#1}} \DeclareRobustCommand\kanjiseries[1]{\edef\k@series{#1}} \DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}} +\else % 2020-02-02 +\DeclareRobustCommand\romanseries[1]{\merge@font@series{#1}} +\DeclareRobustCommand\kanjiseries[1]{\merge@kanji@series{#1}} +\DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}} +\fi +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% +% \begin{macro}{\romanseriesforce} +% \begin{macro}{\kanjiseriesforce} +% \begin{macro}{\fontseriesforce} +% 無条件にシリーズを変更します。 +% \changes{v1.6v}{2020/02/01}{New commands \cs{fontseriesforce} etc. +% (sync with ltfssaxes.dtx 2019/12/16 v1.0a)} +% \begin{macrocode} +\ifx\fontseriesforce\@undefined % old +\let\romanseriesforce\@undefined +\let\kanjiseriesforce\@undefined +\else % 2020-02-02 +\DeclareRobustCommand\romanseriesforce[1]{\edef\f@series{#1}} +\DeclareRobustCommand\kanjiseriesforce[1]{\edef\k@series{#1}} +\DeclareRobustCommand\fontseriesforce[1]{\kanjiseriesforce{#1}\romanseriesforce{#1}} +\fi +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% +% \begin{macro}{\merge@kanji@series} +% \begin{macro}{\merge@kanji@series@} +% \begin{macro}{\set@target@series@kanji} +% \cs{merge@font@series}の和文版です。 +% \begin{macrocode} +\ifx\fontseriesforce\@undefined % old +\let\merge@kanji@series\@undefined +\let\merge@kanji@series@\@undefined +\let\set@target@series@kanji\@undefined +\else % 2020-02-02 +\def\merge@kanji@series#1{% + \expandafter\expandafter\expandafter + \merge@kanji@series@ + \csname series@\k@series @#1\endcsname + {#1}% + \@nil +} +\def\merge@kanji@series@#1#2#3\@nil{% + \def\@reserveda{#3}% + \ifx\@reserveda\@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 + \set@target@series@kanji{#1}% + \else + \ifcsname \k@encoding /\k@family /#2/\k@shape \endcsname + \set@target@series@kanji{#2}% + {\let\curr@fontshape\curr@kfontshape\@font@shape@subst@warning}% + \else + \set@target@series@kanji{#3}% + {\let\curr@fontshape\curr@kfontshape\@font@shape@subst@warning}% + \fi + \fi + \fi +} +\def\set@target@series@kanji#1{% + \edef\k@series{#1}% + \edef\k@series{\expandafter\series@drop@one@m\k@series mm\series@drop@one@m}% +} +\fi % \end{macrocode} % \end{macro} % \end{macro} @@ -1915,15 +2006,83 @@ % \begin{macro}{\fontshape} % 書体のシェイプを指定するコマンドです。 % |\fontshape|コマンドは和欧文の両方に影響します。 +% \LaTeXe~2020-02-02では|\merge@font@shape|を使います。 % \begin{macrocode} +\ifx\fontshapeforce\@undefined % old \DeclareRobustCommand\romanshape[1]{\edef\f@shape{#1}} \DeclareRobustCommand\kanjishape[1]{\edef\k@shape{#1}} \DeclareRobustCommand\fontshape[1]{\kanjishape{#1}\romanshape{#1}} +\else % 2020-02-02 +\DeclareRobustCommand\romanshape[1]{\merge@font@shape{#1}} +\DeclareRobustCommand\kanjishape[1]{\merge@kanji@shape{#1}} +\DeclareRobustCommand\fontshape[1]{\kanjishape{#1}\romanshape{#1}} +\fi % \end{macrocode} % \end{macro} % \end{macro} % \end{macro} % +% \begin{macro}{\romanshapeforce} +% \begin{macro}{\kanjishapeforce} +% \begin{macro}{\fontshapeforce} +% 無条件にシェイプを変更します。 +% \changes{v1.6v}{2020/02/01}{New commands \cs{fontshapeforce} etc. +% (sync with ltfssaxes.dtx 2019/12/16 v1.0a)} +% \begin{macrocode} +\ifx\fontshapeforce\@undefined % old +\let\romanshapeforce\@undefined +\let\kanjishapeforce\@undefined +\else % 2020-02-02 +\DeclareRobustCommand\romanshapeforce[1]{\edef\f@shape{#1}} +\DeclareRobustCommand\kanjishapeforce[1]{\edef\k@shape{#1}} +\DeclareRobustCommand\fontshapeforce[1]{\kanjishapeforce{#1}\romanshapeforce{#1}} +\fi +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% +% \begin{macro}{\merge@kanji@shape} +% \begin{macro}{\merge@kanji@shape@} +% \cs{merge@font@shape}の和文版です。 +% \begin{macrocode} +\ifx\fontseriesforce\@undefined % old +\let\merge@kanji@shape\@undefined +\let\merge@kanji@shape@\@undefined +\else % 2020-02-02 +\def\merge@kanji@shape#1{% + \expandafter\expandafter\expandafter + \merge@kanji@shape@ + \csname shape@\k@shape @#1\endcsname + {#1}% + \@nil +} +\def\merge@kanji@shape@#1#2#3\@nil{% + \def\@reserveda{#3}% + \ifx\@reserveda\@empty + \edef\k@shape{#2}% + \else + \maybe@load@fontshape + \edef\@reserveda{\k@encoding /\k@family /\k@series/#1}% + \ifcsname \@reserveda\endcsname + \edef\k@shape{#1}% + \else + \ifcsname \k@encoding /\k@family /\k@series/#2\endcsname + \edef\k@shape{#2}% + {\let\curr@fontshape\curr@kfontshape\@font@shape@subst@warning}% + \else + \edef\k@shape{#3}% + {\let\curr@fontshape\curr@kfontshape\@font@shape@subst@warning}% + \fi + \fi + \fi +} +\fi +% +% \end{macrocode} +% \end{macro} +% \end{macro} +% % % \begin{macro}{\usekanji} % \begin{macro}{\useroman} @@ -1935,17 +2094,22 @@ % 和文または欧文フォントを切り替えます。 % \changes{v1.6t}{2019/09/16}{Make \cs{usefont} etc. robust % (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)} % \begin{macrocode} -% -%\plIncludeInRelease{2019/10/01}{\usefont} -% {Make robust}% +%\plIncludeInRelease{2020/02/02}{\usefont} +% {Don't call \fontseries or \fontshape}% %<*plcore|platexrelease> -\DeclareRobustCommand\usekanji[4]{% - \kanjiencoding{#1}\kanjifamily{#2}\kanjiseries{#3}\kanjishape{#4}% - \selectfont\ignorespaces} -\DeclareRobustCommand\useroman[4]{% - \romanencoding{#1}\romanfamily{#2}\romanseries{#3}\romanshape{#4}% - \selectfont\ignorespaces} +\DeclareRobustCommand\usekanji[4]{\kanjiencoding{#1}% + \edef\k@family{#2}% + \edef\k@series{#3}% + \edef\k@shape{#4}\selectfont + \ignorespaces} +\DeclareRobustCommand\useroman[4]{\romanencoding{#1}% + \edef\f@family{#2}% + \edef\f@series{#3}% + \edef\f@shape{#4}\selectfont + \ignorespaces} \DeclareRobustCommand\usefont[4]{% \edef\tmp@item{{#1}}% \expandafter\expandafter\expandafter @@ -1955,6 +2119,22 @@ \fi} % %\plEndIncludeInRelease +%\plIncludeInRelease{2019/10/01}{\usefont} +% {Make robust}% +%\DeclareRobustCommand\usekanji[4]{% +% \kanjiencoding{#1}\kanjifamily{#2}\kanjiseries{#3}\kanjishape{#4}% +% \selectfont\ignorespaces} +%\DeclareRobustCommand\useroman[4]{% +% \romanencoding{#1}\romanfamily{#2}\romanseries{#3}\romanshape{#4}% +% \selectfont\ignorespaces} +%\DeclareRobustCommand\usefont[4]{% +% \edef\tmp@item{{#1}}% +% \expandafter\expandafter\expandafter +% \inlist@\expandafter\tmp@item\expandafter{\kenc@list}% +% \ifin@ \usekanji{#1}{#2}{#3}{#4}% +% \else\useroman{#1}{#2}{#3}{#4}% +% \fi} +%\plEndIncludeInRelease %\plIncludeInRelease{0000/00/00}{\usefont} % {ASCII Corporation original}% %\def\usekanji#1#2#3#4{% @@ -1974,7 +2154,6 @@ %\expandafter \let \csname useroman \endcsname \@undefined %\expandafter \let \csname usefont \endcsname \@undefined %\plEndIncludeInRelease -%<*plcore> % \end{macrocode} % \end{macro} % \end{macro} @@ -1987,18 +2166,250 @@ % ただし高速化のため、|\usekanji|と|\useroman|を展開し、 % |\selectfont|を一度しか呼び出さないようにしています。 % \begin{macrocode} +%\plIncludeInRelease{2020/02/02}{\normalfont} +% {Don't call \fontseries or \fontshape}% +%<*plcore|platexrelease> \DeclareRobustCommand\normalfont{% \kanjiencoding{\kanjiencodingdefault}% - \kanjifamily{\kanjifamilydefault}% - \kanjiseries{\kanjiseriesdefault}% - \kanjishape{\kanjishapedefault}% + \edef\k@family{\kanjifamilydefault}% + \edef\k@series{\kanjiseriesdefault}% + \edef\k@shape{\kanjishapedefault}% \romanencoding{\encodingdefault}% - \romanfamily{\familydefault}% - \romanseries{\seriesdefault}% - \romanshape{\shapedefault}% + \edef\f@family{\familydefault}% + \edef\f@series{\seriesdefault}% + \edef\f@shape{\shapedefault}% \selectfont\ignorespaces} \adjustbaseline \let\reset@font\normalfont +% +%\plEndIncludeInRelease +%\plIncludeInRelease{0000/00/00}{\normalfont} +% {ASCII Corporation original}% +%\DeclareRobustCommand\normalfont{% +% \kanjiencoding{\kanjiencodingdefault}% +% \kanjifamily{\kanjifamilydefault}% +% \kanjiseries{\kanjiseriesdefault}% +% \kanjishape{\kanjishapedefault}% +% \romanencoding{\encodingdefault}% +% \romanfamily{\familydefault}% +% \romanseries{\seriesdefault}% +% \romanshape{\shapedefault}% +% \selectfont\ignorespaces} +%\adjustbaseline +%\let\reset@font\normalfont +%\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% +% +% \begin{macro}{\bfseries@mc} +% \begin{macro}{\bfseries@gt} +% \begin{macro}{\mdseries@mc} +% \begin{macro}{\mdseries@gt} +% \LaTeXe~2020-02-02ではmweightsパッケージを基にした +% 欧文フォントのシリーズのカスタム設定が導入されていますので、 +% p\LaTeXe{}の和文フォントでもこれをサポートします。 +% \changes{v1.6v}{2020/02/01}{\LaTeX{}がmweightsパッケージを基にした +% シリーズのカスタム設定を導入したので、これをサポート +% (sync with ltfssini.dtx 2019/12/17 v3.1e)} +% \begin{macrocode} +%<*plcore|platexrelease> +\ifx\bfseries@rm\@undefined % old +\let\bfseries@mc\@undefined +\let\bfseries@gt\@undefined +\let\mdseries@mc\@undefined +\let\mdseries@gt\@undefined +\else % 2020-02-02 +\edef\bfseries@mc{\bfdefault}% b +\edef\bfseries@gt{\bfdefault}% b +\edef\mdseries@mc{\mddefault}% m +\edef\mdseries@gt{\mddefault}% m +\fi +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% +% \begin{macro}{\expand@font@defaults} +% ファミリのデフォルトを完全展開します。 +% まず、オリジナルの\LaTeX{}の定義を載せておきます。 +% \begin{macrocode} +%\def\expand@font@defaults{% +% \edef\rmdef@ult{\rmdefault}% +% \edef\sfdef@ult{\sfdefault}% +% \edef\ttdef@ult{\ttdefault}% +% \edef\bfdef@ult{\bfdefault}% +% \edef\mddef@ult{\mddefault}% +% \edef\famdef@ult{\familydefault}% +%} +% \end{macrocode} +% p\LaTeX{}では、以下のコードを末尾に追加します。 +% \begin{macrocode} +\ifx\expand@font@defaults\@undefined\else % 2020-02-02 +\g@addto@macro\expand@font@defaults{% + \edef\mcdef@ult{\mcdefault}% + \edef\gtdef@ult{\gtdefault}% + \edef\kanjidef@ult{\kanjifamilydefault}% +} +\fi +% \end{macrocode} +% +% \end{macro} +% +% \begin{macro}{\bfseries} +% \begin{macro}{\mdseries} +% カスタム設定をチェックします。 +% \begin{macrocode} +\ifx\bfseries@rm\@undefined\else % 2020-02-02 +\DeclareRobustCommand\bfseries{% + \not@math@alphabet\bfseries\mathbf + \expand@font@defaults + \romanseries{% changed \fontseries -> \romanseries + \ifx\f@family\rmdef@ult \bfseries@rm + \else\ifx\f@family\sfdef@ult \bfseries@sf + \else\ifx\f@family\ttdef@ult \bfseries@tt + \else \bfdefault + \fi\fi\fi + }% +% \end{macrocode} +% ここからがp\LaTeX{}による追加コードです。 +% \begin{macrocode} + \kanjiseries{% + \ifx\k@family\mcdef@ult \bfseries@mc + \else\ifx\k@family\gtdef@ult \bfseries@gt + \else \bfdefault + \fi\fi + }% +% \end{macrocode} +% ここまで。 +% \begin{macrocode} + \selectfont +} +\DeclareRobustCommand\mdseries{% + \not@math@alphabet\mdseries\relax + \expand@font@defaults + \romanseries{% changed \fontseries -> \romanseries + \ifx\f@family\rmdef@ult \mdseries@rm + \else\ifx\f@family\sfdef@ult \mdseries@sf + \else\ifx\f@family\ttdef@ult \mdseries@tt + \else \mddefault + \fi\fi\fi + }% +% \end{macrocode} +% ここからがp\LaTeX{}による追加コードです。 +% \begin{macrocode} + \kanjiseries{% + \ifx\k@family\mcdef@ult \mdseries@mc + \else\ifx\k@family\gtdef@ult \mdseries@gt + \else \mddefault + \fi\fi + }% +% \end{macrocode} +% ここまで。 +% \begin{macrocode} + \selectfont +} +\fi +% \end{macrocode} +% \end{macro} +% \end{macro} +% +% \begin{macro}{\prepare@family@series@update@kanji} +% \begin{macro}{\@meta@family@list@kanji} +% \begin{macro}{\update@series@target@value@kanji} +% |\prepare@family@series@update|の和文版です。 +% \begin{macrocode} +\ifx\prepare@family@series@update\@undefined % old +\let\prepare@family@series@update@kanji\@undefined +\let\@meta@family@list@kanji\@undefined +\else % 2020-02-02 +\def\prepare@family@series@update#1#2{% + \expand@font@defaults + \let\target@series@value\@empty + \def\target@meta@family@value{#1}% + \let\@elt\update@series@target@value + \@meta@family@list + \let\@elt\relax + \romanfamily#2% % changed \fontfamily -> \romanfamily + \ifx\target@series@value\@empty + \else + \maybe@load@fontshape + \let\f@series\target@series@value + \fi +} +\def\prepare@family@series@update@kanji#1#2{% + \expand@font@defaults + \let\target@series@value\@empty + \def\target@meta@family@value{#1}% + \let\@elt\update@series@target@value@kanji + \@meta@family@list@kanji + \let\@elt\relax + \kanjifamily#2% + \ifx\target@series@value\@empty + \else + \begingroup\let\f@encoding\k@encoding\let\f@family\k@family + \maybe@load@fontshape\endgroup + \let\k@series\target@series@value + \fi +} +\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 + \else + \expandafter\ifx\csname#1def@ult\endcsname\k@family + \let\@elt\@gobble + \expandafter\let\expandafter\@reservedb + \csname mdseries@\target@meta@family@value\endcsname + \expandafter\let\expandafter\@reservedc + \csname bfseries@\target@meta@family@value\endcsname + \expandafter\ifx\csname mdseries@#1\endcsname\k@series + \let\target@series@value\@reservedb + \else\expandafter\ifx\csname bfseries@#1\endcsname\k@series + \let\target@series@value\@reservedc + \else\ifx\k@series\mddef@ult \let\target@series@value\@reservedb + \else\ifx\k@series\bfdef@ult \let\target@series@value\@reservedc + \fi\fi\fi\fi + \fi + \fi +} +\fi +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% +% \begin{macro}{\init@series@setup} +% |\begin{document}|で実行される初期化です。 +% まず、オリジナルの\LaTeX{}の定義を載せておきます。 +% \begin{macrocode} +%\def\init@series@setup{% +% \ifx\bfseries@rm@kernel\bfseries@rm +% \expandafter\in@\expandafter{\rmdefault}{cmr,cmss,cmtt,lcmss,lcmtt,lmr,lmss,lmtt}% +% \ifin@ \else \def\bfseries@rm{b}\fi\fi +% \ifx\bfseries@sf@kernel\bfseries@sf +% \expandafter\in@\expandafter{\sfdefault}{cmr,cmss,cmtt,lcmss,lcmtt,lmr,lmss,lmtt}% +% \ifin@ \else \def\bfseries@sf{b}\fi\fi +% \ifx\bfseries@tt@kernel\bfseries@tt +% \expandafter\in@\expandafter{\ttdefault}{cmr,cmss,cmtt,lcmss,lcmtt,lmr,lmss,lmtt}% +% \ifin@ \else \def\bfseries@tt{b}\fi\fi +% \expand@font@defaults +% \ifx\famdef@ult\rmdef@ult \rmfamily +% \else\ifx\famdef@ult\sfdef@ult \sffamily +% \else\ifx\famdef@ult\ttdef@ult \ttfamily +% \fi\fi\fi +%}% +% \end{macrocode} +% ここからがp\LaTeX{}による追加コードです。 +% \begin{macrocode} +\ifx\init@series@setup\@undefined\else % 2020-02-02 +\g@addto@macro\init@series@setup{% + \ifx\kanjidef@ult\mcdef@ult \mcfamily + \else\ifx\kanjidef@ult\gtdef@ult \gtfamily + \fi\fi +}% +\fi % \end{macrocode} % \end{macro} % @@ -2009,16 +2420,109 @@ % これらは、|\rmfamily|などに対応します。 % |\mathmc|と|\mathgt|は数式内で用いるときのコマンド名です。 % \begin{macrocode} +\ifx\prepare@family@series@update@kanji\@undefined % 2020-02-02 \DeclareRobustCommand\mcfamily {\not@math@alphabet\mcfamily\mathmc \kanjifamily\mcdefault\selectfont} \DeclareRobustCommand\gtfamily {\not@math@alphabet\gtfamily\mathgt \kanjifamily\gtdefault\selectfont} +\else +\DeclareRobustCommand\mcfamily + {\not@math@alphabet\mcfamily\mathmc + \prepare@family@series@update@kanji{mc}\mcdefault\selectfont} +\DeclareRobustCommand\gtfamily + {\not@math@alphabet\gtfamily\mathgt + \prepare@family@series@update@kanji{gt}\gtdefault\selectfont} +\fi +% % \end{macrocode} % \end{macro} % \end{macro} % +% \begin{macro}{\textmc} +% \begin{macro}{\textgt} +% \changes{v1.3b}{1997/01/28}{\cs{textmc}, \cs{textgt}の動作修正} +% \changes{v1.6v}{2020/02/01}{定義をpldefsからplcoreへ移動} +% テキストファミリを切り替えるためのコマンドです。 +% \file{ltfntcmd.dtx}で定義されている|\textrm|などに対応します。 +% \begin{macrocode} +%<*plcore> +\DeclareTextFontCommand{\textmc}{\mcfamily} +\DeclareTextFontCommand{\textgt}{\gtfamily} +% +% \end{macrocode} +% \end{macro} +% \end{macro} +% +% \begin{macro}{\em} +% \begin{macro}{\emph} +% \begin{macro}{\eminnershape} +% \changes{v1.3d}{1997/06/25}{\cs{em},\cs{emph}で和文を強調書体に} +% 従来は|\em|, |\emph|で和文フォントの切り替えは行っていませんでしたが、 +% 和文フォントも|\gtfamily|に切り替えるようにしました。 +% +% [p\LaTeXe~2016/04/17] +% \LaTeX\ \texttt{<2015/01/01>}で追加された|\eminnershape|も取り入れ、 +% 強調コマンドを入れ子にする場合の書体を自由に再定義できるようになりました。 +% \changes{v1.6}{2016/02/01}{\LaTeX\ \texttt{!<2015/01/01!>}での\cs{em}の +% 定義変更に対応。\cs{eminnershape}を追加。} +% +% [p\LaTeXe~2020-02-02] +% \LaTeX\ \texttt{<2020-02-02>}で追加された|\DeclareEmphSequence|を +% サポートしました。 +% \changes{v1.6v}{2020/02/01}{Support \cs{emph} sequences +% (sync with ltfssini.dtx 2019/12/17 v3.1e)} +% \changes{v1.6v}{2020/02/01}{定義をpldefsからplcoreへ移動} +% \begin{macrocode} +%\plIncludeInRelease{2020/02/02}{\DeclareEmphSequence} +% {Nested emph}% +%<*plcore|platexrelease> +\ifx\DeclareEmphSequence\@undefined % old +\DeclareRobustCommand\em + {\@nomath\em \ifdim \fontdimen\@ne\font >\z@ + \eminnershape \else \gtfamily \itshape \fi}% +\else +\DeclareRobustCommand\em{% % 2020-02-02 + \@nomath\em + \ifx\emfontdeclare@clist\@empty + \ifdim \fontdimen\@ne\font >\z@ + \eminnershape \else \gtfamily \itshape \fi + \else + \edef\em@currfont{\csname\curr@fontshape/\f@size\endcsname}% + \expandafter\do@emfont@update\emfontdeclare@clist\do@emfont@update + \fi +} +\fi +\def\eminnershape{\mcfamily \upshape}% +% +%\plEndIncludeInRelease +%\plIncludeInRelease{2016/04/17}{\DeclareEmphSequence} +% {Support \eminnershape}% +%\DeclareRobustCommand\em +% {\@nomath\em \ifdim \fontdimen\@ne\font >\z@ +% \eminnershape \else \gtfamily \itshape \fi}% +%\def\eminnershape{\mcfamily \upshape}% +%\plEndIncludeInRelease +%\plIncludeInRelease{2015/01/01}{\DeclareEmphSequence} +% {Non-supported \eminnershape}% +%\DeclareRobustCommand\em +% {\@nomath\em \ifdim \fontdimen\@ne\font >\z@ +% \mcfamily \upshape \else \gtfamily \itshape \fi} +%\def\eminnershape{\upshape}% defined by LaTeX, but not used by pLaTeX +%\plEndIncludeInRelease +%\plIncludeInRelease{0000/00/00}{\DeclareEmphSequence} +% {ASCII Corporation original}% +%\DeclareRobustCommand\em +% {\@nomath\em \ifdim \fontdimen\@ne\font >\z@ +% \mcfamily \upshape \else \gtfamily \itshape \fi} +%\let\eminnershape\@undefined +%\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% % % \begin{macro}{\romanprocess@table} % \begin{macro}{\kanjiprocess@table} @@ -2027,6 +2531,7 @@ % \changes{v1.3g}{1999/04/05}{plpatch.ltxの内容を反映。 % ありがとう、山本さん。} % \begin{macrocode} +%<*plcore> \let\romanprocess@table\process@table \def\kanjiprocess@table{% \kanjiencoding{\kanjiencodingdefault}% @@ -2040,6 +2545,7 @@ } \@onlypreamble\romanprocess@table \@onlypreamble\kanjiprocess@table +% % \end{macrocode} % \end{macro} % \end{macro} @@ -2060,7 +2566,6 @@ % 補正に追随するようにしています。 % \changes{v1.6g}{2017/03/07}{ベースライン補正量を修正} % \begin{macrocode} -% %\plIncludeInRelease{2017/04/08}{\textunderscore} % {Baseline shift for \textunderscore}% %<*plcore|platexrelease> @@ -2610,6 +3115,39 @@ % \end{macro} % % +% \begin{macro}{\<} +% 最後に、|\inhibitglue|の簡略形を定義します。 +% このコマンドは、和文フォントのメトリック情報から、自動的に挿入される +% グルーの挿入を禁止します。 +% +% 2014年のp\TeX{}の|\inhibitglue|のバグ修正に伴い、 +% |\inhibitglue|が垂直モードでは効かなくなりました。 +% \LaTeX{}では垂直モードと水平モードの区別が隠されていますので、 +% p\LaTeX{}の追加命令である|\<|は段落頭でも効くように修正します。 +% +% |\DeclareRobustCommand|を使うと|\protect|の影響で前方の文字に対する +% |\inhibitglue|が効かなくなるので、e-\TeX{}の|\protected|が必要です。 +% \changes{v1.6i}{2017/09/24}{\cs{<}が段落頭でも効くようにした} +% \changes{v1.6v}{2020/02/01}{定義をpldefsからplcoreへ移動} +% \begin{macrocode} +%\plIncludeInRelease{2017/10/28}{\<} +% {\inhibitglue in vertical mode}% +%<*plcore|platexrelease> +\ifx\protected\@undefined +\def\<{\inhibitglue} +\else +\protected\def\<{\ifvmode\leavevmode\fi\inhibitglue} +\fi +% +%\plEndIncludeInRelease +%\plIncludeInRelease{0000/00/00}{\<} +% {ASCII Corporation original}% +%\def\<{\inhibitglue} +%\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% +% % \subsection{デフォルト設定ファイルの読み込み} % デフォルト設定ファイル\file{pldefs.ltx}は、もともと\file{plcore.ltx}の途中で % 読み込んでいましたが、2018年以降の新しいコミュニティ版\pLaTeX{}では @@ -2619,8 +3157,6 @@ % \file{plcore.ltx}から\file{platex.ltx}へ移動} % % -% -% % \section{デフォルト設定ファイル}\label{plfonts:pldefs} % ここでは、フォーマットファイルに読み込まれるデフォルト値を設定しています。 % この節での内容は\file{pldefs.ltx}に出力されます。 @@ -2634,7 +3170,7 @@ % \begin{macrocode} %<*pldefs> \ProvidesFile{pldefs.ltx} - [2019/09/16 v1.6t pLaTeX Kernel (Default settings)] + [2020/02/01 v1.6v pLaTeX Kernel (Default settings)] % % \end{macrocode} % @@ -2673,13 +3209,18 @@ \KanjiEncodingPair{JY1}{JT1} % \end{macrocode} % フォント属性のデフォルト値: +% \LaTeXe~2019-10-01までは|\shapedefault|は|\updefault|でしたが、 +% \LaTeXe~2020-02-02で|\updefault|が``n''から``up''へと修正されたことに +% 伴い、|\shapedefault|は明示的に``n''に設定されました。 +% \changes{v1.6v}{2020/02/01}{Set \cs{kanjishapedefault} explicitly to ``n'' +% (sync with fontdef.dtx 2019/12/17 v3.0e)} % \begin{macrocode} \newcommand\mcdefault{mc} \newcommand\gtdefault{gt} \newcommand\kanjiencodingdefault{JY1} \newcommand\kanjifamilydefault{\mcdefault} \newcommand\kanjiseriesdefault{\mddefault} -\newcommand\kanjishapedefault{\updefault} +\newcommand\kanjishapedefault{n}% formerly \updefault % \end{macrocode} % 和文エンコードの指定: % \begin{macrocode} @@ -2700,57 +3241,6 @@ \fontencoding{JY1}\selectfont % \end{macrocode} % -% \begin{macro}{\textmc} -% \begin{macro}{\textgt} -% \changes{v1.3b}{1997/01/28}{\cs{textmc}, \cs{textgt}の動作修正} -% テキストファミリを切り替えるためのコマンドです。 -% \file{ltfntcmd.dtx}で定義されている|\textrm|などに対応します。 -% \begin{macrocode} -\DeclareTextFontCommand{\textmc}{\mcfamily} -\DeclareTextFontCommand{\textgt}{\gtfamily} -% \end{macrocode} -% \end{macro} -% \end{macro} -% -% \begin{macro}{\em} -% \begin{macro}{\emph} -% \begin{macro}{\eminnershape} -% \changes{v1.3d}{1997/06/25}{\cs{em},\cs{emph}で和文を強調書体に} -% \changes{v1.6}{2016/02/01}{\LaTeX\ \texttt{!<2015/01/01!>}での\cs{em}の -% 定義変更に対応。\cs{eminnershape}を追加。} -% 従来は|\em|, |\emph|で和文フォントの切り替えは行っていませんでしたが、 -% 和文フォントも|\gtfamily|に切り替えるようにしました。 -% \LaTeX\ \texttt{<2015/01/01>}で追加された|\eminnershape|も取り入れ、 -% 強調コマンドを入れ子にする場合の書体を自由に再定義できるようになりました。 -% \begin{macrocode} -% -%\plIncludeInRelease{2016/04/17}{\eminnershape}{\eminnershape}% -%<*pldefs|platexrelease> -\DeclareRobustCommand\em - {\@nomath\em \ifdim \fontdimen\@ne\font >\z@ - \eminnershape \else \gtfamily \itshape \fi}% -\def\eminnershape{\mcfamily \upshape}% -% -%\plEndIncludeInRelease -%\plIncludeInRelease{2015/01/01}{\eminnershape}{\eminnershape}% -%\DeclareRobustCommand\em -% {\@nomath\em \ifdim \fontdimen\@ne\font >\z@ -% \mcfamily \upshape \else \gtfamily \itshape \fi} -%\def\eminnershape{\upshape}% defined by LaTeX, but not used by pLaTeX -%\plEndIncludeInRelease -%\plIncludeInRelease{0000/00/00}{\eminnershape}{\eminnershape}% -%\DeclareRobustCommand\em -% {\@nomath\em \ifdim \fontdimen\@ne\font >\z@ -% \mcfamily \upshape \else \gtfamily \itshape \fi} -%\let\eminnershape\@undefined -%\plEndIncludeInRelease -%<*pldefs> -% \end{macrocode} -% \end{macro} -% \end{macro} -% \end{macro} -% -% % \changes{v1.3b}{1997/01/30}{数式用フォントの宣言をクラスファイルに移動した} % % @@ -2828,39 +3318,6 @@ \jcharwidowpenalty=500 % \end{macrocode} % -% \begin{macro}{\<} -% 最後に、|\inhibitglue|の簡略形を定義します。 -% このコマンドは、和文フォントのメトリック情報から、自動的に挿入される -% グルーの挿入を禁止します。 -% -% 2014年のp\TeX{}の|\inhibitglue|のバグ修正に伴い、 -% |\inhibitglue|が垂直モードでは効かなくなりました。 -% \LaTeX{}では垂直モードと水平モードの区別が隠されていますので、 -% p\LaTeX{}の追加命令である|\<|は段落頭でも効くように修正します。 -% -% |\DeclareRobustCommand|を使うと|\protect|の影響で前方の文字に対する -% |\inhibitglue|が効かなくなるので、e-\TeX{}の|\protected|が必要です。 -% \changes{v1.6i}{2017/09/24}{\cs{<}が段落頭でも効くようにした} -% \begin{macrocode} -% -%\plIncludeInRelease{2017/10/28}{\<} -% {\inhibitglue in vertical mode}% -%<*pldefs|platexrelease> -\ifx\protected\@undefined -\def\<{\inhibitglue} -\else -\protected\def\<{\ifvmode\leavevmode\fi\inhibitglue} -\fi -% -%\plEndIncludeInRelease -%\plIncludeInRelease{0000/00/00}{\<} -% {ASCII Corporation original}% -%\def\<{\inhibitglue} -%\plEndIncludeInRelease -%<*pldefs> -% \end{macrocode} -% \end{macro} -% % ここまでが、\file{pldefs.ltx}の内容です。 % \begin{macrocode} % diff --git a/Master/texmf-dist/source/platex/base/plvers.dtx b/Master/texmf-dist/source/platex/base/plvers.dtx index 0087b31ef4d..7be5ca9cc09 100644 --- a/Master/texmf-dist/source/platex/base/plvers.dtx +++ b/Master/texmf-dist/source/platex/base/plvers.dtx @@ -3,7 +3,7 @@ % % Copyright 1995-2006 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). % ------------------------------------------------------------- @@ -92,12 +92,13 @@ % \changes{v1.1p}{2019/09/16}{エラーメッセージを更新 % (sync with ltvers.dtx 2019/07/01 v1.1c)} % \changes{v1.1q}{2019/10/01}{\LaTeX\ \texttt{!<2019-10-01!>}版対応確認} +% \changes{v1.1r}{2020/02/01}{\LaTeX\ \texttt{!<2020-02-02!>}版対応確認} % \fi % % \iffalse %<*driver> % \fi -\ProvidesFile{plvers.dtx}[2019/10/01 v1.1q pLaTeX Kernel (Version Info)] +\ProvidesFile{plvers.dtx}[2020/02/01 v1.1r pLaTeX Kernel (Version Info)] % \iffalse \documentclass{jltxdoc} \GetFileInfo{plvers.dtx} @@ -136,6 +137,7 @@ % \changes{v1.1j}{2018/04/07}{\LaTeX\ \texttt{!<2018-04-01!>}版対応確認} % \changes{v1.1o}{2018/12/01}{\LaTeX\ \texttt{!<2018-12-01!>}版対応確認} % \changes{v1.1q}{2019/10/01}{\LaTeX\ \texttt{!<2019-10-01!>}版対応確認} +% \changes{v1.1r}{2020/02/01}{\LaTeX\ \texttt{!<2020-02-02!>}版対応確認} % % このバージョンのp\LaTeXe{}は、次のバージョンの\LaTeX{}\footnote{% % \LaTeX\ authors: Johannes Braams, David Carlisle, Alan Jeffrey, @@ -149,7 +151,7 @@ %\edef\latexreleaseversion %\edef\p@known@latexreleaseversion %<*2ekernel|latexrelease|platexrelease> - {2019-10-01} + {2020-02-02} % % \end{macrocode} % @@ -190,10 +192,10 @@ % %\edef\platexreleaseversion %<*plcore|platexrelease> - {2019-10-01} + {2020-02-02} % %<*plcore> -\def\ppatch@level{1} +\def\ppatch@level{0} % % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/tex/platex/base/exppl2e.sty b/Master/texmf-dist/tex/platex/base/exppl2e.sty index 9fab0c5b09f..8774d28fbd1 100644 --- a/Master/texmf-dist/tex/platex/base/exppl2e.sty +++ b/Master/texmf-dist/tex/platex/base/exppl2e.sty @@ -2,7 +2,7 @@ % % This is file `exppl2e.sty', for experimental pLaTeX2e. % -% 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). % ------------------------------------------------------------- @@ -34,7 +34,7 @@ % case 1: This file must be a normal package \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{exppl2e} - [2019/09/16 v1.1d Experimental pLaTeX2e features] + [2020/02/02 v1.1e Experimental pLaTeX2e features] \PackageWarningNoLine{exppl2e}{% This is the unstable, experimental part of pLaTeX2e.\MessageBreak This package may contain:\MessageBreak @@ -330,6 +330,28 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % +% \section{\cs{verb}先頭の合字抑制と\cs{xkanjiskip}} +% +% \begin{macro}{\do@noligs} +% |>|などの一部の文字について、|\xspcode`\>=3|としたときに +% |\texttt{>}|では前後に|\xkanjiskip|由来のアキが入るのに、 +% |\verb+>+|では後ろにしかアキが入らないという現象に対処します。 +% +% 元の定義は\file{ltmiscen.dtx}を参照してください。 +% p\LaTeX{}では、|\kern\z@|を|\vadjust{}|に置き換えることで +% 「合字処理を抑止」かつ「和欧文間スペースの挿入処理は透過」を実現します。 +% (Issue \#87) +% \begin{macrocode} +\def\do@noligs#1{% + \catcode`#1\active + \begingroup + \lccode`\~`#1\relax + \lowercase{\endgroup\def~{\leavevmode\vadjust{}\char`#1}}} +% \end{macrocode} +% \end{macro} +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % \section{脚注の合印直後での改行を許可} % % 2016/09/03に導入済み。 diff --git a/Master/texmf-dist/tex/platex/base/jarticle.cls b/Master/texmf-dist/tex/platex/base/jarticle.cls index 469a93772ca..12b9418f537 100644 --- a/Master/texmf-dist/tex/platex/base/jarticle.cls +++ b/Master/texmf-dist/tex/platex/base/jarticle.cls @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jarticle} - [2019/10/17 v1.8c + [2020/01/03 v1.8e Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -505,16 +505,17 @@ \usecounter{\@enumctr}% \def\makelabel##1{\hss\llap{##1}}}% \fi}{\endlist} -\newcommand{\labelitemi}{\textbullet} +\newcommand{\labelitemi}{\labelitemfont \textbullet} \newcommand{\labelitemii}{% \iftdir - {\textcircled{~}} + {\labelitemfont \textcircled{~}} \else - {\normalfont\bfseries\textendash} + {\labelitemfont \bfseries\textendash} \fi } -\newcommand{\labelitemiii}{\textasteriskcentered} -\newcommand{\labelitemiv}{\textperiodcentered} +\newcommand{\labelitemiii}{\labelitemfont \textasteriskcentered} +\newcommand{\labelitemiv}{\labelitemfont \textperiodcentered} +\newcommand\labelitemfont{\normalfont} \renewenvironment{itemize} {\ifnum \@itemdepth >\thr@@\@toodeep\else \advance\@itemdepth\@ne diff --git a/Master/texmf-dist/tex/platex/base/jbk10.clo b/Master/texmf-dist/tex/platex/base/jbk10.clo index 1b8eab91625..bded2cab3e0 100644 --- a/Master/texmf-dist/tex/platex/base/jbk10.clo +++ b/Master/texmf-dist/tex/platex/base/jbk10.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jbk10.clo} - [2019/10/17 v1.8c + [2020/01/03 v1.8e Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% @@ -25,7 +25,9 @@ \belowdisplayskip \abovedisplayskip \let\@listi\@listI} \normalsize -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} diff --git a/Master/texmf-dist/tex/platex/base/jbk11.clo b/Master/texmf-dist/tex/platex/base/jbk11.clo index 7a188b969fe..2a8bce9fc31 100644 --- a/Master/texmf-dist/tex/platex/base/jbk11.clo +++ b/Master/texmf-dist/tex/platex/base/jbk11.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jbk11.clo} - [2019/10/17 v1.8c + [2020/01/03 v1.8e Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% @@ -25,7 +25,9 @@ \belowdisplayskip \abovedisplayskip \let\@listi\@listI} \normalsize -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} diff --git a/Master/texmf-dist/tex/platex/base/jbk12.clo b/Master/texmf-dist/tex/platex/base/jbk12.clo index 3267421ee24..63a2bbf5a28 100644 --- a/Master/texmf-dist/tex/platex/base/jbk12.clo +++ b/Master/texmf-dist/tex/platex/base/jbk12.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jbk12.clo} - [2019/10/17 v1.8c + [2020/01/03 v1.8e Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% @@ -25,7 +25,9 @@ \belowdisplayskip \abovedisplayskip \let\@listi\@listI} \normalsize -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} diff --git a/Master/texmf-dist/tex/platex/base/jbook.cls b/Master/texmf-dist/tex/platex/base/jbook.cls index 8bb4379cc32..7f2cc142027 100644 --- a/Master/texmf-dist/tex/platex/base/jbook.cls +++ b/Master/texmf-dist/tex/platex/base/jbook.cls @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jbook} - [2019/10/17 v1.8c + [2020/01/03 v1.8e Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -594,16 +594,17 @@ \usecounter{\@enumctr}% \def\makelabel##1{\hss\llap{##1}}}% \fi}{\endlist} -\newcommand{\labelitemi}{\textbullet} +\newcommand{\labelitemi}{\labelitemfont \textbullet} \newcommand{\labelitemii}{% \iftdir - {\textcircled{~}} + {\labelitemfont \textcircled{~}} \else - {\normalfont\bfseries\textendash} + {\labelitemfont \bfseries\textendash} \fi } -\newcommand{\labelitemiii}{\textasteriskcentered} -\newcommand{\labelitemiv}{\textperiodcentered} +\newcommand{\labelitemiii}{\labelitemfont \textasteriskcentered} +\newcommand{\labelitemiv}{\labelitemfont \textperiodcentered} +\newcommand\labelitemfont{\normalfont} \renewenvironment{itemize} {\ifnum \@itemdepth >\thr@@\@toodeep\else \advance\@itemdepth\@ne diff --git a/Master/texmf-dist/tex/platex/base/jreport.cls b/Master/texmf-dist/tex/platex/base/jreport.cls index 90915721af5..aa0c768953f 100644 --- a/Master/texmf-dist/tex/platex/base/jreport.cls +++ b/Master/texmf-dist/tex/platex/base/jreport.cls @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jreport} - [2019/10/17 v1.8c + [2020/01/03 v1.8e Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -590,16 +590,17 @@ \usecounter{\@enumctr}% \def\makelabel##1{\hss\llap{##1}}}% \fi}{\endlist} -\newcommand{\labelitemi}{\textbullet} +\newcommand{\labelitemi}{\labelitemfont \textbullet} \newcommand{\labelitemii}{% \iftdir - {\textcircled{~}} + {\labelitemfont \textcircled{~}} \else - {\normalfont\bfseries\textendash} + {\labelitemfont \bfseries\textendash} \fi } -\newcommand{\labelitemiii}{\textasteriskcentered} -\newcommand{\labelitemiv}{\textperiodcentered} +\newcommand{\labelitemiii}{\labelitemfont \textasteriskcentered} +\newcommand{\labelitemiv}{\labelitemfont \textperiodcentered} +\newcommand\labelitemfont{\normalfont} \renewenvironment{itemize} {\ifnum \@itemdepth >\thr@@\@toodeep\else \advance\@itemdepth\@ne diff --git a/Master/texmf-dist/tex/platex/base/jsize10.clo b/Master/texmf-dist/tex/platex/base/jsize10.clo index 847f35a46a1..93e8f2913a3 100644 --- a/Master/texmf-dist/tex/platex/base/jsize10.clo +++ b/Master/texmf-dist/tex/platex/base/jsize10.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jsize10.clo} - [2019/10/17 v1.8c + [2020/01/03 v1.8e Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% @@ -25,7 +25,9 @@ \belowdisplayskip \abovedisplayskip \let\@listi\@listI} \normalsize -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} diff --git a/Master/texmf-dist/tex/platex/base/jsize11.clo b/Master/texmf-dist/tex/platex/base/jsize11.clo index bd95261bf7f..2775160ebfd 100644 --- a/Master/texmf-dist/tex/platex/base/jsize11.clo +++ b/Master/texmf-dist/tex/platex/base/jsize11.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jsize11.clo} - [2019/10/17 v1.8c + [2020/01/03 v1.8e Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% @@ -25,7 +25,9 @@ \belowdisplayskip \abovedisplayskip \let\@listi\@listI} \normalsize -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} diff --git a/Master/texmf-dist/tex/platex/base/jsize12.clo b/Master/texmf-dist/tex/platex/base/jsize12.clo index 69cf5e67c25..66c7c8a7b9d 100644 --- a/Master/texmf-dist/tex/platex/base/jsize12.clo +++ b/Master/texmf-dist/tex/platex/base/jsize12.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jsize12.clo} - [2019/10/17 v1.8c + [2020/01/03 v1.8e Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% @@ -25,7 +25,9 @@ \belowdisplayskip \abovedisplayskip \let\@listi\@listI} \normalsize -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} diff --git a/Master/texmf-dist/tex/platex/base/platexrelease.sty b/Master/texmf-dist/tex/platex/base/platexrelease.sty index 4c4abf1922d..58af8193acc 100644 --- a/Master/texmf-dist/tex/platex/base/platexrelease.sty +++ b/Master/texmf-dist/tex/platex/base/platexrelease.sty @@ -16,9 +16,9 @@ %% %% File: plvers.dtx \edef\p@known@latexreleaseversion - {2019-10-01} + {2020-02-02} \edef\platexreleaseversion - {2019-10-01} + {2020-02-02} \newif\if@plincludeinrelease \@plincludeinreleasefalse \def\plIncludeInRelease#1{% @@ -487,6 +487,130 @@ of this package available from CTAN} \fi} \expandafter \let \csname adjustbaseline \endcsname \@undefined \plEndIncludeInRelease +\ifx\fontseriesforce\@undefined % old +\DeclareRobustCommand\romanseries[1]{\edef\f@series{#1}} +\DeclareRobustCommand\kanjiseries[1]{\edef\k@series{#1}} +\DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}} +\else % 2020-02-02 +\DeclareRobustCommand\romanseries[1]{\merge@font@series{#1}} +\DeclareRobustCommand\kanjiseries[1]{\merge@kanji@series{#1}} +\DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}} +\fi +\ifx\fontseriesforce\@undefined % old +\let\romanseriesforce\@undefined +\let\kanjiseriesforce\@undefined +\else % 2020-02-02 +\DeclareRobustCommand\romanseriesforce[1]{\edef\f@series{#1}} +\DeclareRobustCommand\kanjiseriesforce[1]{\edef\k@series{#1}} +\DeclareRobustCommand\fontseriesforce[1]{\kanjiseriesforce{#1}\romanseriesforce{#1}} +\fi +\ifx\fontseriesforce\@undefined % old +\let\merge@kanji@series\@undefined +\let\merge@kanji@series@\@undefined +\let\set@target@series@kanji\@undefined +\else % 2020-02-02 +\def\merge@kanji@series#1{% + \expandafter\expandafter\expandafter + \merge@kanji@series@ + \csname series@\k@series @#1\endcsname + {#1}% + \@nil +} +\def\merge@kanji@series@#1#2#3\@nil{% + \def\@reserveda{#3}% + \ifx\@reserveda\@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 + \set@target@series@kanji{#1}% + \else + \ifcsname \k@encoding /\k@family /#2/\k@shape \endcsname + \set@target@series@kanji{#2}% + {\let\curr@fontshape\curr@kfontshape\@font@shape@subst@warning}% + \else + \set@target@series@kanji{#3}% + {\let\curr@fontshape\curr@kfontshape\@font@shape@subst@warning}% + \fi + \fi + \fi +} +\def\set@target@series@kanji#1{% + \edef\k@series{#1}% + \edef\k@series{\expandafter\series@drop@one@m\k@series mm\series@drop@one@m}% +} +\fi +\ifx\fontshapeforce\@undefined % old +\DeclareRobustCommand\romanshape[1]{\edef\f@shape{#1}} +\DeclareRobustCommand\kanjishape[1]{\edef\k@shape{#1}} +\DeclareRobustCommand\fontshape[1]{\kanjishape{#1}\romanshape{#1}} +\else % 2020-02-02 +\DeclareRobustCommand\romanshape[1]{\merge@font@shape{#1}} +\DeclareRobustCommand\kanjishape[1]{\merge@kanji@shape{#1}} +\DeclareRobustCommand\fontshape[1]{\kanjishape{#1}\romanshape{#1}} +\fi +\ifx\fontshapeforce\@undefined % old +\let\romanshapeforce\@undefined +\let\kanjishapeforce\@undefined +\else % 2020-02-02 +\DeclareRobustCommand\romanshapeforce[1]{\edef\f@shape{#1}} +\DeclareRobustCommand\kanjishapeforce[1]{\edef\k@shape{#1}} +\DeclareRobustCommand\fontshapeforce[1]{\kanjishapeforce{#1}\romanshapeforce{#1}} +\fi +\ifx\fontseriesforce\@undefined % old +\let\merge@kanji@shape\@undefined +\let\merge@kanji@shape@\@undefined +\else % 2020-02-02 +\def\merge@kanji@shape#1{% + \expandafter\expandafter\expandafter + \merge@kanji@shape@ + \csname shape@\k@shape @#1\endcsname + {#1}% + \@nil +} +\def\merge@kanji@shape@#1#2#3\@nil{% + \def\@reserveda{#3}% + \ifx\@reserveda\@empty + \edef\k@shape{#2}% + \else + \maybe@load@fontshape + \edef\@reserveda{\k@encoding /\k@family /\k@series/#1}% + \ifcsname \@reserveda\endcsname + \edef\k@shape{#1}% + \else + \ifcsname \k@encoding /\k@family /\k@series/#2\endcsname + \edef\k@shape{#2}% + {\let\curr@fontshape\curr@kfontshape\@font@shape@subst@warning}% + \else + \edef\k@shape{#3}% + {\let\curr@fontshape\curr@kfontshape\@font@shape@subst@warning}% + \fi + \fi + \fi +} +\fi +\plIncludeInRelease{2020/02/02}{\usefont} + {Don't call \fontseries or \fontshape}% +\DeclareRobustCommand\usekanji[4]{\kanjiencoding{#1}% + \edef\k@family{#2}% + \edef\k@series{#3}% + \edef\k@shape{#4}\selectfont + \ignorespaces} +\DeclareRobustCommand\useroman[4]{\romanencoding{#1}% + \edef\f@family{#2}% + \edef\f@series{#3}% + \edef\f@shape{#4}\selectfont + \ignorespaces} +\DeclareRobustCommand\usefont[4]{% + \edef\tmp@item{{#1}}% + \expandafter\expandafter\expandafter + \inlist@\expandafter\tmp@item\expandafter{\kenc@list}% + \ifin@ \usekanji{#1}{#2}{#3}{#4}% + \else\useroman{#1}{#2}{#3}{#4}% + \fi} +\plEndIncludeInRelease \plIncludeInRelease{2019/10/01}{\usefont} {Make robust}% \DeclareRobustCommand\usekanji[4]{% @@ -522,6 +646,210 @@ of this package available from CTAN} \expandafter \let \csname useroman \endcsname \@undefined \expandafter \let \csname usefont \endcsname \@undefined \plEndIncludeInRelease +\plIncludeInRelease{2020/02/02}{\normalfont} + {Don't call \fontseries or \fontshape}% +\DeclareRobustCommand\normalfont{% + \kanjiencoding{\kanjiencodingdefault}% + \edef\k@family{\kanjifamilydefault}% + \edef\k@series{\kanjiseriesdefault}% + \edef\k@shape{\kanjishapedefault}% + \romanencoding{\encodingdefault}% + \edef\f@family{\familydefault}% + \edef\f@series{\seriesdefault}% + \edef\f@shape{\shapedefault}% + \selectfont\ignorespaces} +\adjustbaseline +\let\reset@font\normalfont +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\normalfont} + {ASCII Corporation original}% +\DeclareRobustCommand\normalfont{% + \kanjiencoding{\kanjiencodingdefault}% + \kanjifamily{\kanjifamilydefault}% + \kanjiseries{\kanjiseriesdefault}% + \kanjishape{\kanjishapedefault}% + \romanencoding{\encodingdefault}% + \romanfamily{\familydefault}% + \romanseries{\seriesdefault}% + \romanshape{\shapedefault}% + \selectfont\ignorespaces} +\adjustbaseline +\let\reset@font\normalfont +\plEndIncludeInRelease +\ifx\bfseries@rm\@undefined % old +\let\bfseries@mc\@undefined +\let\bfseries@gt\@undefined +\let\mdseries@mc\@undefined +\let\mdseries@gt\@undefined +\else % 2020-02-02 +\edef\bfseries@mc{\bfdefault}% b +\edef\bfseries@gt{\bfdefault}% b +\edef\mdseries@mc{\mddefault}% m +\edef\mdseries@gt{\mddefault}% m +\fi +\ifx\expand@font@defaults\@undefined\else % 2020-02-02 +\g@addto@macro\expand@font@defaults{% + \edef\mcdef@ult{\mcdefault}% + \edef\gtdef@ult{\gtdefault}% + \edef\kanjidef@ult{\kanjifamilydefault}% +} +\fi +\ifx\bfseries@rm\@undefined\else % 2020-02-02 +\DeclareRobustCommand\bfseries{% + \not@math@alphabet\bfseries\mathbf + \expand@font@defaults + \romanseries{% changed \fontseries -> \romanseries + \ifx\f@family\rmdef@ult \bfseries@rm + \else\ifx\f@family\sfdef@ult \bfseries@sf + \else\ifx\f@family\ttdef@ult \bfseries@tt + \else \bfdefault + \fi\fi\fi + }% + \kanjiseries{% + \ifx\k@family\mcdef@ult \bfseries@mc + \else\ifx\k@family\gtdef@ult \bfseries@gt + \else \bfdefault + \fi\fi + }% + \selectfont +} +\DeclareRobustCommand\mdseries{% + \not@math@alphabet\mdseries\relax + \expand@font@defaults + \romanseries{% changed \fontseries -> \romanseries + \ifx\f@family\rmdef@ult \mdseries@rm + \else\ifx\f@family\sfdef@ult \mdseries@sf + \else\ifx\f@family\ttdef@ult \mdseries@tt + \else \mddefault + \fi\fi\fi + }% + \kanjiseries{% + \ifx\k@family\mcdef@ult \mdseries@mc + \else\ifx\k@family\gtdef@ult \mdseries@gt + \else \mddefault + \fi\fi + }% + \selectfont +} +\fi +\ifx\prepare@family@series@update\@undefined % old +\let\prepare@family@series@update@kanji\@undefined +\let\@meta@family@list@kanji\@undefined +\else % 2020-02-02 +\def\prepare@family@series@update#1#2{% + \expand@font@defaults + \let\target@series@value\@empty + \def\target@meta@family@value{#1}% + \let\@elt\update@series@target@value + \@meta@family@list + \let\@elt\relax + \romanfamily#2% % changed \fontfamily -> \romanfamily + \ifx\target@series@value\@empty + \else + \maybe@load@fontshape + \let\f@series\target@series@value + \fi +} +\def\prepare@family@series@update@kanji#1#2{% + \expand@font@defaults + \let\target@series@value\@empty + \def\target@meta@family@value{#1}% + \let\@elt\update@series@target@value@kanji + \@meta@family@list@kanji + \let\@elt\relax + \kanjifamily#2% + \ifx\target@series@value\@empty + \else + \begingroup\let\f@encoding\k@encoding\let\f@family\k@family + \maybe@load@fontshape\endgroup + \let\k@series\target@series@value + \fi +} +\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 + \else + \expandafter\ifx\csname#1def@ult\endcsname\k@family + \let\@elt\@gobble + \expandafter\let\expandafter\@reservedb + \csname mdseries@\target@meta@family@value\endcsname + \expandafter\let\expandafter\@reservedc + \csname bfseries@\target@meta@family@value\endcsname + \expandafter\ifx\csname mdseries@#1\endcsname\k@series + \let\target@series@value\@reservedb + \else\expandafter\ifx\csname bfseries@#1\endcsname\k@series + \let\target@series@value\@reservedc + \else\ifx\k@series\mddef@ult \let\target@series@value\@reservedb + \else\ifx\k@series\bfdef@ult \let\target@series@value\@reservedc + \fi\fi\fi\fi + \fi + \fi +} +\fi +\ifx\init@series@setup\@undefined\else % 2020-02-02 +\g@addto@macro\init@series@setup{% + \ifx\kanjidef@ult\mcdef@ult \mcfamily + \else\ifx\kanjidef@ult\gtdef@ult \gtfamily + \fi\fi +}% +\fi +\ifx\prepare@family@series@update@kanji\@undefined % 2020-02-02 +\DeclareRobustCommand\mcfamily + {\not@math@alphabet\mcfamily\mathmc + \kanjifamily\mcdefault\selectfont} +\DeclareRobustCommand\gtfamily + {\not@math@alphabet\gtfamily\mathgt + \kanjifamily\gtdefault\selectfont} +\else +\DeclareRobustCommand\mcfamily + {\not@math@alphabet\mcfamily\mathmc + \prepare@family@series@update@kanji{mc}\mcdefault\selectfont} +\DeclareRobustCommand\gtfamily + {\not@math@alphabet\gtfamily\mathgt + \prepare@family@series@update@kanji{gt}\gtdefault\selectfont} +\fi +\plIncludeInRelease{2020/02/02}{\DeclareEmphSequence} + {Nested emph}% +\ifx\DeclareEmphSequence\@undefined % old +\DeclareRobustCommand\em + {\@nomath\em \ifdim \fontdimen\@ne\font >\z@ + \eminnershape \else \gtfamily \itshape \fi}% +\else +\DeclareRobustCommand\em{% % 2020-02-02 + \@nomath\em + \ifx\emfontdeclare@clist\@empty + \ifdim \fontdimen\@ne\font >\z@ + \eminnershape \else \gtfamily \itshape \fi + \else + \edef\em@currfont{\csname\curr@fontshape/\f@size\endcsname}% + \expandafter\do@emfont@update\emfontdeclare@clist\do@emfont@update + \fi +} +\fi +\def\eminnershape{\mcfamily \upshape}% +\plEndIncludeInRelease +\plIncludeInRelease{2016/04/17}{\DeclareEmphSequence} + {Support \eminnershape}% +\DeclareRobustCommand\em + {\@nomath\em \ifdim \fontdimen\@ne\font >\z@ + \eminnershape \else \gtfamily \itshape \fi}% +\def\eminnershape{\mcfamily \upshape}% +\plEndIncludeInRelease +\plIncludeInRelease{2015/01/01}{\DeclareEmphSequence} + {Non-supported \eminnershape}% +\DeclareRobustCommand\em + {\@nomath\em \ifdim \fontdimen\@ne\font >\z@ + \mcfamily \upshape \else \gtfamily \itshape \fi} +\def\eminnershape{\upshape}% defined by LaTeX, but not used by pLaTeX +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\DeclareEmphSequence} + {ASCII Corporation original}% +\DeclareRobustCommand\em + {\@nomath\em \ifdim \fontdimen\@ne\font >\z@ + \mcfamily \upshape \else \gtfamily \itshape \fi} +\let\eminnershape\@undefined +\plEndIncludeInRelease \plIncludeInRelease{2017/04/08}{\textunderscore} {Baseline shift for \textunderscore}% \DeclareTextCommandDefault{\textunderscore}{% @@ -881,24 +1209,6 @@ of this package available from CTAN} \fi } \plEndIncludeInRelease -\plIncludeInRelease{2016/04/17}{\eminnershape}{\eminnershape}% -\DeclareRobustCommand\em - {\@nomath\em \ifdim \fontdimen\@ne\font >\z@ - \eminnershape \else \gtfamily \itshape \fi}% -\def\eminnershape{\mcfamily \upshape}% -\plEndIncludeInRelease -\plIncludeInRelease{2015/01/01}{\eminnershape}{\eminnershape}% -\DeclareRobustCommand\em - {\@nomath\em \ifdim \fontdimen\@ne\font >\z@ - \mcfamily \upshape \else \gtfamily \itshape \fi} -\def\eminnershape{\upshape}% defined by LaTeX, but not used by pLaTeX -\plEndIncludeInRelease -\plIncludeInRelease{0000/00/00}{\eminnershape}{\eminnershape}% -\DeclareRobustCommand\em - {\@nomath\em \ifdim \fontdimen\@ne\font >\z@ - \mcfamily \upshape \else \gtfamily \itshape \fi} -\let\eminnershape\@undefined -\plEndIncludeInRelease \plIncludeInRelease{2017/10/28}{\<} {\inhibitglue in vertical mode}% \ifx\protected\@undefined diff --git a/Master/texmf-dist/tex/platex/base/plcore.ltx b/Master/texmf-dist/tex/platex/base/plcore.ltx index 170c8e5cd16..e9ad50530b3 100644 --- a/Master/texmf-dist/tex/platex/base/plcore.ltx +++ b/Master/texmf-dist/tex/platex/base/plcore.ltx @@ -33,8 +33,8 @@ \fi \def\pfmtname{pLaTeX2e} \def\pfmtversion - {2019-10-01} -\def\ppatch@level{1} + {2020-02-02} +\def\ppatch@level{0} \edef\platexBANNER{\noexpand\platexNILa \the\everyjob % LaTeX banner and delayed codes \noexpand\platexNILb} @@ -676,18 +676,120 @@ \if@notkfam\if@notffam \edef\k@family{#1}\edef\f@family{#1}% \fi\fi} +\ifx\fontseriesforce\@undefined % old \DeclareRobustCommand\romanseries[1]{\edef\f@series{#1}} \DeclareRobustCommand\kanjiseries[1]{\edef\k@series{#1}} \DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}} +\else % 2020-02-02 +\DeclareRobustCommand\romanseries[1]{\merge@font@series{#1}} +\DeclareRobustCommand\kanjiseries[1]{\merge@kanji@series{#1}} +\DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}} +\fi +\ifx\fontseriesforce\@undefined % old +\let\romanseriesforce\@undefined +\let\kanjiseriesforce\@undefined +\else % 2020-02-02 +\DeclareRobustCommand\romanseriesforce[1]{\edef\f@series{#1}} +\DeclareRobustCommand\kanjiseriesforce[1]{\edef\k@series{#1}} +\DeclareRobustCommand\fontseriesforce[1]{\kanjiseriesforce{#1}\romanseriesforce{#1}} +\fi +\ifx\fontseriesforce\@undefined % old +\let\merge@kanji@series\@undefined +\let\merge@kanji@series@\@undefined +\let\set@target@series@kanji\@undefined +\else % 2020-02-02 +\def\merge@kanji@series#1{% + \expandafter\expandafter\expandafter + \merge@kanji@series@ + \csname series@\k@series @#1\endcsname + {#1}% + \@nil +} +\def\merge@kanji@series@#1#2#3\@nil{% + \def\@reserveda{#3}% + \ifx\@reserveda\@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 + \set@target@series@kanji{#1}% + \else + \ifcsname \k@encoding /\k@family /#2/\k@shape \endcsname + \set@target@series@kanji{#2}% + {\let\curr@fontshape\curr@kfontshape\@font@shape@subst@warning}% + \else + \set@target@series@kanji{#3}% + {\let\curr@fontshape\curr@kfontshape\@font@shape@subst@warning}% + \fi + \fi + \fi +} +\def\set@target@series@kanji#1{% + \edef\k@series{#1}% + \edef\k@series{\expandafter\series@drop@one@m\k@series mm\series@drop@one@m}% +} +\fi +\ifx\fontshapeforce\@undefined % old \DeclareRobustCommand\romanshape[1]{\edef\f@shape{#1}} \DeclareRobustCommand\kanjishape[1]{\edef\k@shape{#1}} \DeclareRobustCommand\fontshape[1]{\kanjishape{#1}\romanshape{#1}} -\DeclareRobustCommand\usekanji[4]{% - \kanjiencoding{#1}\kanjifamily{#2}\kanjiseries{#3}\kanjishape{#4}% - \selectfont\ignorespaces} -\DeclareRobustCommand\useroman[4]{% - \romanencoding{#1}\romanfamily{#2}\romanseries{#3}\romanshape{#4}% - \selectfont\ignorespaces} +\else % 2020-02-02 +\DeclareRobustCommand\romanshape[1]{\merge@font@shape{#1}} +\DeclareRobustCommand\kanjishape[1]{\merge@kanji@shape{#1}} +\DeclareRobustCommand\fontshape[1]{\kanjishape{#1}\romanshape{#1}} +\fi +\ifx\fontshapeforce\@undefined % old +\let\romanshapeforce\@undefined +\let\kanjishapeforce\@undefined +\else % 2020-02-02 +\DeclareRobustCommand\romanshapeforce[1]{\edef\f@shape{#1}} +\DeclareRobustCommand\kanjishapeforce[1]{\edef\k@shape{#1}} +\DeclareRobustCommand\fontshapeforce[1]{\kanjishapeforce{#1}\romanshapeforce{#1}} +\fi +\ifx\fontseriesforce\@undefined % old +\let\merge@kanji@shape\@undefined +\let\merge@kanji@shape@\@undefined +\else % 2020-02-02 +\def\merge@kanji@shape#1{% + \expandafter\expandafter\expandafter + \merge@kanji@shape@ + \csname shape@\k@shape @#1\endcsname + {#1}% + \@nil +} +\def\merge@kanji@shape@#1#2#3\@nil{% + \def\@reserveda{#3}% + \ifx\@reserveda\@empty + \edef\k@shape{#2}% + \else + \maybe@load@fontshape + \edef\@reserveda{\k@encoding /\k@family /\k@series/#1}% + \ifcsname \@reserveda\endcsname + \edef\k@shape{#1}% + \else + \ifcsname \k@encoding /\k@family /\k@series/#2\endcsname + \edef\k@shape{#2}% + {\let\curr@fontshape\curr@kfontshape\@font@shape@subst@warning}% + \else + \edef\k@shape{#3}% + {\let\curr@fontshape\curr@kfontshape\@font@shape@subst@warning}% + \fi + \fi + \fi +} +\fi +\DeclareRobustCommand\usekanji[4]{\kanjiencoding{#1}% + \edef\k@family{#2}% + \edef\k@series{#3}% + \edef\k@shape{#4}\selectfont + \ignorespaces} +\DeclareRobustCommand\useroman[4]{\romanencoding{#1}% + \edef\f@family{#2}% + \edef\f@series{#3}% + \edef\f@shape{#4}\selectfont + \ignorespaces} \DeclareRobustCommand\usefont[4]{% \edef\tmp@item{{#1}}% \expandafter\expandafter\expandafter @@ -697,22 +799,168 @@ \fi} \DeclareRobustCommand\normalfont{% \kanjiencoding{\kanjiencodingdefault}% - \kanjifamily{\kanjifamilydefault}% - \kanjiseries{\kanjiseriesdefault}% - \kanjishape{\kanjishapedefault}% + \edef\k@family{\kanjifamilydefault}% + \edef\k@series{\kanjiseriesdefault}% + \edef\k@shape{\kanjishapedefault}% \romanencoding{\encodingdefault}% - \romanfamily{\familydefault}% - \romanseries{\seriesdefault}% - \romanshape{\shapedefault}% + \edef\f@family{\familydefault}% + \edef\f@series{\seriesdefault}% + \edef\f@shape{\shapedefault}% \selectfont\ignorespaces} \adjustbaseline \let\reset@font\normalfont +\ifx\bfseries@rm\@undefined % old +\let\bfseries@mc\@undefined +\let\bfseries@gt\@undefined +\let\mdseries@mc\@undefined +\let\mdseries@gt\@undefined +\else % 2020-02-02 +\edef\bfseries@mc{\bfdefault}% b +\edef\bfseries@gt{\bfdefault}% b +\edef\mdseries@mc{\mddefault}% m +\edef\mdseries@gt{\mddefault}% m +\fi +\ifx\expand@font@defaults\@undefined\else % 2020-02-02 +\g@addto@macro\expand@font@defaults{% + \edef\mcdef@ult{\mcdefault}% + \edef\gtdef@ult{\gtdefault}% + \edef\kanjidef@ult{\kanjifamilydefault}% +} +\fi +\ifx\bfseries@rm\@undefined\else % 2020-02-02 +\DeclareRobustCommand\bfseries{% + \not@math@alphabet\bfseries\mathbf + \expand@font@defaults + \romanseries{% changed \fontseries -> \romanseries + \ifx\f@family\rmdef@ult \bfseries@rm + \else\ifx\f@family\sfdef@ult \bfseries@sf + \else\ifx\f@family\ttdef@ult \bfseries@tt + \else \bfdefault + \fi\fi\fi + }% + \kanjiseries{% + \ifx\k@family\mcdef@ult \bfseries@mc + \else\ifx\k@family\gtdef@ult \bfseries@gt + \else \bfdefault + \fi\fi + }% + \selectfont +} +\DeclareRobustCommand\mdseries{% + \not@math@alphabet\mdseries\relax + \expand@font@defaults + \romanseries{% changed \fontseries -> \romanseries + \ifx\f@family\rmdef@ult \mdseries@rm + \else\ifx\f@family\sfdef@ult \mdseries@sf + \else\ifx\f@family\ttdef@ult \mdseries@tt + \else \mddefault + \fi\fi\fi + }% + \kanjiseries{% + \ifx\k@family\mcdef@ult \mdseries@mc + \else\ifx\k@family\gtdef@ult \mdseries@gt + \else \mddefault + \fi\fi + }% + \selectfont +} +\fi +\ifx\prepare@family@series@update\@undefined % old +\let\prepare@family@series@update@kanji\@undefined +\let\@meta@family@list@kanji\@undefined +\else % 2020-02-02 +\def\prepare@family@series@update#1#2{% + \expand@font@defaults + \let\target@series@value\@empty + \def\target@meta@family@value{#1}% + \let\@elt\update@series@target@value + \@meta@family@list + \let\@elt\relax + \romanfamily#2% % changed \fontfamily -> \romanfamily + \ifx\target@series@value\@empty + \else + \maybe@load@fontshape + \let\f@series\target@series@value + \fi +} +\def\prepare@family@series@update@kanji#1#2{% + \expand@font@defaults + \let\target@series@value\@empty + \def\target@meta@family@value{#1}% + \let\@elt\update@series@target@value@kanji + \@meta@family@list@kanji + \let\@elt\relax + \kanjifamily#2% + \ifx\target@series@value\@empty + \else + \begingroup\let\f@encoding\k@encoding\let\f@family\k@family + \maybe@load@fontshape\endgroup + \let\k@series\target@series@value + \fi +} +\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 + \else + \expandafter\ifx\csname#1def@ult\endcsname\k@family + \let\@elt\@gobble + \expandafter\let\expandafter\@reservedb + \csname mdseries@\target@meta@family@value\endcsname + \expandafter\let\expandafter\@reservedc + \csname bfseries@\target@meta@family@value\endcsname + \expandafter\ifx\csname mdseries@#1\endcsname\k@series + \let\target@series@value\@reservedb + \else\expandafter\ifx\csname bfseries@#1\endcsname\k@series + \let\target@series@value\@reservedc + \else\ifx\k@series\mddef@ult \let\target@series@value\@reservedb + \else\ifx\k@series\bfdef@ult \let\target@series@value\@reservedc + \fi\fi\fi\fi + \fi + \fi +} +\fi +\ifx\init@series@setup\@undefined\else % 2020-02-02 +\g@addto@macro\init@series@setup{% + \ifx\kanjidef@ult\mcdef@ult \mcfamily + \else\ifx\kanjidef@ult\gtdef@ult \gtfamily + \fi\fi +}% +\fi +\ifx\prepare@family@series@update@kanji\@undefined % 2020-02-02 \DeclareRobustCommand\mcfamily {\not@math@alphabet\mcfamily\mathmc \kanjifamily\mcdefault\selectfont} \DeclareRobustCommand\gtfamily {\not@math@alphabet\gtfamily\mathgt \kanjifamily\gtdefault\selectfont} +\else +\DeclareRobustCommand\mcfamily + {\not@math@alphabet\mcfamily\mathmc + \prepare@family@series@update@kanji{mc}\mcdefault\selectfont} +\DeclareRobustCommand\gtfamily + {\not@math@alphabet\gtfamily\mathgt + \prepare@family@series@update@kanji{gt}\gtdefault\selectfont} +\fi +\DeclareTextFontCommand{\textmc}{\mcfamily} +\DeclareTextFontCommand{\textgt}{\gtfamily} +\ifx\DeclareEmphSequence\@undefined % old +\DeclareRobustCommand\em + {\@nomath\em \ifdim \fontdimen\@ne\font >\z@ + \eminnershape \else \gtfamily \itshape \fi}% +\else +\DeclareRobustCommand\em{% % 2020-02-02 + \@nomath\em + \ifx\emfontdeclare@clist\@empty + \ifdim \fontdimen\@ne\font >\z@ + \eminnershape \else \gtfamily \itshape \fi + \else + \edef\em@currfont{\csname\curr@fontshape/\f@size\endcsname}% + \expandafter\do@emfont@update\emfontdeclare@clist\do@emfont@update + \fi +} +\fi +\def\eminnershape{\mcfamily \upshape}% \let\romanprocess@table\process@table \def\kanjiprocess@table{% \kanjiencoding{\kanjiencodingdefault}% @@ -827,6 +1075,11 @@ \let\@text@composite@x\pltx@saved@text@composite@x } \nofixcompositeaccent +\ifx\protected\@undefined +\def\<{\inhibitglue} +\else +\protected\def\<{\ifvmode\leavevmode\fi\inhibitglue} +\fi %% File: plcore.dtx \def\NeedsTeXFormat#1{% \def\reserved@a{#1}% diff --git a/Master/texmf-dist/tex/platex/base/pldefs.ltx b/Master/texmf-dist/tex/platex/base/pldefs.ltx index 7612c6a0499..f26203afb09 100644 --- a/Master/texmf-dist/tex/platex/base/pldefs.ltx +++ b/Master/texmf-dist/tex/platex/base/pldefs.ltx @@ -14,7 +14,7 @@ %% %% File: plfonts.dtx \ProvidesFile{pldefs.ltx} - [2019/09/16 v1.6t pLaTeX Kernel (Default settings)] + [2020/02/01 v1.6v pLaTeX Kernel (Default settings)] \DeclareKanjiEncodingDefaults{}{} \DeclareErrorKanjiFont{JY1}{mc}{m}{n}{10} \kanjifamily{mc} @@ -31,7 +31,7 @@ \newcommand\kanjiencodingdefault{JY1} \newcommand\kanjifamilydefault{\mcdefault} \newcommand\kanjiseriesdefault{\mddefault} -\newcommand\kanjishapedefault{\updefault} +\newcommand\kanjishapedefault{n}% formerly \updefault \kanjiencoding{JY1} \input{jy1mc.fd} \input{jy1gt.fd} @@ -39,12 +39,6 @@ \input{jt1gt.fd} \fontencoding{JT1}\selectfont \fontencoding{JY1}\selectfont -\DeclareTextFontCommand{\textmc}{\mcfamily} -\DeclareTextFontCommand{\textgt}{\gtfamily} -\DeclareRobustCommand\em - {\@nomath\em \ifdim \fontdimen\@ne\font >\z@ - \eminnershape \else \gtfamily \itshape \fi}% -\def\eminnershape{\mcfamily \upshape}% \DeclarePreloadSizes{JY1}{mc}{m}{n}{5,7,10,12} \DeclarePreloadSizes{JY1}{gt}{m}{n}{5,7,10,12} \DeclarePreloadSizes{JT1}{mc}{m}{n}{5,7,10,12} @@ -62,11 +56,6 @@ \xkanjiskip=.25zw plus1pt minus1pt \autoxspacing \jcharwidowpenalty=500 -\ifx\protected\@undefined -\def\<{\inhibitglue} -\else -\protected\def\<{\ifvmode\leavevmode\fi\inhibitglue} -\fi \endinput %% %% End of file `pldefs.ltx'. diff --git a/Master/texmf-dist/tex/platex/base/tarticle.cls b/Master/texmf-dist/tex/platex/base/tarticle.cls index 88220b3f330..82809f3a079 100644 --- a/Master/texmf-dist/tex/platex/base/tarticle.cls +++ b/Master/texmf-dist/tex/platex/base/tarticle.cls @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{tarticle} - [2019/10/17 v1.8c + [2020/01/03 v1.8e Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -509,16 +509,17 @@ \usecounter{\@enumctr}% \def\makelabel##1{\hss\llap{##1}}}% \fi}{\endlist} -\newcommand{\labelitemi}{\textbullet} +\newcommand{\labelitemi}{\labelitemfont \textbullet} \newcommand{\labelitemii}{% \iftdir - {\textcircled{~}} + {\labelitemfont \textcircled{~}} \else - {\normalfont\bfseries\textendash} + {\labelitemfont \bfseries\textendash} \fi } -\newcommand{\labelitemiii}{\textasteriskcentered} -\newcommand{\labelitemiv}{\textperiodcentered} +\newcommand{\labelitemiii}{\labelitemfont \textasteriskcentered} +\newcommand{\labelitemiv}{\labelitemfont \textperiodcentered} +\newcommand\labelitemfont{\normalfont} \renewenvironment{itemize} {\ifnum \@itemdepth >\thr@@\@toodeep\else \advance\@itemdepth\@ne diff --git a/Master/texmf-dist/tex/platex/base/tbk10.clo b/Master/texmf-dist/tex/platex/base/tbk10.clo index b3afca53e61..b08eb4e4008 100644 --- a/Master/texmf-dist/tex/platex/base/tbk10.clo +++ b/Master/texmf-dist/tex/platex/base/tbk10.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tbk10.clo} - [2019/10/17 v1.8c + [2020/01/03 v1.8e Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{17}% @@ -27,7 +27,9 @@ \def\kanjiencodingdefault{JT1}% \kanjiencoding{\kanjiencodingdefault}% \normalsize -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} diff --git a/Master/texmf-dist/tex/platex/base/tbk11.clo b/Master/texmf-dist/tex/platex/base/tbk11.clo index 024ad25f716..087a8a0919e 100644 --- a/Master/texmf-dist/tex/platex/base/tbk11.clo +++ b/Master/texmf-dist/tex/platex/base/tbk11.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tbk11.clo} - [2019/10/17 v1.8c + [2020/01/03 v1.8e Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{17}% @@ -27,7 +27,9 @@ \def\kanjiencodingdefault{JT1}% \kanjiencoding{\kanjiencodingdefault}% \normalsize -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} diff --git a/Master/texmf-dist/tex/platex/base/tbk12.clo b/Master/texmf-dist/tex/platex/base/tbk12.clo index df9ea319f77..d886e64c76d 100644 --- a/Master/texmf-dist/tex/platex/base/tbk12.clo +++ b/Master/texmf-dist/tex/platex/base/tbk12.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tbk12.clo} - [2019/10/17 v1.8c + [2020/01/03 v1.8e Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% @@ -27,7 +27,9 @@ \def\kanjiencodingdefault{JT1}% \kanjiencoding{\kanjiencodingdefault}% \normalsize -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} diff --git a/Master/texmf-dist/tex/platex/base/tbook.cls b/Master/texmf-dist/tex/platex/base/tbook.cls index 04db2c202e9..f9038bb0de6 100644 --- a/Master/texmf-dist/tex/platex/base/tbook.cls +++ b/Master/texmf-dist/tex/platex/base/tbook.cls @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{tbook} - [2019/10/17 v1.8c + [2020/01/03 v1.8e Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -598,16 +598,17 @@ \usecounter{\@enumctr}% \def\makelabel##1{\hss\llap{##1}}}% \fi}{\endlist} -\newcommand{\labelitemi}{\textbullet} +\newcommand{\labelitemi}{\labelitemfont \textbullet} \newcommand{\labelitemii}{% \iftdir - {\textcircled{~}} + {\labelitemfont \textcircled{~}} \else - {\normalfont\bfseries\textendash} + {\labelitemfont \bfseries\textendash} \fi } -\newcommand{\labelitemiii}{\textasteriskcentered} -\newcommand{\labelitemiv}{\textperiodcentered} +\newcommand{\labelitemiii}{\labelitemfont \textasteriskcentered} +\newcommand{\labelitemiv}{\labelitemfont \textperiodcentered} +\newcommand\labelitemfont{\normalfont} \renewenvironment{itemize} {\ifnum \@itemdepth >\thr@@\@toodeep\else \advance\@itemdepth\@ne diff --git a/Master/texmf-dist/tex/platex/base/treport.cls b/Master/texmf-dist/tex/platex/base/treport.cls index 42c6f6a52d0..857c8340190 100644 --- a/Master/texmf-dist/tex/platex/base/treport.cls +++ b/Master/texmf-dist/tex/platex/base/treport.cls @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{treport} - [2019/10/17 v1.8c + [2020/01/03 v1.8e Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -594,16 +594,17 @@ \usecounter{\@enumctr}% \def\makelabel##1{\hss\llap{##1}}}% \fi}{\endlist} -\newcommand{\labelitemi}{\textbullet} +\newcommand{\labelitemi}{\labelitemfont \textbullet} \newcommand{\labelitemii}{% \iftdir - {\textcircled{~}} + {\labelitemfont \textcircled{~}} \else - {\normalfont\bfseries\textendash} + {\labelitemfont \bfseries\textendash} \fi } -\newcommand{\labelitemiii}{\textasteriskcentered} -\newcommand{\labelitemiv}{\textperiodcentered} +\newcommand{\labelitemiii}{\labelitemfont \textasteriskcentered} +\newcommand{\labelitemiv}{\labelitemfont \textperiodcentered} +\newcommand\labelitemfont{\normalfont} \renewenvironment{itemize} {\ifnum \@itemdepth >\thr@@\@toodeep\else \advance\@itemdepth\@ne diff --git a/Master/texmf-dist/tex/platex/base/tsize10.clo b/Master/texmf-dist/tex/platex/base/tsize10.clo index 4c438144592..5357beed5fa 100644 --- a/Master/texmf-dist/tex/platex/base/tsize10.clo +++ b/Master/texmf-dist/tex/platex/base/tsize10.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tsize10.clo} - [2019/10/17 v1.8c + [2020/01/03 v1.8e Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{17}% @@ -27,7 +27,9 @@ \def\kanjiencodingdefault{JT1}% \kanjiencoding{\kanjiencodingdefault}% \normalsize -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} diff --git a/Master/texmf-dist/tex/platex/base/tsize11.clo b/Master/texmf-dist/tex/platex/base/tsize11.clo index 646542f50bb..115ded6e317 100644 --- a/Master/texmf-dist/tex/platex/base/tsize11.clo +++ b/Master/texmf-dist/tex/platex/base/tsize11.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tsize11.clo} - [2019/10/17 v1.8c + [2020/01/03 v1.8e Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{17}% @@ -27,7 +27,9 @@ \def\kanjiencodingdefault{JT1}% \kanjiencoding{\kanjiencodingdefault}% \normalsize -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} diff --git a/Master/texmf-dist/tex/platex/base/tsize12.clo b/Master/texmf-dist/tex/platex/base/tsize12.clo index 4874a65d3b2..7039885f667 100644 --- a/Master/texmf-dist/tex/platex/base/tsize12.clo +++ b/Master/texmf-dist/tex/platex/base/tsize12.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tsize12.clo} - [2019/10/17 v1.8c + [2020/01/03 v1.8e Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% @@ -27,7 +27,9 @@ \def\kanjiencodingdefault{JT1}% \kanjiencoding{\kanjiencodingdefault}% \normalsize -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} -- cgit v1.2.3