From 13e15ec770037fb7e4c70acbad0bd42bd841affd Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 25 Mar 2018 21:23:05 +0000 Subject: geometry (25mar18) git-svn-id: svn://tug.org/texlive/trunk@47106 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/geometry/README | 78 --------------------- Master/texmf-dist/doc/latex/geometry/README.md | 67 ++++++++++++++++++ Master/texmf-dist/doc/latex/geometry/changes.txt | 3 + .../doc/latex/geometry/geometry-samples.tex | 4 +- Master/texmf-dist/doc/latex/geometry/geometry.cfg | 4 +- Master/texmf-dist/doc/latex/geometry/geometry.pdf | Bin 188619 -> 442516 bytes .../texmf-dist/source/latex/geometry/geometry.drv | 4 +- .../texmf-dist/source/latex/geometry/geometry.dtx | 75 ++++++++++++-------- .../texmf-dist/source/latex/geometry/geometry.ins | 10 ++- Master/texmf-dist/tex/latex/geometry/geometry.sty | 34 +++++++-- 10 files changed, 162 insertions(+), 117 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/geometry/README create mode 100644 Master/texmf-dist/doc/latex/geometry/README.md (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/geometry/README b/Master/texmf-dist/doc/latex/geometry/README deleted file mode 100644 index 13c3ca4181f..00000000000 --- a/Master/texmf-dist/doc/latex/geometry/README +++ /dev/null @@ -1,78 +0,0 @@ -LaTeX Package: Geometry 2010/09/12 v5.6 ----------------------------------------- -Flexible and complete interface to document dimensions. - -Copyright (C) 1996-2010 -by Hideo Umeki - -Abstract: - This package provides a flexible and easy interface to page dimensions. - You can set the page layout with intuitive parameters. For instance, - if you want to set a margin to 2cm from each edge of the paper, - you can go \usepackage[margin=2cm]{geometry}. With \newgeometry command - you can change the layout anywhere in the document. - -CTAN: macros/latex/contrib/geometry - -Recent changes: -[Release 5.0-5.6] - * Package 'ifxetex' is loaded for robuster detection of XeTeX. (v5.6-) - * Changing page layout mid-document. - * A new set of options to specify layout area. - * A new driver option 'xetex'. - * New paper size presets for JIS B-series and ISO C-series (v5.4-). - * Changing default for underspecified margin. - * The option 'showframe' works on every page. - * The option 'showcrop' prints elbow-shaped crop marks at each corner - of the layout area, which is equal to paper size. (v5.5-) - * Package 'atbegshi' is required when 'showframe' or 'showcrop' is specified. - * Loading geometry.cfg precedes processing class options. - * Deleted options: 'compat2' and 'twosideshift'. - * Added 'onecolumn' option as a shorthand for 'twocolumn=false'. - * Changed the format of the verbose mode. - * Fixed typos and wrong figures, and revised expressions in the document. - -(changes.txt for more history) - -Files: - * README - 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 - -Installation: -[manual installation] - * To get geometry.sty out of geometry.dtx - $ tex geometry.dtx - or $ (la)tex geometry.ins - * To build documentation - $ latex geometry.dtx - or $ latex geometry.drv - * Put the derived files in the proper directories: - - tex/latex/geometry/geometry.sty - - doc/latex/geometry/geometry.pdf - - source/latex/geometry/geometry.dtx - -[TeXLive] - * Use 'tlmgr' command - $ tlmgr show geometry -- to check the package info - $ sudo tlmgr update geometry -- to update the package - * You can use 'TeX Live Utility' instead of 'tlmgr', if on MacOSX. - -[MikTeX] - * Use the MikTeX Update Wizard to update geometry package. - -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 - and version 1.3c or later is part of all distributions of LaTeX - version 2005/12/01 or later. - --- -Happy TeXing! -Hideo Umeki - -EOF \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/geometry/README.md b/Master/texmf-dist/doc/latex/geometry/README.md new file mode 100644 index 00000000000..49732290146 --- /dev/null +++ b/Master/texmf-dist/doc/latex/geometry/README.md @@ -0,0 +1,67 @@ +LaTeX Package: Geometry 2010/09/12 v5.6 +---------------------------------------- +Flexible and complete interface to document dimensions. + +Copyright (C) 1996-2010 +by Hideo Umeki +Copyright (C) 2018 +Hideo Umeki and David Carlisle https://github.com/davidcarlisle/geometry + +Abstract: + This package provides a flexible and easy interface to page dimensions. + You can set the page layout with intuitive parameters. For instance, + if you want to set a margin to 2cm from each edge of the paper, + you can go \usepackage[margin=2cm]{geometry}. With \newgeometry command + you can change the layout anywhere in the document. + +CTAN: macros/latex/contrib/geometry + +Recent changes: + +[Release 5.7] +Add support for luatex (with new comand names introduced in luatex 0.85) + +(changes.txt for more history) + +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 + +Installation: +[manual installation] + * To get geometry.sty out of geometry.dtx + $ tex geometry.dtx + or $ (la)tex geometry.ins + * To build documentation + $ latex geometry.dtx + or $ latex geometry.drv + * Put the derived files in the proper directories: + - tex/latex/geometry/geometry.sty + - doc/latex/geometry/geometry.pdf + - source/latex/geometry/geometry.dtx + +[TeXLive] + * Use 'tlmgr' command + $ tlmgr show geometry -- to check the package info + $ sudo tlmgr update geometry -- to update the package + * You can use 'TeX Live Utility' instead of 'tlmgr', if on MacOSX. + +[MikTeX] + * Use the MikTeX Update Wizard to update geometry package. + +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 + and version 1.3c or later is part of all distributions of LaTeX + version 2005/12/01 or later. + +-- +Happy TeXing! +Hideo Umeki + +EOF \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/geometry/changes.txt b/Master/texmf-dist/doc/latex/geometry/changes.txt index a3852032863..b077e78105d 100644 --- a/Master/texmf-dist/doc/latex/geometry/changes.txt +++ b/Master/texmf-dist/doc/latex/geometry/changes.txt @@ -1,3 +1,6 @@ +2018-03-24 Release 5.7 + * add support for luatex 0.85+ + 2010-09-12 Release 5.6 * Package 'ifxetex' is loaded for robuster detection of XeTeX. * Fixed a bug where 'pass' option was not reset in \newgeometry. diff --git a/Master/texmf-dist/doc/latex/geometry/geometry-samples.tex b/Master/texmf-dist/doc/latex/geometry/geometry-samples.tex index d51bd898465..7425041e290 100644 --- a/Master/texmf-dist/doc/latex/geometry/geometry-samples.tex +++ b/Master/texmf-dist/doc/latex/geometry/geometry-samples.tex @@ -8,6 +8,8 @@ %% %% Copyright (C) 1996-2010 %% by Hideo Umeki +%% Copyright (C) 2018 +%% 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 @@ -18,7 +20,7 @@ %% version 2005/12/01 or later. %% %% This work is "maintained" (as per the LPPL maintenance status) -%% by Hideo Umeki. +%% by David Carlisle. %% %% This work consists of the files geometry.dtx and %% the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. diff --git a/Master/texmf-dist/doc/latex/geometry/geometry.cfg b/Master/texmf-dist/doc/latex/geometry/geometry.cfg index 6026eed2e13..ee5894a4843 100644 --- a/Master/texmf-dist/doc/latex/geometry/geometry.cfg +++ b/Master/texmf-dist/doc/latex/geometry/geometry.cfg @@ -8,6 +8,8 @@ %% %% Copyright (C) 1996-2010 %% by Hideo Umeki +%% Copyright (C) 2018 +%% 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 @@ -18,7 +20,7 @@ %% version 2005/12/01 or later. %% %% This work is "maintained" (as per the LPPL maintenance status) -%% by Hideo Umeki. +%% by David Carlisle. %% %% This work consists of the files geometry.dtx and %% the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. diff --git a/Master/texmf-dist/doc/latex/geometry/geometry.pdf b/Master/texmf-dist/doc/latex/geometry/geometry.pdf index c85cf1dc487..35ff5e89b6b 100644 Binary files a/Master/texmf-dist/doc/latex/geometry/geometry.pdf and b/Master/texmf-dist/doc/latex/geometry/geometry.pdf differ diff --git a/Master/texmf-dist/source/latex/geometry/geometry.drv b/Master/texmf-dist/source/latex/geometry/geometry.drv index eefcb23a559..729f725b485 100644 --- a/Master/texmf-dist/source/latex/geometry/geometry.drv +++ b/Master/texmf-dist/source/latex/geometry/geometry.drv @@ -8,6 +8,8 @@ %% %% Copyright (C) 1996-2010 %% by Hideo Umeki +%% Copyright (C) 2018 +%% 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 @@ -18,7 +20,7 @@ %% version 2005/12/01 or later. %% %% This work is "maintained" (as per the LPPL maintenance status) -%% by Hideo Umeki. +%% by David Carlisle. %% %% This work consists of the files geometry.dtx and %% the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. diff --git a/Master/texmf-dist/source/latex/geometry/geometry.dtx b/Master/texmf-dist/source/latex/geometry/geometry.dtx index 32c24d0d36c..0df5d53c220 100644 --- a/Master/texmf-dist/source/latex/geometry/geometry.dtx +++ b/Master/texmf-dist/source/latex/geometry/geometry.dtx @@ -1,6 +1,7 @@ % \iffalse meta-comment % % Copyright 1996-2010 by Hideo Umeki +% Copyright 2018 Hideo Umeki and David Carlisle % % LaTeX Package: Geometry % ----------------------- @@ -14,13 +15,13 @@ % version 2005/12/01 or later. % % This work is "maintained" (as per the LPPL maintenance status) -% by Hideo Umeki. +% by David Carlisle % % This work consists of the files geometry.dtx and % the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. % % * Distribution -% CTAN: macros/latex/contrib/geometry/README +% CTAN: macros/latex/contrib/geometry/README.md % CTAN: macros/latex/contrib/geometry/changes.txt % CTAN: macros/latex/contrib/geometry/geometry.ins % CTAN: macros/latex/contrib/geometry/geometry.dtx @@ -39,12 +40,12 @@ % %\NeedsTeXFormat{LaTeX2e} %\ProvidesPackage{geometry} -% [2010/09/12 v5.6 Page Geometry] +% [2018/03/24 v5.7 Page Geometry] %<*install> \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: geometry 2010/09/12 v5.6 Page Geometry} +\Msg{* Package: geometry 2018/03/24 v5.7 Page Geometry} \Msg{************************************************************************} \keepsilent @@ -53,6 +54,8 @@ Copyright (C) 1996-2010 by Hideo Umeki +Copyright (C) 2018 +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 @@ -63,7 +66,7 @@ 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 Hideo Umeki. +by David Carlisle. This work consists of the files geometry.dtx and the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. @@ -117,23 +120,6 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. % % \fi % -% \CheckSum{2680} -% -% \CharacterTable -% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -% Digits \0\1\2\3\4\5\6\7\8\9 -% Exclamation \! Double quote \" Hash (number) \# -% Dollar \$ Percent \% Ampersand \& -% Acute accent \' Left paren \( Right paren \) -% Asterisk \* Plus \+ Comma \, -% Minus \- Point \. Solidus \/ -% Colon \: Semicolon \; Less than \< -% Equals \= Greater than \> Question mark \? -% Commercial at \@ Left bracket \[ Backslash \\ -% Right bracket \] Circumflex \^ Underscore \_ -% Grave accent \` Left brace \{ Vertical bar \| -% Right brace \} Tilde \~} % % \GetFileInfo{geometry.sty} % @@ -1130,8 +1116,8 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. % % \subsection{Drivers}\label{sec:drivers} % -% The package supports drivers |dvips|, |dvipdfm|, |pdftex|, |xetex| and -% |vtex|. You can also set |dvipdfm| for \textsf{dvipdfmx} and +% The package supports drivers |dvips|, |dvipdfm|, |pdftex|, |luatex|, +% |xetex| and |vtex|. You can also set |dvipdfm| for \textsf{dvipdfmx} and % \textsf{xdvipdfmx}. |pdftex| for \textsf{pdflatex}, and |vtex| for % V\TeX{} environment. % The driver options are exclusive. The driver can be set by either @@ -1920,6 +1906,7 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. % \begin{macro}{\Gm@dvips}% % \begin{macro}{\Gm@dvipdfm}% % \begin{macro}{\Gm@pdftex}% +% \begin{macro}{\Gm@luatex}% % \begin{macro}{\Gm@xetex}% % \begin{macro}{\Gm@vtex}% % The driver names. @@ -1927,10 +1914,11 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. \def\Gm@dvips{dvips}% \def\Gm@dvipdfm{dvipdfm}% \def\Gm@pdftex{pdftex}% +\def\Gm@luatex{luatex}% \def\Gm@xetex{xetex}% \def\Gm@vtex{vtex}% % \end{macrocode} -% \end{macro}\end{macro}\end{macro}\end{macro}\end{macro} +% \end{macro}\end{macro}\end{macro}\end{macro}\end{macro}\end{macro} % \begin{macro}{\Gm@true}% % \begin{macro}{\Gm@false}% % The macros for |true| and |false|. @@ -2893,10 +2881,11 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. % \begin{key}{Gm}{dvips} % \begin{key}{Gm}{dvipdfm} % \begin{key}{Gm}{pdftex} +% \begin{key}{Gm}{luatex} % \begin{key}{Gm}{xetex} % \begin{key}{Gm}{vtex} % The \Gm\ package supports |dvips|, |dvipdfm|, -% |pdflatex| and |vtex|. |dvipdfm| works like |dvips|. +% |pdflatex|, |luatex| and |vtex|. |dvipdfm| works like |dvips|. % \begin{macrocode} \define@key{Gm}{dvips}[true]{\ifGm@preamble{dvips}{% \Gm@doifelse{dvips}{#1}{\Gm@setdriver{dvips}}{\Gm@unsetdriver{dvips}}}}% @@ -2904,12 +2893,14 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. \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}{% + \Gm@doifelse{luatex}{#1}{\Gm@setdriver{luatex}}{\Gm@unsetdriver{luatex}}}}% \define@key{Gm}{xetex}[true]{\ifGm@preamble{xetex}{% \Gm@doifelse{xetex}{#1}{\Gm@setdriver{xetex}}{\Gm@unsetdriver{xetex}}}}% \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} % \begin{key}{Gm}{verbose} % The verbose mode. % \begin{macrocode} @@ -3276,7 +3267,11 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. % \cs{ifpdf} is defined in \textsf{ifpdf} package in `oberdiek' bundle. % \begin{macrocode} \ifpdf - \Gm@setdriver{pdftex}% + \ifx\pdfextension\@undefined + \Gm@setdriver{pdftex}% + \else + \Gm@setdriver{luatex}% + \fi \else \Gm@setdriver{dvips}% \fi @@ -3591,7 +3586,7 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. \setlength\pdfpagewidth{\Gm@pw}% \setlength\pdfpageheight{\Gm@ph}}% \ifnum\mag=\@m\else - \@tempdima=\mag sp% + \@tempdima=\mag sp \@ifundefined{pdfhorigin}{}{% \divide\pdfhorigin\@tempdima \multiply\pdfhorigin\@m @@ -3604,6 +3599,28 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. \fi \fi % \end{macrocode} +% If |luatex| is set to |true|, pdf-commands are set properly. +% To avoid |luatex| magnification problem, \cs{horigin} and +% \cs{vorigin} are adjusted for \cs{mag}. +% \begin{macrocode} + \ifx\Gm@driver\Gm@luatex + \setlength\pagewidth{\Gm@pw}% + \setlength\pageheight{\Gm@ph}% + \ifnum\mag=\@m\else + \@tempdima=\mag sp + \edef\Gm@horigin{\pdfvariable horigin}% + \edef\Gm@vorigin{\pdfvariable vorigin}% + \divide\Gm@horigin\@tempdima + \multiply\Gm@horigin\@m + \divide\Gm@vorigin\@tempdima + \multiply\Gm@vorigin\@m + \ifx\Gm@truedimen\Gm@true + \setlength\paperwidth{\Gm@pw}% + \setlength\paperheight{\Gm@ph}% + \fi + \fi + \fi +% \end{macrocode} % With V\TeX{} environment, V\TeX{} variables are set here. % \begin{macrocode} \ifx\Gm@driver\Gm@vtex diff --git a/Master/texmf-dist/source/latex/geometry/geometry.ins b/Master/texmf-dist/source/latex/geometry/geometry.ins index 3d2b0496632..8a298288a15 100644 --- a/Master/texmf-dist/source/latex/geometry/geometry.ins +++ b/Master/texmf-dist/source/latex/geometry/geometry.ins @@ -8,6 +8,8 @@ %% %% Copyright (C) 1996-2010 %% by Hideo Umeki +%% Copyright (C) 2018 +%% 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 @@ -18,7 +20,7 @@ %% version 2005/12/01 or later. %% %% This work is "maintained" (as per the LPPL maintenance status) -%% by Hideo Umeki. +%% by David Carlisle. %% %% This work consists of the files geometry.dtx and %% the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. @@ -26,7 +28,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: geometry 2010/09/12 v5.6 Page Geometry} +\Msg{* Package: geometry 2018/03/24 v5.7 Page Geometry} \Msg{************************************************************************} \keepsilent @@ -35,6 +37,8 @@ Copyright (C) 1996-2010 by Hideo Umeki +Copyright (C) 2018 +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 @@ -45,7 +49,7 @@ 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 Hideo Umeki. +by David Carlisle. This work consists of the files geometry.dtx and the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. diff --git a/Master/texmf-dist/tex/latex/geometry/geometry.sty b/Master/texmf-dist/tex/latex/geometry/geometry.sty index b46f4eea148..13084e18d21 100644 --- a/Master/texmf-dist/tex/latex/geometry/geometry.sty +++ b/Master/texmf-dist/tex/latex/geometry/geometry.sty @@ -8,6 +8,8 @@ %% %% Copyright (C) 1996-2010 %% by Hideo Umeki +%% Copyright (C) 2018 +%% 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 @@ -18,14 +20,14 @@ %% version 2005/12/01 or later. %% %% This work is "maintained" (as per the LPPL maintenance status) -%% by Hideo Umeki. +%% by David Carlisle. %% %% This work consists of the files geometry.dtx and %% the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{geometry} - [2010/09/12 v5.6 Page Geometry] + [2018/03/24 v5.7 Page Geometry] \RequirePackage{keyval}% \RequirePackage{ifpdf}% \RequirePackage{ifvtex}% @@ -72,6 +74,7 @@ \def\Gm@dvips{dvips}% \def\Gm@dvipdfm{dvipdfm}% \def\Gm@pdftex{pdftex}% +\def\Gm@luatex{luatex}% \def\Gm@xetex{xetex}% \def\Gm@vtex{vtex}% \def\Gm@true{true}% @@ -592,6 +595,8 @@ \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}{% + \Gm@doifelse{luatex}{#1}{\Gm@setdriver{luatex}}{\Gm@unsetdriver{luatex}}}}% \define@key{Gm}{xetex}[true]{\ifGm@preamble{xetex}{% \Gm@doifelse{xetex}{#1}{\Gm@setdriver{xetex}}{\Gm@unsetdriver{xetex}}}}% \define@key{Gm}{vtex}[true]{\ifGm@preamble{vtex}{% @@ -809,7 +814,11 @@ \ifx\Gm@driver\@empty \typeout{*geometry* driver: auto-detecting}% \ifpdf - \Gm@setdriver{pdftex}% + \ifx\pdfextension\@undefined + \Gm@setdriver{pdftex}% + \else + \Gm@setdriver{luatex}% + \fi \else \Gm@setdriver{dvips}% \fi @@ -1030,7 +1039,7 @@ \setlength\pdfpagewidth{\Gm@pw}% \setlength\pdfpageheight{\Gm@ph}}% \ifnum\mag=\@m\else - \@tempdima=\mag sp% + \@tempdima=\mag sp \@ifundefined{pdfhorigin}{}{% \divide\pdfhorigin\@tempdima \multiply\pdfhorigin\@m @@ -1042,6 +1051,23 @@ \fi \fi \fi + \ifx\Gm@driver\Gm@luatex + \setlength\pagewidth{\Gm@pw}% + \setlength\pageheight{\Gm@ph}% + \ifnum\mag=\@m\else + \@tempdima=\mag sp + \edef\Gm@horigin{\pdfvariable horigin}% + \edef\Gm@vorigin{\pdfvariable vorigin}% + \divide\Gm@horigin\@tempdima + \multiply\Gm@horigin\@m + \divide\Gm@vorigin\@tempdima + \multiply\Gm@vorigin\@m + \ifx\Gm@truedimen\Gm@true + \setlength\paperwidth{\Gm@pw}% + \setlength\paperheight{\Gm@ph}% + \fi + \fi + \fi \ifx\Gm@driver\Gm@vtex \@ifundefined{mediawidth}{}{% \mediawidth=\paperwidth -- cgit v1.2.3