ltjsclasses

diff --git a/src/ltjarticle.cls b/src/ltjarticle.cls
index 199ee2a..236b2a1 100644 (file)
--- a/src/ltjarticle.cls
+++ b/src/ltjarticle.cls
@@ -796,7 +796,7 @@
   \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
 平成\pltx@today@year@{1988}%
   \else
-〓〓\pltx@today@year@{2018}%
+令和\pltx@today@year@{2018}%
   \fi\fi}
 \def\today{{%
   \if西暦

diff --git a/src/ltjbook.cls b/src/ltjbook.cls
index 411fff6..319f6d2 100644 (file)
--- a/src/ltjbook.cls
+++ b/src/ltjbook.cls
@@ -899,7 +899,7 @@
   \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
 平成\pltx@today@year@{1988}%
   \else
-〓〓\pltx@today@year@{2018}%
+令和\pltx@today@year@{2018}%
   \fi\fi}
 \def\today{{%
   \if西暦

diff --git a/src/ltjclasses.dtx b/src/ltjclasses.dtx
index 5724fd5..13e1ca0 100644 (file)
--- a/src/ltjclasses.dtx
+++ b/src/ltjclasses.dtx
@@ -4491,7 +4491,7 @@
   \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
        平成\pltx@today@year@{1988}%
   \else 
-       〓〓\pltx@today@year@{2018}%
+       令和\pltx@today@year@{2018}%
   \fi\fi}
 \def\today{{%
   \if西暦

diff --git a/src/ltjreport.cls b/src/ltjreport.cls
index 4cb7b16..6cefd58 100644 (file)
--- a/src/ltjreport.cls
+++ b/src/ltjreport.cls
@@ -895,7 +895,7 @@
   \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
 平成\pltx@today@year@{1988}%
   \else
-〓〓\pltx@today@year@{2018}%
+令和\pltx@today@year@{2018}%
   \fi\fi}
 \def\today{{%
   \if西暦

diff --git a/src/ltjsarticle.cls b/src/ltjsarticle.cls
index e2dfed7..f51d521 100644 (file)
--- a/src/ltjsarticle.cls
+++ b/src/ltjsarticle.cls
@@ -1621,27 +1621,43 @@ class has defined the old font commands like\MessageBreak
 \newcommand{\tablename}{\if@english Table~\else 表\fi}
 \newcommand{\appendixname}{\if@english \else 付録\fi}
 \newcommand{\abstractname}{\if@english Abstract\else 概要\fi}
+%% |ltjarticle| などと違って，標準を西暦にし，余分な空白が入らないように改良しました。
 \newif\if西暦 \西暦true
 \def\西暦{\西暦true}
 \def\和暦{\西暦false}
-\newcount\heisei \heisei\year \advance\heisei-1988\relax
+\def\pltx@today@year@#1{%
+  \ifnum\numexpr\year-#1=1 元\else
+\ifnum\ltjgetparameter{direction}=3 \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西暦
+    \ifnum\ltjgetparameter{direction}=3 \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
+  \ifnum\ltjgetparameter{direction}=3
+\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/src/ltjsbook.cls b/src/ltjsbook.cls
index ef9690b..e0e418d 100644 (file)
--- a/src/ltjsbook.cls
+++ b/src/ltjsbook.cls
@@ -1715,27 +1715,43 @@ class has defined the old font commands like\MessageBreak
 \newcommand{\figurename}{\if@english Fig.~\else 図\fi}
 \newcommand{\tablename}{\if@english Table~\else 表\fi}
 \newcommand{\appendixname}{\if@english \else 付録\fi}
+%% |ltjarticle| などと違って，標準を西暦にし，余分な空白が入らないように改良しました。
 \newif\if西暦 \西暦true
 \def\西暦{\西暦true}
 \def\和暦{\西暦false}
-\newcount\heisei \heisei\year \advance\heisei-1988\relax
+\def\pltx@today@year@#1{%
+  \ifnum\numexpr\year-#1=1 元\else
+\ifnum\ltjgetparameter{direction}=3 \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西暦
+    \ifnum\ltjgetparameter{direction}=3 \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
+  \ifnum\ltjgetparameter{direction}=3
+\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/src/ltjsclasses.dtx b/src/ltjsclasses.dtx
index 256a917..2c2cb2a 100644 (file)
--- a/src/ltjsclasses.dtx
+++ b/src/ltjsclasses.dtx
@@ -5600,32 +5600,49 @@
 % \paragraph{今日の日付}
 %
 % \LaTeX で処理した日付を出力します。
-% |ltjarticle| などと違って，標準を西暦にし，余分な空白が入らないように改良しました。
+%% |ltjarticle| などと違って，標準を西暦にし，余分な空白が入らないように改良しました。
 % 和暦にするには |\和暦| と書いてください。
 %
+% [2019-04-01 LTJ] |ltjclasses|と同様の処理．
+%
 % \begin{macro}{\today}
 %    \begin{macrocode}
 \newif\if西暦 \西暦true
 \def\西暦{\西暦true}
 \def\和暦{\西暦false}
-\newcount\heisei \heisei\year \advance\heisei-1988\relax
+\def\pltx@today@year@#1{%
+  \ifnum\numexpr\year-#1=1 元\else
+       \ifnum\ltjgetparameter{direction}=3 \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西暦
+    \ifnum\ltjgetparameter{direction}=3 \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
+  \ifnum\ltjgetparameter{direction}=3
+       \kansuji\month 月
+    \kansuji\day 日
+  \else
+    \number\month\nobreak 月
+    \number\day\nobreak 日
+  \fi\fi}
 %    \end{macrocode}
 % \end{macro}
 %

diff --git a/src/ltjskiyou.cls b/src/ltjskiyou.cls
index 22cb42b..2b360a0 100644 (file)
--- a/src/ltjskiyou.cls
+++ b/src/ltjskiyou.cls
@@ -1586,27 +1586,43 @@ class has defined the old font commands like\MessageBreak
 \newcommand{\tablename}{\if@english Table~\else 表\fi}
 \newcommand{\appendixname}{\if@english \else 付録\fi}
 \newcommand{\abstractname}{\if@english Abstract\else 概要\fi}
+%% |ltjarticle| などと違って，標準を西暦にし，余分な空白が入らないように改良しました。
 \newif\if西暦 \西暦true
 \def\西暦{\西暦true}
 \def\和暦{\西暦false}
-\newcount\heisei \heisei\year \advance\heisei-1988\relax
+\def\pltx@today@year@#1{%
+  \ifnum\numexpr\year-#1=1 元\else
+\ifnum\ltjgetparameter{direction}=3 \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西暦
+    \ifnum\ltjgetparameter{direction}=3 \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
+  \ifnum\ltjgetparameter{direction}=3
+\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/src/ltjspf.cls b/src/ltjspf.cls
index 5c7fd8a..9cd5170 100644 (file)
--- a/src/ltjspf.cls
+++ b/src/ltjspf.cls
@@ -1480,27 +1480,43 @@ class has defined the old font commands like\MessageBreak
 \newcommand{\tablename}{Table~}
 \newcommand{\appendixname}{\if@english \else 付録\fi}
 \newcommand{\abstractname}{\if@english Abstract\else 概要\fi}
+%% |ltjarticle| などと違って，標準を西暦にし，余分な空白が入らないように改良しました。
 \newif\if西暦 \西暦true
 \def\西暦{\西暦true}
 \def\和暦{\西暦false}
-\newcount\heisei \heisei\year \advance\heisei-1988\relax
+\def\pltx@today@year@#1{%
+  \ifnum\numexpr\year-#1=1 元\else
+\ifnum\ltjgetparameter{direction}=3 \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西暦
+    \ifnum\ltjgetparameter{direction}=3 \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
+  \ifnum\ltjgetparameter{direction}=3
+\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/src/ltjsreport.cls b/src/ltjsreport.cls
index 4b6803a..a610de5 100644 (file)
--- a/src/ltjsreport.cls
+++ b/src/ltjsreport.cls
@@ -1709,27 +1709,43 @@ class has defined the old font commands like\MessageBreak
 \newcommand{\tablename}{\if@english Table~\else 表\fi}
 \newcommand{\appendixname}{\if@english \else 付録\fi}
 \newcommand{\abstractname}{\if@english Abstract\else 概要\fi}
+%% |ltjarticle| などと違って，標準を西暦にし，余分な空白が入らないように改良しました。
 \newif\if西暦 \西暦true
 \def\西暦{\西暦true}
 \def\和暦{\西暦false}
-\newcount\heisei \heisei\year \advance\heisei-1988\relax
+\def\pltx@today@year@#1{%
+  \ifnum\numexpr\year-#1=1 元\else
+\ifnum\ltjgetparameter{direction}=3 \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西暦
+    \ifnum\ltjgetparameter{direction}=3 \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
+  \ifnum\ltjgetparameter{direction}=3
+\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/src/ltjtarticle.cls b/src/ltjtarticle.cls
index b9b5e3e..9b95029 100644 (file)
--- a/src/ltjtarticle.cls
+++ b/src/ltjtarticle.cls
@@ -811,7 +811,7 @@
   \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
 平成\pltx@today@year@{1988}%
   \else
-〓〓\pltx@today@year@{2018}%
+令和\pltx@today@year@{2018}%
   \fi\fi}
 \def\today{{%
   \if西暦

diff --git a/src/ltjtbook.cls b/src/ltjtbook.cls
index 08571c0..d262826 100644 (file)
--- a/src/ltjtbook.cls
+++ b/src/ltjtbook.cls
@@ -914,7 +914,7 @@
   \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
 平成\pltx@today@year@{1988}%
   \else
-〓〓\pltx@today@year@{2018}%
+令和\pltx@today@year@{2018}%
   \fi\fi}
 \def\today{{%
   \if西暦

diff --git a/src/ltjtreport.cls b/src/ltjtreport.cls
index c640ae3..b49a2d3 100644 (file)
--- a/src/ltjtreport.cls
+++ b/src/ltjtreport.cls
@@ -910,7 +910,7 @@
   \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
 平成\pltx@today@year@{1988}%
   \else
-〓〓\pltx@today@year@{2018}%
+令和\pltx@today@year@{2018}%
   \fi\fi}
 \def\today{{%
   \if西暦