platex/ に追随

diff --git a/doc/ltjclasses.pdf b/doc/ltjclasses.pdf
index e8e0c93..3571173 100644 (file)
Binary files a/doc/ltjclasses.pdf and b/doc/ltjclasses.pdf differ

diff --git a/doc/ltjsclasses.pdf b/doc/ltjsclasses.pdf
index ab0a081..299c6fb 100644 (file)
Binary files a/doc/ltjsclasses.pdf and b/doc/ltjsclasses.pdf differ

diff --git a/src/ltjarticle.cls b/src/ltjarticle.cls
index 236b2a1..884eeb9 100644 (file)
--- a/src/ltjarticle.cls
+++ b/src/ltjarticle.cls
@@ -21,9 +21,10 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% File: ltjclasses.dtx
+
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjarticle}
-  [2018/10/08 v1.8-ltj-16
+  [2019/04/06 v1.8b-ltj-16
  Standard LuaLaTeX-ja class]
 \RequirePackage{luatexja}
 \newcounter{@paper}
@@ -684,7 +685,7 @@
 \def\addcontentsline#1#2#3{%
   \protected@write\@auxout
     {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble
-\@temptokena{\thepage}}%
+     \@temptokena{\thepage}}%
     {\string\@writefile{#1}%
        {\protect\contentsline{#2}{#3}{\the\@temptokena}%
 \protected@file@percent}}%
@@ -784,29 +785,33 @@
 \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
+    \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}%
+    昭和\pltx@today@year@{1925}%
   \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
-平成\pltx@today@year@{1988}%
+    平成\pltx@today@year@{1988}%
   \else
-令和\pltx@today@year@{2018}%
+    令和\pltx@today@year@{2018}%
   \fi\fi}
 \def\today{{%
   \if西暦
     \ifnum\ltjgetparameter{direction}=3 \kansuji\year
-\else\number\year\nobreak\fi 年
+    \else\number\year\nobreak\fi 年
   \else
-\pltx@today@year
+    \pltx@today@year
   \fi
   \ifnum\ltjgetparameter{direction}=3
-\kansuji\month 月
+    \kansuji\month 月
     \kansuji\day 日
   \else
     \number\month\nobreak 月

diff --git a/src/ltjbk10.clo b/src/ltjbk10.clo
index 29093f3..18d5961 100644 (file)
--- a/src/ltjbk10.clo
+++ b/src/ltjbk10.clo
@@ -21,9 +21,10 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% File: ltjclasses.dtx
+
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjbk10.clo}
-  [2018/10/08 v1.8-ltj-16
+  [2019/04/06 v1.8b-ltj-16
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xpt{15}%

diff --git a/src/ltjbk11.clo b/src/ltjbk11.clo
index b0f792e..8265b54 100644 (file)
--- a/src/ltjbk11.clo
+++ b/src/ltjbk11.clo
@@ -21,9 +21,10 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% File: ltjclasses.dtx
+
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjbk11.clo}
-  [2018/10/08 v1.8-ltj-16
+  [2019/04/06 v1.8b-ltj-16
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xipt{15.5}%

diff --git a/src/ltjbk12.clo b/src/ltjbk12.clo
index 42073da..ae7da1c 100644 (file)
--- a/src/ltjbk12.clo
+++ b/src/ltjbk12.clo
@@ -21,9 +21,10 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% File: ltjclasses.dtx
+
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjbk12.clo}
-  [2018/10/08 v1.8-ltj-16
+  [2019/04/06 v1.8b-ltj-16
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xiipt{16.5}%

diff --git a/src/ltjbook.cls b/src/ltjbook.cls
index 319f6d2..6ad203f 100644 (file)
--- a/src/ltjbook.cls
+++ b/src/ltjbook.cls
@@ -21,9 +21,10 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% File: ltjclasses.dtx
+
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjbook}
-  [2018/10/08 v1.8-ltj-16
+  [2019/04/06 v1.8b-ltj-16
  Standard LuaLaTeX-ja class]
 \RequirePackage{luatexja}
 \newcounter{@paper}
@@ -777,7 +778,7 @@
 \def\addcontentsline#1#2#3{%
   \protected@write\@auxout
     {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble
-\@temptokena{\thepage}}%
+     \@temptokena{\thepage}}%
     {\string\@writefile{#1}%
        {\protect\contentsline{#2}{#3}{\the\@temptokena}%
 \protected@file@percent}}%
@@ -887,29 +888,33 @@
 \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
+    \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}%
+    昭和\pltx@today@year@{1925}%
   \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
-平成\pltx@today@year@{1988}%
+    平成\pltx@today@year@{1988}%
   \else
-令和\pltx@today@year@{2018}%
+    令和\pltx@today@year@{2018}%
   \fi\fi}
 \def\today{{%
   \if西暦
     \ifnum\ltjgetparameter{direction}=3 \kansuji\year
-\else\number\year\nobreak\fi 年
+    \else\number\year\nobreak\fi 年
   \else
-\pltx@today@year
+    \pltx@today@year
   \fi
   \ifnum\ltjgetparameter{direction}=3
-\kansuji\month 月
+    \kansuji\month 月
     \kansuji\day 日
   \else
     \number\month\nobreak 月

diff --git a/src/ltjclasses.dtx b/src/ltjclasses.dtx
index 13e1ca0..c6f39b7 100644 (file)
--- a/src/ltjclasses.dtx
+++ b/src/ltjclasses.dtx
@@ -117,7 +117,10 @@
 % \changes{v1.7h}{2018/02/04}{和文スケール値\cs{Cjascale}を定義}
 % \changes{v1.8}{2018/07/03}{\cs{today}のデフォルトを和暦から西暦に変更}
 % \changes{v1.8-ltj-16}{2018/10/08}{Lua\TeX-jaが|disablejfam|オプションをサポートしたことによる変更}
-% \changes{v1.8-ltj-17}{2019/04/01}{新元号の処理}
+% \changes{v1.8a}{2018/10/25}{ファイル書き出し時の行末文字対策
+%    (sync with ltsect.dtx 2018/09/26 v1.1c)}
+% \changes{v1.8b}{2019/04/02}{新元号対応}
+
 % \fi
 %
 % \iffalse
@@ -147,7 +150,7 @@
 %<11pt&bk>\ProvidesFile{ltjtbk11.clo}
 %<12pt&bk>\ProvidesFile{ltjtbk12.clo}
 %</tate>
-  [2018/10/08 v1.8-ltj-16
+  [2019/04/06 v1.8b-ltj-16
 %<article|report|book> Standard LuaLaTeX-ja class]
 %<10pt|11pt|12pt>  Standard LuaLaTeX-ja file (size option)]
 %<*driver>
@@ -163,6 +166,7 @@
 \else
   \usepackage[kozuka-pr6n,nfssonly]{luatexja-preset}
 \fi
+\def\pLaTeX{p\kern-.05em\LaTeX}
 \usepackage[unicode]{hyperref}
 \title{Lua\LaTeX-ja用\texttt{jclasses}互換クラス}
 \author{Lua\TeX-jaプロジェクト}
@@ -4076,13 +4080,15 @@
 % ^^A このコマンドによる影響はありません。
 %
 % このマクロは\file{ltsect.dtx}で定義されています。
+% \changes{v1.8a}{2018/10/25}{ファイル書き出し時の行末文字対策
+%    (sync with ltsect.dtx 2018/09/26 v1.1c)}
 %    \begin{macrocode}
 \providecommand*\protected@file@percent{}
 \def\addcontentsline#1#2#3{%
   \protected@write\@auxout
     {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble
-%<tate>\@temptokena{\rensuji{\thepage}}}%
-%<yoko>\@temptokena{\thepage}}%
+%<tate>     \@temptokena{\rensuji{\thepage}}}%
+%<yoko>     \@temptokena{\thepage}}%
     {\string\@writefile{#1}%
        {\protect\contentsline{#2}{#3}{\the\@temptokena}%
                \protected@file@percent}}%
@@ -4472,36 +4478,53 @@
 % \end{macro}
 % \EnableCrossrefs
 %
-% \changes{v1.8-ltj-17} |\heisei|は削除．
+% \begin{macro}{\heisei}
+% \changes{v1.1m}{1998/04/07}{\cs{today}の計算手順を変更}
+% \changes{v1.8b}{2019/04/02}{\cs{heisei}の値は$\mbox{西暦}-1988$で固定}
+% |\today|コマンドを|\rightmark|で指定したとき、|\rightmark|を出力する部分
+% で和暦のための計算ができないので、クラスファイルを読み込む時点で計算して
+% おきます。
+%    \begin{macrocode}
+\newcount\heisei \heisei\year \advance\heisei-1988\relax
+%    \end{macrocode}
+% \end{macro}
+%
 % \begin{macro}{\today}
+% \begin{macro}{\pltx@today@year}
 % 縦組の場合は、漢数字で出力します。
+% \pLaTeX\ 2018-12-01以前では縦数式ディレクション時でも漢数字で出力していましたが、
+% \pLaTeX\ 2019-04-06以降からはそうしなくなりました。
 %
 % \changes{v1.6-ltj-9}{2015/01/01}{縦組では，この漢数字による日付出力でエラーになりました．
 % Lua\TeX-ja では，\cs{kansuji}の後に\cs{number}を続けることは出来ないので\cs{number}を削除しました．}
+% \changes{v1.8b}{2019/04/02}{\cs{today}の計算・出力方法を変更。}
 %    \begin{macrocode}
 \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
+    \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}%
+    昭和\pltx@today@year@{1925}%
   \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
-       平成\pltx@today@year@{1988}%
+    平成\pltx@today@year@{1988}%
   \else 
-       令和\pltx@today@year@{2018}%
+    令和\pltx@today@year@{2018}%
   \fi\fi}
 \def\today{{%
   \if西暦
     \ifnum\ltjgetparameter{direction}=3 \kansuji\year
-       \else\number\year\nobreak\fi 年
+    \else\number\year\nobreak\fi 年
   \else
-       \pltx@today@year
+    \pltx@today@year
   \fi
   \ifnum\ltjgetparameter{direction}=3
-       \kansuji\month 月
+    \kansuji\month 月
     \kansuji\day 日
   \else
     \number\month\nobreak 月
@@ -4509,6 +4532,7 @@
   \fi}}
 %    \end{macrocode}
 % \end{macro}
+% \end{macro}
 %
 %
 %

diff --git a/src/ltjreport.cls b/src/ltjreport.cls
index 6cefd58..d87b35e 100644 (file)
--- a/src/ltjreport.cls
+++ b/src/ltjreport.cls
@@ -21,9 +21,10 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% File: ltjclasses.dtx
+
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjreport}
-  [2018/10/08 v1.8-ltj-16
+  [2019/04/06 v1.8b-ltj-16
  Standard LuaLaTeX-ja class]
 \RequirePackage{luatexja}
 \newcounter{@paper}
@@ -773,7 +774,7 @@
 \def\addcontentsline#1#2#3{%
   \protected@write\@auxout
     {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble
-\@temptokena{\thepage}}%
+     \@temptokena{\thepage}}%
     {\string\@writefile{#1}%
        {\protect\contentsline{#2}{#3}{\the\@temptokena}%
 \protected@file@percent}}%
@@ -883,29 +884,33 @@
 \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
+    \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}%
+    昭和\pltx@today@year@{1925}%
   \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
-平成\pltx@today@year@{1988}%
+    平成\pltx@today@year@{1988}%
   \else
-令和\pltx@today@year@{2018}%
+    令和\pltx@today@year@{2018}%
   \fi\fi}
 \def\today{{%
   \if西暦
     \ifnum\ltjgetparameter{direction}=3 \kansuji\year
-\else\number\year\nobreak\fi 年
+    \else\number\year\nobreak\fi 年
   \else
-\pltx@today@year
+    \pltx@today@year
   \fi
   \ifnum\ltjgetparameter{direction}=3
-\kansuji\month 月
+    \kansuji\month 月
     \kansuji\day 日
   \else
     \number\month\nobreak 月

diff --git a/src/ltjsarticle.cls b/src/ltjsarticle.cls
index f51d521..7b015de 100644 (file)
--- a/src/ltjsarticle.cls
+++ b/src/ltjsarticle.cls
@@ -38,7 +38,7 @@
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjsarticle}
-  [2018/10/08 ltjsclasses ]
+  [2019/04/06 ltjsclasses ]
 \def\jsc@clsname{ltjsarticle}
 \def\Cjascale{0.924715}
 \RequirePackage{luatexja}
@@ -1621,23 +1621,26 @@ 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
+    \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}%
+    昭和\pltx@today@year@{1925}%
   \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
-平成\pltx@today@year@{1988}%
+    平成\pltx@today@year@{1988}%
   \else
-令和\pltx@today@year@{2018}%
+    令和\pltx@today@year@{2018}%
   \fi\fi}
 \def\today{%
   \if@english
@@ -1647,12 +1650,12 @@ class has defined the old font commands like\MessageBreak
       \space\number\day, \number\year
   \else\if西暦
     \ifnum\ltjgetparameter{direction}=3 \kansuji\year
-\else\number\year\nobreak\fi 年
+    \else\number\year\nobreak\fi 年
   \else
-\pltx@today@year
+    \pltx@today@year
   \fi
   \ifnum\ltjgetparameter{direction}=3
-\kansuji\month 月
+    \kansuji\month 月
     \kansuji\day 日
   \else
     \number\month\nobreak 月

diff --git a/src/ltjsbook.cls b/src/ltjsbook.cls
index e0e418d..162b236 100644 (file)
--- a/src/ltjsbook.cls
+++ b/src/ltjsbook.cls
@@ -38,7 +38,7 @@
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjsbook}
-  [2018/10/08 ltjsclasses ]
+  [2019/04/06 ltjsclasses ]
 \def\jsc@clsname{ltjsbook}
 \def\Cjascale{0.924715}
 \RequirePackage{luatexja}
@@ -1715,23 +1715,26 @@ 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
+    \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}%
+    昭和\pltx@today@year@{1925}%
   \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
-平成\pltx@today@year@{1988}%
+    平成\pltx@today@year@{1988}%
   \else
-令和\pltx@today@year@{2018}%
+    令和\pltx@today@year@{2018}%
   \fi\fi}
 \def\today{%
   \if@english
@@ -1741,12 +1744,12 @@ class has defined the old font commands like\MessageBreak
       \space\number\day, \number\year
   \else\if西暦
     \ifnum\ltjgetparameter{direction}=3 \kansuji\year
-\else\number\year\nobreak\fi 年
+    \else\number\year\nobreak\fi 年
   \else
-\pltx@today@year
+    \pltx@today@year
   \fi
   \ifnum\ltjgetparameter{direction}=3
-\kansuji\month 月
+    \kansuji\month 月
     \kansuji\day 日
   \else
     \number\month\nobreak 月

diff --git a/src/ltjsclasses.dtx b/src/ltjsclasses.dtx
index 2c2cb2a..b816ad5 100644 (file)
--- a/src/ltjsclasses.dtx
+++ b/src/ltjsclasses.dtx
@@ -44,7 +44,7 @@
 %<*driver>
 \ProvidesFile{ltjsclasses.dtx}
 %</driver>
-  [2018/10/08 ltjsclasses ]
+  [2019/04/06 ltjsclasses ]
 %<*driver>
 \IfFileExists{luatex85.sty}{\RequirePackage{luatex85}}{}
 \documentclass[disablejfam]{ltjsarticle}
@@ -5600,29 +5600,36 @@
 % \paragraph{今日の日付}
 %
 % \LaTeX で処理した日付を出力します。
-%% |ltjarticle| などと違って，標準を西暦にし，余分な空白が入らないように改良しました。
+% ^^A |jarticle| などと違って，標準を西暦にし，
+% ^^A 余分な空白が入らないように改良しました。
+% ^^A -- 2018年7月以降は |jarticle| なども標準が西暦，
+% ^^A -- 2019年4月以降は余分な空白が入らなくなっています。
 % 和暦にするには |\和暦| と書いてください。
-%
-% [2019-04-01 LTJ] |ltjclasses|と同様の処理．
+% ちなみにこの文章の作成日は西暦では{\西暦\today}で，
+% 和暦では{\和暦\today}です。
 %
 % \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
+    \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}%
+    昭和\pltx@today@year@{1925}%
   \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
-       平成\pltx@today@year@{1988}%
-  \else 
-       令和\pltx@today@year@{2018}%
+    平成\pltx@today@year@{1988}%
+  \else
+    令和\pltx@today@year@{2018}%
   \fi\fi}
 \def\today{%
   \if@english
@@ -5632,12 +5639,12 @@
       \space\number\day, \number\year
   \else\if西暦
     \ifnum\ltjgetparameter{direction}=3 \kansuji\year
-       \else\number\year\nobreak\fi 年
+    \else\number\year\nobreak\fi 年
   \else
-       \pltx@today@year
+    \pltx@today@year
   \fi
   \ifnum\ltjgetparameter{direction}=3
-       \kansuji\month 月
+    \kansuji\month 月
     \kansuji\day 日
   \else
     \number\month\nobreak 月

diff --git a/src/ltjsize10.clo b/src/ltjsize10.clo
index 2c44545..0fd6055 100644 (file)
--- a/src/ltjsize10.clo
+++ b/src/ltjsize10.clo
@@ -21,9 +21,10 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% File: ltjclasses.dtx
+
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjsize10.clo}
-  [2018/10/08 v1.8-ltj-16
+  [2019/04/06 v1.8b-ltj-16
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xpt{15}%

diff --git a/src/ltjsize11.clo b/src/ltjsize11.clo
index 983f9ba..d2445e4 100644 (file)
--- a/src/ltjsize11.clo
+++ b/src/ltjsize11.clo
@@ -21,9 +21,10 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% File: ltjclasses.dtx
+
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjsize11.clo}
-  [2018/10/08 v1.8-ltj-16
+  [2019/04/06 v1.8b-ltj-16
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xipt{15.5}%

diff --git a/src/ltjsize12.clo b/src/ltjsize12.clo
index efd3aec..c8e3ca6 100644 (file)
--- a/src/ltjsize12.clo
+++ b/src/ltjsize12.clo
@@ -21,9 +21,10 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% File: ltjclasses.dtx
+
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjsize12.clo}
-  [2018/10/08 v1.8-ltj-16
+  [2019/04/06 v1.8b-ltj-16
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xiipt{16.5}%

diff --git a/src/ltjskiyou.cls b/src/ltjskiyou.cls
index 2b360a0..3bb3ae0 100644 (file)
--- a/src/ltjskiyou.cls
+++ b/src/ltjskiyou.cls
@@ -38,7 +38,7 @@
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjskiyou}
-  [2018/10/08 ltjsclasses ]
+  [2019/04/06 ltjsclasses ]
 \def\jsc@clsname{ltjskiyou}
 \def\Cjascale{0.924715}
 \RequirePackage{luatexja}
@@ -1586,23 +1586,26 @@ 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
+    \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}%
+    昭和\pltx@today@year@{1925}%
   \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
-平成\pltx@today@year@{1988}%
+    平成\pltx@today@year@{1988}%
   \else
-令和\pltx@today@year@{2018}%
+    令和\pltx@today@year@{2018}%
   \fi\fi}
 \def\today{%
   \if@english
@@ -1612,12 +1615,12 @@ class has defined the old font commands like\MessageBreak
       \space\number\day, \number\year
   \else\if西暦
     \ifnum\ltjgetparameter{direction}=3 \kansuji\year
-\else\number\year\nobreak\fi 年
+    \else\number\year\nobreak\fi 年
   \else
-\pltx@today@year
+    \pltx@today@year
   \fi
   \ifnum\ltjgetparameter{direction}=3
-\kansuji\month 月
+    \kansuji\month 月
     \kansuji\day 日
   \else
     \number\month\nobreak 月

diff --git a/src/ltjspf.cls b/src/ltjspf.cls
index 9cd5170..3e7b5d2 100644 (file)
--- a/src/ltjspf.cls
+++ b/src/ltjspf.cls
@@ -38,7 +38,7 @@
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjspf}
-  [2018/10/08 ltjsclasses ]
+  [2019/04/06 ltjsclasses ]
 \def\jsc@clsname{ltjspf}
 \def\Cjascale{0.903375}
 \RequirePackage{luatexja}
@@ -1480,23 +1480,26 @@ 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
+    \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}%
+    昭和\pltx@today@year@{1925}%
   \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
-平成\pltx@today@year@{1988}%
+    平成\pltx@today@year@{1988}%
   \else
-令和\pltx@today@year@{2018}%
+    令和\pltx@today@year@{2018}%
   \fi\fi}
 \def\today{%
   \if@english
@@ -1506,12 +1509,12 @@ class has defined the old font commands like\MessageBreak
       \space\number\day, \number\year
   \else\if西暦
     \ifnum\ltjgetparameter{direction}=3 \kansuji\year
-\else\number\year\nobreak\fi 年
+    \else\number\year\nobreak\fi 年
   \else
-\pltx@today@year
+    \pltx@today@year
   \fi
   \ifnum\ltjgetparameter{direction}=3
-\kansuji\month 月
+    \kansuji\month 月
     \kansuji\day 日
   \else
     \number\month\nobreak 月

diff --git a/src/ltjsreport.cls b/src/ltjsreport.cls
index a610de5..f28caeb 100644 (file)
--- a/src/ltjsreport.cls
+++ b/src/ltjsreport.cls
@@ -38,7 +38,7 @@
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjsreport}
-  [2018/10/08 ltjsclasses ]
+  [2019/04/06 ltjsclasses ]
 \def\jsc@clsname{ltjsreport}
 \def\Cjascale{0.924715}
 \RequirePackage{luatexja}
@@ -1709,23 +1709,26 @@ 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
+    \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}%
+    昭和\pltx@today@year@{1925}%
   \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
-平成\pltx@today@year@{1988}%
+    平成\pltx@today@year@{1988}%
   \else
-令和\pltx@today@year@{2018}%
+    令和\pltx@today@year@{2018}%
   \fi\fi}
 \def\today{%
   \if@english
@@ -1735,12 +1738,12 @@ class has defined the old font commands like\MessageBreak
       \space\number\day, \number\year
   \else\if西暦
     \ifnum\ltjgetparameter{direction}=3 \kansuji\year
-\else\number\year\nobreak\fi 年
+    \else\number\year\nobreak\fi 年
   \else
-\pltx@today@year
+    \pltx@today@year
   \fi
   \ifnum\ltjgetparameter{direction}=3
-\kansuji\month 月
+    \kansuji\month 月
     \kansuji\day 日
   \else
     \number\month\nobreak 月

diff --git a/src/ltjtarticle.cls b/src/ltjtarticle.cls
index 9b95029..6c8e4fd 100644 (file)
--- a/src/ltjtarticle.cls
+++ b/src/ltjtarticle.cls
@@ -21,9 +21,10 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% File: ltjclasses.dtx
+
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjtarticle}
-  [2018/10/08 v1.8-ltj-16
+  [2019/04/06 v1.8b-ltj-16
  Standard LuaLaTeX-ja class]
 \RequirePackage{luatexja}
 \newcounter{@paper}
@@ -699,7 +700,7 @@
 \def\addcontentsline#1#2#3{%
   \protected@write\@auxout
     {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble
-\@temptokena{\rensuji{\thepage}}}%
+     \@temptokena{\rensuji{\thepage}}}%
     {\string\@writefile{#1}%
        {\protect\contentsline{#2}{#3}{\the\@temptokena}%
 \protected@file@percent}}%
@@ -799,29 +800,33 @@
 \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
+    \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}%
+    昭和\pltx@today@year@{1925}%
   \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
-平成\pltx@today@year@{1988}%
+    平成\pltx@today@year@{1988}%
   \else
-令和\pltx@today@year@{2018}%
+    令和\pltx@today@year@{2018}%
   \fi\fi}
 \def\today{{%
   \if西暦
     \ifnum\ltjgetparameter{direction}=3 \kansuji\year
-\else\number\year\nobreak\fi 年
+    \else\number\year\nobreak\fi 年
   \else
-\pltx@today@year
+    \pltx@today@year
   \fi
   \ifnum\ltjgetparameter{direction}=3
-\kansuji\month 月
+    \kansuji\month 月
     \kansuji\day 日
   \else
     \number\month\nobreak 月

diff --git a/src/ltjtbk10.clo b/src/ltjtbk10.clo
index 496dae2..61825f2 100644 (file)
--- a/src/ltjtbk10.clo
+++ b/src/ltjtbk10.clo
@@ -21,9 +21,10 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% File: ltjclasses.dtx
+
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjtbk10.clo}
-  [2018/10/08 v1.8-ltj-16
+  [2019/04/06 v1.8b-ltj-16
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xpt{17}%

diff --git a/src/ltjtbk11.clo b/src/ltjtbk11.clo
index a8428e3..1db86d1 100644 (file)
--- a/src/ltjtbk11.clo
+++ b/src/ltjtbk11.clo
@@ -21,9 +21,10 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% File: ltjclasses.dtx
+
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjtbk11.clo}
-  [2018/10/08 v1.8-ltj-16
+  [2019/04/06 v1.8b-ltj-16
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xipt{17}%

diff --git a/src/ltjtbk12.clo b/src/ltjtbk12.clo
index c7d5f89..72f2116 100644 (file)
--- a/src/ltjtbk12.clo
+++ b/src/ltjtbk12.clo
@@ -21,9 +21,10 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% File: ltjclasses.dtx
+
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjtbk12.clo}
-  [2018/10/08 v1.8-ltj-16
+  [2019/04/06 v1.8b-ltj-16
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xiipt{18}%

diff --git a/src/ltjtbook.cls b/src/ltjtbook.cls
index d262826..9815703 100644 (file)
--- a/src/ltjtbook.cls
+++ b/src/ltjtbook.cls
@@ -21,9 +21,10 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% File: ltjclasses.dtx
+
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjtbook}
-  [2018/10/08 v1.8-ltj-16
+  [2019/04/06 v1.8b-ltj-16
  Standard LuaLaTeX-ja class]
 \RequirePackage{luatexja}
 \newcounter{@paper}
@@ -792,7 +793,7 @@
 \def\addcontentsline#1#2#3{%
   \protected@write\@auxout
     {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble
-\@temptokena{\rensuji{\thepage}}}%
+     \@temptokena{\rensuji{\thepage}}}%
     {\string\@writefile{#1}%
        {\protect\contentsline{#2}{#3}{\the\@temptokena}%
 \protected@file@percent}}%
@@ -902,29 +903,33 @@
 \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
+    \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}%
+    昭和\pltx@today@year@{1925}%
   \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
-平成\pltx@today@year@{1988}%
+    平成\pltx@today@year@{1988}%
   \else
-令和\pltx@today@year@{2018}%
+    令和\pltx@today@year@{2018}%
   \fi\fi}
 \def\today{{%
   \if西暦
     \ifnum\ltjgetparameter{direction}=3 \kansuji\year
-\else\number\year\nobreak\fi 年
+    \else\number\year\nobreak\fi 年
   \else
-\pltx@today@year
+    \pltx@today@year
   \fi
   \ifnum\ltjgetparameter{direction}=3
-\kansuji\month 月
+    \kansuji\month 月
     \kansuji\day 日
   \else
     \number\month\nobreak 月

diff --git a/src/ltjtreport.cls b/src/ltjtreport.cls
index b49a2d3..447ee9e 100644 (file)
--- a/src/ltjtreport.cls
+++ b/src/ltjtreport.cls
@@ -21,9 +21,10 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% File: ltjclasses.dtx
+
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjtreport}
-  [2018/10/08 v1.8-ltj-16
+  [2019/04/06 v1.8b-ltj-16
  Standard LuaLaTeX-ja class]
 \RequirePackage{luatexja}
 \newcounter{@paper}
@@ -788,7 +789,7 @@
 \def\addcontentsline#1#2#3{%
   \protected@write\@auxout
     {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble
-\@temptokena{\rensuji{\thepage}}}%
+     \@temptokena{\rensuji{\thepage}}}%
     {\string\@writefile{#1}%
        {\protect\contentsline{#2}{#3}{\the\@temptokena}%
 \protected@file@percent}}%
@@ -898,29 +899,33 @@
 \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
+    \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}%
+    昭和\pltx@today@year@{1925}%
   \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
-平成\pltx@today@year@{1988}%
+    平成\pltx@today@year@{1988}%
   \else
-令和\pltx@today@year@{2018}%
+    令和\pltx@today@year@{2018}%
   \fi\fi}
 \def\today{{%
   \if西暦
     \ifnum\ltjgetparameter{direction}=3 \kansuji\year
-\else\number\year\nobreak\fi 年
+    \else\number\year\nobreak\fi 年
   \else
-\pltx@today@year
+    \pltx@today@year
   \fi
   \ifnum\ltjgetparameter{direction}=3
-\kansuji\month 月
+    \kansuji\month 月
     \kansuji\day 日
   \else
     \number\month\nobreak 月

diff --git a/src/ltjtsize10.clo b/src/ltjtsize10.clo
index 834522e..6fe390a 100644 (file)
--- a/src/ltjtsize10.clo
+++ b/src/ltjtsize10.clo
@@ -21,9 +21,10 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% File: ltjclasses.dtx
+
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjtsize10.clo}
-  [2018/10/08 v1.8-ltj-16
+  [2019/04/06 v1.8b-ltj-16
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xpt{17}%

diff --git a/src/ltjtsize11.clo b/src/ltjtsize11.clo
index 6afec3c..0268322 100644 (file)
--- a/src/ltjtsize11.clo
+++ b/src/ltjtsize11.clo
@@ -21,9 +21,10 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% File: ltjclasses.dtx
+
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjtsize11.clo}
-  [2018/10/08 v1.8-ltj-16
+  [2019/04/06 v1.8b-ltj-16
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xipt{17}%

diff --git a/src/ltjtsize12.clo b/src/ltjtsize12.clo
index fc7ab29..5f5d5ec 100644 (file)
--- a/src/ltjtsize12.clo
+++ b/src/ltjtsize12.clo
@@ -21,9 +21,10 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% File: ltjclasses.dtx
+
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjtsize12.clo}
-  [2018/10/08 v1.8-ltj-16
+  [2019/04/06 v1.8b-ltj-16
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xiipt{18}%