texlive[50813] Master/texmf-dist: jsclasses (6apr19)
commits+karl at tug.org
commits+karl at tug.org
Sat Apr 6 23:11:50 CEST 2019
Revision: 50813
http://tug.org/svn/texlive?view=revision&revision=50813
Author: karl
Date: 2019-04-06 23:11:50 +0200 (Sat, 06 Apr 2019)
Log Message:
-----------
jsclasses (6apr19)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/platex/jsclasses/LICENSE
trunk/Master/texmf-dist/doc/platex/jsclasses/README.md
trunk/Master/texmf-dist/doc/platex/jsclasses/jsclasses.pdf
trunk/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx
trunk/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls
trunk/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls
trunk/Master/texmf-dist/tex/platex/jsclasses/jspf.cls
trunk/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls
trunk/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls
Modified: trunk/Master/texmf-dist/doc/platex/jsclasses/LICENSE
===================================================================
--- trunk/Master/texmf-dist/doc/platex/jsclasses/LICENSE 2019-04-06 21:11:36 UTC (rev 50812)
+++ trunk/Master/texmf-dist/doc/platex/jsclasses/LICENSE 2019-04-06 21:11:50 UTC (rev 50813)
@@ -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
Modified: trunk/Master/texmf-dist/doc/platex/jsclasses/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/platex/jsclasses/README.md 2019-04-06 21:11:36 UTC (rev 50812)
+++ trunk/Master/texmf-dist/doc/platex/jsclasses/README.md 2019-04-06 21:11:50 UTC (rev 50813)
@@ -37,7 +37,7 @@
## Release Date
-2018-12-11
+2019-04-06
Haruhiko Okumura,
Japanese TeX Development Community
Modified: trunk/Master/texmf-dist/doc/platex/jsclasses/jsclasses.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx
===================================================================
--- trunk/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx 2019-04-06 21:11:36 UTC (rev 50812)
+++ trunk/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx 2019-04-06 21:11:50 UTC (rev 50813)
@@ -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}
%</driver>
- [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 at baseline{15}%
- \fi
+ \fi
\fi
%<*kiyou>
\def\jsc at magscale{0.9769230}
@@ -893,7 +893,7 @@
\def\inv at mag{1.02354}
\jsc at mpt=1\p@
\jsc at mmm=1mm
-\else
+\else
\jsc at mpt=\jsc at magscale\p@
\jsc at mmm=\jsc at magscale mm
\def\inv at 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,6 +5880,23 @@
\def\西暦{\西暦true}
\def\和暦{\西暦false}
\newcount\heisei \heisei\year \advance\heisei-1988\relax
+\def\pltx at 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 at today@year{%
+ \ifnum\numexpr\year*10000+\month*100+\day<19890108
+ 昭和\pltx at today@year@{1925}%
+ \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
+ 平成\pltx at today@year@{1988}%
+ \else
+ 令和\pltx at today@year@{2018}%
+ \fi\fi}
\def\today{%
\if at english
\ifcase\month\or
@@ -5881,17 +5903,19 @@
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 at 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}
%
Modified: trunk/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls
===================================================================
--- trunk/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls 2019-04-06 21:11:36 UTC (rev 50812)
+++ trunk/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls 2019-04-06 21:11:50 UTC (rev 50813)
@@ -25,7 +25,7 @@
\fi
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{jsarticle}
- [2018/12/11 jsclasses (okumura, texjporg)]
+ [2019/04/06 jsclasses (okumura, texjporg)]
\def\jsc at clsname{jsarticle}
\newif\ifjsc at needsp@tch
\jsc at needsp@tchfalse
@@ -1888,6 +1888,23 @@
\def\西暦{\西暦true}
\def\和暦{\西暦false}
\newcount\heisei \heisei\year \advance\heisei-1988\relax
+\def\pltx at 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 at today@year{%
+ \ifnum\numexpr\year*10000+\month*100+\day<19890108
+ 昭和\pltx at today@year@{1925}%
+ \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
+ 平成\pltx at today@year@{1988}%
+ \else
+ 令和\pltx at today@year@{2018}%
+ \fi\fi}
\def\today{%
\if at english
\ifcase\month\or
@@ -1894,17 +1911,19 @@
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 at 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 at slide \pagestyle{empty} \else \pagestyle{plain} \fi
\pagenumbering{arabic}
Modified: trunk/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls 2019-04-06 21:11:36 UTC (rev 50812)
+++ trunk/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls 2019-04-06 21:11:50 UTC (rev 50813)
@@ -25,7 +25,7 @@
\fi
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{jsbook}
- [2018/12/11 jsclasses (okumura, texjporg)]
+ [2019/04/06 jsclasses (okumura, texjporg)]
\def\jsc at clsname{jsbook}
\newif\ifjsc at needsp@tch
\jsc at needsp@tchfalse
@@ -1979,6 +1979,23 @@
\def\西暦{\西暦true}
\def\和暦{\西暦false}
\newcount\heisei \heisei\year \advance\heisei-1988\relax
+\def\pltx at 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 at today@year{%
+ \ifnum\numexpr\year*10000+\month*100+\day<19890108
+ 昭和\pltx at today@year@{1925}%
+ \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
+ 平成\pltx at today@year@{1988}%
+ \else
+ 令和\pltx at today@year@{2018}%
+ \fi\fi}
\def\today{%
\if at english
\ifcase\month\or
@@ -1985,17 +2002,19 @@
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 at 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 at report \pagestyle{plain} \else \pagestyle{headings} \fi
\pagenumbering{arabic}
Modified: trunk/Master/texmf-dist/tex/platex/jsclasses/jspf.cls
===================================================================
--- trunk/Master/texmf-dist/tex/platex/jsclasses/jspf.cls 2019-04-06 21:11:36 UTC (rev 50812)
+++ trunk/Master/texmf-dist/tex/platex/jsclasses/jspf.cls 2019-04-06 21:11:50 UTC (rev 50813)
@@ -25,7 +25,7 @@
\fi
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{jspf}
- [2018/12/11 jsclasses (okumura, texjporg)]
+ [2019/04/06 jsclasses (okumura, texjporg)]
\def\jsc at clsname{jspf}
\newif\ifjsc at needsp@tch
\jsc at needsp@tchfalse
@@ -1730,6 +1730,23 @@
\def\西暦{\西暦true}
\def\和暦{\西暦false}
\newcount\heisei \heisei\year \advance\heisei-1988\relax
+\def\pltx at 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 at today@year{%
+ \ifnum\numexpr\year*10000+\month*100+\day<19890108
+ 昭和\pltx at today@year@{1925}%
+ \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
+ 平成\pltx at today@year@{1988}%
+ \else
+ 令和\pltx at today@year@{2018}%
+ \fi\fi}
\def\today{%
\if at english
\ifcase\month\or
@@ -1736,17 +1753,19 @@
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 at 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}
Modified: trunk/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls
===================================================================
--- trunk/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls 2019-04-06 21:11:36 UTC (rev 50812)
+++ trunk/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls 2019-04-06 21:11:50 UTC (rev 50813)
@@ -25,7 +25,7 @@
\fi
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{jsreport}
- [2018/12/11 jsclasses (okumura, texjporg)]
+ [2019/04/06 jsclasses (okumura, texjporg)]
\def\jsc at clsname{jsreport}
\newif\ifjsc at needsp@tch
\jsc at needsp@tchfalse
@@ -1973,6 +1973,23 @@
\def\西暦{\西暦true}
\def\和暦{\西暦false}
\newcount\heisei \heisei\year \advance\heisei-1988\relax
+\def\pltx at 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 at today@year{%
+ \ifnum\numexpr\year*10000+\month*100+\day<19890108
+ 昭和\pltx at today@year@{1925}%
+ \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
+ 平成\pltx at today@year@{1988}%
+ \else
+ 令和\pltx at today@year@{2018}%
+ \fi\fi}
\def\today{%
\if at english
\ifcase\month\or
@@ -1979,17 +1996,19 @@
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 at 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}
Modified: trunk/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls
===================================================================
--- trunk/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls 2019-04-06 21:11:36 UTC (rev 50812)
+++ trunk/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls 2019-04-06 21:11:50 UTC (rev 50813)
@@ -25,7 +25,7 @@
\fi
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{kiyou}
- [2018/12/11 jsclasses (okumura, texjporg)]
+ [2019/04/06 jsclasses (okumura, texjporg)]
\def\jsc at clsname{kiyou}
\newif\ifjsc at needsp@tch
\jsc at needsp@tchfalse
@@ -1846,6 +1846,23 @@
\def\西暦{\西暦true}
\def\和暦{\西暦false}
\newcount\heisei \heisei\year \advance\heisei-1988\relax
+\def\pltx at 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 at today@year{%
+ \ifnum\numexpr\year*10000+\month*100+\day<19890108
+ 昭和\pltx at today@year@{1925}%
+ \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
+ 平成\pltx at today@year@{1988}%
+ \else
+ 令和\pltx at today@year@{2018}%
+ \fi\fi}
\def\today{%
\if at english
\ifcase\month\or
@@ -1852,17 +1869,19 @@
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 at 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}
More information about the tex-live-commits
mailing list