geometry (7may18)

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

2 files changed, 13 insertions, 8 deletions

diff --git a/Master/texmf-dist/source/latex/geometry/geometry.dtx b/Master/texmf-dist/source/latex/geometry/geometry.dtx
index 0df5d53c220..964b901888c 100644
--- a/Master/texmf-dist/source/latex/geometry/geometry.dtx
+++ b/Master/texmf-dist/source/latex/geometry/geometry.dtx
@@ -40,12 +40,12 @@
 %</ignore>
 %<package|driver>\NeedsTeXFormat{LaTeX2e}
 %<package>\ProvidesPackage{geometry}
-%<package>  [2018/03/24 v5.7 Page Geometry]
+%<package>  [2018/04/16 v5.8 Page Geometry]
 %<*install>
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: geometry 2018/03/24 v5.7 Page Geometry}
+\Msg{* Package: geometry 2018/04/16 v5.8 Page Geometry}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -1128,7 +1128,7 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex.
 %
 % \begin{Options}
 % \item[\onlypre driver] specifies the driver with |driver=|\meta{driver name}. 
-% |dvips|, |dvipdfm|, |pdftex|, |vtex|, |xetex|, |auto| and |none| are
+% |dvips|, |dvipdfm|, |pdftex|, |luatex|, |vtex|, |xetex|, |auto| and |none| are
 % available as a driver name. The names except for |auto| and |none| can
 % be specified directly with the name without |driver=|.
 % |driver=auto| makes the auto-detection work whatever the previous setting is. 
@@ -1147,6 +1147,7 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex.
 %      \textsf{xdvipdfmx} to process the dvi output.
 % \item[\onlypre pdftex] sets \cs{pdfpagewidth} and \cs{pdfpageheight}
 %      internally.
+% \item[\onlypre luatex] sets \cs{pagewidth} and \cs{pageheight} internally.
 % \item[\onlypre xetex] is the same as |pdftex| except for ignoring
 %     |\pdf{h,v}origin| undefined in \XeLaTeX{}. This option is introduced in
 %     the version 5. Note that `geometry.cfg' in \TeX{} Live, which disables the
@@ -1294,8 +1295,8 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex.
 %
 % \subsection{Defaults}\label{sec:defaults}
 %
-%　This section sums up the default settings for the auto-completion
-%　described later.
+% This section sums up the default settings for the auto-completion
+% described later.
 % 
 % The default vertical margin ratio is $2/3$, namely,
 % \begin{equation}
@@ -2879,7 +2880,7 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex.
 %    \end{macrocode}
 %  \end{key}
 %  \begin{key}{Gm}{dvips}
-%  \begin{key}{Gm}{dvipdfm}
+%  \begin{key}{Gm}{dvipdfm}\begin{key}{Gm}{dvipdfmx}\begin{key}{Gm}{xdvipdfmx}
 %  \begin{key}{Gm}{pdftex}
 %  \begin{key}{Gm}{luatex}
 %  \begin{key}{Gm}{xetex}
@@ -2891,6 +2892,10 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex.
   \Gm@doifelse{dvips}{#1}{\Gm@setdriver{dvips}}{\Gm@unsetdriver{dvips}}}}%
 \define@key{Gm}{dvipdfm}[true]{\ifGm@preamble{dvipdfm}{%
   \Gm@doifelse{dvipdfm}{#1}{\Gm@setdriver{dvipdfm}}{\Gm@unsetdriver{dvipdfm}}}}%
+\define@key{Gm}{dvipdfmx}[true]{\ifGm@preamble{dvipdfm}{%
+  \Gm@doifelse{dvipdfm}{#1}{\Gm@setdriver{dvipdfm}}{\Gm@unsetdriver{dvipdfm}}}}%
+\define@key{Gm}{xdvipdfmx}[true]{\ifGm@preamble{dvipdfm}{%
+  \Gm@doifelse{dvipdfm}{#1}{\Gm@setdriver{dvipdfm}}{\Gm@unsetdriver{dvipdfm}}}}%
 \define@key{Gm}{pdftex}[true]{\ifGm@preamble{pdftex}{%
   \Gm@doifelse{pdftex}{#1}{\Gm@setdriver{pdftex}}{\Gm@unsetdriver{pdftex}}}}%
 \define@key{Gm}{luatex}[true]{\ifGm@preamble{luatex}{%
@@ -2900,7 +2905,7 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex.
 \define@key{Gm}{vtex}[true]{\ifGm@preamble{vtex}{%
   \Gm@doifelse{vtex}{#1}{\Gm@setdriver{vtex}}{\Gm@unsetdriver{vtex}}}}%
 %    \end{macrocode}
-%  \end{key}\end{key}\end{key}\end{key}\end{key}\end{key}
+%  \end{key}\end{key}\end{key}\end{key}\end{key}\end{key}\end{key}\end{key}
 %  \begin{key}{Gm}{verbose}
 %    The verbose mode.
 %    \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/geometry/geometry.ins b/Master/texmf-dist/source/latex/geometry/geometry.ins
index 8a298288a15..d810dce7578 100644
--- a/Master/texmf-dist/source/latex/geometry/geometry.ins
+++ b/Master/texmf-dist/source/latex/geometry/geometry.ins
@@ -28,7 +28,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: geometry 2018/03/24 v5.7 Page Geometry}
+\Msg{* Package: geometry 2018/04/16 v5.8 Page Geometry}
 \Msg{************************************************************************}
 
 \keepsilent