X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltjarticle.cls;h=a90b1e2d89fea96fd7fa7ad7fbfb2f76a0bf1251;hb=eb118f3e5ea0852407b5261817700401699528b9;hp=4651167e24a45f2312b7c1516089d6f83ffb60b6;hpb=399f8c1571826b8aecd3b6b0ae6da62d6ab34212;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltjarticle.cls b/src/ltjarticle.cls
index 4651167..a90b1e2 100644
--- a/src/ltjarticle.cls
+++ b/src/ltjarticle.cls
@@ -39,7 +39,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjarticle}
-  [2015/01/01 v1.6-ltj-9
+  [2015/10/18 v1.6-ltj-10
  Standard LuaLaTeX-ja class]
 \RequirePackage{luatexja}
 \newcounter{@paper}
@@ -144,9 +144,6 @@
 \fi
 \DeclareOption{draft}{\setlength\overfullrule{5pt}}
 \DeclareOption{final}{\setlength\overfullrule{0pt}}
-\ExecuteOptions{a4paper,10pt,oneside,onecolumn,final}
-\ProcessOptions\relax
-\input{ltjsize1\@ptsize.clo}
 \directlua{luatexbase.add_to_callback('luatexja.load_jfm',
   function (ji, jn) ji.chars['parbdd'] = 0; return ji end,
   'ltj.jclasses_load_jfm', 1)}
@@ -156,6 +153,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')}
+\ExecuteOptions{a4paper,10pt,oneside,onecolumn,final}
+\ProcessOptions\relax
+\input{ltjsize1\@ptsize.clo}
 \if@stysize
   \setlength\columnsep{2\Cwd}
 \else
@@ -168,8 +168,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}{}