Resolved conflicts between 3a2e3a7 and 7c7fe5e.

[luatex-ja/luatexja.git] / src / ltjsclasses / ltjspf.cls

diff --git a/src/ltjsclasses/ltjspf.cls b/src/ltjsclasses/ltjspf.cls
index f5ebc0b..6fb9b51 100644 (file)
--- a/src/ltjsclasses/ltjspf.cls
+++ b/src/ltjsclasses/ltjspf.cls
@@ -209,14 +209,6 @@
   \setlength\paperheight{\paperwidth}
   \setlength\paperwidth {\@tempdima}
 \fi
-\setlength{\@tempdima}{\paperwidth}
-\setlength{\@tempdimb}{\paperheight}
-\iftombow
-  \advance \@tempdima 2in
-  \advance \@tempdimb 2in
-\fi
-\setlength{\pdfpagewidth}{\@tempdima}
-\setlength{\pdfpageheight}{\@tempdimb}
 \def\n@baseline{14.554375}
 \def\inv@mag{1}
 \ifnum\@ptsize=-2
@@ -279,6 +271,14 @@
 \fi
 \setlength\paperwidth{\inv@mag\paperwidth}%
 \setlength\paperheight{\inv@mag\paperheight}%
+\setlength{\@tempdima}{\paperwidth}
+\setlength{\@tempdimb}{\paperheight}
+\iftombow
+  \advance \@tempdima 2in
+  \advance \@tempdimb 2in
+\fi
+\setlength{\pdfpagewidth}{\@tempdima}
+\setlength{\pdfpageheight}{\@tempdimb}
 \ifmingoth
   \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.903375] psft:Ryumin-Light:jfm=min}{}
   \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.903375] psft:GothicBBB-Medium:jfm=min}{}
@@ -519,11 +519,7 @@
 \setlength{\oddsidemargin}{\paperwidth}
 \addtolength{\oddsidemargin}{-\fullwidth}
 \setlength{\oddsidemargin}{.5\oddsidemargin}
-\iftombow
-  \addtolength{\oddsidemargin}{-1in}
-\else
-  \addtolength{\oddsidemargin}{-\inv@mag in}
-\fi
+\addtolength{\oddsidemargin}{-1in}
 \setlength{\evensidemargin}{\oddsidemargin}
 \if@mparswitch
   \addtolength{\evensidemargin}{\fullwidth}
@@ -531,7 +527,7 @@
 \fi
 \setlength\marginparwidth{\paperwidth}
 \addtolength\marginparwidth{-\oddsidemargin}
-\addtolength\marginparwidth{-\inv@mag in}
+\addtolength\marginparwidth{-1in}
 \addtolength\marginparwidth{-\textwidth}
 \addtolength\marginparwidth{-1cm}
 \addtolength\marginparwidth{-\marginparsep}
@@ -548,11 +544,7 @@
 \addtolength\topmargin{-\headsep}
 \addtolength\topmargin{-\footskip}
 \setlength\topmargin{0.5\topmargin}
-\iftombow
-  \addtolength\topmargin{-1in}
-\else
-  \addtolength\topmargin{-\inv@mag in}
-\fi
+\addtolength\topmargin{-1in}
 {\footnotesize\global\setlength\footnotesep{\baselineskip}}
 \setlength\footnotesep{0.7\footnotesep}
 \setlength{\skip\footins}{16\p@ \@plus 5\p@ \@minus 2\p@}