From af2345e308493f1954ca25fa832c59438fc6cde5 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 3 Sep 2018 21:11:52 +0000 Subject: platex (3sep18) git-svn-id: svn://tug.org/texlive/trunk@48562 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/platex/base/README.md | 2 +- Master/texmf-dist/doc/platex/base/platex-en.pdf | Bin 149358 -> 148790 bytes Master/texmf-dist/doc/platex/base/platex.pdf | Bin 284238 -> 287418 bytes .../texmf-dist/doc/platex/base/platexrelease.pdf | Bin 121826 -> 121553 bytes Master/texmf-dist/doc/platex/base/pldoc.pdf | Bin 821450 -> 822760 bytes Master/texmf-dist/source/platex/base/platex.dtx | 83 ++++++++++------ .../source/platex/base/platexrelease.dtx | 1 + Master/texmf-dist/source/platex/base/plcore.dtx | 107 +++++++++++++-------- Master/texmf-dist/source/platex/base/plvers.dtx | 2 +- .../texmf-dist/tex/platex/base/platexrelease.sty | 81 +++++++++------- Master/texmf-dist/tex/platex/base/plcore.ltx | 3 +- 11 files changed, 170 insertions(+), 109 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/platex/base/README.md b/Master/texmf-dist/doc/platex/base/README.md index c2d7113d358..6d4052d8d83 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 -2018-07-28 +2018-09-03 Japanese TeX Development Community diff --git a/Master/texmf-dist/doc/platex/base/platex-en.pdf b/Master/texmf-dist/doc/platex/base/platex-en.pdf index d7432e02689..609e57a241b 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 3c3c77b8a43..3e38e778125 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 210dba123d3..df2e838e323 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 83d015f68e0..91a683bbeff 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 81cc51712e3..da62e0f18b5 100644 --- a/Master/texmf-dist/source/platex/base/platex.dtx +++ b/Master/texmf-dist/source/platex/base/platex.dtx @@ -80,6 +80,9 @@ % \changes{v1.0v}{2018/04/06}{最新のsource2eへの追随} % \changes{v1.0w}{2018/04/08}{安全のためフォーマット作成時の % バナー表示をやめた} +% \changes{v1.0x}{2018/09/03}{ドキュメントを更新} +% \changes{v1.0x}{2018/09/03}{platexcheatに言及} +% \changes{v1.0x}{2018/09/03}{plautopatchに言及} %\else % \changes{v1.0}{1995/05/08}{first edition} % \changes{v1.0a}{1995/08/25}{Added 'Compatibility', `Usage of \dst{}' @@ -118,6 +121,9 @@ % \changes{v1.0v}{2018/04/06}{Sync with the latest \file{source2e.tex}} % \changes{v1.0w}{2018/04/08}{Stop showing banner during % format generation for safety} +% \changes{v1.0x}{2018/09/03}{Update document.} +% \changes{v1.0x}{2018/09/03}{Mention platexcheat (Japanese only).} +% \changes{v1.0x}{2018/09/03}{Mention plautopatch.} %\fi % \fi % @@ -125,7 +131,7 @@ %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{platex.dtx}[2018/04/08 v1.0w pLaTeX document file] +\ProvidesFile{platex.dtx}[2018/09/03 v1.0x pLaTeX document file] % \iffalse \documentclass{jltxdoc} \usepackage{plext} @@ -188,32 +194,29 @@ % \changes{v1.0f}{2016/04/12}{ドキュメントを更新} % \changes{v1.0k}{2016/05/21}{変更履歴も出力するようにした} % \changes{v1.0q}{2017/11/29}{英語版ドキュメントを追加} +% \changes{v1.0x}{2018/09/03}{ドキュメントを更新} %\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.} %\fi -% \begin{chuui} %\ifJAPANESE +% \begin{chuui} % この文書では「コミュニティ版\pLaTeXe{}」について簡単に説明します。 % 株式会社アスキー(現アスキー・メディアワークス % \footnote{アスキー日本語\TeX{}(\pTeX{})、 % \texttt{http://ascii.asciimw.jp/pb/ptex/}})が配布している % \pLaTeXe{}(以下、アスキー版\pLaTeXe{})とは異なる内容ですので、 % 注意してください。 +% \end{chuui} %\else +% \begin{chuui}[] % This document provides a brief description of \pLaTeXe, the Japanese -% extended version of \LaTeXe. The original version of -% \pLaTeXe\ (`ASCII \pLaTeXe') was developed by ASCII MEDIA -% WORKS\footnote{\texttt{http://ascii.asciimw.jp/pb/ptex/}} -% (formerly ASCII CORPORATION) during 1995 and 2006. -% The current version, which is now distributed in CTAN and -% \TeX\ Live, is a forked version called -% `\pLaTeXe\ Community Edition.' -% It is now maintained by Japanese \TeX\ Development -% Community\footnote{\texttt{https://texjp.org}}. -%\fi +% extended version of \LaTeXe. Current maintainer of +% \pLaTeXe\ is Japanese \TeX\ Development Community. % \end{chuui} +%\fi % %\ifJAPANESE % 2010年以降、アスキー\pTeX{}は、国際的に広く使われている\TeX\ Liveという @@ -237,30 +240,36 @@ % コミュニティ版:plnewsc*.pdf)を参照してください。また、 % 実際の\pLaTeX{}のソースコードはpldoc.pdfで説明しています。 %\else -% \def\JLaTeX{\leavevmode\lower.5ex\hbox{J}\kern-.15em\LaTeXe} +% \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\ (\TeX\ engine with extensions for Japanese -% typesetting; it is designed for high-quality Japanese book publishing, -% and the `p' stands for `publishing'\footnote{There is another -% old implementation of Japanese \LaTeX, called \JLaTeX\ (but -% not includeded in \TeX\ Live). Also, MiK\TeX\ has another program -% called `platex,' but it has nothing to do with our -% Japanese \pLaTeX!}), and the developent of both \pTeX\ and -% \pLaTeX\ was done by ASCII Corporation. +% It requires \pTeX, 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'' +% respectively. % % In 2010, ASCII \pTeX\ was incorporated into the -% world-wide \TeX\ distribution `\TeX\ Live.' Since then, \pTeX\ has +% 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, the default engine of -% \pLaTeX\ changed from original \pTeX\ to \epTeX\ (\pTeX\ with -% \eTeX\ extension), and the original \LaTeX\ itself is also frequently -% updated. On the other hand, \pLaTeX\ remained unchanged since 2006, +% In recent versions of \TeX\ Live and W32\TeX\ (arround 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. +% On the other hand, \pLaTeX\ remained unchanged since 2006, % which resulted in some incompatibility and limitations. % % To follow these upstream changes, we (Japanese \TeX\ Development -% Community) decided to fork ASCII \pLaTeX\ and distribute the -% `community edition.' The development version is available from +% Community\footnote{\texttt{https://texjp.org}}) decided to fork +% ASCII \pLaTeX\ and distribute the ``community edition.'' +% The development version is available from % GitHub repository\footnote{\texttt{https://github.com/texjporg/platex}}. % The forked community edition is different from the original ASCII % edition, so any bug reports and requests should be sent to @@ -291,9 +300,14 @@ % % \LaTeX{}の機能については、\cite{latex-book2}や\cite{latex-comp}などを % 参照してください。新しい機能については\file{usrguide.tex}を参照してください。 +% \pLaTeX{}のコマンド一覧は「\pLaTeXe{}チートシート」(platexsheet.pdf) または +% その\textsf{jsclasses}版 (platexsheet-jsclasses.pdf) が参考に +% なるでしょう\footnote{両者のPDFとも、コマンドラインで +% \texttt{texdoc -l platexcheat}を実行すると表示されます。}。 % \changes{v1.0}{1995/05/08}{最初のバージョン} % \changes{v1.0a}{1995/08/25}{互換性について、\dst{}の使い方、参考文献を追加} % \changes{v1.0r}{2017/12/02}{英語の参考文献も追加} +% \changes{v1.0x}{2018/09/03}{platexcheatに言及} %\else % \section{Introduction to this document}\label{platex:intro} % This document briefly describes \pLaTeXe, but is not a manual of \pLaTeXe. @@ -310,6 +324,7 @@ % \changes{v1.0a}{1995/08/25}{Added 'Compatibility', `Usage of \dst{}' % and `References'} % \changes{v1.0r}{2017/12/02}{English references added} +% \changes{v1.0x}{2018/09/03}{Mention platexcheat (Japanese only).} %\fi % %\ifJAPANESE @@ -839,6 +854,12 @@ % うまく動くかどうかを、完全に確かめる方法は残念ながらありません。 % 一番簡単なのは、動かしてみることです。不幸にもうまく動かない場合は、 % ログファイルや付属の文書ファイルを参考に原因を調べてください。 +% +% なお、いくつかの\LaTeX{}パッケージについては、\pLaTeX{}向けの +% パッチが用意されています。その一覧は、 +% \texttt{plautopatch}パッケージ(Hironobu Yamashita作)の +% ドキュメント(日本語版はplautopatch-ja.pdf)に記載されています。 +% \changes{v1.0x}{2018/09/03}{plautopatchに言及} %\else % \section{Compatibility with Other Formats and Older Versions} % \label{platex:compatibility} @@ -858,6 +879,12 @@ % We cannot tell whether a class or a package works fine with % \pLaTeXe\ beforehand; the easiest way is to try to use it. % If it fails, please refer to the log file or a package manual. +% +% Some \LaTeX\ packages are known to be incompatible with \pLaTeX. +% For those packages, \pLaTeX-specific patches might be available. +% Please refer to the documentation of the \texttt{plautopatch} +% package (by Hironobu Yamashita). +% \changes{v1.0x}{2018/09/03}{Mention plautopatch.} %\fi % %\ifJAPANESE diff --git a/Master/texmf-dist/source/platex/base/platexrelease.dtx b/Master/texmf-dist/source/platex/base/platexrelease.dtx index de52a354113..cdba2211ab9 100644 --- a/Master/texmf-dist/source/platex/base/platexrelease.dtx +++ b/Master/texmf-dist/source/platex/base/platexrelease.dtx @@ -324,6 +324,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}% + % * <2018-07-28>+1 % * <2018-07-28> % * <2018-05-20> % * <2018-04-01>+2 diff --git a/Master/texmf-dist/source/platex/base/plcore.dtx b/Master/texmf-dist/source/platex/base/plcore.dtx index 4dadbc27e65..545206a0152 100644 --- a/Master/texmf-dist/source/platex/base/plcore.dtx +++ b/Master/texmf-dist/source/platex/base/plcore.dtx @@ -95,13 +95,15 @@ % \changes{v1.2z}{2018/05/13}{コマンドに分離、さらに % bleed幅を\cs{@tombowbleed}に切り出し} % \changes{v1.2z}{2018/05/13}{\cs{@tombowreset@@paper}コマンドに分離} +% \changes{v1.3}{2018/09/02}{\cs{removejfmglue}の挙動を明文化} +% \changes{v1.3}{2018/09/02}{\file{platexrelease}バグ修正} % \fi % % \iffalse %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{plcore.dtx}[2018/05/13 v1.2z pLaTeX core file] +\ProvidesFile{plcore.dtx}[2018/09/02 v1.3 pLaTeX core file] % \iffalse \documentclass{jltxdoc} \GetFileInfo{plcore.dtx} @@ -214,7 +216,19 @@ % そこで、「最後のノードがJFMグルーであった場合にそれを削除する」という % ユーザ向け命令を定義します。この機能にはe-p\TeX{} 180226以降の % |\lastnodesubtype|プリミティブが必要です。 +% この命令はあくまで「\verb+\removejfmglue+の展開時点で +% 既にp\TeX{}によって挿入完了しているJFMグルー」だけを +% 削除し、「これから挿入されようとするJFMグルー」は抑制しません。例えば +%\begin{verbatim} +% 始)\removejfmglue 中)\relax\removejfmglue 終 +%\end{verbatim} +% という入力からは +% \begin{quote} +% 始)\removejfmglue 中)\relax\removejfmglue 終 +% \end{quote} +% が得られます(最初の\verb+\removejfmglue+は結果的に何もしていません)。 % \changes{v1.2x}{2018/03/01}{JFMグルーノードを削除するマクロ追加} +% \changes{v1.3}{2018/09/02}{\cs{removejfmglue}の挙動を明文化} % \begin{macrocode} %\plIncludeInRelease{2018/03/09}% % {\removejfmglue}{Macro added}% @@ -360,7 +374,7 @@ % 効かない場合があったので、元に戻した} % \begin{macrocode} %\plIncludeInRelease{2017/10/28}{\@no@lnbk} -% {Break before prebreakpenalty}% +% {Break before prebreakpenalty (revert)}% %\def\@no@lnbk #1[#2]{% % \ifvmode % \@nolnerr @@ -375,7 +389,7 @@ % \fi} %\plEndIncludeInRelease %\plIncludeInRelease{2017/07/29}{\@no@lnbk} -% {Break before prebreakpenalty}% +% {Break before prebreakpenalty (another)}% %\def\@no@lnbk #1[#2]{% % \ifvmode % \@nolnerr @@ -407,7 +421,7 @@ % \fi} %\plEndIncludeInRelease %\plIncludeInRelease{0000/00/00}{\@no@lnbk} -% {Break before prebreakpenalty}% +% {LaTeX2e original}% %\def\@no@lnbk #1[#2]{% % \ifvmode % \@nolnerr @@ -456,7 +470,8 @@ % このマクロが組み立てる部分の中心となります。 % \file{ltoutput.dtx}で定義されているものです。 % \begin{macrocode} -%\plIncludeInRelease{2017/04/08}{\@makecol}{\@makecol}% +%\plIncludeInRelease{2017/04/08}{\@makecol} +% {Take into account depth of footnote}% %<*plcore|platexrelease> \gdef\@makecol{% \setbox\@outputbox\box\@cclv% @@ -467,10 +482,12 @@ % \end{macrocode} % オリジナルの\LaTeX{}は、トップフロート、本文、脚注、ボトムフロートの順番で % 出力します。一方p\LaTeX{}は、トップフロート、本文、ボトムフロート、脚注の -% 順番で出力します。ところが、アスキー版のコードは順番を入れ替えるだけでなく、 +% 順番で出力します。 +% ところが、アスキー版のコードは順番を入れ替えるだけでなく、脚注のあるページの % 版面全体の垂直位置が(特に縦組で顕著に)ずれてしまっていました。 -% これは補正量|\dp\@outputbox|の取得が早すぎたためですので、コミュニティ版 -% p\LaTeX{}ではこの問題に対処してあります。結果的に、fnposパッケージ(yafoot)の +% これは補正量|\dp\@outputbox|の取得を\emph{脚注挿入より前}に行っていたためで、 +% コミュニティ版p\LaTeX{}ではこの問題に対処してあります。 +% 結果的に、fnposパッケージ(yafoot)の % |\makeFNbottom|かつ|\makeFNbelow|な状態と完全に等価になりました。 % \changes{v1.2l}{2017/02/25}{脚注とボトムフロートの順序を入れ替えたことで % 版面全体の垂直位置がずれていたのを修正(Issue 32)} @@ -494,7 +511,7 @@ \@makespecialcolbox \else \setbox\@outputbox \vbox to\@colht {% -% \boxmaxdepth \@maxdepth % comment out on LaTeX 1997/12/01 + %\boxmaxdepth \@maxdepth % comment out on LaTeX 1997/12/01 \@texttop \dimen@ \dp\@outputbox \unvbox \@outputbox @@ -525,7 +542,8 @@ } % %\plEndIncludeInRelease -%\plIncludeInRelease{2016/09/03}{\@makecol}{\@makecol}% +%\plIncludeInRelease{2016/09/03}{\@makecol} +% {Avoid infinite loop}% %\gdef\@makecol{% % \setbox\@outputbox\box\@cclv% % \xdef\@freelist{\@freelist\@midlist}% @@ -535,7 +553,7 @@ % \@makespecialcolbox % \else % \setbox\@outputbox \vbox to\@colht {% -%% \boxmaxdepth \@maxdepth % comment out on LaTeX 1997/12/01 +% %\boxmaxdepth \@maxdepth % comment out on LaTeX 1997/12/01 % \@texttop % \dimen@ \dp\@outputbox % \unvbox \@outputbox @@ -555,7 +573,8 @@ % \global \maxdepth \@maxdepth %} %\plEndIncludeInRelease -%\plIncludeInRelease{2016/04/17}{\@makecol}{\@makecol}% +%\plIncludeInRelease{2016/04/17}{\@makecol} +% {Adjust for \dp\@outputbox in tate mode}% %\gdef\@makecol{% % \setbox\@outputbox\box\@cclv% % \xdef\@freelist{\@freelist\@midlist}% @@ -565,7 +584,7 @@ % \@makespecialcolbox % \else % \setbox\@outputbox \vbox to\@colht {% -%% \boxmaxdepth \@maxdepth % comment out on LaTeX 1997/12/01 +% %\boxmaxdepth \@maxdepth % comment out on LaTeX 1997/12/01 % \@texttop % \dimen@ \dp\@outputbox % \unvbox \@outputbox @@ -585,7 +604,8 @@ % \global \maxdepth \@maxdepth %} %\plEndIncludeInRelease -%\plIncludeInRelease{0000/00/00}{\@makecol}{\@makecol}% +%\plIncludeInRelease{0000/00/00}{\@makecol} +% {ASCII Corporation original}% %\gdef\@makecol{% % \setbox\@outputbox\box\@cclv% % \xdef\@freelist{\@freelist\@midlist}% @@ -595,7 +615,7 @@ % \@makespecialcolbox % \else % \setbox\@outputbox \vbox to\@colht {% -%% \boxmaxdepth \@maxdepth % comment out on LaTeX 1997/12/01 +% %\boxmaxdepth \@maxdepth % comment out on LaTeX 1997/12/01 % \@texttop % \dimen@ \dp\@outputbox % \unvbox \@outputbox @@ -937,7 +957,7 @@ % %\plEndIncludeInRelease %\plIncludeInRelease{0000/00/00}{\maketombowbox} -% {Use \@tombowbleed}% +% {ASCII Corporation original}% %\def\maketombowbox{% % \setbox\@TL\hbox to\z@{\yoko\hss % \vrule width13mm height\@tombowwidth depth\z@ @@ -995,10 +1015,11 @@ % \changes{v1.2z}{2018/05/13}{色の付いたテキストの途中で改ページすると % トンボにも色が付く現象に対処、さらにトンボの色を\cs{@tombowcolor}へ・ % bleed幅を\cs{@tombowbleed}に切り出し} +% \changes{v1.3}{2018/09/02}{\file{platexrelease}バグ修正} % \begin{macrocode} % %\plIncludeInRelease{2018/05/20}{\@outputtombow} -% {Use \@tombowcolor and \@tombowbleed}% +% {Use \@tombowcolor and \@tombowbleed}% %<*plcore|platexrelease> \def\@outputtombow{% \iftombow @@ -1025,7 +1046,8 @@ } % %\plEndIncludeInRelease -%\plIncludeInRelease{2016/04/17}{\@outputtombow}{\@outputtombow}% +%\plIncludeInRelease{2016/04/17}{\@outputtombow} +% {Safe \boxmaxdepth}% %\def\@outputtombow{% % \iftombow % \vbox to\z@{\kern-13mm\relax @@ -1047,7 +1069,8 @@ % \fi %} %\plEndIncludeInRelease -%\plIncludeInRelease{0000/00/00}{\@outputtombow}{\@outputtombow}% +%\plIncludeInRelease{0000/00/00}{\@outputtombow} +% {ASCII Corporation original}% %\def\@outputtombow{% % \iftombow % \vbox to\z@{\kern-13mm\relax @@ -1311,7 +1334,7 @@ %} %\plEndIncludeInRelease %\plIncludeInRelease{0000/00/00}{\@outputpage} -% {Reset language for hyphenation}% +% {ASCII Corporation original}% %\def\@outputpage{% %\begingroup % the \endgroup is put in by \aftergroup % \iftdir @@ -1408,7 +1431,7 @@ % %\plEndIncludeInRelease %\plIncludeInRelease{0000/00/00}{\AtBeginDvi} -% {Fix for incompatible direction}% +% {LaTeX2e original}% %\def \AtBeginDvi #1{% % \global \setbox \@begindvibox % \vbox{\unvbox \@begindvibox #1}% @@ -1466,7 +1489,7 @@ % %\plEndIncludeInRelease %\plIncludeInRelease{0000/00/00}{\@makefnmark} -% {Remove extra \xkanjiskip}% +% {ASCII Corporation original}% %\renewcommand\@makefnmark{\hbox{% % \ifydir \@textsuperscript{\normalfont\@thefnmark}% % \else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi}} @@ -1522,7 +1545,7 @@ % %\plEndIncludeInRelease %\plIncludeInRelease{0000/00/00}{\footnote} -% {Append \inhibitglue in \footnotemark}% +% {LaTeX2e original}% %\def\footnote{\@ifnextchar[\@xfootnote{\stepcounter\@mpfn % \protected@xdef\@thefnmark{\thempfn}% % \@footnotemark\@footnotetext}} @@ -1556,7 +1579,7 @@ % %\plEndIncludeInRelease %\plIncludeInRelease{0000/00/00}{\footnotetext} -% {Preserve penalty before \footnotetext}% +% {LaTeX2e original}% %\def\footnotetext{% % \@ifnextchar [\@xfootnotenext % {\protected@xdef\@thefnmark{\thempfn}% @@ -1637,7 +1660,7 @@ % \fi} %\plEndIncludeInRelease %\plIncludeInRelease{0000/00/00}{\@footnotetext} -% {Allow break after \footnote}% +% {ASCII Corporation original}% %\long\def\@footnotetext#1{% % \ifydir\def\@tempa{\yoko}\else\def\@tempa{\tate}\fi % \insert\footins{\@tempa% @@ -1703,7 +1726,7 @@ % \begin{macrocode} % %\plIncludeInRelease{2017/10/28}{\@setref} -% {Spacing after \ref in moving arguments}% +% {Space factor after \ref}% %<*plcore|platexrelease> \def\@setref#1#2#3{% \ifx#1\relax @@ -1731,7 +1754,7 @@ %\let\@setref@\@undefined %\plEndIncludeInRelease %\plIncludeInRelease{0000/00/00}{\@setref} -% {Spacing after \ref in moving arguments}% +% {ASCII Corporation original}% %\def\@setref#1#2#3{% % \ifx#1\relax % \protect\G@refundefinedtrue @@ -1803,7 +1826,7 @@ %\fi %\plEndIncludeInRelease %\plIncludeInRelease{0000/00/00}{\verb} -% {Disable hyphenation in verb}% +% {ASCII Corporation original}% %\if@compatibility\else %\def\verb{\relax\ifmmode\hbox\else\leavevmode\fi % \bgroup @@ -1841,7 +1864,7 @@ % %\plEndIncludeInRelease %\plIncludeInRelease{0000/00/00}{\@startline} -% {Inhibit JFM glue at the beginning}% +% {LaTeX2e original}% %\gdef\@startline{% % \ifnum \@nxttabmar >\@hightab % \@badtab @@ -1923,7 +1946,7 @@ % \begin{macrocode} % %\plIncludeInRelease{2018/03/09}{\@tabclassz} -% {Inhibit JFM glue in tabular cells}% +% {Inhibit JFM glue in tabular cells (better)}% %<*plcore|platexrelease> \ifx\removejfmglue\@undefined \def\@tabclassz{% @@ -2003,7 +2026,7 @@ % \fi}}} %\plEndIncludeInRelease %\plIncludeInRelease{2017/07/29}{\@tabclassz} -% {Inhibit JFM glue in tabular cells}% +% {Inhibit JFM glue in tabular cells (wrong)}% %\def\@tabclassz{% % \ifcase\@lastchclass % \@acolampacol @@ -2029,7 +2052,7 @@ % \fi}}} %\plEndIncludeInRelease %\plIncludeInRelease{0000/00/00}{\@tabclassz} -% {Inhibit JFM glue in tabular cells}% +% {LaTeX2e original}% %\def\@tabclassz{% % \ifcase\@lastchclass % \@acolampacol @@ -2075,7 +2098,7 @@ % \changes{v1.2x}{2018/03/01}{セル最初の\cs{par}で空行が入らないようにした} % \begin{macrocode} %\plIncludeInRelease{2018/03/09}{\@classv} -% {Inhibit JFM glue in tabular cells}% +% {Inhibit JFM glue in tabular cells (better)}% %<*plcore|platexrelease> \def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\pltx@next@inhibitglue\ignorespaces \@sharp\unskip\@endpbox}} @@ -2087,7 +2110,7 @@ %\@sharp\unskip\@endpbox}} %\plEndIncludeInRelease %\plIncludeInRelease{0000/00/00}{\@classv} -% {Inhibit JFM glue in tabular cells}% +% {LaTeX2e original}% %\def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\ignorespaces %\@sharp\@endpbox}} %\plEndIncludeInRelease @@ -2138,7 +2161,7 @@ % %\plEndIncludeInRelease %\plIncludeInRelease{0000/00/00}{\@tabular} -% {Remove extra \xkanjiskip}% +% {LaTeX2e original}% %\def\@tabular{\leavevmode \hbox \bgroup $\let\@acol\@tabacol % \let\@classz\@tabclassz % \let\@classiv\@tabclassiv \let\\\@tabularcr\@tabarray} @@ -2157,7 +2180,7 @@ % %\plEndIncludeInRelease %\plIncludeInRelease{0000/00/00}{\endtabular} -% {Remove extra \xkanjiskip}% +% {LaTeX2e original}% %\def\endtabular{\crcr\egroup\egroup $\egroup} %\expandafter \let \csname endtabular*\endcsname = \endtabular %\plEndIncludeInRelease @@ -2194,7 +2217,7 @@ % %\plEndIncludeInRelease %\plIncludeInRelease{0000/00/00}{\@iiiparbox} -% {Remove extra \xkanjiskip}% +% {LaTeX2e original}% %\let\@parboxto\@empty %\long\def\@iiiparbox#1#2[#3]#4#5{% % \leavevmode @@ -2232,7 +2255,7 @@ % %\plEndIncludeInRelease %\plIncludeInRelease{0000/00/00}{\underline} -% {Remove extra \xkanjiskip}% +% {LaTeX2e original}% %\def\underline#1{% % \relax % \ifmmode\@@underline{#1}% @@ -2317,7 +2340,7 @@ %\fi %\plEndIncludeInRelease %\plIncludeInRelease{2015/01/01}% -% {\e@alloc@chardef}{Extended Allocation (FAM256)}% +% {\e@alloc@chardef}{LaTeX2e original}% %\ifx\widowpenalties\@undefined % \mathchardef\e@alloc@top=255 % \let\e@alloc@chardef\chardef @@ -2327,7 +2350,7 @@ %\fi %\plEndIncludeInRelease %\plIncludeInRelease{0000/00/00}% -% {\e@alloc@chardef}{Extended Allocation (FAM256)}% +% {\e@alloc@chardef}{LaTeX2e original}% %\let\e@alloc@top\@undefined %\let\e@alloc@chardef\@undefined %\plEndIncludeInRelease @@ -2361,11 +2384,11 @@ % %\plEndIncludeInRelease %\plIncludeInRelease{2015/01/01}% -% {\e@mathgroup@top}{Extended Allocation (FAM256)}% +% {\e@mathgroup@top}{LaTeX2e original}% %\chardef\e@mathgroup@top=16 %\plEndIncludeInRelease %\plIncludeInRelease{0000/00/00}% -% {\e@mathgroup@top}{Extended Allocation (FAM256)}% +% {\e@mathgroup@top}{LaTeX2e original}% %\let\e@mathgroup@top\@undefined %\plEndIncludeInRelease % \end{macrocode} diff --git a/Master/texmf-dist/source/platex/base/plvers.dtx b/Master/texmf-dist/source/platex/base/plvers.dtx index 76bdf982964..4970216fe31 100644 --- a/Master/texmf-dist/source/platex/base/plvers.dtx +++ b/Master/texmf-dist/source/platex/base/plvers.dtx @@ -172,7 +172,7 @@ {2018-07-28} % %<*plcore> -\def\ppatch@level{0} +\def\ppatch@level{1} % % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/tex/platex/base/platexrelease.sty b/Master/texmf-dist/tex/platex/base/platexrelease.sty index aac95a71650..114f64dd5cf 100644 --- a/Master/texmf-dist/tex/platex/base/platexrelease.sty +++ b/Master/texmf-dist/tex/platex/base/platexrelease.sty @@ -133,6 +133,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}% + % * <2018-07-28>+1 % * <2018-07-28> % * <2018-05-20> % * <2018-04-01>+2 @@ -807,7 +808,7 @@ of this package available from CTAN} \let\removejfmglue\@undefined \plEndIncludeInRelease \plIncludeInRelease{2017/10/28}{\@no@lnbk} - {Break before prebreakpenalty}% + {Break before prebreakpenalty (revert)}% \def\@no@lnbk #1[#2]{% \ifvmode \@nolnerr @@ -822,7 +823,7 @@ of this package available from CTAN} \fi} \plEndIncludeInRelease \plIncludeInRelease{2017/07/29}{\@no@lnbk} - {Break before prebreakpenalty}% + {Break before prebreakpenalty (another)}% \def\@no@lnbk #1[#2]{% \ifvmode \@nolnerr @@ -854,7 +855,7 @@ of this package available from CTAN} \fi} \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}{\@no@lnbk} - {Break before prebreakpenalty}% + {LaTeX2e original}% \def\@no@lnbk #1[#2]{% \ifvmode \@nolnerr @@ -868,7 +869,8 @@ of this package available from CTAN} \fi \fi} \plEndIncludeInRelease -\plIncludeInRelease{2017/04/08}{\@makecol}{\@makecol}% +\plIncludeInRelease{2017/04/08}{\@makecol} + {Take into account depth of footnote}% \gdef\@makecol{% \setbox\@outputbox\box\@cclv% \let\@elt\relax % added on LaTeX (ltoutput.dtx 2003/12/16 v1.2k) @@ -894,6 +896,7 @@ of this package available from CTAN} \@makespecialcolbox \else \setbox\@outputbox \vbox to\@colht {% + %\boxmaxdepth \@maxdepth % comment out on LaTeX 1997/12/01 \@texttop \dimen@ \dp\@outputbox \unvbox \@outputbox @@ -906,7 +909,8 @@ of this package available from CTAN} \global \maxdepth \@maxdepth } \plEndIncludeInRelease -\plIncludeInRelease{2016/09/03}{\@makecol}{\@makecol}% +\plIncludeInRelease{2016/09/03}{\@makecol} + {Avoid infinite loop}% \gdef\@makecol{% \setbox\@outputbox\box\@cclv% \xdef\@freelist{\@freelist\@midlist}% @@ -916,7 +920,7 @@ of this package available from CTAN} \@makespecialcolbox \else \setbox\@outputbox \vbox to\@colht {% -% \boxmaxdepth \@maxdepth % comment out on LaTeX 1997/12/01 + %\boxmaxdepth \@maxdepth % comment out on LaTeX 1997/12/01 \@texttop \dimen@ \dp\@outputbox \unvbox \@outputbox @@ -936,7 +940,8 @@ of this package available from CTAN} \global \maxdepth \@maxdepth } \plEndIncludeInRelease -\plIncludeInRelease{2016/04/17}{\@makecol}{\@makecol}% +\plIncludeInRelease{2016/04/17}{\@makecol} + {Adjust for \dp\@outputbox in tate mode}% \gdef\@makecol{% \setbox\@outputbox\box\@cclv% \xdef\@freelist{\@freelist\@midlist}% @@ -946,7 +951,7 @@ of this package available from CTAN} \@makespecialcolbox \else \setbox\@outputbox \vbox to\@colht {% -% \boxmaxdepth \@maxdepth % comment out on LaTeX 1997/12/01 + %\boxmaxdepth \@maxdepth % comment out on LaTeX 1997/12/01 \@texttop \dimen@ \dp\@outputbox \unvbox \@outputbox @@ -966,7 +971,8 @@ of this package available from CTAN} \global \maxdepth \@maxdepth } \plEndIncludeInRelease -\plIncludeInRelease{0000/00/00}{\@makecol}{\@makecol}% +\plIncludeInRelease{0000/00/00}{\@makecol} + {ASCII Corporation original}% \gdef\@makecol{% \setbox\@outputbox\box\@cclv% \xdef\@freelist{\@freelist\@midlist}% @@ -976,7 +982,7 @@ of this package available from CTAN} \@makespecialcolbox \else \setbox\@outputbox \vbox to\@colht {% -% \boxmaxdepth \@maxdepth % comment out on LaTeX 1997/12/01 + %\boxmaxdepth \@maxdepth % comment out on LaTeX 1997/12/01 \@texttop \dimen@ \dp\@outputbox \unvbox \@outputbox @@ -1055,7 +1061,7 @@ of this package available from CTAN} } \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}{\maketombowbox} - {Use \@tombowbleed}% + {ASCII Corporation original}% \def\maketombowbox{% \setbox\@TL\hbox to\z@{\yoko\hss \vrule width13mm height\@tombowwidth depth\z@ @@ -1101,6 +1107,7 @@ of this package available from CTAN} } \plEndIncludeInRelease \plIncludeInRelease{2018/05/20}{\@outputtombow} + {Use \@tombowcolor and \@tombowbleed}% \def\@outputtombow{% \iftombow \vbox to\z@{\kern-\dimexpr 10mm+\@tombowbleed\relax\relax @@ -1125,7 +1132,8 @@ of this package available from CTAN} \fi } \plEndIncludeInRelease -\plIncludeInRelease{2016/04/17}{\@outputtombow}{\@outputtombow}% +\plIncludeInRelease{2016/04/17}{\@outputtombow} + {Safe \boxmaxdepth}% \def\@outputtombow{% \iftombow \vbox to\z@{\kern-13mm\relax @@ -1147,7 +1155,8 @@ of this package available from CTAN} \fi } \plEndIncludeInRelease -\plIncludeInRelease{0000/00/00}{\@outputtombow}{\@outputtombow}% +\plIncludeInRelease{0000/00/00}{\@outputtombow} + {ASCII Corporation original}% \def\@outputtombow{% \iftombow \vbox to\z@{\kern-13mm\relax @@ -1321,7 +1330,7 @@ of this package available from CTAN} } \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}{\@outputpage} - {Reset language for hyphenation}% + {ASCII Corporation original}% \def\@outputpage{% \begingroup % the \endgroup is put in by \aftergroup \iftdir @@ -1397,7 +1406,7 @@ of this package available from CTAN} } \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}{\AtBeginDvi} - {Fix for incompatible direction}% + {LaTeX2e original}% \def \AtBeginDvi #1{% \global \setbox \@begindvibox \vbox{\unvbox \@begindvibox #1}% @@ -1410,7 +1419,7 @@ of this package available from CTAN} \else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi} \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}{\@makefnmark} - {Remove extra \xkanjiskip}% + {ASCII Corporation original}% \renewcommand\@makefnmark{\hbox{% \ifydir \@textsuperscript{\normalfont\@thefnmark}% \else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi}} @@ -1437,7 +1446,7 @@ of this package available from CTAN} \@footnotemark}} \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}{\footnote} - {Append \inhibitglue in \footnotemark}% + {LaTeX2e original}% \def\footnote{\@ifnextchar[\@xfootnote{\stepcounter\@mpfn \protected@xdef\@thefnmark{\thempfn}% \@footnotemark\@footnotetext}} @@ -1456,7 +1465,7 @@ of this package available from CTAN} \@footnotetext}} \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}{\footnotetext} - {Preserve penalty before \footnotetext}% + {LaTeX2e original}% \def\footnotetext{% \@ifnextchar [\@xfootnotenext {\protected@xdef\@thefnmark{\thempfn}% @@ -1507,7 +1516,7 @@ of this package available from CTAN} \fi} \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}{\@footnotetext} - {Allow break after \footnote}% + {ASCII Corporation original}% \long\def\@footnotetext#1{% \ifydir\def\@tempa{\yoko}\else\def\@tempa{\tate}\fi \insert\footins{\@tempa% @@ -1525,7 +1534,7 @@ of this package available from CTAN} \color@endgroup}} \plEndIncludeInRelease \plIncludeInRelease{2017/10/28}{\@setref} - {Spacing after \ref in moving arguments}% + {Space factor after \ref}% \def\@setref#1#2#3{% \ifx#1\relax \protect\G@refundefinedtrue @@ -1551,7 +1560,7 @@ of this package available from CTAN} \let\@setref@\@undefined \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}{\@setref} - {Spacing after \ref in moving arguments}% + {ASCII Corporation original}% \def\@setref#1#2#3{% \ifx#1\relax \protect\G@refundefinedtrue @@ -1586,7 +1595,7 @@ of this package available from CTAN} \fi \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}{\verb} - {Disable hyphenation in verb}% + {ASCII Corporation original}% \if@compatibility\else \def\verb{\relax\ifmmode\hbox\else\leavevmode\fi \bgroup @@ -1609,7 +1618,7 @@ of this package available from CTAN} \strut\inhibitglue} \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}{\@startline} - {Inhibit JFM glue at the beginning}% + {LaTeX2e original}% \gdef\@startline{% \ifnum \@nxttabmar >\@hightab \@badtab @@ -1622,7 +1631,7 @@ of this package available from CTAN} \strut} \plEndIncludeInRelease \plIncludeInRelease{2018/03/09}{\@tabclassz} - {Inhibit JFM glue in tabular cells}% + {Inhibit JFM glue in tabular cells (better)}% \ifx\removejfmglue\@undefined \def\@tabclassz{% \ifcase\@lastchclass @@ -1700,7 +1709,7 @@ of this package available from CTAN} \fi}}} \plEndIncludeInRelease \plIncludeInRelease{2017/07/29}{\@tabclassz} - {Inhibit JFM glue in tabular cells}% + {Inhibit JFM glue in tabular cells (wrong)}% \def\@tabclassz{% \ifcase\@lastchclass \@acolampacol @@ -1726,7 +1735,7 @@ of this package available from CTAN} \fi}}} \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}{\@tabclassz} - {Inhibit JFM glue in tabular cells}% + {LaTeX2e original}% \def\@tabclassz{% \ifcase\@lastchclass \@acolampacol @@ -1752,7 +1761,7 @@ of this package available from CTAN} \fi}}} \plEndIncludeInRelease \plIncludeInRelease{2018/03/09}{\@classv} - {Inhibit JFM glue in tabular cells}% + {Inhibit JFM glue in tabular cells (better)}% \def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\pltx@next@inhibitglue\ignorespaces \@sharp\unskip\@endpbox}} \plEndIncludeInRelease @@ -1762,7 +1771,7 @@ of this package available from CTAN} \@sharp\unskip\@endpbox}} \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}{\@classv} - {Inhibit JFM glue in tabular cells}% + {LaTeX2e original}% \def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\ignorespaces \@sharp\@endpbox}} \plEndIncludeInRelease @@ -1786,7 +1795,7 @@ of this package available from CTAN} \let\@classiv\@tabclassiv \let\\\@tabularcr\@tabarray} \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}{\@tabular} - {Remove extra \xkanjiskip}% + {LaTeX2e original}% \def\@tabular{\leavevmode \hbox \bgroup $\let\@acol\@tabacol \let\@classz\@tabclassz \let\@classiv\@tabclassiv \let\\\@tabularcr\@tabarray} @@ -1797,7 +1806,7 @@ of this package available from CTAN} \expandafter \let \csname endtabular*\endcsname = \endtabular \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}{\endtabular} - {Remove extra \xkanjiskip}% + {LaTeX2e original}% \def\endtabular{\crcr\egroup\egroup $\egroup} \expandafter \let \csname endtabular*\endcsname = \endtabular \plEndIncludeInRelease @@ -1824,7 +1833,7 @@ of this package available from CTAN} \@end@tempboxa} \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}{\@iiiparbox} - {Remove extra \xkanjiskip}% + {LaTeX2e original}% \let\@parboxto\@empty \long\def\@iiiparbox#1#2[#3]#4#5{% \leavevmode @@ -1853,7 +1862,7 @@ of this package available from CTAN} \else \leavevmode\null$\@@underline{\hbox{#1}}\m@th$\null\relax\fi} \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}{\underline} - {Remove extra \xkanjiskip}% + {LaTeX2e original}% \def\underline#1{% \relax \ifmmode\@@underline{#1}% @@ -1895,7 +1904,7 @@ of this package available from CTAN} \fi \plEndIncludeInRelease \plIncludeInRelease{2015/01/01}% - {\e@alloc@chardef}{Extended Allocation (FAM256)}% + {\e@alloc@chardef}{LaTeX2e original}% \ifx\widowpenalties\@undefined \mathchardef\e@alloc@top=255 \let\e@alloc@chardef\chardef @@ -1905,7 +1914,7 @@ of this package available from CTAN} \fi \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}% - {\e@alloc@chardef}{Extended Allocation (FAM256)}% + {\e@alloc@chardef}{LaTeX2e original}% \let\e@alloc@top\@undefined \let\e@alloc@chardef\@undefined \plEndIncludeInRelease @@ -1918,11 +1927,11 @@ of this package available from CTAN} \fi \plEndIncludeInRelease \plIncludeInRelease{2015/01/01}% - {\e@mathgroup@top}{Extended Allocation (FAM256)}% + {\e@mathgroup@top}{LaTeX2e original}% \chardef\e@mathgroup@top=16 \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}% - {\e@mathgroup@top}{Extended Allocation (FAM256)}% + {\e@mathgroup@top}{LaTeX2e original}% \let\e@mathgroup@top\@undefined \plEndIncludeInRelease \endinput diff --git a/Master/texmf-dist/tex/platex/base/plcore.ltx b/Master/texmf-dist/tex/platex/base/plcore.ltx index 9628bf64596..93ea6b7cc52 100644 --- a/Master/texmf-dist/tex/platex/base/plcore.ltx +++ b/Master/texmf-dist/tex/platex/base/plcore.ltx @@ -34,7 +34,7 @@ \def\pfmtname{pLaTeX2e} \def\pfmtversion {2018-07-28} -\def\ppatch@level{0} +\def\ppatch@level{1} \edef\platexBANNER{\noexpand\platexNILa \the\everyjob % LaTeX banner and delayed codes \noexpand\platexNILb} @@ -927,6 +927,7 @@ \@makespecialcolbox \else \setbox\@outputbox \vbox to\@colht {% + %\boxmaxdepth \@maxdepth % comment out on LaTeX 1997/12/01 \@texttop \dimen@ \dp\@outputbox \unvbox \@outputbox -- cgit v1.2.3