geometry 5.6 (12sep10)

git-svn-id: svn://tug.org/texlive/trunk@19716 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 13 insertions, 8 deletions

diff --git a/Master/texmf-dist/tex/latex/geometry/geometry.sty b/Master/texmf-dist/tex/latex/geometry/geometry.sty
index b87bea8d016..b46f4eea148 100644
--- a/Master/texmf-dist/tex/latex/geometry/geometry.sty
+++ b/Master/texmf-dist/tex/latex/geometry/geometry.sty
@@ -25,13 +25,14 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{geometry}
-  [2010/07/13 v5.5 Page Geometry]
+  [2010/09/12 v5.6 Page Geometry]
 \RequirePackage{keyval}%
 \RequirePackage{ifpdf}%
 \RequirePackage{ifvtex}%
+\RequirePackage{ifxetex}%
 \newif\ifGm@verbose
 \newif\ifGm@landscape
-\newif\ifGm@swap@papersize\Gm@swap@papersizefalse
+\newif\ifGm@swap@papersize
 \newif\ifGm@includehead
 \newif\ifGm@includefoot
 \newif\ifGm@includemp
@@ -40,7 +41,7 @@
 \newif\ifGm@heightrounded
 \newif\ifGm@showframe
 \newif\ifGm@showcrop
-\newif\ifGm@pass\Gm@passfalse
+\newif\ifGm@pass
 \newif\ifGm@resetpaper
 \newif\ifGm@layout
 \newif\ifGm@newgm
@@ -114,6 +115,8 @@
   \Gm@saveboolean{@mparswitch}%
   \Gm@saveboolean{@reversemargin}}%
 \def\Gm@initnewgm{%
+  \Gm@passfalse
+  \Gm@swap@papersizefalse
   \Gm@dimlist={}
   \Gm@hbodyfalse
   \Gm@vbodyfalse
@@ -813,12 +816,15 @@
     \ifvtex
       \Gm@setdriver{vtex}%
     \fi
-    \@ifundefined{XeTeXversion}{}{\Gm@setdriver{xetex}}%
+    \ifxetex
+      \Gm@setdriver{xetex}
+    \fi
   \else
     \ifx\Gm@driver\Gm@xetex %%
-      \@ifundefined{XeTeXversion}{\Gm@warning{%
-            Wrong driver setting: `xetex'; trying `pdftex' driver}%
-            \Gm@setdriver{pdftex}}{}%
+      \ifxetex\else
+        \Gm@warning{Wrong driver setting: `xetex'; trying `pdftex' driver}%
+        \Gm@setdriver{pdftex}
+      \fi
     \fi
     \ifx\Gm@driver\Gm@vtex
       \ifvtex\else
@@ -1096,7 +1102,6 @@
 \newcommand{\newgeometry}[1]{%
   \clearpage
   \Gm@restore@org
-  \Gm@swap@papersizefalse
   \Gm@initnewgm
   \Gm@newgmtrue
   \setkeys{Gm}{#1}%