summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2016-06-17 10:13:04 +0000
committerNorbert Preining <preining@logic.at>2016-06-17 10:13:04 +0000
commit8830ce15fe7587ab7c603da38e6940694763afd3 (patch)
tree1af53b83c1be111bf76aaf5b0b1c804d3e8b6fcb /Master
parentdbe4f7081c0c8fc3891e19156d386c90f74fb232 (diff)
luatex-def (17Jun)
git-svn-id: svn://tug.org/texlive/trunk@41466 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/tex/lualatex/luatex-def/luatex.def12
1 files changed, 9 insertions, 3 deletions
diff --git a/Master/texmf-dist/tex/lualatex/luatex-def/luatex.def b/Master/texmf-dist/tex/lualatex/luatex-def/luatex.def
index bd37d1a20ee..34af1f9cc26 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/06/04 v0.01d Graphics/Color for luaTeX]
+\ProvidesFile{luatex.def}[2016/06/17 v0.01e Graphics/Color for luaTeX]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%
%% LaTeX Colour and Graphics support for luatex
@@ -60,6 +60,7 @@
% 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.
+% 2016/06/17 Version 0.01e guards for contributed packages and plain TeX
%
% Prefix of internal commands for this file `pdftex.def':
% \GPT@ (Graphics bundle PdfTex driver, even though this is for luatex)
@@ -107,9 +108,13 @@
}\@ehc
\outputmode=1 %
\fi
-
+\@ifundefined{ifGin@setpagesize}
+ {\expandafter\let\csname ifGin@setpagesize\expandafter\endcsname
+ \csname iftrue\endcsname}
+ {}
\ifGin@setpagesize
- \AtBeginDocument{%
+\ifx\paperwidth\@undefined\else
+\AtBeginDocument{%
\ltx@IfUndefined{stockwidth}{%
\ltx@IfUndefined{paperwidth}{%
}{%
@@ -130,6 +135,7 @@
}%
}
\fi
+\fi
% Colour Support. The following models may be used.
% * cmyk supported directly.