geometry 4.1 (12nov08)

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

7 files changed, 58 insertions, 52 deletions

diff --git a/Master/texmf-dist/doc/latex/geometry/README b/Master/texmf-dist/doc/latex/geometry/README
index 37d2f5bd12f..1006e4767c6 100644
--- a/Master/texmf-dist/doc/latex/geometry/README
+++ b/Master/texmf-dist/doc/latex/geometry/README
@@ -1,6 +1,6 @@
 
 
-Geometry package  2008/11/06 v4.0
+Geometry package  2008/11/13 v4.1
 ----------------------------------
 Flexible and easy interface to page dimensions
 
@@ -10,13 +10,15 @@ Copyright (C) 1996-2002, 2008 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 just
-  \usepackage[margin=2cm]{geometry}.
+  if you want to set a margin to 2cm from each edge of the paper,
+  you can go \usepackage[margin=2cm]{geometry}.
 
 CTAN: macros/latex/contrib/geometry
 
-
-What's new in v4.0: (See changes.txt or geometry.pdf for details)
+Release v4.1:
+ * Bug fixed: Missing \ProvidesPackage.
+ 
+Release v4.0: (See changes.txt or geometry.pdf for details)
  * More robust driver detection.
  * New option: resetpaper.
  * Adjustment to \topskip introduced.
@@ -32,8 +34,8 @@ Files:
  * geometry.dtx   -  including sources and documentation
  * geometry.pdf   -  print-ready documentation (can be generated from geometry.dtx)
 
-   To get geometry.sty, just "tex geometry.dtx".
-   To get geometry.pdf, just "pdflatex geometry.dtx".
+   To get geometry.sty, go "tex geometry.dtx".
+   To get geometry.pdf, go "pdflatex geometry.dtx".
    (See also geometry.dtx)
 
 License:
diff --git a/Master/texmf-dist/doc/latex/geometry/changes.txt b/Master/texmf-dist/doc/latex/geometry/changes.txt
index 5566774a53d..cd93564d3f2 100644
--- a/Master/texmf-dist/doc/latex/geometry/changes.txt
+++ b/Master/texmf-dist/doc/latex/geometry/changes.txt
@@ -1,28 +1,32 @@
+2008-11-13 Hideo Umeki
+      * Release 4.1
+      * Bug fixed: missing \ProvidesPackage.
+
 2008-11-06 Hideo Umeki
       * Release 4.0
       * More robust driver detection.
-		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|.
-		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
-		bug (a typo) that affects the detection of VTeX.
-		So you need to use the new version of `ifvtex' later than v1.3.
+    		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|.
+    		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
+    		bug (a typo) that affects the detection of VTeX.
+    		So you need to use the new version of `ifvtex' later than v1.3.
       * New option: resetpaper.
-		This option disables explicit paper setting in \textsf{geometry}
-		and uses the paper size specified before \textsf{geometry}. 
-		This option may be useful to print nonstandard sized documents
-		with normal printers and papers.
+    		This option disables explicit paper setting in \textsf{geometry}
+    		and uses the paper size specified before \textsf{geometry}. 
+    		This option may be useful to print nonstandard sized documents
+        with normal printers and papers.
       * Adjustment to \topskip introduced.
-		When large font sizes are specified, \topskip has to be adjusted
-		so that the formula:
-		   textheight = (lines - 1)  x \baselineskip} + \topskip
-		to be correct. To do this, \topskip is set to \ht\strutbox,
-		if \topskip is smaller than \ht\strutbox.
+        When large font sizes are specified, \topskip has to be adjusted
+        so that the formula:
+         \textheight = (lines - 1)  x \baselineskip} + \topskip
+         to be correct. To do this, \topskip is set to \ht\strutbox,
+         if \topskip is smaller than \ht\strutbox.
       * ANSI paper sizes added.
         New paper size definitions for ANSI A to E are added.
       * Bug fixed: Wrong ISO paper sizes.
@@ -31,10 +35,10 @@
         PDF paper offset is adjusted properly when magnification is
         set by mag option with pdfTeX.
       * Package source organization changed.
-		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.
+        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.
       * Many other improvements to the code and documentation.
 
 2002-07-08 Hideo Umeki
diff --git a/Master/texmf-dist/doc/latex/geometry/geometry.pdf b/Master/texmf-dist/doc/latex/geometry/geometry.pdf
index 6762f8b33cb..1f966430112 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.drv b/Master/texmf-dist/source/latex/geometry/geometry.drv
index cfac34ff2c6..4e9d7185a39 100644
--- a/Master/texmf-dist/source/latex/geometry/geometry.drv
+++ b/Master/texmf-dist/source/latex/geometry/geometry.drv
@@ -23,12 +23,11 @@
 %% the derived files: geometry.{sty,ins,drv}, geometry-samples.tex.
 %% 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesFile{geometry.drv}%
-   [2008/11/06 v4.0 Page Geometry]%
+\ProvidesFile{geometry.drv}
 \documentclass{ltxdoc}
 \usepackage[colorlinks, linkcolor=blue]{hyperref}
 \usepackage[a4paper, hmargin={3.8cm,1.5cm},vmargin={1.5cm,1cm},
-           includeheadfoot, marginpar=3.5cm]{geometry}
+  includeheadfoot, marginpar=3.5cm]{geometry}
 \begin{document}
  \DocInput{geometry.dtx}
 \end{document}
diff --git a/Master/texmf-dist/source/latex/geometry/geometry.dtx b/Master/texmf-dist/source/latex/geometry/geometry.dtx
index 2e4f75ce69d..8b8d31f9172 100644
--- a/Master/texmf-dist/source/latex/geometry/geometry.dtx
+++ b/Master/texmf-dist/source/latex/geometry/geometry.dtx
@@ -52,11 +52,14 @@
          \ifx\fmtname\x\else 1\fi\relax
 \else\csname fi\endcsname
 %</ignore>
+%<package|driver>\NeedsTeXFormat{LaTeX2e}
+%<package>\ProvidesPackage{geometry}
+%<package>  [2008/11/13 v4.1 Page Geometry]
 %<*install>
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: geometry 2008/11/06 v4.0 Page Geometry}
+\Msg{* Package: geometry 2008/11/13 v4.1 Page Geometry}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -112,13 +115,11 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex.
 \fi
 %</ignore>
 %<*driver>
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesFile{geometry.drv}%
-   [2008/11/06 v4.0 Page Geometry]%
+\ProvidesFile{geometry.drv}
 \documentclass{ltxdoc}
 \usepackage[colorlinks, linkcolor=blue]{hyperref}
 \usepackage[a4paper, hmargin={3.8cm,1.5cm},vmargin={1.5cm,1cm},
-           includeheadfoot, marginpar=3.5cm]{geometry}
+  includeheadfoot, marginpar=3.5cm]{geometry}
 \begin{document}
  \DocInput{geometry.dtx}
 \end{document}
@@ -143,7 +144,7 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex.
 %   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %   Right brace   \}     Tilde         \~}
 %
-% \GetFileInfo{geometry.drv}
+% \GetFileInfo{geometry.sty}
 %
 % \title{The \textsf{geometry} package}
 % \date{\filedate\ \fileversion}
@@ -645,7 +646,7 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex.
 % If one margin is specified, the rest of dimensions can also be determined
 % by the default margin ratio. 
 % Page margin setting by margin ratio was introduced in KOMA 
-% script\footnote{CTAN:~\texttt{macros/latex/contrib/supported/koma-script}
+% script\footnote{CTAN:~\texttt{macros/latex/contrib/koma-script}
 % by Frank Neukam and Markus Kohm.}.
 %
 % The default vertical margin ratio is $2/3$, namely,
@@ -1520,18 +1521,18 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex.
 %  Alexis Dimitriadis,
 %  Friedrich Flender,
 %  Stephan Hennig,
-%  Morten H$\phi$gholm,
+%  Morten H\o{}gholm,
 %  Jonathan Kew,
 %  James Kilfiger,
 %  Jean-Marc Lasgouttes,
 %  Wlodzimierz Macewicz,
 %  Rolf Niepraschk,
-%  Hans Fr. Nordhaug,
+%  Hans Fr.~Nordhaug,
 %  Keith Reckdahl, 
 %  Peter Riocreux,
 %  Will Robertson,
-%  Nico Schl\"{o}emer
-%  Perry C. Stearns, 
+%  Nico Schl\"{o}emer,
+%  Perry C.~Stearns, 
 %  Frank Stengel,
 %  Plamen Tanovski,
 %  Petr Uher,
@@ -1553,11 +1554,8 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex.
 %    \begin{macrocode}
 %<*package>
 %    \end{macrocode}
-%    This package requires three other packages:
-%    \begin{itemize}
-%    \item\textsf{keyval} in \LaTeX\ graphics bundle,
-%    \item\textsf{ifpdf} and \item\textsf{ifvtex} in `oberdiek' bundle,
-%    \end{itemize}
+%    This package requires three other packages: \textsf{keyval} in \LaTeX\ graphics bundle,
+%    \textsf{ifpdf} and \textsf{ifvtex} in `oberdiek' bundle.
 %    \begin{macrocode}
 \RequirePackage{keyval}%
 \RequirePackage{ifpdf}%
@@ -3114,7 +3112,7 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex.
 %    \end{macrocode}
 %    \end{macro}
 %    A local configuration file may define more options. 
-%    To set A4 paper as default, \texttt{geometry.cfg} needs to contain
+%    To set A4 paper as default, \texttt{geometry.cfg} gg to contain
 %    |\ExecuteOptions{a4paper}|.
 %    \begin{macrocode}
 \InputIfFileExists{geometry.cfg}{}{}%
diff --git a/Master/texmf-dist/source/latex/geometry/geometry.ins b/Master/texmf-dist/source/latex/geometry/geometry.ins
index 62383ad956c..553079d69d4 100644
--- a/Master/texmf-dist/source/latex/geometry/geometry.ins
+++ b/Master/texmf-dist/source/latex/geometry/geometry.ins
@@ -25,7 +25,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: geometry 2008/11/06 v4.0 Page Geometry}
+\Msg{* Package: geometry 2008/11/13 v4.1 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 cac8125bc73..c2a98090bd3 100644
--- a/Master/texmf-dist/tex/latex/geometry/geometry.sty
+++ b/Master/texmf-dist/tex/latex/geometry/geometry.sty
@@ -22,6 +22,9 @@
 %% This work consists of the files geometry.dtx and
 %% the derived files: geometry.{sty,ins,drv}, geometry-samples.tex.
 %% 
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{geometry}
+  [2008/11/13 v4.1 Page Geometry]
 \RequirePackage{keyval}%
 \RequirePackage{ifpdf}%
 \RequirePackage{ifvtex}%