geometry (2jan20)

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

7 files changed, 90 insertions, 7 deletions

diff --git a/Master/texmf-dist/doc/latex/geometry/README.md b/Master/texmf-dist/doc/latex/geometry/README.md
index ebdb25bf4d1..1b88d806474 100644
--- a/Master/texmf-dist/doc/latex/geometry/README.md
+++ b/Master/texmf-dist/doc/latex/geometry/README.md
@@ -1,10 +1,10 @@
-LaTeX Package: Geometry 2010/09/12 v5.6
+LaTeX Package: Geometry 2020/01/02 v5.9
 ----------------------------------------
 Flexible and complete interface to document dimensions.
 
 Copyright (C) 1996-2010
 by Hideo Umeki <latexgeometry@gmail.com>
-Copyright (C) 2018
+Copyright (C) 2018-202
 Hideo Umeki and David Carlisle https://github.com/davidcarlisle/geometry
 
 Abstract:
@@ -18,6 +18,10 @@ CTAN: macros/latex/contrib/geometry
 
 Recent changes:
 
+[Release 5.9]
+Do not load ifxetex and ifpdf packages (use combined iftex package)
+Include German translation of the documentation.
+
 [Release 5.8]
 Add xdvipdfmx and dvipdfmx alias for dvipdfm option.
 
@@ -28,9 +32,11 @@ Add support for luatex (with new comand names introduced in luatex 0.85)
 
 Files:
   * README.md         -  this file
-  * changes.txt    -  history of changes
-  * geometry.dtx   -  including sources and documentation
-  * geometry.pdf   -  print-ready documentation
+  * changes.txt       -  history of changes
+  * geometry.dtx      -  including sources and documentation
+  * geometry.pdf      -  print-ready documentation
+  * geometry-de.dtx   -  German translation
+  * geometry-de.pdf   -  German translation
 
 Installation: 
 [manual installation]
diff --git a/Master/texmf-dist/doc/latex/geometry/changes.txt b/Master/texmf-dist/doc/latex/geometry/changes.txt
index c4633444382..75efb2d6b2a 100644
--- a/Master/texmf-dist/doc/latex/geometry/changes.txt
+++ b/Master/texmf-dist/doc/latex/geometry/changes.txt
@@ -1,3 +1,7 @@
+2020-01-02 Release 5.9
+  * Include German translation (previously distributed as geometry-de on ctan)
+  * Use iftex versions of \ifxetex, \ifpdf
+
 2018-04-16 Release 5.8
   * Documentation fixes.
   * (x)dvipdfmx alias for dvipdfm otion.
diff --git a/Master/texmf-dist/doc/latex/geometry/geometry-de.pdf b/Master/texmf-dist/doc/latex/geometry/geometry-de.pdf
new file mode 100644
index 00000000000..d3b6408dd20
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/geometry/geometry-de.pdf
diff --git a/Master/texmf-dist/doc/latex/geometry/geometry-samples-de.tex b/Master/texmf-dist/doc/latex/geometry/geometry-samples-de.tex
new file mode 100644
index 00000000000..4f83d44c70b
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/geometry/geometry-samples-de.tex
@@ -0,0 +1,73 @@
+%%
+%% This is file `geometry-samples-de.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% geometry-de.dtx  (with options: `samples')
+%% 
+%% Copyright (C) 1996-2010
+%% by Hideo Umeki <latexgeometry@gmail.com>
+%% Copyright (C) 2018-2020
+%% by Hideo Umeki and David Carlisle https://github.com/davidcarlisle/geometry
+%% 
+%% 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
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%% 
+%% This work is "maintained" (as per the LPPL maintenance status)
+%% by David Carlisle.
+%% 
+%% This work consists of the files geometry.dtx and
+%% the derived files: geometry.{sty,ins,drv}, geometry-samples.tex.
+%% 
+\documentclass[12pt]{article}% uses letterpaper by default
+% \documentclass[12pt,a4paper]{article}% for A4 paper
+%---------------------------------------------------------------
+% Edit and uncomment one of the settings below
+%---------------------------------------------------------------
+% \usepackage{geometry}
+% \usepackage[centering]{geometry}
+% \usepackage[width=10cm,vscale=.7]{geometry}
+% \usepackage[margin=1cm, papersize={12cm,19cm}, resetpaper]{geometry}
+% \usepackage[margin=1cm,includeheadfoot]{geometry}
+\usepackage[margin=1cm,includeheadfoot,includemp]{geometry}
+% \usepackage[margin=1cm,bindingoffset=1cm,twoside]{geometry}
+% \usepackage[hmarginratio=2:1, vmargin=2cm]{geometry}
+% \usepackage[hscale=0.5,twoside]{geometry}
+% \usepackage[hscale=0.5,asymmetric]{geometry}
+% \usepackage[hscale=0.5,heightrounded]{geometry}
+% \usepackage[left=1cm,right=4cm,top=2cm,includefoot]{geometry}
+% \usepackage[lines=20,left=2cm,right=6cm,top=2cm,twoside]{geometry}
+% \usepackage[width=15cm, marginparwidth=3cm, includemp]{geometry}
+% \usepackage[hdivide={1cm,,2cm}, vdivide={3cm,8in,}, nohead]{geometry}
+% \usepackage[headsep=20pt, head=40pt,foot=20pt,includeheadfoot]{geometry}
+% \usepackage[text={6in,8in}, top=2cm, left=2cm]{geometry}
+% \usepackage[centering,includemp,twoside,landscape]{geometry}
+% \usepackage[mag=1414,margin=2cm]{geometry}
+% \usepackage[mag=1414,margin=2truecm,truedimen]{geometry}
+% \usepackage[a5paper, landscape, twocolumn, twoside,
+%    left=2cm, hmarginratio=2:1, includemp, marginparwidth=43pt,
+%    bottom=1cm, foot=.7cm, includefoot, textheight=11cm, heightrounded,
+%    columnsep=1cm,verbose]{geometry}
+%---------------------------------------------------------------
+% No need to change below
+%---------------------------------------------------------------
+\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}
+\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
+%%
+%% End of file `geometry-samples-de.tex'.
diff --git a/Master/texmf-dist/doc/latex/geometry/geometry-samples.tex b/Master/texmf-dist/doc/latex/geometry/geometry-samples.tex
index 7425041e290..1febb818e86 100644
--- a/Master/texmf-dist/doc/latex/geometry/geometry-samples.tex
+++ b/Master/texmf-dist/doc/latex/geometry/geometry-samples.tex
@@ -8,7 +8,7 @@
 %% 
 %% Copyright (C) 1996-2010
 %% by Hideo Umeki <latexgeometry@gmail.com>
-%% Copyright (C) 2018
+%% Copyright (C) 2018-2020
 %% by Hideo Umeki and David Carlisle https://github.com/davidcarlisle/geometry
 %% 
 %% This work may be distributed and/or modified under the conditions of
diff --git a/Master/texmf-dist/doc/latex/geometry/geometry.cfg b/Master/texmf-dist/doc/latex/geometry/geometry.cfg
index ee5894a4843..4861ae2a3e6 100644
--- a/Master/texmf-dist/doc/latex/geometry/geometry.cfg
+++ b/Master/texmf-dist/doc/latex/geometry/geometry.cfg
@@ -8,7 +8,7 @@
 %% 
 %% Copyright (C) 1996-2010
 %% by Hideo Umeki <latexgeometry@gmail.com>
-%% Copyright (C) 2018
+%% Copyright (C) 2018-2020
 %% by Hideo Umeki and David Carlisle https://github.com/davidcarlisle/geometry
 %% 
 %% This work may be distributed and/or modified under the conditions of
diff --git a/Master/texmf-dist/doc/latex/geometry/geometry.pdf b/Master/texmf-dist/doc/latex/geometry/geometry.pdf
index 66f3c55c4e7..8bb0d972109 100644
--- a/Master/texmf-dist/doc/latex/geometry/geometry.pdf
+++ b/Master/texmf-dist/doc/latex/geometry/geometry.pdf