From 4762127ac5ea21c9c8c4e3fc85f1c635aaca89a7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 6 Apr 2019 23:20:14 +0000 Subject: platex (6apr19) git-svn-id: svn://tug.org/texlive/trunk@50831 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/platex/base/exppl2e.sty | 22 +++++++++- Master/texmf-dist/tex/platex/base/jarticle.cls | 49 +++++++++++++--------- Master/texmf-dist/tex/platex/base/jbk10.clo | 4 +- Master/texmf-dist/tex/platex/base/jbk11.clo | 4 +- Master/texmf-dist/tex/platex/base/jbk12.clo | 4 +- Master/texmf-dist/tex/platex/base/jbook.cls | 49 +++++++++++++--------- Master/texmf-dist/tex/platex/base/jreport.cls | 49 +++++++++++++--------- Master/texmf-dist/tex/platex/base/jsize10.clo | 4 +- Master/texmf-dist/tex/platex/base/jsize11.clo | 4 +- Master/texmf-dist/tex/platex/base/jsize12.clo | 4 +- .../texmf-dist/tex/platex/base/platexrelease.sty | 30 ++++++++----- Master/texmf-dist/tex/platex/base/plcore.ltx | 11 +++-- Master/texmf-dist/tex/platex/base/tarticle.cls | 49 +++++++++++++--------- Master/texmf-dist/tex/platex/base/tbk10.clo | 4 +- Master/texmf-dist/tex/platex/base/tbk11.clo | 4 +- Master/texmf-dist/tex/platex/base/tbk12.clo | 4 +- Master/texmf-dist/tex/platex/base/tbook.cls | 49 +++++++++++++--------- Master/texmf-dist/tex/platex/base/treport.cls | 49 +++++++++++++--------- Master/texmf-dist/tex/platex/base/tsize10.clo | 4 +- Master/texmf-dist/tex/platex/base/tsize11.clo | 4 +- Master/texmf-dist/tex/platex/base/tsize12.clo | 4 +- 21 files changed, 246 insertions(+), 159 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/platex/base/exppl2e.sty b/Master/texmf-dist/tex/platex/base/exppl2e.sty index 9d40c233fcc..b4eadb72265 100644 --- a/Master/texmf-dist/tex/platex/base/exppl2e.sty +++ b/Master/texmf-dist/tex/platex/base/exppl2e.sty @@ -34,7 +34,7 @@ % case 1: This file must be a normal package \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{exppl2e} - [2018/11/25 v1.1b Experimental pLaTeX2e features] + [2018/12/02 v1.1c Experimental pLaTeX2e features] \PackageWarningNoLine{exppl2e}{% This is the unstable, experimental part of pLaTeX2e.\MessageBreak This package may contain:\MessageBreak @@ -268,6 +268,26 @@ % 対策が効いていません。ただ、フロートが空である状況は % 元々不自然なので、現在はサポートしていません。 % +% もし対策することになれば、下記のコードを使用します。 +% \begin{macro}{\@vtryfc} +% \file{ltoutput.dtx}で定義されている|\@vtryfc|に +% |\iftdir\hskip\z@\fi|を追加してあります。 +% \begin{macrocode} +\def\@vtryfc #1{% + \global\setbox\@outputbox\vbox{\iftdir\hskip\z@\fi}% + \let\@elt\@wtryfc + \@flsucceed + \global\setbox\@outputbox \vbox to\@colht{% + \vskip \@fptop + \vskip -\@fpsep + \unvbox \@outputbox + \vskip \@fpbot}% + \let\@elt\relax + \xdef #1{\@failedlist\@flfail}% + \xdef\@freelist{\@freelist\@flsucceed}} +% \end{macrocode} +% \end{macro} +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % \section{支柱} diff --git a/Master/texmf-dist/tex/platex/base/jarticle.cls b/Master/texmf-dist/tex/platex/base/jarticle.cls index a4d2d987b65..b9f6f1d593a 100644 --- a/Master/texmf-dist/tex/platex/base/jarticle.cls +++ b/Master/texmf-dist/tex/platex/base/jarticle.cls @@ -7,7 +7,7 @@ %% jclasses.dtx (with options: `article,yoko') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016-2018 Japanese TeX Development Community +%% Copyright (c) 2016-2019 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jarticle} - [2018/10/25 v1.8a + [2019/04/02 v1.8b Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -770,27 +770,36 @@ \def\西暦{\西暦true} \def\和暦{\西暦false} \newcount\heisei \heisei\year \advance\heisei-1988\relax -\def\today{{% - \iftdir - \if西暦 - \kansuji\number\year 年 - \kansuji\number\month 月 - \kansuji\number\day 日 +\def\pltx@today@year@#1{% + \ifnum\numexpr\year-#1=1 元\else + \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi + \kansuji\number\numexpr\year-#1\relax \else - 平成\ifnum\heisei=1 元年\else\kansuji\number\heisei 年\fi - \kansuji\number\month 月 - \kansuji\number\day 日 + \number\numexpr\year-#1\relax\nobreak \fi + \fi 年 +} +\def\pltx@today@year{% + \ifnum\numexpr\year*10000+\month*100+\day<19890108 + 昭和\pltx@today@year@{1925}% + \else\ifnum\numexpr\year*10000+\month*100+\day<20190501 + 平成\pltx@today@year@{1988}% \else - \if西暦 - \number\year~年 - \number\month~月 - \number\day~日 - \else - 平成\ifnum\heisei=1 元年\else\number\heisei~年\fi - \number\month~月 - \number\day~日 - \fi + 令和\pltx@today@year@{2018}% + \fi\fi} +\def\today{{% + \if西暦 + \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi\kansuji\number\year + \else\number\year\nobreak\fi 年 + \else + \pltx@today@year + \fi + \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi + \kansuji\number\month 月 + \kansuji\number\day 日 + \else + \number\month\nobreak 月 + \number\day\nobreak 日 \fi}} \newcommand{\prepartname}{第} \newcommand{\postpartname}{部} diff --git a/Master/texmf-dist/tex/platex/base/jbk10.clo b/Master/texmf-dist/tex/platex/base/jbk10.clo index aa8ae22b828..2a7dcba02be 100644 --- a/Master/texmf-dist/tex/platex/base/jbk10.clo +++ b/Master/texmf-dist/tex/platex/base/jbk10.clo @@ -7,7 +7,7 @@ %% jclasses.dtx (with options: `10pt,bk,yoko') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016-2018 Japanese TeX Development Community +%% Copyright (c) 2016-2019 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jbk10.clo} - [2018/10/25 v1.8a + [2019/04/02 v1.8b 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 0e905125d47..ac2c9a0d088 100644 --- a/Master/texmf-dist/tex/platex/base/jbk11.clo +++ b/Master/texmf-dist/tex/platex/base/jbk11.clo @@ -7,7 +7,7 @@ %% jclasses.dtx (with options: `11pt,bk,yoko') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016-2018 Japanese TeX Development Community +%% Copyright (c) 2016-2019 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jbk11.clo} - [2018/10/25 v1.8a + [2019/04/02 v1.8b 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 c006099157f..961af2eb555 100644 --- a/Master/texmf-dist/tex/platex/base/jbk12.clo +++ b/Master/texmf-dist/tex/platex/base/jbk12.clo @@ -7,7 +7,7 @@ %% jclasses.dtx (with options: `12pt,bk,yoko') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016-2018 Japanese TeX Development Community +%% Copyright (c) 2016-2019 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jbk12.clo} - [2018/10/25 v1.8a + [2019/04/02 v1.8b 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 d60128610d2..c4ff6626636 100644 --- a/Master/texmf-dist/tex/platex/base/jbook.cls +++ b/Master/texmf-dist/tex/platex/base/jbook.cls @@ -7,7 +7,7 @@ %% jclasses.dtx (with options: `book,yoko') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016-2018 Japanese TeX Development Community +%% Copyright (c) 2016-2019 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jbook} - [2018/10/25 v1.8a + [2019/04/02 v1.8b Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -873,27 +873,36 @@ \def\西暦{\西暦true} \def\和暦{\西暦false} \newcount\heisei \heisei\year \advance\heisei-1988\relax -\def\today{{% - \iftdir - \if西暦 - \kansuji\number\year 年 - \kansuji\number\month 月 - \kansuji\number\day 日 +\def\pltx@today@year@#1{% + \ifnum\numexpr\year-#1=1 元\else + \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi + \kansuji\number\numexpr\year-#1\relax \else - 平成\ifnum\heisei=1 元年\else\kansuji\number\heisei 年\fi - \kansuji\number\month 月 - \kansuji\number\day 日 + \number\numexpr\year-#1\relax\nobreak \fi + \fi 年 +} +\def\pltx@today@year{% + \ifnum\numexpr\year*10000+\month*100+\day<19890108 + 昭和\pltx@today@year@{1925}% + \else\ifnum\numexpr\year*10000+\month*100+\day<20190501 + 平成\pltx@today@year@{1988}% \else - \if西暦 - \number\year~年 - \number\month~月 - \number\day~日 - \else - 平成\ifnum\heisei=1 元年\else\number\heisei~年\fi - \number\month~月 - \number\day~日 - \fi + 令和\pltx@today@year@{2018}% + \fi\fi} +\def\today{{% + \if西暦 + \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi\kansuji\number\year + \else\number\year\nobreak\fi 年 + \else + \pltx@today@year + \fi + \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi + \kansuji\number\month 月 + \kansuji\number\day 日 + \else + \number\month\nobreak 月 + \number\day\nobreak 日 \fi}} \newcommand{\prepartname}{第} \newcommand{\postpartname}{部} diff --git a/Master/texmf-dist/tex/platex/base/jreport.cls b/Master/texmf-dist/tex/platex/base/jreport.cls index a9b4a02e2cf..70776897aa7 100644 --- a/Master/texmf-dist/tex/platex/base/jreport.cls +++ b/Master/texmf-dist/tex/platex/base/jreport.cls @@ -7,7 +7,7 @@ %% jclasses.dtx (with options: `report,yoko') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016-2018 Japanese TeX Development Community +%% Copyright (c) 2016-2019 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jreport} - [2018/10/25 v1.8a + [2019/04/02 v1.8b Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -869,27 +869,36 @@ \def\西暦{\西暦true} \def\和暦{\西暦false} \newcount\heisei \heisei\year \advance\heisei-1988\relax -\def\today{{% - \iftdir - \if西暦 - \kansuji\number\year 年 - \kansuji\number\month 月 - \kansuji\number\day 日 +\def\pltx@today@year@#1{% + \ifnum\numexpr\year-#1=1 元\else + \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi + \kansuji\number\numexpr\year-#1\relax \else - 平成\ifnum\heisei=1 元年\else\kansuji\number\heisei 年\fi - \kansuji\number\month 月 - \kansuji\number\day 日 + \number\numexpr\year-#1\relax\nobreak \fi + \fi 年 +} +\def\pltx@today@year{% + \ifnum\numexpr\year*10000+\month*100+\day<19890108 + 昭和\pltx@today@year@{1925}% + \else\ifnum\numexpr\year*10000+\month*100+\day<20190501 + 平成\pltx@today@year@{1988}% \else - \if西暦 - \number\year~年 - \number\month~月 - \number\day~日 - \else - 平成\ifnum\heisei=1 元年\else\number\heisei~年\fi - \number\month~月 - \number\day~日 - \fi + 令和\pltx@today@year@{2018}% + \fi\fi} +\def\today{{% + \if西暦 + \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi\kansuji\number\year + \else\number\year\nobreak\fi 年 + \else + \pltx@today@year + \fi + \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi + \kansuji\number\month 月 + \kansuji\number\day 日 + \else + \number\month\nobreak 月 + \number\day\nobreak 日 \fi}} \newcommand{\prepartname}{第} \newcommand{\postpartname}{部} diff --git a/Master/texmf-dist/tex/platex/base/jsize10.clo b/Master/texmf-dist/tex/platex/base/jsize10.clo index b53d51cc733..15820d96b24 100644 --- a/Master/texmf-dist/tex/platex/base/jsize10.clo +++ b/Master/texmf-dist/tex/platex/base/jsize10.clo @@ -7,7 +7,7 @@ %% jclasses.dtx (with options: `10pt,yoko') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016-2018 Japanese TeX Development Community +%% Copyright (c) 2016-2019 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jsize10.clo} - [2018/10/25 v1.8a + [2019/04/02 v1.8b 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 3d6b44e506d..f520993cb2f 100644 --- a/Master/texmf-dist/tex/platex/base/jsize11.clo +++ b/Master/texmf-dist/tex/platex/base/jsize11.clo @@ -7,7 +7,7 @@ %% jclasses.dtx (with options: `11pt,yoko') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016-2018 Japanese TeX Development Community +%% Copyright (c) 2016-2019 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jsize11.clo} - [2018/10/25 v1.8a + [2019/04/02 v1.8b 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 672a9ea523b..ffea382165e 100644 --- a/Master/texmf-dist/tex/platex/base/jsize12.clo +++ b/Master/texmf-dist/tex/platex/base/jsize12.clo @@ -7,7 +7,7 @@ %% jclasses.dtx (with options: `12pt,yoko') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016-2018 Japanese TeX Development Community +%% Copyright (c) 2016-2019 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jsize12.clo} - [2018/10/25 v1.8a + [2019/04/02 v1.8b Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% diff --git a/Master/texmf-dist/tex/platex/base/platexrelease.sty b/Master/texmf-dist/tex/platex/base/platexrelease.sty index a2712102ca5..d522fa1ee87 100644 --- a/Master/texmf-dist/tex/platex/base/platexrelease.sty +++ b/Master/texmf-dist/tex/platex/base/platexrelease.sty @@ -18,7 +18,7 @@ \edef\p@known@latexreleaseversion {2018-12-01} \edef\platexreleaseversion - {2018-12-01} + {2019-04-06} \newif\if@plincludeinrelease \@plincludeinreleasefalse \def\plIncludeInRelease#1{% @@ -133,6 +133,7 @@ of this package available from CTAN} some critical bugs. We advise you to\MessageBreak select another format date} \plIncludeInRelease{2017/10/28}{\PackageWarning}{pLaTeX Info}% + % * <2019-04-06> % * <2018-12-01> % * <2018-07-28>+1 % * <2018-07-28> @@ -1675,11 +1676,14 @@ of this package available from CTAN} \edef\@preamble{% \@preamble{% \ifcase\@chnum - \hfil\inhibitglue\ignorespaces\@sharp\unskip\removejfmglue\hfil % c + \hfil\hskip1sp\inhibitglue + \ignorespaces\@sharp\unskip\removejfmglue\hfil % c \or - \hskip1sp\inhibitglue\ignorespaces\@sharp\unskip\removejfmglue\hfil % l + \hskip1sp\inhibitglue + \ignorespaces\@sharp\unskip\removejfmglue\hfil % l \or - \hfil\hskip1sp\inhibitglue\ignorespaces\@sharp\unskip\removejfmglue % r + \hfil\hskip1sp\inhibitglue + \ignorespaces\@sharp\unskip\removejfmglue % r \fi}}} \fi \plEndIncludeInRelease @@ -1702,11 +1706,14 @@ of this package available from CTAN} \edef\@preamble{% \@preamble{% \ifcase\@chnum - \hfil\mbox{\inhibitglue\ignorespaces\@sharp\unskip}\hfil % c + \hfil\mbox{\inhibitglue + \ignorespaces\@sharp\unskip}\hfil % c \or - \hskip1sp\mbox{\inhibitglue\ignorespaces\@sharp\unskip}\hfil % l + \hskip1sp\mbox{\inhibitglue + \ignorespaces\@sharp\unskip}\hfil % l \or - \hfil\hskip1sp\mbox{\inhibitglue\ignorespaces\@sharp\unskip}% % r + \hfil\hskip1sp\mbox{\inhibitglue + \ignorespaces\@sharp\unskip}% % r \fi}}} \plEndIncludeInRelease \plIncludeInRelease{2017/07/29}{\@tabclassz} @@ -1728,11 +1735,14 @@ of this package available from CTAN} \edef\@preamble{% \@preamble{% \ifcase\@chnum - \hfil\inhibitglue\ignorespaces\@sharp\unskip\unskip\hfil % c + \hfil\inhibitglue + \ignorespaces\@sharp\unskip\unskip\hfil % c \or - \hskip1sp\inhibitglue\ignorespaces\@sharp\unskip\unskip\hfil % l + \hskip1sp\inhibitglue + \ignorespaces\@sharp\unskip\unskip\hfil % l \or - \hfil\hskip1sp\inhibitglue\ignorespaces\@sharp\unskip\unskip % r + \hfil\hskip1sp\inhibitglue + \ignorespaces\@sharp\unskip\unskip % r \fi}}} \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}{\@tabclassz} diff --git a/Master/texmf-dist/tex/platex/base/plcore.ltx b/Master/texmf-dist/tex/platex/base/plcore.ltx index 7c3075985ec..b8237ce7aa9 100644 --- a/Master/texmf-dist/tex/platex/base/plcore.ltx +++ b/Master/texmf-dist/tex/platex/base/plcore.ltx @@ -33,7 +33,7 @@ \fi \def\pfmtname{pLaTeX2e} \def\pfmtversion - {2018-12-01} + {2019-04-06} \def\ppatch@level{0} \edef\platexBANNER{\noexpand\platexNILa \the\everyjob % LaTeX banner and delayed codes @@ -1263,11 +1263,14 @@ \edef\@preamble{% \@preamble{% \ifcase\@chnum - \hfil\inhibitglue\ignorespaces\@sharp\unskip\removejfmglue\hfil % c + \hfil\hskip1sp\inhibitglue + \ignorespaces\@sharp\unskip\removejfmglue\hfil % c \or - \hskip1sp\inhibitglue\ignorespaces\@sharp\unskip\removejfmglue\hfil % l + \hskip1sp\inhibitglue + \ignorespaces\@sharp\unskip\removejfmglue\hfil % l \or - \hfil\hskip1sp\inhibitglue\ignorespaces\@sharp\unskip\removejfmglue % r + \hfil\hskip1sp\inhibitglue + \ignorespaces\@sharp\unskip\removejfmglue % r \fi}}} \fi \def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\pltx@next@inhibitglue\ignorespaces diff --git a/Master/texmf-dist/tex/platex/base/tarticle.cls b/Master/texmf-dist/tex/platex/base/tarticle.cls index 3ad596d32fd..64fe88d7910 100644 --- a/Master/texmf-dist/tex/platex/base/tarticle.cls +++ b/Master/texmf-dist/tex/platex/base/tarticle.cls @@ -7,7 +7,7 @@ %% jclasses.dtx (with options: `article,tate') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016-2018 Japanese TeX Development Community +%% Copyright (c) 2016-2019 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{tarticle} - [2018/10/25 v1.8a + [2019/04/02 v1.8b Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -774,27 +774,36 @@ \def\西暦{\西暦true} \def\和暦{\西暦false} \newcount\heisei \heisei\year \advance\heisei-1988\relax -\def\today{{% - \iftdir - \if西暦 - \kansuji\number\year 年 - \kansuji\number\month 月 - \kansuji\number\day 日 +\def\pltx@today@year@#1{% + \ifnum\numexpr\year-#1=1 元\else + \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi + \kansuji\number\numexpr\year-#1\relax \else - 平成\ifnum\heisei=1 元年\else\kansuji\number\heisei 年\fi - \kansuji\number\month 月 - \kansuji\number\day 日 + \number\numexpr\year-#1\relax\nobreak \fi + \fi 年 +} +\def\pltx@today@year{% + \ifnum\numexpr\year*10000+\month*100+\day<19890108 + 昭和\pltx@today@year@{1925}% + \else\ifnum\numexpr\year*10000+\month*100+\day<20190501 + 平成\pltx@today@year@{1988}% \else - \if西暦 - \number\year~年 - \number\month~月 - \number\day~日 - \else - 平成\ifnum\heisei=1 元年\else\number\heisei~年\fi - \number\month~月 - \number\day~日 - \fi + 令和\pltx@today@year@{2018}% + \fi\fi} +\def\today{{% + \if西暦 + \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi\kansuji\number\year + \else\number\year\nobreak\fi 年 + \else + \pltx@today@year + \fi + \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi + \kansuji\number\month 月 + \kansuji\number\day 日 + \else + \number\month\nobreak 月 + \number\day\nobreak 日 \fi}} \newcommand{\prepartname}{第} \newcommand{\postpartname}{部} diff --git a/Master/texmf-dist/tex/platex/base/tbk10.clo b/Master/texmf-dist/tex/platex/base/tbk10.clo index 4f6b9c5623b..5d06cce9c71 100644 --- a/Master/texmf-dist/tex/platex/base/tbk10.clo +++ b/Master/texmf-dist/tex/platex/base/tbk10.clo @@ -7,7 +7,7 @@ %% jclasses.dtx (with options: `10pt,bk,tate') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016-2018 Japanese TeX Development Community +%% Copyright (c) 2016-2019 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tbk10.clo} - [2018/10/25 v1.8a + [2019/04/02 v1.8b 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 4187ea44c45..167c4c94bc3 100644 --- a/Master/texmf-dist/tex/platex/base/tbk11.clo +++ b/Master/texmf-dist/tex/platex/base/tbk11.clo @@ -7,7 +7,7 @@ %% jclasses.dtx (with options: `11pt,bk,tate') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016-2018 Japanese TeX Development Community +%% Copyright (c) 2016-2019 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tbk11.clo} - [2018/10/25 v1.8a + [2019/04/02 v1.8b 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 b84fa217e28..f1f8718e853 100644 --- a/Master/texmf-dist/tex/platex/base/tbk12.clo +++ b/Master/texmf-dist/tex/platex/base/tbk12.clo @@ -7,7 +7,7 @@ %% jclasses.dtx (with options: `12pt,bk,tate') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016-2018 Japanese TeX Development Community +%% Copyright (c) 2016-2019 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tbk12.clo} - [2018/10/25 v1.8a + [2019/04/02 v1.8b 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 c8ab2dcc704..8982dfd5497 100644 --- a/Master/texmf-dist/tex/platex/base/tbook.cls +++ b/Master/texmf-dist/tex/platex/base/tbook.cls @@ -7,7 +7,7 @@ %% jclasses.dtx (with options: `book,tate') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016-2018 Japanese TeX Development Community +%% Copyright (c) 2016-2019 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{tbook} - [2018/10/25 v1.8a + [2019/04/02 v1.8b Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -877,27 +877,36 @@ \def\西暦{\西暦true} \def\和暦{\西暦false} \newcount\heisei \heisei\year \advance\heisei-1988\relax -\def\today{{% - \iftdir - \if西暦 - \kansuji\number\year 年 - \kansuji\number\month 月 - \kansuji\number\day 日 +\def\pltx@today@year@#1{% + \ifnum\numexpr\year-#1=1 元\else + \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi + \kansuji\number\numexpr\year-#1\relax \else - 平成\ifnum\heisei=1 元年\else\kansuji\number\heisei 年\fi - \kansuji\number\month 月 - \kansuji\number\day 日 + \number\numexpr\year-#1\relax\nobreak \fi + \fi 年 +} +\def\pltx@today@year{% + \ifnum\numexpr\year*10000+\month*100+\day<19890108 + 昭和\pltx@today@year@{1925}% + \else\ifnum\numexpr\year*10000+\month*100+\day<20190501 + 平成\pltx@today@year@{1988}% \else - \if西暦 - \number\year~年 - \number\month~月 - \number\day~日 - \else - 平成\ifnum\heisei=1 元年\else\number\heisei~年\fi - \number\month~月 - \number\day~日 - \fi + 令和\pltx@today@year@{2018}% + \fi\fi} +\def\today{{% + \if西暦 + \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi\kansuji\number\year + \else\number\year\nobreak\fi 年 + \else + \pltx@today@year + \fi + \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi + \kansuji\number\month 月 + \kansuji\number\day 日 + \else + \number\month\nobreak 月 + \number\day\nobreak 日 \fi}} \newcommand{\prepartname}{第} \newcommand{\postpartname}{部} diff --git a/Master/texmf-dist/tex/platex/base/treport.cls b/Master/texmf-dist/tex/platex/base/treport.cls index cd21d882928..0df6570c708 100644 --- a/Master/texmf-dist/tex/platex/base/treport.cls +++ b/Master/texmf-dist/tex/platex/base/treport.cls @@ -7,7 +7,7 @@ %% jclasses.dtx (with options: `report,tate') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016-2018 Japanese TeX Development Community +%% Copyright (c) 2016-2019 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{treport} - [2018/10/25 v1.8a + [2019/04/02 v1.8b Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -873,27 +873,36 @@ \def\西暦{\西暦true} \def\和暦{\西暦false} \newcount\heisei \heisei\year \advance\heisei-1988\relax -\def\today{{% - \iftdir - \if西暦 - \kansuji\number\year 年 - \kansuji\number\month 月 - \kansuji\number\day 日 +\def\pltx@today@year@#1{% + \ifnum\numexpr\year-#1=1 元\else + \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi + \kansuji\number\numexpr\year-#1\relax \else - 平成\ifnum\heisei=1 元年\else\kansuji\number\heisei 年\fi - \kansuji\number\month 月 - \kansuji\number\day 日 + \number\numexpr\year-#1\relax\nobreak \fi + \fi 年 +} +\def\pltx@today@year{% + \ifnum\numexpr\year*10000+\month*100+\day<19890108 + 昭和\pltx@today@year@{1925}% + \else\ifnum\numexpr\year*10000+\month*100+\day<20190501 + 平成\pltx@today@year@{1988}% \else - \if西暦 - \number\year~年 - \number\month~月 - \number\day~日 - \else - 平成\ifnum\heisei=1 元年\else\number\heisei~年\fi - \number\month~月 - \number\day~日 - \fi + 令和\pltx@today@year@{2018}% + \fi\fi} +\def\today{{% + \if西暦 + \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi\kansuji\number\year + \else\number\year\nobreak\fi 年 + \else + \pltx@today@year + \fi + \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi + \kansuji\number\month 月 + \kansuji\number\day 日 + \else + \number\month\nobreak 月 + \number\day\nobreak 日 \fi}} \newcommand{\prepartname}{第} \newcommand{\postpartname}{部} diff --git a/Master/texmf-dist/tex/platex/base/tsize10.clo b/Master/texmf-dist/tex/platex/base/tsize10.clo index ee839c781bf..fefede56c97 100644 --- a/Master/texmf-dist/tex/platex/base/tsize10.clo +++ b/Master/texmf-dist/tex/platex/base/tsize10.clo @@ -7,7 +7,7 @@ %% jclasses.dtx (with options: `10pt,tate') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016-2018 Japanese TeX Development Community +%% Copyright (c) 2016-2019 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tsize10.clo} - [2018/10/25 v1.8a + [2019/04/02 v1.8b 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 9cd2dc0596a..3cbbb3eece6 100644 --- a/Master/texmf-dist/tex/platex/base/tsize11.clo +++ b/Master/texmf-dist/tex/platex/base/tsize11.clo @@ -7,7 +7,7 @@ %% jclasses.dtx (with options: `11pt,tate') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016-2018 Japanese TeX Development Community +%% Copyright (c) 2016-2019 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tsize11.clo} - [2018/10/25 v1.8a + [2019/04/02 v1.8b 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 b2fbca1068f..52d8b9cce7e 100644 --- a/Master/texmf-dist/tex/platex/base/tsize12.clo +++ b/Master/texmf-dist/tex/platex/base/tsize12.clo @@ -7,7 +7,7 @@ %% jclasses.dtx (with options: `12pt,tate') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016-2018 Japanese TeX Development Community +%% Copyright (c) 2016-2019 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tsize12.clo} - [2018/10/25 v1.8a + [2019/04/02 v1.8b Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% -- cgit v1.2.3