geometry 5.0 (13feb10)

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

5 files changed, 100 insertions, 36 deletions

diff --git a/Master/texmf-dist/doc/latex/geometry/README b/Master/texmf-dist/doc/latex/geometry/README
index be030925278..2bb341cc801 100644
--- a/Master/texmf-dist/doc/latex/geometry/README
+++ b/Master/texmf-dist/doc/latex/geometry/README
@@ -1,33 +1,53 @@
-Geometry package  2008/12/21 v4.2
-----------------------------------
+LaTeX Package: Geometry 2010/02/12 v5.0
+----------------------------------------
 Flexible and easy interface to page dimensions
 
-Copyright (C) 1996-2002, 2008 by Hideo Umeki <latexgeometry@gmail.com>
+Copyright (C) 1996-2010
+by Hideo Umeki <latexgeometry@gmail.com>
 
 Abstract:
   This package provides a flexible and easy interface to page dimensions.
   You can set the page layout with intuitive parameters. For instance,
   if you want to set a margin to 2cm from each edge of the paper,
-  you can go \usepackage[margin=2cm]{geometry}.
+  you can go \usepackage[margin=2cm]{geometry}. With \newgeometry command
+  you can change the layout anywhere in the document.
 
 CTAN: macros/latex/contrib/geometry
 
-Release v4.2:
-* 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.
+Release 5.0
+ * Changing page layout mid-document.
+ * A new set of options to specify the layout area.
+ * A new driver option 'xetex'.
+ * New paper size presets for JIS B-series.
+ * Changing default for underspecified margin.
+ * The option 'showframe' works on every page.
+ * Loading geometry.cfg precedes processing class options.
+ * Deleted options: 'compat2' and 'twosideshift'.
+
 See changes.txt for more history.
 
 Files:
  * README         -  this file
  * changes.txt    -  history of changes
+ * geometry.ins   -  for installation to get .sty from .dtx
  * geometry.dtx   -  including sources and documentation
- * geometry.pdf   -  print-ready documentation (can be generated from geometry.dtx)
+ * geometry.pdf   -  print-ready documentation created by the command:
+                            (pdf)latex geometry.dtx.
+
+Installation:
+ * To get geometry.sty out of geometry.dtx
+       $ tex geometry.dtx
+   or  $ tex geometry.ins
+
+ * To build documentation
+        $ latex geometry.dtx
+    or  $ latex geometry.drv
+
+ * Put the style file in the directory where the LaTeX
+   system can find it.
 
-   To get geometry.sty, go "tex geometry.dtx".
-   To get geometry.pdf, go "pdflatex geometry.dtx".
-   (See also geometry.dtx)
+ * For MikTeX, use the MikTeX package manager/updater
+   to update the geometry package.
 
 License:
   This work may be distributed and/or modified under the conditions of
diff --git a/Master/texmf-dist/doc/latex/geometry/changes.txt b/Master/texmf-dist/doc/latex/geometry/changes.txt
index 98b3567673a..62d4f3490ee 100644
--- a/Master/texmf-dist/doc/latex/geometry/changes.txt
+++ b/Master/texmf-dist/doc/latex/geometry/changes.txt
@@ -1,7 +1,50 @@
+2010-02-12 Hideo Umeki
+      * Release 5.0
+      * Changing page layout mid-document.
+        The new commands \newgeometry{...} and \restoregeometry allow
+        users to change page dimensions in the middle of the document. 
+      * A new set of options to specify the layout area.
+        The options specified for the area, in which the page dimensions
+        are calculated, are added: 'layout', 'layoutsize', 
+        'layoutwidth', 'layoutheight' and so forth.
+        These options would help to print the specified
+        layout to a different sized paper.  For example, with 'a4paper'
+        and 'layout=a5paper', the geometry package uses 'A5' layout to
+        calculate margins with the paper size still 'A4'.
+      * A new driver option 'xetex'.
+        The new driver option 'xetex' is added. The driver auto-detection
+        routine has been revised so as to avoid an error with undefined
+        control sequences. Note that 'geometry.cfg' in TeXLive, which
+        disables the auto-detection routine and sets 'pdftex', is no
+        longer necessary and has no problem even though it still exists.
+        To set 'xetex' is strongly recommended with XeLaTeX.
+      * New paper size presets for JIS B-series.
+        The papersize presets 'b0j' to 'b6j' for JIS (Japanese Industrial
+        Standards) B-series are added.
+      * Changing default for underspecified margin.
+        In the previous version, if only one margin was specified,
+        'bottom=1cm' for example, then geometry set the other margin with
+        the margin ratio (1:1 by default for the vertical dimensions)
+        and got 'top'=1cm in this case.
+        The version 5 sets the text-body size with the default 'scale'
+        (=0.7) and determine the unspecified margin.
+      * The option 'showframe' works on every page.
+        With 'showframe' option, the page frames are shown on every page.
+        In addition, the new option 'showcrop' would print cropmarks showing
+        the corners of the layout (the same as paper by default) on every page.
+      * Loading geometry.cfg precedes processing class options.
+        The previous version loaded 'geometry.cfg' after processing
+				the document class options.  Now that the config file is
+				loaded before processing the class options, you can change the
+        behavior specified in 'geometry.cfg' by adding options into
+				\documentclass as well as \usepackage and \geometry.
+      * Deleted options: 'compat2' and 'twosideshift'.
+        The version 5 has no longer compatibility with the previous ones.
+        'compat2' and 'twosideshift' are gone for simplicity. 
 
 2008-12-21 Hideo Umeki
       * Release 4.2
-      * Fixed check for the definition of \AtBeginShipoutFirst
+      * 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.
@@ -16,17 +59,17 @@
     		The driver detection method has been totally rewritten so that
     		it can automatically detect the driver appropriate for the
     		typesetting program in use. Therefore explicit driver setting is no
-    		longer needed in most cases, except for the driver |dvipdfm|.
+    		longer needed in most cases, except for the driver 'dvipdfm'.
     		This improvement makes geometry work more robustly for 
     		the typesetting programs under e-TeX, XeTeX and VTeX
-    		as well as normal TeX environment. The packages `ifpdf' and
-    		`ifvtex' are used, which are available in CTAN.
-    		Note that `ifvtex' package v1.3 (2007/09/09), however, has a
+    		as well as normal TeX environment. The packages 'ifpdf' and
+    		'ifvtex' are used, which are available in CTAN.
+    		Note that 'ifvtex' package v1.3 (2007/09/09), however, has a
     		bug (a typo) that affects the detection of VTeX.
-    		So you need to use the new version of `ifvtex' later than v1.3.
+    		So you need to use 'ifvtex' v1.4 or later.
       * New option: resetpaper.
-    		This option disables explicit paper setting in \textsf{geometry}
-    		and uses the paper size specified before \textsf{geometry}. 
+    		This option disables explicit paper setting in 'geometry'
+    		and uses the paper size specified before 'geometry'. 
     		This option may be useful to print nonstandard sized documents
         with normal printers and papers.
       * Added adjustment to \topskip.
@@ -45,8 +88,8 @@
       * Changed package source organization.
         Files geometry.ins and geometry-samples.tex are integrated into
         geometry.dtx so that they can be generated from geometry.dtx by
-        the `tex' command. Documentation can be also generated directly
-        from geometry.dtx by `(pdf)latex' command.
+        the 'tex' command. Documentation can be also generated directly
+        from geometry.dtx by '(pdf)latex' command.
       * Other improvements to the code and documentation.
 
 2002-07-08 Hideo Umeki
@@ -131,8 +174,8 @@
         'twoside' automatically set 'asymmetric=false', but users can
          set manually 'asymmetric(=true)'.
       * Changed showparam style.
-      * Added 'hcentering' and 'vcentering', which set |hmarginratio=1:1|
-        and |vmarginratio=1:1| respectively.
+      * Added 'hcentering' and 'vcentering', which set 'hmarginratio=1:1'
+        and 'vmarginratio=1:1' respectively.
       * Bug fixed: incorrect margins when 'twocolumn' and 'includemp'
       * Bug fixed: '(h|v)centering' option was set even when the value is
         false.
@@ -196,10 +239,10 @@
 
 2002-04-22  Hideo Umeki
       * Version 3.0 Candidate alpha, alpha-2 (formly known as 2.4 alpha-1,2)
-      * Added `ignorehead', `ignorefoot', `ignoreheadfoot', and
-        `ignoreheadfootmp'(ignoreall) options to disregard
+      * Added 'ignorehead', 'ignorefoot', 'ignoreheadfoot', and
+        'ignoreheadfootmp'(ignoreall) options to disregard
         head/foot/marginpars spaces.
-      * Added `{h|v}marginratio' options.
+      * Added '{h|v}marginratio' options.
         These options specify visible marginal spaces in each direction,
         left(inner):right(outer) for the horizontal ratio, top:bottom
         for the vertical. They should be set in 'a:b' style and each
@@ -213,7 +256,7 @@
 
 2000-06-28  Hideo Umeki
       * Release 2.3
-      * Added `truedimen', `columnsep' and `footnotesep' options.
+      * Added 'truedimen', 'columnsep' and 'footnotesep' options.
       * VTeX supported.
       * Modified internal settings for twosideshift and mag.
 
@@ -244,7 +287,7 @@
       * Release 1.07
       * Modified process of 'dvips' option.
       * pdftex supported.
-      * Added `a0paper' and `b0paper'.
+      * Added 'a0paper' and 'b0paper'.
 
 1997-04-16  Hideo Umeki
       * Release 1.06
@@ -265,14 +308,14 @@
 
 1996-06-07  Hideo Umeki
       * Release 1.02
-      * Changed definition for `reset' option.
-      * Revised instructions for `reset' and `dvips' options.
+      * Changed definition for 'reset' option.
+      * Revised instructions for 'reset' and 'dvips' options.
 
 1996-06-03  Hideo Umeki
       * Release 1.01
       * Fixed bugs in setting paper and option processing.
       * geometry.cfg
-      * Added `dvips' option.
+      * Added 'dvips' option.
 
 1996-05-31  Hideo Umeki
       * Release 1.00
diff --git a/Master/texmf-dist/doc/latex/geometry/geometry-samples.tex b/Master/texmf-dist/doc/latex/geometry/geometry-samples.tex
index 9b9335960a4..e035f9f10dc 100644
--- a/Master/texmf-dist/doc/latex/geometry/geometry-samples.tex
+++ b/Master/texmf-dist/doc/latex/geometry/geometry-samples.tex
@@ -6,7 +6,8 @@
 %%
 %% geometry.dtx  (with options: `samples')
 %% 
-%% Copyright (C) 1996-2002, 2008 by Hideo Umeki <latexgeometry@gmail.com>
+%% Copyright (C) 1996-2010
+%% 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
@@ -47,7 +48,6 @@
 % \usepackage[centering,includemp,twoside,landscape]{geometry}
 % \usepackage[mag=1414,margin=2cm]{geometry}
 % \usepackage[mag=1414,margin=2truecm,truedimen]{geometry}
-% \usepackage[compat2,marginpar=50pt,twosideshift=50pt]{geometry}
 % \usepackage[a5paper, landscape, twocolumn, twoside,
 %    left=2cm, hmarginratio=2:1, includemp, marginparwidth=43pt,
 %    bottom=1cm, foot=.7cm, includefoot, textheight=11cm, heightrounded,
diff --git a/Master/texmf-dist/doc/latex/geometry/geometry.cfg b/Master/texmf-dist/doc/latex/geometry/geometry.cfg
index 4277d685942..6026eed2e13 100644
--- a/Master/texmf-dist/doc/latex/geometry/geometry.cfg
+++ b/Master/texmf-dist/doc/latex/geometry/geometry.cfg
@@ -6,7 +6,8 @@
 %%
 %% geometry.dtx  (with options: `config')
 %% 
-%% Copyright (C) 1996-2002, 2008 by Hideo Umeki <latexgeometry@gmail.com>
+%% Copyright (C) 1996-2010
+%% 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
diff --git a/Master/texmf-dist/doc/latex/geometry/geometry.pdf b/Master/texmf-dist/doc/latex/geometry/geometry.pdf
index 15a38f5ef62..d6e50f48307 100644
--- a/Master/texmf-dist/doc/latex/geometry/geometry.pdf
+++ b/Master/texmf-dist/doc/latex/geometry/geometry.pdf