ltjarticle.cle etc.: docstrip

[luatex-ja/luatexja.git] / src / ltjreport.cls

diff --git a/src/ltjreport.cls b/src/ltjreport.cls
index fda097c..95a1d1b 100644 (file)
--- a/src/ltjreport.cls
+++ b/src/ltjreport.cls
@@ -23,7 +23,7 @@
 %% File: ltjclasses.dtx
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjreport}
-  [2018/10/08 v1.8-ltj-16
+  [2021-12-22 v1.8f-ltj-21
  Standard LuaLaTeX-ja class]
 \RequirePackage{luatexja}
 \newcounter{@paper}
@@ -134,6 +134,12 @@
 \fi
 \DeclareOption{draft}{\setlength\overfullrule{5pt}}
 \DeclareOption{final}{\setlength\overfullrule{0pt}}
+\newif\ifptexmin
+\DeclareOption{ptexmin}{\ptexmintrue}%
+\DeclareOption{disablejfam}{}
+\ExecuteOptions{a4paper,10pt,oneside,onecolumn,final,openany}
+\ProcessOptions\relax
+\ifptexmin
 \directlua{luatexbase.add_to_callback('luatexja.load_jfm',
   function (ji, jn) ji.chars['parbdd'] = 0; return ji end,
   'ltj.jclasses_load_jfm', 1)}
@@ -143,9 +149,9 @@
 \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj@stdgtfont:jfm=min;jfmvar=goth}{}
 \ltjglobalsetparameter{differentjfm=both}
 \directlua{luatexbase.remove_from_callback('luatexja.load_jfm', 'ltj.jclasses_load_jfm')}
-\ExecuteOptions{a4paper,10pt,oneside,onecolumn,final,openany}
-\ProcessOptions\relax
+\fi
 \input{ltjsize1\@ptsize.clo}
+
 \def\Cjascale{0.962216}
 \if@stysize
   \setlength\columnsep{2\Cwd}
@@ -614,16 +620,17 @@
          \usecounter{\@enumctr}%
          \def\makelabel##1{\hss\llap{##1}}}%
    \fi}{\endlist}
-\newcommand{\labelitemi}{\textbullet}
+\newcommand{\labelitemi}{\labelitemfont \textbullet}
 \newcommand{\labelitemii}{%
   \ifnum\ltjgetparameter{direction}=3
-     {\textcircled{~}}
+     {\labelitemfont \textcircled{~}}
   \else
-     {\normalfont\bfseries\textendash}
+     {\labelitemfont \bfseries\textendash}
   \fi
 }
-\newcommand{\labelitemiii}{\textasteriskcentered}
-\newcommand{\labelitemiv}{\textperiodcentered}
+\newcommand{\labelitemiii}{\labelitemfont \textasteriskcentered}
+\newcommand{\labelitemiv}{\labelitemfont \textperiodcentered}
+\newcommand\labelitemfont{\normalfont}
 \renewenvironment{itemize}
   {\ifnum \@itemdepth >\thr@@\@toodeep\else
    \advance\@itemdepth\@ne
@@ -773,9 +780,9 @@
 \def\addcontentsline#1#2#3{%
   \protected@write\@auxout
     {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble
-\@temptokena{\thepage}}%
-    {\string\@writefile{#1}%
-       {\protect\contentsline{#2}{#3}{\the\@temptokena}%
+     \@temptokena{\thepage}%
+    }{\string\@writefile{#1}%
+       {\protect\contentsline{#2}{#3}{\the\@temptokena}{}%
 \protected@file@percent}}%
 }
 \newcommand{\tableofcontents}{%
@@ -883,32 +890,37 @@
 \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\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\fi 年
+    \ifnum\ltjgetparameter{direction}=3 \kansuji\year
+    \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~月
-    \number\day~日
+    \number\month\nobreak 月
+    \number\day\nobreak 日
   \fi}}
 \newcommand{\prepartname}{第}
 \newcommand{\postpartname}{部}
@@ -939,8 +951,8 @@
 \else
   \@mparswitchfalse
 \fi
-\AtBeginOfPackageFile*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext}
-\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext}
+\ltj@ExecuteBeforePackage*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext}
+\ltj@ExecuteAfterPackage*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext}
 \endinput
 %%
 %% End of file `ltjreport.cls'.