geometry 5.6 (12sep10)

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

6 files changed, 63 insertions, 31 deletions

diff --git a/Master/texmf-dist/doc/latex/geometry/README b/Master/texmf-dist/doc/latex/geometry/README
index 426e5ce24c6..13c3ca4181f 100644
--- a/Master/texmf-dist/doc/latex/geometry/README
+++ b/Master/texmf-dist/doc/latex/geometry/README
@@ -1,4 +1,4 @@
-LaTeX Package: Geometry 2010/07/13 v5.5
+LaTeX Package: Geometry 2010/09/12 v5.6
 ----------------------------------------
 Flexible and complete interface to document dimensions.
 
@@ -15,15 +15,16 @@ Abstract:
 CTAN: macros/latex/contrib/geometry
 
 Recent changes:
-[Release 5.0-5.5]
+[Release 5.0-5.6]
+  * Package 'ifxetex' is loaded for robuster detection of XeTeX. (v5.6-)
   * Changing page layout mid-document.
   * A new set of options to specify layout area.
   * A new driver option 'xetex'.
-  * New paper size presets for JIS B-series and ISO C-series.
+  * New paper size presets for JIS B-series and ISO C-series (v5.4-).
   * Changing default for underspecified margin.
   * The option 'showframe' works on every page.
   * The option 'showcrop' prints elbow-shaped crop marks at each corner
-    of the layout area, which is equal to paper size.
+    of the layout area, which is equal to paper size. (v5.5-)
   * Package 'atbegshi' is required when 'showframe' or 'showcrop' is specified.
   * Loading geometry.cfg precedes processing class options.
   * Deleted options: 'compat2' and 'twosideshift'.
diff --git a/Master/texmf-dist/doc/latex/geometry/changes.txt b/Master/texmf-dist/doc/latex/geometry/changes.txt
index ec19d341705..a3852032863 100644
--- a/Master/texmf-dist/doc/latex/geometry/changes.txt
+++ b/Master/texmf-dist/doc/latex/geometry/changes.txt
@@ -1,3 +1,7 @@
+2010-09-12 Release 5.6
+  * Package 'ifxetex' is loaded for robuster detection of XeTeX.
+  * Fixed a bug where 'pass' option was not reset in \newgeometry.
+
 2010-07-13 Release 5.5
   * Fixed a bug where paper width and height were swapped unnecessarily
     inside \newgeometry{} if 'landscape' is given as a class option.
@@ -83,7 +87,7 @@
   * Fixed check for the definition of \AtBeginShipoutFirst.
   * Fixed \topskip adjustment so that it works when "lines" option is used.
   * Added "driver=none" option, which does nothing for driver.
-  * Revised the note on "ifvtex" package.
+  * Revised the note on 'ifvtex' package.
 
 2008-11-13 Release 4.1
   * Fixed missing \ProvidesPackage.
diff --git a/Master/texmf-dist/doc/latex/geometry/geometry.pdf b/Master/texmf-dist/doc/latex/geometry/geometry.pdf
index 3b4f7ca9955..c85cf1dc487 100644
--- a/Master/texmf-dist/doc/latex/geometry/geometry.pdf
+++ b/Master/texmf-dist/doc/latex/geometry/geometry.pdf
diff --git a/Master/texmf-dist/source/latex/geometry/geometry.dtx b/Master/texmf-dist/source/latex/geometry/geometry.dtx
index 67c5479b531..32c24d0d36c 100644
--- a/Master/texmf-dist/source/latex/geometry/geometry.dtx
+++ b/Master/texmf-dist/source/latex/geometry/geometry.dtx
@@ -39,12 +39,12 @@
 %</ignore>
 %<package|driver>\NeedsTeXFormat{LaTeX2e}
 %<package>\ProvidesPackage{geometry}
-%<package>  [2010/07/13 v5.5 Page Geometry]
+%<package>  [2010/09/12 v5.6 Page Geometry]
 %<*install>
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: geometry 2010/07/13 v5.5 Page Geometry}
+\Msg{* Package: geometry 2010/09/12 v5.6 Page Geometry}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -117,7 +117,7 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex.
 %</driver>
 % \fi
 %
-% \CheckSum{2677}
+% \CheckSum{2680}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -1615,7 +1615,7 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex.
 %
 % \section{Examples}
 %
-% \begin{itemize}
+% \begin{enumerate}
 % \item A onesided page layout with the text area centered in the paper.
 % The examples below have the same result because the horizontal margin ratio
 % is set |1:1| for oneside by default.
@@ -1716,6 +1716,21 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex.
 %  You can add |dvips| option, that is useful to preview it with proper
 %  paper size by |dviout| or |xdvi|.
 %
+% \item  Changing the layout of the first page and leaving the others
+%  as default before loading \Gm. Use |pass| option, |\newgeometry|
+%  and |\restoregeometry|.
+% \begin{verbatim}
+%   \documentclass{book}
+%   \usepackage[pass]{geometry}
+%      % 'pass' disregards the package layout,
+%      %  so the original 'book' layout is memorized here.
+%   \begin{document}
+%   \newgeometry{margin=1cm}% changes the first page dimensions.
+%      Page 1
+%   \restoregeometry % restores the original 'book' layout.
+%      Page 2 and more
+%   \end{document}\end{verbatim}
+%
 % \item A complex page layout.
 % \begin{verbatim}
 %  \usepackage[a5paper, landscape, twocolumn, twoside,
@@ -1723,7 +1738,7 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex.
 %      bottom=1cm, foot=.7cm, includefoot, textheight=11cm, heightrounded,
 %      columnsep=1cm, dvips,  verbose]{geometry}\end{verbatim}
 % Try typesetting it and checking out the result yourself. |:-)|
-% \end{itemize}
+% \end{enumerate}
 %
 % \section{Known problems}
 % \begin{itemize}
@@ -1752,6 +1767,7 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex.
 %  Morten H\o{}gholm,
 %  Jonathan Kew,
 %  James Kilfiger,
+%  Yusuke Kuroki,
 %  Jean-Marc Lasgouttes,
 %  Wlodzimierz Macewicz,
 %  Frank Mittelbach,
@@ -1781,20 +1797,20 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex.
 %    \begin{macrocode}
 %<*package>
 %    \end{macrocode}
-%    This package requires three other packages: \textsf{keyval} in
-%    \LaTeX\ graphics bundle, \textsf{ifpdf} and \textsf{ifvtex} in
-%    `oberdiek' bundle.
+%    This package requires the following packages:
+%    \textsf{keyval}, \textsf{ifpdf}, \textsf{ifvtex} and \textsf{ifxetex}.
 %    \begin{macrocode}
 \RequirePackage{keyval}%
 \RequirePackage{ifpdf}%
 \RequirePackage{ifvtex}%
+\RequirePackage{ifxetex}%
 %    \end{macrocode}
 % 
 %    Internal switches are declared here.
 %    \begin{macrocode}
 \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
@@ -1803,7 +1819,7 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex.
 \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
@@ -1993,6 +2009,8 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex.
 %    in |\newgeometry|.
 %    \begin{macrocode}
 \def\Gm@initnewgm{%
+  \Gm@passfalse
+  \Gm@swap@papersizefalse
   \Gm@dimlist={}
   \Gm@hbodyfalse
   \Gm@vbodyfalse
@@ -3244,7 +3262,8 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex.
 %    \begin{macro}{\Gm@detectdriver}
 %    The macro checks the typeset environment and changes the driver option
 %    if necessary. To make the engine detection more robust, the macro is
-%    rewritten in the version 4 with packages \textsf{ifpdf} and \textsf{ifvtex}.
+%    rewritten with packages \textsf{ifpdf}, \textsf{ifvtex} and 
+%    \textsf{ifxetex}.
 %    \begin{macrocode}
 \def\Gm@detectdriver{%
 %    \end{macrocode} 
@@ -3269,17 +3288,21 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex.
       \Gm@setdriver{vtex}%
     \fi
 %    \end{macrocode}
-%    xetex
+%    \cs{ifxetex} is defined in \textsf{ifxetex} package written by
+%    Will Robertson.
 %    \begin{macrocode} 
-    \@ifundefined{XeTeXversion}{}{\Gm@setdriver{xetex}}%
+    \ifxetex
+      \Gm@setdriver{xetex}
+    \fi
 %    \end{macrocode}
 %    When the driver option is set by the user, check if it is valid or not. 
 %    \begin{macrocode} 
   \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
@@ -3697,7 +3720,6 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex.
 \newcommand{\newgeometry}[1]{%
   \clearpage
   \Gm@restore@org
-  \Gm@swap@papersizefalse
   \Gm@initnewgm
   \Gm@newgmtrue
   \setkeys{Gm}{#1}%
diff --git a/Master/texmf-dist/source/latex/geometry/geometry.ins b/Master/texmf-dist/source/latex/geometry/geometry.ins
index 655e0e56459..3d2b0496632 100644
--- a/Master/texmf-dist/source/latex/geometry/geometry.ins
+++ b/Master/texmf-dist/source/latex/geometry/geometry.ins
@@ -26,7 +26,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: geometry 2010/07/13 v5.5 Page Geometry}
+\Msg{* Package: geometry 2010/09/12 v5.6 Page Geometry}
 \Msg{************************************************************************}
 
 \keepsilent
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}%