X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fltjbook.cls;h=02a58a4699fd45b22b773ec88d9143eab8c792e4;hb=fcfc3e15900ed56d46784a5f5e87e5330788ad0d;hp=56658e7d4a90f21be59c0646e4acc77df982246f;hpb=67d3d7373e6d45a8d3d1b483f8f846660a3b7e02;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltjbook.cls b/src/ltjbook.cls
index 56658e7..02a58a4 100644
--- a/src/ltjbook.cls
+++ b/src/ltjbook.cls
@@ -23,7 +23,7 @@
 %% File: ltjclasses.dtx
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjbook}
-  [2017/02/15 v1.7d-ltj-12
+  [2020/01/13 v1.8e-ltj-17
  Standard LuaLaTeX-ja class]
 \RequirePackage{luatexja}
 \newcounter{@paper}
@@ -91,8 +91,8 @@
   \tombowtrue \tombowdatetrue
   \setlength{\@tombowwidth}{.1\p@}%
   \@bannertoken{%
-     \jobname\space:\space\number\year/\number\month/\number\day
-      (\number\hour:\number\minute)}
+     \jobname\space(\number\year-\two@digits\month-\two@digits\day
+     \space\two@digits\hour:\two@digits\minute)}%
   \maketombowbox}
 \DeclareOption{tombo}{%
   \tombowtrue \tombowdatefalse
@@ -132,8 +132,6 @@
 \if@compatibility
   \@mathrmmctrue
 \else
-  \DeclareOption{disablejfam}{%
-    \ClassWarningNoLine{\@currname}{The class option 'disablejfam' is obsolete}}
   \DeclareOption{mathrmmc}{\@mathrmmctrue}
 \fi
 \DeclareOption{draft}{\setlength\overfullrule{5pt}}
@@ -147,9 +145,11 @@
 \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}
 \ProcessOptions\relax
 \input{ltjbk1\@ptsize.clo}
+\def\Cjascale{0.962216}
 \if@stysize
   \setlength\columnsep{2\Cwd}
 \else
@@ -198,28 +198,14 @@
 \renewcommand{\dbltopfraction}{.7}
 \renewcommand{\dblfloatpagefraction}{.5}
 \def\pltx@cleartorightpage{\clearpage\if@twoside
-  \ifodd\c@page
-    \iftdir
-      \hbox{}\thispagestyle{empty}\newpage
-      \if@twocolumn\hbox{}\newpage\fi
-    \fi
-  \else
-    \ifydir
-      \hbox{}\thispagestyle{empty}\newpage
-      \if@twocolumn\hbox{}\newpage\fi
-    \fi
+  \unless\ifodd\numexpr\c@page+\ltjgetparameter{direction}\relax
+    \hbox{}\thispagestyle{empty}\newpage
+    \if@twocolumn\hbox{}\newpage\fi
   \fi\fi}
 \def\pltx@cleartoleftpage{\clearpage\if@twoside
-  \ifodd\c@page
-    \ifydir
-      \hbox{}\thispagestyle{empty}\newpage
-      \if@twocolumn\hbox{}\newpage\fi
-    \fi
-  \else
-    \iftdir
-      \hbox{}\thispagestyle{empty}\newpage
-      \if@twocolumn\hbox{}\newpage\fi
-    \fi
+  \ifodd\numexpr\c@page+\ltjgetparameter{direction}\relax
+    \hbox{}\thispagestyle{empty}\newpage
+    \if@twocolumn\hbox{}\newpage\fi
   \fi\fi}
 \def\pltx@cleartooddpage{\clearpage\if@twoside
   \ifodd\c@page\else
@@ -261,9 +247,9 @@
     \let\@mkboth\markboth
   \def\chaptermark##1{\markboth{%
      \ifnum \c@secnumdepth >\m@ne
-         \if@mainmatter
+       \if@mainmatter
          \@chapapp\thechapter\@chappos\hskip1\zw
-         \fi
+       \fi
      \fi
      ##1}{}}%
   \def\sectionmark##1{\markright{%
@@ -277,9 +263,9 @@
     \let\@mkboth\markboth
 \def\chaptermark##1{\markright{%
    \ifnum \c@secnumdepth >\m@ne
-         \if@mainmatter
+     \if@mainmatter
        \@chapapp\thechapter\@chappos\hskip1\zw
-         \fi
+     \fi
    \fi
    ##1}}%
   }
@@ -293,9 +279,9 @@
   \let\@mkboth\markboth
 \def\chaptermark##1{\markboth{%
      \ifnum \c@secnumdepth >\m@ne
-         \if@mainmatter
+       \if@mainmatter
          \@chapapp\thechapter\@chappos\hskip1\zw
-         \fi
+       \fi
      \fi
      ##1}{}}%
   \def\sectionmark##1{\markright{%
@@ -309,9 +295,9 @@
     \let\@mkboth\markboth
   \def\chaptermark##1{\markright{%
      \ifnum \c@secnumdepth >\m@ne
-         \if@mainmatter
+       \if@mainmatter
          \@chapapp\thechapter\@chappos\hskip1\zw
-         \fi
+       \fi
      \fi
      ##1}}%
   }
@@ -327,7 +313,7 @@
 \if@compatibility
 \newenvironment{titlepage}
     {%
-      \cleardoublepage
+     \cleardoublepage
      \if@twocolumn\@restonecoltrue\onecolumn
      \else\@restonecolfalse\newpage\fi
      \thispagestyle{empty}%
@@ -335,7 +321,6 @@
     }%
     {\if@restonecol\twocolumn\else\newpage\fi
     }
-+% \changes{v1.7d}{2017/02/15}{bookクラスでtitlepageを必ず奇数ページ
 \else
 \newenvironment{titlepage}
     {%
@@ -462,12 +447,10 @@
 \newcommand{\@chapapp}{\prechaptername}
 \newcommand{\@chappos}{\postchaptername}
 \newcommand{\frontmatter}{%
-  \if@openleft \cleardoublepage \else
-  \if@openright \cleardoublepage \else \clearpage \fi \fi
+  \pltx@cleartooddpage
   \@mainmatterfalse\pagenumbering{roman}}
 \newcommand{\mainmatter}{%
-  \if@openleft \cleardoublepage \else
-  \if@openright \cleardoublepage \else \clearpage \fi \fi
+  \pltx@cleartooddpage
   \@mainmattertrue\pagenumbering{arabic}}
 \newcommand{\backmatter}{%
   \if@openleft \cleardoublepage \else
@@ -550,7 +533,6 @@
    \else
      #1\relax
    \fi}\nobreak\vskip3\Cvs}
- タイトルより高い位置に右カラムの始点が来るという挙動を維持してあります。
 \def\@schapter#1{%
   \@makeschapterhead{#1}\@afterheading
 }
@@ -637,16 +619,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
@@ -743,6 +726,7 @@
 \@addtoreset{equation}{chapter}
 \renewcommand{\theequation}{%
   \ifnum\c@chapter>\z@\thechapter.\fi \@arabic\c@equation}
+\unless\ifltj@disablejfam
 \if@compatibility\else
   \DeclareSymbolFont{mincho}{JY3}{mc}{m}{n}
   \DeclareSymbolFontAlphabet{\mathmc}{mincho}
@@ -756,6 +740,7 @@
   \reDeclareMathAlphabet{\mathbf}{\mathbf}{\mathgt}
 }%
 \fi
+\fi
 \DeclareOldFontCommand{\mc}{\normalfont\mcfamily}{\mathmc}
 \DeclareOldFontCommand{\gt}{\normalfont\gtfamily}{\mathgt}
 \DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm}
@@ -790,12 +775,14 @@
      \hb@xt@\@pnumwidth{\hss\normalfont \normalcolor #5}%
      \par}%
   \fi}
+\providecommand*\protected@file@percent{}
 \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}}}%
+       {\protect\contentsline{#2}{#3}{\the\@temptokena}%
+\protected@file@percent}}%
 }
 \newcommand{\tableofcontents}{%
   \if@twocolumn\@restonecoltrue\onecolumn
@@ -899,31 +886,40 @@
 \@addtoreset{footnote}{chapter}
 \newcommand\@makefntext[1]{\parindent 1em
   \noindent\hb@xt@ 1.8em{\hss\@makefnmark}#1}
-\newif\if西暦 \西暦false
+\newif\if西暦 \西暦true
 \def\西暦{\西暦true}
 \def\和暦{\西暦false}
 \newcount\heisei \heisei\year \advance\heisei-1988\relax
-\def\today{{%
-  \ifnum\ltjgetparameter{direction}=3
-    \if西暦
-      \kansuji\year å¹´
-      \kansuji\month 月
-      \kansuji\day 日
+\def\pltx@today@year@#1{%
+  \ifnum\numexpr\year-#1=1 元\else
+    \ifnum\ltjgetparameter{direction}=3
+      \kansuji\numexpr\year-#1\relax
     \else
-      平成\ifnum\heisei=1 元年\else\kansuji\heisei 年\fi
-      \kansuji\month 月
-      \kansuji\day 日
+      \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
-    \if西暦
-      \number\year~å¹´
-      \number\month~月
-      \number\day~日
-    \else
-      平成\ifnum\heisei=1 元年\else\number\heisei~年\fi
-      \number\month~月
-      \number\day~日
-    \fi
+    令和\pltx@today@year@{2018}%
+  \fi\fi}
+\def\today{{%
+  \if西暦
+    \ifnum\ltjgetparameter{direction}=3 \kansuji\year
+    \else\number\year\nobreak\fi å¹´
+  \else
+    \pltx@today@year
+  \fi
+  \ifnum\ltjgetparameter{direction}=3
+    \kansuji\month 月
+    \kansuji\day 日
+  \else
+    \number\month\nobreak 月
+    \number\day\nobreak 日
   \fi}}
 \newcommand{\prepartname}{第}
 \newcommand{\postpartname}{部}
@@ -940,6 +936,8 @@
 \pagestyle{headings}
 \pagenumbering{arabic}
 \raggedbottom
+\fnfixbottomtrue % 2017-02-19
+\IfFileExists{stfloats.sty}{\RequirePackage{stfloats}\fnbelowfloat}{}
 \if@twocolumn
   \twocolumn
   \sloppy
@@ -951,6 +949,8 @@
 \else
   \@mparswitchfalse
 \fi
+\AtBeginOfPackageFile*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext}
+\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext}
 \endinput
 %%
 %% End of file `ltjbook.cls'.