summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-02-16 23:46:38 +0000
committerKarl Berry <karl@freefriends.org>2010-02-16 23:46:38 +0000
commit80f8b8d7c5431f27d221b670d2fbb51f37cdbdff (patch)
tree25096704ef42fe8f2ff3d5335e3b918cfb8c6b8f /Master
parentff176359e6939078b0938282f537d617f9f99db1 (diff)
geometry update (16feb10)
git-svn-id: svn://tug.org/texlive/trunk@17060 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/geometry/README4
-rw-r--r--Master/texmf-dist/doc/latex/geometry/changes.txt4
-rw-r--r--Master/texmf-dist/doc/latex/geometry/geometry.pdfbin225579 -> 226435 bytes
-rw-r--r--Master/texmf-dist/source/latex/geometry/geometry.dtx22
-rw-r--r--Master/texmf-dist/source/latex/geometry/geometry.ins2
-rw-r--r--Master/texmf-dist/tex/latex/geometry/geometry.sty10
6 files changed, 28 insertions, 14 deletions
diff --git a/Master/texmf-dist/doc/latex/geometry/README b/Master/texmf-dist/doc/latex/geometry/README
index 2bb341cc801..6fa8e6a455a 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/02/12 v5.0
+LaTeX Package: Geometry 2010/02/15 v5.1
----------------------------------------
Flexible and easy interface to page dimensions
@@ -14,6 +14,8 @@ Abstract:
CTAN: macros/latex/contrib/geometry
+Release 5.1
+ * Fixed a bug that caused an error in 'pass' option.
Release 5.0
* Changing page layout mid-document.
* A new set of options to specify the layout area.
diff --git a/Master/texmf-dist/doc/latex/geometry/changes.txt b/Master/texmf-dist/doc/latex/geometry/changes.txt
index 62d4f3490ee..6fd1bb705ea 100644
--- a/Master/texmf-dist/doc/latex/geometry/changes.txt
+++ b/Master/texmf-dist/doc/latex/geometry/changes.txt
@@ -1,3 +1,7 @@
+2010-02-15 Hideo Umeki
+ * Release 5.1
+ * Fixed a bug that caused an error in 'pass' option.
+
2010-02-12 Hideo Umeki
* Release 5.0
* Changing page layout mid-document.
diff --git a/Master/texmf-dist/doc/latex/geometry/geometry.pdf b/Master/texmf-dist/doc/latex/geometry/geometry.pdf
index d6e50f48307..8fc40e0a1f3 100644
--- a/Master/texmf-dist/doc/latex/geometry/geometry.pdf
+++ b/Master/texmf-dist/doc/latex/geometry/geometry.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/geometry/geometry.dtx b/Master/texmf-dist/source/latex/geometry/geometry.dtx
index 448a26a3603..97135e1db6b 100644
--- a/Master/texmf-dist/source/latex/geometry/geometry.dtx
+++ b/Master/texmf-dist/source/latex/geometry/geometry.dtx
@@ -50,12 +50,12 @@
%</ignore>
%<package|driver>\NeedsTeXFormat{LaTeX2e}
%<package>\ProvidesPackage{geometry}
-%<package> [2010/02/12 v5.0 Page Geometry]
+%<package> [2010/02/15 v5.1 Page Geometry]
%<*install>
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: geometry 2010/02/12 v5.0 Page Geometry}
+\Msg{* Package: geometry 2010/02/15 v5.1 Page Geometry}
\Msg{************************************************************************}
\keepsilent
@@ -121,7 +121,7 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex.
%</driver>
% \fi
%
-% \CheckSum{2719}
+% \CheckSum{2722}
%
% \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
@@ -2899,7 +2899,7 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex.
% The option makes all the options specified ineffective except
% verbose switch.
% \begin{macrocode}
-\define@key{Gm}{pass}[true]{\ifGm@preamble{truedimen}{\Gm@setbool{pass}{#1}}}%
+\define@key{Gm}{pass}[true]{\ifGm@preamble{pass}{\Gm@setbool{pass}{#1}}}%
% \end{macrocode}
% \end{key}
% \begin{key}{Gm}{showframe}
@@ -3263,8 +3263,15 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex.
% \end{macro}
%
% \begin{macro}{\Gm@showparams}
+% Prints the resulted parammeters and dimensions to STDOUT
+% if |verbose| is true.
+% |\Gm@width| and |\Gm@height| are expanded to get the real size.
% \begin{macrocode}
\def\Gm@showparams#1{%
+ \ifGm@pass\else
+ \setlength\@tempdima{\Gm@width}\edef\Gm@width{\the\@tempdima}%
+ \setlength\@tempdima{\Gm@height}\edef\Gm@height{\the\@tempdima}%
+ \fi
\ifGm@verbose\expandafter\typeout\else\expandafter\wlog\fi
{\Gm@logcontent{#1}}}%
\def\Gm@showbool#1{\@nameuse{ifGm@#1}#1\space\fi}%
@@ -3598,11 +3605,10 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex.
% \begin{macrocode}
\ifGm@verbose\ifGm@pass\else\Gm@checkmp\fi\fi
% \end{macrocode}
-% If |verbose=true| the parameter results are displayed on the terminal.
-% |verbose=false| (default) still puts them into the log file.
+% |\Gm@showparams| puts the resulted parameters and dimensions
+% into the log file. If |verbose| is true, they are displayed
+% on the terminal as well.
% \begin{macrocode}
- \setlength\@tempdima{\Gm@width}\edef\Gm@width{\the\@tempdima}%
- \setlength\@tempdima{\Gm@height}\edef\Gm@height{\the\@tempdima}%
\Gm@showparams{in the preamble}%
}% end of \AtBeginDocument
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/geometry/geometry.ins b/Master/texmf-dist/source/latex/geometry/geometry.ins
index 708705bb796..4a5da0e4e7e 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/02/12 v5.0 Page Geometry}
+\Msg{* Package: geometry 2010/02/15 v5.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 575a4df14f8..aa2def676b0 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/02/12 v5.0 Page Geometry]
+ [2010/02/15 v5.1 Page Geometry]
\RequirePackage{keyval}%
\RequirePackage{ifpdf}%
\RequirePackage{ifvtex}%
@@ -585,7 +585,7 @@
\define@key{Gm}{truedimen}[true]{\ifGm@preamble{truedimen}{%
\Gm@doifelse{truedimen}{#1}{\let\Gm@truedimen\Gm@true}%
{\let\Gm@truedimen\@empty}}}%
-\define@key{Gm}{pass}[true]{\ifGm@preamble{truedimen}{\Gm@setbool{pass}{#1}}}%
+\define@key{Gm}{pass}[true]{\ifGm@preamble{pass}{\Gm@setbool{pass}{#1}}}%
\define@key{Gm}{showframe}[true]{\Gm@setbool{showframe}{#1}}%
\define@key{Gm}{showcrop}[true]{\Gm@setbool{showcrop}{#1}}%
\def\Gm@setdefaultpaper{%
@@ -815,6 +815,10 @@
\typeout{*geometry* detected driver: \Gm@driver}%
\fi}%
\def\Gm@showparams#1{%
+ \ifGm@pass\else
+ \setlength\@tempdima{\Gm@width}\edef\Gm@width{\the\@tempdima}%
+ \setlength\@tempdima{\Gm@height}\edef\Gm@height{\the\@tempdima}%
+ \fi
\ifGm@verbose\expandafter\typeout\else\expandafter\wlog\fi
{\Gm@logcontent{#1}}}%
\def\Gm@showbool#1{\@nameuse{ifGm@#1}#1\space\fi}%
@@ -1049,8 +1053,6 @@
\Gm@save
\edef\Gm@restore@pkg{\Gm@restore}%
\ifGm@verbose\ifGm@pass\else\Gm@checkmp\fi\fi
- \setlength\@tempdima{\Gm@width}\edef\Gm@width{\the\@tempdima}%
- \setlength\@tempdima{\Gm@height}\edef\Gm@height{\the\@tempdima}%
\Gm@showparams{in the preamble}%
}% end of \AtBeginDocument
\newcommand{\geometry}[1]{%