geometry update for test files, plus leave geometry.cfg in doc

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

21 files changed, 883 insertions, 0 deletions

diff --git a/Master/texmf-dist/doc/latex/geometry/ChangeLog b/Master/texmf-dist/doc/latex/geometry/ChangeLog
new file mode 100644
index 00000000000..5bbf5671387
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/geometry/ChangeLog
@@ -0,0 +1,231 @@
+2002-07-08 Hideo UMEKI <hideo.umeki@toshiba.co.jp>
+      * 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.
+      * Bug fix: double-valued marginratio setting like {1:1,1:5} didn't
+        work properly. {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.
+        (I'd like to thank Rolf Niepraschk for his pointing out the bug.)
+      * Added two test files: gtest15.tex gtest16.tex
+
+2002-07-04 Hideo UMEKI <hideo.umeki@toshiba.co.jp>
+      * Release 3.1
+      * Bug fix: 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 <hideo.umeki@toshiba.co.jp>
+      (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 <hideo.umeki@toshiba.co.jp>
+      * 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 <hideo.umeki@toshiba.co.jp>
+      * 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 <hideo.umeki@toshiba.co.jp>
+      * 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 <hideo.umeki@toshiba.co.jp>
+      * 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 <hideo.umeki@toshiba.co.jp>
+      * '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 <hideo.umeki@toshiba.co.jp>
+      * 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 <hideo.umeki@toshiba.co.jp>
+      * 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 <hideo.umeki@toshiba.co.jp>
+      * 'asymmetric' just sets \@mparswitchfalse. 'asymmetric=false' does
+        nothing.
+      * '\geom@process' revised.
+
+2002-05-14 Hideo UMEKI <hideo.umeki@toshiba.co.jp>
+      * '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 <hideo.umeki@toshiba.co.jp>
+      * 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 <hideo.umeki@toshiba.co.jp>
+      * 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 <hideo.umeki@toshiba.co.jp>
+      * 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 <hideo.umeki@toshiba.co.jp>
+      * \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  Hideo UMEKI <hideo.umeki@toshiba.co.jp>
+      * 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 <hideo.umeki@toshiba.co.jp>
+      * 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 <hideo.umeki@toshiba.co.jp>
+      * Release 2.3
+      * Added `truedimen', `columnsep' and `footnotesep' options.
+      * VTeX supported.
+      * Modified internal settings for twosideshift and mag.
+
+1999-10-07  Hideo UMEKI <hideo.umeki@toshiba.co.jp>
+      * Release 2.2
+      * Bug fixed: explicit twoside was needed for book.cls.
+
+1999-09-27  Hideo UMEKI <hideo.umeki@toshiba.co.jp>
+      * 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 <hideo.umeki@toshiba.co.jp>
+      * 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 <hideo.umeki@toshiba.co.jp>
+      * Release 1.08
+      * Included geometry.cfg into geometry.dtx.
+      * Changed the catcode of exclamation mark.
+
+1997-07-05  Hideo UMEKI <hideo.umeki@toshiba.co.jp>
+      * Release 1.07
+      * Modified process of 'dvips' option.
+      * pdftex supported.
+      * Added `a0paper' and `b0paper'.
+
+1997-04-16  Hideo UMEKI <hideo.umeki@toshiba.co.jp>
+      * Release 1.06
+      * reversemarginpar supported.
+
+1997-02-17  Hideo UMEKI <hideo.umeki@toshiba.co.jp>
+      * Release 1.05
+      * Changed the definition for dvips option.
+
+1996-08-05  Hideo UMEKI <hideo.umeki@toshiba.co.jp>
+      * 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 <hideo.umeki@toshiba.co.jp>
+      * Release 1.03
+      * calc support
+
+1996-06-07  Hideo UMEKI <hideo.umeki@toshiba.co.jp>
+      * Release 1.02
+      * Changed definition for `reset' option.
+      * Revised instructions for `reset' and `dvips' options.
+
+1996-06-03  Hideo UMEKI <hideo.umeki@toshiba.co.jp>
+      * Release 1.01
+      * Fixed bugs in setting paper and option processing.
+      * geometry.cfg
+      * Added `dvips' option.
+
+1996-05-31  Hideo UMEKI <hideo.umeki@toshiba.co.jp>
+      * Release 1.00
+      * Started geometry package distribution.
+      * Use keyval interface.
+EOF
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/geometry/geometry.cfg b/Master/texmf-dist/doc/latex/geometry/geometry.cfg
new file mode 100644
index 00000000000..9bafe583219
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/geometry/geometry.cfg
@@ -0,0 +1,23 @@
+%%
+%% This is file `geometry.cfg',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% geometry.dtx  (with options: `config')
+%% 
+%% File: geometry.dtx Copyright (C) 1996-2002 Hideo Umeki
+%%                              (hideo.umeki@toshiba.co.jp)
+%%
+%% This package may be distributed under the terms of the LaTeX
+%% Project Public License, as described in lppl.txt in the base
+%% LaTeX distribution, either version 1.2 or (at your option)
+%% any later version.
+%%
+
+%% Uncomment and edit the line below to set default options.
+%%\ExecuteOptions{a4paper,dvips}
+
+\endinput
+%%
+%% End of file `geometry.cfg'.
diff --git a/Master/texmf-dist/doc/latex/geometry/sample.dvi b/Master/texmf-dist/doc/latex/geometry/sample.dvi
deleted file mode 100644
index 48db46e50ca..00000000000
--- a/Master/texmf-dist/doc/latex/geometry/sample.dvi
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/geometry/test/Makefile b/Master/texmf-dist/doc/latex/geometry/test/Makefile
new file mode 100644
index 00000000000..ff46011bca7
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/geometry/test/Makefile
@@ -0,0 +1,26 @@
+RM=rm -f
+SHELL=sh
+VERSION=3.0
+JUNKS=*.aux *.toc *.idx *.drv *.dvi *.log *.lof *.ist *.ilg *.ind *.out
+
+all: test
+
+#
+#  You need to put the new geometry.sty in 
+#  the current directory or a directory searched by LaTeX.
+#
+test:
+	@echo
+	@(for f in gtest*tex; do latex $$f; done)
+	@echo
+	@echo "--- Summary of Tests ---"
+	@(grep -h Test gtest*.log)
+	@echo "-------------------------"
+
+clean:
+	@$(RM) $(JUNKS) *~ \#*
+	@echo 'Test directory has been cleaned up except geometry.{sty,cfg}.'
+
+veryclean: clean
+	@$(RM) geometry.sty geometry.cfg
+	@echo Test directory has been cleaned up.
diff --git a/Master/texmf-dist/doc/latex/geometry/test/gcheck.sty b/Master/texmf-dist/doc/latex/geometry/test/gcheck.sty
new file mode 100644
index 00000000000..787e5e5b7c5
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/geometry/test/gcheck.sty
@@ -0,0 +1,49 @@
+\usepackage{calc}
+
+\newif\ifcheckpass
+\checkpasstrue
+
+\def\checkresults{%
+  \ifcheckpass
+    \typeout{---^^JTest (\jobname): success.^^J---}
+  \else
+    \typeout{---^^JTest (\jobname): FAILED.\@spaces Check \jobname.log.^^J---}
+  \fi
+}
+
+\def\dcheck#1#2{%
+  \setlength\@tempdima{#2}%
+  \setlength\@tempdimb{#2}%
+  \addtolength\@tempdimb{-#1}%
+  \@tempcnta=\z@
+  \ifdim\@tempdimb > -0.01pt
+    \ifdim\@tempdimb < 0.01pt
+      \@tempcnta=\@ne
+      \wlog{OK: #1= \the#1 (diff=\the\@tempdimb).}
+    \fi
+  \fi
+  \ifnum\@tempcnta=\z@
+    \checkpassfalse
+    \immediate\typeout{NG: #1= \the#1 (expected=\the\@tempdima).}
+  \fi}
+
+\def\ccheck#1#2{%
+  \edef\@@tempa{#2}
+  \@tempcnta=\@@tempa
+  \advance\@tempcnta-#1\relax
+  \ifnum\@tempcnta=\z@
+    \wlog{OK: #1= \the#1 (diff=\the\@tempcnta).}
+  \else
+    \checkpassfalse
+    \immediate\typeout{NG: #1= \the#1 (expected=\@@tempa).}
+  \fi}
+
+\def\nompstring{\renewcommand\mynote\relax}
+
+\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.
diff --git a/Master/texmf-dist/doc/latex/geometry/test/gtest01.tex b/Master/texmf-dist/doc/latex/geometry/test/gtest01.tex
new file mode 100644
index 00000000000..f10bf1f0d9b
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/geometry/test/gtest01.tex
@@ -0,0 +1,35 @@
+\documentclass{article}%
+
+\usepackage{gcheck}
+
+\usepackage[a5paper, landscape, twocolumn, twoside,
+   left=2cm, hmarginratio=2:1, includemp, marginparwidth=43pt, 
+   bottom=1cm, foot=20pt, includefoot, textheight=300pt, heightrounded,
+   columnsep=1cm]{geometry}
+\geometry{showframe,dvips}
+
+\begin{document}
+
+\typeout{}
+\dcheck\paperwidth{597.50787pt}
+\dcheck\paperheight{423.94606pt}
+\dcheck\textwidth{404.14963pt}
+\dcheck\textheight{298.0pt}% because of 'heightrounded'
+\dcheck\oddsidemargin{38.63551pt}
+\dcheck\evensidemargin{10.18275pt}
+\dcheck\topmargin{-33.77667pt}
+\dcheck\headheight{12.0pt}
+\dcheck\headsep{25.0pt}
+\dcheck\footskip{20pt}
+\dcheck\marginparwidth{43.0pt}
+\dcheck\marginparsep{11.0pt}
+\dcheck\columnsep{28.45274pt}
+\dcheck\hoffset{0pt}
+\dcheck\voffset{0pt}
+\ccheck\mag{1000}
+\checkresults
+\typeout{}
+
+\manyfoxes\manyfoxes\manyfoxes\manyfoxes
+\manyfoxes\manyfoxes\manyfoxes\manyfoxes
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/geometry/test/gtest02.tex b/Master/texmf-dist/doc/latex/geometry/test/gtest02.tex
new file mode 100644
index 00000000000..9c242e8de1d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/geometry/test/gtest02.tex
@@ -0,0 +1,36 @@
+\documentclass[12pt,landscape,twoside]{book}
+\usepackage{gcheck}
+
+\usepackage[portrait]{geometry}
+\geometry{landscape=false, includemp, margin=1cm, 
+          bindingoffset=1cm, heightrounded} 
+\geometry{marginparwidth=3cm, includehead}
+\geometry{dvipdfm=false}
+\geometry{mag=1414, truedimen}
+\geometry{showframe}
+
+\begin{document}
+
+\typeout{}
+\dcheck\paperwidth{614.28824pt}
+\dcheck\paperheight{794.96506pt}
+\dcheck\textwidth{256.72127pt}
+\dcheck\textheight{476.0pt}
+\dcheck\oddsidemargin{5.79622pt}
+\dcheck\evensidemargin{69.70174pt}
+\dcheck\topmargin{-22.65652pt}
+\dcheck\headheight{12pt}
+\dcheck\headsep{19.8738pt}
+\dcheck\footskip{30pt}
+\dcheck\marginparwidth{85.35826pt}
+\dcheck\marginparsep{7pt}
+\dcheck\columnsep{10pt}
+\dcheck\hoffset{0pt}
+\dcheck\voffset{0pt}
+\ccheck\mag{1414}
+\checkresults
+\typeout{}
+
+\manyfoxes\manyfoxes\manyfoxes\manyfoxes
+\manyfoxes\manyfoxes\manyfoxes\manyfoxes
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/geometry/test/gtest03.tex b/Master/texmf-dist/doc/latex/geometry/test/gtest03.tex
new file mode 100644
index 00000000000..4cea6af6a79
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/geometry/test/gtest03.tex
@@ -0,0 +1,32 @@
+\documentclass{report}
+\usepackage{gcheck}
+
+\usepackage[]{geometry}
+\geometry{margin=10pt}
+\geometry{showframe,dvips}
+
+\begin{document}
+
+\typeout{}
+\dcheck\paperwidth{614.28824pt}
+\dcheck\paperheight{794.96506pt}
+\dcheck\textwidth{594.295pt}
+\dcheck\textheight{774.96999pt}
+\dcheck\oddsidemargin{-62.26999pt}
+\dcheck\evensidemargin{-62.26999pt}
+\dcheck\topmargin{-99.26999pt}
+\dcheck\headheight{12pt}
+\dcheck\headsep{25pt}
+\dcheck\footskip{30pt}
+\dcheck\marginparwidth{65pt}
+\dcheck\marginparsep{11pt}
+\dcheck\columnsep{10pt}
+\dcheck\hoffset{0pt}
+\dcheck\voffset{0pt}
+\ccheck\mag{1000}
+\checkresults
+\typeout{}
+
+\manyfoxes\manyfoxes\manyfoxes\manyfoxes
+\manyfoxes\manyfoxes\manyfoxes\manyfoxes
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/geometry/test/gtest04.tex b/Master/texmf-dist/doc/latex/geometry/test/gtest04.tex
new file mode 100644
index 00000000000..6e7b35bd864
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/geometry/test/gtest04.tex
@@ -0,0 +1,31 @@
+\documentclass{report}
+\usepackage{gcheck}
+
+\usepackage[dvips,showframe]{geometry}
+\geometry{screen,margin={50pt,30pt},foot=20pt}
+
+\begin{document}
+
+\typeout{}
+\dcheck\paperwidth{640.187pt}
+\dcheck\paperheight{512.1496pt}
+\dcheck\textwidth{540.187pt}
+\dcheck\textheight{452.1496pt}
+\dcheck\oddsidemargin{-22.26999pt}
+\dcheck\evensidemargin{-22.26999pt}
+\dcheck\topmargin{-79.26999pt}
+\dcheck\headheight{12pt}
+\dcheck\headsep{25pt}
+\dcheck\footskip{20pt}
+\dcheck\marginparwidth{65pt}
+\dcheck\marginparsep{11pt}
+\dcheck\columnsep{10pt}
+\dcheck\hoffset{0pt}
+\dcheck\voffset{0pt}
+\ccheck\mag{1000}
+\checkresults
+\typeout{}
+
+\manyfoxes\manyfoxes\manyfoxes\manyfoxes
+\manyfoxes\manyfoxes\manyfoxes\manyfoxes
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/geometry/test/gtest05.tex b/Master/texmf-dist/doc/latex/geometry/test/gtest05.tex
new file mode 100644
index 00000000000..192a6b8f760
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/geometry/test/gtest05.tex
@@ -0,0 +1,32 @@
+\documentclass[twocolumn,twoside]{report}
+\usepackage{gcheck}
+
+\usepackage[reset]{geometry}
+\geometry{width=600pt,left=2cm,right=1cm}
+\geometry{dvips,showframe, columnsep=20pt}
+
+\begin{document}
+
+\typeout{}
+\dcheck\paperwidth{614.295pt}
+\dcheck\paperheight{794.96999pt}
+\dcheck\textwidth{528.93675pt}
+\dcheck\textheight{556.47656pt}
+\dcheck\oddsidemargin{-15.36449pt}
+\dcheck\evensidemargin{-43.81725pt}
+\dcheck\topmargin{-13.87262pt}
+\dcheck\headheight{12pt}
+\dcheck\headsep{25pt}
+\dcheck\footskip{30pt}
+\dcheck\marginparwidth{48pt}
+\dcheck\marginparsep{10pt}
+\dcheck\columnsep{20pt}
+\dcheck\hoffset{0pt}
+\dcheck\voffset{0pt}
+\ccheck\mag{1000}
+\checkresults
+\typeout{}
+
+\manyfoxes\manyfoxes\manyfoxes\manyfoxes
+\manyfoxes\manyfoxes\manyfoxes\manyfoxes
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/geometry/test/gtest06.tex b/Master/texmf-dist/doc/latex/geometry/test/gtest06.tex
new file mode 100644
index 00000000000..7e928915528
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/geometry/test/gtest06.tex
@@ -0,0 +1,35 @@
+\documentclass[a4paper,twoside]{book}
+\usepackage{gcheck}
+
+\usepackage[margin=1cm,includehead]{geometry}
+\geometry{reset,  a3paper, landscape}
+\geometry{a6paper,  hmargin={1cm,0.5cm},  heightrounded}
+\geometry{portrait,  a5paper, centering }
+% `centering' (marginratio=1:1) is ineffective `hmargin'.
+\geometry{dvips,  showframe}
+
+\begin{document}
+
+\typeout{}
+\dcheck\paperwidth{423.94606pt}
+\dcheck\paperheight{597.50787pt}
+\dcheck\textwidth{381.26695pt}
+\dcheck\textheight{418.0pt}
+\dcheck\oddsidemargin{-43.81725pt}
+\dcheck\evensidemargin{-58.04362pt}
+\dcheck\topmargin{-12.71039pt}
+\dcheck\headheight{12pt}
+\dcheck\headsep{18.06749pt}
+\dcheck\footskip{25.29494pt}
+\dcheck\marginparwidth{115pt}
+\dcheck\marginparsep{7.0pt}
+\dcheck\columnsep{10pt}
+\dcheck\hoffset{0pt}
+\dcheck\voffset{0pt}
+\ccheck\mag{1000}
+\checkresults
+\typeout{}
+
+\manyfoxes\manyfoxes\manyfoxes\manyfoxes
+\manyfoxes\manyfoxes\manyfoxes\manyfoxes
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/geometry/test/gtest07.tex b/Master/texmf-dist/doc/latex/geometry/test/gtest07.tex
new file mode 100644
index 00000000000..7b9be3ad845
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/geometry/test/gtest07.tex
@@ -0,0 +1,34 @@
+\documentclass[]{article}
+\usepackage{gcheck}
+
+\usepackage[a4paper,portrait,landscape,portrait,a4paper]{geometry}
+\geometry{landscape,landscape,portrait,a4paper}
+\geometry{top=2cm,twoside,twoside=false}
+\geometry{twoside}
+\geometry{dvips,showframe}
+
+\begin{document}
+
+\typeout{}
+\dcheck\paperwidth{597.50787pt}
+\dcheck\paperheight{845.04684pt}
+\dcheck\textwidth{418.25368pt}
+\dcheck\textheight{702.7831pt}
+\dcheck\oddsidemargin{-0.56833pt}
+\dcheck\evensidemargin{35.28255pt}
+\dcheck\topmargin{-52.36449pt}
+\dcheck\headheight{12pt}
+\dcheck\headsep{25.0pt}
+\dcheck\footskip{30pt}
+\dcheck\marginparwidth{65pt}
+\dcheck\marginparsep{11pt}
+\dcheck\columnsep{10pt}
+\dcheck\hoffset{0pt}
+\dcheck\voffset{0pt}
+\ccheck\mag{1000}
+\checkresults
+\typeout{}
+
+\manyfoxes\manyfoxes\manyfoxes\manyfoxes
+\manyfoxes\manyfoxes\manyfoxes\manyfoxes
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/geometry/test/gtest08.tex b/Master/texmf-dist/doc/latex/geometry/test/gtest08.tex
new file mode 100644
index 00000000000..014f9beeaee
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/geometry/test/gtest08.tex
@@ -0,0 +1,32 @@
+\documentclass[]{article}
+\usepackage{gcheck}
+
+\usepackage[compat2,twosideshift=10pt, marginpar=50pt,
+            dvips, showframe]{geometry}
+\geometry{twosideshift=8pt}
+
+\begin{document}
+
+\typeout{}
+\dcheck\paperwidth{614.295pt}
+\dcheck\paperheight{794.96999pt}
+\dcheck\textwidth{430.43787pt}
+\dcheck\textheight{648.46812pt}
+\dcheck\oddsidemargin{-2.84143pt}
+\dcheck\evensidemargin{42.15858pt}
+\dcheck\topmargin{-32.51906pt}
+\dcheck\headheight{12pt}
+\dcheck\headsep{25.0pt}
+\dcheck\footskip{30pt}
+\dcheck\marginparwidth{50pt}
+\dcheck\marginparsep{11pt}
+\dcheck\columnsep{10pt}
+\dcheck\hoffset{0pt}
+\dcheck\voffset{0pt}
+\ccheck\mag{1000}
+\checkresults
+\typeout{}
+
+\manyfoxes\manyfoxes\manyfoxes\manyfoxes
+\manyfoxes\manyfoxes\manyfoxes\manyfoxes
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/geometry/test/gtest09.tex b/Master/texmf-dist/doc/latex/geometry/test/gtest09.tex
new file mode 100644
index 00000000000..c0043ad0358
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/geometry/test/gtest09.tex
@@ -0,0 +1,36 @@
+\documentclass[twoside]{article}%
+
+\setlength{\headheight}{12pt}
+\setlength{\headsep}{10pt}
+
+\usepackage{gcheck}
+\usepackage[left=1in,top=1in, width=5in, asymmetric]{geometry}
+\geometry{bindingoffset=20pt}
+\geometry{showframe,dvips}
+
+\begin{document}
+
+\typeout{}
+\dcheck\paperwidth{8.5in}
+\dcheck\paperheight{11in}
+\dcheck\textwidth{361.34999pt}
+\dcheck\textheight{614.29501pt}
+\dcheck\oddsidemargin{20pt}% because of 'bindingoffset=20pt'
+\dcheck\evensidemargin{0pt}
+\dcheck\topmargin{-10pt-12pt}
+\dcheck\headheight{12.0pt}
+\dcheck\headsep{10pt}
+\dcheck\footskip{30pt}
+\dcheck\marginparwidth{121.0pt}
+\dcheck\marginparsep{11.0pt}
+\dcheck\columnsep{10pt}
+\dcheck\hoffset{0pt}
+\dcheck\voffset{0pt}
+\ccheck\mag{1000}
+\checkresults
+\typeout{}
+
+\manyfoxes\manyfoxes\manyfoxes\manyfoxes
+\manyfoxes\manyfoxes\manyfoxes\manyfoxes
+\manyfoxes\manyfoxes\manyfoxes\manyfoxes
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/geometry/test/gtest10.tex b/Master/texmf-dist/doc/latex/geometry/test/gtest10.tex
new file mode 100644
index 00000000000..5f026a04d68
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/geometry/test/gtest10.tex
@@ -0,0 +1,31 @@
+\documentclass[]{book}%
+
+\usepackage{gcheck}
+
+\usepackage[a6paper,twoside]{geometry}
+\geometry{dvips,showframe}
+
+\begin{document}
+
+\typeout{}
+\dcheck\paperwidth{298.75394pt}
+\dcheck\paperheight{423.94606pt}
+\dcheck\textwidth{209.12683pt}
+\dcheck\textheight{296.76094pt}
+\dcheck\oddsidemargin{-36.41916pt}
+\dcheck\evensidemargin{-18.49371pt}
+\dcheck\topmargin{-51.46346pt}
+\dcheck\headheight{12.0pt}
+\dcheck\headsep{18.06749pt}
+\dcheck\footskip{25.29494pt}
+\dcheck\marginparwidth{125.0pt}
+\dcheck\marginparsep{7.0pt}
+\dcheck\columnsep{10pt}
+\dcheck\hoffset{0pt}
+\dcheck\voffset{0pt}
+\ccheck\mag{1000}
+\checkresults
+\typeout{}
+
+\manyfoxes\manyfoxes\manyfoxes
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/geometry/test/gtest11.tex b/Master/texmf-dist/doc/latex/geometry/test/gtest11.tex
new file mode 100644
index 00000000000..7137567d396
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/geometry/test/gtest11.tex
@@ -0,0 +1,34 @@
+\documentclass[]{article}%
+
+\usepackage{gcheck}
+
+\usepackage[a6paper,asymmetric, bindingoffset=18pt,
+  marginparwidth=.8in, reversemp,
+  hmarginratio=2:1, vmarginratio=4:5,
+  left=1in, top=1in]{geometry}
+\geometry{dvips,showframe}
+
+\begin{document}
+
+\typeout{}
+\dcheck\paperwidth{298.75394pt}
+\dcheck\paperheight{423.94606pt}
+\dcheck\textwidth{172.34895pt}
+\dcheck\textheight{261.3386pt}
+\dcheck\oddsidemargin{18.0pt}
+\dcheck\evensidemargin{0pt}
+\dcheck\topmargin{-37.0pt}
+\dcheck\headheight{12.0pt}
+\dcheck\headsep{25.0pt}
+\dcheck\footskip{30pt}
+\dcheck\marginparwidth{57.81621pt}
+\dcheck\marginparsep{11.0pt}
+\dcheck\columnsep{10pt}
+\dcheck\hoffset{0pt}
+\dcheck\voffset{0pt}
+\ccheck\mag{1000}
+\checkresults
+\typeout{}
+
+\manyfoxes\manyfoxes
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/geometry/test/gtest12.tex b/Master/texmf-dist/doc/latex/geometry/test/gtest12.tex
new file mode 100644
index 00000000000..5701c37d01d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/geometry/test/gtest12.tex
@@ -0,0 +1,33 @@
+\documentclass[]{article}%
+
+\usepackage{gcheck}
+
+\usepackage[a6paper,landscape,
+  margin=1in,includeall]{geometry}
+\geometry{right=2in,ignoremp}
+\geometry{dvips,showframe}
+
+\begin{document}
+
+\typeout{}
+\dcheck\paperwidth{423.94606pt}
+\dcheck\paperheight{298.75394pt}
+\dcheck\textwidth{207.13608pt}
+\dcheck\textheight{87.21396pt}
+\dcheck\oddsidemargin{0pt}
+\dcheck\evensidemargin{0pt}
+\dcheck\topmargin{0pt}
+\dcheck\headheight{12pt}
+\dcheck\headsep{25pt}
+\dcheck\footskip{30pt}
+\dcheck\marginparwidth{65pt}
+\dcheck\marginparsep{11pt}
+\dcheck\columnsep{10pt}
+\dcheck\hoffset{0pt}
+\dcheck\voffset{0pt}
+\ccheck\mag{1000}
+\checkresults
+\typeout{}
+
+\manyfoxes
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/geometry/test/gtest13.tex b/Master/texmf-dist/doc/latex/geometry/test/gtest13.tex
new file mode 100644
index 00000000000..a57d28b47da
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/geometry/test/gtest13.tex
@@ -0,0 +1,33 @@
+\documentclass[]{article}%
+
+\usepackage{gcheck}
+
+\usepackage[a5paper, papersize={14cm,20cm},
+ landscape, margin=1in]{geometry}
+\geometry{portrait,landscape}
+\geometry{dvips,showframe}
+
+\begin{document}
+
+\typeout{}
+\dcheck\paperwidth{569.05511pt}
+\dcheck\paperheight{398.33858pt}
+\dcheck\textwidth{424.51514pt}
+\dcheck\textheight{253.7986pt}
+\dcheck\oddsidemargin{0pt}
+\dcheck\evensidemargin{0pt}
+\dcheck\topmargin{-37.0pt}
+\dcheck\headheight{12pt}
+\dcheck\headsep{25pt}
+\dcheck\footskip{30pt}
+\dcheck\marginparwidth{65pt}
+\dcheck\marginparsep{11pt}
+\dcheck\columnsep{10pt}
+\dcheck\hoffset{0pt}
+\dcheck\voffset{0pt}
+\ccheck\mag{1000}
+\checkresults
+\typeout{}
+
+\manyfoxes
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/geometry/test/gtest14.tex b/Master/texmf-dist/doc/latex/geometry/test/gtest14.tex
new file mode 100644
index 00000000000..93486ff959d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/geometry/test/gtest14.tex
@@ -0,0 +1,43 @@
+\documentclass[10pt,a4paper,twoside]{article}
+
+\usepackage{gcheck}
+\usepackage{calc}
+\usepackage[showframe]{geometry}
+
+\geometry{textwidth=\widthof{\texttt{M}}*80,
+          lines=40+5*2-4, centering, includeheadfoot,
+          top=\heightof{\texttt{N}}*10}
+
+\setlength{\parindent}{0pt}
+\begin{document}
+{\ttfamily
+MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM%
+MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM%
+% 80 characters
+}
+
+\bigskip
+\manyfoxes\manyfoxes\manyfoxes\manyfoxes
+\manyfoxes\manyfoxes\manyfoxes\manyfoxes
+
+\typeout{}
+\dcheck\paperwidth{597.50787pt}
+\dcheck\paperheight{845.04684pt}
+\dcheck\textwidth{419.99634pt}
+\dcheck\textheight{550.0pt}
+\dcheck\oddsidemargin{16.48578pt}
+\dcheck\evensidemargin{16.48578pt}
+\dcheck\topmargin{-11.15884pt}
+\dcheck\headheight{12pt}
+\dcheck\headsep{25pt}
+\dcheck\footskip{30pt}
+\dcheck\marginparwidth{111.0pt}
+\dcheck\marginparsep{11pt}
+\dcheck\columnsep{10pt}
+\dcheck\hoffset{0pt}
+\dcheck\voffset{0pt}
+\ccheck\mag{1000}
+\checkresults
+\typeout{}
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/geometry/test/gtest15.tex b/Master/texmf-dist/doc/latex/geometry/test/gtest15.tex
new file mode 100644
index 00000000000..576f955ae41
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/geometry/test/gtest15.tex
@@ -0,0 +1,40 @@
+\documentclass[]{article}
+
+\usepackage{gcheck}
+\usepackage{calc}
+\usepackage{geometry}
+
+% \geometry{compat2,a4paper,mag=1200,truedimen,margin=2cm,
+%   twosideshift=10pt,headsep=7pt,headheight=14.5pt}
+% The case above can be rewritten without 'compat2' as follows:
+ \geometry{a4paper,mag=1200,truedimen,margin=2cm,
+   twoside, left=2cm+10pt, right=2cm-10pt,
+   includeheadfoot, headsep=7pt,headheight=14.5pt}
+
+\geometry{dvips,showframe}
+
+\begin{document}
+\manyfoxes\manyfoxes\manyfoxes\manyfoxes
+\manyfoxes\manyfoxes\manyfoxes\manyfoxes
+
+\typeout{}
+\dcheck\paperwidth{597.49146pt}
+\dcheck\paperheight{845.03174pt}
+\dcheck\textwidth{384.11221pt}
+\dcheck\textheight{538.8947pt}
+\dcheck\oddsidemargin{6.68088pt}
+\dcheck\evensidemargin{-13.31912pt}
+\dcheck\topmargin{-3.31912pt}
+\dcheck\headheight{14.5pt}
+\dcheck\headsep{7.0pt}
+\dcheck\footskip{30pt}
+\dcheck\marginparwidth{65.0pt}
+\dcheck\marginparsep{11pt}
+\dcheck\columnsep{10pt}
+\dcheck\hoffset{0.01344pt}
+\dcheck\voffset{0.01344pt}
+\ccheck\mag{1200}
+\checkresults
+\typeout{}
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/geometry/test/gtest16.tex b/Master/texmf-dist/doc/latex/geometry/test/gtest16.tex
new file mode 100644
index 00000000000..a7b6bac8120
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/geometry/test/gtest16.tex
@@ -0,0 +1,37 @@
+\documentclass[a4paper]{article}
+
+\usepackage{gcheck}
+\usepackage[textwidth=15cm,textheight=20cm,
+            noheadfoot,nomarginpar,
+            marginratio={1:1,1:5}
+%           hmarginratio=1:1, vmarginratio=1:5
+%           ratio={1:1, 1:5}
+            ]{geometry}
+\geometry{showframe,dvips}
+
+\begin{document}
+\nompstring
+\manyfoxes\manyfoxes\manyfoxes\manyfoxes
+\manyfoxes\manyfoxes\manyfoxes\manyfoxes
+
+\typeout{}
+\dcheck\paperwidth{597.50787pt}
+\dcheck\paperheight{845.04684pt}
+\dcheck\textwidth{426.79134pt}
+\dcheck\textheight{569.05511pt}
+\dcheck\oddsidemargin{13.08827pt}
+\dcheck\evensidemargin{13.08827pt}
+\dcheck\topmargin{-26.27138pt}
+\dcheck\headheight{0pt}
+\dcheck\headsep{0pt}
+\dcheck\footskip{0pt}
+\dcheck\marginparwidth{0pt}
+\dcheck\marginparsep{0pt}
+\dcheck\columnsep{10pt}
+\dcheck\hoffset{0pt}
+\dcheck\voffset{0pt}
+\ccheck\mag{1000}
+\checkresults
+\typeout{}
+
+\end{document}