From cb80c8476ad28cf03650f087acc7062a148268a6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 6 Apr 2019 21:11:50 +0000 Subject: jsclasses (6apr19) git-svn-id: svn://tug.org/texlive/trunk@50813 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/platex/jsclasses/LICENSE | 2 +- Master/texmf-dist/doc/platex/jsclasses/README.md | 2 +- .../texmf-dist/doc/platex/jsclasses/jsclasses.pdf | Bin 478619 -> 479489 bytes .../source/platex/jsclasses/jsclasses.dtx | 58 +++++++++++++++------ .../texmf-dist/tex/platex/jsclasses/jsarticle.cls | 41 +++++++++++---- Master/texmf-dist/tex/platex/jsclasses/jsbook.cls | 41 +++++++++++---- Master/texmf-dist/tex/platex/jsclasses/jspf.cls | 41 +++++++++++---- .../texmf-dist/tex/platex/jsclasses/jsreport.cls | 41 +++++++++++---- Master/texmf-dist/tex/platex/jsclasses/kiyou.cls | 41 +++++++++++---- 9 files changed, 193 insertions(+), 74 deletions(-) diff --git a/Master/texmf-dist/doc/platex/jsclasses/LICENSE b/Master/texmf-dist/doc/platex/jsclasses/LICENSE index a43f33b573c..ff8691b935e 100644 --- a/Master/texmf-dist/doc/platex/jsclasses/LICENSE +++ b/Master/texmf-dist/doc/platex/jsclasses/LICENSE @@ -1,6 +1,6 @@ Copyright 1995-1999 ASCII MEDIA WORKS Copyright 1999-2016 Haruhiko Okumura -Copyright 2016-2018 Japanese TeX Development Community +Copyright 2016-2019 Japanese TeX Development Community All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/doc/platex/jsclasses/README.md b/Master/texmf-dist/doc/platex/jsclasses/README.md index d35dd1b7bfb..ff4f40d3d54 100644 --- a/Master/texmf-dist/doc/platex/jsclasses/README.md +++ b/Master/texmf-dist/doc/platex/jsclasses/README.md @@ -37,7 +37,7 @@ distributed separately. ## Release Date -2018-12-11 +2019-04-06 Haruhiko Okumura, Japanese TeX Development Community diff --git a/Master/texmf-dist/doc/platex/jsclasses/jsclasses.pdf b/Master/texmf-dist/doc/platex/jsclasses/jsclasses.pdf index f644c45673c..5bed9e0fa31 100644 Binary files a/Master/texmf-dist/doc/platex/jsclasses/jsclasses.pdf and b/Master/texmf-dist/doc/platex/jsclasses/jsclasses.pdf differ diff --git a/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx b/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx index 4ca5f419219..2ddf1d1dbe9 100644 --- a/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx +++ b/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx @@ -15,7 +15,7 @@ % % Copyright 1995-1999 ASCII Corporation. % Copyright 1999-2016 Haruhiko Okumura -% Copyright 2016-2018 Japanese TeX Development Community +% Copyright 2016-2019 Japanese TeX Development Community % % \fi % @@ -31,7 +31,7 @@ %<*driver> \ProvidesFile{jsclasses.dtx} % - [2018/12/11 jsclasses (okumura, texjporg)] + [2019/04/06 jsclasses (okumura, texjporg)] %<*driver> \documentclass{jsarticle} \usepackage{doc} @@ -884,7 +884,7 @@ \fi \ifnum\@ptsize=-1 \def\n@baseline{15}% - \fi + \fi \fi %<*kiyou> \def\jsc@magscale{0.9769230} @@ -893,7 +893,7 @@ \def\inv@mag{1.02354} \jsc@mpt=1\p@ \jsc@mmm=1mm -\else +\else \jsc@mpt=\jsc@magscale\p@ \jsc@mmm=\jsc@magscale mm \def\inv@mag{1} @@ -1340,10 +1340,10 @@ \xspcode`+=3 \xspcode`\%=3 % \end{macrocode} -% +% % これ以外にT1エンコーディングで80〜ffの文字もすべて欧文文字ですので, % 両側の和文文字との間にスペースが入らなければなりません。 -% +% % \begin{macrocode} \xspcode`^^80=3 \xspcode`^^81=3 @@ -5866,8 +5866,13 @@ % \paragraph{今日の日付} % % \LaTeX で処理した日付を出力します。 -% |jarticle| などと違って,標準を西暦にし,余分な空白が入らないように改良しました。 +% ^^A |jarticle| などと違って,標準を西暦にし, +% ^^A 余分な空白が入らないように改良しました。 +% ^^A -- 2018年7月以降は |jarticle| なども標準が西暦, +% ^^A -- 2019年4月以降は余分な空白が入らなくなっています。 % 和暦にするには |\和暦| と書いてください。 +% ちなみにこの文章の作成日は西暦では{\西暦\today}で, +% 和暦では{\和暦\today}です。 % % \begin{macro}{\today} % \begin{macrocode} @@ -5875,23 +5880,42 @@ \def\西暦{\西暦true} \def\和暦{\西暦false} \newcount\heisei \heisei\year \advance\heisei-1988\relax +\def\pltx@today@year@#1{% + \ifnum\numexpr\year-#1=1 元\else + \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi + \kansuji\numexpr\year-#1\relax + \else + \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 + 令和\pltx@today@year@{2018}% + \fi\fi} \def\today{% \if@english \ifcase\month\or January\or February\or March\or April\or May\or June\or July\or August\or September\or October\or November\or December\fi \space\number\day, \number\year + \else\if西暦 + \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi \kansuji\year + \else\number\year\nobreak\fi 年 \else - \if西暦 - \number\year 年 - \number\month 月 - \number\day 日 - \else - 平成\number\heisei 年 - \number\month 月 - \number\day 日 - \fi - \fi} + \pltx@today@year + \fi + \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi + \kansuji\month 月 + \kansuji\day 日 + \else + \number\month\nobreak 月 + \number\day\nobreak 日 + \fi\fi} % \end{macrocode} % \end{macro} % diff --git a/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls b/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls index f2521497a14..d1a07e0e39e 100644 --- a/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls +++ b/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls @@ -25,7 +25,7 @@ \fi \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jsarticle} - [2018/12/11 jsclasses (okumura, texjporg)] + [2019/04/06 jsclasses (okumura, texjporg)] \def\jsc@clsname{jsarticle} \newif\ifjsc@needsp@tch \jsc@needsp@tchfalse @@ -1888,23 +1888,42 @@ \def\西暦{\西暦true} \def\和暦{\西暦false} \newcount\heisei \heisei\year \advance\heisei-1988\relax +\def\pltx@today@year@#1{% + \ifnum\numexpr\year-#1=1 元\else + \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi + \kansuji\numexpr\year-#1\relax + \else + \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 + 令和\pltx@today@year@{2018}% + \fi\fi} \def\today{% \if@english \ifcase\month\or January\or February\or March\or April\or May\or June\or July\or August\or September\or October\or November\or December\fi \space\number\day, \number\year + \else\if西暦 + \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi \kansuji\year + \else\number\year\nobreak\fi 年 \else - \if西暦 - \number\year 年 - \number\month 月 - \number\day 日 - \else - 平成\number\heisei 年 - \number\month 月 - \number\day 日 - \fi - \fi} + \pltx@today@year + \fi + \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi + \kansuji\month 月 + \kansuji\day 日 + \else + \number\month\nobreak 月 + \number\day\nobreak 日 + \fi\fi} \hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script} \if@slide \pagestyle{empty} \else \pagestyle{plain} \fi \pagenumbering{arabic} diff --git a/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls b/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls index 4491721e2c0..e50732a6e2b 100644 --- a/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls +++ b/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls @@ -25,7 +25,7 @@ \fi \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jsbook} - [2018/12/11 jsclasses (okumura, texjporg)] + [2019/04/06 jsclasses (okumura, texjporg)] \def\jsc@clsname{jsbook} \newif\ifjsc@needsp@tch \jsc@needsp@tchfalse @@ -1979,23 +1979,42 @@ \def\西暦{\西暦true} \def\和暦{\西暦false} \newcount\heisei \heisei\year \advance\heisei-1988\relax +\def\pltx@today@year@#1{% + \ifnum\numexpr\year-#1=1 元\else + \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi + \kansuji\numexpr\year-#1\relax + \else + \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 + 令和\pltx@today@year@{2018}% + \fi\fi} \def\today{% \if@english \ifcase\month\or January\or February\or March\or April\or May\or June\or July\or August\or September\or October\or November\or December\fi \space\number\day, \number\year + \else\if西暦 + \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi \kansuji\year + \else\number\year\nobreak\fi 年 \else - \if西暦 - \number\year 年 - \number\month 月 - \number\day 日 - \else - 平成\number\heisei 年 - \number\month 月 - \number\day 日 - \fi - \fi} + \pltx@today@year + \fi + \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi + \kansuji\month 月 + \kansuji\day 日 + \else + \number\month\nobreak 月 + \number\day\nobreak 日 + \fi\fi} \hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script} \if@report \pagestyle{plain} \else \pagestyle{headings} \fi \pagenumbering{arabic} diff --git a/Master/texmf-dist/tex/platex/jsclasses/jspf.cls b/Master/texmf-dist/tex/platex/jsclasses/jspf.cls index c22f62f2b92..a20a4308227 100644 --- a/Master/texmf-dist/tex/platex/jsclasses/jspf.cls +++ b/Master/texmf-dist/tex/platex/jsclasses/jspf.cls @@ -25,7 +25,7 @@ \fi \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jspf} - [2018/12/11 jsclasses (okumura, texjporg)] + [2019/04/06 jsclasses (okumura, texjporg)] \def\jsc@clsname{jspf} \newif\ifjsc@needsp@tch \jsc@needsp@tchfalse @@ -1730,23 +1730,42 @@ \def\西暦{\西暦true} \def\和暦{\西暦false} \newcount\heisei \heisei\year \advance\heisei-1988\relax +\def\pltx@today@year@#1{% + \ifnum\numexpr\year-#1=1 元\else + \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi + \kansuji\numexpr\year-#1\relax + \else + \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 + 令和\pltx@today@year@{2018}% + \fi\fi} \def\today{% \if@english \ifcase\month\or January\or February\or March\or April\or May\or June\or July\or August\or September\or October\or November\or December\fi \space\number\day, \number\year + \else\if西暦 + \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi \kansuji\year + \else\number\year\nobreak\fi 年 \else - \if西暦 - \number\year 年 - \number\month 月 - \number\day 日 - \else - 平成\number\heisei 年 - \number\month 月 - \number\day 日 - \fi - \fi} + \pltx@today@year + \fi + \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi + \kansuji\month 月 + \kansuji\day 日 + \else + \number\month\nobreak 月 + \number\day\nobreak 日 + \fi\fi} \hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script} \pagestyle{headings} \pagenumbering{arabic} diff --git a/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls b/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls index 056a7cb49b9..d51267e622b 100644 --- a/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls +++ b/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls @@ -25,7 +25,7 @@ \fi \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jsreport} - [2018/12/11 jsclasses (okumura, texjporg)] + [2019/04/06 jsclasses (okumura, texjporg)] \def\jsc@clsname{jsreport} \newif\ifjsc@needsp@tch \jsc@needsp@tchfalse @@ -1973,23 +1973,42 @@ \def\西暦{\西暦true} \def\和暦{\西暦false} \newcount\heisei \heisei\year \advance\heisei-1988\relax +\def\pltx@today@year@#1{% + \ifnum\numexpr\year-#1=1 元\else + \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi + \kansuji\numexpr\year-#1\relax + \else + \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 + 令和\pltx@today@year@{2018}% + \fi\fi} \def\today{% \if@english \ifcase\month\or January\or February\or March\or April\or May\or June\or July\or August\or September\or October\or November\or December\fi \space\number\day, \number\year + \else\if西暦 + \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi \kansuji\year + \else\number\year\nobreak\fi 年 \else - \if西暦 - \number\year 年 - \number\month 月 - \number\day 日 - \else - 平成\number\heisei 年 - \number\month 月 - \number\day 日 - \fi - \fi} + \pltx@today@year + \fi + \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi + \kansuji\month 月 + \kansuji\day 日 + \else + \number\month\nobreak 月 + \number\day\nobreak 日 + \fi\fi} \hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script} \pagestyle{plain} \pagenumbering{arabic} diff --git a/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls b/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls index e849c1683af..de417c63a2d 100644 --- a/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls +++ b/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls @@ -25,7 +25,7 @@ \fi \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{kiyou} - [2018/12/11 jsclasses (okumura, texjporg)] + [2019/04/06 jsclasses (okumura, texjporg)] \def\jsc@clsname{kiyou} \newif\ifjsc@needsp@tch \jsc@needsp@tchfalse @@ -1846,23 +1846,42 @@ \def\西暦{\西暦true} \def\和暦{\西暦false} \newcount\heisei \heisei\year \advance\heisei-1988\relax +\def\pltx@today@year@#1{% + \ifnum\numexpr\year-#1=1 元\else + \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi + \kansuji\numexpr\year-#1\relax + \else + \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 + 令和\pltx@today@year@{2018}% + \fi\fi} \def\today{% \if@english \ifcase\month\or January\or February\or March\or April\or May\or June\or July\or August\or September\or October\or November\or December\fi \space\number\day, \number\year + \else\if西暦 + \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi \kansuji\year + \else\number\year\nobreak\fi 年 \else - \if西暦 - \number\year 年 - \number\month 月 - \number\day 日 - \else - 平成\number\heisei 年 - \number\month 月 - \number\day 日 - \fi - \fi} + \pltx@today@year + \fi + \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi + \kansuji\month 月 + \kansuji\day 日 + \else + \number\month\nobreak 月 + \number\day\nobreak 日 + \fi\fi} \hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script} \pagestyle{plain} \pagenumbering{arabic} -- cgit v1.2.3