summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/geometry/README.md8
-rw-r--r--Master/texmf-dist/doc/latex/geometry/changes.txt4
-rw-r--r--Master/texmf-dist/doc/latex/geometry/geometry.pdfbin442516 -> 442423 bytes
-rw-r--r--Master/texmf-dist/source/latex/geometry/geometry.dtx19
-rw-r--r--Master/texmf-dist/source/latex/geometry/geometry.ins2
-rw-r--r--Master/texmf-dist/tex/latex/geometry/geometry.sty6
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds3
7 files changed, 29 insertions, 13 deletions
diff --git a/Master/texmf-dist/doc/latex/geometry/README.md b/Master/texmf-dist/doc/latex/geometry/README.md
index 49732290146..ebdb25bf4d1 100644
--- a/Master/texmf-dist/doc/latex/geometry/README.md
+++ b/Master/texmf-dist/doc/latex/geometry/README.md
@@ -18,6 +18,9 @@ CTAN: macros/latex/contrib/geometry
Recent changes:
+[Release 5.8]
+Add xdvipdfmx and dvipdfmx alias for dvipdfm option.
+
[Release 5.7]
Add support for luatex (with new comand names introduced in luatex 0.85)
@@ -26,7 +29,6 @@ Add support for luatex (with new comand names introduced in luatex 0.85)
Files:
* README.md - this file
* changes.txt - history of changes
- * geometry.ins - for installation to get .sty from .dtx
* geometry.dtx - including sources and documentation
* geometry.pdf - print-ready documentation
@@ -34,10 +36,10 @@ Installation:
[manual installation]
* To get geometry.sty out of geometry.dtx
$ tex geometry.dtx
- or $ (la)tex geometry.ins
+ or $ (la)tex geometry.ins (after first extraction)
* To build documentation
$ latex geometry.dtx
- or $ latex geometry.drv
+ or $ latex geometry.drv (after first extraction)
* Put the derived files in the proper directories:
- tex/latex/geometry/geometry.sty
- doc/latex/geometry/geometry.pdf
diff --git a/Master/texmf-dist/doc/latex/geometry/changes.txt b/Master/texmf-dist/doc/latex/geometry/changes.txt
index b077e78105d..c4633444382 100644
--- a/Master/texmf-dist/doc/latex/geometry/changes.txt
+++ b/Master/texmf-dist/doc/latex/geometry/changes.txt
@@ -1,3 +1,7 @@
+2018-04-16 Release 5.8
+ * Documentation fixes.
+ * (x)dvipdfmx alias for dvipdfm otion.
+
2018-03-24 Release 5.7
* add support for luatex 0.85+
diff --git a/Master/texmf-dist/doc/latex/geometry/geometry.pdf b/Master/texmf-dist/doc/latex/geometry/geometry.pdf
index 35ff5e89b6b..66f3c55c4e7 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 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
diff --git a/Master/texmf-dist/tex/latex/geometry/geometry.sty b/Master/texmf-dist/tex/latex/geometry/geometry.sty
index 13084e18d21..f64caadec9b 100644
--- a/Master/texmf-dist/tex/latex/geometry/geometry.sty
+++ b/Master/texmf-dist/tex/latex/geometry/geometry.sty
@@ -27,7 +27,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{geometry}
- [2018/03/24 v5.7 Page Geometry]
+ [2018/04/16 v5.8 Page Geometry]
\RequirePackage{keyval}%
\RequirePackage{ifpdf}%
\RequirePackage{ifvtex}%
@@ -593,6 +593,10 @@
\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}{%
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 2cdfdeca932..edb7a053e66 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -98,7 +98,6 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'ams-cd', "die 'skipping, latex 2.09 and never in tl'",
'amslatex', "die 'skipping, use ams subpackages (see tlpkginfo)'",
'amsldoc-vn', "&MAKEflatten",
-# 'amsmath', "die 'skipping until ams fixes missing amstex.sty, per bb'",
'amstex', "&MAKEflatten",
'analogclock', "die 'skipping, requires system font installation",
'annot_pro', "die 'skipping, per author (dps) request'",
@@ -621,6 +620,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'latex-sciences-humaines', "die 'skipping, no source'",
'latex-tipps-und-tricks', "die 'skipping, noinfo license'",
'latex_maker', "die 'skipping, we must not usurp two-character cmd name'",
+ 'latex2e-help-texinfo-spanish', "die 'skipping, await next release'",
'latex2html', "die 'skipping, not self-locating, needs apache changes'",
'latex2pdf', "die 'skipping, too bare-bones'",
'latex2rtf', "die 'skipping, no configure or requests, etc.'",
@@ -801,6 +801,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'norasi-c90', "&MAKEnorasi_c90",
'notes', "&MAKEnotes",
'notestex', "&MAKEflatten",
+ 'npp-for-context', "die 'skipping, await next release'",
'ntabbing', "die 'skipping, noinfo license, author email bad'",
'ntg', "die 'skipping, ntg is stale user group information'",
'numending', "die 'skipping, noinfo license'",