From a4aaec6038582459ed4f70ee377bb98bc158f2db Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 22 Jan 2017 23:37:49 +0000 Subject: -----BEGIN CERTIFICATE REQUEST----- (22jan17) git-svn-id: svn://tug.org/texlive/trunk@43025 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/graphics-def/dvipdfmx.def | 3 ++- Master/texmf-dist/tex/latex/graphics-def/luatex.def | 16 ++++++++++++++-- Master/texmf-dist/tex/latex/graphics-def/pdftex.def | 18 +++++++++++++++--- Master/texmf-dist/tex/latex/graphics-def/xetex.def | 3 ++- 4 files changed, 33 insertions(+), 7 deletions(-) (limited to 'Master/texmf-dist/tex/latex/graphics-def') diff --git a/Master/texmf-dist/tex/latex/graphics-def/dvipdfmx.def b/Master/texmf-dist/tex/latex/graphics-def/dvipdfmx.def index ab455ad1cd5..044bc38d6e5 100644 --- a/Master/texmf-dist/tex/latex/graphics-def/dvipdfmx.def +++ b/Master/texmf-dist/tex/latex/graphics-def/dvipdfmx.def @@ -367,7 +367,8 @@ \special{pdf:btrans rotate \Grot@angle}} \def\Grot@end{\special{pdf:etrans}} \def\Gscale@start{% -\special{pdf:btrans xscale \Gscale@x\space yscale \Gscale@y}} + \special{pdf:btrans}% + \special{pdf:literal \Gscale@x\space 0 0 \Gscale@y\space 0 0 cm}} \def\Gscale@end{\special{pdf:etrans}} \def\Gin@PS@raw#1{\special{ps: #1}} \def\Gin@PS@restored#1{\special{" #1}} diff --git a/Master/texmf-dist/tex/latex/graphics-def/luatex.def b/Master/texmf-dist/tex/latex/graphics-def/luatex.def index ee4da891254..1af0d987494 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/08/17 v0.01g Graphics/Color for luaTeX] +\ProvidesFile{luatex.def}[2017/01/12 v0.01h Graphics/Color for luaTeX] %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% %% LaTeX Colour and Graphics support for luatex @@ -6,7 +6,7 @@ %% License %% ======= %% -%% Copyright (C) 2000-2016 LaTeX3 Project +%% Copyright (C) 2000-2017 LaTeX3 Project %% %% based on pdftex.def by the following authors %% David Carlisle, Sebastian Rahtz, Hans Hagen, @@ -62,6 +62,8 @@ % 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 +% 2016/08/17 Version 0.01g Guard for non-LaTeX use +% 2017/01/12 Version 0.01h graphics options as viewport for graphics/4499 % % Prefix of internal commands for this file `luatex.def': % \GPT@ (Graphics bundle PdfTex driver, even though this is for luatex) @@ -802,6 +804,16 @@ }% } \def\Ginclude@pdftex#1{% + % basic faking of viewport settings so graphic-s- interface + % does something sensible + \ifx\GPT@AttrShort\@undefined + \GPT@info{Interpreting graphics options as viewport}% + \let\GPT@AttrShort\@empty + \let\Gin@vllx\Gin@llx + \let\Gin@vlly\Gin@lly + \let\Gin@vurx\Gin@urx + \let\Gin@vury\Gin@ury + \fi \def\@tempa{!}% \ifx\Gin@scaley\@tempa \let\Gin@scaley\Gin@scalex diff --git a/Master/texmf-dist/tex/latex/graphics-def/pdftex.def b/Master/texmf-dist/tex/latex/graphics-def/pdftex.def index 3fca115295d..76ebd378a2e 100644 --- a/Master/texmf-dist/tex/latex/graphics-def/pdftex.def +++ b/Master/texmf-dist/tex/latex/graphics-def/pdftex.def @@ -1,4 +1,4 @@ -\ProvidesFile{pdftex.def}[2016/07/10 v0.06j Graphics/color for pdfTeX] +\ProvidesFile{pdftex.def}[2017/01/12 v0.06k Graphics/color for pdfTeX] %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% %% LaTeX Colour and Graphics support for PDFTeX @@ -10,7 +10,7 @@ %% David Carlisle, Sebastian Rahtz, Hans Hagen, %% Heiko Oberdiek and Martin Schr\"oder %% -%% 2016 LaTeX3 project and Heiko Oberdiek +%% 2016-2017 LaTeX3 project and Heiko Oberdiek %% https://github.com/latex3/graphics-def/issues %% %% This work may be distributed and/or modified under the @@ -268,8 +268,10 @@ % * typo % 2016/06/17 v0.6h (DPC) % * guards for contributed packages and plain TeX -% 2016/07/1o v0.6j (DPC) +% 2016/07/10 v0.6j (DPC) % * don't set page size for non standard \mag +% 2017/01/12 v0.6k (DPC) +% * graphics options as viewport for graphics/4499 % @@ -1313,6 +1315,16 @@ E \else }% } \def\Ginclude@pdftex#1{% + % basic faking of viewport settings so graphic-s- interface + % does something sensible + \ifx\GPT@AttrShort\@undefined + \GPT@info{Interpreting graphics options as viewport}% + \let\GPT@AttrShort\@empty + \let\Gin@vllx\Gin@llx + \let\Gin@vlly\Gin@lly + \let\Gin@vurx\Gin@urx + \let\Gin@vury\Gin@ury + \fi \def\@tempa{!}% \ifx\Gin@scaley\@tempa \let\Gin@scaley\Gin@scalex diff --git a/Master/texmf-dist/tex/latex/graphics-def/xetex.def b/Master/texmf-dist/tex/latex/graphics-def/xetex.def index f30eebbc99a..a432f12802f 100644 --- a/Master/texmf-dist/tex/latex/graphics-def/xetex.def +++ b/Master/texmf-dist/tex/latex/graphics-def/xetex.def @@ -673,7 +673,8 @@ \def\Grot@end{\special{x:grestore}} \def\Gscale@start{% - \special{x:gsave}\special{x:scale \Gscale@x\space\Gscale@y}} + \special{x:gsave}% + \special{pdf:literal \Gscale@x\space 0 0 \Gscale@y\space 0 0 cm}} \let\Gscale@end\Grot@end % -- cgit v1.2.3