geometry 4.1 (12nov08)

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

3 files changed, 18 insertions, 21 deletions

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