lltjdefs: include \jttdefault in \verbatim@font

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

diff --git a/src/ltjtreport.cls b/src/ltjtreport.cls
index 57be83f..312af11 100644 (file)
--- a/src/ltjtreport.cls
+++ b/src/ltjtreport.cls
@@ -39,10 +39,9 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjtreport}
-  [2014/11/15 v1.6-ltj-7
+  [2015/10/18 v1.6-ltj-10
  Standard LuaLaTeX-ja class]
 \RequirePackage{luatexja}
-\RequirePackage{filehook}
 \newcounter{@paper}
 \newif\if@landscape \@landscapefalse
 \newcommand{\@ptsize}{}
@@ -91,14 +90,6 @@
 \DeclareOption{b5p}{\setcounter{@paper}{4}\@stysizetrue
   \setlength\paperheight {257mm}
   \setlength\paperwidth  {182mm}}
-\AtEndOfPackageFile{geometry}{%
-  \setlength{\@tempdima}{\textheight}%
-  \setlength{\textheight}{\textwidth}%
-  \setlength{\textwidth}{\@tempdima}%
-  \expandafter\def\expandafter\Gm@process\expandafter{\Gm@process
-    \setlength{\@tempdima}{\textheight}%
-    \setlength{\textheight}{\textwidth}%
-    \setlength{\textwidth}{\@tempdima}}}
 \if@compatibility
   \renewcommand{\@ptsize}{0}
 \else
@@ -170,10 +161,6 @@
 \fi
 \DeclareOption{draft}{\setlength\overfullrule{5pt}}
 \DeclareOption{final}{\setlength\overfullrule{0pt}}
-\ExecuteOptions{a4paper,10pt,oneside,onecolumn,final,openany,tate}
-\ProcessOptions\relax
-\input{ltjtsize1\@ptsize.clo}
-\RequirePackage{lltjext}
 \directlua{luatexbase.add_to_callback('luatexja.load_jfm',
   function (ji, jn) ji.chars['parbdd'] = 0; return ji end,
   'ltj.jclasses_load_jfm', 1)}
@@ -183,6 +170,10 @@
 \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,tate}
+\ProcessOptions\relax
+\input{ltjtsize1\@ptsize.clo}
+\RequirePackage{lltjext}
 \if@stysize
   \setlength\columnsep{3\Cwd}
 \else
@@ -195,8 +186,13 @@
   \advance \@tempdima 2in
   \advance \@tempdimb 2in
 \fi
-\setlength{\pdfpagewidth}{\@tempdima}
-\setlength{\pdfpageheight}{\@tempdimb}
+\ifdefined\pdfpagewidth
+  \setlength{\pdfpagewidth}{\@tempdima}
+  \setlength{\pdfpageheight}{\@tempdimb}
+\else
+  \setlength{\pagewidth}{\@tempdima}
+  \setlength{\pageheight}{\@tempdimb}
+\fi
 \setlength\lineskip{1\p@}
 \setlength\normallineskip{1\p@}
 \renewcommand{\baselinestretch}{}
@@ -874,13 +870,13 @@
 \def\today{{%
   \ifnum\ltjgetparameter{direction}=3
     \if西暦
-      \kansuji\number\year 年
-      \kansuji\number\month 月
-      \kansuji\number\day 日
+      \kansuji\year 年
+      \kansuji\month 月
+      \kansuji\day 日
     \else
-      平成\ifnum\heisei=1 元年\else\kansuji\number\heisei 年\fi
-      \kansuji\number\month 月
-      \kansuji\number\day 日
+      平成\ifnum\heisei=1 元年\else\kansuji\heisei 年\fi
+      \kansuji\month 月
+      \kansuji\day 日
     \fi
   \else
     \if西暦