geometry update (13mar10)

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

6 files changed, 46 insertions, 51 deletions

diff --git a/Master/texmf-dist/doc/latex/geometry/README b/Master/texmf-dist/doc/latex/geometry/README
index 909c8a914e0..df223304c57 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/03/01 v5.2
+LaTeX Package: Geometry 2010/03/13 v5.3
 ----------------------------------------
 Flexible and easy interface to page dimensions
 
@@ -14,18 +14,11 @@ Abstract:
 
 CTAN: macros/latex/contrib/geometry
 
-Release 5.2
-  * Fixed a bug that the papersize setting explicitly specified
-    with \geometry or \usepackage in the preample didn't come to
-    \newgeometry.
-  * Added \mag offset adjustment for \newgeometry.
-  * Added 'onecolumn' option as a shorthand for 'twocolumn=false'.
-  * Changed the format of the verbose mode.
-
-Release 5.1
-  * Fixed a bug that caused an error in 'pass' option.
+Recent changes:
+ [Release 5.3]
+  * Fixed missed initialization of \Gm@lines.
 
-Release 5.0
+ [Release 5.0-]
   * Changing page layout mid-document.
   * A new set of options to specify the layout area.
   * A new driver option 'xetex'.
@@ -34,37 +27,45 @@ Release 5.0
   * The option 'showframe' works on every page.
   * Loading geometry.cfg precedes processing class options.
   * Deleted options: 'compat2' and 'twosideshift'.
+  * Added 'onecolumn' option as a shorthand for 'twocolumn=false'.
+  * Changed the format of the verbose mode.
 
-See changes.txt for more history.
+(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 created by the command:
-                            (pdf)latex geometry.dtx.
-
-Installation:
- * To get geometry.sty out of geometry.dtx
-       $ tex geometry.dtx
-   or  $ tex geometry.ins
+  * 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
 
- * To build documentation
-        $ latex geometry.dtx
+Installation: 
+[manual installation]
+  * To get geometry.sty out of geometry.dtx
+        $ tex geometry.dtx 
+    or  $ (la)tex geometry.ins
+  * To build documentation
+        $ latex geometry.dtx  
     or  $ latex geometry.drv
+  * Put the derived files in the proper directories:
+      -  tex/latex/geometry/geometry.sty
+      -  doc/latex/geometry/geometry.pdf
+      -  source/latex/geometry/geometry.dtx
 
- * Put the style file in the directory where the LaTeX
-   system can find it.
+[TeXLive]
+  * Use 'tlmgr' command
+        $ tlmgr show geometry          -- to check the package info
+        $ sudo tlmgr update geometry   -- to update the package
+  * You can use 'TeX Live Utility' instead of 'tlmgr', if on MacOSX.
 
- * For MikTeX, use the MikTeX package manager/updater
-   to update the geometry package.
+[MikTeX]
+  * Use the MikTeX Update Wizard to update geometry package.
 
 License:
-  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
+  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.
 
diff --git a/Master/texmf-dist/doc/latex/geometry/changes.txt b/Master/texmf-dist/doc/latex/geometry/changes.txt
index f7a71a8153b..287fedb77fe 100644
--- a/Master/texmf-dist/doc/latex/geometry/changes.txt
+++ b/Master/texmf-dist/doc/latex/geometry/changes.txt
@@ -1,3 +1,6 @@
+2010-03-13 Release 5.3
+  * Fixed missed initialization of \Gm@lines.
+
 2010-03-01 Release 5.2
   * Fixed a bug that the papersize setting explicitly specified
     with \geometry or \usepackage in the preample didn't come to
diff --git a/Master/texmf-dist/doc/latex/geometry/geometry.pdf b/Master/texmf-dist/doc/latex/geometry/geometry.pdf
index b99027684dd..97619af3e23 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 d8c03e6031c..c7ad45a9d24 100644
--- a/Master/texmf-dist/source/latex/geometry/geometry.dtx
+++ b/Master/texmf-dist/source/latex/geometry/geometry.dtx
@@ -26,18 +26,7 @@
 %    CTAN: macros/latex/contrib/geometry/geometry.dtx
 %    CTAN: macros/latex/contrib/geometry/geometry.pdf
 %
-% * 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
-%
-% * Installation
-%    TDS:tex/latex/geometry/geometry.sty
-%    TDS:doc/latex/geometry/geometry.pdf
-%    TDS:source/latex/geometry/geometry.dtx
+% * See README for installation.
 %        
 %<*ignore>
 \begingroup
@@ -50,12 +39,12 @@
 %</ignore>
 %<package|driver>\NeedsTeXFormat{LaTeX2e}
 %<package>\ProvidesPackage{geometry}
-%<package>  [2010/03/01 v5.2 Page Geometry]
+%<package>  [2010/03/13 v5.3 Page Geometry]
 %<*install>
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: geometry 2010/03/01 v5.2 Page Geometry}
+\Msg{* Package: geometry 2010/03/13 v5.3 Page Geometry}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -121,7 +110,7 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex.
 %</driver>
 % \fi
 %
-% \CheckSum{2720}
+% \CheckSum{2723}
 %
 % \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
@@ -1992,6 +1981,7 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex.
   \let\Gm@height\@undefined
   \let\Gm@textwidth\@undefined
   \let\Gm@textheight\@undefined
+  \let\Gm@lines\@undefined
   \let\Gm@hscale\@undefined
   \let\Gm@vscale\@undefined
   \let\Gm@hmarginratio\@undefined
diff --git a/Master/texmf-dist/source/latex/geometry/geometry.ins b/Master/texmf-dist/source/latex/geometry/geometry.ins
index 6a61d98c4ed..6b9f2ecf4ec 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/03/01 v5.2 Page Geometry}
+\Msg{* Package: geometry 2010/03/13 v5.3 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 78926d48f18..73ff861c1ab 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/03/01 v5.2 Page Geometry]
+  [2010/03/13 v5.3 Page Geometry]
 \RequirePackage{keyval}%
 \RequirePackage{ifpdf}%
 \RequirePackage{ifvtex}%
@@ -123,6 +123,7 @@
   \let\Gm@height\@undefined
   \let\Gm@textwidth\@undefined
   \let\Gm@textheight\@undefined
+  \let\Gm@lines\@undefined
   \let\Gm@hscale\@undefined
   \let\Gm@vscale\@undefined
   \let\Gm@hmarginratio\@undefined