Sync with platex/ef7eb212

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

diff --git a/src/ltjtbook.cls b/src/ltjtbook.cls
index 1ffa36f..5c81f3d 100644 (file)
--- a/src/ltjtbook.cls
+++ b/src/ltjtbook.cls
@@ -21,10 +21,9 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% File: ltjclasses.dtx
-
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjtbook}
-  [2019/04/06 v1.8b-ltj-16
+  [2020-09-30 v1.8f-ltj-20
  Standard LuaLaTeX-ja class]
 \RequirePackage{luatexja}
 \newcounter{@paper}
@@ -106,17 +105,6 @@
 \DeclareOption{tate}{%
   \tate\AtBeginDocument{\message{《縦組モード》}\adjustbaseline}%
 }
-\AtEndOfPackageFile{everyshi}{%
-  \def\@EveryShipout@Output{%
-    \setbox8\vbox{%
-      \yoko
-      \@EveryShipout@Hook
-      \@EveryShipout@AtNextHook
-      \global\setbox\luatexoutputbox=\box\luatexoutputbox
-    }%
-    \gdef\@EveryShipout@AtNextHook{}%
-    \@EveryShipout@Org@Shipout\box\luatexoutputbox
-  }}
 \DeclareOption{oneside}{\@twosidefalse}
 \DeclareOption{twoside}{\@twosidetrue}
 \DeclareOption{onecolumn}{\@twocolumnfalse}
@@ -148,6 +136,12 @@
 \fi
 \DeclareOption{draft}{\setlength\overfullrule{5pt}}
 \DeclareOption{final}{\setlength\overfullrule{0pt}}
+\newif\ifptexmin
+\DeclareOption{ptexmin}{\ptexmintrue}%
+\DeclareOption{disablejfam}{}
+\ExecuteOptions{a4paper,10pt,twoside,onecolumn,final,openright,tate}
+\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)}
@@ -157,10 +151,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')}
-\DeclareOption{disablejfam}{}
-\ExecuteOptions{a4paper,10pt,twoside,onecolumn,final,openright,tate}
-\ProcessOptions\relax
+\fi
 \input{ltjtbk1\@ptsize.clo}
+
 \RequirePackage{lltjext}
 \def\Cjascale{0.962216}
 \if@stysize
@@ -635,16 +628,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
@@ -794,9 +788,9 @@
 \def\addcontentsline#1#2#3{%
   \protected@write\@auxout
     {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble
-     \@temptokena{\rensuji{\thepage}}}%
-    {\string\@writefile{#1}%
-       {\protect\contentsline{#2}{#3}{\the\@temptokena}%
+     \@temptokena{\rensuji{\thepage}}%
+    }{\string\@writefile{#1}%
+       {\protect\contentsline{#2}{#3}{\the\@temptokena}{}%
 \protected@file@percent}}%
 }
 \newcommand{\tableofcontents}{%
@@ -961,8 +955,10 @@
 \fi
 \normalmarginpar
 \@mparswitchfalse
-\AtBeginOfPackageFile*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext}
-\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext}
+%% この節のコードは|filehook|パッケージ（Lua\TeX-ja読み込み時に自動でロードされます）
+%% の機能を用いています。
+\ltj@ExecuteBeforePackage*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext}
+\ltj@ExecuteAfterPackage*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext}
 \endinput
 %%
 %% End of file `ltjtbook.cls'.