From 80f8b8d7c5431f27d221b670d2fbb51f37cdbdff Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 16 Feb 2010 23:46:38 +0000 Subject: geometry update (16feb10) git-svn-id: svn://tug.org/texlive/trunk@17060 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/geometry/geometry.sty | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'Master/texmf-dist/tex/latex/geometry') diff --git a/Master/texmf-dist/tex/latex/geometry/geometry.sty b/Master/texmf-dist/tex/latex/geometry/geometry.sty index 575a4df14f8..aa2def676b0 100644 --- a/Master/texmf-dist/tex/latex/geometry/geometry.sty +++ b/Master/texmf-dist/tex/latex/geometry/geometry.sty @@ -25,7 +25,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{geometry} - [2010/02/12 v5.0 Page Geometry] + [2010/02/15 v5.1 Page Geometry] \RequirePackage{keyval}% \RequirePackage{ifpdf}% \RequirePackage{ifvtex}% @@ -585,7 +585,7 @@ \define@key{Gm}{truedimen}[true]{\ifGm@preamble{truedimen}{% \Gm@doifelse{truedimen}{#1}{\let\Gm@truedimen\Gm@true}% {\let\Gm@truedimen\@empty}}}% -\define@key{Gm}{pass}[true]{\ifGm@preamble{truedimen}{\Gm@setbool{pass}{#1}}}% +\define@key{Gm}{pass}[true]{\ifGm@preamble{pass}{\Gm@setbool{pass}{#1}}}% \define@key{Gm}{showframe}[true]{\Gm@setbool{showframe}{#1}}% \define@key{Gm}{showcrop}[true]{\Gm@setbool{showcrop}{#1}}% \def\Gm@setdefaultpaper{% @@ -815,6 +815,10 @@ \typeout{*geometry* detected driver: \Gm@driver}% \fi}% \def\Gm@showparams#1{% + \ifGm@pass\else + \setlength\@tempdima{\Gm@width}\edef\Gm@width{\the\@tempdima}% + \setlength\@tempdima{\Gm@height}\edef\Gm@height{\the\@tempdima}% + \fi \ifGm@verbose\expandafter\typeout\else\expandafter\wlog\fi {\Gm@logcontent{#1}}}% \def\Gm@showbool#1{\@nameuse{ifGm@#1}#1\space\fi}% @@ -1049,8 +1053,6 @@ \Gm@save \edef\Gm@restore@pkg{\Gm@restore}% \ifGm@verbose\ifGm@pass\else\Gm@checkmp\fi\fi - \setlength\@tempdima{\Gm@width}\edef\Gm@width{\the\@tempdima}% - \setlength\@tempdima{\Gm@height}\edef\Gm@height{\the\@tempdima}% \Gm@showparams{in the preamble}% }% end of \AtBeginDocument \newcommand{\geometry}[1]{% -- cgit v1.2.3