summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/geometry
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-12-22 23:28:59 +0000
committerKarl Berry <karl@freefriends.org>2008-12-22 23:28:59 +0000
commit21fc4fdd9bef9706044d952b4448ecadf92202f6 (patch)
treeb983543711cdd0b95d9ff477551d3619f654230d /Master/texmf-dist/tex/latex/geometry
parent8e604fd314ceb4046499cd237b8ffb3fbc2eda2e (diff)
geometry 4.2 (21dec08)
git-svn-id: svn://tug.org/texlive/trunk@11688 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/geometry')
-rw-r--r--Master/texmf-dist/tex/latex/geometry/geometry.sty35
1 files changed, 21 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/latex/geometry/geometry.sty b/Master/texmf-dist/tex/latex/geometry/geometry.sty
index c2a98090bd3..458354d1de7 100644
--- a/Master/texmf-dist/tex/latex/geometry/geometry.sty
+++ b/Master/texmf-dist/tex/latex/geometry/geometry.sty
@@ -24,7 +24,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{geometry}
- [2008/11/13 v4.1 Page Geometry]
+ [2008/12/21 v4.2 Page Geometry]
\RequirePackage{keyval}%
\RequirePackage{ifpdf}%
\RequirePackage{ifvtex}%
@@ -506,10 +506,11 @@
\Gm@doif{reversemp}{#1}{\csname @reversemargin\Gm@bool\endcsname}}%
\define@key{Gm}{reversemarginpar}[true]{%
\Gm@doif{reversemarginpar}{#1}{\csname @reversemargin\Gm@bool\endcsname}}%
-\define@key{Gm}{driver}{\edef\@@tempa{#1}\edef\@@auto{auto}%
- \ifx\@@tempa\@empty\let\Gm@driver\@empty\else
+\define@key{Gm}{driver}{\edef\@@tempa{#1}\edef\@@auto{auto}\edef\@@none{none}%
+ \ifx\@@tempa\@empty\let\Gm@driver\relax\else
+ \ifx\@@tempa\@@none\let\Gm@driver\relax\else
\ifx\@@tempa\@@auto\let\Gm@driver\@empty\else
- \setkeys{Gm}{#1}\fi\fi}%
+ \setkeys{Gm}{#1}\fi\fi\fi\let\@@auto\relax\let\@@none\relax}%
\define@key{Gm}{dvips}[true]{%
\Gm@doifelse{dvips}{#1}{\Gm@setdriver{dvips}}{\Gm@unsetdriver{dvips}}}%
\define@key{Gm}{dvipdfm}[true]{%
@@ -679,11 +680,6 @@
\edef\Gm@width{\the\@tempdima}%
\fi
\fi
- \ifdim\topskip<\ht\strutbox
- \setlength\@tempdima{\topskip}%
- \setlength\topskip{\ht\strutbox}%
- \Gm@warning{\noexpand\topskip was changed from \the\@tempdima\space to \the\topskip}%
- \fi
\ifGm@vbody
\ifx\Gm@height\@undefined
\ifx\Gm@vscale\@undefined
@@ -693,6 +689,12 @@
\fi
\fi
\ifx\Gm@lines\@undefined\else
+ \ifdim\topskip<\ht\strutbox
+ \setlength\@tempdima{\topskip}%
+ \setlength\topskip{\ht\strutbox}%
+ \Gm@warning{\noexpand\topskip was changed from \the\@tempdima\space
+ to \the\topskip}%
+ \fi
\setlength\@tempdima{\baselineskip}%
\multiply\@tempdima\Gm@lines
\addtolength\@tempdima{\topskip}%
@@ -794,7 +796,7 @@
\Gm@checkbool{includehead}%
\Gm@checkbool{includefoot}%
\Gm@checkbool{includemp}%
- driver: \Gm@driver^^J%
+ driver: \if\Gm@driver\relax --\else\Gm@driver\fi^^J%
\fi
-------------------- Page layout dimensions and switches^^J%
\string\paperwidth\space\space\the\paperwidth^^J%
@@ -871,7 +873,11 @@
\fi
\fi
\Gm@checkdrivers
- \typeout{*geometry detected driver: \Gm@driver*}%
+ \ifx\Gm@driver\relax
+ \typeout{*geometry detected driver: <none>*}%
+ \else
+ \typeout{*geometry detected driver: \Gm@driver*}%
+ \fi
\ifx\Gm@driver\Gm@pdftex
\setlength\pdfpagewidth{\Gm@pw}%
\setlength\pdfpageheight{\Gm@ph}%
@@ -900,10 +906,11 @@
\AtBeginDvi{\special{! /landplus90 true store}}%
\fi\fi
\else\ifx\Gm@driver\Gm@dvipdfm
- \ifx\AtBeginShipoutFirst\relax
- \AtBeginDvi{\special{papersize=\the\paperwidth,\the\paperheight}}%
- \else
+ \ifcase\ifx\AtBeginShipoutFirst\relax\@ne\else
+ \ifx\AtBeginShipoutFirst\@undefined\@ne\else\z@\fi\fi
\AtBeginShipoutFirst{\special{papersize=\the\paperwidth,\the\paperheight}}%
+ \or
+ \AtBeginDvi{\special{papersize=\the\paperwidth,\the\paperheight}}%
\fi
\fi\fi
\ifGm@showframe