From 8e7cee93b8e73580a81e4d353d4843345b2c2998 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 16 Apr 2017 22:05:53 +0000 Subject: platex (16apr17) git-svn-id: svn://tug.org/texlive/trunk@43852 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/platex/base/exppl2e.sty | 670 ++++++++++++++++++++- Master/texmf-dist/tex/platex/base/jarticle.cls | 44 +- Master/texmf-dist/tex/platex/base/jbk10.clo | 2 +- Master/texmf-dist/tex/platex/base/jbk11.clo | 2 +- Master/texmf-dist/tex/platex/base/jbk12.clo | 2 +- Master/texmf-dist/tex/platex/base/jbook.cls | 96 ++- Master/texmf-dist/tex/platex/base/jreport.cls | 69 ++- Master/texmf-dist/tex/platex/base/jsize10.clo | 2 +- Master/texmf-dist/tex/platex/base/jsize11.clo | 2 +- Master/texmf-dist/tex/platex/base/jsize12.clo | 2 +- Master/texmf-dist/tex/platex/base/pfltrace.sty | 4 +- .../texmf-dist/tex/platex/base/platexrelease.sty | 336 ++++++++++- Master/texmf-dist/tex/platex/base/plcore.ltx | 49 +- Master/texmf-dist/tex/platex/base/plext.sty | 32 +- Master/texmf-dist/tex/platex/base/ptrace.sty | 60 +- Master/texmf-dist/tex/platex/base/tarticle.cls | 44 +- Master/texmf-dist/tex/platex/base/tbk10.clo | 2 +- Master/texmf-dist/tex/platex/base/tbk11.clo | 2 +- Master/texmf-dist/tex/platex/base/tbk12.clo | 2 +- Master/texmf-dist/tex/platex/base/tbook.cls | 96 ++- Master/texmf-dist/tex/platex/base/treport.cls | 69 ++- Master/texmf-dist/tex/platex/base/tsize10.clo | 2 +- Master/texmf-dist/tex/platex/base/tsize11.clo | 2 +- Master/texmf-dist/tex/platex/base/tsize12.clo | 2 +- 24 files changed, 1438 insertions(+), 155 deletions(-) (limited to 'Master/texmf-dist/tex/platex') diff --git a/Master/texmf-dist/tex/platex/base/exppl2e.sty b/Master/texmf-dist/tex/platex/base/exppl2e.sty index 1521d97cddd..a0f6cb8adb3 100644 --- a/Master/texmf-dist/tex/platex/base/exppl2e.sty +++ b/Master/texmf-dist/tex/platex/base/exppl2e.sty @@ -2,7 +2,7 @@ % % This is file `exppl2e.sty', for experimental pLaTeX2e. % -% Copyright (c) 2016 Japanese TeX Development Community +% Copyright (c) 2016-2017 Japanese TeX Development Community % % This file is part of the pLaTeX2e system (community edition). % ------------------------------------------------------------- @@ -34,7 +34,7 @@ % case 1: This file must be a normal package \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{exppl2e} - [2016/11/29 v1.0h Experimental pLaTeX2e features] + [2017/04/08 v1.0k Experimental pLaTeX2e features] \PackageWarningNoLine{exppl2e}{% This is the unstable, experimental part of pLaTeX2e.\MessageBreak This package may contain:\MessageBreak @@ -237,7 +237,7 @@ % \begin{macrocode} \else \ifdim\@tempdima=\z@{\ybaselineshift\z@\tbaselineshift\z@#1}% - \else\lower\@tempdima\box\z@\fi + \else\leavevmode\lower\@tempdima\box\z@\fi \fi \endgroup}% \fi @@ -292,9 +292,9 @@ % % \begin{macro}{\ystrutbox} % |\ystrutbox|は高さと深さが7対3の横組ボックス用の支柱です。 -% \changes{v????}{????/??/??}{\cs{ystrutbox}を追加} +% \changes{v1.6f}{2017/02/20}{\cs{ystrutbox}を追加} % \begin{macrocode} -%\plIncludeInRelease{????/??/??}{\ystrutbox} +%\plIncludeInRelease{2017/04/08}{\ystrutbox} % {Add \ystrutbox}% %<*plcore|platexrelease> \newbox\ystrutbox @@ -307,6 +307,23 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}{\strutbox} +% |\strutbox|は縦横両対応です。 +% \changes{v1.6f}{2017/02/20}{\cs{strutbox}を縦横両対応に} +% \begin{macrocode} +%\plIncludeInRelease{2017/04/08}{\strutbox} +% {Add \strutbox}% +%<*plcore|platexrelease> +\def\strutbox{\iftdir\tstrutbox\else\ystrutbox\fi} +% +%\plEndIncludeInRelease +%\plIncludeInRelease{0000/00/00}{\strutbox} +% {Add \strutbox}% +%\newbox\strutbox % emulation purpose only +%\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\strut} % ディレクションに応じて|\ystrutbox|と|\tstrutbox|を使い分けます。 % ^^A |\strutbox|は|\yoko|ディレクションで組まれていますので、 @@ -317,9 +334,9 @@ % なってしまうのを修正} % \changes{v1.3h}{1999/08/09}{縦組のとき、幅のあるボックスになってしまう % のを修正} -% \changes{v????}{????/??/??}{\cs{strutbox}の代わりに\cs{ystrutbox}を使用} +% \changes{v1.6f}{2017/02/20}{\cs{strutbox}の代わりに\cs{ystrutbox}を使用} % \begin{macrocode} -%\plIncludeInRelease{????/??/??}{\strut} +%\plIncludeInRelease{2017/04/08}{\strut} % {Use \ystrutbox}% %<*plcore|platexrelease> \def\strut{\relax @@ -354,9 +371,9 @@ % \end{macro} % % \begin{macro}{\ystrut} -% \changes{v????}{????/??/??}{\cs{ystrut}を追加} +% \changes{v1.6f}{2017/02/20}{\cs{ystrut}を追加} % \begin{macrocode} -%\plIncludeInRelease{????/??/??}{\ystrut} +%\plIncludeInRelease{2017/04/08}{\ystrut} % {Add \ystrut}% %<*plcore|platexrelease> \def\ystrut{\relax\hbox{\yoko @@ -372,15 +389,14 @@ % % % -%^^A================================================================= -%^^A メモ：|\set@fontsize|のplatexreleaseガード、traceガードは未完成 -%^^A================================================================= -% % \begin{macro}{\set@fontsize} % |\fontsize|コマンドの内部形式です。 % ベースラインの設定と、支柱の設定を行ないます。 % \begin{macrocode} -\def\strutbox{\iftdir\tstrutbox\else\ystrutbox\fi} +% +%\plIncludeInRelease{2017/04/08}{\set@fontsize} +% {Construct \ystrutbox}% +%<*plcore|platexrelease|trace> \def\set@fontsize#1#2#3{% \@defaultunits\@tempdimb#2pt\relax\@nnil \edef\f@size{\strip@pt\@tempdimb}% @@ -394,8 +410,7 @@ \normalbaselineskip\baselineskip % \end{macrocode} % ここで、ベースラインシフトの調整と支柱を組み立てます。 -% \changes{v????}{????/??/??}{\cs{ystrutbox}を組み立てるように -% し、\cs{strutbox}を縦横両対応に} +% \changes{v1.6f}{2017/02/20}{\cs{ystrutbox}を組み立てるように} % \begin{macrocode} \adjustbaseline \setbox\ystrutbox\hbox{\yoko @@ -411,18 +426,58 @@ % フォントサイズとベースラインに関する診断情報を出力します。 % \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 +% \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}} +% +%\plEndIncludeInRelease +%\plIncludeInRelease{0000/00/00}{\set@fontsize} +% {Construct \ystrutbox}% +%\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 +% \adjustbaseline +% \setbox\strutbox\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}% +%<*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}} +%\plEndIncludeInRelease +%<*plcore|trace> % \end{macrocode} % \end{macro} % @@ -482,4 +537,567 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % +% \section{相互参照} +% +% \begin{macro}{\@setref} +% \changes{v1.1c}{1995/09/07}{change \cs{null} to \cs{relax} in \cs{@setref}.} +% \changes{v1.2k}{2017/02/20}{目次で\cs{ref}を使った場合に後ろの空白が消える +% 現象に対処するため、\cs{relax}のあとに\{\}を追加} +% |\ref|コマンドや|\pageref|コマンドで参照したとき、これらのコマンドに +% よって出力された番号と続く２バイト文字との間に|\xkanjiskip|が入りません。 +% これは、|\null|が|\hbox{}|と定義されているためです。 +% そこで|\null|を取り除きます。 +% このコマンドは、\file{ltxref.dtx}で定義されているものです。 +% +% しかし、単に|\null|を|\relax|に置き換えるだけでは、|\section|のような +% 「動く引数」で|\ref|などを使った場合に、目次で後ろの空白が消えてしまいます。 +% そこで、|\relax|のあとに|{}|を追加しました。従来も|\protect\ref|のように使えば +% 問題ありませんでしたが、\LaTeX{}では展開されても問題が起きないrobustな実装に +% なっていますので、これに従います。 +% \begin{macrocode} +%\plIncludeInRelease{2017/04/08}{\@setref} +% {Spacing after \ref in moving arguments}% +%<*plcore|platexrelease> +\def\@setref#1#2#3{% + \ifx#1\relax + \protect\G@refundefinedtrue + \nfss@text{\reset@font\bfseries ??}% + \@latex@warning{Reference `#3' on page \thepage \space + undefined}% + \else + \expandafter#2#1\relax{}% change \null to \relax{} + \fi} +% +%\plEndIncludeInRelease +%\plIncludeInRelease{0000/00/00}{\@setref} +% {Spacing after \ref in moving arguments}% +%\def\@setref#1#2#3{% +% \ifx#1\relax +% \protect\G@refundefinedtrue +% \nfss@text{\reset@font\bfseries ??}% +% \@latex@warning{Reference `#3' on page \thepage \space +% undefined}% +% \else +% \expandafter#2#1\relax% change \null to \relax +% \fi} +%\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% \section{脚注とボトムフロートの順序および垂直位置} +% +% \begin{macro}{\@makecol} +% このマクロが組み立てる部分の中心となります。 +% \file{ltoutput.dtx}で定義されているものです。 +% \begin{macrocode} +%\plIncludeInRelease{2017/04/08}{\@makecol}{\@makecol}% +%<*plcore|platexrelease> +\gdef\@makecol{% + \setbox\@outputbox\box\@cclv% + \let\@elt\relax % added on LaTeX (ltoutput.dtx 2003/12/16 v1.2k) + \xdef\@freelist{\@freelist\@midlist}% + \global \let \@midlist \@empty + \@combinefloats +% \end{macrocode} +% オリジナルの\LaTeX{}は、トップフロート、本文、脚注、ボトムフロートの順番で +% 出力します。一方p\LaTeX{}は、トップフロート、本文、ボトムフロート、脚注の +% 順番で出力します。ところが、アスキー版のコードは順番を入れ替えるだけでなく、 +% 版面全体の垂直位置が（特に縦組で顕著に）ずれてしまっていました。 +% これは補正量|\dp\@outputbox|の取得が早すぎたためですので、コミュニティ版 +% p\LaTeX{}ではこの問題に対処してあります。結果的に、fnposパッケージ(yafoot)の +% |\makeFNbottom|かつ|\makeFNbelow|な状態と完全に等価になりました。 +% \changes{v1.2l}{2017/02/25}{脚注とボトムフロートの順序を入れ替えたことで +% 版面全体の垂直位置がずれていたのを修正(Issue 32)} +% \begin{macrocode} + \let\pltx@textbottom\@textbottom % save (pLaTeX 2017/02/25) + \ifvoid\footins\else % changed (pLaTeX 2017/02/25) + \setbox\@outputbox \vbox {% + \boxmaxdepth \@maxdepth + \unvbox \@outputbox + \@textbottom % inserted here (pLaTeX 2017/02/25) + \vskip \skip\footins + \color@begingroup + \normalcolor + \footnoterule + \unvbox \footins + \color@endgroup + }% + \let\@textbottom\relax % disable temporarily (pLaTeX 2017/02/25) + \fi + \ifvbox\@kludgeins + \@makespecialcolbox + \else + \setbox\@outputbox \vbox to\@colht {% +% \boxmaxdepth \@maxdepth % comment out on LaTeX 1997/12/01 + \@texttop + \dimen@ \dp\@outputbox + \unvbox \@outputbox +% \end{macrocode} +% 縦組の際に|\@outputbox|の内容が空のボックスだけの場合に、|\wd\@outputbox|が +% 0ptになってしまい、結果としてフッタの位置がくるってしまっていた。 +% 0の|\hskip|を発生させると|\wd\@outputbox|の値が期待したものとなるので、 +% 縦組の場合はその方法で対処する。 +% +% ただし、0の|\hskip|を発生させるとき、水平モードに入ってしまうと、たとえば +% longtableパッケージを使用して表組途中で改ページするときに|\par -> {\vskip}|の +% 無限ループが起きてしまいます。そこで、|\vbox|の中で発生させます。 +% \changes{v1.1j}{2001/05/10}{\cs{@makecol}で組み立てられる +% \cs{@outputbox}の大きさが、縦組で中身が空のボックスだけの場合も適正になる +% ように修正} +% \changes{v1.2b}{2016/01/26}{\cs{@outputbox}の深さが他のものの位置に影響を与えない +% ようにする\texttt{\cs{vskip}~-\cs{dimen@}}が縦組モードでは無効になっていたので修正} +% \changes{v1.2h}{2016/09/01}{縦組でlongtableパッケージを使って表組の途中で改ページ +% するとき無限ループが起こる問題に対処(Issue 21)} +% \begin{macrocode} + \iftdir\vbox{\hskip\z@}\fi + \vskip -\dimen@ + \@textbottom + }% + \fi + \let\@textbottom\pltx@textbottom % restore (pLaTeX 2017/02/25) + \global \maxdepth \@maxdepth +} +% +%\plEndIncludeInRelease +%\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 {% +%% \boxmaxdepth \@maxdepth % comment out on LaTeX 1997/12/01 +% \@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% +% \xdef\@freelist{\@freelist\@midlist}% +% \global \let \@midlist \@empty +% \@combinefloats +% \ifvbox\@kludgeins +% \@makespecialcolbox +% \else +% \setbox\@outputbox \vbox to\@colht {% +%% \boxmaxdepth \@maxdepth % comment out on LaTeX 1997/12/01 +% \@texttop +% \dimen@ \dp\@outputbox +% \unvbox \@outputbox +% \iftdir\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{0000/00/00}{\@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 {% +%% \boxmaxdepth \@maxdepth % comment out on LaTeX 1997/12/01 +% \@texttop +% \dimen@ \dp\@outputbox +% \unvbox \@outputbox +% \iftdir\hskip\z@ +% \else\vskip -\dimen@\fi +% \@textbottom +% \ifvoid\footins\else % for pLaTeX +% \vskip \skip\footins +% \color@begingroup +% \normalcolor +% \footnoterule +% \unvbox \footins +% \color@endgroup +% \fi +% }% +% \fi +% \global \maxdepth \@maxdepth +%} +%\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\@makespecialcolbox} +% 本文（あるいはボトムフロート）と脚注の間に|\@textbottom|を入れたいので、 +% |\@makespecialcolbox|コマンドも修正をします。 +% やはり、\file{ltoutput.dtx}で定義されているものです。 +% +% このマクロは、|\enlargethispage|が使われたときに、 +% |\@makecol|マクロから呼び出されます。 +% +% \noindent\emph{日本語\TeX{}開発コミュニティによる補足(2017/02/25)}： +% 2016/11/29以前のp\LaTeX{}では、|\@makecol|はボトムフロートを挿入した後、 +% すぐに|\@kludgeins|が空かどうか判定し +% \begin{itemize} +% \item 空の場合は、残りすべての処理を|\@makespecialcolbox|に任せる +% \item 空でない場合は、|\@makecol|自身で残りすべての処理を行う +% \end{itemize} +% としていました。しかし2017/04/08以降のp\LaTeX{}では、|\@makecol|はボトム +% フロートと脚注を挿入してから|\@kludgeins|の判定に移るようにしています。 +% したがって、新しい|\@makecol|から以下に記す|\@makespecialcolbox|が呼び +% 出される場合は、|\ifvoid\footins|（二箇所）の判定は常に真となるはずです。 +% 要するに「つぎの部分がp\LaTeX{}用の修正です。」という二箇所のコードは +% 実質的に不要となりました。 +% +% しかし、だからといって消してしまうと、古いp\LaTeX{}の|\@makecol|を +% ベースに作られた外部パッケージから|\@makespecialcolbox|が呼び出される +% 場合に脚注が消滅するおそれがあります。このため、|\@makespecialcolbox|は +% 従来のコードのまま維持してあります（害はありません）。 +% \changes{v1.2l}{2017/02/25}{\cs{@makecol}を変更したのに +% \cs{@makespecialcolbox}を変更しない、という判断について明文化} +% （中略） +% \end{macro} +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% \section{下線マクロ} +% +% \begin{macro}{\textunderscore} +% \changes{v1.1b}{1995/04/12}{下線マクロを追加} +% このコマンドはテキストモードで指定された|\_|の内部コマンドです。 +% 縦組での位置を調整するように再定義をします。 +% もとは\file{ltoutenc.dtx}で定義されています。 +% +% なお、|\_|を数式モードで使うと|\mathunderscore|が実行されます。 +% +% コミュニティ版では縦数式ディレクションでベースライン補正量が +% 変だったのを直しました。あわせて横ディレクションでもベースライン +% 補正に追随するようにしています。 +% \changes{v1.6g}{2017/03/07}{ベースライン補正量を修正} +% \begin{macrocode} +%\plIncludeInRelease{2017/04/08}{\textunderscore} +% {Baseline shift for \textunderscore}% +%<*plcore|platexrelease> +\DeclareTextCommandDefault{\textunderscore}{% + \leavevmode\kern.06em + \raise-\iftdir\ifmdir\ybaselineshift + \else\tbaselineshift\fi + \else\ybaselineshift\fi + \vbox{\hrule\@width.3em}} +% +%\plEndIncludeInRelease +%\plIncludeInRelease{0000/00/00}{\textunderscore} +% {Baseline shift for \textunderscore}% +%\DeclareTextCommandDefault{\textunderscore}{% +% \leavevmode\kern.06em +% \iftdir\raise-\tbaselineshift\fi +% \vbox{\hrule\@width.3em}} +%\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% ^^A ===== plcore.dtx (plcore) ===== +% \section{verbatimとハイフネーション} +% +% \LaTeXe\ 2017-04-15で導入された疑似タイプ入力(verbatim)内での +% ハイフネーションに関連した修正に追随します。 +% +% \begin{macro}{\@outputpage} +% |\textwidth|と|\textheight|の交換は、|\@shipoutsetup|内では行ないません。 +% なぜなら、|\@shipoutsetup|マクロが実行されるときは、 +% |\shipout|されるvboxの中であり、このときは横組モードですので、 +% つねに|\iftdir|は偽と判断され、縦と横のサイズを交換できないからです。 +% +% なお、この変更をローカルなものにするために、 +% |\begingroup|と|\endgroup|で囲みます。 +% \changes{v1.2a}{2001/09/26}{\LaTeX\ \texttt{!<2001/06/01!>}に対応} +% \begin{macrocode} +%\plIncludeInRelease{2017/04/08}{\@outputpage} +% {Reset language for hyphenation}% +%<*plcore|platexrelease> +\def\@outputpage{% +\begingroup % the \endgroup is put in by \aftergroup + \iftdir + \dimen\z@\textwidth \textwidth\textheight \textheight\dimen\z@ + \fi + \let \protect \noexpand +% \end{macrocode} +% \LaTeXe\ 2017-04-15ではverbatim環境内でハイフネーションが起きないように +% 修正されましたが、verbatim環境の途中で改ページが起きた場合にヘッダで +% ハイフネーションが抑制されるのは正しくないので、|\language|を +% |\begin{document}|での値にリセットします（参考：latex2e svn r1407）。 +% プリアンブルで特別に設定されればその値、設定されなければ0です（万が一 +% |\document|の定義が古い場合\footnote{\LaTeXe\ 2017/01/01以前を使って +% p\LaTeXe{}のフォーマットを作成した場合や、dinbrief.clsのように独自の +% 再定義を行うクラスやパッケージを使った場合に起こるかもしれません。}は +% $-1$になりますが、これは0と同じはたらきをするので問題は起きません）。 +% \changes{v1.2m}{2017/03/19}{\cs{language}をリセット +% (sync with ltoutput.dtx 2017/03/10 v1.3c)} +% \begin{macrocode} + \language\document@default@language + \@resetactivechars + \global\let\@@if@newlist\if@newlist + \global\@newlistfalse + \@parboxrestore + \shipout\vbox{\yoko + \set@typeset@protect + \aftergroup\endgroup + \aftergroup\set@typeset@protect +% \end{macrocode} +% \changes{v1.1g}{1998/02/03}{\cs{@shipoutsetup}を\cs{@outputpage}内に入れた} +% ここから|\@shipoutsetup|の内容。 +% \begin{macrocode} + \if@specialpage + \global\@specialpagefalse\@nameuse{ps@\@specialstyle}% + \fi +% \end{macrocode} +% \changes{v1.1c}{1995/02/05}{\cs{oddsidemargin}と\cs{evensidemargin}が +% 逆だったのを修正} +% \begin{macrocode} + \if@twoside + \ifodd\count\z@ \let\@thehead\@oddhead \let\@thefoot\@oddfoot + \iftdir\let\@themargin\evensidemargin + \else\let\@themargin\oddsidemargin\fi + \else \let\@thehead\@evenhead + \let\@thefoot\@evenfoot + \iftdir\let\@themargin\oddsidemargin + \else\let\@themargin\evensidemargin\fi + \fi\fi +% \end{macrocode} +% トンボ出力オプションが指定されている場合、ここで用紙サイズを再設定します。 +% \TeX の加える左と上部の1インチは、トンボの内側に入ります。 +% \changes{v1.1a}{1995/11/10}{\cs{topmargin}が反映されないバグを修正} +% \begin{macrocode} + \@@topmargin\topmargin + \iftombow + \@@paperwidth\paperwidth \advance\@@paperwidth 6mm\relax + \@@paperheight\paperheight \advance\@@paperheight 16mm\relax + \advance\@@topmargin 1in\relax \advance\@themargin 1in\relax + \fi + \reset@font + \normalsize + \normalsfcodes + \let\label\@gobble + \let\index\@gobble + \let\glossary\@gobble + \baselineskip\z@skip \lineskip\z@skip \lineskiplimit\z@ +% \end{macrocode} +% ここまでが|\@shipoutsetup|の内容。 +% \begin{macrocode} + \@begindvi + \@outputtombow + \vskip \@@topmargin + \moveright\@themargin\vbox{% + \setbox\@tempboxa \vbox to\headheight{% + \vfil + \color@hbox + \normalcolor + \hb@xt@\textwidth{\@thehead}% + \color@endbox + }% %% 22 Feb 87 + \dp\@tempboxa \z@ + \box\@tempboxa + \vskip \headsep + \box\@outputbox + \baselineskip \footskip + \color@hbox + \normalcolor + \hb@xt@\textwidth{\@thefoot}% + \color@endbox + }% + }% +% \endgroup now inserted by \aftergroup +% \end{macrocode} +% |\if@newlist|を初期化。 +% \begin{macrocode} + \global\let\if@newlist\@@if@newlist + \global \@colht \textheight + \stepcounter{page}% + \let\firstmark\botmark +} +% +%\plEndIncludeInRelease +%\plIncludeInRelease{0000/00/00}{\@outputpage} +% {Reset language for hyphenation}% +%\def\@outputpage{% +%\begingroup % the \endgroup is put in by \aftergroup +% \iftdir +% \dimen\z@\textwidth \textwidth\textheight \textheight\dimen\z@ +% \fi +% \let \protect \noexpand +% \@resetactivechars +% \global\let\@@if@newlist\if@newlist +% \global\@newlistfalse +% \@parboxrestore +% \shipout\vbox{\yoko +% \set@typeset@protect +% \aftergroup\endgroup +% \aftergroup\set@typeset@protect +% \if@specialpage +% \global\@specialpagefalse\@nameuse{ps@\@specialstyle}% +% \fi +% \if@twoside +% \ifodd\count\z@ \let\@thehead\@oddhead \let\@thefoot\@oddfoot +% \iftdir\let\@themargin\evensidemargin +% \else\let\@themargin\oddsidemargin\fi +% \else \let\@thehead\@evenhead +% \let\@thefoot\@evenfoot +% \iftdir\let\@themargin\oddsidemargin +% \else\let\@themargin\evensidemargin\fi +% \fi\fi +% \@@topmargin\topmargin +% \iftombow +% \@@paperwidth\paperwidth \advance\@@paperwidth 6mm\relax +% \@@paperheight\paperheight \advance\@@paperheight 16mm\relax +% \advance\@@topmargin 1in\relax \advance\@themargin 1in\relax +% \fi +% \reset@font +% \normalsize +% \normalsfcodes +% \let\label\@gobble +% \let\index\@gobble +% \let\glossary\@gobble +% \baselineskip\z@skip \lineskip\z@skip \lineskiplimit\z@ +% \@begindvi +% \@outputtombow +% \vskip \@@topmargin +% \moveright\@themargin\vbox{% +% \setbox\@tempboxa \vbox to\headheight{% +% \vfil +% \color@hbox +% \normalcolor +% \hb@xt@\textwidth{\@thehead}% +% \color@endbox +% }% %% 22 Feb 87 +% \dp\@tempboxa \z@ +% \box\@tempboxa +% \vskip \headsep +% \box\@outputbox +% \baselineskip \footskip +% \color@hbox +% \normalcolor +% \hb@xt@\textwidth{\@thefoot}% +% \color@endbox +% }% +% }% +% \global\let\if@newlist\@@if@newlist +% \global \@colht \textheight +% \stepcounter{page}% +% \let\firstmark\botmark +%} +%\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% +% \subsection{疑似タイプ入力} +% +% \begin{macro}{\verb} +% \changes{v1.1b}{1995/04/05}{互換モードのときは、pl209.defの定義を使う} +% \changes{v1.1g}{1997/01/16} +% {\cs{verb}コマンドを\LaTeX\ \texttt{!<1996/06/01!>}に合わせて修正} +% \LaTeX{}の|\verb|コマンドでは、数式モードでないときは、 +% |\leavevmode|で水平モードに入ったあと、|\null|を出力しています。 +% マクロ|\null|は|\hbox{}|として定義されていますので、 +% ここには和欧文間スペース（|\xkanjiskip|）が入りません。 +% そこで、|\null|を出力しないようマクロを修正します。 +% このマクロは、\file{ltmiscen.dtx}で定義されています。 +% \begin{macrocode} +%\plIncludeInRelease{2017/04/08}{\verb} +% {Disable hyphenation in verb}% +%<*plcore|platexrelease> +\if@compatibility\else +\def\verb{\relax\ifmmode\hbox\else\leavevmode\fi + \bgroup + \verb@eol@error \let\do\@makeother \dospecials + \verbatim@font\@noligs +% \end{macrocode} +% \LaTeXe\ 2017-04-15に追随して、|\verb|の途中でハイフネーションが起きない +% ように|\language|を設定します（参考：latex2e svn r1405）。 +% \changes{v1.2m}{2017/03/19}{\cs{verb}の途中でハイフネーションが起きない +% ように\cs{language}を設定(sync with ltmiscen.dtx 2017/03/09 v1.1m)} +% \begin{macrocode} + \language\l@nohyphenation + \@ifstar\@sverb\@verb} +\fi +% +%\plEndIncludeInRelease +%\plIncludeInRelease{0000/00/00}{\verb} +% {Disable hyphenation in verb}% +%\if@compatibility\else +%\def\verb{\relax\ifmmode\hbox\else\leavevmode\fi +% \bgroup +% \verb@eol@error \let\do\@makeother \dospecials +% \verbatim@font\@noligs +% \@ifstar\@sverb\@verb} +%\fi +%\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% +% ^^A ===== plvers.dtx (plfinal) ===== +% \subsection{ハイフネーション関連} +% +% \begin{macro}{\l@nohyphenation} +% \LaTeXe\ 2017-04-15で、|\verb|の途中でハイフネーションが起きないように +% する修正が入りました。この修正には|\l@nohyphenation|が定義済みでなければ +% なりませんが、通常はBabelの定義ファイルによって提供されています。 +% \LaTeXe{}は特殊な状況も想定してltfinalで対策しているようですので、 +% p\LaTeXe{}も念のためplfinalで対策します（参考：latex2e svn r1405）。 +% \changes{v1.1b}{2017/03/19}{\cs{l@nohyphenation}の定義を保証 +% (sync with ltfinal 2017/03/09 v2.0t)} +% \begin{macrocode} +%<*plfinal> +\ifx\l@nohyphenation \@undefined + \newlanguage\l@nohyphenation +\fi +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\document@default@language} +% \LaTeXe\ 2017-04-15で導入されたパラメータです。更新タイミングのずれの +% 可能性を考慮し、p\LaTeXe{}でも準備しておきます。verbatim環境の途中で +% 改ページが起きた場合にヘッダでハイフネーションが抑制されないように、 +% |\@outputpage|で|\language|をリセットするときに使われます +% （参考：latex2e svn r1407）。 +% \changes{v1.1b}{2017/03/19}{\cs{document@default@language}の定義を保証 +% (sync with ltfinal 2017/03/09 v2.0t)} +% \begin{macrocode} +\ifx\document@default@language \@undefined + \let\document@default@language\m@ne +\fi +% +% \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 3b38283f963..ffa0d7747f6 100644 --- a/Master/texmf-dist/tex/platex/base/jarticle.cls +++ b/Master/texmf-dist/tex/platex/base/jarticle.cls @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jarticle} - [2016/11/22 v1.7b + [2017/03/05 v1.7e Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -80,8 +80,8 @@ \tombowtrue \tombowdatetrue \setlength{\@tombowwidth}{.1\p@}% \@bannertoken{% - \jobname\space:\space\number\year/\number\month/\number\day - (\number\hour:\number\minute)} + \jobname\space(\number\year-\two@digits\month-\two@digits\day + \space\two@digits\hour:\two@digits\minute)}% \maketombowbox} \DeclareOption{tombo}{% \tombowtrue \tombowdatefalse @@ -147,6 +147,40 @@ \renewcommand{\floatpagefraction}{.5} \renewcommand{\dbltopfraction}{.7} \renewcommand{\dblfloatpagefraction}{.5} +\def\pltx@cleartorightpage{\clearpage\if@twoside + \ifodd\c@page + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartoleftpage{\clearpage\if@twoside + \ifodd\c@page + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartooddpage{\clearpage\if@twoside + \ifodd\c@page\else + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\def\pltx@cleartoevenpage{\clearpage\if@twoside + \ifodd\c@page + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} \def\ps@plain{\let\@mkboth\@gobbletwo \let\ps@jpl@in\ps@plain \let\@oddhead\@empty @@ -238,7 +272,7 @@ \@restonecolfalse\newpage \fi \thispagestyle{empty}% - \setcounter{page}\@ne + \ifodd\c@page\setcounter{page}\@ne\else\setcounter{page}\z@\fi %% 2017/02/15 }% {\if@restonecol\twocolumn \else \newpage \fi \if@twoside\else @@ -248,7 +282,7 @@ \fi \def\p@thanks#1{\footnotemark \protected@xdef\@thanks{\@thanks - \protect{\noindent$\m@th^\thefootnote$~#1\protect\par}}} + \protect{\noindent\hbox{\yoko$\m@th^\thefootnote$}#1\protect\par}}} \if@titlepage \newcommand{\maketitle}{\begin{titlepage}% \let\footnotesize\small diff --git a/Master/texmf-dist/tex/platex/base/jbk10.clo b/Master/texmf-dist/tex/platex/base/jbk10.clo index 85ae77ffae0..c4236176f89 100644 --- a/Master/texmf-dist/tex/platex/base/jbk10.clo +++ b/Master/texmf-dist/tex/platex/base/jbk10.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jbk10.clo} - [2016/11/22 v1.7b + [2017/03/05 v1.7e Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% diff --git a/Master/texmf-dist/tex/platex/base/jbk11.clo b/Master/texmf-dist/tex/platex/base/jbk11.clo index ca260663a31..6491c404096 100644 --- a/Master/texmf-dist/tex/platex/base/jbk11.clo +++ b/Master/texmf-dist/tex/platex/base/jbk11.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jbk11.clo} - [2016/11/22 v1.7b + [2017/03/05 v1.7e Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% diff --git a/Master/texmf-dist/tex/platex/base/jbk12.clo b/Master/texmf-dist/tex/platex/base/jbk12.clo index 1b029ac5ac8..e3f3ceaeffb 100644 --- a/Master/texmf-dist/tex/platex/base/jbk12.clo +++ b/Master/texmf-dist/tex/platex/base/jbk12.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jbk12.clo} - [2016/11/22 v1.7b + [2017/03/05 v1.7e Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% diff --git a/Master/texmf-dist/tex/platex/base/jbook.cls b/Master/texmf-dist/tex/platex/base/jbook.cls index 79a8b9085fe..dafb5748633 100644 --- a/Master/texmf-dist/tex/platex/base/jbook.cls +++ b/Master/texmf-dist/tex/platex/base/jbook.cls @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jbook} - [2016/11/22 v1.7b + [2017/03/05 v1.7e Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -24,6 +24,7 @@ \newif\if@titlepage \@titlepagetrue \newif\if@openright +\newif\if@openleft \newif\if@mainmatter \@mainmattertrue \hour\time \divide\hour by 60\relax \@tempcnta\hour \multiply\@tempcnta 60\relax @@ -82,8 +83,8 @@ \tombowtrue \tombowdatetrue \setlength{\@tombowwidth}{.1\p@}% \@bannertoken{% - \jobname\space:\space\number\year/\number\month/\number\day - (\number\hour:\number\minute)} + \jobname\space(\number\year-\two@digits\month-\two@digits\day + \space\two@digits\hour:\two@digits\minute)}% \maketombowbox} \DeclareOption{tombo}{% \tombowtrue \tombowdatefalse @@ -106,8 +107,9 @@ \if@compatibility \@openrighttrue \else -\DeclareOption{openright}{\@openrighttrue} -\DeclareOption{openany}{\@openrightfalse} +\DeclareOption{openright}{\@openrighttrue\@openleftfalse} +\DeclareOption{openleft}{\@openlefttrue\@openrightfalse} +\DeclareOption{openany}{\@openrightfalse\@openleftfalse} \fi \DeclareOption{leqno}{\input{leqno.clo}} \DeclareOption{fleqn}{\input{fleqn.clo}} @@ -155,6 +157,45 @@ \renewcommand{\floatpagefraction}{.5} \renewcommand{\dbltopfraction}{.7} \renewcommand{\dblfloatpagefraction}{.5} +\def\pltx@cleartorightpage{\clearpage\if@twoside + \ifodd\c@page + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartoleftpage{\clearpage\if@twoside + \ifodd\c@page + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartooddpage{\clearpage\if@twoside + \ifodd\c@page\else + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\def\pltx@cleartoevenpage{\clearpage\if@twoside + \ifodd\c@page + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\if@openleft + \let\cleardoublepage\pltx@cleartoleftpage +\else\if@openright + \let\cleardoublepage\pltx@cleartorightpage +\fi\fi \def\ps@plain{\let\@mkboth\@gobbletwo \let\ps@jpl@in\ps@plain \let\@oddhead\@empty @@ -180,9 +221,9 @@ \let\@mkboth\markboth \def\chaptermark##1{\markboth{% \ifnum \c@secnumdepth >\m@ne - \if@mainmatter + \if@mainmatter \@chapapp\thechapter\@chappos\hskip1zw - \fi + \fi \fi ##1}{}}% \def\sectionmark##1{\markright{% @@ -196,9 +237,9 @@ \let\@mkboth\markboth \def\chaptermark##1{\markright{% \ifnum \c@secnumdepth >\m@ne - \if@mainmatter + \if@mainmatter \@chapapp\thechapter\@chappos\hskip1zw - \fi + \fi \fi ##1}}% } @@ -212,9 +253,9 @@ \let\@mkboth\markboth \def\chaptermark##1{\markboth{% \ifnum \c@secnumdepth >\m@ne - \if@mainmatter + \if@mainmatter \@chapapp\thechapter\@chappos\hskip1zw - \fi + \fi \fi ##1}{}}% \def\sectionmark##1{\markright{% @@ -228,9 +269,9 @@ \let\@mkboth\markboth \def\chaptermark##1{\markright{% \ifnum \c@secnumdepth >\m@ne - \if@mainmatter + \if@mainmatter \@chapapp\thechapter\@chappos\hskip1zw - \fi + \fi \fi ##1}}% } @@ -246,7 +287,7 @@ \if@compatibility \newenvironment{titlepage} {% - \cleardoublepage + \cleardoublepage \if@twocolumn\@restonecoltrue\onecolumn \else\@restonecolfalse\newpage\fi \thispagestyle{empty}% @@ -257,14 +298,14 @@ \else \newenvironment{titlepage} {% - \cleardoublepage + \pltx@cleartooddpage %% 2017/02/15 \if@twocolumn \@restonecoltrue\onecolumn \else \@restonecolfalse\newpage \fi \thispagestyle{empty}% - \setcounter{page}\@ne + \ifodd\c@page\setcounter{page}\@ne\else\setcounter{page}\z@\fi %% 2017/02/15 }% {\if@restonecol\twocolumn \else \newpage \fi \if@twoside\else @@ -274,7 +315,7 @@ \fi \def\p@thanks#1{\footnotemark \protected@xdef\@thanks{\@thanks - \protect{\noindent$\m@th^\thefootnote$~#1\protect\par}}} + \protect{\noindent\hbox{\yoko$\m@th^\thefootnote$}#1\protect\par}}} \if@titlepage \newcommand{\maketitle}{\begin{titlepage}% \let\footnotesize\small @@ -380,16 +421,18 @@ \newcommand{\@chapapp}{\prechaptername} \newcommand{\@chappos}{\postchaptername} \newcommand{\frontmatter}{% - \if@openright \cleardoublepage \else \clearpage \fi + \pltx@cleartooddpage \@mainmatterfalse\pagenumbering{roman}} \newcommand{\mainmatter}{% - \if@openright \cleardoublepage \else \clearpage \fi + \pltx@cleartooddpage \@mainmattertrue\pagenumbering{arabic}} \newcommand{\backmatter}{% - \if@openright \cleardoublepage \else \clearpage \fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \@mainmatterfalse} \newcommand{\part}{% - \if@openright \cleardoublepage \else \clearpage \fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \thispagestyle{empty}% \if@twocolumn\onecolumn\@tempswatrue\else\@tempswafalse\fi \null\vfil @@ -417,10 +460,17 @@ \Huge\bfseries#1\par}% \@endpart} \def\@endpart{\vfil\newpage - \if@twoside\null\thispagestyle{empty}\newpage\fi + \if@twoside + \if@openleft %% \if@openleft added (2017/02/15) + \null\thispagestyle{empty}\newpage + \else\if@openright %% \if@openright added (2016/12/18) + \null\thispagestyle{empty}\newpage + \fi\fi %% added (2016/12/18, 2017/02/15) + \fi \if@tempswa\twocolumn\fi} \newcommand{\chapter}{% - \if@openright\cleardoublepage\else\clearpage\fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \thispagestyle{jpl@in}% \global\@topnum\z@ \@afterindenttrue diff --git a/Master/texmf-dist/tex/platex/base/jreport.cls b/Master/texmf-dist/tex/platex/base/jreport.cls index 673d69658c3..7859e891e24 100644 --- a/Master/texmf-dist/tex/platex/base/jreport.cls +++ b/Master/texmf-dist/tex/platex/base/jreport.cls @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jreport} - [2016/11/22 v1.7b + [2017/03/05 v1.7e Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -24,6 +24,7 @@ \newif\if@titlepage \@titlepagetrue \newif\if@openright +\newif\if@openleft \hour\time \divide\hour by 60\relax \@tempcnta\hour \multiply\@tempcnta 60\relax \minute\time \advance\minute-\@tempcnta @@ -81,8 +82,8 @@ \tombowtrue \tombowdatetrue \setlength{\@tombowwidth}{.1\p@}% \@bannertoken{% - \jobname\space:\space\number\year/\number\month/\number\day - (\number\hour:\number\minute)} + \jobname\space(\number\year-\two@digits\month-\two@digits\day + \space\two@digits\hour:\two@digits\minute)}% \maketombowbox} \DeclareOption{tombo}{% \tombowtrue \tombowdatefalse @@ -104,8 +105,9 @@ \DeclareOption{notitlepage}{\@titlepagefalse} \if@compatibility \else -\DeclareOption{openright}{\@openrighttrue} -\DeclareOption{openany}{\@openrightfalse} +\DeclareOption{openright}{\@openrighttrue\@openleftfalse} +\DeclareOption{openleft}{\@openlefttrue\@openrightfalse} +\DeclareOption{openany}{\@openrightfalse\@openleftfalse} \fi \DeclareOption{leqno}{\input{leqno.clo}} \DeclareOption{fleqn}{\input{fleqn.clo}} @@ -153,6 +155,45 @@ \renewcommand{\floatpagefraction}{.5} \renewcommand{\dbltopfraction}{.7} \renewcommand{\dblfloatpagefraction}{.5} +\def\pltx@cleartorightpage{\clearpage\if@twoside + \ifodd\c@page + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartoleftpage{\clearpage\if@twoside + \ifodd\c@page + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartooddpage{\clearpage\if@twoside + \ifodd\c@page\else + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\def\pltx@cleartoevenpage{\clearpage\if@twoside + \ifodd\c@page + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\if@openleft + \let\cleardoublepage\pltx@cleartoleftpage +\else\if@openright + \let\cleardoublepage\pltx@cleartorightpage +\fi\fi \def\ps@plain{\let\@mkboth\@gobbletwo \let\ps@jpl@in\ps@plain \let\@oddhead\@empty @@ -252,7 +293,7 @@ \@restonecolfalse\newpage \fi \thispagestyle{empty}% - \setcounter{page}\@ne + \ifodd\c@page\setcounter{page}\@ne\else\setcounter{page}\z@\fi %% 2017/02/15 }% {\if@restonecol\twocolumn \else \newpage \fi \if@twoside\else @@ -262,7 +303,7 @@ \fi \def\p@thanks#1{\footnotemark \protected@xdef\@thanks{\@thanks - \protect{\noindent$\m@th^\thefootnote$~#1\protect\par}}} + \protect{\noindent\hbox{\yoko$\m@th^\thefootnote$}#1\protect\par}}} \if@titlepage \newcommand{\maketitle}{\begin{titlepage}% \let\footnotesize\small @@ -390,7 +431,8 @@ \newcommand{\@chapapp}{\prechaptername} \newcommand{\@chappos}{\postchaptername} \newcommand{\part}{% - \if@openright \cleardoublepage \else \clearpage \fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \thispagestyle{empty}% \if@twocolumn\onecolumn\@tempswatrue\else\@tempswafalse\fi \null\vfil @@ -418,10 +460,17 @@ \Huge\bfseries#1\par}% \@endpart} \def\@endpart{\vfil\newpage - \if@twoside\null\thispagestyle{empty}\newpage\fi + \if@twoside + \if@openleft %% \if@openleft added (2017/02/15) + \null\thispagestyle{empty}\newpage + \else\if@openright %% \if@openright added (2016/12/18) + \null\thispagestyle{empty}\newpage + \fi\fi %% added (2016/12/18, 2017/02/15) + \fi \if@tempswa\twocolumn\fi} \newcommand{\chapter}{% - \if@openright\cleardoublepage\else\clearpage\fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \thispagestyle{jpl@in}% \global\@topnum\z@ \@afterindenttrue diff --git a/Master/texmf-dist/tex/platex/base/jsize10.clo b/Master/texmf-dist/tex/platex/base/jsize10.clo index 78980e3fc9b..0de1a880c64 100644 --- a/Master/texmf-dist/tex/platex/base/jsize10.clo +++ b/Master/texmf-dist/tex/platex/base/jsize10.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jsize10.clo} - [2016/11/22 v1.7b + [2017/03/05 v1.7e Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% diff --git a/Master/texmf-dist/tex/platex/base/jsize11.clo b/Master/texmf-dist/tex/platex/base/jsize11.clo index b1d9ec0b007..0c9010443e0 100644 --- a/Master/texmf-dist/tex/platex/base/jsize11.clo +++ b/Master/texmf-dist/tex/platex/base/jsize11.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jsize11.clo} - [2016/11/22 v1.7b + [2017/03/05 v1.7e Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% diff --git a/Master/texmf-dist/tex/platex/base/jsize12.clo b/Master/texmf-dist/tex/platex/base/jsize12.clo index e045bc7a65a..a7388304d86 100644 --- a/Master/texmf-dist/tex/platex/base/jsize12.clo +++ b/Master/texmf-dist/tex/platex/base/jsize12.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jsize12.clo} - [2016/11/22 v1.7b + [2017/03/05 v1.7e Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% diff --git a/Master/texmf-dist/tex/platex/base/pfltrace.sty b/Master/texmf-dist/tex/platex/base/pfltrace.sty index 8375b45e319..06459d11a23 100644 --- a/Master/texmf-dist/tex/platex/base/pfltrace.sty +++ b/Master/texmf-dist/tex/platex/base/pfltrace.sty @@ -19,8 +19,8 @@ \RequirePackageWithOptions{fltrace} \gdef\@makespecialcolbox{% \fl@trace{Krudgeins ht \the\ht\@kludgeins\space - dp \the\dp\@kludgeins\space - wd \the\wd\@kludgeins}% + dp \the\dp\@kludgeins\space + wd \the\wd\@kludgeins}% \setbox\@outputbox \vbox {% \@texttop \dimen@ \dp\@outputbox diff --git a/Master/texmf-dist/tex/platex/base/platexrelease.sty b/Master/texmf-dist/tex/platex/base/platexrelease.sty index 659d26153aa..6efb18a30aa 100644 --- a/Master/texmf-dist/tex/platex/base/platexrelease.sty +++ b/Master/texmf-dist/tex/platex/base/platexrelease.sty @@ -16,9 +16,9 @@ %% %% File: plvers.dtx \edef\p@known@latexreleaseversion - {2016/03/31} + {2017/01/01} \edef\platexreleaseversion - {2016/11/29} + {2017/04/08} \def\plIncludeInRelease#1{\kernel@ifnextchar[% {\@plIncludeInRelease{#1}} {\@plIncludeInRelease{#1}[#1]}} @@ -121,6 +121,115 @@ of this package available from CTAN} \plIncludeInRelease{0000/00/00}{\PackageWarning}{pLaTeX Info}% \plEndIncludeInRelease %% File: plfonts.dtx +\plIncludeInRelease{2017/04/08}{\ystrutbox} + {Add \ystrutbox}% +\newbox\ystrutbox +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\ystrutbox} + {Add \ystrutbox}% +\let\ystrutbox\@undefined +\plEndIncludeInRelease +\plIncludeInRelease{2017/04/08}{\strutbox} + {Add \strutbox}% +\def\strutbox{\iftdir\tstrutbox\else\ystrutbox\fi} +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\strutbox} + {Add \strutbox}% +\newbox\strutbox % emulation purpose only +\plEndIncludeInRelease +\plIncludeInRelease{2017/04/08}{\strut} + {Use \ystrutbox}% +\def\strut{\relax + \ifydir + \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi + \else + \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi + \fi} +\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 +\plIncludeInRelease{2017/04/08}{\ystrut} + {Add \ystrut}% +\def\ystrut{\relax\hbox{\yoko + \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi}} +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\ystrut} + {Add \ystrut}% +\let\ystrut\@undefined +\plEndIncludeInRelease +\plIncludeInRelease{2017/04/08}{\set@fontsize} + {Construct \ystrutbox}% +\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 + \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}% + \let\size@update\relax}} +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\set@fontsize} + {Construct \ystrutbox}% +\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 + \adjustbaseline + \setbox\strutbox\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}% + \let\size@update\relax}} +\plEndIncludeInRelease +\plIncludeInRelease{2017/04/08}{\textunderscore} + {Baseline shift for \textunderscore}% +\DeclareTextCommandDefault{\textunderscore}{% + \leavevmode\kern.06em + \raise-\iftdir\ifmdir\ybaselineshift + \else\tbaselineshift\fi + \else\ybaselineshift\fi + \vbox{\hrule\@width.3em}} +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\textunderscore} + {Baseline shift for \textunderscore}% +\DeclareTextCommandDefault{\textunderscore}{% + \leavevmode\kern.06em + \iftdir\raise-\tbaselineshift\fi + \vbox{\hrule\@width.3em}} +\plEndIncludeInRelease \plIncludeInRelease{2016/06/10}{\g@tlastchart@} {Added \g@tlastchart@}% \def\g@tlastchart@#1{#1\ifx\lastnodechar\@undefined\m@ne\else\lastnodechar\fi} @@ -284,6 +393,44 @@ of this package available from CTAN} \let\eminnershape\@undefined \plEndIncludeInRelease %% File: plcore.dtx +\plIncludeInRelease{2017/04/08}{\@makecol}{\@makecol}% +\gdef\@makecol{% + \setbox\@outputbox\box\@cclv% + \let\@elt\relax % added on LaTeX (ltoutput.dtx 2003/12/16 v1.2k) + \xdef\@freelist{\@freelist\@midlist}% + \global \let \@midlist \@empty + \@combinefloats + \let\pltx@textbottom\@textbottom % save (pLaTeX 2017/02/25) + \ifvoid\footins\else % changed (pLaTeX 2017/02/25) + \setbox\@outputbox \vbox {% + \boxmaxdepth \@maxdepth + \unvbox \@outputbox + \@textbottom % inserted here (pLaTeX 2017/02/25) + \vskip \skip\footins + \color@begingroup + \normalcolor + \footnoterule + \unvbox \footins + \color@endgroup + }% + \let\@textbottom\relax % disable temporarily (pLaTeX 2017/02/25) + \fi + \ifvbox\@kludgeins + \@makespecialcolbox + \else + \setbox\@outputbox \vbox to\@colht {% + \@texttop + \dimen@ \dp\@outputbox + \unvbox \@outputbox + \iftdir\vbox{\hskip\z@}\fi + \vskip -\dimen@ + \@textbottom + }% + \fi + \let\@textbottom\pltx@textbottom % restore (pLaTeX 2017/02/25) + \global \maxdepth \@maxdepth +} +\plEndIncludeInRelease \plIncludeInRelease{2016/09/03}{\@makecol}{\@makecol}% \gdef\@makecol{% \setbox\@outputbox\box\@cclv% @@ -294,6 +441,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 @@ -416,6 +564,145 @@ of this package available from CTAN} \fi } \plEndIncludeInRelease +\plIncludeInRelease{2017/04/08}{\@outputpage} + {Reset language for hyphenation}% +\def\@outputpage{% +\begingroup % the \endgroup is put in by \aftergroup + \iftdir + \dimen\z@\textwidth \textwidth\textheight \textheight\dimen\z@ + \fi + \let \protect \noexpand + \language\document@default@language + \@resetactivechars + \global\let\@@if@newlist\if@newlist + \global\@newlistfalse + \@parboxrestore + \shipout\vbox{\yoko + \set@typeset@protect + \aftergroup\endgroup + \aftergroup\set@typeset@protect + \if@specialpage + \global\@specialpagefalse\@nameuse{ps@\@specialstyle}% + \fi + \if@twoside + \ifodd\count\z@ \let\@thehead\@oddhead \let\@thefoot\@oddfoot + \iftdir\let\@themargin\evensidemargin + \else\let\@themargin\oddsidemargin\fi + \else \let\@thehead\@evenhead + \let\@thefoot\@evenfoot + \iftdir\let\@themargin\oddsidemargin + \else\let\@themargin\evensidemargin\fi + \fi\fi + \@@topmargin\topmargin + \iftombow + \@@paperwidth\paperwidth \advance\@@paperwidth 6mm\relax + \@@paperheight\paperheight \advance\@@paperheight 16mm\relax + \advance\@@topmargin 1in\relax \advance\@themargin 1in\relax + \fi + \reset@font + \normalsize + \normalsfcodes + \let\label\@gobble + \let\index\@gobble + \let\glossary\@gobble + \baselineskip\z@skip \lineskip\z@skip \lineskiplimit\z@ + \@begindvi + \@outputtombow + \vskip \@@topmargin + \moveright\@themargin\vbox{% + \setbox\@tempboxa \vbox to\headheight{% + \vfil + \color@hbox + \normalcolor + \hb@xt@\textwidth{\@thehead}% + \color@endbox + }% %% 22 Feb 87 + \dp\@tempboxa \z@ + \box\@tempboxa + \vskip \headsep + \box\@outputbox + \baselineskip \footskip + \color@hbox + \normalcolor + \hb@xt@\textwidth{\@thefoot}% + \color@endbox + }% + }% + \global\let\if@newlist\@@if@newlist + \global \@colht \textheight + \stepcounter{page}% + \let\firstmark\botmark +} +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\@outputpage} + {Reset language for hyphenation}% +\def\@outputpage{% +\begingroup % the \endgroup is put in by \aftergroup + \iftdir + \dimen\z@\textwidth \textwidth\textheight \textheight\dimen\z@ + \fi + \let \protect \noexpand + \@resetactivechars + \global\let\@@if@newlist\if@newlist + \global\@newlistfalse + \@parboxrestore + \shipout\vbox{\yoko + \set@typeset@protect + \aftergroup\endgroup + \aftergroup\set@typeset@protect + \if@specialpage + \global\@specialpagefalse\@nameuse{ps@\@specialstyle}% + \fi + \if@twoside + \ifodd\count\z@ \let\@thehead\@oddhead \let\@thefoot\@oddfoot + \iftdir\let\@themargin\evensidemargin + \else\let\@themargin\oddsidemargin\fi + \else \let\@thehead\@evenhead + \let\@thefoot\@evenfoot + \iftdir\let\@themargin\oddsidemargin + \else\let\@themargin\evensidemargin\fi + \fi\fi + \@@topmargin\topmargin + \iftombow + \@@paperwidth\paperwidth \advance\@@paperwidth 6mm\relax + \@@paperheight\paperheight \advance\@@paperheight 16mm\relax + \advance\@@topmargin 1in\relax \advance\@themargin 1in\relax + \fi + \reset@font + \normalsize + \normalsfcodes + \let\label\@gobble + \let\index\@gobble + \let\glossary\@gobble + \baselineskip\z@skip \lineskip\z@skip \lineskiplimit\z@ + \@begindvi + \@outputtombow + \vskip \@@topmargin + \moveright\@themargin\vbox{% + \setbox\@tempboxa \vbox to\headheight{% + \vfil + \color@hbox + \normalcolor + \hb@xt@\textwidth{\@thehead}% + \color@endbox + }% %% 22 Feb 87 + \dp\@tempboxa \z@ + \box\@tempboxa + \vskip \headsep + \box\@outputbox + \baselineskip \footskip + \color@hbox + \normalcolor + \hb@xt@\textwidth{\@thefoot}% + \color@endbox + }% + }% + \global\let\if@newlist\@@if@newlist + \global \@colht \textheight + \stepcounter{page}% + \let\firstmark\botmark +} +\plEndIncludeInRelease \plIncludeInRelease{2016/07/01}{\AtBeginDvi} {Fix for incompatible direction}% \def \AtBeginDvi #1{% @@ -551,6 +838,51 @@ of this package available from CTAN} \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}% \color@endgroup}} \plEndIncludeInRelease +\plIncludeInRelease{2017/04/08}{\@setref} + {Spacing after \ref in moving arguments}% +\def\@setref#1#2#3{% + \ifx#1\relax + \protect\G@refundefinedtrue + \nfss@text{\reset@font\bfseries ??}% + \@latex@warning{Reference `#3' on page \thepage \space + undefined}% + \else + \expandafter#2#1\relax{}% change \null to \relax{} + \fi} +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\@setref} + {Spacing after \ref in moving arguments}% +\def\@setref#1#2#3{% + \ifx#1\relax + \protect\G@refundefinedtrue + \nfss@text{\reset@font\bfseries ??}% + \@latex@warning{Reference `#3' on page \thepage \space + undefined}% + \else + \expandafter#2#1\relax% change \null to \relax + \fi} +\plEndIncludeInRelease +\plIncludeInRelease{2017/04/08}{\verb} + {Disable hyphenation in verb}% +\if@compatibility\else +\def\verb{\relax\ifmmode\hbox\else\leavevmode\fi + \bgroup + \verb@eol@error \let\do\@makeother \dospecials + \verbatim@font\@noligs + \language\l@nohyphenation + \@ifstar\@sverb\@verb} +\fi +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\verb} + {Disable hyphenation in verb}% +\if@compatibility\else +\def\verb{\relax\ifmmode\hbox\else\leavevmode\fi + \bgroup + \verb@eol@error \let\do\@makeother \dospecials + \verbatim@font\@noligs + \@ifstar\@sverb\@verb} +\fi +\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 57453dce9d3..775b33fd921 100644 --- a/Master/texmf-dist/tex/platex/base/plcore.ltx +++ b/Master/texmf-dist/tex/platex/base/plcore.ltx @@ -18,7 +18,7 @@ %% File: plvers.dtx \def\pfmtname{pLaTeX2e} \def\pfmtversion - {2016/11/29} + {2017/04/08} \def\ppatch@level{0} \def\plIncludeInRelease#1{\kernel@ifnextchar[% {\@plIncludeInRelease{#1}} @@ -82,9 +82,11 @@ \let\notffam@list\kfam@list \newbox\tstrutbox \newbox\zstrutbox +\newbox\ystrutbox +\def\strutbox{\iftdir\tstrutbox\else\ystrutbox\fi} \def\strut{\relax \ifydir - \ifmmode\copy\strutbox\else\unhcopy\strutbox\fi + \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi \else \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi \fi} @@ -92,6 +94,8 @@ \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi}} \def\zstrut{\relax\hbox{\tate \ifmmode\copy\zstrutbox\else\unhcopy\zstrutbox\fi}} +\def\ystrut{\relax\hbox{\yoko + \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi}} \def\DeclareFontEncoding{% \begingroup \nfss@catcodes @@ -427,7 +431,7 @@ \baselineskip\f@linespread\baselineskip \normalbaselineskip\baselineskip \adjustbaseline - \setbox\strutbox\hbox{\yoko + \setbox\ystrutbox\hbox{\yoko \vrule\@width\z@ \@height.7\baselineskip \@depth.3\baselineskip}% \setbox\tstrutbox\hbox{\tate @@ -632,7 +636,9 @@ \@onlypreamble\kanjiprocess@table \DeclareTextCommandDefault{\textunderscore}{% \leavevmode\kern.06em - \iftdir\raise-\tbaselineshift\fi + \raise-\iftdir\ifmdir\ybaselineshift + \else\tbaselineshift\fi + \else\ybaselineshift\fi \vbox{\hrule\@width.3em}} \InputIfFileExists{pldefs.cfg} {\typeout{*************************************^^J% @@ -689,9 +695,25 @@ \fi} \gdef\@makecol{% \setbox\@outputbox\box\@cclv% + \let\@elt\relax % added on LaTeX (ltoutput.dtx 2003/12/16 v1.2k) \xdef\@freelist{\@freelist\@midlist}% \global \let \@midlist \@empty \@combinefloats + \let\pltx@textbottom\@textbottom % save (pLaTeX 2017/02/25) + \ifvoid\footins\else % changed (pLaTeX 2017/02/25) + \setbox\@outputbox \vbox {% + \boxmaxdepth \@maxdepth + \unvbox \@outputbox + \@textbottom % inserted here (pLaTeX 2017/02/25) + \vskip \skip\footins + \color@begingroup + \normalcolor + \footnoterule + \unvbox \footins + \color@endgroup + }% + \let\@textbottom\relax % disable temporarily (pLaTeX 2017/02/25) + \fi \ifvbox\@kludgeins \@makespecialcolbox \else @@ -702,16 +724,9 @@ \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 + \let\@textbottom\pltx@textbottom % restore (pLaTeX 2017/02/25) \global \maxdepth \@maxdepth } \gdef\@makespecialcolbox{% @@ -849,6 +864,7 @@ \dimen\z@\textwidth \textwidth\textheight \textheight\dimen\z@ \fi \let \protect \noexpand + \language\document@default@language \@resetactivechars \global\let\@@if@newlist\if@newlist \global\@newlistfalse @@ -963,13 +979,14 @@ \@latex@warning{Reference `#3' on page \thepage \space undefined}% \else - \expandafter#2#1\relax% change \null to \relax + \expandafter#2#1\relax{}% change \null to \relax{} \fi} \if@compatibility\else \def\verb{\relax\ifmmode\hbox\else\leavevmode\fi \bgroup \verb@eol@error \let\do\@makeother \dospecials \verbatim@font\@noligs + \language\l@nohyphenation \@ifstar\@sverb\@verb} \fi \gdef\@stopfield{\null\color@endgroup\egroup} @@ -1058,6 +1075,12 @@ } \expandafter \endgroup \platexTMP +\ifx\l@nohyphenation \@undefined + \newlanguage\l@nohyphenation +\fi +\ifx\document@default@language \@undefined + \let\document@default@language\m@ne +\fi \AtBeginDocument{% \@ifpackageloaded{latexrelease}{% \@ifpackageloaded{platexrelease}{}{% diff --git a/Master/texmf-dist/tex/platex/base/plext.sty b/Master/texmf-dist/tex/platex/base/plext.sty index dd503892abc..3d6e4be9ec3 100644 --- a/Master/texmf-dist/tex/platex/base/plext.sty +++ b/Master/texmf-dist/tex/platex/base/plext.sty @@ -15,7 +15,7 @@ %% File: plext.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{plext} - [2016/11/19 v1.2c pLaTeX package file (community edition)] + [2017/03/28 v1.2f pLaTeX package file (community edition)] \newif\if@rotsw \def\array{\let\@acol\@arrayacol \let\@classz\@arrayclassz \let\@classiv\@arrayclassiv @@ -73,10 +73,16 @@ \iftdir \if #1y\relax\let\box@dir\yoko \if #2t\relax - \def\@begin@alignbox{\raise\cdp\vtop\bgroup\kern\z@\vbox}% + \def\@begin@alignbox{% + \@tempdima=\tbaselineshift + \advance\@tempdima-\ybaselineshift + \raise\@tempdima\vtop\bgroup\kern\z@\vtop}% \let\@end@alignbox\egroup \else\if #2b\relax - \def\@begin@alignbox{\lower\cdp\vbox\bgroup\vbox}% + \def\@begin@alignbox{% + \@tempdima=\tbaselineshift + \advance\@tempdima-\ybaselineshift + \raise\@tempdima\vbox\bgroup\vbox}% \def\@end@alignbox{\kern\z@\egroup}% \else \let\@begin@alignbox\vcenter @@ -95,7 +101,7 @@ \fi\fi \else\let\box@dir\tate \if #2t\relax - \def\@begin@alignbox{\raise\cdp\vtop}% + \let\@begin@alignbox\vtop \let\@end@alignbox\relax \else\if #2b\relax \let\@begin@alignbox\vbox @@ -119,7 +125,7 @@ \fi\fi \else\let\box@dir\yoko \if #2t\relax - \def\@begin@alignbox{\raise\cdp\vtop}% + \let\@begin@alignbox\vtop \let\@end@alignbox\relax \else\if #2b\relax \let\@begin@alignbox\vbox @@ -301,7 +307,7 @@ \if@rotsw \egroup\m@th$\egroup\fi \egroup \expandafter\@iiiparbox\@mpargs{\unvbox\@tempboxa}\egroup} -\def\parbox{\@ifnextchar<%> +\DeclareRobustCommand\parbox{\@ifnextchar<%> {\X@parbox}{\X@parbox}} \def\X@parbox<#1>{\@ifnextchar[%] {\@iparbox<#1>}{\@iiiparbox<#1>{c}\relax[s]}} @@ -333,7 +339,7 @@ \iftdir \if #1y\relax\let\box@dir\yoko \if #2t\relax - \def\@begin@parbox{\raise\cdp\vtop\bgroup\kern\z@\vtop}% + \def\@begin@parbox{\raise\cht\vtop\bgroup\kern\z@\vtop}% \let\@end@parbox\egroup \else\if #2b\relax \def\@begin@parbox{\lower\cdp\vbox\bgroup\vbox}% @@ -342,7 +348,7 @@ \let\@begin@parbox\vcenter \let\@end@parbox\relax \else - \def\@begin@parbox{\hskip\tbaselineshift$\vcenter}% + \def\@begin@parbox{$\vcenter}% \def\@end@parbox{\m@th$}% \fi\fi\fi \else\if #1z\relax\@rotswtrue \let\box@dir\relax @@ -356,7 +362,7 @@ \let\@begin@parbox\vcenter \let\@end@parbox\relax \else - \def\@begin@parbox{\hskip\tbaselineshift$\vcenter}% + \def\@begin@parbox{$\vcenter}% \def\@end@parbox{\m@th$}% \fi\fi\fi \else\let\box@dir\tate @@ -364,7 +370,7 @@ \let\@begin@parbox\vtop \let\@end@parbox\relax \else\if #2b\relax - \def\@begin@parbox{\lower\cdp\vbox}% + \let\@begin@parbox\vbox \let\@end@parbox\relax \else\ifmmode \let\@begin@parbox\vcenter @@ -377,10 +383,10 @@ \else \if #1t\relax\let\box@dir\tate \if #2t\relax - \def\@begin@parbox{\vtop\bgroup\kern\z@\vbox}% + \def\@begin@parbox{\raise\cht\vtop\bgroup\kern\z@\vtop}% \let\@end@parbox\egroup \else\if #2b\relax - \def\@begin@parbox{\vbox\bgroup\vbox}% + \def\@begin@parbox{\lower\cdp\vbox\bgroup\vbox}% \def\@end@parbox{\kern\z@\egroup}% \else\ifmmode \let\@begin@parbox\vcenter @@ -504,7 +510,7 @@ \let\Rensuji\rensuji \let\prensuji\rensuji \def\Kanji#1{\expandafter\@Kanji\csname c@#1\endcsname} -\def\@Kanji#1{\expandafter\kansuji\number #1} +\def\@Kanji#1{\kansuji #1} \def\kanji{\iftdir\expandafter\kansuji\fi} \def\boutenchar{\char\euc"A1A2} \def\bou#1{\ifvmode\leavevmode\fi\@bou#1\end} diff --git a/Master/texmf-dist/tex/platex/base/ptrace.sty b/Master/texmf-dist/tex/platex/base/ptrace.sty index 58ef9e145f6..18fca273f86 100644 --- a/Master/texmf-dist/tex/platex/base/ptrace.sty +++ b/Master/texmf-dist/tex/platex/base/ptrace.sty @@ -15,7 +15,7 @@ %% File: plfonts.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{ptrace} - [2016/04/30 v1.6b Standard pLaTeX package (font tracing)] + [2017/02/20 v1.6f Standard pLaTeX package (font tracing)] \RequirePackageWithOptions{tracefnt} \DeclareRobustCommand\selectfont{% \let\tmp@error@fontshape\error@fontshape @@ -74,6 +74,43 @@ \size@update} \def\KanjiEncodingPair#1#2{\@namedef{t@enc@#1}{#2}\@namedef{y@enc@#2}{#1}} \KanjiEncodingPair{JY1}{JT1} +\plIncludeInRelease{2017/04/08}{\set@fontsize} + {Construct \ystrutbox}% +\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 + \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}% + \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}} +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\set@fontsize} + {Construct \ystrutbox}% \def\set@fontsize#1#2#3{% \@defaultunits\@tempdimb#2pt\relax\@nnil \edef\f@size{\strip@pt\@tempdimb}% @@ -95,17 +132,18 @@ \setbox\zstrutbox\hbox{\tate \vrule\@width\z@ \@height.7\baselineskip \@depth.3\baselineskip}% - \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 + \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}} +\plEndIncludeInRelease \newbox\adjust@box \newdimen\adjust@dimen \def\adjustbaseline{% diff --git a/Master/texmf-dist/tex/platex/base/tarticle.cls b/Master/texmf-dist/tex/platex/base/tarticle.cls index 258f8d010da..a4041b53cbc 100644 --- a/Master/texmf-dist/tex/platex/base/tarticle.cls +++ b/Master/texmf-dist/tex/platex/base/tarticle.cls @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{tarticle} - [2016/11/22 v1.7b + [2017/03/05 v1.7e Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -80,8 +80,8 @@ \tombowtrue \tombowdatetrue \setlength{\@tombowwidth}{.1\p@}% \@bannertoken{% - \jobname\space:\space\number\year/\number\month/\number\day - (\number\hour:\number\minute)} + \jobname\space(\number\year-\two@digits\month-\two@digits\day + \space\two@digits\hour:\two@digits\minute)}% \maketombowbox} \DeclareOption{tombo}{% \tombowtrue \tombowdatefalse @@ -148,6 +148,40 @@ \renewcommand{\floatpagefraction}{.5} \renewcommand{\dbltopfraction}{.7} \renewcommand{\dblfloatpagefraction}{.5} +\def\pltx@cleartorightpage{\clearpage\if@twoside + \ifodd\c@page + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartoleftpage{\clearpage\if@twoside + \ifodd\c@page + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartooddpage{\clearpage\if@twoside + \ifodd\c@page\else + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\def\pltx@cleartoevenpage{\clearpage\if@twoside + \ifodd\c@page + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} \def\ps@plain{\let\@mkboth\@gobbletwo \let\ps@jpl@in\ps@plain \let\@oddhead\@empty @@ -239,7 +273,7 @@ \@restonecolfalse\newpage \fi \thispagestyle{empty}% - \setcounter{page}\@ne + \ifodd\c@page\setcounter{page}\@ne\else\setcounter{page}\z@\fi %% 2017/02/15 }% {\if@restonecol\twocolumn \else \newpage \fi \if@twoside\else @@ -249,7 +283,7 @@ \fi \def\p@thanks#1{\footnotemark \protected@xdef\@thanks{\@thanks - \protect{\noindent$\m@th^\thefootnote$~#1\protect\par}}} + \protect{\noindent\hbox{\yoko$\m@th^\thefootnote$}#1\protect\par}}} \if@titlepage \newcommand{\maketitle}{\begin{titlepage}% \let\footnotesize\small diff --git a/Master/texmf-dist/tex/platex/base/tbk10.clo b/Master/texmf-dist/tex/platex/base/tbk10.clo index ac9037fc6e6..9d3f59afedd 100644 --- a/Master/texmf-dist/tex/platex/base/tbk10.clo +++ b/Master/texmf-dist/tex/platex/base/tbk10.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tbk10.clo} - [2016/11/22 v1.7b + [2017/03/05 v1.7e Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{17}% diff --git a/Master/texmf-dist/tex/platex/base/tbk11.clo b/Master/texmf-dist/tex/platex/base/tbk11.clo index 90fd84a193b..c049ce48905 100644 --- a/Master/texmf-dist/tex/platex/base/tbk11.clo +++ b/Master/texmf-dist/tex/platex/base/tbk11.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tbk11.clo} - [2016/11/22 v1.7b + [2017/03/05 v1.7e Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{17}% diff --git a/Master/texmf-dist/tex/platex/base/tbk12.clo b/Master/texmf-dist/tex/platex/base/tbk12.clo index fba4457a085..5467b0cce56 100644 --- a/Master/texmf-dist/tex/platex/base/tbk12.clo +++ b/Master/texmf-dist/tex/platex/base/tbk12.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tbk12.clo} - [2016/11/22 v1.7b + [2017/03/05 v1.7e Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% diff --git a/Master/texmf-dist/tex/platex/base/tbook.cls b/Master/texmf-dist/tex/platex/base/tbook.cls index 446af36373e..a80402bd3e0 100644 --- a/Master/texmf-dist/tex/platex/base/tbook.cls +++ b/Master/texmf-dist/tex/platex/base/tbook.cls @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{tbook} - [2016/11/22 v1.7b + [2017/03/05 v1.7e Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -24,6 +24,7 @@ \newif\if@titlepage \@titlepagetrue \newif\if@openright +\newif\if@openleft \newif\if@mainmatter \@mainmattertrue \hour\time \divide\hour by 60\relax \@tempcnta\hour \multiply\@tempcnta 60\relax @@ -82,8 +83,8 @@ \tombowtrue \tombowdatetrue \setlength{\@tombowwidth}{.1\p@}% \@bannertoken{% - \jobname\space:\space\number\year/\number\month/\number\day - (\number\hour:\number\minute)} + \jobname\space(\number\year-\two@digits\month-\two@digits\day + \space\two@digits\hour:\two@digits\minute)}% \maketombowbox} \DeclareOption{tombo}{% \tombowtrue \tombowdatefalse @@ -106,8 +107,9 @@ \if@compatibility \@openrighttrue \else -\DeclareOption{openright}{\@openrighttrue} -\DeclareOption{openany}{\@openrightfalse} +\DeclareOption{openright}{\@openrighttrue\@openleftfalse} +\DeclareOption{openleft}{\@openlefttrue\@openrightfalse} +\DeclareOption{openany}{\@openrightfalse\@openleftfalse} \fi \DeclareOption{leqno}{\input{leqno.clo}} \DeclareOption{fleqn}{\input{fleqn.clo}} @@ -156,6 +158,45 @@ \renewcommand{\floatpagefraction}{.5} \renewcommand{\dbltopfraction}{.7} \renewcommand{\dblfloatpagefraction}{.5} +\def\pltx@cleartorightpage{\clearpage\if@twoside + \ifodd\c@page + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartoleftpage{\clearpage\if@twoside + \ifodd\c@page + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartooddpage{\clearpage\if@twoside + \ifodd\c@page\else + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\def\pltx@cleartoevenpage{\clearpage\if@twoside + \ifodd\c@page + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\if@openleft + \let\cleardoublepage\pltx@cleartoleftpage +\else\if@openright + \let\cleardoublepage\pltx@cleartorightpage +\fi\fi \def\ps@plain{\let\@mkboth\@gobbletwo \let\ps@jpl@in\ps@plain \let\@oddhead\@empty @@ -181,9 +222,9 @@ \let\@mkboth\markboth \def\chaptermark##1{\markboth{% \ifnum \c@secnumdepth >\m@ne - \if@mainmatter + \if@mainmatter \@chapapp\thechapter\@chappos\hskip1zw - \fi + \fi \fi ##1}{}}% \def\sectionmark##1{\markright{% @@ -197,9 +238,9 @@ \let\@mkboth\markboth \def\chaptermark##1{\markright{% \ifnum \c@secnumdepth >\m@ne - \if@mainmatter + \if@mainmatter \@chapapp\thechapter\@chappos\hskip1zw - \fi + \fi \fi ##1}}% } @@ -213,9 +254,9 @@ \let\@mkboth\markboth \def\chaptermark##1{\markboth{% \ifnum \c@secnumdepth >\m@ne - \if@mainmatter + \if@mainmatter \@chapapp\thechapter\@chappos\hskip1zw - \fi + \fi \fi ##1}{}}% \def\sectionmark##1{\markright{% @@ -229,9 +270,9 @@ \let\@mkboth\markboth \def\chaptermark##1{\markright{% \ifnum \c@secnumdepth >\m@ne - \if@mainmatter + \if@mainmatter \@chapapp\thechapter\@chappos\hskip1zw - \fi + \fi \fi ##1}}% } @@ -247,7 +288,7 @@ \if@compatibility \newenvironment{titlepage} {% - \cleardoublepage + \cleardoublepage \if@twocolumn\@restonecoltrue\onecolumn \else\@restonecolfalse\newpage\fi \thispagestyle{empty}% @@ -258,14 +299,14 @@ \else \newenvironment{titlepage} {% - \cleardoublepage + \pltx@cleartooddpage %% 2017/02/15 \if@twocolumn \@restonecoltrue\onecolumn \else \@restonecolfalse\newpage \fi \thispagestyle{empty}% - \setcounter{page}\@ne + \ifodd\c@page\setcounter{page}\@ne\else\setcounter{page}\z@\fi %% 2017/02/15 }% {\if@restonecol\twocolumn \else \newpage \fi \if@twoside\else @@ -275,7 +316,7 @@ \fi \def\p@thanks#1{\footnotemark \protected@xdef\@thanks{\@thanks - \protect{\noindent$\m@th^\thefootnote$~#1\protect\par}}} + \protect{\noindent\hbox{\yoko$\m@th^\thefootnote$}#1\protect\par}}} \if@titlepage \newcommand{\maketitle}{\begin{titlepage}% \let\footnotesize\small @@ -384,16 +425,18 @@ \newcommand{\@chapapp}{\prechaptername} \newcommand{\@chappos}{\postchaptername} \newcommand{\frontmatter}{% - \if@openright \cleardoublepage \else \clearpage \fi + \pltx@cleartooddpage \@mainmatterfalse\pagenumbering{roman}} \newcommand{\mainmatter}{% - \if@openright \cleardoublepage \else \clearpage \fi + \pltx@cleartooddpage \@mainmattertrue\pagenumbering{arabic}} \newcommand{\backmatter}{% - \if@openright \cleardoublepage \else \clearpage \fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \@mainmatterfalse} \newcommand{\part}{% - \if@openright \cleardoublepage \else \clearpage \fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \thispagestyle{empty}% \if@twocolumn\onecolumn\@tempswatrue\else\@tempswafalse\fi \null\vfil @@ -421,10 +464,17 @@ \Huge\bfseries#1\par}% \@endpart} \def\@endpart{\vfil\newpage - \if@twoside\null\thispagestyle{empty}\newpage\fi + \if@twoside + \if@openleft %% \if@openleft added (2017/02/15) + \null\thispagestyle{empty}\newpage + \else\if@openright %% \if@openright added (2016/12/18) + \null\thispagestyle{empty}\newpage + \fi\fi %% added (2016/12/18, 2017/02/15) + \fi \if@tempswa\twocolumn\fi} \newcommand{\chapter}{% - \if@openright\cleardoublepage\else\clearpage\fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \thispagestyle{jpl@in}% \global\@topnum\z@ \@afterindenttrue diff --git a/Master/texmf-dist/tex/platex/base/treport.cls b/Master/texmf-dist/tex/platex/base/treport.cls index f5b0da97350..287e9ce3322 100644 --- a/Master/texmf-dist/tex/platex/base/treport.cls +++ b/Master/texmf-dist/tex/platex/base/treport.cls @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{treport} - [2016/11/22 v1.7b + [2017/03/05 v1.7e Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -24,6 +24,7 @@ \newif\if@titlepage \@titlepagetrue \newif\if@openright +\newif\if@openleft \hour\time \divide\hour by 60\relax \@tempcnta\hour \multiply\@tempcnta 60\relax \minute\time \advance\minute-\@tempcnta @@ -81,8 +82,8 @@ \tombowtrue \tombowdatetrue \setlength{\@tombowwidth}{.1\p@}% \@bannertoken{% - \jobname\space:\space\number\year/\number\month/\number\day - (\number\hour:\number\minute)} + \jobname\space(\number\year-\two@digits\month-\two@digits\day + \space\two@digits\hour:\two@digits\minute)}% \maketombowbox} \DeclareOption{tombo}{% \tombowtrue \tombowdatefalse @@ -104,8 +105,9 @@ \DeclareOption{notitlepage}{\@titlepagefalse} \if@compatibility \else -\DeclareOption{openright}{\@openrighttrue} -\DeclareOption{openany}{\@openrightfalse} +\DeclareOption{openright}{\@openrighttrue\@openleftfalse} +\DeclareOption{openleft}{\@openlefttrue\@openrightfalse} +\DeclareOption{openany}{\@openrightfalse\@openleftfalse} \fi \DeclareOption{leqno}{\input{leqno.clo}} \DeclareOption{fleqn}{\input{fleqn.clo}} @@ -154,6 +156,45 @@ \renewcommand{\floatpagefraction}{.5} \renewcommand{\dbltopfraction}{.7} \renewcommand{\dblfloatpagefraction}{.5} +\def\pltx@cleartorightpage{\clearpage\if@twoside + \ifodd\c@page + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartoleftpage{\clearpage\if@twoside + \ifodd\c@page + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartooddpage{\clearpage\if@twoside + \ifodd\c@page\else + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\def\pltx@cleartoevenpage{\clearpage\if@twoside + \ifodd\c@page + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\if@openleft + \let\cleardoublepage\pltx@cleartoleftpage +\else\if@openright + \let\cleardoublepage\pltx@cleartorightpage +\fi\fi \def\ps@plain{\let\@mkboth\@gobbletwo \let\ps@jpl@in\ps@plain \let\@oddhead\@empty @@ -253,7 +294,7 @@ \@restonecolfalse\newpage \fi \thispagestyle{empty}% - \setcounter{page}\@ne + \ifodd\c@page\setcounter{page}\@ne\else\setcounter{page}\z@\fi %% 2017/02/15 }% {\if@restonecol\twocolumn \else \newpage \fi \if@twoside\else @@ -263,7 +304,7 @@ \fi \def\p@thanks#1{\footnotemark \protected@xdef\@thanks{\@thanks - \protect{\noindent$\m@th^\thefootnote$~#1\protect\par}}} + \protect{\noindent\hbox{\yoko$\m@th^\thefootnote$}#1\protect\par}}} \if@titlepage \newcommand{\maketitle}{\begin{titlepage}% \let\footnotesize\small @@ -394,7 +435,8 @@ \newcommand{\@chapapp}{\prechaptername} \newcommand{\@chappos}{\postchaptername} \newcommand{\part}{% - \if@openright \cleardoublepage \else \clearpage \fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \thispagestyle{empty}% \if@twocolumn\onecolumn\@tempswatrue\else\@tempswafalse\fi \null\vfil @@ -422,10 +464,17 @@ \Huge\bfseries#1\par}% \@endpart} \def\@endpart{\vfil\newpage - \if@twoside\null\thispagestyle{empty}\newpage\fi + \if@twoside + \if@openleft %% \if@openleft added (2017/02/15) + \null\thispagestyle{empty}\newpage + \else\if@openright %% \if@openright added (2016/12/18) + \null\thispagestyle{empty}\newpage + \fi\fi %% added (2016/12/18, 2017/02/15) + \fi \if@tempswa\twocolumn\fi} \newcommand{\chapter}{% - \if@openright\cleardoublepage\else\clearpage\fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \thispagestyle{jpl@in}% \global\@topnum\z@ \@afterindenttrue diff --git a/Master/texmf-dist/tex/platex/base/tsize10.clo b/Master/texmf-dist/tex/platex/base/tsize10.clo index 91da6e42af9..bbef5376c8d 100644 --- a/Master/texmf-dist/tex/platex/base/tsize10.clo +++ b/Master/texmf-dist/tex/platex/base/tsize10.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tsize10.clo} - [2016/11/22 v1.7b + [2017/03/05 v1.7e Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{17}% diff --git a/Master/texmf-dist/tex/platex/base/tsize11.clo b/Master/texmf-dist/tex/platex/base/tsize11.clo index 08c9a18bde3..0095b29980d 100644 --- a/Master/texmf-dist/tex/platex/base/tsize11.clo +++ b/Master/texmf-dist/tex/platex/base/tsize11.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tsize11.clo} - [2016/11/22 v1.7b + [2017/03/05 v1.7e Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{17}% diff --git a/Master/texmf-dist/tex/platex/base/tsize12.clo b/Master/texmf-dist/tex/platex/base/tsize12.clo index c7b6b638fac..4fa8f37fce9 100644 --- a/Master/texmf-dist/tex/platex/base/tsize12.clo +++ b/Master/texmf-dist/tex/platex/base/tsize12.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tsize12.clo} - [2016/11/22 v1.7b + [2017/03/05 v1.7e Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% -- cgit v1.2.3