diff options
author | Karl Berry <karl@freefriends.org> | 2016-07-13 22:32:59 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-07-13 22:32:59 +0000 |
commit | 340fd1eddc14e61d3f7e4b493269dcb960cdb3bc (patch) | |
tree | db43600721c0ef5621e6dd081a7534cf8e6edb6e /Master/texmf-dist/tex/latex/graphics-def/luatex.def | |
parent | 9ba411b76cebc96643f89f5f0e6d6298c0b4fda8 (diff) |
graphics-def (13jul16)
git-svn-id: svn://tug.org/texlive/trunk@41687 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/graphics-def/luatex.def')
-rw-r--r-- | Master/texmf-dist/tex/latex/graphics-def/luatex.def | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/Master/texmf-dist/tex/latex/graphics-def/luatex.def b/Master/texmf-dist/tex/latex/graphics-def/luatex.def index a92a37eb074..8978d688320 100644 --- a/Master/texmf-dist/tex/latex/graphics-def/luatex.def +++ b/Master/texmf-dist/tex/latex/graphics-def/luatex.def @@ -1,4 +1,4 @@ -\ProvidesFile{luatex.def}[2016/07/01 v0.01f Graphics/Color for luaTeX] +\ProvidesFile{luatex.def}[2016/07/11 v0.01f Graphics/Color for luaTeX] %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% %% LaTeX Colour and Graphics support for luatex @@ -61,8 +61,9 @@ % 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 +% 2016/07/11 Version 0.01f test for \mag added to all drivers, missing \fi in pagebox % -% Prefix of internal commands for this file `pdftex.def': +% Prefix of internal commands for this file `luatex.def': % \GPT@ (Graphics bundle PdfTex driver, even though this is for luatex) @@ -115,6 +116,9 @@ \ifGin@setpagesize \ifx\paperwidth\@undefined\else \AtBeginDocument{% +% If a package has changed \mag, assume it knows what it is doing +% and leave page size alone +\ifnum\mag=\@m \ltx@IfUndefined{stockwidth}{% \ltx@IfUndefined{paperwidth}{% }{% @@ -133,6 +137,7 @@ \fi \fi }% +\fi } \fi \fi @@ -356,6 +361,7 @@ Supported values:\MessageBreak mediabox, cropbox, bleedbox, trimbox, artbox% }% + \fi }% \def\GPT@pagebox@mediabox{mediabox}% \let\GPT@pagebox@cropbox\ltx@empty @@ -997,16 +1003,9 @@ \@namedef{Gin@rule@.jpeg}#1{{jpg}{.jpeg}{#1}}% \@namedef{Gin@rule@.JPG}#1{{jpg}{.JPG}{#1}}% \@namedef{Gin@rule@.JPEG}#1{{jpg}{.JPEG}{#1}}% - \@ifpackageloaded{pst-pdf}% hv 20160630 - {\def\Gin@extensions{% + \def\Gin@extensions{% .png,.pdf,.jpg,.mps,.jpeg,.jbig2,.jb2,% .PNG,.PDF,.JPG,.JPEG,.JBIG2,.JB2}% - }% - {\def\Gin@extensions{% - .png,.pdf,.jpg,.mps,.jpeg,.jbig2,.jb2,% - .PNG,.PDF,.JPG,.JPEG,.JBIG2,.JB2,% - .eps}% - }% \@namedef{Gin@rule@.jb2}#1{{jbig2}{.jb2}{#1}}% \@namedef{Gin@rule@.jbig2}#1{{jbig2}{.jbig2}{#1}}% @@ -1263,6 +1262,8 @@ \ifx\includegraphics\@undefined\else \@ifpackageloaded{pst-pdf}{}{% \@ifpackageloaded{pdftricks}{}{% + % only add .eps to file extension list if epstopdf is loaded + \edef\Gin@extensions{\Gin@extensions,.eps}% \RequirePackage{epstopdf-base}% }% }% |