summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/doc/latex/geometry
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-03-02 00:44:35 +0000
committerKarl Berry <karl@freefriends.org>2010-03-02 00:44:35 +0000
commit65293db75e3702db6206732e71cc68adbb0075a7 (patch)
tree177ac7f2e0c39f831b7937f4bafa8fd61290e220 /Master/texmf-dist/doc/latex/geometry
parent22e1ea793c2800134b08e2148376a5dfa8722750 (diff)
geometry 5.2 (28feb10)
git-svn-id: svn://tug.org/texlive/trunk@17268 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc/latex/geometry')
-rw-r--r--Master/texmf-dist/doc/latex/geometry/README32
-rw-r--r--Master/texmf-dist/doc/latex/geometry/changes.txt637
-rw-r--r--Master/texmf-dist/doc/latex/geometry/geometry-samples.tex24
-rw-r--r--Master/texmf-dist/doc/latex/geometry/geometry.pdfbin226435 -> 227181 bytes
4 files changed, 343 insertions, 350 deletions
diff --git a/Master/texmf-dist/doc/latex/geometry/README b/Master/texmf-dist/doc/latex/geometry/README
index 6fa8e6a455a..909c8a914e0 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/15 v5.1
+LaTeX Package: Geometry 2010/03/01 v5.2
----------------------------------------
Flexible and easy interface to page dimensions
@@ -14,17 +14,26 @@ 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.
+ * 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.
- * 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'.
+ * 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.
@@ -55,8 +64,7 @@ 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
+ 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 6fd1bb705ea..f7a71a8153b 100644
--- a/Master/texmf-dist/doc/latex/geometry/changes.txt
+++ b/Master/texmf-dist/doc/latex/geometry/changes.txt
@@ -1,328 +1,315 @@
-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.
- 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 \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.
-
-2008-11-13 Hideo Umeki
- * Release 4.1
- * 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 'ifvtex' v1.4 or later.
- * New option: resetpaper.
- 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.
- 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.
- * Added ANSI paper sizes.
- New paper size definitions for ANSI A to E are added.
- * Fixed wrong ISO paper sizes.
- The paper sizes for A1,A2,A5 and A6 were wrong (by 1mm).
- * Fixed PDFTeX magnification problem.
- PDF paper offset is adjusted properly when magnification is
- set by mag option with pdfTeX.
- * 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.
- * Other improvements to the code and documentation.
-
-2002-07-08 Hideo Umeki
- * Release 3.2
- * Added known problem: for crop package with its 'center' option and
- 'mag' larger than 1000, the result is not the one expected.
- * Fixed double-valued marginratio setting like {1:1,1:5}.
- {h|v}marginratio should have been set by \edef
- instead of \def (line:439-440 in geometry.sty).
- The bug was introduced in v3.1. (found by Rolf Niepraschk)
- * Added two test files: gtest15.tex gtest16.tex
-
-2002-07-04 Hideo Umeki
- * Release 3.1
- * Fixed an error in setting geometry dimensions with \widthof of
- calc package. \Gm@defbylen and \Gm@defbycnt are introduced to set
- geometry dimensions.
-
-2002-06-30 Hideo Umeki
- (Special thanks to Frank Mittelbach for checking codes patiently
- and providing extremely helpful insight and suggestions)
- * Release 3.0
- * Revised geometry.dtx document.
-
-2002-06-28 Hideo Umeki
- * Bug fix: multiple landscape/portrait switches malfunctioned.
- * Bug fix: default hmarginratio wasn't reset when twoside is reset.
- The initialization of default margionratios added in \Gm@clean.
-
-2002-06-12 Hideo Umeki
- * Improved 'reset': can reset 'paper' given as a geometry option.
- * Bug fix: class default papersize with class option 'landscape'
- didn't work with \geometry command.
-
-2002-06-05 Hideo Umeki
- * Added a landscape correction for dvips with 'special' command.
- * Added 'dvipdfm' (same as 'dvips' internally).
- * Changed driver settings ('dvips', 'pdftex', and all that) to exclusive.
- * Bug fix: 'footnotesep' (\skip\footins) couldn't be reset.
- * Bug fix: 'bindingoffset' didn't work with calc package
- * Bug fix: 'showframe' vbox had improper height settings.
- * Bug fix: complex margin settings with calc, e.g. (1in-50pt)*2/3,
- didn't work well.
-
-2002-05-27 Hideo Umeki
- * Added many '\@onlypreamble' commands.
- * The default vscale is changed to 0.7.
- * Added 'compat2' to achieve option compatibility with the old version.
-
-2002-05-24 Hideo Umeki
- * 'pdfoutput=1' is removed because it is unnecessary and rather harmful
- with package 'hyperref'.
- * The default hscale is changed to 0.7.
- * The default hmaginratio '\Geom@Dhratiotwo' (=2:3) is used
- if \@twosidetrue.
- * 'asymmetric' sets \@mparswitchfalse and \@twosidetrue, so that
- one can use 'asymmetric' as an alternative to the 'twoside' option.
-
-2002-05-21 Hideo Umeki
- * Added 'nomarginpar' with \marginparwidth and \marginparsep set to 0pt.
- * Added '\geom@checkmp' checking if marginal notes fall off the page.
- * '\geom@process' revised with new internal macros.
- * Bug fixed: odd/evensidemargin calculations totally modified.
-
-2002-05-20 Hideo Umeki
- * Changed the default settings (old defaults --> new defaults)
- - scale={0.8,0.9} --> scale=0.8
- - includeheadfoot, ignoremp --> ignoreall
- - marginratio={2:3,1:2} for oneside, marginratio=2:3 for twoside
- --> marginratio={1:1,2:3} for oneside, marginratio=2:3 for twoside
-
-2002-05-19 Hideo Umeki
- * 'asymmetric' just sets \@mparswitchfalse. 'asymmetric=false' does
- nothing.
- * '\geom@process' revised.
-
-2002-05-14 Hideo Umeki
- * 'nohead', 'nofoot' and 'noheadfoot' are just shortcut for
- setting the corresponding LaTeX dimensions to zero, so they
- are overwritable by subsequent options.
- * Added 'asymmetric' option with the same layout on every pages.
- '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.
- * Bug fixed: incorrect margins when 'twocolumn' and 'includemp'
- * Bug fixed: '(h|v)centering' option was set even when the value is
- false.
- * Bug fixed: \mag and options with true dimension values caused
- overspecification warning about \mag. Now \mag cannot be specified
- more than once as geometry option.
- * Known Problem: 'reset' still leaves the last papername given as
- a geometry option, not the class original papername.
- Set the proper paper name again after 'reset'.
-
-2002-05-13 Hideo Umeki
- * Added 'twocolumn' option
- * "verbose" displays the parameter results on the terminal,
- "verbose=false" (default) still puts them into the log.
- * 'heightrounded' calculation no longer needs ifthen package.
- * Bug fixed: 'heightrounded' always adjusted downwards.
- * Bug fixed: it didn't work with calc package.
- \Geom@setafter command needs \expandafter's
- * Bug fixed: 'pass' and multiple 'reset' didn't work well.
-
-2002-05-10 Hideo Umeki
- * Added 'showframe' option, which shows textarea and page frames,
- and lines for head and foot to check layout in detail.
- Geometry.sty now contains features of showframe.sty. So showframe.sty
- is deleted from the distribution.
- * Bug fixed: {h,v}offset was set wrong values when 'mag', 'truedimen'
- and \geometry{..} macro were used.
- * Bug fixed: execution timing of changing papersize was wrong.
- This bug was introduced in v3.0 beta.
-
-2002-05-09 Hideo Umeki
- * Added 'heightrounded' option. If \textheight is not specified,
- this option rounds it to n-times (n: an integer) of \baselineskip plus
- \topskip, \textheight = n * \baselineskip + \topskip,
- to avoid "underfull vbox" in some cases. Default is false.
- ifthen package included in LaTeX base bundle is required.
- * Added 'lines' option, which enables users to specify \textheight
- by the number of lines included in \textheight auto-calculating
- \textheight = (lines - 1) * \baselineskip + \topskip.
- This option is prior to all the other options determining 'textheight'
- directly (ie. 'textheight', 'height', 'vscale').
- * Bug fixed: \Geom@dset wasn't set by \edef.
-
-2002-04-26 Hideo Umeki
- * \geom@setafter and \Geom@dset (both internal) makes LaTeX dimension
- setting as a option (headsep, footskip, hoffset, and etc)
- effective at the beginning of \geom@process for 'pass' option.
- * Revised internal codes specifying papersize.
- * Changed the way of displaying options and parameters in 'verbose' mode.
+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
+ \newgeometry.
+ * Added \mag offset adjustment for \newgeometry.
+ * Added 'onecolumn' option as a shorthand for 'twocolumn=false'.
+ * Changed the format of the verbose mode.
+
+2010-02-15 Release 5.1
+ * Fixed a bug that caused an error in 'pass' option.
+
+2010-02-12 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 Release 4.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.
+
+2008-11-13 Release 4.1
+ * Fixed missing \ProvidesPackage.
+
+2008-11-06 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 'ifvtex' v1.4 or later.
+ * New option: resetpaper.
+ 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.
+ 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.
+ * Added ANSI paper sizes.
+ New paper size definitions for ANSI A to E are added.
+ * Fixed wrong ISO paper sizes.
+ The paper sizes for A1,A2,A5 and A6 were wrong (by 1mm).
+ * Fixed PDFTeX magnification problem.
+ PDF paper offset is adjusted properly when magnification is
+ set by mag option with pdfTeX.
+ * 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.
+ * Other improvements to the code and documentation.
+
+2002-07-08 Release 3.2
+ * Added known problem: for crop package with its 'center' option and
+ 'mag' larger than 1000, the result is not the one expected.
+ * Fixed double-valued marginratio setting like {1:1,1:5}.
+ {h|v}marginratio should have been set by \edef
+ instead of \def (line:439-440 in geometry.sty).
+ The bug was introduced in v3.1. (found by Rolf Niepraschk)
+ * Added two test files: gtest15.tex gtest16.tex
+
+2002-07-04 Release 3.1
+ * Fixed an error in setting geometry dimensions with \widthof of
+ calc package. \Gm@defbylen and \Gm@defbycnt are introduced to set
+ geometry dimensions.
+
+2002-06-30 Release 3.0
+ (Special thanks to Frank Mittelbach for checking codes patiently
+ and providing extremely helpful insight and suggestions)
+ * Revised geometry.dtx document.
+
+2002-06-28
+ * Bug fix: multiple landscape/portrait switches malfunctioned.
+ * Bug fix: default hmarginratio wasn't reset when twoside is reset.
+ The initialization of default margionratios added in \Gm@clean.
-2002-04-25 Hideo Umeki
- * Version 3.0 beta
- * Added 'screen' option as a new papersize (papersize={225mm,180mm}).
- To make presentation with PC and video projector, geometry option
- "screen,centering" with 'slide' documentclass must be the best choise.
- * Added 'pass' option, which disables geometry's auto-layout.
- * Added 'ratio' option equivalent to 'marginratio'.
- * Added 'centering', a shortcut for 'marginratio=1:1'.
- * Added 'innermargin' and 'outermargin', aliases for leftmargin
- and rightmargin respectively.
-
-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
- head/foot/marginpars spaces.
- * 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
- value should be a positive integer less than 100 to avoid
- arithmetic overflow. In default, hmarginratio=2:3 (1:2 for
- twoside) and vmarginratio=1:2.
- * The 'automatic' centering is no longer default layout,
- so marginratio={2:3,1:2} is used as default.
- * Removed twosideshift option, use bindingoffset instead.
- bindingoffset is set 0pt as default and supports twoside.
-
-2000-06-28 Hideo Umeki
- * Release 2.3
- * Added 'truedimen', 'columnsep' and 'footnotesep' options.
- * VTeX supported.
- * Modified internal settings for twosideshift and mag.
-
-1999-10-07 Hideo Umeki
- * Release 2.2
- * Bug fixed: explicit twoside was needed for book.cls.
-
-1999-09-27 Hideo Umeki
- * Release 2.1
- * Bug fixed: twosideshift with reversemarginpar made wrong margins.
- * Added mag option.
- * Paper sizes A6 and B6 supported.
- * Changed license declaration to LPPL.
-
-1998-04-06 Hideo Umeki
- * Release 2.0
- * Flexible setting scheme for package option with keyval.
- * Removed exclamations and extra control sequences for paperwidth
- and paperheight.
- * Totally revised the code and document.
-
-1997-09-08 Hideo Umeki
- * Release 1.08
- * Included geometry.cfg into geometry.dtx.
- * Changed the catcode of exclamation mark.
-
-1997-07-05 Hideo Umeki
- * Release 1.07
- * Modified process of 'dvips' option.
- * pdftex supported.
- * Added 'a0paper' and 'b0paper'.
-
-1997-04-16 Hideo Umeki
- * Release 1.06
- * reversemarginpar supported.
-
-1997-02-17 Hideo Umeki
- * Release 1.05
- * Changed the definition for dvips option.
-
-1996-08-05 Hideo Umeki
- * Release 1.04
- * Bug fixed: papersize= had no effect when papertype was given
- in geometry.cfg or as a package option.
-
-1996-07-17 Hideo Umeki
- * Release 1.03
- * calc support
-
-1996-06-07 Hideo Umeki
- * Release 1.02
- * 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.
+2002-06-12
+ * Improved 'reset': can reset 'paper' given as a geometry option.
+ * Bug fix: class default papersize with class option 'landscape'
+ didn't work with \geometry command.
+
+2002-06-05
+ * Added a landscape correction for dvips with 'special' command.
+ * Added 'dvipdfm' (same as 'dvips' internally).
+ * Changed driver settings ('dvips', 'pdftex', and all that) to exclusive.
+ * Bug fix: 'footnotesep' (\skip\footins) couldn't be reset.
+ * Bug fix: 'bindingoffset' didn't work with calc package
+ * Bug fix: 'showframe' vbox had improper height settings.
+ * Bug fix: complex margin settings with calc, e.g. (1in-50pt)*2/3,
+ didn't work well.
+
+2002-05-27
+ * Added many '\@onlypreamble' commands.
+ * The default vscale is changed to 0.7.
+ * Added 'compat2' to achieve option compatibility with the old version.
+
+2002-05-24
+ * 'pdfoutput=1' is removed because it is unnecessary and rather harmful
+ with package 'hyperref'.
+ * The default hscale is changed to 0.7.
+ * The default hmaginratio '\Geom@Dhratiotwo' (=2:3) is used
+ if \@twosidetrue.
+ * 'asymmetric' sets \@mparswitchfalse and \@twosidetrue, so that
+ one can use 'asymmetric' as an alternative to the 'twoside' option.
+
+2002-05-21
+ * Added 'nomarginpar' with \marginparwidth and \marginparsep set to 0pt.
+ * Added '\geom@checkmp' checking if marginal notes fall off the page.
+ * '\geom@process' revised with new internal macros.
+ * Bug fixed: odd/evensidemargin calculations totally modified.
+
+2002-05-20
+ * Changed the default settings (old defaults --> new defaults)
+ - scale={0.8,0.9} --> scale=0.8
+ - includeheadfoot, ignoremp --> ignoreall
+ - marginratio={2:3,1:2} for oneside, marginratio=2:3 for twoside
+ --> marginratio={1:1,2:3} for oneside, marginratio=2:3 for twoside
+
+2002-05-19
+ * 'asymmetric' just sets \@mparswitchfalse. 'asymmetric=false' does
+ nothing.
+ * '\geom@process' revised.
+
+2002-05-14
+ * 'nohead', 'nofoot' and 'noheadfoot' are just shortcut for
+ setting the corresponding LaTeX dimensions to zero, so they
+ are overwritable by subsequent options.
+ * Added 'asymmetric' option with the same layout on every pages.
+ '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.
+ * Bug fixed: incorrect margins when 'twocolumn' and 'includemp'
+ * Bug fixed: '(h|v)centering' option was set even when the value is
+ false.
+ * Bug fixed: \mag and options with true dimension values caused
+ overspecification warning about \mag. Now \mag cannot be specified
+ more than once as geometry option.
+ * Known Problem: 'reset' still leaves the last papername given as
+ a geometry option, not the class original papername.
+ Set the proper paper name again after 'reset'.
+
+2002-05-13
+ * Added 'twocolumn' option
+ * "verbose" displays the parameter results on the terminal,
+ "verbose=false" (default) still puts them into the log.
+ * 'heightrounded' calculation no longer needs ifthen package.
+ * Bug fixed: 'heightrounded' always adjusted downwards.
+ * Bug fixed: it didn't work with calc package.
+ \Geom@setafter command needs \expandafter's
+ * Bug fixed: 'pass' and multiple 'reset' didn't work well.
+
+2002-05-10
+ * Added 'showframe' option, which shows textarea and page frames,
+ and lines for head and foot to check layout in detail.
+ Geometry.sty now contains features of showframe.sty. So showframe.sty
+ is deleted from the distribution.
+ * Bug fixed: {h,v}offset was set wrong values when 'mag', 'truedimen'
+ and \geometry{..} macro were used.
+ * Bug fixed: execution timing of changing papersize was wrong.
+ This bug was introduced in v3.0 beta.
+
+2002-05-09
+ * Added 'heightrounded' option. If \textheight is not specified,
+ this option rounds it to n-times (n: an integer) of \baselineskip plus
+ \topskip, \textheight = n * \baselineskip + \topskip,
+ to avoid "underfull vbox" in some cases. Default is false.
+ ifthen package included in LaTeX base bundle is required.
+ * Added 'lines' option, which enables users to specify \textheight
+ by the number of lines included in \textheight auto-calculating
+ \textheight = (lines - 1) * \baselineskip + \topskip.
+ This option is prior to all the other options determining 'textheight'
+ directly (ie. 'textheight', 'height', 'vscale').
+ * Bug fixed: \Geom@dset wasn't set by \edef.
+
+2002-04-26
+ * \geom@setafter and \Geom@dset (both internal) makes LaTeX dimension
+ setting as a option (headsep, footskip, hoffset, and etc)
+ effective at the beginning of \geom@process for 'pass' option.
+ * Revised internal codes specifying papersize.
+ * Changed the way of displaying options and parameters in 'verbose' mode.
+
+2002-04-25 Release 3.0 beta
+ * Added 'screen' option as a new papersize (papersize={225mm,180mm}).
+ To make presentation with PC and video projector, geometry option
+ "screen,centering" with 'slide' documentclass must be the best choise.
+ * Added 'pass' option, which disables geometry's auto-layout.
+ * Added 'ratio' option equivalent to 'marginratio'.
+ * Added 'centering', a shortcut for 'marginratio=1:1'.
+ * Added 'innermargin' and 'outermargin', aliases for leftmargin
+ and rightmargin respectively.
+
+2002-04-22
+ * 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
+ head/foot/marginpars spaces.
+ * 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
+ value should be a positive integer less than 100 to avoid
+ arithmetic overflow. In default, hmarginratio=2:3 (1:2 for
+ twoside) and vmarginratio=1:2.
+ * The 'automatic' centering is no longer default layout,
+ so marginratio={2:3,1:2} is used as default.
+ * Removed twosideshift option, use bindingoffset instead.
+ bindingoffset is set 0pt as default and supports twoside.
+
+2000-06-28 Release 2.3
+ * Added 'truedimen', 'columnsep' and 'footnotesep' options.
+ * VTeX supported.
+ * Modified internal settings for twosideshift and mag.
+
+1999-10-07 Release 2.2
+ * Bug fixed: explicit twoside was needed for book.cls.
+
+1999-09-27 Release 2.1
+ * Bug fixed: twosideshift with reversemarginpar made wrong margins.
+ * Added mag option.
+ * Paper sizes A6 and B6 supported.
+ * Changed license declaration to LPPL.
+
+1998-04-06 Release 2.0
+ * Flexible setting scheme for package option with keyval.
+ * Removed exclamations and extra control sequences for paperwidth
+ and paperheight.
+ * Totally revised the code and document.
+
+1997-09-08 Release 1.08
+ * Included geometry.cfg into geometry.dtx.
+ * Changed the catcode of exclamation mark.
+
+1997-07-05 Release 1.07
+ * Modified process of 'dvips' option.
+ * pdftex supported.
+ * Added 'a0paper' and 'b0paper'.
+
+1997-04-16 Release 1.06
+ * reversemarginpar supported.
+
+1997-02-17 Release 1.05
+ * Changed the definition for dvips option.
+
+1996-08-05 Release 1.04
+ * Bug fixed: papersize= had no effect when papertype was given
+ in geometry.cfg or as a package option.
+
+1996-07-17 Release 1.03
+ * calc support
+
+1996-06-07 Release 1.02
+ * Changed definition for 'reset' option.
+ * Revised instructions for 'reset' and 'dvips' options.
+
+1996-06-03 Release 1.01
+ * Fixed bugs in setting paper and option processing.
+ * geometry.cfg
+ * Added 'dvips' option.
+
+1996-05-31 Release 1.00
+ * Started geometry package distribution.
+ * Use keyval interface.
-1996-05-31 Hideo Umeki
- * Release 1.00
- * Started geometry package distribution.
- * Use keyval interface.
EOF
diff --git a/Master/texmf-dist/doc/latex/geometry/geometry-samples.tex b/Master/texmf-dist/doc/latex/geometry/geometry-samples.tex
index e035f9f10dc..d51bd898465 100644
--- a/Master/texmf-dist/doc/latex/geometry/geometry-samples.tex
+++ b/Master/texmf-dist/doc/latex/geometry/geometry-samples.tex
@@ -23,8 +23,8 @@
%% This work consists of the files geometry.dtx and
%% the derived files: geometry.{sty,ins,drv}, geometry-samples.tex.
%%
-\documentclass{article}% uses letterpaper by default
-% \documentclass[a4paper]{article}% for A4 paper
+\documentclass[12pt]{article}% uses letterpaper by default
+% \documentclass[12pt,a4paper]{article}% for A4 paper
%---------------------------------------------------------------
% Edit and uncomment one of the settings below
%---------------------------------------------------------------
@@ -55,18 +55,16 @@
%---------------------------------------------------------------
% No need to change below
%---------------------------------------------------------------
-\geometry{verbose,showframe}% options appended.
-\newcommand\mynote{\marginpar%
-[\raggedright\rule{\marginparwidth}{.7pt}\\A left side note.]%
-{\raggedright\rule{\marginparwidth}{.7pt}\\A side note.}}%
-\def\fox{A quick brown fox jumps over the lazy dog. }
-\def\fivefoxes{\fox\fox\fox\fox\fox}
-\def\manyfoxes{\fivefoxes\mynote\fivefoxes\par\fivefoxes\fivefoxes\par}
-% \let\mynote\relax % removes marginal notes.
+\geometry{verbose,showframe}% the options appended.
+\usepackage{lipsum}% for dummy text of 150 paragraphs
+\newcommand\mynote{\marginpar[\raggedright
+A sample margin note in the left side.]%
+{\raggedright A sample margin note.}}%
+\newcommand\myfootnote{\footnote{This is a sample footnote text.}}
\begin{document}
-\manyfoxes\manyfoxes\manyfoxes\manyfoxes
-\manyfoxes\manyfoxes\manyfoxes\manyfoxes
-\manyfoxes\manyfoxes\manyfoxes\manyfoxes
+\lipsum[1-2]\mynote\lipsum[3-4]\mynote
+\lipsum[5-11]\mynote\lipsum[12]\myfootnote
+\lipsum[13-22]\mynote\lipsum[23-32]
\end{document}
\endinput
%%
diff --git a/Master/texmf-dist/doc/latex/geometry/geometry.pdf b/Master/texmf-dist/doc/latex/geometry/geometry.pdf
index 8fc40e0a1f3..b99027684dd 100644
--- a/Master/texmf-dist/doc/latex/geometry/geometry.pdf
+++ b/Master/texmf-dist/doc/latex/geometry/geometry.pdf
Binary files differ