X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltjbook.cls;h=b3e5ea2ee6d4c5e9fb4bb50edda702cc89e58e01;hb=3fae82d64b193c794fdf2f1262d80bddc98ce5a8;hp=85e92e0d705ff91254a7b3e7d80fac4b64b0b29c;hpb=23d1df431c9a93f67237efea2a067439415d1861;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltjbook.cls b/src/ltjbook.cls
index 85e92e0..b3e5ea2 100644
--- a/src/ltjbook.cls
+++ b/src/ltjbook.cls
@@ -23,7 +23,7 @@
 %% File: ltjclasses.dtx
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjbook}
-  [2017/02/20 v1.7d-ltj-14
+  [2018/10/08 v1.8-ltj-16
  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}}
@@ -150,6 +148,7 @@
 \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,12 +197,12 @@
 \renewcommand{\dbltopfraction}{.7}
 \renewcommand{\dblfloatpagefraction}{.5}
 \def\pltx@cleartorightpage{\clearpage\if@twoside
-  \unless\ifodd\dimexpr\c@page+\ltjgetparameter{direction}\relax
+  \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\dimexpr\c@page+\ltjgetparameter{direction}\relax
+  \ifodd\numexpr\c@page+\ltjgetparameter{direction}\relax
     \hbox{}\thispagestyle{empty}\newpage
     \if@twocolumn\hbox{}\newpage\fi
   \fi\fi}
@@ -247,9 +246,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{%
@@ -263,9 +262,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}}%
   }
@@ -279,9 +278,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{%
@@ -295,9 +294,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}}%
   }
@@ -313,7 +312,7 @@
 \if@compatibility
 \newenvironment{titlepage}
     {%
-      \cleardoublepage
+     \cleardoublepage
      \if@twocolumn\@restonecoltrue\onecolumn
      \else\@restonecolfalse\newpage\fi
      \thispagestyle{empty}%
@@ -447,12 +446,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
@@ -727,6 +724,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}
@@ -740,6 +738,7 @@
   \reDeclareMathAlphabet{\mathbf}{\mathbf}{\mathgt}
 }%
 \fi
+\fi
 \DeclareOldFontCommand{\mc}{\normalfont\mcfamily}{\mathmc}
 \DeclareOldFontCommand{\gt}{\normalfont\gtfamily}{\mathgt}
 \DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm}
@@ -774,12 +773,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}}%
     {\string\@writefile{#1}%
-       {\protect\contentsline{#2}{#3}{\the\@temptokena}}}%
+       {\protect\contentsline{#2}{#3}{\the\@temptokena}%
+\protected@file@percent}}%
 }
 \newcommand{\tableofcontents}{%
   \if@twocolumn\@restonecoltrue\onecolumn
@@ -883,7 +884,7 @@
 \@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