From f62e383205a510feebe4b5d9137f5d2850993924 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 3 Sep 2016 21:35:33 +0000 Subject: platex (3sep16) git-svn-id: svn://tug.org/texlive/trunk@41982 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/platex/base/ascmac.sty | 2 +- Master/texmf-dist/tex/platex/base/exppl2e.sty | 196 ++++++++++++++++++++- Master/texmf-dist/tex/platex/base/jarticle.cls | 16 -- Master/texmf-dist/tex/platex/base/jarticle.sty | 16 -- Master/texmf-dist/tex/platex/base/jbk10.clo | 16 -- Master/texmf-dist/tex/platex/base/jbk11.clo | 16 -- Master/texmf-dist/tex/platex/base/jbk12.clo | 16 -- Master/texmf-dist/tex/platex/base/jbook.cls | 16 -- Master/texmf-dist/tex/platex/base/jbook.sty | 16 -- Master/texmf-dist/tex/platex/base/jltxdoc.cls | 23 +-- Master/texmf-dist/tex/platex/base/jreport.cls | 16 -- Master/texmf-dist/tex/platex/base/jreport.sty | 16 -- Master/texmf-dist/tex/platex/base/jsize10.clo | 16 -- Master/texmf-dist/tex/platex/base/jsize11.clo | 16 -- Master/texmf-dist/tex/platex/base/jsize12.clo | 16 -- Master/texmf-dist/tex/platex/base/jt1gt.fd | 16 -- Master/texmf-dist/tex/platex/base/jt1mc.fd | 16 -- Master/texmf-dist/tex/platex/base/jy1gt.fd | 16 -- Master/texmf-dist/tex/platex/base/jy1mc.fd | 16 -- Master/texmf-dist/tex/platex/base/kinsoku.tex | 16 -- Master/texmf-dist/tex/platex/base/nidanfloat.sty | 16 -- Master/texmf-dist/tex/platex/base/oldpfont.sty | 16 -- Master/texmf-dist/tex/platex/base/pfltrace.sty | 16 -- Master/texmf-dist/tex/platex/base/pl209.def | 16 -- Master/texmf-dist/tex/platex/base/platex.ltx | 25 +-- .../texmf-dist/tex/platex/base/platexrelease.sty | 187 +++++++++++++------- Master/texmf-dist/tex/platex/base/plcore.ltx | 98 +++-------- Master/texmf-dist/tex/platex/base/pldefs.ltx | 16 -- Master/texmf-dist/tex/platex/base/plext.sty | 34 +--- Master/texmf-dist/tex/platex/base/ptrace.sty | 16 -- Master/texmf-dist/tex/platex/base/tarticle.cls | 16 -- Master/texmf-dist/tex/platex/base/tarticle.sty | 16 -- Master/texmf-dist/tex/platex/base/tascmac.sty | 101 +++++++---- Master/texmf-dist/tex/platex/base/tbk10.clo | 16 -- Master/texmf-dist/tex/platex/base/tbk11.clo | 16 -- Master/texmf-dist/tex/platex/base/tbk12.clo | 16 -- Master/texmf-dist/tex/platex/base/tbook.cls | 16 -- Master/texmf-dist/tex/platex/base/tbook.sty | 16 -- Master/texmf-dist/tex/platex/base/treport.cls | 16 -- Master/texmf-dist/tex/platex/base/treport.sty | 16 -- Master/texmf-dist/tex/platex/base/tsize10.clo | 16 -- Master/texmf-dist/tex/platex/base/tsize11.clo | 16 -- Master/texmf-dist/tex/platex/base/tsize12.clo | 16 -- 43 files changed, 424 insertions(+), 802 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/platex/base/ascmac.sty b/Master/texmf-dist/tex/platex/base/ascmac.sty index 0a4b56cc1fd..ac5639a4ebc 100644 --- a/Master/texmf-dist/tex/platex/base/ascmac.sty +++ b/Master/texmf-dist/tex/platex/base/ascmac.sty @@ -16,7 +16,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{ascmac} - [2016/04/15 v2.0b + [2016/08/21 v2.0c ascmac wrapper (community edition) ] \RequirePackage{tascmac} diff --git a/Master/texmf-dist/tex/platex/base/exppl2e.sty b/Master/texmf-dist/tex/platex/base/exppl2e.sty index e0727eaadaf..3eda0ea6b0b 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} - [2016/06/29 v1.0b Experimental pLaTeX2e features] + [2016/09/03 v1.0e Experimental pLaTeX2e features] \PackageWarningNoLine{exppl2e}{% This is the unstable, experimental part of pLaTeX2e.\MessageBreak This package may contain:\MessageBreak @@ -88,10 +88,10 @@ % % パッケージ\file{exppl2e.sty}を読み込みます。ただし、|\usepackage|命令 % を使うのではなく、文書クラスより\emph{前}に読み込んでおくのが無難です。 -% \begin{verbatim} +%\begin{verbatim} % \RequirePackage{exppl2e} % \documentclass{article} -% \end{verbatim} +%\end{verbatim} % % \subsection{常に実験的コードを使用したい場合} % @@ -101,9 +101,9 @@ % に\file{platex.cfg}というファイルがあれば、起動時にそれを読み込み % ます。この機能を利用すると、以下の内容の\file{platex.cfg}を用意し % ておくだけで、自動的に毎回\file{exppl2e.sty}が読み込まれます。 -% \begin{verbatim} +%\begin{verbatim} % \RequirePackage{exppl2e} -% \end{verbatim} +%\end{verbatim} % % % \section{このドキュメントについて} @@ -112,9 +112,9 @@ % 実質的には\file{exppl2e.sty}はdtxファイルと同等です。すなわち、 % コードと一緒にdtx互換ドキュメントが含まれています。このドキュメント % を組版するには -% \begin{verbatim} +%\begin{verbatim} % # platex exppl2e.sty -% \end{verbatim} +%\end{verbatim} % を実行します。 % % @@ -122,6 +122,7 @@ % % ここからp\LaTeXe{}のexperimentalコード本体です。 % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % \section{PDFのブックマークとアクセント文字} % @@ -246,4 +247,185 @@ % \end{macrocode} % \end{macro} % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% \section{脚注の合印直後での改行を許可} +% +% p\LaTeXe{}カーネル(2016/09/03)に導入したため削除。 +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% \section{支柱} +% +% \subsubsection{支柱} +% 行間の調整などに用いる支柱です。 +% 支柱のもととなるボックスの大きさは、フォントサイズが変更されるたびに、 +% |\set@fontsize|コマンドによって変化します。 +% +% フォントサイズが変更されたときに、|\set@fontsize|コマンドで更新されます。 +% +% 従来、横組ボックス用の支柱は|\strutbox|で、高さと深さが7対3となっていました。 +% これはp\LaTeX{}単体では問題になりませんでしたが、海外製の\LaTeX{}パッケージを +% 縦組で使用した場合に、意図しない幅や高さが取得されることがありました。 +% この不都合を回避するため、コミュニティ版p\LaTeX{}では次の方法をとります。 +% \begin{itemize} +% \item |\ystrutbox|(新設):高さと深さが7対3の横組ボックス用の支柱 +% \item |\tstrutbox|:高さと深さが5対5の縦組ボックス用の支柱 +% \item |\zstrutbox|:高さと深さが7対3の縦組ボックス用の支柱 +% \item |\strutbox|(仕様変更):縦横のディレクションに応じて +% |\tstrutbox|または|\ystrutbox|に展開されるマクロ +% \end{itemize} +% すなわち、従来のp\LaTeX{}における|\strutbox|と同じ挙動を示すのが、 +% 新設された|\ystrutbox|ということになります。 +% +% \begin{macro}{\tstrutbox} +% \begin{macro}{\zstrutbox} +% |\tstrutbox|は高さと深さが5対5、 +% |\zstrutbox|は高さと深さが7対3の支柱ボックスとなります。 +% これらは縦組ボックスの行間の調整などに使います。 +% \begin{macrocode} +\newbox\tstrutbox +\newbox\zstrutbox +% \end{macrocode} +% \end{macro} +% \end{macro} +% +% \begin{macro}{\ystrutbox} +% |\ystrutbox|は高さと深さが7対3の横組ボックス用の支柱です。 +% \changes{v????}{????/??/??}{\cs{ystrutbox}を追加} +% \begin{macrocode} +%\plIncludeInRelease{????/??/??}{\ystrutbox} +% {Add \ystrutbox}% +%<*plcore|platexrelease> +\newbox\ystrutbox +% +%\plEndIncludeInRelease +%\plIncludeInRelease{0000/00/00}{\ystrutbox} +% {Add \ystrutbox}% +%\let\ystrutbox\@undefined +%\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\strut} +% ディレクションに応じて|\ystrutbox|と|\tstrutbox|を使い分けます。 +% ^^A |\strutbox|は|\yoko|ディレクションで組まれていますので、 +% ^^A 縦組ボックス内で|\unhcopy|をするとエラーとなります。 +% 元々このマクロは\file{ltplain.dtx}で定義されています。 +% +% \changes{v1.1c}{1995/08/24}{``\cs{centerling}~\cs{strut}''の幅がゼロに +% なってしまうのを修正} +% \changes{v1.3h}{1999/08/09}{縦組のとき、幅のあるボックスになってしまう +% のを修正} +% \changes{v????}{????/??/??}{\cs{strutbox}の代わりに\cs{ystrutbox}を使用} +% \begin{macrocode} +%\plIncludeInRelease{????/??/??}{\strut} +% {Use \ystrutbox}% +%<*plcore|platexrelease> +\def\strut{\relax + \ifydir + \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi + \else + \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi + \fi} +% +%\plEndIncludeInRelease +%\plIncludeInRelease{0000/00/00}{\strut} +% {Use \ystrutbox}% +%\def\strut{\relax +% \ifydir +% \ifmmode\copy\strutbox\else\unhcopy\strutbox\fi +% \else +% \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi +% \fi} +%\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\tstrut} +% \begin{macro}{\zstrut} +% \begin{macrocode} +\def\tstrut{\relax\hbox{\tate + \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi}} +\def\zstrut{\relax\hbox{\tate + \ifmmode\copy\zstrutbox\else\unhcopy\zstrutbox\fi}} +% \end{macrocode} +% \end{macro} +% \end{macro} +% +% \begin{macro}{\ystrut} +% \changes{v????}{????/??/??}{\cs{ystrut}を追加} +% \begin{macrocode} +%\plIncludeInRelease{????/??/??}{\ystrut} +% {Add \ystrut}% +%<*plcore|platexrelease> +\def\ystrut{\relax\hbox{\yoko + \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi}} +% +%\plEndIncludeInRelease +%\plIncludeInRelease{0000/00/00}{\ystrut} +% {Add \ystrut}% +%\let\ystrut\@undefined +%\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% +% +% +%^^A================================================================= +%^^A メモ:|\set@fontsize|のplatexreleaseガード、traceガードは未完成 +%^^A================================================================= +% +% \begin{macro}{\set@fontsize} +% |\fontsize|コマンドの内部形式です。 +% ベースラインの設定と、支柱の設定を行ないます。 +% \begin{macrocode} +\def\set@fontsize#1#2#3{% + \@defaultunits\@tempdimb#2pt\relax\@nnil + \edef\f@size{\strip@pt\@tempdimb}% + \@defaultunits\@tempskipa#3pt\relax\@nnil + \edef\f@baselineskip{\the\@tempskipa}% + \edef\f@linespread{#1}% + \let\baselinestretch\f@linespread + \def\size@update{% + \baselineskip\f@baselineskip\relax + \baselineskip\f@linespread\baselineskip + \normalbaselineskip\baselineskip +% \end{macrocode} +% ここで、ベースラインシフトの調整と支柱を組み立てます。 +% \changes{v????}{????/??/??}{\cs{ystrutbox}を組み立てるように +% し、\cs{strutbox}を縦横両対応に} +% \begin{macrocode} + \adjustbaseline + \setbox\ystrutbox\hbox{\yoko + \vrule\@width\z@ + \@height.7\baselineskip \@depth.3\baselineskip}% + \setbox\tstrutbox\hbox{\tate + \vrule\@width\z@ + \@height.5\baselineskip \@depth.5\baselineskip}% + \setbox\zstrutbox\hbox{\tate + \vrule\@width\z@ + \@height.7\baselineskip \@depth.3\baselineskip}% + \def\strutbox{\iftdir\tstrutbox\else\ystrutbox\fi}% +% \end{macrocode} +% フォントサイズとベースラインに関する診断情報を出力します。 +% \begin{macrocode} +%<*trace> +% \ifnum \tracingfonts>\tw@ +% \ifx\f@linespread\@empty +% \let\reserved@a\@empty +% \else +% \def\reserved@a{\f@linespread x}% +% \fi +% \@font@info{Changing size to\space +% \f@size/\reserved@a \f@baselineskip}% +% \aftergroup\type@restoreinfo +% \fi +% + \let\size@update\relax}} +% \end{macrocode} +% \end{macro} +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \endinput diff --git a/Master/texmf-dist/tex/platex/base/jarticle.cls b/Master/texmf-dist/tex/platex/base/jarticle.cls index d2bae3a88c5..d999bd75644 100644 --- a/Master/texmf-dist/tex/platex/base/jarticle.cls +++ b/Master/texmf-dist/tex/platex/base/jarticle.cls @@ -13,22 +13,6 @@ %% ------------------------------------------------------------- %% %% File: jclasses.dtx -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jarticle} [2006/06/27 v1.6 diff --git a/Master/texmf-dist/tex/platex/base/jarticle.sty b/Master/texmf-dist/tex/platex/base/jarticle.sty index 96dca60c935..632cf58b3dd 100644 --- a/Master/texmf-dist/tex/platex/base/jarticle.sty +++ b/Master/texmf-dist/tex/platex/base/jarticle.sty @@ -13,22 +13,6 @@ %% ------------------------------------------------------------- %% %% File: pl209.dtx -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% \NeedsTeXFormat{pLaTeX2e} \@obsoletefile{jarticle.cls}{jarticle.sty} \LoadClass{jarticle} diff --git a/Master/texmf-dist/tex/platex/base/jbk10.clo b/Master/texmf-dist/tex/platex/base/jbk10.clo index 70b1bb5f51f..6392173bea0 100644 --- a/Master/texmf-dist/tex/platex/base/jbk10.clo +++ b/Master/texmf-dist/tex/platex/base/jbk10.clo @@ -13,22 +13,6 @@ %% ------------------------------------------------------------- %% %% File: jclasses.dtx -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jbk10.clo} [2006/06/27 v1.6 diff --git a/Master/texmf-dist/tex/platex/base/jbk11.clo b/Master/texmf-dist/tex/platex/base/jbk11.clo index a3215ec9c61..6561becb3dd 100644 --- a/Master/texmf-dist/tex/platex/base/jbk11.clo +++ b/Master/texmf-dist/tex/platex/base/jbk11.clo @@ -13,22 +13,6 @@ %% ------------------------------------------------------------- %% %% File: jclasses.dtx -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jbk11.clo} [2006/06/27 v1.6 diff --git a/Master/texmf-dist/tex/platex/base/jbk12.clo b/Master/texmf-dist/tex/platex/base/jbk12.clo index 2910c2e97ca..84915f187ff 100644 --- a/Master/texmf-dist/tex/platex/base/jbk12.clo +++ b/Master/texmf-dist/tex/platex/base/jbk12.clo @@ -13,22 +13,6 @@ %% ------------------------------------------------------------- %% %% File: jclasses.dtx -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jbk12.clo} [2006/06/27 v1.6 diff --git a/Master/texmf-dist/tex/platex/base/jbook.cls b/Master/texmf-dist/tex/platex/base/jbook.cls index a40ad063b18..55ffdb96300 100644 --- a/Master/texmf-dist/tex/platex/base/jbook.cls +++ b/Master/texmf-dist/tex/platex/base/jbook.cls @@ -13,22 +13,6 @@ %% ------------------------------------------------------------- %% %% File: jclasses.dtx -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jbook} [2006/06/27 v1.6 diff --git a/Master/texmf-dist/tex/platex/base/jbook.sty b/Master/texmf-dist/tex/platex/base/jbook.sty index faa52e3ed65..56d6df93ff6 100644 --- a/Master/texmf-dist/tex/platex/base/jbook.sty +++ b/Master/texmf-dist/tex/platex/base/jbook.sty @@ -13,22 +13,6 @@ %% ------------------------------------------------------------- %% %% File: pl209.dtx -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% \NeedsTeXFormat{pLaTeX2e} \@obsoletefile{jbook.cls}{jbook.sty} \LoadClass{jbook} diff --git a/Master/texmf-dist/tex/platex/base/jltxdoc.cls b/Master/texmf-dist/tex/platex/base/jltxdoc.cls index 7b57c4b2132..f4e8f666a81 100644 --- a/Master/texmf-dist/tex/platex/base/jltxdoc.cls +++ b/Master/texmf-dist/tex/platex/base/jltxdoc.cls @@ -13,25 +13,8 @@ %% ------------------------------------------------------------- %% %% File: jltxdoc.dtx -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% - \NeedsTeXFormat{pLaTeX2e} -\ProvidesClass{jltxdoc}[1997/07/29 v1.0b Standard pLaTeX file] +\ProvidesClass{jltxdoc}[2016/07/25 v1.0c Standard pLaTeX file] \DeclareOption*{\PassOptionsToClass{\CurrentOption}{ltxdoc}} \ProcessOptions \LoadClass{ltxdoc} @@ -76,6 +59,10 @@ \def\DisableCrossrefs{\@bsphack\scan@allowedfalse\@esphack} \def\EnableCrossrefs{\@bsphack\scan@allowedtrue \def\DisableCrossrefs{\@bsphack\scan@allowedfalse\@esphack}\@esphack} +\def\verb{\relax\ifmmode\hbox\else\leavevmode\fi + \bgroup \let\do\do@noligs \verbatim@nolig@list + \ttfamily \verb@eol@error \let\do\@makeother \dospecials + \@ifstar{\@sverb}{\@vobeyspaces \frenchspacing \@sverb}} \xspcode"5C=3 %% \ \xspcode"22=3 %% " \endinput diff --git a/Master/texmf-dist/tex/platex/base/jreport.cls b/Master/texmf-dist/tex/platex/base/jreport.cls index 1d6a5737adf..42a7ce54efc 100644 --- a/Master/texmf-dist/tex/platex/base/jreport.cls +++ b/Master/texmf-dist/tex/platex/base/jreport.cls @@ -13,22 +13,6 @@ %% ------------------------------------------------------------- %% %% File: jclasses.dtx -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jreport} [2006/06/27 v1.6 diff --git a/Master/texmf-dist/tex/platex/base/jreport.sty b/Master/texmf-dist/tex/platex/base/jreport.sty index 4ea06a3c7a7..c898d43150e 100644 --- a/Master/texmf-dist/tex/platex/base/jreport.sty +++ b/Master/texmf-dist/tex/platex/base/jreport.sty @@ -13,22 +13,6 @@ %% ------------------------------------------------------------- %% %% File: pl209.dtx -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% \NeedsTeXFormat{pLaTeX2e} \@obsoletefile{jreport.cls}{jreport.sty} \LoadClass{jreport} diff --git a/Master/texmf-dist/tex/platex/base/jsize10.clo b/Master/texmf-dist/tex/platex/base/jsize10.clo index ba3e05a79fe..e8e91a691ec 100644 --- a/Master/texmf-dist/tex/platex/base/jsize10.clo +++ b/Master/texmf-dist/tex/platex/base/jsize10.clo @@ -13,22 +13,6 @@ %% ------------------------------------------------------------- %% %% File: jclasses.dtx -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jsize10.clo} [2006/06/27 v1.6 diff --git a/Master/texmf-dist/tex/platex/base/jsize11.clo b/Master/texmf-dist/tex/platex/base/jsize11.clo index 035f1ecd95e..e3f1cad21da 100644 --- a/Master/texmf-dist/tex/platex/base/jsize11.clo +++ b/Master/texmf-dist/tex/platex/base/jsize11.clo @@ -13,22 +13,6 @@ %% ------------------------------------------------------------- %% %% File: jclasses.dtx -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jsize11.clo} [2006/06/27 v1.6 diff --git a/Master/texmf-dist/tex/platex/base/jsize12.clo b/Master/texmf-dist/tex/platex/base/jsize12.clo index d1478cab8ab..33d10675a15 100644 --- a/Master/texmf-dist/tex/platex/base/jsize12.clo +++ b/Master/texmf-dist/tex/platex/base/jsize12.clo @@ -13,22 +13,6 @@ %% ------------------------------------------------------------- %% %% File: jclasses.dtx -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jsize12.clo} [2006/06/27 v1.6 diff --git a/Master/texmf-dist/tex/platex/base/jt1gt.fd b/Master/texmf-dist/tex/platex/base/jt1gt.fd index 0a2dbcb44e1..01412ea3af0 100644 --- a/Master/texmf-dist/tex/platex/base/jt1gt.fd +++ b/Master/texmf-dist/tex/platex/base/jt1gt.fd @@ -13,22 +13,6 @@ %% ------------------------------------------------------------- %% %% File: plfonts.dtx -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% \ProvidesFile{jt1gt.fd} [1997/01/24 v1.3 KANJI font defines] \DeclareKanjiFamily{JT1}{gt}{} diff --git a/Master/texmf-dist/tex/platex/base/jt1mc.fd b/Master/texmf-dist/tex/platex/base/jt1mc.fd index 0dcca07d5bd..ebd9ce717ee 100644 --- a/Master/texmf-dist/tex/platex/base/jt1mc.fd +++ b/Master/texmf-dist/tex/platex/base/jt1mc.fd @@ -13,22 +13,6 @@ %% ------------------------------------------------------------- %% %% File: plfonts.dtx -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% \ProvidesFile{jt1mc.fd} [1997/01/24 v1.3 KANJI font defines] \DeclareKanjiFamily{JT1}{mc}{} diff --git a/Master/texmf-dist/tex/platex/base/jy1gt.fd b/Master/texmf-dist/tex/platex/base/jy1gt.fd index b89e28fdf0e..c2710d9c677 100644 --- a/Master/texmf-dist/tex/platex/base/jy1gt.fd +++ b/Master/texmf-dist/tex/platex/base/jy1gt.fd @@ -13,22 +13,6 @@ %% ------------------------------------------------------------- %% %% File: plfonts.dtx -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% \ProvidesFile{jy1gt.fd} [1997/01/24 v1.3 KANJI font defines] \DeclareKanjiFamily{JY1}{gt}{} diff --git a/Master/texmf-dist/tex/platex/base/jy1mc.fd b/Master/texmf-dist/tex/platex/base/jy1mc.fd index d794990a014..a45f3b5a539 100644 --- a/Master/texmf-dist/tex/platex/base/jy1mc.fd +++ b/Master/texmf-dist/tex/platex/base/jy1mc.fd @@ -13,22 +13,6 @@ %% ------------------------------------------------------------- %% %% File: plfonts.dtx -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% \ProvidesFile{jy1mc.fd} [1997/01/24 v1.3 KANJI font defines] \DeclareKanjiFamily{JY1}{mc}{} diff --git a/Master/texmf-dist/tex/platex/base/kinsoku.tex b/Master/texmf-dist/tex/platex/base/kinsoku.tex index 9ebcd9a3ccf..6d03b0d7339 100644 --- a/Master/texmf-dist/tex/platex/base/kinsoku.tex +++ b/Master/texmf-dist/tex/platex/base/kinsoku.tex @@ -13,22 +13,6 @@ %% ------------------------------------------------------------- %% %% File: kinsoku.dtx -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% \prebreakpenalty`!=10000 \prebreakpenalty`"=10000 \postbreakpenalty`\#=500 diff --git a/Master/texmf-dist/tex/platex/base/nidanfloat.sty b/Master/texmf-dist/tex/platex/base/nidanfloat.sty index dc3d71de637..ae6d8839928 100644 --- a/Master/texmf-dist/tex/platex/base/nidanfloat.sty +++ b/Master/texmf-dist/tex/platex/base/nidanfloat.sty @@ -13,22 +13,6 @@ %% ------------------------------------------------------------- %% %% File: nidanfloat.dtx -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{nidanfloat}% [2005/12/09 v2.7 Put double-floats at top/bottom within twocolumn mode] diff --git a/Master/texmf-dist/tex/platex/base/oldpfont.sty b/Master/texmf-dist/tex/platex/base/oldpfont.sty index dfd9523f1db..62959a461ba 100644 --- a/Master/texmf-dist/tex/platex/base/oldpfont.sty +++ b/Master/texmf-dist/tex/platex/base/oldpfont.sty @@ -13,22 +13,6 @@ %% ------------------------------------------------------------- %% %% File: pl209.dtx -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% \RequirePackage{oldlfont} \RequirePackage{ptrace} \DeclareSymbolFont{mincho}{JY1}{mc}{m}{n} diff --git a/Master/texmf-dist/tex/platex/base/pfltrace.sty b/Master/texmf-dist/tex/platex/base/pfltrace.sty index a6b644a4ce7..d7daa4ca196 100644 --- a/Master/texmf-dist/tex/platex/base/pfltrace.sty +++ b/Master/texmf-dist/tex/platex/base/pfltrace.sty @@ -13,22 +13,6 @@ %% ------------------------------------------------------------- %% %% File: plcore.dtx -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{pfltrace} [2016/05/20 v1.2e Standard pLaTeX package (float tracing)] diff --git a/Master/texmf-dist/tex/platex/base/pl209.def b/Master/texmf-dist/tex/platex/base/pl209.def index c7de7ca531b..68376e34600 100644 --- a/Master/texmf-dist/tex/platex/base/pl209.def +++ b/Master/texmf-dist/tex/platex/base/pl209.def @@ -13,22 +13,6 @@ %% ------------------------------------------------------------- %% %% File: pl209.dtx -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% \typeout{Entering pLaTeX 2.09 compatibility mode.} \input{latex209.def} \RequirePackage{ptrace} diff --git a/Master/texmf-dist/tex/platex/base/platex.ltx b/Master/texmf-dist/tex/platex/base/platex.ltx index 8df129f5f0c..e5ba0c13b4f 100644 --- a/Master/texmf-dist/tex/platex/base/platex.ltx +++ b/Master/texmf-dist/tex/platex/base/platex.ltx @@ -13,22 +13,6 @@ %% ------------------------------------------------------------- %% %% File: platex.dtx -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% \let\orgdump\dump \let\dump\relax \input latex.ltx @@ -41,11 +25,18 @@ \makeatletter \input plcore.ltx \the\everyjob +\everyjob\expandafter{% + \the\everyjob + \IfFileExists{platex.cfg}{% + \typeout{*************************^^J% + * Loading platex.cfg.^^J% + *************************}% + \input{platex.cfg}}{}% +} \let\dump\orgdump \let\orgdump\@undefined \makeatother \dump \endinput -\endinput %% %% End of file `platex.ltx'. diff --git a/Master/texmf-dist/tex/platex/base/platexrelease.sty b/Master/texmf-dist/tex/platex/base/platexrelease.sty index fb296fb741b..5525fcb0207 100644 --- a/Master/texmf-dist/tex/platex/base/platexrelease.sty +++ b/Master/texmf-dist/tex/platex/base/platexrelease.sty @@ -15,26 +15,10 @@ %% ------------------------------------------------------------- %% %% File: plvers.dtx -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% \edef\p@known@latexreleaseversion {2016/03/31} \edef\platexreleaseversion - {2016/07/01} + {2016/09/03} \def\plIncludeInRelease#1{\kernel@ifnextchar[% {\@plIncludeInRelease{#1}} {\@plIncludeInRelease{#1}[#1]}} @@ -58,25 +42,9 @@ \long\def\@gobble@plIncludeInRelease#1\plEndIncludeInRelease{} \let\plEndIncludeInRelease\relax %% File: platexrelease.dtx -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{platexrelease} - [2016/06/30 v1.0e latexrelease support for pLaTeX Kernel] + [2016/07/05 v1.0f latexrelease support for pLaTeX Kernel] \RequirePackageWithOptions{latexrelease} \ifnum\expandafter\@parse@version\latexreleaseversion//00\@nil >\expandafter\@parse@version\p@known@latexreleaseversion//00\@nil @@ -117,7 +85,7 @@ >\expandafter\@parse@version\platexreleaseversion//00\@nil \PackageWarningNoLine{platexrelease}{% The current package is for an older pLaTeX format:\MessageBreak -pLaTeX \pfmtversion\space\MessageBreak +pLaTeX \platexreleaseversion\space\MessageBreak Obtain a newer version of this package!} \expandafter\endinput \fi @@ -144,22 +112,6 @@ of this package available from CTAN} \plIncludeInRelease{0000/00/00}{\PackageWarning}{pLaTeX Info}% \plEndIncludeInRelease %% File: plfonts.dtx -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% \plIncludeInRelease{2016/06/10}{\g@tlastchart@} {Added \g@tlastchart@}% \def\g@tlastchart@#1{#1\ifx\lastnodechar\@undefined\m@ne\else\lastnodechar\fi} @@ -323,22 +275,35 @@ of this package available from CTAN} \let\eminnershape\@undefined \plEndIncludeInRelease %% File: plcore.dtx -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% +\plIncludeInRelease{2016/09/03}{\@makecol}{\@makecol}% +\gdef\@makecol{% + \setbox\@outputbox\box\@cclv% + \xdef\@freelist{\@freelist\@midlist}% + \global \let \@midlist \@empty + \@combinefloats + \ifvbox\@kludgeins + \@makespecialcolbox + \else + \setbox\@outputbox \vbox to\@colht {% + \@texttop + \dimen@ \dp\@outputbox + \unvbox \@outputbox + \iftdir\vbox{\hskip\z@}\fi + \vskip -\dimen@ + \@textbottom + \ifvoid\footins\else % for pLaTeX + \vskip \skip\footins + \color@begingroup + \normalcolor + \footnoterule + \unvbox \footins + \color@endgroup + \fi + }% + \fi + \global \maxdepth \@maxdepth +} +\plEndIncludeInRelease \plIncludeInRelease{2016/04/17}{\@makecol}{\@makecol}% \gdef\@makecol{% \setbox\@outputbox\box\@cclv% @@ -349,6 +314,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 @@ -467,6 +433,93 @@ of this package available from CTAN} \ifydir \@textsuperscript{\normalfont\@thefnmark}% \else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi}} \plEndIncludeInRelease +\plIncludeInRelease{2016/09/03}{\pltx@foot@penalty} + {Add new counter \pltx@foot@penalty}% +\ifx\@undefined\pltx@foot@penalty \newcount\pltx@foot@penalty \fi +\pltx@foot@penalty\z@ +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\pltx@foot@penalty} + {Add new counter \pltx@foot@penalty}% +\let\pltx@foot@penalty\@undefined +\plEndIncludeInRelease +\plIncludeInRelease{2016/09/03}{\footnote} + {Append \inhibitglue in \footnotemark}% +\def\footnote{\inhibitglue + \@ifnextchar[\@xfootnote{\stepcounter\@mpfn + \protected@xdef\@thefnmark{\thempfn}% + \@footnotemark\@footnotetext}} +\def\footnotemark{\inhibitglue + \@ifnextchar[\@xfootnotemark + {\stepcounter{footnote}% + \protected@xdef\@thefnmark{\thefootnote}% + \@footnotemark}} +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\footnote} + {Append \inhibitglue in \footnotemark}% +\def\footnote{\@ifnextchar[\@xfootnote{\stepcounter\@mpfn + \protected@xdef\@thefnmark{\thempfn}% + \@footnotemark\@footnotetext}} +\def\footnotemark{% + \@ifnextchar[\@xfootnotemark + {\stepcounter{footnote}% + \protected@xdef\@thefnmark{\thefootnote}% + \@footnotemark}} +\plEndIncludeInRelease +\plIncludeInRelease{2016/09/03}{\footnotetext} + {Preserve penalty before \footnotetext}% +\def\footnotetext{% + \ifhmode\pltx@foot@penalty\lastpenalty\unpenalty\fi% + \@ifnextchar [\@xfootnotenext + {\protected@xdef\@thefnmark{\thempfn}% + \@footnotetext}} +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\footnotetext} + {Preserve penalty before \footnotetext}% +\def\footnotetext{% + \@ifnextchar [\@xfootnotenext + {\protected@xdef\@thefnmark{\thempfn}% + \@footnotetext}} +\plEndIncludeInRelease +\plIncludeInRelease{2016/09/03}{\@footnotetext} + {Allow break after \footnote}% +\long\def\@footnotetext#1{% + \ifydir\def\@tempa{\yoko}\else\def\@tempa{\tate}\fi + \insert\footins{\@tempa% + \reset@font\footnotesize + \interlinepenalty\interfootnotelinepenalty + \splittopskip\footnotesep + \splitmaxdepth \dp\strutbox \floatingpenalty \@MM + \hsize\columnwidth \@parboxrestore + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark + }% + \color@begingroup + \@makefntext{% + \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}% + \color@endgroup}\null + \ifnum\pltx@foot@penalty=\z@\else + \penalty\pltx@foot@penalty + \pltx@foot@penalty\z@ + \fi} +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\@footnotetext} + {Allow break after \footnote}% +\long\def\@footnotetext#1{% + \ifydir\def\@tempa{\yoko}\else\def\@tempa{\tate}\fi + \insert\footins{\@tempa% + \reset@font\footnotesize + \interlinepenalty\interfootnotelinepenalty + \splittopskip\footnotesep + \splitmaxdepth \dp\strutbox \floatingpenalty \@MM + \hsize\columnwidth \@parboxrestore + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark + }% + \color@begingroup + \@makefntext{% + \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}% + \color@endgroup}} +\plEndIncludeInRelease \plIncludeInRelease{2016/04/17}{\@tabular} {Remove extra \xkanjiskip}% \def\@tabular{\leavevmode \null\hbox \bgroup $\let\@acol\@tabacol diff --git a/Master/texmf-dist/tex/platex/base/plcore.ltx b/Master/texmf-dist/tex/platex/base/plcore.ltx index c2e8a3df77b..87390477c10 100644 --- a/Master/texmf-dist/tex/platex/base/plcore.ltx +++ b/Master/texmf-dist/tex/platex/base/plcore.ltx @@ -16,25 +16,9 @@ %% ------------------------------------------------------------- %% %% File: plvers.dtx -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% \def\pfmtname{pLaTeX2e} \def\pfmtversion - {2016/07/01} + {2016/09/03} \def\ppatch@level{0} \def\plIncludeInRelease#1{\kernel@ifnextchar[% {\@plIncludeInRelease{#1}} @@ -59,22 +43,6 @@ \long\def\@gobble@plIncludeInRelease#1\plEndIncludeInRelease{} \let\plEndIncludeInRelease\relax %% File: plfonts.dtx -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% \let\k@encoding\@empty \let\ck@encoding\@empty \def\cy@encoding{JY1} @@ -672,22 +640,6 @@ *************************************}}% {\input{pldefs.ltx}} %% File: plcore.dtx -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% \def\NeedsTeXFormat#1{% \def\reserved@a{#1}% \ifx\reserved@a\pfmtname @@ -747,7 +699,7 @@ \@texttop \dimen@ \dp\@outputbox \unvbox \@outputbox - \iftdir\hskip\z@\fi + \iftdir\vbox{\hskip\z@}\fi \vskip -\dimen@ \@textbottom \ifvoid\footins\else % for pLaTeX @@ -964,6 +916,22 @@ \renewcommand\@makefnmark{% \ifydir \hbox{}\hbox{\@textsuperscript{\normalfont\@thefnmark}}\hbox{}% \else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi} +\ifx\@undefined\pltx@foot@penalty \newcount\pltx@foot@penalty \fi +\pltx@foot@penalty\z@ +\def\footnote{\inhibitglue + \@ifnextchar[\@xfootnote{\stepcounter\@mpfn + \protected@xdef\@thefnmark{\thempfn}% + \@footnotemark\@footnotetext}} +\def\footnotemark{\inhibitglue + \@ifnextchar[\@xfootnotemark + {\stepcounter{footnote}% + \protected@xdef\@thefnmark{\thefootnote}% + \@footnotemark}} +\def\footnotetext{% + \ifhmode\pltx@foot@penalty\lastpenalty\unpenalty\fi% + \@ifnextchar [\@xfootnotenext + {\protected@xdef\@thefnmark{\thempfn}% + \@footnotetext}} \long\def\@footnotetext#1{% \ifydir\def\@tempa{\yoko}\else\def\@tempa{\tate}\fi \insert\footins{\@tempa% @@ -978,7 +946,11 @@ \color@begingroup \@makefntext{% \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}% - \color@endgroup}} + \color@endgroup}\null + \ifnum\pltx@foot@penalty=\z@\else + \penalty\pltx@foot@penalty + \pltx@foot@penalty\z@ + \fi} \def\@footnotemark{\leavevmode \ifhmode\edef\@x@sf{\the\spacefactor}\nobreak\fi \ifydir\@makefnmark @@ -1033,22 +1005,6 @@ \ifmmode\@@underline{#1}% \else \leavevmode\null$\@@underline{\hbox{#1}}\m@th$\null\relax\fi} %% File: plvers.dtx -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% \ifx\patch@level\@undefined % fallback if undefined in LaTeX \def\patch@level{0}\fi \ifx\ppatch@level\@undefined % fallback if undefined in pLaTeX @@ -1082,14 +1038,6 @@ } \expandafter \endgroup \platexTMP -\everyjob\expandafter{% - \the\everyjob - \IfFileExists{platex.cfg}{% - \typeout{*************************^^J% - * Loading platex.cfg.^^J% - *************************}% - \input{platex.cfg}}{}% -} \AtBeginDocument{% \@ifpackageloaded{latexrelease}{% \@ifpackageloaded{platexrelease}{}{% diff --git a/Master/texmf-dist/tex/platex/base/pldefs.ltx b/Master/texmf-dist/tex/platex/base/pldefs.ltx index 52e48ff0d22..6eca8060621 100644 --- a/Master/texmf-dist/tex/platex/base/pldefs.ltx +++ b/Master/texmf-dist/tex/platex/base/pldefs.ltx @@ -13,22 +13,6 @@ %% ------------------------------------------------------------- %% %% File: plfonts.dtx -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% \ProvidesFile{pldefs.ltx} [2016/06/26 v1.6e pLaTeX Kernel (Default settings)] \def\g@tlastchart@#1{#1\ifx\lastnodechar\@undefined\m@ne\else\lastnodechar\fi} diff --git a/Master/texmf-dist/tex/platex/base/plext.sty b/Master/texmf-dist/tex/platex/base/plext.sty index ac113672409..fd30b518ee9 100644 --- a/Master/texmf-dist/tex/platex/base/plext.sty +++ b/Master/texmf-dist/tex/platex/base/plext.sty @@ -13,29 +13,13 @@ %% ------------------------------------------------------------- %% %% File: plext.dtx -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{plext} - [2001/09/26 v1.2 pLaTeX package file] + [2016/08/20 v1.2a pLaTeX package file (community edition)] \newif\if@rotsw \def\array{\let\@acol\@arrayacol \let\@classz\@arrayclassz - \let\@classiv\@arrayclassiv - \let\\\@arraycr\let\@halignto\@empty\X@tabarray} + \let\@classiv\@arrayclassiv + \let\\\@arraycr\let\@halignto\@empty\X@tabarray} \def\tabular{\let\@halignto\@empty\X@tabular} \@namedef{tabular*}{\@ifnextchar<%> {\@stabular}{\@stabular}} @@ -44,7 +28,7 @@ \def\X@tabular{\@ifnextchar<%> {\p@tabular}{\p@tabular}} \def\@stabular<#1>#2{\def\@halignto{to#2}\p@tabular<#1>} -\def\p@tabular<#1>{\leavevmode \hbox \bgroup $\let\@acol\@tabacol +\def\p@tabular<#1>{\leavevmode \null\hbox \bgroup $\let\@acol\@tabacol \let\@classz\@tabclassz \let\@classiv\@tabclassiv \let\\\@tabularcr\p@tabarray<#1>} \def\p@tabarray<#1>{\m@th\@ifnextchar[%] @@ -62,9 +46,9 @@ \@depth\arraystretch\dp\tstrutbox \@width\z@ \fi\fi \else - \if #1t\relax\hbox{\tate + \if #1t\relax\tate \vrule\@height\arraystretch\ht\tstrutbox - \@depth\arraystretch\dp\tstrutbox \@width\z@}% + \@depth\arraystretch\dp\tstrutbox \@width\z@ \else \vrule\@height\arraystretch\ht\strutbox \@depth\arraystretch\dp\strutbox \@width\z@ @@ -80,7 +64,7 @@ \let\@sharp##\let\protect\relax \lineskip\z@skip\baselineskip\z@skip\@preamble} \def\endarray{\crcr\egroup\egroup\@end@alignbox} -\def\endtabular{\crcr\egroup\egroup\@end@alignbox $\egroup} +\def\endtabular{\crcr\egroup\egroup\@end@alignbox $\egroup\null} \expandafter \let \csname endtabular*\endcsname = \endtabular \def\fork@array@option<#1>[#2]{% \@rotswfalse @@ -325,7 +309,7 @@ \def\@iiparbox<#1>#2[#3]{\@ifnextchar[%]% {\@iiiparbox<#1>{#2}{#3}}{\@iiiparbox<#1>{#2}{#3}[#2]}} \long\def\@iiiparbox<#1>#2#3[#4]#5#6{% - \leavevmode\bgroup + \leavevmode\null\bgroup \setlength\@tempdima{#5}% \fork@parbox@option<#1>[#2]% \if@rotsw @@ -342,7 +326,7 @@ \@begin@parbox\@parboxto{\box@dir\adjustbaseline \let\hss\vss\let\unhbox\unvbox \csname bm@#4\endcsname}\@end@parbox - \@end@tempboxa\egroup} + \@end@tempboxa\egroup\null} \def\fork@parbox@option<#1>[#2]{% \@rotswfalse \iftdir diff --git a/Master/texmf-dist/tex/platex/base/ptrace.sty b/Master/texmf-dist/tex/platex/base/ptrace.sty index dae20e378cc..58ef9e145f6 100644 --- a/Master/texmf-dist/tex/platex/base/ptrace.sty +++ b/Master/texmf-dist/tex/platex/base/ptrace.sty @@ -13,22 +13,6 @@ %% ------------------------------------------------------------- %% %% File: plfonts.dtx -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{ptrace} [2016/04/30 v1.6b Standard pLaTeX package (font tracing)] diff --git a/Master/texmf-dist/tex/platex/base/tarticle.cls b/Master/texmf-dist/tex/platex/base/tarticle.cls index 358cbfca84d..6477ece89e0 100644 --- a/Master/texmf-dist/tex/platex/base/tarticle.cls +++ b/Master/texmf-dist/tex/platex/base/tarticle.cls @@ -13,22 +13,6 @@ %% ------------------------------------------------------------- %% %% File: jclasses.dtx -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{tarticle} [2006/06/27 v1.6 diff --git a/Master/texmf-dist/tex/platex/base/tarticle.sty b/Master/texmf-dist/tex/platex/base/tarticle.sty index ff0f4459a89..16792d49e90 100644 --- a/Master/texmf-dist/tex/platex/base/tarticle.sty +++ b/Master/texmf-dist/tex/platex/base/tarticle.sty @@ -13,22 +13,6 @@ %% ------------------------------------------------------------- %% %% File: pl209.dtx -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% \NeedsTeXFormat{pLaTeX2e} \@obsoletefile{tarticle.cls}{tarticle.sty} \LoadClass{tarticle} diff --git a/Master/texmf-dist/tex/platex/base/tascmac.sty b/Master/texmf-dist/tex/platex/base/tascmac.sty index a38da428621..3d5d9e1f8ee 100644 --- a/Master/texmf-dist/tex/platex/base/tascmac.sty +++ b/Master/texmf-dist/tex/platex/base/tascmac.sty @@ -23,31 +23,52 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{tascmac} - [2016/04/15 v2.0b + [2016/08/21 v2.0c ascmac package (community edition) ] %% -%% Actually `tascmac' requires pLaTeX2e, but LuaTeX-ja can handle the -%% code properly; so \NeedsTeXFormat{LaTeX2e} on purpose. -%% Check is included below: +%% Originally `ascmac' and `tascmac' can be used only in +%% pLaTeX, upLaTeX or LuaLaTeX with LuaTeX-ja support. +%% We (texjporg) started to support other engines, such as +%% pdfLaTeX, XeLaTeX and LuaLaTeX (even without LuaTeX-ja). %% +\newif\ifascmac@ptex \ascmac@ptextrue \ifx\kanjiskip\@undefined \@ifpackageloaded{luatexja}{% \PackageInfo{tascmac}{% Patch from LuaTeX-ja will be applied}% }{% - \PackageError{tascmac}{% - `ascmac' and `tascmac' can be used only in pLaTeX,\MessageBreak - upLaTeX or LuaLaTeX with LuaTeX-ja support.\MessageBreak - Consider using `bxascmac' instead.\MessageBreak - See https://github.com/zr-tex8r/BXptool for detail}{}% + \PackageInfo{tascmac}{% + Assuming pdfLaTeX, XeLaTeX or LuaLaTeX}% + \ascmac@ptexfalse }% \fi +\chardef\ascmac@q@catcode=\catcode`\Q\relax +\ifascmac@ptex + \catcode`\Q=9\relax +\else + \catcode`\Q=14\relax +\fi +%% +%% Use Type1 font for ascgrp (pdfLaTeX, LuaLaTeX) +\ifascmac@ptex\else + \ifdefined\pdfextension + % LuaTeX (>=0.85) + \pdfextension mapline{+ascgrp Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tbk10.clo} [2006/06/27 v1.6 diff --git a/Master/texmf-dist/tex/platex/base/tbk11.clo b/Master/texmf-dist/tex/platex/base/tbk11.clo index ece7ec76fc4..7ad84979e13 100644 --- a/Master/texmf-dist/tex/platex/base/tbk11.clo +++ b/Master/texmf-dist/tex/platex/base/tbk11.clo @@ -13,22 +13,6 @@ %% ------------------------------------------------------------- %% %% File: jclasses.dtx -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tbk11.clo} [2006/06/27 v1.6 diff --git a/Master/texmf-dist/tex/platex/base/tbk12.clo b/Master/texmf-dist/tex/platex/base/tbk12.clo index 79b1def1bbd..1540bfea817 100644 --- a/Master/texmf-dist/tex/platex/base/tbk12.clo +++ b/Master/texmf-dist/tex/platex/base/tbk12.clo @@ -13,22 +13,6 @@ %% ------------------------------------------------------------- %% %% File: jclasses.dtx -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tbk12.clo} [2006/06/27 v1.6 diff --git a/Master/texmf-dist/tex/platex/base/tbook.cls b/Master/texmf-dist/tex/platex/base/tbook.cls index 2b030ee5be6..6eff68c3b33 100644 --- a/Master/texmf-dist/tex/platex/base/tbook.cls +++ b/Master/texmf-dist/tex/platex/base/tbook.cls @@ -13,22 +13,6 @@ %% ------------------------------------------------------------- %% %% File: jclasses.dtx -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{tbook} [2006/06/27 v1.6 diff --git a/Master/texmf-dist/tex/platex/base/tbook.sty b/Master/texmf-dist/tex/platex/base/tbook.sty index 9c7ef48afe9..32cb5c4d80c 100644 --- a/Master/texmf-dist/tex/platex/base/tbook.sty +++ b/Master/texmf-dist/tex/platex/base/tbook.sty @@ -13,22 +13,6 @@ %% ------------------------------------------------------------- %% %% File: pl209.dtx -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% \NeedsTeXFormat{pLaTeX2e} \@obsoletefile{tbook.cls}{tbook.sty} \LoadClass{tbook} diff --git a/Master/texmf-dist/tex/platex/base/treport.cls b/Master/texmf-dist/tex/platex/base/treport.cls index 1f5a1b595cf..8165c53459e 100644 --- a/Master/texmf-dist/tex/platex/base/treport.cls +++ b/Master/texmf-dist/tex/platex/base/treport.cls @@ -13,22 +13,6 @@ %% ------------------------------------------------------------- %% %% File: jclasses.dtx -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{treport} [2006/06/27 v1.6 diff --git a/Master/texmf-dist/tex/platex/base/treport.sty b/Master/texmf-dist/tex/platex/base/treport.sty index 1e3e022e58a..0d4d2c141f8 100644 --- a/Master/texmf-dist/tex/platex/base/treport.sty +++ b/Master/texmf-dist/tex/platex/base/treport.sty @@ -13,22 +13,6 @@ %% ------------------------------------------------------------- %% %% File: pl209.dtx -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% \NeedsTeXFormat{pLaTeX2e} \@obsoletefile{treport.cls}{treport.sty} \LoadClass{treport} diff --git a/Master/texmf-dist/tex/platex/base/tsize10.clo b/Master/texmf-dist/tex/platex/base/tsize10.clo index 00f93729dfb..4fec08f1873 100644 --- a/Master/texmf-dist/tex/platex/base/tsize10.clo +++ b/Master/texmf-dist/tex/platex/base/tsize10.clo @@ -13,22 +13,6 @@ %% ------------------------------------------------------------- %% %% File: jclasses.dtx -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tsize10.clo} [2006/06/27 v1.6 diff --git a/Master/texmf-dist/tex/platex/base/tsize11.clo b/Master/texmf-dist/tex/platex/base/tsize11.clo index 66fb5c3604f..235b63cc579 100644 --- a/Master/texmf-dist/tex/platex/base/tsize11.clo +++ b/Master/texmf-dist/tex/platex/base/tsize11.clo @@ -13,22 +13,6 @@ %% ------------------------------------------------------------- %% %% File: jclasses.dtx -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tsize11.clo} [2006/06/27 v1.6 diff --git a/Master/texmf-dist/tex/platex/base/tsize12.clo b/Master/texmf-dist/tex/platex/base/tsize12.clo index b4acf2824c3..1da44debfdd 100644 --- a/Master/texmf-dist/tex/platex/base/tsize12.clo +++ b/Master/texmf-dist/tex/platex/base/tsize12.clo @@ -13,22 +13,6 @@ %% ------------------------------------------------------------- %% %% File: jclasses.dtx -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tsize12.clo} [2006/06/27 v1.6 -- cgit v1.2.3