From 11d483f249eeb5c7362a958126878c12ec7167b6 Mon Sep 17 00:00:00 2001 From: Hironobu Yamashita Date: Sat, 6 Apr 2019 15:10:40 +0900 Subject: [PATCH] make jisfile --- jis/jsarticle.cls | 41 ++++++++++++++++++++++++--------- jis/jsbook.cls | 41 ++++++++++++++++++++++++--------- jis/jsclasses.dtx | 58 +++++++++++++++++++++++++++++++++-------------- jis/jspf.cls | 41 ++++++++++++++++++++++++--------- jis/jsreport.cls | 41 ++++++++++++++++++++++++--------- jis/kiyou.cls | 41 ++++++++++++++++++++++++--------- 6 files changed, 191 insertions(+), 72 deletions(-) diff --git a/jis/jsarticle.cls b/jis/jsarticle.cls index 118d1a3..3879f07 100644 --- a/jis/jsarticle.cls +++ b/jis/jsarticle.cls @@ -22,7 +22,7 @@ %% in the same archive or directory.) \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 @@ -1885,23 +1885,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/jis/jsbook.cls b/jis/jsbook.cls index dff5339..22cacf2 100644 --- a/jis/jsbook.cls +++ b/jis/jsbook.cls @@ -22,7 +22,7 @@ %% in the same archive or directory.) \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 @@ -1976,23 +1976,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/jis/jsclasses.dtx b/jis/jsclasses.dtx index c3da75d..7c35499 100644 --- a/jis/jsclasses.dtx +++ b/jis/jsclasses.dtx @@ -10,7 +10,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 % @@ -26,7 +26,7 @@ %<*driver> \ProvidesFile{jsclasses.dtx} % - [2018/12/11 jsclasses (okumura, texjporg)] + [2019/04/06 jsclasses (okumura, texjporg)] %<*driver> \documentclass{jsarticle} \usepackage{doc} @@ -879,7 +879,7 @@ \fi \ifnum\@ptsize=-1 \def\n@baseline{15}% - \fi + \fi \fi %<*kiyou> \def\jsc@magscale{0.9769230} @@ -888,7 +888,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} @@ -1335,10 +1335,10 @@ \xspcode`+=3 \xspcode`\%=3 % \end{macrocode} -% +% % これ以外にT1エンコーディングで80〜ffの文字もすべて欧文文字ですので， % 両側の和文文字との間にスペースが入らなければなりません。 -% +% % \begin{macrocode} \xspcode`^^80=3 \xspcode`^^81=3 @@ -5861,8 +5861,13 @@ % \paragraph{今日の日付} % % \LaTeX で処理した日付を出力します。 -% |jarticle| などと違って，標準を西暦にし，余分な空白が入らないように改良しました。 +% ^^A |jarticle| などと違って，標準を西暦にし， +% ^^A 余分な空白が入らないように改良しました。 +% ^^A -- 2018年7月以降は |jarticle| なども標準が西暦， +% ^^A -- 2019年4月以降は余分な空白が入らなくなっています。 % 和暦にするには |\和暦| と書いてください。 +% ちなみにこの文章の作成日は西暦では{\西暦\today}で， +% 和暦では{\和暦\today}です。 % % \begin{macro}{\today} % \begin{macrocode} @@ -5870,23 +5875,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/jis/jspf.cls b/jis/jspf.cls index bb397d5..6e20f5e 100644 --- a/jis/jspf.cls +++ b/jis/jspf.cls @@ -22,7 +22,7 @@ %% in the same archive or directory.) \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 @@ -1727,23 +1727,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/jis/jsreport.cls b/jis/jsreport.cls index d53425e..53dfc1c 100644 --- a/jis/jsreport.cls +++ b/jis/jsreport.cls @@ -22,7 +22,7 @@ %% in the same archive or directory.) \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 @@ -1970,23 +1970,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/jis/kiyou.cls b/jis/kiyou.cls index 1d1acbb..2b7e5e8 100644 --- a/jis/kiyou.cls +++ b/jis/kiyou.cls @@ -22,7 +22,7 @@ %% in the same archive or directory.) \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 @@ -1843,23 +1843,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}