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/source/platex/base/Makefile | 2 +- Master/texmf-dist/source/platex/base/jclasses.dtx | 60 ++++++++++++++-------- .../source/platex/base/platexrelease.dtx | 3 +- Master/texmf-dist/source/platex/base/plcls.ins | 2 +- Master/texmf-dist/source/platex/base/plcore.dtx | 36 +++++++++---- Master/texmf-dist/source/platex/base/plvers.dtx | 4 +- 6 files changed, 69 insertions(+), 38 deletions(-) (limited to 'Master/texmf-dist/source/platex') diff --git a/Master/texmf-dist/source/platex/base/Makefile b/Master/texmf-dist/source/platex/base/Makefile index f056c73b3ec..ac45cee9c13 100644 --- a/Master/texmf-dist/source/platex/base/Makefile +++ b/Master/texmf-dist/source/platex/base/Makefile @@ -140,7 +140,7 @@ install: cp ./LICENSE ${TEXMF}/doc/platex/base/ cp ./README.md ${TEXMF}/doc/platex/base/ cp ./*.pdf ${TEXMF}/doc/platex/base/ - cp ./*.txt ${TEXMF}/doc/platex/base/ +# cp ./*.txt ${TEXMF}/doc/platex/base/ mkdir -p ${TEXMF}/source/platex/base cp ./Makefile ${TEXMF}/source/platex/base/ cp ./plnews*.tex ${TEXMF}/source/platex/base/ diff --git a/Master/texmf-dist/source/platex/base/jclasses.dtx b/Master/texmf-dist/source/platex/base/jclasses.dtx index b3b99a53a2b..04c939bacb8 100644 --- a/Master/texmf-dist/source/platex/base/jclasses.dtx +++ b/Master/texmf-dist/source/platex/base/jclasses.dtx @@ -3,7 +3,7 @@ % % Copyright 1995-2001 ASCII Corporation. % Copyright (c) 2010 ASCII MEDIA WORKS -% Copyright (c) 2016-2018 Japanese TeX Development Community +% Copyright (c) 2016-2019 Japanese TeX Development Community % % This file is part of the pLaTeX2e system (community edition). % ------------------------------------------------------------- @@ -97,6 +97,7 @@ % \changes{v1.8}{2018/07/03}{\cs{today}のデフォルトを和暦から西暦に変更} % \changes{v1.8a}{2018/10/25}{ファイル書き出し時の行末文字対策 % (sync with ltsect.dtx 2018/09/26 v1.1c)} +% \changes{v1.8b}{2019/04/02}{新元号対応} % \fi % % \iffalse @@ -126,7 +127,7 @@ %<11pt&bk>\ProvidesFile{tbk11.clo} %<12pt&bk>\ProvidesFile{tbk12.clo} % - [2018/10/25 v1.8a + [2019/04/02 v1.8b % Standard pLaTeX class] %<10pt|11pt|12pt> Standard pLaTeX file (size option)] %<*driver> @@ -4364,6 +4365,7 @@ % % \begin{macro}{\heisei} % \changes{v1.1m}{1998/04/07}{\cs{today}の計算手順を変更} +% \changes{v1.8b}{2019/04/02}{\cs{heisei}の値は$\mbox{西暦}-1988$で固定} % |\today|コマンドを|\rightmark|で指定したとき、|\rightmark|を出力する部分 % で和暦のための計算ができないので、クラスファイルを読み込む時点で計算して % おきます。 @@ -4373,32 +4375,46 @@ % \end{macro} % % \begin{macro}{\today} -% 縦組の場合は、漢数字で出力します。 -% \begin{macrocode} -\def\today{{% - \iftdir - \if西暦 - \kansuji\number\year 年 - \kansuji\number\month 月 - \kansuji\number\day 日 +% \begin{macro}{\pltx@today@year} +% \changes{v1.8b}{2019/04/02}{\cs{today}の計算・出力方法を変更。} +% 縦組の場合は、漢数字で出力します +% \pLaTeX\ 2018-12-01以前では縦数式ディレクション時でも漢数字で出力していましたが、 +% \pLaTeX\ 2019-04-06以降からはそうしなくなりました。 +% \begin{macrocode} +\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}} % \end{macrocode} % \end{macro} +% \end{macro} % % % diff --git a/Master/texmf-dist/source/platex/base/platexrelease.dtx b/Master/texmf-dist/source/platex/base/platexrelease.dtx index a04ccf9b445..2defdcf9489 100644 --- a/Master/texmf-dist/source/platex/base/platexrelease.dtx +++ b/Master/texmf-dist/source/platex/base/platexrelease.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment %% File: platexrelease.dtx % -% 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). % ------------------------------------------------------------- @@ -324,6 +324,7 @@ of this package available from CTAN} some critical bugs. We advise you to\MessageBreak select another format date} \plIncludeInRelease{2017/10/28}{\PackageWarning}{pLaTeX Info}% + % * <2019-04-06> % * <2018-12-01> % * <2018-07-28>+1 % * <2018-07-28> diff --git a/Master/texmf-dist/source/platex/base/plcls.ins b/Master/texmf-dist/source/platex/base/plcls.ins index 9a19b77d302..6993d136ba1 100644 --- a/Master/texmf-dist/source/platex/base/plcls.ins +++ b/Master/texmf-dist/source/platex/base/plcls.ins @@ -8,7 +8,7 @@ \preamble 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). ------------------------------------------------------------- diff --git a/Master/texmf-dist/source/platex/base/plcore.dtx b/Master/texmf-dist/source/platex/base/plcore.dtx index 024901cbb62..d71af9c45f7 100644 --- a/Master/texmf-dist/source/platex/base/plcore.dtx +++ b/Master/texmf-dist/source/platex/base/plcore.dtx @@ -3,7 +3,7 @@ % % Copyright 1994-2001 ASCII Corporation. % Copyright (c) 2010 ASCII MEDIA WORKS -% Copyright (c) 2016-2018 Japanese TeX Development Community +% Copyright (c) 2016-2019 Japanese TeX Development Community % % This file is part of the pLaTeX2e system (community edition). % ------------------------------------------------------------- @@ -114,13 +114,15 @@ % \changes{v1.3a}{2018/10/31}{\LaTeXe{}とp\LaTeXe{}の更新タイミングずれ対策を % \file{plvers.dtx} (plfinal) から\file{plcore.dtx}へ移動、latexrelease対策 % (sync with ltfinal 2018/08/24 v2.1f)} +% \changes{v1.3b}{2019/02/08}{中央揃えのセルでの\cs{unskip}対策 +% (sync with lttab 2018/12/30 v1.1p)} % \fi % % \iffalse %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{plcore.dtx}[2018/10/31 v1.3a pLaTeX core file] +\ProvidesFile{plcore.dtx}[2019/02/08 v1.3b pLaTeX core file] % \iffalse \documentclass{jltxdoc} \GetFileInfo{plcore.dtx} @@ -1960,6 +1962,9 @@ % \changes{v1.2r}{2017/09/26}{tabular環境の右揃え(r)で罫線がずれるように % なっていたバグを修正} % \changes{v1.2x}{2018/03/01}{\cs{removejfmglue}があれば利用するようにした} +% \changes{v1.3b}{2019/02/08}{中央揃えのセルでの\cs{unskip}対策 +% (sync with lttab 2018/12/30 v1.1p)} +% ^^A なぜか v1.3b の変更は本家 latexrelease に含まれないのでそれに合わせた % \begin{macrocode} % %\plIncludeInRelease{2018/03/09}{\@tabclassz} @@ -2007,11 +2012,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 % @@ -2035,11 +2043,14 @@ % \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} @@ -2061,11 +2072,14 @@ % \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/source/platex/base/plvers.dtx b/Master/texmf-dist/source/platex/base/plvers.dtx index 5ad8deaaa4a..9944cbfc1c9 100644 --- a/Master/texmf-dist/source/platex/base/plvers.dtx +++ b/Master/texmf-dist/source/platex/base/plvers.dtx @@ -3,7 +3,7 @@ % % Copyright 1995-2006 ASCII Corporation. % Copyright (c) 2010 ASCII MEDIA WORKS -% Copyright (c) 2016-2018 Japanese TeX Development Community +% Copyright (c) 2016-2019 Japanese TeX Development Community % % This file is part of the pLaTeX2e system (community edition). % ------------------------------------------------------------- @@ -186,7 +186,7 @@ % %\edef\platexreleaseversion %<*plcore|platexrelease> - {2018-12-01} + {2019-04-06} % %<*plcore> \def\ppatch@level{0} -- cgit v1.2.3