From f3e77606f13c3ff3c0915bd4860c3486948400c6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 1 Oct 2019 21:17:27 +0000 Subject: platex (1oct19) git-svn-id: svn://tug.org/texlive/trunk@52243 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/platex/base/README.md | 2 +- Master/texmf-dist/doc/platex/base/exppl2e.pdf | Bin 172427 -> 172706 bytes Master/texmf-dist/doc/platex/base/platex-en.pdf | Bin 149713 -> 158767 bytes Master/texmf-dist/doc/platex/base/platex.pdf | Bin 288279 -> 298160 bytes .../texmf-dist/doc/platex/base/platexrelease.pdf | Bin 121553 -> 125169 bytes Master/texmf-dist/doc/platex/base/pldoc.pdf | Bin 841630 -> 848162 bytes Master/texmf-dist/source/platex/base/platex.dtx | 45 ++-- .../source/platex/base/platexrelease.dtx | 6 +- Master/texmf-dist/source/platex/base/plcore.dtx | 40 +++- Master/texmf-dist/source/platex/base/plext.dtx | 12 +- Master/texmf-dist/source/platex/base/plfonts.dtx | 251 ++++++++++++++++----- Master/texmf-dist/source/platex/base/plnewsc13.tex | 91 ++++++++ Master/texmf-dist/source/platex/base/plvers.dtx | 29 ++- Master/texmf-dist/tex/platex/base/exppl2e.sty | 4 +- .../texmf-dist/tex/platex/base/platexrelease.sty | 179 +++++++++++++-- Master/texmf-dist/tex/platex/base/plcore.ltx | 43 ++-- Master/texmf-dist/tex/platex/base/pldefs.ltx | 6 +- Master/texmf-dist/tex/platex/base/plext.sty | 6 +- Master/texmf-dist/tex/platex/base/ptrace.sty | 32 ++- 19 files changed, 603 insertions(+), 143 deletions(-) create mode 100644 Master/texmf-dist/source/platex/base/plnewsc13.tex diff --git a/Master/texmf-dist/doc/platex/base/README.md b/Master/texmf-dist/doc/platex/base/README.md index 652a868b461..6e501ec1594 100644 --- a/Master/texmf-dist/doc/platex/base/README.md +++ b/Master/texmf-dist/doc/platex/base/README.md @@ -61,6 +61,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)). ## Release Date -2019-04-06 +2019-10-01 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 f9d04581f3b..408b5d000fb 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/platex-en.pdf b/Master/texmf-dist/doc/platex/base/platex-en.pdf index 99c3e7200e1..4bae13686eb 100644 Binary files a/Master/texmf-dist/doc/platex/base/platex-en.pdf and b/Master/texmf-dist/doc/platex/base/platex-en.pdf differ diff --git a/Master/texmf-dist/doc/platex/base/platex.pdf b/Master/texmf-dist/doc/platex/base/platex.pdf index 5cb716ebaf7..d07bd853c28 100644 Binary files a/Master/texmf-dist/doc/platex/base/platex.pdf and b/Master/texmf-dist/doc/platex/base/platex.pdf differ diff --git a/Master/texmf-dist/doc/platex/base/platexrelease.pdf b/Master/texmf-dist/doc/platex/base/platexrelease.pdf index df2e838e323..2dc9289fe01 100644 Binary files a/Master/texmf-dist/doc/platex/base/platexrelease.pdf and b/Master/texmf-dist/doc/platex/base/platexrelease.pdf differ diff --git a/Master/texmf-dist/doc/platex/base/pldoc.pdf b/Master/texmf-dist/doc/platex/base/pldoc.pdf index 2d845301aaa..2252277b8c6 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/platex.dtx b/Master/texmf-dist/source/platex/base/platex.dtx index e559bdc473d..dabac8c871b 100644 --- a/Master/texmf-dist/source/platex/base/platex.dtx +++ b/Master/texmf-dist/source/platex/base/platex.dtx @@ -3,7 +3,7 @@ % % Copyright 1995,1996 ASCII Corporation. % Copyright (c) 2010 ASCII MEDIA WORKS -% Copyright (c) 2016-2018 Japanese TeX Development Community +% Copyright (c) 2016-2019 Japanese TeX Development Community % % This file is part of the pLaTeX2e system (community edition). % ------------------------------------------------------------- @@ -84,6 +84,7 @@ % \changes{v1.0x}{2018/09/03}{platexcheatに言及} % \changes{v1.0x}{2018/09/03}{plautopatchに言及} % \changes{v1.0y}{2018/09/22}{最終更新日を\file{pldoc.pdf}に表示} +% \changes{v1.0z}{2019/09/29}{タイポ修正} %\else % \changes{v1.0}{1995/05/08}{first edition} % \changes{v1.0a}{1995/08/25}{Added 'Compatibility', `Usage of \dst{}' @@ -126,6 +127,7 @@ % \changes{v1.0x}{2018/09/03}{Mention platexcheat (Japanese only).} % \changes{v1.0x}{2018/09/03}{Mention plautopatch.} % \changes{v1.0y}{2018/09/22}{Show last update info on \file{pldoc.pdf}} +% \changes{v1.0z}{2019/09/29}{Fix typos in document.} %\fi % \fi % @@ -133,7 +135,7 @@ %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{platex.dtx}[2018/09/22 v1.0y pLaTeX document file] +\ProvidesFile{platex.dtx}[2019/09/29 v1.0z pLaTeX document file] % \iffalse \documentclass{jltxdoc} \usepackage{plext} @@ -197,11 +199,13 @@ % \changes{v1.0k}{2016/05/21}{変更履歴も出力するようにした} % \changes{v1.0q}{2017/11/29}{英語版ドキュメントを追加} % \changes{v1.0x}{2018/09/03}{ドキュメントを更新} +% \changes{v1.0z}{2019/09/29}{タイポ修正} %\else % \changes{v1.0f}{2016/04/12}{Update document.} % \changes{v1.0k}{2016/05/21}{Print also changes.} % \changes{v1.0q}{2017/11/29}{New English documentation added!} % \changes{v1.0x}{2018/09/03}{Update document.} +% \changes{v1.0z}{2019/09/29}{Fix typos in document.} %\fi %\ifJAPANESE % \begin{chuui} @@ -213,17 +217,19 @@ % 注意してください。 % \end{chuui} %\else -% \begin{chuui}[] -% This document provides a brief description of \pLaTeXe, the Japanese -% extended version of \LaTeXe. Current maintainer of -% \pLaTeXe\ is Japanese \TeX\ Development Community. -% \end{chuui} +% ^^A \begin{chuui}[] +% ^^A This document provides a brief description of \pLaTeXe, the Japanese +% ^^A extended version of \LaTeXe. Current maintainer of +% ^^A \pLaTeXe\ is Japanese \TeX\ Development Community. +% ^^A \end{chuui} %\fi % %\ifJAPANESE -% 2010年以降、アスキー\pTeX{}は、国際的に広く使われている\TeX\ Liveという -% ディストリビューションに取り込まれ、そこで独自の改良や仕様変更が加えられ -% てきました。最近(2011年以降)の\TeX\ LiveやW32\TeX{}では、\pLaTeX{}も +% 2010年以降、アスキー\pTeX\footnote{アスキー日本語\pTeX: +% \texttt{https://asciidwango.github.io/ptex/}}は、 +% 国際的に広く使われている\TeX\ Liveというディストリビューションに +% 取り込まれ、そこで独自の改良や仕様変更が加えられてきました。 +% 最近(2011年以降)の\TeX\ LiveやW32\TeX{}では、\pLaTeX{}も % 元々の\pTeX{}ではなく、その拡張版\epTeX{}をエンジンに用いるようになって % います。また、\pLaTeX{}のベースである\LaTeX{}も更新が進められています。 % @@ -245,23 +251,24 @@ % \def\JLaTeX{\leavevmode\lower.5ex\hbox{J}\kern-.15em\LaTeX} % \pLaTeX\ is a Japanese \LaTeX\ format, which is adjusted/extended % to be more suitable for writing Japanese documents. -% It requires \pTeX, a \TeX\ engine with extensions for -% Japanese typesetting, which is designed for high-quality +% It requires \pTeX\footnote{The \pTeX\ website: +% \texttt{https://asciidwango.github.io/ptex/} (in Japanese)}, +% a \TeX\ engine with extensions for Japanese typesetting, +% which is designed for high-quality % Japanese book ``p''ublishing.\footnote{There is another % old implementation of Japanese \LaTeX, called % \JLaTeX\ (not available in \TeX\ Live). % Also, MiK\TeX\ has another program \texttt{platex}, but -% it has nothing to do with our Japanese \pLaTeX!} The developent of -% both \pTeX\ and \pLaTeX\ was done by ASCII Corporation (and its -% successor ASCII Media Works\footnote{The \pTeX\ website: -% \texttt{http://ascii.asciimw.jp/pb/ptex/} (closed in 2016).}), -% so they are often refered to as ``ASCII \pTeX'' and ``ASCII \pLaTeX'' +% it has nothing to do with our Japanese \pLaTeX!} +% Both \pTeX\ and \pLaTeX\ were developed by ASCII Corporation +% (and its successor ASCII Media Works), +% so they are often referred to as ``ASCII \pTeX'' and ``ASCII \pLaTeX'' % respectively. % % In 2010, ASCII \pTeX\ was incorporated into the % world-wide \TeX\ distribution, \TeX\ Live. Since then, \pTeX\ has % been maintained/improved/changed along with \TeX\ Live sources. -% In recent versions of \TeX\ Live and W32\TeX\ (arround 2011), +% In recent versions of \TeX\ Live and W32\TeX\ (around 2011), % the default engine of \pLaTeX\ changed from original \pTeX\ to % \epTeX\ (\pTeX\ with \eTeX\ extension). % Also, the original \LaTeX\ itself is also frequently updated. @@ -1241,7 +1248,7 @@ all others indicate the places where it is used.} \edef\@date{\@date\space Pre-Release\patchdate} \fi\fi -% Add the last update info, in case formate date unchanged +% Add the last update info, in case format date unchanged % Note: \@ifl@t@r can be used only in preamble. \def\lastupd@te{0000/00/00} \begingroup diff --git a/Master/texmf-dist/source/platex/base/platexrelease.dtx b/Master/texmf-dist/source/platex/base/platexrelease.dtx index 2defdcf9489..d230ade5fd2 100644 --- a/Master/texmf-dist/source/platex/base/platexrelease.dtx +++ b/Master/texmf-dist/source/platex/base/platexrelease.dtx @@ -307,9 +307,8 @@ of this package available from CTAN} % % \section{注意:p\LaTeXe{}のバグ情報} % -% 以下の日付のp\LaTeXe{}にはcriticalなバグがあることを、 -% 日本語\TeX{}開発コミュニティが把握しています。 -% エミュレートしようと考えている場合は、注意してください。 +% 過去のp\LaTeXe{}には何度かcriticalなバグがあったため、 +% そのバージョンをエミュレートした場合に警告が出るようにします。 % \changes{v1.0d}{2016/06/08}{p\LaTeX\ \texttt{!<2016/04/17!>}版と % p\LaTeX\ \texttt{!<2016/05/07!>}版に警告} % \changes{v1.0e}{2016/06/30}{p\LaTeX\ \texttt{!<2016/06/10!>}版に警告} @@ -324,6 +323,7 @@ of this package available from CTAN} some critical bugs. We advise you to\MessageBreak select another format date} \plIncludeInRelease{2017/10/28}{\PackageWarning}{pLaTeX Info}% + % * <2019-10-01> % * <2019-04-06> % * <2018-12-01> % * <2018-07-28>+1 diff --git a/Master/texmf-dist/source/platex/base/plcore.dtx b/Master/texmf-dist/source/platex/base/plcore.dtx index d71af9c45f7..8f38335c096 100644 --- a/Master/texmf-dist/source/platex/base/plcore.dtx +++ b/Master/texmf-dist/source/platex/base/plcore.dtx @@ -116,13 +116,17 @@ % (sync with ltfinal 2018/08/24 v2.1f)} % \changes{v1.3b}{2019/02/08}{中央揃えのセルでの\cs{unskip}対策 % (sync with lttab 2018/12/30 v1.1p)} +% \changes{v1.3c}{2019/09/16}{Make \cs{AtBeginDvi} robust +% (sync with ltoutput.dtx 2019/08/27 v1.4e)} +% \changes{v1.3c}{2019/09/16}{Make \cs{underline} robust +% (sync with ltboxes.dtx 2019/08/27 v1.3b)} % \fi % % \iffalse %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{plcore.dtx}[2019/02/08 v1.3b pLaTeX core file] +\ProvidesFile{plcore.dtx}[2019/09/16 v1.3c pLaTeX core file] % \iffalse \documentclass{jltxdoc} \GetFileInfo{plcore.dtx} @@ -1438,23 +1442,34 @@ % \end{center} % と仮定します。この仮定に従い、|\AtBeginDvi|を再定義します。 % \changes{v1.2f}{2016/06/30}{\cs{@begindvibox}を常に横組に} +% \changes{v1.3c}{2019/09/16}{Make \cs{AtBeginDvi} robust +% (sync with ltoutput.dtx 2019/08/27 v1.4e)} % \begin{macrocode} % -%\plIncludeInRelease{2016/07/01}{\AtBeginDvi} -% {Fix for incompatible direction}% +%\plIncludeInRelease{2019/10/01}{\AtBeginDvi} +% {Make robust}% %<*plcore|platexrelease> -\def \AtBeginDvi #1{% +\DeclareRobustCommand \AtBeginDvi [1]{% \global \setbox \@begindvibox \vbox{\yoko \unvbox \@begindvibox #1}% } % %\plEndIncludeInRelease +%\plIncludeInRelease{2016/07/01}{\AtBeginDvi} +% {Fix for incompatible direction}% +%\def \AtBeginDvi #1{% +% \global \setbox \@begindvibox +% \vbox{\yoko \unvbox \@begindvibox #1}% +%} +%\expandafter \let \csname AtBeginDvi \endcsname \@undefined +%\plEndIncludeInRelease %\plIncludeInRelease{0000/00/00}{\AtBeginDvi} % {LaTeX2e original}% %\def \AtBeginDvi #1{% % \global \setbox \@begindvibox % \vbox{\unvbox \@begindvibox #1}% %} +%\expandafter \let \csname AtBeginDvi \endcsname \@undefined %\plEndIncludeInRelease %<*plcore> % \end{macrocode} @@ -2275,22 +2290,33 @@ % \begin{macro}{\underline} % 下線を引く命令です。もとは\file{ltboxes.dtx}で定義されています。 % \changes{v1.2c}{2016/02/28}{1.2bと同様の修正を\cs{underline}命令にも行った} +% \changes{v1.3c}{2019/09/16}{Make \cs{underline} robust +% (sync with ltboxes.dtx 2019/08/27 v1.3b)} % \begin{macrocode} -%\plIncludeInRelease{2016/04/17}{\underline} -% {Remove extra \xkanjiskip}% +%\plIncludeInRelease{2019/10/01}{\underline} +% {Make robust}% %<*plcore|platexrelease> -\def\underline#1{% +\DeclareRobustCommand\underline[1]{% \relax \ifmmode\@@underline{#1}% \else \leavevmode\null$\@@underline{\hbox{#1}}\m@th$\null\relax\fi} % %\plEndIncludeInRelease +%\plIncludeInRelease{2016/04/17}{\underline} +% {Remove extra \xkanjiskip}% +%\def\underline#1{% +% \relax +% \ifmmode\@@underline{#1}% +% \else \leavevmode\null$\@@underline{\hbox{#1}}\m@th$\null\relax\fi} +%\expandafter \let \csname underline \endcsname \@undefined +%\plEndIncludeInRelease %\plIncludeInRelease{0000/00/00}{\underline} % {LaTeX2e original}% %\def\underline#1{% % \relax % \ifmmode\@@underline{#1}% % \else $\@@underline{\hbox{#1}}\m@th$\relax\fi} +%\expandafter \let \csname underline \endcsname \@undefined %\plEndIncludeInRelease % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/source/platex/base/plext.dtx b/Master/texmf-dist/source/platex/base/plext.dtx index 8dbce770027..438cf7c0433 100644 --- a/Master/texmf-dist/source/platex/base/plext.dtx +++ b/Master/texmf-dist/source/platex/base/plext.dtx @@ -3,7 +3,7 @@ % % Copyright 2001 ASCII Corporation. % Copyright (c) 2010 ASCII MEDIA WORKS -% Copyright (c) 2016-2018 Japanese TeX Development Community +% Copyright (c) 2016-2019 Japanese TeX Development Community % % This file is part of the pLaTeX2e system (community edition). % ------------------------------------------------------------- @@ -81,6 +81,8 @@ % 変更 (forum:2506, issue~76)} % \changes{v1.2k}{2018/10/07}{キャプションの組み方向が基本組の組み方向と % 直交する場合に、深さを忘れていたバグ修正 (forum:2506, issue~76)} +% \changes{v1.2l}{2019/09/29}{Make \cs{bou} robust} +% \changes{v1.2l}{2019/09/29}{Make \cs{kasen} robust} % \fi % % \iffalse @@ -89,7 +91,7 @@ \ProvidesFile{plext.dtx} % %\ProvidesPackage{plext} - [2018/10/07 v1.2k pLaTeX package file (community edition)] + [2019/09/29 v1.2l pLaTeX package file (community edition)] %<*driver> \documentclass{jltxdoc} \usepackage{plext} @@ -1380,8 +1382,9 @@ \def\boutenchar{\char\euc"A1A2} % \end{macrocode} % +% \changes{v1.2l}{2019/09/29}{Make \cs{bou} robust} % \begin{macrocode} -\def\bou#1{\ifvmode\leavevmode\fi\@bou#1\end} +\DeclareRobustCommand\bou[1]{\ifvmode\leavevmode\fi\@bou#1\end} \def\@bou#1{% \ifx#1\end \let\next=\relax \else @@ -1412,8 +1415,9 @@ % 縦組モードでも、回転モードの|\parbox|などで使われたときには、 % やはり引数を|\underline|に渡します。 % これ以外の場合は、引数の上に直線を引きます。 +% \changes{v1.2l}{2019/09/29}{Make \cs{kasen} robust} % \begin{macrocode} -\def\kasen#1{% +\DeclareRobustCommand\kasen[1]{% \ifydir\underline{#1}% \else\if@rotsw\underline{#1}\else \setbox\z@\hbox{#1}\leavevmode\raise.7zw diff --git a/Master/texmf-dist/source/platex/base/plfonts.dtx b/Master/texmf-dist/source/platex/base/plfonts.dtx index 78f54e1e6aa..bfe6e4913a5 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-2018 Japanese TeX Development Community +% Copyright (c) 2016-2019 Japanese TeX Development Community % % This file is part of the pLaTeX2e system (community edition). % ------------------------------------------------------------- @@ -101,13 +101,25 @@ % \changes{v1.6r}{2018/07/25}{PDFのしおりにアクセント文字が含まれる場合に対応} % \changes{v1.6r}{2018/07/25}{\cs{[no]fixcompositeaccent}マクロ追加} % \changes{v1.6r}{2018/07/25}{コード整理} +% \changes{v1.6s}{2019/08/13}{\cs{DeclareErrorKanjiFont}: +% Don't set any \cs{k@...} macros +% (sync with ltfssbas.dtx 2019/07/09 v3.2c)} +% \changes{v1.6s}{2019/08/13}{Explicitly set some defaults +% after \cs{DeclareErrorKanjiFont} change +% (sync with ltfssini.dtx 2019/07/09 v3.1c)} +% \changes{v1.6t}{2019/09/16}{Make \cs{strut}, \cs{tstrut} etc. robust +% (sync with ltdefns.dtx 2019/08/27 v1.5f)} +% \changes{v1.6t}{2019/09/16}{Make \cs{usefont} etc. robust +% (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} % \fi % % \iffalse %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{plfonts.dtx}[2018/07/25 v1.6r pLaTeX New Font Selection Scheme] +\ProvidesFile{plfonts.dtx}[2019/09/29 v1.6u pLaTeX New Font Selection Scheme] % \iffalse \documentclass{jltxdoc} \GetFileInfo{plfonts.dtx} @@ -181,7 +193,7 @@ %<*trace> \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{ptrace} - [2017/08/05 v1.6h Standard pLaTeX package (font tracing)] + [2019/09/16 v1.6t Standard pLaTeX package (font tracing)] \RequirePackageWithOptions{tracefnt} % % \end{macrocode} @@ -508,13 +520,13 @@ % \changes{v1.6f}{2017/02/20}{\cs{strutbox}を縦横両対応に} % \begin{macrocode} %\plIncludeInRelease{2017/04/08}{\strutbox} -% {Add \strutbox}% +% {Macro definition of \strutbox}% %<*plcore|platexrelease> \def\strutbox{\iftdir\tstrutbox\else\ystrutbox\fi} % %\plEndIncludeInRelease %\plIncludeInRelease{0000/00/00}{\strutbox} -% {Add \strutbox}% +% {LaTeX2e original}% %\newbox\strutbox % emulation purpose only %\plEndIncludeInRelease % \end{macrocode} @@ -524,45 +536,73 @@ % ディレクションに応じて|\ystrutbox|と|\tstrutbox|を使い分けます。 % ^^A |\strutbox|は|\yoko|ディレクションで組まれていますので、 % ^^A 縦組ボックス内で|\unhcopy|をするとエラーとなります。 -% 元々このマクロは\file{ltplain.dtx}で定義されています。 +% オリジナルの\LaTeX{}では\file{ltplain.dtx}で定義されていますが、 +% \LaTeXe\ 2019-10-01以降ではさらに\file{ltdefns.dtx}で +% |\MakeRobust|を前置されるため、robustになります。 % % \changes{v1.1c}{1995/08/24}{``\cs{centerling}~\cs{strut}''の幅がゼロに % なってしまうのを修正} % \changes{v1.3h}{1999/08/09}{縦組のとき、幅のあるボックスになってしまう % のを修正} % \changes{v1.6f}{2017/02/20}{\cs{strutbox}の代わりに\cs{ystrutbox}を使用} +% \changes{v1.6t}{2019/09/16}{Make \cs{strut}, \cs{tstrut} etc. robust +% (sync with ltdefns.dtx 2019/08/27 v1.5f)} % \begin{macrocode} -%\plIncludeInRelease{2017/04/08}{\strut} -% {Use \ystrutbox}% +%\plIncludeInRelease{2019/10/01}{\strut} +% {Make robust}% %<*plcore|platexrelease> -\def\strut{\relax - \ifydir - \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi - \else +\DeclareRobustCommand\strut{\relax + \iftdir \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi + \else + \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi \fi} % %\plEndIncludeInRelease -%\plIncludeInRelease{0000/00/00}{\strut} +%\plIncludeInRelease{2017/04/08}{\strut} % {Use \ystrutbox}% %\def\strut{\relax % \ifydir +% \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi +% \else +% \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi +% \fi} +%\expandafter \let \csname strut \endcsname \@undefined +%\plEndIncludeInRelease +%\plIncludeInRelease{0000/00/00}{\strut} +% {ASCII Corporation original}% +%\def\strut{\relax +% \ifydir % \ifmmode\copy\strutbox\else\unhcopy\strutbox\fi % \else % \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi % \fi} +%\expandafter \let \csname strut \endcsname \@undefined %\plEndIncludeInRelease -%<*plcore> % \end{macrocode} % \end{macro} % % \begin{macro}{\tstrut} % \begin{macro}{\zstrut} % \begin{macrocode} -\def\tstrut{\relax\hbox{\tate +%\plIncludeInRelease{2019/10/01}{\tstrut} +% {Make robust}% +%<*plcore|platexrelease> +\DeclareRobustCommand\tstrut{\relax\hbox{\tate \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi}} -\def\zstrut{\relax\hbox{\tate +\DeclareRobustCommand\zstrut{\relax\hbox{\tate \ifmmode\copy\zstrutbox\else\unhcopy\zstrutbox\fi}} +% +%\plEndIncludeInRelease +%\plIncludeInRelease{0000/00/00}{\tstrut} +% {ASCII Corporation original}% +%\def\tstrut{\relax\hbox{\tate +% \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi}} +%\def\zstrut{\relax\hbox{\tate +% \ifmmode\copy\zstrutbox\else\unhcopy\zstrutbox\fi}} +%\expandafter \let \csname tstrut \endcsname \@undefined +%\expandafter \let \csname zstrut \endcsname \@undefined +%\plEndIncludeInRelease % \end{macrocode} % \end{macro} % \end{macro} @@ -570,17 +610,23 @@ % \begin{macro}{\ystrut} % \changes{v1.6f}{2017/02/20}{\cs{ystrut}を追加} % \begin{macrocode} -% -%\plIncludeInRelease{2017/04/08}{\ystrut} -% {Add \ystrut}% +%\plIncludeInRelease{2019/10/01}{\ystrut} +% {Make robust}% %<*plcore|platexrelease> -\def\ystrut{\relax\hbox{\yoko +\DeclareRobustCommand\ystrut{\relax\hbox{\yoko \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi}} % %\plEndIncludeInRelease +%\plIncludeInRelease{2017/04/08}{\ystrut} +% {Add \ystrut}% +%\def\ystrut{\relax\hbox{\yoko +% \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi}} +%\expandafter \let \csname ystrut \endcsname \@undefined +%\plEndIncludeInRelease %\plIncludeInRelease{0000/00/00}{\ystrut} % {Add \ystrut}% %\let\ystrut\@undefined +%\expandafter \let \csname ystrut \endcsname \@undefined %\plEndIncludeInRelease %<*plcore> % \end{macrocode} @@ -734,7 +780,7 @@ % %\plEndIncludeInRelease %\plIncludeInRelease{0000/00/00}{\DeclareFontEncoding@} -% {UTF-8 Encoding}% +% {ASCII Corporation original}% %\def\DeclareFontEncoding@#1#2#3{% % \expandafter % \ifx\csname T@#1\endcsname\relax @@ -925,12 +971,10 @@ % \end{macrocode} % \end{macro} % -% % \begin{macro}{\DeclareKanjiSubstitution} -% \begin{macro}{\DeclareErrorKanjiFont} % 目的の和文フォントが見つからなかったときに使うフォントの宣言をする % コマンドです。 -% それぞれ、|\DeclareFontSubstitution|と|\DeclareErrorFont|に対応します。 +% |\DeclareFontSubstitution|に対応します。 % \begin{macrocode} \def\DeclareKanjiSubstitution#1#2#3#4{% \expandafter\ifx\csname T@#1\endcsname\relax @@ -953,7 +997,20 @@ \def\default@series{#3}% \def\default@shape{#4}}% \fi} +\@onlypreamble\DeclareKanjiSubstitution +% \end{macrocode} +% \end{macro} % +% \begin{macro}{\DeclareErrorKanjiFont} +% |\DeclareErrorFont|に対応するコマンドです。 +% \changes{v1.6s}{2019/08/13}{\cs{DeclareErrorKanjiFont}: +% Don't set any \cs{k@...} macros +% (sync with ltfssbas.dtx 2019/07/09 v3.2c)} +% \begin{macrocode} +% +%\plIncludeInRelease{2019/10/01}{\DeclareErrorKanjiFont} +% {No side effects please}% +%<*plcore|platexrelease> \def\DeclareErrorKanjiFont#1#2#3#4#5{% \xdef\error@kfontshape{% \noexpand\expandafter\noexpand\split@name\noexpand\string @@ -962,17 +1019,29 @@ \gdef\default@k@family{#2}% \gdef\default@k@series{#3}% \gdef\default@k@shape{#4}% - \global\let\k@family\default@k@family - \global\let\k@series\default@k@series - \global\let\k@shape\default@k@shape - \gdef\f@size{#5}% - \gdef\f@baselineskip{#5pt}} -% -\@onlypreamble\DeclareKanjiSubstitution + } +% +%\plEndIncludeInRelease +%\plIncludeInRelease{0000/00/00}{\DeclareErrorKanjiFont} +% {ASCII Corporation original}% +%\def\DeclareErrorKanjiFont#1#2#3#4#5{% +% \xdef\error@kfontshape{% +% \noexpand\expandafter\noexpand\split@name\noexpand\string +% \expandafter\noexpand\csname#1/#2/#3/#4/#5\endcsname +% \noexpand\@nil}% +% \gdef\default@k@family{#2}% +% \gdef\default@k@series{#3}% +% \gdef\default@k@shape{#4}% +% \global\let\k@family\default@k@family +% \global\let\k@series\default@k@series +% \global\let\k@shape\default@k@shape +% \gdef\f@size{#5}% +% \gdef\f@baselineskip{#5pt}} +%\plEndIncludeInRelease +%<*plcore> \@onlypreamble\DeclareErrorKanjiFont % \end{macrocode} % \end{macro} -% \end{macro} % % % \begin{macro}{\DeclareFixedFont} @@ -1202,16 +1271,32 @@ % % % \begin{macro}{\if@knjcmd} -% \begin{macro}{\userelfont} % |\if@knjcmd|は欧文書体を従属書体にするかどうかのフラグです。 % このフラグが真になると、欧文書体に従属書体が使われます。 -% このフラグは|\userelfont|コマンドによって、\emph{真}となります。 -% そして|\selectfont|実行後には\emph{偽}に初期化されます。 % \begin{macrocode} \newif\if@knjcmd -\def\userelfont{\@knjcmdtrue} % \end{macrocode} % \end{macro} +% +% \begin{macro}{\userelfont} +% |\if@knjcmd|フラグは|\userelfont|コマンドによって、\emph{真}となります。 +% そして|\selectfont|実行後には\emph{偽}に初期化されます。 +% \changes{v1.6u}{2019/09/29}{Make \cs{userelfont} robust} +% \begin{macrocode} +% +%\plIncludeInRelease{2019/10/01}{\userelfont} +% {Make robust}% +%<*plcore|platexrelease> +\DeclareRobustCommand\userelfont{\@knjcmdtrue} +% +%\plEndIncludeInRelease +%\plIncludeInRelease{0000/00/00}{\userelfont} +% {ASCII Corporation original}% +%\def\userelfont{\@knjcmdtrue} +%\expandafter \let \csname userelfont \endcsname \@undefined +%\plEndIncludeInRelease +%<*plcore> +% \end{macrocode} % \end{macro} % % \begin{macro}{\selectfont} @@ -1359,7 +1444,7 @@ % %\plEndIncludeInRelease %\plIncludeInRelease{0000/00/00}{\set@fontsize} -% {Construct \ystrutbox}% +% {ASCII Corporation original}% %\def\set@fontsize#1#2#3{% % \@defaultunits\@tempdimb#2pt\relax\@nnil % \edef\f@size{\strip@pt\@tempdimb}% @@ -1424,7 +1509,7 @@ % 全角空白(EUCコード\texttt{0xA1A1})はJFMで特殊なタイプに分類される可能性 % があるため、和文書体の基準を「漢」(JISコード\texttt{0x3441})へ変更しました。 % \changes{v1.6h}{2017/08/05}{和文書体の基準を全角空白から「漢」に変更} -% +% \changes{v1.6u}{2019/09/29}{Make \cs{adjustbaseline} robust} % \begin{macrocode} \newbox\adjust@box \newdimen\adjust@dimen @@ -1432,10 +1517,10 @@ % % \begin{macrocode} % -%\plIncludeInRelease{2017/07/29}{\adjustbaseline} -% {Change zenkaku reference}% +%\plIncludeInRelease{2019/10/01}{\adjustbaseline} +% {Make robust}% %<*plcore|platexrelease|trace> -\def\adjustbaseline{% +\DeclareRobustCommand\adjustbaseline{% % \end{macrocode} % 和文フォントの基準値を設定します。 % \begin{macrocode} @@ -1475,9 +1560,36 @@ \fi} % %\plEndIncludeInRelease -%\plIncludeInRelease{0000/00/00}{\adjustbaseline} +%\plIncludeInRelease{2017/07/29}{\adjustbaseline} % {Change zenkaku reference}% %\def\adjustbaseline{% +% \setbox\adjust@box\hbox{\char\jis"3441}%" +% \cht\ht\adjust@box +% \cdp\dp\adjust@box +% \cwd\wd\adjust@box +% \cvs\normalbaselineskip +% \chs\cwd +% \cHT\cht \advance\cHT\cdp +% \iftdir +% \setbox\adjust@box\hbox{\tbaselineshift\z@ M}% +% \adjust@dimen\ht\adjust@box +% \advance\adjust@dimen\dp\adjust@box +% \advance\adjust@dimen-\cHT +% \divide\adjust@dimen\tw@ +% \advance\adjust@dimen\cdp +% \advance\adjust@dimen-\dp\adjust@box +% \tbaselineshift\adjust@dimen +%<*trace> +% \ifnum \tracingfonts>\tw@ +% \typeout{baselineshift:\the\tbaselineshift}% +% \fi +% +% \fi} +%\expandafter \let \csname adjustbaseline \endcsname \@undefined +%\plEndIncludeInRelease +%\plIncludeInRelease{0000/00/00}{\adjustbaseline} +% {ASCII Corporation original}% +%\def\adjustbaseline{% % \setbox\adjust@box\hbox{\char\euc"A1A1}%" % \cht\ht\adjust@box % \cdp\dp\adjust@box @@ -1500,6 +1612,7 @@ % \fi % % \fi} +%\expandafter \let \csname adjustbaseline \endcsname \@undefined %\plEndIncludeInRelease %<*plcore> % \end{macrocode} @@ -1820,20 +1933,48 @@ % % |\usefont|コマンドは、第一引数で指定されるエンコードによって、 % 和文または欧文フォントを切り替えます。 +% \changes{v1.6t}{2019/09/16}{Make \cs{usefont} etc. robust +% (sync with ltfssbas.dtx 2019/08/27 v3.2d)} % \begin{macrocode} -\def\usekanji#1#2#3#4{% +% +%\plIncludeInRelease{2019/10/01}{\usefont} +% {Make robust}% +%<*plcore|platexrelease> +\DeclareRobustCommand\usekanji[4]{% \kanjiencoding{#1}\kanjifamily{#2}\kanjiseries{#3}\kanjishape{#4}% \selectfont\ignorespaces} -\def\useroman#1#2#3#4{% +\DeclareRobustCommand\useroman[4]{% \romanencoding{#1}\romanfamily{#2}\romanseries{#3}\romanshape{#4}% \selectfont\ignorespaces} -\def\usefont#1#2#3#4{% +\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{% +% \kanjiencoding{#1}\kanjifamily{#2}\kanjiseries{#3}\kanjishape{#4}% +% \selectfont\ignorespaces} +%\def\useroman#1#2#3#4{% +% \romanencoding{#1}\romanfamily{#2}\romanseries{#3}\romanshape{#4}% +% \selectfont\ignorespaces} +%\def\usefont#1#2#3#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} +%\expandafter \let \csname usekanji \endcsname \@undefined +%\expandafter \let \csname useroman \endcsname \@undefined +%\expandafter \let \csname usefont \endcsname \@undefined +%\plEndIncludeInRelease +%<*plcore> % \end{macrocode} % \end{macro} % \end{macro} @@ -1932,7 +2073,7 @@ % %\plEndIncludeInRelease %\plIncludeInRelease{0000/00/00}{\textunderscore} -% {Baseline shift for \textunderscore}% +% {ASCII Corporation original}% %\DeclareTextCommandDefault{\textunderscore}{% % \leavevmode\kern.06em % \iftdir\raise-\tbaselineshift\fi @@ -2125,7 +2266,7 @@ % \changes{v1.6c}{2016/06/06}{v1.6aでの誤った再定義を削除(forum:1941)} % \begin{macrocode} %\plIncludeInRelease{2016/06/10}{\@text@composite} -% {Fix for non-zero baselineshift (wrong)}% +% {Fix for non-zero baselineshift (revert)}% %\def\@text@composite#1#2#3\@text@composite{% % \expandafter\@text@composite@x % \csname\string#1-\string#2\endcsname} @@ -2140,7 +2281,7 @@ % \csname\string#1-\string#2\endcsname} %\plEndIncludeInRelease %\plIncludeInRelease{0000/00/00}{\@text@composite} -% {Fix for non-zero baselineshift (wrong)}% +% {LaTeX2e original}% %\def\@text@composite#1#2#3\@text@composite{% % \expandafter\@text@composite@x % \csname\string#1-\string#2\endcsname} @@ -2443,7 +2584,7 @@ %} %\plEndIncludeInRelease %\plIncludeInRelease{0000/00/00}{\check@nocorr@} -% {Italic correction before \textt...}% +% {ASCII Corporation original}% %\def \check@nocorr@ #1#2\nocorr#3\@nil {% % \let \check@icl \relax % changed from \maybe@ic % \def \check@icr {\ifvmode \else \aftergroup \maybe@ic \fi}% @@ -2493,19 +2634,27 @@ % \begin{macrocode} %<*pldefs> \ProvidesFile{pldefs.ltx} - [2018/02/04 v1.6l pLaTeX Kernel (Default settings)] + [2019/09/16 v1.6t pLaTeX Kernel (Default settings)] % % \end{macrocode} % % \subsection{テキストフォント} % テキストフォントのための属性やエラー書体などの宣言です。 % p\LaTeX{}のデフォルトの横組エンコードはJY1、縦組エンコードはJT1とします。 +% +% \changes{v1.6s}{2019/08/13}{Explicitly set some defaults +% after \cs{DeclareErrorKanjiFont} change +% (sync with ltfssini.dtx 2019/07/09 v3.1c)} % \noindent % 縦横エンコード共通: % \begin{macrocode} %<*pldefs> \DeclareKanjiEncodingDefaults{}{} \DeclareErrorKanjiFont{JY1}{mc}{m}{n}{10} +\kanjifamily{mc} +\kanjiseries{m} +\kanjishape{n} +\fontsize{10}{10} % \end{macrocode} % 横組エンコード: % \begin{macrocode} @@ -2705,7 +2854,7 @@ % %\plEndIncludeInRelease %\plIncludeInRelease{0000/00/00}{\<} -% {\inhibitglue in vertical mode}% +% {ASCII Corporation original}% %\def\<{\inhibitglue} %\plEndIncludeInRelease %<*pldefs> diff --git a/Master/texmf-dist/source/platex/base/plnewsc13.tex b/Master/texmf-dist/source/platex/base/plnewsc13.tex new file mode 100644 index 00000000000..c58a5bd961c --- /dev/null +++ b/Master/texmf-dist/source/platex/base/plnewsc13.tex @@ -0,0 +1,91 @@ +%% <2019-04-06> and <2019-10-01> +\documentclass{plnews} + +\publicationyear{2019}% 発行年 +\publicationmonth{10}% 発行月 +\publicationissue{c13}% 番号 +\author{日本語\TeX{}開発コミュニティ(\texttt{https://texjp.org/})} + +\def\cs#1{\texttt{\char92\nobreak #1}} +\def\pTeX{p\kern-.15em\TeX} +\def\eTeX{$\varepsilon$-\TeX} +\def\epTeX{$\varepsilon$-\pTeX} +\def\pLaTeX{p\kern-.05em\LaTeX} +\def\pLaTeXe{p\kern-.05em\LaTeXe} +\xspcode`\\=1 + +\begin{document} + +\maketitle + +コミュニティ版\pLaTeXe\ \texttt{<2019-04-06>}および +\texttt{<2019-10-01>}について、 +\pLaTeXe\ \texttt{<2018-12-01>}からの更新箇所をまとめます。 + + +\section{標準クラスの新元号対応} +\pLaTeXe\ \texttt{<2019-04-06>}では、付属の標準クラス +(jarticle, jbook, jreport, tarticle, tbook, treport)で +\cs{和暦} を指定した場合の \cs{today} について、 +2019年5月1日から施行予定の新元号「令和」に対応しました。 +\begin{itemize} +\item {\year=2019 \month=4 \day=30 + \西暦\today $\rightarrow$ \和暦\today} +\item {\year=2019 \month=5 \day=1 + \西暦\today $\rightarrow$ \和暦\today} +\item {\year=2020 \month=1 \day=2 + \西暦\today $\rightarrow$ \和暦\today} +\end{itemize} +また、縦数式ディレクションで \cs{today} を使った場合、 +従来は縦組と同じく漢数字に変換されていましたが、 +このバージョンからは算用数字としました。 + + +\section{\LaTeXe\ \texttt{<2019-10-01>}対応} +オリジナルの\LaTeX に合わせるため、\pLaTeX へも +いくつか修正を加えました。 + +\pLaTeXe\ \texttt{<2019-04-06>}時点では +\begin{itemize} +\item 表組み(tabular環境)のマクロの微修正 +\end{itemize} +に対応しました。 + +\pLaTeXe\ \texttt{<2019-10-01>}時点では、さらに +\begin{itemize} +\item \cs{DeclareErrorKanjiFont}が\cs{k@family}等を定義しない + ように(\cs{DeclareErrorFont}に追随) +\item ユーザ用コマンドをrobustに + \begin{itemize} + \item \cs{strut}関係 (\cs{\{t,z,y\}strut}) + \item \cs{usefont}関係 (\cs{use\{roman,kanji\}}) + \item \cs{userelfont}, \cs{adjustbaseline} + \item \cs{AtBeginDvi}, \cs{underline} + \item plextパッケージの\cs{bou}, \cs{kasen} + \end{itemize} +\end{itemize} +にも対応しました。 + +\section{開発版のテストのお願い} +今後\pLaTeX{}に導入するかもしれない修正パッチや仕様変更のテストに +ご協力ください。\TeX{}ファイルの冒頭(|\documentclass|より前)で +\begin{verbatim} + \RequirePackage{exppl2e} +\end{verbatim} +と書くことで、現在の開発版をテストすることができます。 +現在は +\begin{itemize} + \item 支柱コマンドで用いられる|\strut|の挙動 + \item 空のフロートだけのページが発生した場合の処理 +\end{itemize} +に関するパッチが入っています。 + +詳細は\file{exppl2e.pdf}を参照してください。ここには、 +その他の\pLaTeXe{}の既知の制約事項も記載しています。 +\TeX\ ForumやGitHubのIssueでのバグ報告やご意見を歓迎します。 +\begin{itemize} +\item \texttt{https://github.com/texjporg/platex} +\item \texttt{https://github.com/texjporg/uplatex} +\end{itemize} + +\end{document} diff --git a/Master/texmf-dist/source/platex/base/plvers.dtx b/Master/texmf-dist/source/platex/base/plvers.dtx index 9944cbfc1c9..e465f2dab7d 100644 --- a/Master/texmf-dist/source/platex/base/plvers.dtx +++ b/Master/texmf-dist/source/platex/base/plvers.dtx @@ -65,9 +65,9 @@ % \changes{v1.1}{2016/09/14}{起動時のバナーを取得するコードを改良} % \changes{v1.1a}{2017/02/20}{\LaTeX\ \texttt{!<2017/01/01!>}版対応確認} % \changes{v1.1b}{2017/03/19}{\cs{l@nohyphenation}の定義を保証 -% (sync with ltfinal 2017/03/09 v2.0t)} +% (sync with ltfinal.dtx 2017/03/09 v2.0t)} % \changes{v1.1b}{2017/03/19}{\cs{document@default@language}の定義を保証 -% (sync with ltfinal 2017/03/09 v2.0t)} +% (sync with ltfinal.dtx 2017/03/09 v2.0t)} % \changes{v1.1c}{2017/04/23}{\LaTeX\ \texttt{!<2017-04-15!>}版対応確認} % \changes{v1.1d}{2017/09/24}{パッチレベルが負の数の場合をpre-release扱いへ} % \changes{v1.1e}{2017/11/09}{\file{latexrelease}と @@ -78,7 +78,7 @@ % \cs{pfmtname}, \cs{pfmtversion}, \cs{ppatch@level}を展開しないように} % \changes{v1.1h}{2018/01/10}{Modify \cs{plIncludeInRelease} code % to check matching \cs{plEndIncluderelease} -% (sync with ltvers 2018/01/08 v1.1a)} +% (sync with ltvers.dtx 2018/01/08 v1.1a)} % \changes{v1.1i}{2018/03/31}{\LaTeXe\ 2017-04-15以降必須} % \changes{v1.1j}{2018/04/07}{\LaTeX\ \texttt{!<2018-04-01!>}版対応確認} % \changes{v1.1k}{2018/04/08}{バナー調節のコードを最後(plfinal)ではなく @@ -89,12 +89,15 @@ % \changes{v1.1n}{2018/10/31}{\LaTeXe{}とp\LaTeXe{}の更新タイミングずれ対策を % \file{plvers.dtx} (plfinal) から\file{plcore.dtx}へ移動} % \changes{v1.1o}{2018/12/01}{\LaTeX\ \texttt{!<2018-12-01!>}版対応確認} +% \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!>}版対応確認} % \fi % % \iffalse %<*driver> % \fi -\ProvidesFile{plvers.dtx}[2018/12/01 v1.1o pLaTeX Kernel (Version Info)] +\ProvidesFile{plvers.dtx}[2019/10/01 v1.1q pLaTeX Kernel (Version Info)] % \iffalse \documentclass{jltxdoc} \GetFileInfo{plvers.dtx} @@ -132,6 +135,7 @@ % \changes{v1.1c}{2017/04/23}{\LaTeX\ \texttt{!<2017-04-15!>}版対応確認} % \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!>}版対応確認} % % このバージョンのp\LaTeXe{}は、次のバージョンの\LaTeX{}\footnote{% % \LaTeX\ authors: Johannes Braams, David Carlisle, Alan Jeffrey, @@ -145,7 +149,7 @@ %\edef\latexreleaseversion %\edef\p@known@latexreleaseversion %<*2ekernel|latexrelease|platexrelease> - {2018-12-01} + {2019-10-01} % % \end{macrocode} % @@ -186,7 +190,7 @@ % %\edef\platexreleaseversion %<*plcore|platexrelease> - {2019-04-06} + {2019-10-01} % %<*plcore> \def\ppatch@level{0} @@ -345,9 +349,9 @@ % ^^A (ハイフネーション関連パラメータの定義)は、 % ^^A \file{plvers.dtx}から\file{plcore.dtx}へ移動しました。 % \changes{v1.1b}{2017/03/19}{\cs{l@nohyphenation}の定義を保証 -% (sync with ltfinal 2017/03/09 v2.0t)} +% (sync with ltfinal.dtx 2017/03/09 v2.0t)} % \changes{v1.1b}{2017/03/19}{\cs{document@default@language}の定義を保証 -% (sync with ltfinal 2017/03/09 v2.0t)} +% (sync with ltfinal.dtx 2017/03/09 v2.0t)} % \changes{v1.1n}{2018/10/31}{\LaTeXe{}とp\LaTeXe{}の更新タイミングずれ対策を % \file{plvers.dtx} (plfinal) から\file{plcore.dtx}へ移動} % @@ -362,7 +366,9 @@ % \cs{platexrelease}のエミュレート内部処理を分離} % \changes{v1.1h}{2018/01/10}{Modify \cs{plIncludeInRelease} code % to check matching \cs{plEndIncluderelease} -% (sync with ltvers 2018/01/08 v1.1a)} +% (sync with ltvers.dtx 2018/01/08 v1.1a)} +% \changes{v1.1p}{2019/09/16}{エラーメッセージを更新 +% (sync with ltvers.dtx 2019/07/01 v1.1c)} % % \iffalse % 備忘録:\LaTeX{}では\cs{if@includeinrelease}の定義を @@ -378,7 +384,8 @@ \def\plIncludeInRelease#1{% \if@plincludeinrelease \PackageError{platexrelease} - {mis-matched \string\plIncludeInRelease}{}% + {mis-matched \string\plIncludeInRelease}% + {There is an \string\plEndIncludeRelease\space missing}% \@plincludeinreleasefalse \fi \kernel@ifnextchar[% @@ -431,7 +438,7 @@ #2#3\@end@check@plIncludeInRelease{% \ifx\@check@plIncludeInRelease#2\else \PackageError{platexrelease} - {skipped \string\plIncludeInRelease}{}% + {skipped \string\plIncludeInRelease\space for tag \string#2}{}% \fi} % % \end{macrocode} diff --git a/Master/texmf-dist/tex/platex/base/exppl2e.sty b/Master/texmf-dist/tex/platex/base/exppl2e.sty index b4eadb72265..9fab0c5b09f 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} - [2018/12/02 v1.1c Experimental pLaTeX2e features] + [2019/09/16 v1.1d Experimental pLaTeX2e features] \PackageWarningNoLine{exppl2e}{% This is the unstable, experimental part of pLaTeX2e.\MessageBreak This package may contain:\MessageBreak @@ -296,7 +296,7 @@ % \cs{strut}を縦数式ディレクションで使った場合への修正。 % \begin{macrocode} %% \strut の改良版 -\def\strut{\relax +\DeclareRobustCommand\strut{\relax \iftdir \ifmdir %% [縦数式ディレクション] diff --git a/Master/texmf-dist/tex/platex/base/platexrelease.sty b/Master/texmf-dist/tex/platex/base/platexrelease.sty index d522fa1ee87..ffd149cdd99 100644 --- a/Master/texmf-dist/tex/platex/base/platexrelease.sty +++ b/Master/texmf-dist/tex/platex/base/platexrelease.sty @@ -16,15 +16,16 @@ %% %% File: plvers.dtx \edef\p@known@latexreleaseversion - {2018-12-01} + {2019-10-01} \edef\platexreleaseversion - {2019-04-06} + {2019-10-01} \newif\if@plincludeinrelease \@plincludeinreleasefalse \def\plIncludeInRelease#1{% \if@plincludeinrelease \PackageError{platexrelease} - {mis-matched \string\plIncludeInRelease}{}% + {mis-matched \string\plIncludeInRelease}% + {There is an \string\plEndIncludeRelease\space missing}% \@plincludeinreleasefalse \fi \kernel@ifnextchar[% @@ -63,7 +64,7 @@ #2#3\@end@check@plIncludeInRelease{% \ifx\@check@plIncludeInRelease#2\else \PackageError{platexrelease} - {skipped \string\plIncludeInRelease}{}% + {skipped \string\plIncludeInRelease\space for tag \string#2}{}% \fi} %% File: platexrelease.dtx \NeedsTeXFormat{pLaTeX2e} @@ -133,6 +134,7 @@ of this package available from CTAN} some critical bugs. We advise you to\MessageBreak select another format date} \plIncludeInRelease{2017/10/28}{\PackageWarning}{pLaTeX Info}% + % * <2019-10-01> % * <2019-04-06> % * <2018-12-01> % * <2018-07-28>+1 @@ -196,13 +198,22 @@ of this package available from CTAN} \let\ystrutbox\@undefined \plEndIncludeInRelease \plIncludeInRelease{2017/04/08}{\strutbox} - {Add \strutbox}% + {Macro definition of \strutbox}% \def\strutbox{\iftdir\tstrutbox\else\ystrutbox\fi} \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}{\strutbox} - {Add \strutbox}% + {LaTeX2e original}% \newbox\strutbox % emulation purpose only \plEndIncludeInRelease +\plIncludeInRelease{2019/10/01}{\strut} + {Make robust}% +\DeclareRobustCommand\strut{\relax + \iftdir + \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi + \else + \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi + \fi} +\plEndIncludeInRelease \plIncludeInRelease{2017/04/08}{\strut} {Use \ystrutbox}% \def\strut{\relax @@ -211,24 +222,49 @@ of this package available from CTAN} \else \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi \fi} +\expandafter \let \csname strut \endcsname \@undefined \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}{\strut} - {Use \ystrutbox}% + {ASCII Corporation original}% \def\strut{\relax \ifydir \ifmmode\copy\strutbox\else\unhcopy\strutbox\fi \else \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi \fi} +\expandafter \let \csname strut \endcsname \@undefined +\plEndIncludeInRelease +\plIncludeInRelease{2019/10/01}{\tstrut} + {Make robust}% +\DeclareRobustCommand\tstrut{\relax\hbox{\tate + \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi}} +\DeclareRobustCommand\zstrut{\relax\hbox{\tate + \ifmmode\copy\zstrutbox\else\unhcopy\zstrutbox\fi}} +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\tstrut} + {ASCII Corporation original}% +\def\tstrut{\relax\hbox{\tate + \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi}} +\def\zstrut{\relax\hbox{\tate + \ifmmode\copy\zstrutbox\else\unhcopy\zstrutbox\fi}} +\expandafter \let \csname tstrut \endcsname \@undefined +\expandafter \let \csname zstrut \endcsname \@undefined +\plEndIncludeInRelease +\plIncludeInRelease{2019/10/01}{\ystrut} + {Make robust}% +\DeclareRobustCommand\ystrut{\relax\hbox{\yoko + \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi}} \plEndIncludeInRelease \plIncludeInRelease{2017/04/08}{\ystrut} {Add \ystrut}% \def\ystrut{\relax\hbox{\yoko \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi}} +\expandafter \let \csname ystrut \endcsname \@undefined \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}{\ystrut} {Add \ystrut}% \let\ystrut\@undefined +\expandafter \let \csname ystrut \endcsname \@undefined \plEndIncludeInRelease \plIncludeInRelease{2018/04/01}{\DeclareFontEncoding@} {UTF-8 Encoding}% @@ -279,7 +315,7 @@ of this package available from CTAN} \fi \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}{\DeclareFontEncoding@} - {UTF-8 Encoding}% + {ASCII Corporation original}% \def\DeclareFontEncoding@#1#2#3{% \expandafter \ifx\csname T@#1\endcsname\relax @@ -299,6 +335,43 @@ of this package available from CTAN} } \let\DeclareFontEncoding@saved\@undefined \plEndIncludeInRelease +\plIncludeInRelease{2019/10/01}{\DeclareErrorKanjiFont} + {No side effects please}% +\def\DeclareErrorKanjiFont#1#2#3#4#5{% + \xdef\error@kfontshape{% + \noexpand\expandafter\noexpand\split@name\noexpand\string + \expandafter\noexpand\csname#1/#2/#3/#4/#5\endcsname + \noexpand\@nil}% + \gdef\default@k@family{#2}% + \gdef\default@k@series{#3}% + \gdef\default@k@shape{#4}% + } +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\DeclareErrorKanjiFont} + {ASCII Corporation original}% +\def\DeclareErrorKanjiFont#1#2#3#4#5{% + \xdef\error@kfontshape{% + \noexpand\expandafter\noexpand\split@name\noexpand\string + \expandafter\noexpand\csname#1/#2/#3/#4/#5\endcsname + \noexpand\@nil}% + \gdef\default@k@family{#2}% + \gdef\default@k@series{#3}% + \gdef\default@k@shape{#4}% + \global\let\k@family\default@k@family + \global\let\k@series\default@k@series + \global\let\k@shape\default@k@shape + \gdef\f@size{#5}% + \gdef\f@baselineskip{#5pt}} +\plEndIncludeInRelease +\plIncludeInRelease{2019/10/01}{\userelfont} + {Make robust}% +\DeclareRobustCommand\userelfont{\@knjcmdtrue} +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\userelfont} + {ASCII Corporation original}% +\def\userelfont{\@knjcmdtrue} +\expandafter \let \csname userelfont \endcsname \@undefined +\plEndIncludeInRelease \plIncludeInRelease{2017/04/08}{\set@fontsize} {Construct \ystrutbox}% \def\set@fontsize#1#2#3{% @@ -325,7 +398,7 @@ of this package available from CTAN} \let\size@update\relax}} \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}{\set@fontsize} - {Construct \ystrutbox}% + {ASCII Corporation original}% \def\set@fontsize#1#2#3{% \@defaultunits\@tempdimb#2pt\relax\@nnil \edef\f@size{\strip@pt\@tempdimb}% @@ -349,6 +422,27 @@ of this package available from CTAN} \@height.7\baselineskip \@depth.3\baselineskip}% \let\size@update\relax}} \plEndIncludeInRelease +\plIncludeInRelease{2019/10/01}{\adjustbaseline} + {Make robust}% +\DeclareRobustCommand\adjustbaseline{% + \setbox\adjust@box\hbox{\char\jis"3441}%" + \cht\ht\adjust@box + \cdp\dp\adjust@box + \cwd\wd\adjust@box + \cvs\normalbaselineskip + \chs\cwd + \cHT\cht \advance\cHT\cdp + \iftdir + \setbox\adjust@box\hbox{\tbaselineshift\z@ M}% + \adjust@dimen\ht\adjust@box + \advance\adjust@dimen\dp\adjust@box + \advance\adjust@dimen-\cHT + \divide\adjust@dimen\tw@ + \advance\adjust@dimen\cdp + \advance\adjust@dimen-\dp\adjust@box + \tbaselineshift\adjust@dimen + \fi} +\plEndIncludeInRelease \plIncludeInRelease{2017/07/29}{\adjustbaseline} {Change zenkaku reference}% \def\adjustbaseline{% @@ -369,9 +463,10 @@ of this package available from CTAN} \advance\adjust@dimen-\dp\adjust@box \tbaselineshift\adjust@dimen \fi} +\expandafter \let \csname adjustbaseline \endcsname \@undefined \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}{\adjustbaseline} - {Change zenkaku reference}% + {ASCII Corporation original}% \def\adjustbaseline{% \setbox\adjust@box\hbox{\char\euc"A1A1}%" \cht\ht\adjust@box @@ -390,6 +485,42 @@ of this package available from CTAN} \advance\adjust@dimen-\dp\adjust@box \tbaselineshift\adjust@dimen \fi} +\expandafter \let \csname adjustbaseline \endcsname \@undefined +\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{% + \kanjiencoding{#1}\kanjifamily{#2}\kanjiseries{#3}\kanjishape{#4}% + \selectfont\ignorespaces} +\def\useroman#1#2#3#4{% + \romanencoding{#1}\romanfamily{#2}\romanseries{#3}\romanshape{#4}% + \selectfont\ignorespaces} +\def\usefont#1#2#3#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} +\expandafter \let \csname usekanji \endcsname \@undefined +\expandafter \let \csname useroman \endcsname \@undefined +\expandafter \let \csname usefont \endcsname \@undefined \plEndIncludeInRelease \plIncludeInRelease{2017/04/08}{\textunderscore} {Baseline shift for \textunderscore}% @@ -401,7 +532,7 @@ of this package available from CTAN} \vbox{\hrule\@width.3em}} \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}{\textunderscore} - {Baseline shift for \textunderscore}% + {ASCII Corporation original}% \DeclareTextCommandDefault{\textunderscore}{% \leavevmode\kern.06em \iftdir\raise-\tbaselineshift\fi @@ -510,7 +641,7 @@ of this package available from CTAN} \let\pltx@isletter\@undefined \plEndIncludeInRelease \plIncludeInRelease{2016/06/10}{\@text@composite} - {Fix for non-zero baselineshift (wrong)}% + {Fix for non-zero baselineshift (revert)}% \def\@text@composite#1#2#3\@text@composite{% \expandafter\@text@composite@x \csname\string#1-\string#2\endcsname} @@ -525,7 +656,7 @@ of this package available from CTAN} \csname\string#1-\string#2\endcsname} \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}{\@text@composite} - {Fix for non-zero baselineshift (wrong)}% + {LaTeX2e original}% \def\@text@composite#1#2#3\@text@composite{% \expandafter\@text@composite@x \csname\string#1-\string#2\endcsname} @@ -728,7 +859,7 @@ of this package available from CTAN} } \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}{\check@nocorr@} - {Italic correction before \textt...}% + {ASCII Corporation original}% \def \check@nocorr@ #1#2\nocorr#3\@nil {% \let \check@icl \relax % changed from \maybe@ic \def \check@icr {\ifvmode \else \aftergroup \maybe@ic \fi}% @@ -777,7 +908,7 @@ of this package available from CTAN} \fi \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}{\<} - {\inhibitglue in vertical mode}% + {ASCII Corporation original}% \def\<{\inhibitglue} \plEndIncludeInRelease %% File: plcore.dtx @@ -1400,12 +1531,20 @@ of this package available from CTAN} \let\firstmark\botmark } \plEndIncludeInRelease +\plIncludeInRelease{2019/10/01}{\AtBeginDvi} + {Make robust}% +\DeclareRobustCommand \AtBeginDvi [1]{% + \global \setbox \@begindvibox + \vbox{\yoko \unvbox \@begindvibox #1}% +} +\plEndIncludeInRelease \plIncludeInRelease{2016/07/01}{\AtBeginDvi} {Fix for incompatible direction}% \def \AtBeginDvi #1{% \global \setbox \@begindvibox \vbox{\yoko \unvbox \@begindvibox #1}% } +\expandafter \let \csname AtBeginDvi \endcsname \@undefined \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}{\AtBeginDvi} {LaTeX2e original}% @@ -1413,6 +1552,7 @@ of this package available from CTAN} \global \setbox \@begindvibox \vbox{\unvbox \@begindvibox #1}% } +\expandafter \let \csname AtBeginDvi \endcsname \@undefined \plEndIncludeInRelease \plIncludeInRelease{2016/04/17}{\@makefnmark} {Remove extra \xkanjiskip}% @@ -1865,12 +2005,20 @@ of this package available from CTAN} \if@pboxsw \m@th$\fi \@end@tempboxa} \plEndIncludeInRelease +\plIncludeInRelease{2019/10/01}{\underline} + {Make robust}% +\DeclareRobustCommand\underline[1]{% + \relax + \ifmmode\@@underline{#1}% + \else \leavevmode\null$\@@underline{\hbox{#1}}\m@th$\null\relax\fi} +\plEndIncludeInRelease \plIncludeInRelease{2016/04/17}{\underline} {Remove extra \xkanjiskip}% \def\underline#1{% \relax \ifmmode\@@underline{#1}% \else \leavevmode\null$\@@underline{\hbox{#1}}\m@th$\null\relax\fi} +\expandafter \let \csname underline \endcsname \@undefined \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}{\underline} {LaTeX2e original}% @@ -1878,6 +2026,7 @@ of this package available from CTAN} \relax \ifmmode\@@underline{#1}% \else $\@@underline{\hbox{#1}}\m@th$\relax\fi} +\expandafter \let \csname underline \endcsname \@undefined \plEndIncludeInRelease \plIncludeInRelease{2018/03/09}% {\e@alloc@chardef}{Extended Allocation (FAM256)}% diff --git a/Master/texmf-dist/tex/platex/base/plcore.ltx b/Master/texmf-dist/tex/platex/base/plcore.ltx index b8237ce7aa9..3dcc6d0e942 100644 --- a/Master/texmf-dist/tex/platex/base/plcore.ltx +++ b/Master/texmf-dist/tex/platex/base/plcore.ltx @@ -33,7 +33,7 @@ \fi \def\pfmtname{pLaTeX2e} \def\pfmtversion - {2019-04-06} + {2019-10-01} \def\ppatch@level{0} \edef\platexBANNER{\noexpand\platexNILa \the\everyjob % LaTeX banner and delayed codes @@ -69,7 +69,8 @@ \def\plIncludeInRelease#1{% \if@plincludeinrelease \PackageError{platexrelease} - {mis-matched \string\plIncludeInRelease}{}% + {mis-matched \string\plIncludeInRelease}% + {There is an \string\plEndIncludeRelease\space missing}% \@plincludeinreleasefalse \fi \kernel@ifnextchar[% @@ -108,7 +109,7 @@ #2#3\@end@check@plIncludeInRelease{% \ifx\@check@plIncludeInRelease#2\else \PackageError{platexrelease} - {skipped \string\plIncludeInRelease}{}% + {skipped \string\plIncludeInRelease\space for tag \string#2}{}% \fi} %% File: plfonts.dtx \let\k@encoding\@empty @@ -152,17 +153,17 @@ \newbox\zstrutbox \newbox\ystrutbox \def\strutbox{\iftdir\tstrutbox\else\ystrutbox\fi} -\def\strut{\relax - \ifydir - \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi - \else +\DeclareRobustCommand\strut{\relax + \iftdir \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi + \else + \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi \fi} -\def\tstrut{\relax\hbox{\tate +\DeclareRobustCommand\tstrut{\relax\hbox{\tate \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi}} -\def\zstrut{\relax\hbox{\tate +\DeclareRobustCommand\zstrut{\relax\hbox{\tate \ifmmode\copy\zstrutbox\else\unhcopy\zstrutbox\fi}} -\def\ystrut{\relax\hbox{\yoko +\DeclareRobustCommand\ystrut{\relax\hbox{\yoko \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi}} \def\DeclareFontEncoding{% \begingroup @@ -350,6 +351,7 @@ \def\default@series{#3}% \def\default@shape{#4}}% \fi} +\@onlypreamble\DeclareKanjiSubstitution \def\DeclareErrorKanjiFont#1#2#3#4#5{% \xdef\error@kfontshape{% \noexpand\expandafter\noexpand\split@name\noexpand\string @@ -358,12 +360,7 @@ \gdef\default@k@family{#2}% \gdef\default@k@series{#3}% \gdef\default@k@shape{#4}% - \global\let\k@family\default@k@family - \global\let\k@series\default@k@series - \global\let\k@shape\default@k@shape - \gdef\f@size{#5}% - \gdef\f@baselineskip{#5pt}} -\@onlypreamble\DeclareKanjiSubstitution + } \@onlypreamble\DeclareErrorKanjiFont \def\DeclareFixedFont#1#2#3#4#5#6{% \begingroup @@ -460,7 +457,7 @@ \fi } \newif\if@knjcmd -\def\userelfont{\@knjcmdtrue} +\DeclareRobustCommand\userelfont{\@knjcmdtrue} \DeclareRobustCommand\selectfont{% \let\tmp@error@fontshape\error@fontshape \let\error@fontshape\error@kfontshape @@ -538,7 +535,7 @@ \let\size@update\relax}} \newbox\adjust@box \newdimen\adjust@dimen -\def\adjustbaseline{% +\DeclareRobustCommand\adjustbaseline{% \setbox\adjust@box\hbox{\char\jis"3441}%" \cht\ht\adjust@box \cdp\dp\adjust@box @@ -685,13 +682,13 @@ \DeclareRobustCommand\romanshape[1]{\edef\f@shape{#1}} \DeclareRobustCommand\kanjishape[1]{\edef\k@shape{#1}} \DeclareRobustCommand\fontshape[1]{\kanjishape{#1}\romanshape{#1}} -\def\usekanji#1#2#3#4{% +\DeclareRobustCommand\usekanji[4]{% \kanjiencoding{#1}\kanjifamily{#2}\kanjiseries{#3}\kanjishape{#4}% \selectfont\ignorespaces} -\def\useroman#1#2#3#4{% +\DeclareRobustCommand\useroman[4]{% \romanencoding{#1}\romanfamily{#2}\romanseries{#3}\romanshape{#4}% \selectfont\ignorespaces} -\def\usefont#1#2#3#4{% +\DeclareRobustCommand\usefont[4]{% \edef\tmp@item{{#1}}% \expandafter\expandafter\expandafter \inlist@\expandafter\tmp@item\expandafter{\kenc@list}% @@ -1142,7 +1139,7 @@ \stepcounter{page}% \let\firstmark\botmark } -\def \AtBeginDvi #1{% +\DeclareRobustCommand \AtBeginDvi [1]{% \global \setbox \@begindvibox \vbox{\yoko \unvbox \@begindvibox #1}% } @@ -1305,7 +1302,7 @@ \csname bm@#3\endcsname}% \if@pboxsw \m@th$\null\fi% !!! \@end@tempboxa} -\def\underline#1{% +\DeclareRobustCommand\underline[1]{% \relax \ifmmode\@@underline{#1}% \else \leavevmode\null$\@@underline{\hbox{#1}}\m@th$\null\relax\fi} diff --git a/Master/texmf-dist/tex/platex/base/pldefs.ltx b/Master/texmf-dist/tex/platex/base/pldefs.ltx index 8e9db2bb726..7612c6a0499 100644 --- a/Master/texmf-dist/tex/platex/base/pldefs.ltx +++ b/Master/texmf-dist/tex/platex/base/pldefs.ltx @@ -14,9 +14,13 @@ %% %% File: plfonts.dtx \ProvidesFile{pldefs.ltx} - [2018/02/04 v1.6l pLaTeX Kernel (Default settings)] + [2019/09/16 v1.6t pLaTeX Kernel (Default settings)] \DeclareKanjiEncodingDefaults{}{} \DeclareErrorKanjiFont{JY1}{mc}{m}{n}{10} +\kanjifamily{mc} +\kanjiseries{m} +\kanjishape{n} +\fontsize{10}{10} \DeclareYokoKanjiEncoding{JY1}{}{} \DeclareKanjiSubstitution{JY1}{mc}{m}{n} \DeclareTateKanjiEncoding{JT1}{}{} diff --git a/Master/texmf-dist/tex/platex/base/plext.sty b/Master/texmf-dist/tex/platex/base/plext.sty index bfab42a6416..e69f58c05a8 100644 --- a/Master/texmf-dist/tex/platex/base/plext.sty +++ b/Master/texmf-dist/tex/platex/base/plext.sty @@ -15,7 +15,7 @@ %% File: plext.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{plext} - [2018/10/07 v1.2k pLaTeX package file (community edition)] + [2019/09/29 v1.2l pLaTeX package file (community edition)] \newif\if@rotsw \def\array{\let\@acol\@arrayacol \let\@classz\@arrayclassz \let\@classiv\@arrayclassiv @@ -538,7 +538,7 @@ \def\@Kanji#1{\kansuji #1} \def\kanji{\iftdir\expandafter\kansuji\fi} \def\boutenchar{\char\euc"A1A2} -\def\bou#1{\ifvmode\leavevmode\fi\@bou#1\end} +\DeclareRobustCommand\bou[1]{\ifvmode\leavevmode\fi\@bou#1\end} \def\@bou#1{% \ifx#1\end \let\next=\relax \else @@ -557,7 +557,7 @@ \fi \let\next=\@bou \fi\next} -\def\kasen#1{% +\DeclareRobustCommand\kasen[1]{% \ifydir\underline{#1}% \else\if@rotsw\underline{#1}\else \setbox\z@\hbox{#1}\leavevmode\raise.7zw diff --git a/Master/texmf-dist/tex/platex/base/ptrace.sty b/Master/texmf-dist/tex/platex/base/ptrace.sty index 7f7d3836922..45d5ecd800d 100644 --- a/Master/texmf-dist/tex/platex/base/ptrace.sty +++ b/Master/texmf-dist/tex/platex/base/ptrace.sty @@ -15,7 +15,7 @@ %% File: plfonts.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{ptrace} - [2017/08/05 v1.6h Standard pLaTeX package (font tracing)] + [2019/09/16 v1.6t Standard pLaTeX package (font tracing)] \RequirePackageWithOptions{tracefnt} \DeclareRobustCommand\selectfont{% \let\tmp@error@fontshape\error@fontshape @@ -108,7 +108,7 @@ \let\size@update\relax}} \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}{\set@fontsize} - {Construct \ystrutbox}% + {ASCII Corporation original}% \def\set@fontsize#1#2#3{% \@defaultunits\@tempdimb#2pt\relax\@nnil \edef\f@size{\strip@pt\@tempdimb}% @@ -142,6 +142,30 @@ \fi \let\size@update\relax}} \plEndIncludeInRelease +\plIncludeInRelease{2019/10/01}{\adjustbaseline} + {Make robust}% +\DeclareRobustCommand\adjustbaseline{% + \setbox\adjust@box\hbox{\char\jis"3441}%" + \cht\ht\adjust@box + \cdp\dp\adjust@box + \cwd\wd\adjust@box + \cvs\normalbaselineskip + \chs\cwd + \cHT\cht \advance\cHT\cdp + \iftdir + \setbox\adjust@box\hbox{\tbaselineshift\z@ M}% + \adjust@dimen\ht\adjust@box + \advance\adjust@dimen\dp\adjust@box + \advance\adjust@dimen-\cHT + \divide\adjust@dimen\tw@ + \advance\adjust@dimen\cdp + \advance\adjust@dimen-\dp\adjust@box + \tbaselineshift\adjust@dimen + \ifnum \tracingfonts>\tw@ + \typeout{baselineshift:\the\tbaselineshift}% + \fi + \fi} +\plEndIncludeInRelease \plIncludeInRelease{2017/07/29}{\adjustbaseline} {Change zenkaku reference}% \def\adjustbaseline{% @@ -165,9 +189,10 @@ \typeout{baselineshift:\the\tbaselineshift}% \fi \fi} +\expandafter \let \csname adjustbaseline \endcsname \@undefined \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}{\adjustbaseline} - {Change zenkaku reference}% + {ASCII Corporation original}% \def\adjustbaseline{% \setbox\adjust@box\hbox{\char\euc"A1A1}%" \cht\ht\adjust@box @@ -189,6 +214,7 @@ \typeout{baselineshift:\the\tbaselineshift} \fi \fi} +\expandafter \let \csname adjustbaseline \endcsname \@undefined \plEndIncludeInRelease \endinput %% -- cgit v1.2.3