リビジョン | eefcb4ebcd5c8290d8f23459194e35584b517258 (tree) |
---|---|
日時 | 2014-11-22 21:34:19 |
作者 | Kazuki Maeda <kmaeda@kmae...> |
コミッター | Kazuki Maeda |
lltjp-geometry.sty: modify \Gm@clean.
@@ -32,9 +32,9 @@ | ||
32 | 32 | \ifx\Gm@bmargin\@undefined\else\advance\@tempcnta1\relax\fi |
33 | 33 | \Gm@cnth\@tempcnta |
34 | 34 | \else |
35 | - \ifx\Gm@lmargin\@undefined\else\advance\@tempcnta4\relax\fi | |
35 | + \ifx\Gm@rmargin\@undefined\else\advance\@tempcnta4\relax\fi | |
36 | 36 | \ifGm@vbody\advance\@tempcnta2\relax\fi |
37 | - \ifx\Gm@rmargin\@undefined\else\advance\@tempcnta1\relax\fi | |
37 | + \ifx\Gm@lmargin\@undefined\else\advance\@tempcnta1\relax\fi | |
38 | 38 | \Gm@cntv\@tempcnta |
39 | 39 | \fi |
40 | 40 | \ifcase\@tempcnta |
@@ -82,6 +82,22 @@ | ||
82 | 82 | ^^J\@spaces `#2' (\@nameuse{Gm@#2}) is ignored}% |
83 | 83 | \Gm@detiv{#2}{#3}{#4}{#2}% |
84 | 84 | \else\fi}% |
85 | +\def\Gm@clean{% | |
86 | + \ifnum\Gm@cnth<4\let\Gm@tmargin\@undefined\fi | |
87 | + \ifodd\Gm@cnth\else\let\Gm@bmargin\@undefined\fi | |
88 | + \ifnum\Gm@cntv<4\let\Gm@rmargin\@undefined\fi | |
89 | + \ifodd\Gm@cntv\else\let\Gm@lmargin\@undefined\fi | |
90 | + \ifGm@hbody\else | |
91 | + \let\Gm@hscale\@undefined | |
92 | + \let\Gm@width\@undefined | |
93 | + \let\Gm@textwidth\@undefined | |
94 | + \fi | |
95 | + \ifGm@vbody\else | |
96 | + \let\Gm@vscale\@undefined | |
97 | + \let\Gm@height\@undefined | |
98 | + \let\Gm@textheight\@undefined | |
99 | + \fi | |
100 | + }% | |
85 | 101 | \def\Gm@adjustpaper{% |
86 | 102 | \ifdim\paperwidth>\p@\else |
87 | 103 | \PackageError{geometry}{% |
@@ -109,7 +125,7 @@ | ||
109 | 125 | \Gm@adjustmp |
110 | 126 | \Gm@adjustbody |
111 | 127 | \Gm@detall{h}{width}{tmargin}{bmargin}% |
112 | - \Gm@detall{v}{height}{lmargin}{rmargin}% | |
128 | + \Gm@detall{v}{height}{rmargin}{lmargin}% | |
113 | 129 | \setlength\textwidth{\Gm@width}% |
114 | 130 | \setlength\textheight{\Gm@height}% |
115 | 131 | \setlength\topmargin{\Gm@tmargin}% |