luatex-def (14jun16)

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

1 files changed, 10 insertions, 4 deletions

diff --git a/Master/texmf-dist/tex/lualatex/luatex-def/luatex.def b/Master/texmf-dist/tex/lualatex/luatex-def/luatex.def
index 2223792a618..bd37d1a20ee 100644
--- a/Master/texmf-dist/tex/lualatex/luatex-def/luatex.def
+++ b/Master/texmf-dist/tex/lualatex/luatex-def/luatex.def
@@ -1,4 +1,4 @@
-\ProvidesFile{luatex.def}[2016/05/21 v0.01c Graphics/Color for luaTeX]
+\ProvidesFile{luatex.def}[2016/06/04 v0.01d Graphics/Color for luaTeX]
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%
 %% LaTeX Colour and Graphics support for luatex
@@ -6,7 +6,9 @@
 %% License
 %% =======
 %%
-%% Copyright (C) 2000-2016 LaTeX3 Project and the following authors
+%% Copyright (C) 2000-2016 LaTeX3 Project
+%%
+%% based on pdftex.def by the following authors
 %% David Carlisle, Sebastian Rahtz, Hans Hagen,
 %% Heiko Oberdiek and Martin Schr\"oder
 %%
@@ -56,6 +58,8 @@
 %
 % 2015/12/30 Version 0.01a derived from pdftex.def
 % 2016/01/23 Version 0.01b Moved to latex3 github, documentation changes
+% 2016/05/21 Version 0.01c fix for graphics/4472
+% 2016/06/24 Version 0.01d support the (no)setpagesize option.
 %
 % Prefix of internal commands for this file `pdftex.def':
 % \GPT@ (Graphics bundle PdfTex driver, even though this is for luatex)
@@ -104,6 +108,8 @@
   \outputmode=1 %
 \fi
 
+\ifGin@setpagesize
+  \AtBeginDocument{%
 \ltx@IfUndefined{stockwidth}{%
   \ltx@IfUndefined{paperwidth}{%
   }{%
@@ -121,7 +127,9 @@
       \pageheight=\stockheight
     \fi
   \fi
+}%
 }
+\fi
 
 % Colour Support. The following models may be used.
 %   * cmyk   supported directly.
@@ -1242,9 +1250,7 @@
 % skip this.
  \AtBeginDocument{%
    \ifx\includegraphics\@undefined\else
-     \def\Gin@driver{pdftex.def}%
      \RequirePackage{epstopdf-base}%
-     \def\Gin@driver{luatex.def}%
    \fi
   }
 \fi
\ No newline at end of file