X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltjtarticle.cls;h=08db701933b98cb2cc8a0878685a51c6c80f6a78;hb=3fae82d64b193c794fdf2f1262d80bddc98ce5a8;hp=199131b88f486fa59d4f85b77b35716d36d1cf41;hpb=67d3d7373e6d45a8d3d1b483f8f846660a3b7e02;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltjtarticle.cls b/src/ltjtarticle.cls
index 199131b..08db701 100644
--- a/src/ltjtarticle.cls
+++ b/src/ltjtarticle.cls
@@ -23,7 +23,7 @@
 %% File: ltjclasses.dtx
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjtarticle}
-  [2017/02/15 v1.7d-ltj-12
+  [2018/10/08 v1.8-ltj-16
  Standard LuaLaTeX-ja class]
 \RequirePackage{luatexja}
 \newcounter{@paper}
@@ -88,8 +88,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
@@ -133,8 +133,6 @@
 \if@compatibility
   \@mathrmmctrue
 \else
-  \DeclareOption{disablejfam}{%
-    \ClassWarningNoLine{\@currname}{The class option 'disablejfam' is obsolete}}
   \DeclareOption{mathrmmc}{\@mathrmmctrue}
 \fi
 \DeclareOption{draft}{\setlength\overfullrule{5pt}}
@@ -152,6 +150,7 @@
 \ProcessOptions\relax
 \input{ltjtsize1\@ptsize.clo}
 \RequirePackage{lltjext}
+\def\Cjascale{0.962216}
 \if@stysize
   \setlength\columnsep{3\Cwd}
 \else
@@ -200,28 +199,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
@@ -315,7 +300,6 @@
     }%
     {\if@restonecol\twocolumn\else\newpage\fi
     }
-+% \changes{v1.7d}{2017/02/15}{bookクラスでtitlepageを必ず奇数ページ
 \else
 \newenvironment{titlepage}
     {%
@@ -662,6 +646,7 @@
 \setlength\fboxsep{3\p@}
 \setlength\fboxrule{.4\p@}
 \renewcommand{\theequation}{\@arabic\c@equation}
+\unless\ifltj@disablejfam
 \if@compatibility\else
   \DeclareSymbolFont{mincho}{JY3}{mc}{m}{n}
   \DeclareSymbolFontAlphabet{\mathmc}{mincho}
@@ -675,6 +660,7 @@
   \reDeclareMathAlphabet{\mathbf}{\mathbf}{\mathgt}
 }%
 \fi
+\fi
 \DeclareOldFontCommand{\mc}{\normalfont\mcfamily}{\mathmc}
 \DeclareOldFontCommand{\gt}{\normalfont\gtfamily}{\mathgt}
 \DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm}
@@ -709,12 +695,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{\rensuji{\thepage}}}%
     {\string\@writefile{#1}%
-       {\protect\contentsline{#2}{#3}{\the\@temptokena}}}%
+       {\protect\contentsline{#2}{#3}{\the\@temptokena}%
+\protected@file@percent}}%
 }
 \newcommand{\tableofcontents}{%
   \section*{\contentsname
@@ -808,7 +796,7 @@
   \kern2.6\p@}
 \newcommand\@makefntext[1]{\parindent 1\zw
   \noindent\hb@xt@ 2\zw{\hss\@makefnmark}#1}
-\newif\if西暦 \西暦false
+\newif\if西暦 \西暦true
 \def\西暦{\西暦true}
 \def\和暦{\西暦false}
 \newcount\heisei \heisei\year \advance\heisei-1988\relax
@@ -848,6 +836,8 @@
 \pagestyle{plain}
 \pagenumbering{arabic}
 \raggedbottom
+\fnfixbottomtrue % 2017-02-19
+\IfFileExists{stfloats.sty}{\RequirePackage{stfloats}\fnbelowfloat}{}
 \if@twocolumn
   \twocolumn
   \sloppy
@@ -856,6 +846,8 @@
 \fi
 \normalmarginpar
 \@mparswitchfalse
+\AtBeginOfPackageFile*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext}
+\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext}
 \endinput
 %%
 %% End of file `ltjtarticle.cls'.