geometry 4.0 (6nov08)

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

1 files changed, 104 insertions, 55 deletions

diff --git a/Master/texmf-dist/tex/latex/geometry/geometry.sty b/Master/texmf-dist/tex/latex/geometry/geometry.sty
index 53ce447cf17..cac8125bc73 100644
--- a/Master/texmf-dist/tex/latex/geometry/geometry.sty
+++ b/Master/texmf-dist/tex/latex/geometry/geometry.sty
@@ -6,17 +6,25 @@
 %%
 %% geometry.dtx  (with options: `package')
 %% 
-%% File: geometry.dtx Copyright (C) 1996-2002 Hideo Umeki
-%%                              (hideo.umeki@toshiba.co.jp)
-%%
-%% This package may be distributed under the terms of the LaTeX
-%% Project Public License, as described in lppl.txt in the base
-%% LaTeX distribution, either version 1.2 or (at your option)
-%% any later version.
-%%
-\NeedsTeXFormat{LaTeX2e}%
-\ProvidesPackage{geometry}[2002/07/08 v3.2 Page Geometry]
+%% Copyright (C) 1996-2002, 2008 by Hideo Umeki <latexgeometry@gmail.com>
+%% 
+%% This work may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License, either version 1.3c of this license
+%% or (at your option) any later version. The latest version of this
+%% license is in
+%%    http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%% 
+%% This work is "maintained" (as per the LPPL maintenance status)
+%% by Hideo Umeki.
+%% 
+%% This work consists of the files geometry.dtx and
+%% the derived files: geometry.{sty,ins,drv}, geometry-samples.tex.
+%% 
 \RequirePackage{keyval}%
+\RequirePackage{ifpdf}%
+\RequirePackage{ifvtex}%
 \newif\ifGm@verbose
 \newif\ifGm@landscape
 \newif\ifGm@includehead
@@ -27,9 +35,9 @@
 \newif\ifGm@heightrounded
 \newif\ifGm@showframe
 \newif\ifGm@compatii
-\newif\ifGm@special
 \newif\ifGm@sworient\Gm@sworientfalse
 \newif\ifGm@pass\Gm@passfalse
+\newif\ifGm@resetpaper
 \newcount\Gm@cnth
 \newcount\Gm@cntv
 \newcount\c@Gm@tempcnt
@@ -60,6 +68,8 @@
 \@onlypreamble\Gm@vtex
 \def\Gm@true{true}%
 \def\Gm@false{false}%
+\edef\Gm@orgpw{\the\paperwidth}%
+\edef\Gm@orgph{\the\paperheight}%
 \edef\Gm@dorg{%
   \noexpand\setlength{\paperwidth}{\the\paperwidth}%
   \noexpand\setlength{\paperheight}{\the\paperheight}%
@@ -91,7 +101,7 @@
   \Gm@hbodyfalse\Gm@vbodyfalse
   \Gm@includeheadfalse\Gm@includefootfalse\Gm@includempfalse
   \Gm@landscapefalse\Gm@compatiifalse\Gm@heightroundedfalse
-  \Gm@verbosefalse\Gm@showframefalse\Gm@specialfalse
+  \Gm@verbosefalse\Gm@showframefalse\Gm@resetpaperfalse
   \let\Gm@paper\@undefined
   \let\Gm@width\@undefined\let\Gm@height\@undefined
   \let\Gm@textwidth\@undefined\let\Gm@textheight\@undefined
@@ -332,12 +342,12 @@
 \def\Gm@chpaper{\@nameuse{Gm@\Gm@paper}}%
 \@onlypreamble\Gm@chpaper
 \@namedef{Gm@a0paper}{\Gm@setpaper(841,1189){mm}}%
-\@namedef{Gm@a1paper}{\Gm@setpaper(595,841){mm}}%
-\@namedef{Gm@a2paper}{\Gm@setpaper(420,595){mm}}%
+\@namedef{Gm@a1paper}{\Gm@setpaper(594,841){mm}}%
+\@namedef{Gm@a2paper}{\Gm@setpaper(420,594){mm}}%
 \@namedef{Gm@a3paper}{\Gm@setpaper(297,420){mm}}%
 \@namedef{Gm@a4paper}{\Gm@setpaper(210,297){mm}}%
-\@namedef{Gm@a5paper}{\Gm@setpaper(149,210){mm}}%
-\@namedef{Gm@a6paper}{\Gm@setpaper(105,149){mm}}%
+\@namedef{Gm@a5paper}{\Gm@setpaper(148,210){mm}}%
+\@namedef{Gm@a6paper}{\Gm@setpaper(105,148){mm}}%
 \@namedef{Gm@b0paper}{\Gm@setpaper(1000,1414){mm}}%
 \@namedef{Gm@b1paper}{\Gm@setpaper(707,1000){mm}}%
 \@namedef{Gm@b2paper}{\Gm@setpaper(500,707){mm}}%
@@ -345,6 +355,11 @@
 \@namedef{Gm@b4paper}{\Gm@setpaper(250,353){mm}}%
 \@namedef{Gm@b5paper}{\Gm@setpaper(176,250){mm}}%
 \@namedef{Gm@b6paper}{\Gm@setpaper(125,176){mm}}%
+\@namedef{Gm@ansiapaper}{\Gm@setpaper(8.5,11){in}}%
+\@namedef{Gm@ansibpaper}{\Gm@setpaper(11,17){in}}%
+\@namedef{Gm@ansicpaper}{\Gm@setpaper(17,22){in}}%
+\@namedef{Gm@ansidpaper}{\Gm@setpaper(22,34){in}}%
+\@namedef{Gm@ansiepaper}{\Gm@setpaper(34,44){in}}%
 \@namedef{Gm@letterpaper}{\Gm@setpaper(8.5,11){in}}%
 \@namedef{Gm@legalpaper}{\Gm@setpaper(8.5,14){in}}%
 \@namedef{Gm@executivepaper}{\Gm@setpaper(7.25,10.5){in}}%
@@ -365,6 +380,11 @@
 \define@key{Gm}{b4paper}[true]{\def\Gm@paper{b4paper}\Gm@chpaper}%
 \define@key{Gm}{b5paper}[true]{\def\Gm@paper{b5paper}\Gm@chpaper}%
 \define@key{Gm}{b6paper}[true]{\def\Gm@paper{b6paper}\Gm@chpaper}%
+\define@key{Gm}{ansiapaper}[true]{\def\Gm@paper{ansiapaper}\Gm@chpaper}%
+\define@key{Gm}{ansibpaper}[true]{\def\Gm@paper{ansibpaper}\Gm@chpaper}%
+\define@key{Gm}{ansicpaper}[true]{\def\Gm@paper{ansicpaper}\Gm@chpaper}%
+\define@key{Gm}{ansidpaper}[true]{\def\Gm@paper{ansidpaper}\Gm@chpaper}%
+\define@key{Gm}{ansiepaper}[true]{\def\Gm@paper{ansiepaper}\Gm@chpaper}%
 \define@key{Gm}{letterpaper}[true]{\def\Gm@paper{letterpaper}\Gm@chpaper}%
 \define@key{Gm}{legalpaper}[true]{\def\Gm@paper{legalpaper}\Gm@chpaper}%
 \define@key{Gm}{executivepaper}[true]{\def\Gm@paper{executivepaper}%
@@ -483,8 +503,10 @@
   \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}%
-  \ifx\@@tempa\@empty\let\Gm@driver\@empty\else\setkeys{Gm}{#1}\fi}%
+\define@key{Gm}{driver}{\edef\@@tempa{#1}\edef\@@auto{auto}%
+  \ifx\@@tempa\@empty\let\Gm@driver\@empty\else
+  \ifx\@@tempa\@@auto\let\Gm@driver\@empty\else
+  \setkeys{Gm}{#1}\fi\fi}%
 \define@key{Gm}{dvips}[true]{%
   \Gm@doifelse{dvips}{#1}{\Gm@setdriver{dvips}}{\Gm@unsetdriver{dvips}}}%
 \define@key{Gm}{dvipdfm}[true]{%
@@ -496,6 +518,7 @@
 \define@key{Gm}{verbose}[true]{\Gm@setbool{verbose}{#1}}%
 \define@key{Gm}{reset}[true]{\Gm@doifelse{reset}{#1}%
   {\Gm@init\Gm@dorg\ProcessOptionsKV[c]{Gm}\Gm@setdefaultpaper}{}}%
+\define@key{Gm}{resetpaper}[true]{\Gm@setbool{resetpaper}{#1}}%
 \define@key{Gm}{mag}{\mag=#1}%
 \define@key{Gm}{truedimen}[true]{\Gm@doifelse{truedimen}{#1}%
   {\let\Gm@truedimen\Gm@true}{\let\Gm@truedimen\@empty}}%
@@ -560,25 +583,30 @@
   \fi}%
 \@onlypreamble\Gm@checkmp
 \def\Gm@checkdrivers{%
-  \ifx\pdfpagewidth\@undefined\else
-    \ifnum\pdfoutput=\@ne
+  \ifx\Gm@driver\@empty
+    \typeout{*geometry auto-detecting driver*}%
+    \ifpdf
       \Gm@setdriver{pdftex}%
+    \else
+      \Gm@setdriver{dvips}%
     \fi
-  \fi
-  \ifx\VTeXversion\@undefined\else
-    \ifnum\OpMode=\@ne
+    \@ifundefined{XeTeXrevision}{}{\Gm@setdriver{pdftex}}%
+    \ifvtex
       \Gm@setdriver{vtex}%
-    \else
-      \ifnum\OpMode=\tw@
-        \Gm@setdriver{vtex}%
-      \fi
     \fi
-  \fi
-  \ifx\Gm@driver\Gm@dvips
-    \Gm@specialtrue
   \else
-    \ifx\Gm@driver\Gm@dvipdfm
-       \Gm@specialtrue
+    \ifx\Gm@driver\Gm@pdftex
+      \ifpdf\else
+         \@ifundefined{XeTeXrevision}{\Gm@warning{%
+            Wrong driver setting: `pdftex'; using default driver}%
+            \Gm@setdriver{dvips}}{}%
+      \fi
+    \fi
+    \ifx\Gm@driver\Gm@vtex
+      \ifvtex\else
+        \Gm@warning{Wrong driver setting: `vtex'; using default driver}%
+        \Gm@setdriver{dvips}%
+      \fi
     \fi
   \fi}%
 \@onlypreamble\Gm@checkdrivers
@@ -606,9 +634,9 @@
   \fi}%
 \@onlypreamble\Gm@mpfix
 \def\Gm@process{%
- \ifGm@pass
-  \Gm@dorg
- \else
+  \ifGm@pass
+    \Gm@dorg
+  \else
   \Gm@processdimlist
   \ifx\Gm@hmarginratio\@undefined
     \if@twoside
@@ -648,6 +676,11 @@
       \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
@@ -818,8 +851,13 @@
 \ProcessOptionsKV[p]{Gm}%
 \Gm@process
 \AtBeginDocument{%
-  \edef\Gm@orgw{\the\paperwidth}%
-  \edef\Gm@orgh{\the\paperheight}%
+  \ifGm@resetpaper
+    \edef\Gm@pw{\Gm@orgpw}%
+    \edef\Gm@ph{\Gm@orgph}%
+  \else
+    \edef\Gm@pw{\the\paperwidth}%
+    \edef\Gm@ph{\the\paperheight}%
+  \fi
   \ifGm@pass\else
     \ifnum\mag=\@m\else
       \Gm@magtooffset
@@ -830,32 +868,41 @@
     \fi
   \fi
   \Gm@checkdrivers
+  \typeout{*geometry detected driver: \Gm@driver*}%
   \ifx\Gm@driver\Gm@pdftex
-    \ifx\pdfpagewidth\@undefined
-      \Gm@warning{`pdftex' option is invalid in this environment}%
-    \else
-      \setlength\pdfpagewidth{\Gm@orgw}%
-      \setlength\pdfpageheight{\Gm@orgh}%
-      \ifnum\mag=\@m\else\ifx\Gm@truedimen\Gm@true
-        \setlength\paperwidth{\Gm@orgw}%
-        \setlength\paperheight{\Gm@orgh}%
-      \fi\fi
+    \setlength\pdfpagewidth{\Gm@pw}%
+    \setlength\pdfpageheight{\Gm@ph}%
+    \ifnum\mag=\@m\else
+      \@tempdima=\mag sp%
+      \divide\pdfhorigin\@tempdima
+      \multiply\pdfhorigin\@m
+      \divide\pdfvorigin\@tempdima
+      \multiply\pdfvorigin\@m
+      \ifx\Gm@truedimen\Gm@true
+        \setlength\paperwidth{\Gm@pw}%
+        \setlength\paperheight{\Gm@ph}%
+      \fi
     \fi
   \fi
   \ifx\Gm@driver\Gm@vtex
-    \ifx\VTeXversion\@undefined
-      \Gm@warning{`vtex' option is invalid in this environment}%
-    \else
-      \mediawidth=\paperwidth
-      \mediaheight=\paperheight
+    \mediawidth=\paperwidth
+    \mediaheight=\paperheight
+    \ifvtexdvi
+      \AtBeginDvi{\special{papersize=\the\paperwidth,\the\paperheight}}%
     \fi
   \fi
-  \ifGm@special
+  \ifx\Gm@driver\Gm@dvips
     \AtBeginDvi{\special{papersize=\the\paperwidth,\the\paperheight}}%
     \ifx\Gm@driver\Gm@dvips\ifGm@landscape
       \AtBeginDvi{\special{! /landplus90 true store}}%
     \fi\fi
-  \fi
+  \else\ifx\Gm@driver\Gm@dvipdfm
+    \ifx\AtBeginShipoutFirst\relax
+      \AtBeginDvi{\special{papersize=\the\paperwidth,\the\paperheight}}%
+    \else
+      \AtBeginShipoutFirst{\special{papersize=\the\paperwidth,\the\paperheight}}%
+    \fi
+  \fi\fi
   \ifGm@showframe
     \AtBeginDvi{%
       \moveright\@themargin%
@@ -887,8 +934,10 @@
   \let\Gm@wd@mp\relax
   \let\Gm@odd@mp\relax
   \let\Gm@even@mp\relax
-  \let\Gm@orgw\relax
-  \let\Gm@orgh\relax
+  \let\Gm@orgpw\relax
+  \let\Gm@orgph\relax
+  \let\Gm@pw\relax
+  \let\Gm@ph\relax
   \let\Gm@dimlist\relax}%
 \def\geometry#1{%
   \Gm@clean