diff options
| -rw-r--r-- | Master/texmf-dist/tex/latex/graphics-def/dvipdfmx.def | 267 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/graphics-def/dvips.def | 18 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/graphics-def/dvisvgm.def | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/graphics-def/luatex.def | 1335 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/graphics-def/pdftex.def | 1923 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/graphics-def/xetex.def | 802 |
6 files changed, 886 insertions, 3461 deletions
diff --git a/Master/texmf-dist/tex/latex/graphics-def/dvipdfmx.def b/Master/texmf-dist/tex/latex/graphics-def/dvipdfmx.def index 044bc38d6e5..a01c63be14b 100644 --- a/Master/texmf-dist/tex/latex/graphics-def/dvipdfmx.def +++ b/Master/texmf-dist/tex/latex/graphics-def/dvipdfmx.def @@ -1,13 +1,13 @@ -%% This is file `dvipdfmx.def' for DVIPDFMx by J.-H. Cho and S. Hirata -%% based upon `dvipdf.def' in the LaTeX `Graphics Bundle'. +%% dvipdfmx.def Copyright (C) 2005-2017 LaTeX3 Project, Jin-Hwan Cho, Shunsaku Hirata +%% (with contributions from many others) %% -%% Copyright 2005-2016 LaTeX3 Project, Jin-Hwan Cho, Shunsaku Hirata -%% (with contributions from many others) -%% -%% This file is not part of the Standard LaTeX `Graphics Bundle'. -%% It may be distributed under the terms of the LaTeX Project Public -%% License, as described in lppl.txt in the base LaTeX distribution. -%% Either version 1.0 or, at your option, any later version. +%% 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. %% %% This work has the LPPL maintenance status `maintained'. %% @@ -16,25 +16,7 @@ %% https://github.com/latex3/graphics-def/issues %% \ProvidesFile{dvipdfmx.def} - [2016/07/11 v4.12 LaTeX color/graphics driver for dvipdfmx (L3/ChoF)] -% -% miniltx.tex does not define \PackageWarning -\@ifundefined{PackageWarning}{% - \def\PackageWarning#1#2{% - \begingroup - \def\@spaces{\space\space\space\space}% - \ifx\on@line\@undefined\def\on@line{}\fi - \newlinechar=10 % - \def\MessageBreak{% - ^^J(#1)\@spaces\@spaces\@spaces\@spaces - }% - \immediate\write16{^^JPackage #1 Warning: #2\on@line.^^J}% - \endgroup - }% -}{} - -\def\GPT@warn{\PackageWarning{dvipdfmx.def}}% - + [2017/06/01 v5.0a Graphics/color driver for dvipdfmx] \def\c@lor@arg#1{% \dimen@#1\p@ \ifdim\dimen@<\z@\dimen@\maxdimen\fi @@ -71,15 +53,6 @@ \dimen@#1\p@ \divide\dimen@\@cclv \edef#2{\strip@pt\dimen@}} -%% -%% the following 7 lines do not work. (2016/06/22) -%%\def\color@hsb#1#2{\c@lor@@hsb#2\@@#1} -%%\def\c@lor@@hsb#1,#2,#3\@@#4{% -%% \c@lor@arg{#1}% -%% \c@lor@arg{#2}% -%% \c@lor@arg{#3}% -%% \edef#4{[#1 #2 #3] hsb}% -%% } \def\color@named#1#2{\c@lor@@named#2,,\@@#1} \def\c@lor@@named#1,#2,#3\@@#4{% \@ifundefined{col@#1}% @@ -102,87 +75,25 @@ pdf:bgcolor \current@color}} \def\define@color@named#1#2{% \expandafter\let\csname col@#1\endcsname\@nnil} -% -% Graphics -% -\def\declareimagemask{% - \@ifnextchar[\declareimagemask@i{\declareimagemask@i[]}} -\def\declareimagemask@i[#1]#2#3{% - \special{pdf:image @#2\space hide (#3) #1}} -% -% import from pdftex.def -% -\let\GPT@pagebox@option\@empty -\begingroup -\toks@{% -\define@key{Gin}{page}{\def\Gin@page{#1}} -\define@key{Gin}{mask}{\def\Gin@mask{#1}} -\define@key{Gin}{interpolate}[true]{% - \lowercase{\Gin@boolkey{#1}}{interpolate}} -\define@key{Gin}{pagebox}{% - \expandafter\let\expandafter\GPT@pagebox% - \csname GPT@pagebox@#1\endcsname - \ifx\GPT@pagebox\relax - \let\GPT@pagebox\@empty - \GPT@warn{% - Unknown value `#1' for `pagebox'.\MessageBreak - Supported values:\MessageBreak - mediabox, cropbox, bleedbox, trimbox, artbox% - }% - \else% - \def\GPT@pagebox@option{-B \GPT@pagebox\space}% - \fi% -}% -} -\@ifundefined{define@key}{ - \edef\x{\endgroup - \noexpand\AtBeginDocument{% - \noexpand\@ifundefined{define@key}{}{\the\toks@}% - }% - }\x - }{% - \expandafter\endgroup\the\toks@ - }% - -\def\GPT@pagebox@cropbox{cropbox}% -\def\GPT@pagebox@mediabox{mediabox}% -\def\GPT@pagebox@artbox{artbox}% -\def\GPT@pagebox@trimbox{trimbox}% -\def\GPT@pagebox@bleedbox{bleedbox}% -% -% end (import from pdftex.def) -% -% improved by N. Abe to cache BoundingBox for pdfpages package -% +\@ifundefined{Gin@page} + {\let\Gin@page\@empty} + {} +\@ifundefined{Gin@pagebox} + {\def\Gin@page{cropbox}} + {} +\@ifundefined{Gin@interpolate} + {\csname newif\endcsname\ifGin@interpolate} + {} \def\Gread@pdf#1{% -\edef\@tempa{pdf@bbox@cache@\Gin@page @\GPT@pagebox @#1}% -\expandafter\expandafter\expandafter\@ifundefined\expandafter{\@tempa}{\Gread@@pdf{#1}}{% -\edef\@gtempa{\csname\@tempa\endcsname}% -\expandafter\Gread@parse@bb\@gtempa\\}} -\def\Gread@@pdf#1{% - \begingroup - \@tempcnta\z@ - \loop\ifnum\@tempcnta<\@xxxii - \catcode\@tempcnta14 % - \advance\@tempcnta\@ne - \repeat - \catcode`\^^?14 % - \let\do\@makeother - \dospecials - \catcode`\ 10 % - \catcode`\^^I10 % - \catcode\endlinechar5 % - \@makeother\:% - \@makeother\-% - \immediate\openin\@inputcheck"#1" % allow spaces in a name of a .xbb file + \Gread@generic{#1}\Gread@extractbb@aux +} +\def\Gread@extractbb@aux#1{% \ifeof\@inputcheck - \def\@tempc{!}% - \ifx\Gin@page\@tempc - \def\@tempc{}% - \else - \def\@tempc{-p \Gin@page\space}% - \fi - \immediate\openin\@inputcheck="|extractbb \GPT@pagebox@option \@tempc -O \Gin@base\Gin@ext"% + \immediate\openin\@inputcheck=% + "|extractbb % + \ifx\Gin@page\@empty\else -p \Gin@page\space\fi + \ifx\Gin@pagebox\@empty\else -B \Gin@pagebox\space\fi + -O \Gin@base\Gin@ext"% \fi \Gread@true \let\@tempb\Gread@false @@ -203,102 +114,34 @@ \repeat \immediate\closein\@inputcheck \fi -% -% If BoundingBox is not obtained, extractbb may be an old one which does not -% support the -p and/or -B options, and usage of extractbb is printed to stdout. -% Thus we retry without the -p and/or -B optons. -% - \ifGin@bbox\else - \immediate\openin\@inputcheck="|extractbb -O \Gin@base\Gin@ext"% - \message{^^JI try without the new options^^J}% - \Gread@true - \let\@tempb\Gread@false - \ifeof\@inputcheck - \@latex@error - {Cannot run pipe command. Try --shell-escape^^J% - (--enable-pipes in MikTeX) option}% - {}% - \else - \loop - \read\@inputcheck to\@tempa - \ifeof\@inputcheck - \Gread@false - \else - \expandafter\Gread@find@bb\@tempa:.\\% - \fi - \ifGread@ - \repeat - \immediate\closein\@inputcheck - \aftergroup\Gin@clear@pagebox - \fi - \fi -% -% improved by N. Abe to cache BoundingBox for pdfpages package -% - \ifGin@bbox - \edef\@tempa{pdf@bbox@cache@\Gin@page @\GPT@pagebox @#1}% - \expandafter\expandafter\expandafter\xdef\expandafter\csname\@tempa\endcsname{\@gtempa}% - \else - \@latex@error - {Cannot determine size of image (no BoundingBox)}% - {}% - \gdef\@gtempa{0 0 72 72 }% - \fi - \endgroup - \expandafter\Gread@parse@bb\@gtempa\\} -\def\Gin@clear@pagebox{% - \let\GPT@pagebox\@empty} +} \let\Gread@bmp\Gread@pdf -\def\Gin@page{!} -\def\Gin@mask{!} -\newif\ifGin@interpolate\Gin@interpolatefalse -\let\GPT@pagebox\@empty \def\Ginclude@pdf#1{% - \message{<#1>}% + \Gin@interpolatefalse + \Ginclude@dvipdfmx{#1}{epdf}% +} +\def\Ginclude@bmp#1{% + \let\Gin@page\@empty + \let\Gin@pagebox\@empty + \Ginclude@dvipdfmx{#1{image}}% +} +\def\Ginclude@dvipdfmx#1#2{% + \Gin@log{<#1>}% \bgroup \def\@tempa{!}% - \special{pdf:epdf\space - \ifx\Gin@page\@tempa\else page\space\Gin@page\space\fi - \ifx\GPT@pagebox\@empty\else pagebox\space\GPT@pagebox\space\fi + \special{pdf:#2\space + \ifx\Gin@page\@empty\else page\space\Gin@page\space\fi + \ifx\Gin@pagebox\@empty\else pagebox\space\Gin@pagebox\space\fi bbox\space\Gin@llx\space\Gin@lly\space\Gin@urx\space\Gin@ury\space clip\space\ifGin@clip 1\else 0\fi\space \ifx\Gin@scalex\@tempa\else width\space\the\Gin@req@width\space\fi \ifx\Gin@scaley\@tempa\else height\space\the\Gin@req@height\space\fi (#1)\space - \ifx\Gin@mask\@tempa - \ifGin@interpolate<</Interpolate\space true>>\fi - \else - <</SMask @\Gin@mask\space% - \ifGin@interpolate/Interpolate\space true\fi>>% - \fi}% - \egroup} -\def\Ginclude@bmp#1{% - \message{<#1>}% - \bgroup - \def\@tempa{!}% - \special{pdf:image\space - \ifx\Gin@page\@tempa\else page\space\Gin@page\space\fi - % The next line was \ifGin@bbox previously. However, LaTeX can read - % BoundingBox from a .xbb file even when \Gin@bboxfalse. - % Thus, we give bbox in the cases of trim/viewport, since - % trim/viewport don't work without bbox. - \ifx\Gin@ollx\@undefined\else - bbox\space\Gin@llx\space\Gin@lly\space\Gin@urx\space\Gin@ury\space - clip\space\ifGin@clip 1\else 0\fi\space - \fi - \ifx\Gin@scalex\@tempa\else width\space\the\Gin@req@width\space\fi - \ifx\Gin@scaley\@tempa\else height\space\the\Gin@req@height\space\fi - (#1)\space - \ifx\Gin@mask\@tempa - \ifGin@interpolate<</Interpolate\space true>>\fi - \else - <</SMask @\Gin@mask\space% - \ifGin@interpolate/Interpolate\space true\fi>>% - \fi}% + \ifGin@interpolate<</Interpolate\space true>>\fi}% \egroup} \newif\if@trim@vport \def\Ginclude@eps#1{% - \message{<#1>}% + \Gin@log{<#1>}% \bgroup \ifx\Undefined\Gin@vllx\else\@trim@vporttrue\fi \def\@tempa{!}% @@ -345,7 +188,7 @@ % the option --mvorigin. % \def\Ginclude@mps#1{% - \message{<#1>}% + \Gin@log{<#1>}% \bgroup \def\@tempa{!}% \dimen@\Gin@req@width @@ -366,9 +209,25 @@ \def\Grot@start{% \special{pdf:btrans rotate \Grot@angle}} \def\Grot@end{\special{pdf:etrans}} + +% 4.13 add support for ptex vertical writing mode +% inspired by pxtatescale package (Hironobu Yamashita) +\ifx\kanjiskip\@undefined \def\Gscale@start{% \special{pdf:btrans}% - \special{pdf:literal \Gscale@x\space 0 0 \Gscale@y\space 0 0 cm}} + \special{x:scale \Gscale@x\space\Gscale@y}% +} +\else +\edef\Gscale@start{% + \special{pdf:btrans}% + \special{x:scale + \expandafter\noexpand\csname iftdir\endcsname + \noexpand\Gscale@y\noexpand\space\noexpand\Gscale@x + \expandafter\noexpand\csname else\endcsname + \noexpand\Gscale@x\noexpand\space\noexpand\Gscale@y + \expandafter\noexpand\csname fi\endcsname}} +\fi +% \def\Gscale@end{\special{pdf:etrans}} \def\Gin@PS@raw#1{\special{ps: #1}} \def\Gin@PS@restored#1{\special{" #1}} @@ -459,7 +318,3 @@ } \fi \fi - -\endinput -%% -%% End of file `dvipdfmx.def'. diff --git a/Master/texmf-dist/tex/latex/graphics-def/dvips.def b/Master/texmf-dist/tex/latex/graphics-def/dvips.def index b3b65bf8d0f..c999ac054e6 100644 --- a/Master/texmf-dist/tex/latex/graphics-def/dvips.def +++ b/Master/texmf-dist/tex/latex/graphics-def/dvips.def @@ -1,14 +1,6 @@ -%% -%% This is file `dvips.def', -%% original generated with the docstrip utility. -%% -%% The original source files were: -%% -%% drivers.dtx (with options: `dvips,color1,psrulesZ,dosrules,macrules') -%% -%% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz -%% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000--2016 David Carlisle, LaTeX3 Project +%% dvips.def Copyright (C) 1994 David Carlisle Sebastian Rahtz +%% Copyright (C) 1995-1999 David Carlisle +%% Copyright (C) 2000-2017 David Carlisle, LaTeX3 Project %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -25,7 +17,7 @@ %% https://github.com/latex3/graphics-def/issues %% \ProvidesFile{dvips.def} - [2016/07/10 v3.1a Driver-dependent file (DPC,SPQR)] + [2017/06/01 v3.1b Graphics/color driver for dvips] \def\c@lor@arg#1{% \dimen@#1\p@ \ifdim\dimen@<\z@\dimen@\maxdimen\fi @@ -191,5 +183,3 @@ \@namedef{Gin@rule@.pict}#1{{pict}{}{#1}} \@namedef{Gin@rule@.pntg}#1{{pntg}{}{#1}} \endinput -%% -%% End of file `dvips.def'. diff --git a/Master/texmf-dist/tex/latex/graphics-def/dvisvgm.def b/Master/texmf-dist/tex/latex/graphics-def/dvisvgm.def index 777bb855448..2df54162900 100644 --- a/Master/texmf-dist/tex/latex/graphics-def/dvisvgm.def +++ b/Master/texmf-dist/tex/latex/graphics-def/dvisvgm.def @@ -15,7 +15,7 @@ %% %% https://github.com/latex3/graphics-def/issues % -\ProvidesFile{dvisvgm.def}[2016/05/09 v1.0a dvisvgm graphics driver for latex] +\ProvidesFile{dvisvgm.def}[2017/06/01 v1.0a dvisvgm graphics driver for latex] % The following is copied from dvips.def: \def\c@lor@arg#1{% \dimen@#1\p@ diff --git a/Master/texmf-dist/tex/latex/graphics-def/luatex.def b/Master/texmf-dist/tex/latex/graphics-def/luatex.def index 1af0d987494..9b87fbc96f5 100644 --- a/Master/texmf-dist/tex/latex/graphics-def/luatex.def +++ b/Master/texmf-dist/tex/latex/graphics-def/luatex.def @@ -1,16 +1,7 @@ -\ProvidesFile{luatex.def}[2017/01/12 v0.01h Graphics/Color for luaTeX] -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% -%% LaTeX Colour and Graphics support for luatex -%% -%% License -%% ======= -%% -%% Copyright (C) 2000-2017 LaTeX3 Project -%% -%% based on pdftex.def by the following authors -%% David Carlisle, Sebastian Rahtz, Hans Hagen, -%% Heiko Oberdiek and Martin Schr\"oder +%% luatex.def Copyright (C) 2000-2015 David Carlisle, Sebastian Rahtz, +%% Hans Hagen, Heiko Oberdiek and +%% Martin Schr\"oder +%% Copyright (C) 2016-2017 LaTeX3 project and Heiko Oberdiek %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -26,138 +17,18 @@ %% %% https://github.com/latex3/graphics-def/issues %% -%% This work consists of the file luatex.def. -%% -%% Usage -%% ===== -%% -%% It may be used by specifying the luatex option to any of the -%% supported packages, for example: -%% -%% \usepackage[luatex]{graphicx} -%% -%% * luatex determines the bounding box of the images itself -%% Therefore the bounding box options should not be used. -%% In this cases a warning is issued and viewport is used instead. -%% * Option "page" (graphicx) for selecting a page of a multipage -%% PDF document. -%% * \pagecolor is supported. \nopagecolor disables the page color. -%% * Option "quiet" (graphicx/experimental): log messages are suppressed. -%% * Option "resolution" (graphicx/experimental): this sets -%% \pdfvariable imageresolution, see luaTeX documentation. -%% * Option "print" (graphicx/experimental): specifies an alternate -%% print image (bitmaps only), see PDF specification. -%% * luatex.def can be used under plain-TeX with miniltx support. -%% -%% "Experimental" means that these features can change or vanish -%% in later versions. -%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% History -% -% 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. -% 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) - - -% if not luatex, complain, -% on old luatex, use pdftex.def -\ifx\luatexversion\@undefined - \PackageError{graphics}{Unexpected luatex driver}{} -\else - \ifnum\luatexversion<87\relax - \input pdftex.def - \expandafter\expandafter\expandafter\endinput - \fi -\fi - - -\protected\edef\GPT@compresslevel {\pdfvariable compresslevel} - -\begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname RequirePackage\endcsname\relax - \input infwarerr.sty\relax - \input ltxcmds.sty\relax -\else - \RequirePackage{infwarerr}[2007/09/09]% - \RequirePackage{ltxcmds}[2010/12/07]% -\fi - -\def\GPT@error{\@PackageError{luatex.def}}% -\def\GPT@warn{\@PackageWarning{luatex.def}}% -\ifx\Gin@log\@undefined - \def\Gin@log{\message}% -\fi -\def\GPT@info{\@PackageInfoNoLine{luatex.def}}% - - - -% Ensure PDF mode -\ifnum\outputmode<1 % - \GPT@error{% - PDF mode expected, but DVI mode detected!\MessageBreak - If you are using `dvilualatex', then call `lualatex'.\MessageBreak - Otherwise check and correct the driver options.\MessageBreak - Error recovery by switching to PDF mode% - }\@ehc - \outputmode=1 % -\fi -\@ifundefined{ifGin@setpagesize} - {\expandafter\let\csname ifGin@setpagesize\expandafter\endcsname - \csname iftrue\endcsname} - {} -\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}{% - }{% - \ifdim\paperwidth>0pt\relax - \ifdim\paperheight>0pt\relax - \pagewidth=\paperwidth - \pageheight=\paperheight - \fi - \fi - }% -}{% - \ifdim\stockwidth>0pt\relax - \ifdim\stockheight>0pt\relax - \pagewidth=\stockwidth - \pageheight=\stockheight - \fi - \fi -}% -\fi -} -\fi -\fi - -% Colour Support. The following models may be used. -% * cmyk supported directly. -% * rgb supported directly. -% * RGB converted to rgb by this file. -% * gray supported directly. -% * named converted to cmyk by this file. -% +\ProvidesFile{luatex.def} + [2017/06/01 v1.0a Graphics/color driver for luatex] \def\c@lor@arg#1{% \dimen@#1\p@ \ifdim\dimen@<\z@\dimen@\maxdimen\fi \ifdim\dimen@>\p@ \PackageError{color}{Argument `#1' not in range [0,1]}\@ehd - \fi -} + \fi} +\def\color@gray#1#2{% + \c@lor@arg{#2}% + \edef#1{#2 g #2 G}% + } \def\color@cmyk#1#2{\c@lor@@cmyk#2\@@#1} \def\c@lor@@cmyk#1,#2,#3,#4\@@#5{% \c@lor@arg{#4}% @@ -165,94 +36,65 @@ \c@lor@arg{#2}% \c@lor@arg{#3}% \edef#5{#1 #2 #3 #4 k #1 #2 #3 #4 K}% -} -\def\color@gray#1#2{% - \c@lor@arg{#2}% - \edef#1{#2 g #2 G}% -} + } \def\color@rgb#1#2{\c@lor@@rgb#2\@@#1} \def\c@lor@@rgb#1,#2,#3\@@#4{% \c@lor@arg{#1}% \c@lor@arg{#2}% \c@lor@arg{#3}% \edef#4{#1 #2 #3 rg #1 #2 #3 RG}% -} + } \def\color@RGB#1#2{\c@lor@@RGB#2\@@#1} \def\c@lor@@RGB#1,#2,#3\@@#4{% - \c@lor@RGB@rgb{#1}\@tempa - \c@lor@RGB@rgb{#2}\@tempb - \c@lor@RGB@rgb{#3}\@tempc - \c@lor@@rgb\@tempa,\@tempb,\@tempc\@@#4% -} + \c@lor@RGB@rgb{#1}\@tempa + \c@lor@RGB@rgb{#2}\@tempb + \c@lor@RGB@rgb{#3}\@tempc + \c@lor@@rgb\@tempa,\@tempb,\@tempc\@@#4% + } \def\c@lor@RGB@rgb#1#2{% \dimen@#1\p@ \divide\dimen@\@cclv - \edef#2{\strip@pt\dimen@}% -} - + \edef#2{\strip@pt\dimen@}} \def\color@named#1#2{\c@lor@@named#2,,\@@#1} \def\c@lor@@named#1,#2,#3\@@#4{% - \ltx@IfUndefined{col@#1}{% - \PackageError{color}{Undefined color `#1'}\@ehd - }{% - \edef#4{\csname col@#1\endcsname}% - }% -} - - - \chardef\main@pdfcolorstack=0 % - \ltx@ifundefined{@pdfcolorstack}{% - \def\@pdfcolorstack{\main@pdfcolorstack}% - }{}% - \def\set@color{% - \pdfextension colorstack\@pdfcolorstack push{\current@color}% - \aftergroup\reset@color - }% - \def\reset@color{% - \pdfextension colorstack\@pdfcolorstack pop\relax - }% - -\def\define@color@named#1#2{% - \expandafter\edef\csname col@#1\endcsname{#2}% -} + \@ifundefined{col@#1}% + {\PackageError{color}{Undefined color `#1'}\@ehd}% + {\edef#4{\csname col@#1\endcsname}}% + } +\chardef\main@pdfcolorstack=0 % +\@ifundefined{@pdfcolorstack} + {\def\@pdfcolorstack{\main@pdfcolorstack}}{} \def\current@color{0 g 0 G} - -% v0.02t: support for \pagecolor -% fixed in v0.02p by using a box register, see -% http://tug.org/pipermail/pdftex/2005-August/005916.html -% -% v0.03r: \nopagecolor/\no@page@color added. -\ltx@newglobalif\ifGPT@pagecolor -\ltx@ifundefined{nopagecolor}{% - \def\nopagecolor{\no@page@color}% -}{} -\def\no@page@color{% - \GPT@pagecolorfalse -} +\def\set@color{% + \pdfextension colorstack\@pdfcolorstack push{\current@color}% + \aftergroup\reset@color} +\def\reset@color{\pdfextension colorstack\@pdfcolorstack pop\relax} +\newif\ifGPT@pagecolor +\begingroup\expandafter\expandafter\expandafter\endgroup \def\set@page@color{% \GPT@pagecolortrue \global\let\current@page@color\current@color - \ltx@ifundefined{GPT@outputbox}{% + \ifundefined{GPT@outputbox}{% % \newbox is outer in plain \csname newbox\endcsname\GPT@outputbox }{}% - \ltx@ifundefined{GPTorg@shipout}{% + \@ifundefined{GPTorg@shipout}{% \global\let\GPTorg@shipout\shipout \gdef\shipout{% - \edef\GPT@saved@grouplevel{\number\currentgrouplevel}% + \edef\GPT@saved@grouplevel{\number\currentgrouplevel}% \afterassignment\GPT@shipout \global\setbox\GPT@outputbox=% }% \gdef\GPT@shipout{% - \ifnum\GPT@saved@grouplevel=\currentgrouplevel - \else + \ifnum\GPT@saved@grouplevel=\currentgrouplevel + \else \expandafter\aftergroup \fi \GPT@@shipout }% \gdef\GPT@@shipout{% \ifvoid\GPT@outputbox\relax - \GPT@warn{Ignoring void output box}% + \PackageInfo{pdftex.def}{Ignoring void output box}% \else \setbox\GPT@outputbox=\vbox{% \GPT@pageliteral @@ -265,10 +107,10 @@ \ifGPT@pagecolor \pdfextension literal page{% q % gsave - \current@page@color\ltx@space + \current@page@color\space n % newpath - 0 0 \strip@pt\pagewidth\ltx@space - \strip@pt\pageheight\ltx@space re % rectangle + 0 0 \strip@pt\pagewidth\space + \strip@pt\pageheight\space re % rectangle % there is no need to convert to bp f % fill Q% grestore @@ -277,576 +119,141 @@ }% }{}% } - - - - -% -% Graphic inclusion. Currently supports .png, .jpg, .mps and .pdf inclusion; -% .mps is MetaPost output. -% -% -% support for -% * multipage pdf images -% * alternate print image (bitmaps only) -% * printed image can be resused, but not the base image, -% because it's dictionary contains the additional key /Alternates. -% * not supported by Ghostscript or xpdf. -% * option quiet -% * option resetcolor -% * option xmpfile -% -% \GPT@page: page number of pdf image or \ltx@empty otherwise. -\let\GPT@page\ltx@empty -% \GPT@print: file name for alternate image or \ltx@empty otherwise. -\let\GPT@print\ltx@empty -\let\GPT@xmpfile\ltx@empty -\let\GPT@pagebox\ltx@empty -\let\GPT@pagebox@\ltx@empty -\let\GPT@interpolate\ltx@empty -\let\GPT@decodearray\ltx@empty -\let\GPT@mask\ltx@empty -\let\GPT@intent\ltx@empty -\let\GPT@ocobjnum\ltx@empty -\ltx@newif\ifGPT@ResetColor -\let\GPT@ResetColorEnd\relax -\def\GPT@ResetColorBegin{% - \ifGPT@ResetColor - \ifGPT@IsBitmap - \else - \begingroup - \normalcolor - \let\GPT@ResetColorEnd\endgroup - \fi - \fi -} - -% \pdfmatch may be emulated in lua -% (may be better to use lua patterns than bring in full -% regex, do nothing for now - \def\GPT@match#1#2#3#4{}% - \def\GPT@pat@real/{}% - - -\begingroup - \toks@{% - \define@key{Gin}{resetcolor}[true]{% - \csname GPT@ResetColor% - \expandafter\ifx\csname iftrue\expandafter\endcsname - \csname if#1\endcsname - true% - \else - false% - \fi - \endcsname - }% -% - \define@key{Gin}{page}{% - \def\GPT@page{#1}% - \ifx\GPT@page\ltx@empty - \else - \edef\GPT@page{\number\GPT@page}% - \fi - }% - \define@key{Gin}{print}{% - \def\GPT@print{#1}% - }% -% - % option pagebox - \define@key{Gin}{pagebox}{% - \expandafter\let\expandafter\GPT@pagebox - \csname GPT@pagebox@#1\endcsname - \ifx\GPT@pagebox\relax - \let\GPT@pagebox\ltx@empty - \GPT@warn{% - Unknown value `#1' for `pagebox'.\MessageBreak - Supported values:\MessageBreak - mediabox, cropbox, bleedbox, trimbox, artbox% - }% - \fi - }% - \def\GPT@pagebox@mediabox{mediabox}% - \let\GPT@pagebox@cropbox\ltx@empty - \def\GPT@pagebox@bleedbox{bleedbox}% - \def\GPT@pagebox@trimbox{trimbox}% - \def\GPT@pagebox@artbox{artbox}% - % option interpolate - \define@key{Gin}{interpolate}[true]{% - \expandafter\let\expandafter\GPT@interpolate - \csname GPT@interpolate@#1\endcsname - \ifx\GPT@interpolate\relax - \let\GPT@interpolate\ltx@empty - \GPT@warn{% - Unknown value `#1' for `interpolate'.\MessageBreak - Supported values: true, false% - }% - \fi - }% - \let\GPT@interpolate@false\ltx@empty - \def\GPT@interpolate@true{1}% non-empty, value does not matter - % option decodearray - \define@key{Gin}{decodearray}{% - \def\GPT@decodearray{#1}% - \ifx\GPT@decodearray\ltx@empty - \else - \GPT@match\GPT@decodearray{% - ((^| )\GPT@pat@real/ \GPT@pat@real/)+$% - }{}{% - \GPT@warn{% - Invalid value (\GPT@decodearray)\MessageBreak - for `decodearray' is ignored% - }% - \let\GPT@decodearray\ltx@empty - }% - \fi - }% - % option maskarray - \define@key{Gin}{maskarray}{% - \def\GPT@mask{#1}% - \ifx\GPT@mask\ltx@empty - \else - \GPT@match\GPT@mask{% - ((^| )[0-9]+ [0-9]+)+$% - }{}{% - \GPT@warn{% - Invalid value (\GPT@mask)\MessageBreak - for `maskarray' is ignored% - }% - \let\GPT@mask\ltx@empty - }% - \ifx\GPT@mask\ltx@empty - \else - \edef\GPT@mask{[\GPT@mask]}% - \fi - \fi - }% - % option intent - \define@key{Gin}{intent}{% - \def\GPT@intent{#1}% - \ifx\GPT@intent\ltx@empty - \else - \GPT@match\GPT@intent{% - ^((Absolute|Relative)Colorimetric|Saturation|Perceptual)$% - }{}{% - \GPT@match\GPT@intent{% - ^[A-Za-z0-9_]+$% - }{% - \GPT@warn{% - Rendering intent `\GPT@intent'\MessageBreak - is not a standard name of the PDF specification% - }% - }{% - \GPT@warn{% - Ignoring intent `\GPT@intent'\MessageBreak - with unusual characters% - }% - \let\GPT@intent\ltx@empty - }% - }% - \fi - }% - % option ocobjnum - \define@key{Gin}{ocobjnum}{% - \edef\GPT@ocobjnum{#1}% - \ifx\GPT@ocobjnum\ltx@empty - \else - \edef\GPT@ocobjnum{\number\GPT@ocobjnum}% - \GPT@match\GPT@ocobjnum{^[1-9]+[0-9]*$}{% - }{% - \GPT@warn{% - Invalid value (\GPT@ocobjnum)\MessageBreak - for `ocobjnum' is ignored% - }% - \let\GPT@ocobjnum\ltx@empty - }% - \ifx\GPT@ocobjnum\ltx@empty - \else - \edef\GPT@ocobjnum{\number\GPT@ocobjnum}% - \fi - \fi - }% - % option ocobjref - \define@key{Gin}{ocobjref}{% - \edef\GPT@ocobjnum{#1}% - \ifx\GPT@ocobjnum\ltx@empty - \else - \edef\GPT@ocobjnum{% - \expandafter\strip@prefix\meaning\GPT@ocobjnum - }% - \GPT@match\GPT@ocobjnum{^[1-9]+[0-9]* 0 R$}{% - }{% - \GPT@warn{% - Invalid value (\GPT@ocobjnum)\MessageBreak - for `ocobjref' is ignored% - }% - \let\GPT@ocobjnum\ltx@empty - }% - \ifx\GPT@ocobjnum\ltx@empty - \else - \begingroup - \def\GPT@temp##1 ##2\@nil{\endgroup - \def\GPT@ocobjnum{##1}% - }% - \expandafter\GPT@temp\GPT@ocobjnum\@nil - \edef\GPT@ocobjnum{\number\GPT@ocobjnum}% - \fi - \fi - }% - \define@key{Gin}{quiet}[]{% - \let\Gin@log\ltx@gobble - }% - \define@key{Gin}{resolution}{% - \pdfvariable imageresolution#1\relax - }% - \define@key{Gin}{xmpfile}[\Gin@base.xmp]{% - \def\GPT@xmpfile{#1}% - }% - }% - \ltx@IfUndefined{define@key}{% - \edef\x{\endgroup - \noexpand\AtBeginDocument{% - \noexpand\ltx@IfUndefined{define@key}{}{\the\toks@}% - }% - }\x - }{% - \expandafter\endgroup\the\toks@ - }% - -% redefinitions of some graphicx options: -\def\GPT@disable#1{% - \GPT@warn{% - Option `#1' is not supported, use\MessageBreak - option `viewport' instead% - }% -} -\def\GPT@fix{% - \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname define@key\endcsname\relax - \else - \def\KV@Gin@bb{% - \GPT@warn{% - Option `bb' does not make sense,\MessageBreak - using `viewport' instead% - }% - \KV@Gin@viewport - }% - \define@key{Gin}{bbllx}{\GPT@disable{bbllx}}% - \define@key{Gin}{bblly}{\GPT@disable{bblly}}% - \define@key{Gin}{bburx}{\GPT@disable{bburx}}% - \define@key{Gin}{bbury}{\GPT@disable{bbury}}% - \fi +\def\define@color@named#1#2{% + \expandafter\edef\csname col@#1\endcsname{#2}} +\def\no@page@color{% + \GPT@pagecolorfalse } -\AtBeginDocument{\GPT@fix} - -% -% Check for image file existence -% - \def\GPT@IfFileExists#1{% - \IfFileExists{#1}% - }% - -% -% Wrapper for \Gread@... that checks image existence first. -% -\def\GPT@read#1#2{% - \GPT@IfFileExists{#2}% - {% - #1{#2}% - }{% - \def\Gin@llx{0}% - \let\Gin@lly\Gin@llx - \def\Gin@urx{72}% - \let\Gin@ury\Gin@urx - \ifGin@draft - \else - \GPT@error{File `#2' not found}{% - Using draft setting for this image.\MessageBreak +\def\Gread@pdftex#1{% + \IfFileExists{#1} + {\Gread@@pdftex{#1}}% + {% + \def\Gin@llx{0}% + \let\Gin@lly\Gin@llx + \def\Gin@urx{72}% + \let\Gin@ury\Gin@urx + \ifGin@draft + \else + \PackageError{luatex.def}{File `#1' not found: using draft setting}% \@ehc - }% - \Gin@drafttrue - \fi - }% -} - -% -% mechanism for re-use of objects also -% allows us to get the size by deriving it from the initial storage; -% this works for all graphics types. -% -\ltx@ifundefined{Gread@gobject}{% - \csname newcount\endcsname\Gread@gobject -}{} -\def\GPT@ReusedName#1{% - \ifx\GPT@print\ltx@empty - #1% - \else - \GPT@print - \fi -} -\def\GPT@objref{ 0 R} -\def\Gread@pdftex{% - \GPT@read\Gread@@pdftex + \Gin@drafttrue + \fi + }% } +\let\Gin@attr@hash\@empty +\@ifundefined{Gin@log} + {\let\Gin@log\wlog} + {} +\@ifundefined{Gin@page} + {\let\Gin@page\@empty} + {} +\@ifundefined{Gin@pagebox} + {\def\Gin@page{cropbox}} + {} +\@ifundefined{Gin@interpolate} + {\csname newif\endcsname\ifGin@interpolate} + {} \def\Gread@@pdftex#1{% - % Ensure that option `print' works only on bitmap images. - \let\GPT@Attr\ltx@empty - \let\GPT@AttrShort\ltx@empty - \ifx\GPT@ocobjnum\ltx@empty + \edef\Gin@attr@hash{% + \ifx\Gin@pagebox\@empty \else - \edef\GPT@AttrShort{\GPT@AttrShort - :OC\GPT@ocobjnum - }% - \edef\GPT@Attr{\GPT@Attr - /OC \GPT@ocobjnum\GPT@objref - }% + :\Gin@pagebox \fi - \ifGPT@IsBitmap - \let\GPT@page\ltx@empty - \let\GPT@pagebox\ltx@empty - \ifx\GPT@xmpfile\ltx@empty - \else - \ltx@IfUndefined{GPT@XMP@\GPT@xmpfile}{% - \GPT@IMfFileExists{\GPT@xmpfile}{% - \begingroup - \GPT@compresslevel=0 % - \immediate\pdfextension obj stream attr{% - /Type/Metadata% - /Subtype/XML% - }file{\GPT@xmpfile}% - \expandafter\xdef\csname GPT@XMP@\GPT@xmpfile\endcsname{% - \the\numexpr\pdffeedback lastobj\relax - }% - \endgroup - }{% - \GPT@warn{Missing XMP file (\GPT@xmpfile)}% - }% - }{}% - \ltx@IfUndefined{GPT@XMP@\GPT@xmpfile}{}{% - \edef\GPT@Attr{\GPT@Attr - /Metadata \@nameuse{GPT@XMP@\GPT@xmpfile}\GPT@objref - }% - \edef\GPT@AttrShort{\GPT@AttrShort - :MD\@nameuse{GPT@XMP@\GPT@xmpfile}% - }% - }% - \fi - \ifx\GPT@interpolate\ltx@empty - \else - \edef\GPT@Attr{\GPT@Attr - /Interpolate true% - }% - \edef\GPT@AttrShort{\GPT@AttrShort - :I% - }% - \fi - \ifx\GPT@decodearray\ltx@empty - \else - \edef\GPT@Attr{\GPT@Attr - /Decode[\GPT@decodearray]% - }% - \edef\GPT@AttrShort{\GPT@AttrShort - :D[\GPT@decodearray]% - }% - \fi - \ifx\GPT@mask\ltx@empty - \else - \edef\GPT@Attr{\GPT@Attr - /Mask\GPT@mask - }% - \edef\GPT@AttrShort{\GPT@AttrShort - :M\GPT@mask - }% - \fi - \ifx\GPT@intent\ltx@empty - \else - \edef\GPT@AttrShort{\GPT@AttrShort - :RI\GPT@intent - }% - \edef\GPT@intent{\TODOescapename{\GPT@intent}}% - \edef\GPT@Attr{\GPT@Attr - /Intent/\GPT@intent - }% - \fi - \else - \let\GPT@interpolate\ltx@empty - \let\GPT@decodearray\ltx@empty - \let\GPT@mask\ltx@empty - \let\GPT@intent\ltx@empty - \ifx\GPT@page\ltx@empty + \ifx\Gin@page\@empty \else - \edef\GPT@AttrShort{\GPT@AttrShort - :P\GPT@page - }% + :P\Gin@page \fi - \ifx\GPT@pagebox\ltx@empty - \else - \edef\GPT@AttrShort{% - \GPT@AttrShort - :\expandafter\ltx@car\GPT@pagebox{}\@nil b% - }% + \ifGin@interpolate + :I% \fi - \ifx\GPT@print\ltx@empty - \else - \GPT@warn{% - Option `print' can only be used\MessageBreak - for bitmap images% + }% + \@ifundefined{#1 image\Gin@attr@hash}% + {% + \saveimageresource + \ifGin@interpolate attr{/Interpolate true}\fi + \ifx\Gin@page\@empty\else page \Gin@page\fi + \Gin@pagebox + {#1}% + \setbox\@tempboxa=\hbox{\useimageresource\lastsavedimageresourceindex}% + \def\Gin@llx{0}\let\Gin@lly\Gin@llx + \Gin@defaultbp\Gin@urx{\wd\@tempboxa}% + \Gin@defaultbp\Gin@ury{\ht\@tempboxa}% + \expandafter\xdef\csname #1 image\Gin@attr@hash\endcsname + {\useimageresource\the\lastsavedimageresourceindex}% + \expandafter\xdef\csname #1 height\Gin@attr@hash\endcsname + {\the\ht\@tempboxa}% + \expandafter\xdef\csname #1 width\Gin@attr@hash\endcsname + {\the\wd\@tempboxa}% + \Gin@log{% + <#1, % + id=\the\lastsavedimageresourceindex, % + \ifx\Gin@page\@empty\else page=\Gin@page , \fi + \ifx\Gin@pagebox\@empty\else pagebox=\Gin@pagebox , \fi + \ifGin@interpolate interpolate=true, \fi + \the\wd\@tempboxa\space x \the\ht\@tempboxa + >% }% - \let\GPT@print\ltx@empty - \fi - \fi - % Check if print image exists. - \ifx\GPT@print\ltx@empty - \else - \GPT@IfFileExists{\GPT@print}{% }{% - \GPT@error{Print image `\GPT@print' not found}{% - The print version of the image is ignored.\MessageBreak - \@ehc - }% - \let\GPT@print\ltx@empty + \def\Gin@llx{0}\let\Gin@lly\Gin@llx + \Gin@defaultbp\Gin@urx{\csname #1 width\Gin@attr@hash\endcsname}% + \Gin@defaultbp\Gin@ury{\csname #1 height\Gin@attr@hash\endcsname}% }% - \fi - % If option `print' is set, the screen image object - % will contain an additional /Alternate entry - % and will not be reused. - \ifx\GPT@print\ltx@empty - \else - \expandafter\expandafter\expandafter\ltx@firstoftwo\expandafter\ltx@gobbletwo - \fi - \ltx@ifundefined{#1 image\GPT@AttrShort}{% - \ifx\GPT@print\ltx@empty - \ifx\GPT@Attr\ltx@empty - \let\GPT@RuleAttr\ltx@empty - \else - \edef\GPT@RuleAttr{attr{\GPT@Attr}}% - \fi - \else - \ltx@ifundefined{\GPT@print\ltx@space image\GPT@AttrShort}{% - \immediate\saveimageresource{\GPT@print}% - \setbox\@tempboxa=\hbox{\useimageresource\lastsavedimageresourceindex}% - \edef\GPT@PrintObj{\the\lastsavedimageresourceindex}% - \expandafter\xdef\csname\GPT@print\ltx@space - image\GPT@AttrShort\endcsname{% - \useimageresource\GPT@PrintObj\relax - }% - \immediate\pdfextension obj{% - [<<% - /Image \GPT@PrintObj\GPT@objref - /DefaultForPrinting true% - >>]% - }% - \def\GPT@RuleAttr{% - width\wd\@tempboxa height\ht\@tempboxa - attr{% - \GPT@Attr - /Alternates \the\numexpr\pdffeedback lastobj\relax\GPT@objref - }% - }% - }{% - \edef\GPT@PrintObj{% - \expandafter\expandafter\expandafter\ltx@gobble - \csname\GPT@print\ltx@space image\GPT@AttrShort\endcsname - }% - \immediate\pdfextension obj{% - [<<% - /Image \GPT@PrintObj\GPT@objref - /DefaultForPrinting true% - >>]% - }% - \def\GPT@RuleAttr{% - width \csname\GPT@print\ltx@space width\GPT@AttrShort\endcsname - height \csname\GPT@print\ltx@space height\GPT@AttrShort\endcsname - attr{% - \GPT@Attr - /Alternates \the\numexpr\pdffeedback lastobj\relax\GPT@objref - }% - }% - }% - \fi - \saveimageresource\GPT@RuleAttr - \ifx\GPT@page\ltx@empty - \else - page \GPT@page - \fi - \GPT@pagebox - {#1}% - \setbox\@tempboxa=\hbox{\useimageresource\lastsavedimageresourceindex}% - \def\Gin@llx{0}\let\Gin@lly\Gin@llx - \Gin@defaultbp\Gin@urx{\wd\@tempboxa}% - \Gin@defaultbp\Gin@ury{\ht\@tempboxa}% - \expandafter\xdef\csname\GPT@ReusedName{#1} width\GPT@AttrShort\endcsname{% - \the\wd\@tempboxa - }% - \expandafter\xdef\csname\GPT@ReusedName{#1} height\GPT@AttrShort\endcsname{% - \the\ht\@tempboxa - }% - \expandafter\xdef\csname #1 image\GPT@AttrShort - \ifx\GPT@print\ltx@empty\else!\fi\endcsname{% - \useimageresource\the\lastsavedimageresourceindex - }% - \Gin@log{% - <#1, id=% - \the\lastsavedimageresourceindex - \ifx\GPT@page\ltx@empty\else , page=\GPT@page\fi - \ifx\GPT@pagebox\ltx@empty\else, pagebox=\GPT@pagebox\fi - \ifx\GPT@interpolate\ltx@empty\else, interpolate=true\fi - \ifx\GPT@print\ltx@empty - \else - , print=\GPT@print, id=\GPT@PrintObj - \fi - , \the\wd\@tempboxa\ltx@space x \the\ht\@tempboxa - >% - }% - }{% - \def\Gin@llx{0}\let\Gin@lly\Gin@llx - \Gin@defaultbp\Gin@urx{\csname#1 width\GPT@AttrShort\endcsname}% - \Gin@defaultbp\Gin@ury{\csname#1 height\GPT@AttrShort\endcsname}% - }% } -\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\Gread@png#1{% + \let\Gin@page\@empty + \Gread@pdftex{#1}% +} +\let\Gread@jpg\Gread@png +\expandafter\let\csname Gread@jbig2\endcsname\Gread@png +\def\Gread@pdf#1{% + \Gin@interpolatefalse + \Gread@pdftex{#1}% +} +\let\Gread@mps\Gread@eps +\def\GPT@setup@scale{% \def\@tempa{!}% \ifx\Gin@scaley\@tempa \let\Gin@scaley\Gin@scalex \else \ifx\Gin@scalex\@tempa\let\Gin@scalex\Gin@scaley\fi \fi +} +\def\Ginclude@pdftex#1{% + \GPT@setup@scale \Gin@log{% <use #1% - \ifx\GPT@page\ltx@empty\else, page \GPT@page\fi + \ifx\Gin@page\@empty\else, page \Gin@page\fi >% }% - \GPT@info{% - #1\ifx\GPT@page\ltx@empty\else, page\GPT@page\fi - \ltx@space used\on@line.\MessageBreak + \PackageInfo{luatex.def}{% + #1 \ifx\Gin@page\@empty\else, page\Gin@page\fi + \space used\ifx\on@line\@undefined\else\on@line\fi.}% + \PackageInfo{luatex.def}{% Requested size: % - \the\Gin@req@width\ltx@space x \the\Gin@req@height + \the\Gin@req@width\space x \the\Gin@req@height }% + \Ginclude@@pdftex{\@nameuse{#1 image\Gin@attr@hash}}% +} +\def\Ginclude@mps#1{% + \GPT@setup@scale + \Ginclude@@pdftex{\convertMPtoPDF{#1}{1}{1}}% +} +\def\Ginclude@@pdftex#1{% \hbox{% - \GPT@ResetColorBegin \Gscale@box{\Gin@scalex}[\Gin@scaley]{% - \ltx@IfUndefined{Gin@vllx}{% + \@ifundefined{Gin@vllx}{% \GPT@viewportfalse % without viewport/trim clipping does not make sense % for pdfTeX \Gin@clipfalse }{}% \ifGin@clip - \if!\Gin@vllx\Gin@vlly\Gin@vurx\Gin@vury!% - \else - \let\GPT@clipend\GPT@DoClipEnd - \setbox\@tempboxa\hbox\bgroup - \fi + \if!\Gin@vllx\Gin@vlly\Gin@vurx\Gin@vury!% + \else + \let\GPT@clipend\GPT@DoClipEnd + \setbox\@tempboxa\hbox\bgroup \fi + \fi \ifGPT@viewport \ifdim\Gin@vlly\p@=\z@ \else @@ -857,9 +264,7 @@ \hskip-\Gin@vllx bp\relax \fi \fi - \csname#1 image\GPT@AttrShort - \ifx\GPT@print\ltx@empty\else!\fi - \endcsname + #1% \ifGPT@viewport \ifdim\Gin@vlly\p@=\z@ \else @@ -868,10 +273,9 @@ \GPT@clipend \fi }% - \GPT@ResetColorEnd }% } -\ltx@newif\ifGPT@viewport +\newif\ifGPT@viewport \GPT@viewporttrue \let\GPT@clipend\relax \def\GPT@DoClipEnd{% @@ -880,200 +284,59 @@ % \Gin@urx and \Gin@ury already contain the correct values, % so both cases viewport and trim can be handled together: \dimen@\Gin@urx\p@ - % v0.03k \Gin@vllx replaced by \Gin@llx \advance\dimen@ -\Gin@llx\p@ \wd\@tempboxa\strip@pt\dimen@ bp\relax \dimen@\Gin@ury\p@ - % v0.03k \Gin@vlly replaced by \Gin@lly \advance\dimen@ -\Gin@lly\p@ \ht\@tempboxa\strip@pt\dimen@ bp\relax - \let\GPT@temp\ltx@empty - \ifx\GPT@ocobjnum\ltx@empty - \fi - \expandafter\saveboxresource\GPT@temp\@tempboxa + \saveboxresource\@tempboxa \useboxresource\lastsavedboxresourceindex } -\ltx@newif\ifGPT@IsBitmap -\def\Gread@pdfbitmap#1{% - \GPT@IsBitmaptrue - \Gread@pdftex{#1}% - \GPT@IsBitmapfalse -} - -\edef\Gread@MBox{/MediaBox} -\def\Gread@pdf{% - \GPT@read\Gread@@pdf -} -\def\Gread@@pdf#1{% - \begingroup - \@tempcnta\z@ - \loop - \ifnum\@tempcnta<\@xxxii - \catcode\@tempcnta14 % - \advance\@tempcnta\@ne - \repeat - \catcode127=14 % - \let\do\@makeother\dospecials\catcode`\ 10 % - \catcode\endlinechar5 % - \immediate\openin\@inputcheck#1 % - \ifeof\@inputcheck - \@latex@error{File `#1' not found}\@ehc - \else - \Gread@true - \let\@tempb\Gread@false - \loop -% v0.02e: use \. not \@tempa so the space is preserved before [ - \read\@inputcheck to\.% - \ifeof\@inputcheck - \Gread@false - \else - \expandafter\Gread@find@mbox\. []\\% - \fi - \ifGread@ - \repeat - \immediate\closein\@inputcheck - \fi - \ifGin@bbox - \else - \@latex@error - {Cannot determine size of graphic in #1 (no BoundingBox)}% - \@ehc - \gdef\@gtempa{0 0 72 72 }% - \fi - \endgroup - \expandafter\Gread@parse@bb\@gtempa\\% -} -\long\def\Gread@find@mbox#1 [#2]#3\\{% hash-ok - \def\@tempa{#1}% - \ifx\@tempa\Gread@MBox - \gdef\@gtempa{#2 }% - \@tempb - \Gin@bboxtrue - \fi -} - -\def\Ginclude@mps#1{% - \def\@tempa{!}% - \ifx\Gin@scaley\@tempa - \let\Gin@scaley\Gin@scalex - \else - \ifx\Gin@scalex\@tempa\let\Gin@scalex\Gin@scaley\fi - \fi - \hbox{% - \GPT@ResetColorBegin - \Gscale@box{\Gin@scalex}[\Gin@scaley]{% - \ltx@IfUndefined{Gin@vllx}{% - \GPT@viewportfalse - % without viewport/trim clipping does not make sense - % for pdfTeX - \Gin@clipfalse - }{}% - \ifGin@clip - \if!\Gin@vllx\Gin@vlly\Gin@vurx\Gin@vury!% - \else - \let\GPT@clipend\GPT@DoClipEnd - \setbox\@tempboxa\hbox\bgroup - \fi - \fi - \ifGPT@viewport - \ifdim\Gin@vlly\p@=\z@ - \else - \lower\Gin@vlly bp\hbox\bgroup - \fi - \ifdim\Gin@vllx\p@=\z@ - \else - \hskip-\Gin@vllx bp\relax - \fi - \fi -%%%%% \GPT@catcodes{mps}% - \convertMPtoPDF{#1}{1}{1}% -%%%%% \GPT@restore@mps - \ifGPT@viewport - \ifdim\Gin@vlly\p@=\z@ - \else - \egroup - \fi - \GPT@clipend - \fi - }% - \GPT@ResetColorEnd - }% -} -\def\Gread@mps{% - \GPT@read\Gread@eps -} - \let\Ginclude@png\Ginclude@pdftex - \let\Ginclude@jpg\Ginclude@pdftex - \let\Ginclude@pdf\Ginclude@pdftex - \let\Gread@pdf\Gread@pdftex - \let\Gread@png\Gread@pdfbitmap - \let\Gread@jpg\Gread@pdfbitmap - \expandafter\let\csname Gread@jbig2\endcsname\Gread@pdfbitmap - \expandafter\let\csname Ginclude@jbig2\endcsname\Ginclude@pdftex - - \@namedef{Gin@rule@.jpg}#1{{jpg}{.jpg}{#1}}% - \@namedef{Gin@rule@.jpeg}#1{{jpg}{.jpeg}{#1}}% - \@namedef{Gin@rule@.JPG}#1{{jpg}{.JPG}{#1}}% - \@namedef{Gin@rule@.JPEG}#1{{jpg}{.JPEG}{#1}}% - \def\Gin@extensions{% - .png,.pdf,.jpg,.mps,.jpeg,.jbig2,.jb2,% - .PNG,.PDF,.JPG,.JPEG,.JBIG2,.JB2}% - \@namedef{Gin@rule@.jb2}#1{{jbig2}{.jb2}{#1}}% - \@namedef{Gin@rule@.jbig2}#1{{jbig2}{.jbig2}{#1}}% - -\@namedef{Gin@rule@.png}#1{{png}{.png}{#1}} -\@namedef{Gin@rule@.PNG}#1{{png}{.PNG}{#1}} -\@namedef{Gin@rule@.mps}#1{{mps}{.mps}{#1}} -\@namedef{Gin@rule@.pdf}#1{{pdf}{.pdf}{#1}} -\@namedef{Gin@rule@.PDF}#1{{pdf}{.PDF}{#1}} -\@namedef{Gin@rule@.eps}#1{{eps}{.eps}{#1}} - - -% Rotation -% slightly hacky, but set width of box 0 to 0pt otherwise -% the CTM gets restored in the wrong place. - +\let\Ginclude@png\Ginclude@pdftex +\let\Ginclude@jpg\Ginclude@pdftex +\let\Ginclude@pdf\Ginclude@pdftex +\expandafter\let\csname Ginclude@jbig2\endcsname\Ginclude@pdftex \def\GPT@MatrixIdentity{1 0 0 1} \def\GPT@Zero{0} \def\GPT@Minus{-} \def\GPT@NormalizeNumber#1{% \edef#1{#1}% - \edef#1{\expandafter\ltx@zapspace\expandafter{#1}}% + \edef#1{\expandafter\zap@space#1 \@empty}% \edef#1{\expandafter\GPT@ZapPlus#1+\@nil}% \edef#1{\expandafter\GPT@ZapMinusMinus#1--\@nil}% \expandafter\GPT@Split#1..\@nil - \ifx\GPT@frac\ltx@empty + \ifx\GPT@frac\@empty \else \edef\GPT@frac{% \expandafter\GPT@Reverse\expandafter{\expandafter}\GPT@frac\@nil }% \edef\GPT@frac{% - \expandafter\GPT@ZapLeadingZeros\GPT@frac\ltx@empty + \expandafter\GPT@ZapLeadingZeros\GPT@frac\@empty }% - \ifx\GPT@frac\ltx@empty + \ifx\GPT@frac\@empty \else \edef\GPT@frac{% \expandafter\GPT@Reverse\expandafter{\expandafter}\GPT@frac\@nil }% \fi \fi - \edef\GPT@sign{\expandafter\ltx@car\GPT@int\ltx@empty\@nil}% + \edef\GPT@sign{\expandafter\@car\GPT@int\@empty\@nil}% \ifx\GPT@sign\GPT@Minus - \edef\GPT@int{\expandafter\ltx@cdr\GPT@int\@nil}% + \edef\GPT@int{\expandafter\@cdr\GPT@int\@nil}% \else \def\GPT@sign{}% \fi \edef\GPT@int{% - \expandafter\GPT@ZapLeadingZeros\GPT@int\ltx@empty + \expandafter\GPT@ZapLeadingZeros\GPT@int\@empty }% \edef\GPT@temp{\GPT@int\GPT@frac}% - \ifx\GPT@temp\ltx@empty + \ifx\GPT@temp\@empty \def#1{0}% \else \edef#1{% \GPT@sign \GPT@int - \ifx\GPT@frac\ltx@empty + \ifx\GPT@frac\@empty \else .\GPT@frac \fi @@ -1082,8 +345,8 @@ } \def\GPT@ZapPlus#1+#2\@nil{% #1% - \ifx\ltx@empty#2\ltx@empty - \expandafter\ltx@gobble + \ifx\@empty#2\@empty + \expandafter\@gobble \else \expandafter\@firstofone \fi @@ -1093,8 +356,8 @@ } \def\GPT@ZapMinusMinus#1--#2\@nil{% #1% - \ifx\ltx@empty#2\ltx@empty - \expandafter\ltx@gobble + \ifx\@empty#2\@empty + \expandafter\@gobble \else \expandafter\@firstofone \fi @@ -1104,18 +367,18 @@ } \def\GPT@Split#1.#2.#3\@nil{% \def\GPT@int{#1}% - \ifx\ltx@empty#2\ltx@empty - \let\GPT@frac\ltx@empty + \ifx\@empty#2\@empty + \let\GPT@frac\@empty \else \def\GPT@frac{#2}% \fi } \def\GPT@Reverse#1#2#3\@nil{% - \ifx\ltx@empty#3\ltx@empty + \ifx\@empty#3\@empty #2#1% - \expandafter\ltx@gobble + \expandafter\@gobble \else - \expandafter\ltx@firstofone + \expandafter\@firstofone \fi {% \GPT@Reverse{#2#1}#3\@nil @@ -1128,57 +391,104 @@ #1% \fi } - \def\Grot@start{% - \GPT@NormalizeNumber\Grot@sin - \GPT@NormalizeNumber\Grot@cos - \edef\GPT@temp{% - \Grot@cos\ltx@space\Grot@sin\ltx@space - \if-\Grot@sin +\def\Grot@start{% + \GPT@NormalizeNumber\Grot@sin + \GPT@NormalizeNumber\Grot@cos + \edef\GPT@temp{% + \Grot@cos\space\Grot@sin\space + \if-\Grot@sin + \else + \ifx\Grot@sin\GPT@Zero + \GPT@Zero \else - \ifx\Grot@sin\GPT@Zero - \GPT@Zero - \else - -\Grot@sin - \fi + -\Grot@sin \fi - \ltx@space\Grot@cos - }% - \ifx\GPT@temp\GPT@MatrixIdentity - \def\Grot@end{}% - \else - \pdfextension save\relax - \pdfextension setmatrix{\GPT@temp}% - \wd\z@\z@ \fi + \space\Grot@cos }% - \def\Grot@end{\pdfextension restore\relax}% - \def\Gscale@start{% - \GPT@NormalizeNumber\Gscale@x - \GPT@NormalizeNumber\Gscale@y - \edef\GPT@temp{% - \Gscale@x\ltx@space0 0 \Gscale@y - }% - \ifx\GPT@temp\GPT@MatrixIdentity - \def\Gscale@end{}% - \else - \pdfextension save\relax - \pdfextension setmatrix{\GPT@temp}% + \ifx\GPT@temp\GPT@MatrixIdentity + \def\Grot@end{}% + \else + \pdfextension save\relax + \pdfextension setmatrix{\GPT@temp}% + % Slightly hacky, but set width of box 0 to 0pt otherwise + % the CTM gets restored in the wrong place + \wd\z@\z@ + \fi +} +\def\Grot@end{\pdfextension restore\relax} +\def\Gscale@start{% + \GPT@NormalizeNumber\Gscale@x + \GPT@NormalizeNumber\Gscale@y + \edef\GPT@temp{% + \Gscale@x\space0 0 \Gscale@y + }% + \ifx\GPT@temp\GPT@MatrixIdentity + \def\Gscale@end{}% + \else + \pdfextension save\relax + \pdfextension setmatrix{\GPT@temp}% + \fi +} +\def\Gscale@end{\pdfextension restore\relax} +\@ifundefined{ifGin@setpagesize} + {\expandafter\let\csname ifGin@setpagesize\expandafter\endcsname + \csname iftrue\endcsname} + {} +\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 + \@ifundefined{stockwidth}{% + \@ifundefined{paperwidth}{% + }{% + \ifdim\paperwidth>0pt\relax + \ifdim\paperheight>0pt\relax + \pagewidth=\paperwidth + \pageheight=\paperheight + \fi \fi }% - -\let\Gscale@end\Grot@end - -% Trig patching no longer needed (trig.sty updated) - - +}{% + \ifdim\stockwidth>0pt\relax + \ifdim\stockheight>0pt\relax + \pagewidth=\stockwidth + \pageheight=\stockheight + \fi + \fi +}% +\fi +} +\fi +\fi +\def\Gin@extensions{% + .pdf,.png,.jpg,.mps,.jpeg,.jbig2,.jb2,% + .PDF,.PNG,.JPG,.JPEG,.JBIG2,.JB2 +} +\@namedef{Gin@rule@.jpg}#1{{jpg}{.jpg}{#1}} +\@namedef{Gin@rule@.jpeg}#1{{jpg}{.jpeg}{#1}} +\@namedef{Gin@rule@.JPG}#1{{jpg}{.JPG}{#1}} +\@namedef{Gin@rule@.JPEG}#1{{jpg}{.JPEG}{#1}} +\@namedef{Gin@rule@.jb2}#1{{jbig2}{.jb2}{#1}}% +\@namedef{Gin@rule@.jbig2}#1{{jbig2}{.jbig2}{#1}}% +\@namedef{Gin@rule@.png}#1{{png}{.png}{#1}} +\@namedef{Gin@rule@.PNG}#1{{png}{.PNG}{#1}} +\@namedef{Gin@rule@.mps}#1{{mps}{.mps}{#1}} +\@namedef{Gin@rule@.pdf}#1{{pdf}{.pdf}{#1}} +\@namedef{Gin@rule@.PDF}#1{{pdf}{.PDF}{#1}} +\@namedef{Gin@rule@.eps}#1{{eps}{.eps}{#1}} % MPS conversion \def\GPT@LoadSuppPdf{% - \ltx@IfUndefined{convertMPtoPDF}{% -%%%%% \GPT@catcodes{supp}% - \InputIfFileExists{supp-pdf.mkii}{}{% - \InputIfFileExists{supp-pdf}{}{}% - }% -%%%%%% \GPT@restore@supp + \@ifundefined{convertMPtoPDF}{% + \edef\@tempa{% + \catcode`\noexpand\<\the\catcode`\<\relax + \catcode`\noexpand\>\the\catcode`\>\relax + }% + \@makeother\<\@makeother\<% + \InputIfFileExists{supp-pdf.mkii}{}{}% + \@tempa }{% % supp-pdf is probably already loaded. }% @@ -1187,19 +497,18 @@ % of \InputIfFileExists will not work: % * \InputIfFileExists has problems with parameters (#1). % * Implementation of \providecommand is insufficient in miniltx.tex - \ltx@ifundefined{convertMPtoPDF}{% + \@ifundefined{convertMPtoPDF}{% % 2016/05/21 v0.01c use \newcommand here not \newcommand* graphics/4472 \newcommand{\convertMPtoPDF}[3]{% - \GPT@error{% - Cannot convert ##1 from MPS to PDF.\MessageBreak + \PackageError{luatex.def}{% + Cannot convert ##1 from MPS to PDF. The support file `supp-pdf.mkii' (supp-pdf.tex) is missing% }{% - The graphics driver for pdfTeX needs `supp-pdf.mkii'\MessageBreak - (or `supp-pdf.tex' and/or `supp-mis.tex')\MessageBreak - to convert MetaPost output files to PDF.\MessageBreak + The graphics driver for pdfTeX needs `supp-pdf.mkii' + (or `supp-pdf.tex' and/or `supp-mis.tex') + to convert MetaPost output files to PDF. These files are part of ConTeXt and can also be found here:% - \MessageBreak - \ltx@space\ltx@space CTAN:macros/pdftex/graphics/\MessageBreak + \space\space CTAN:macros/pdftex/graphics/. You'll get more errors if you'll continue now.% }% }% @@ -1209,79 +518,47 @@ \AtBeginDocument{% \GPT@LoadSuppPdf } - -% Adds support for extended MetaPost features (transparency) -% \GPT@catcodes removed -% should replace with luatex catcodetable support, TODO -\def\LoadMetaPostSpecialExtensions{% - \AtBeginDocument{% - \ltx@IfUndefined{assignMPStransparency}{% -%%%% \GPT@catcodes{mpe}% - \let\GPT@found=N% - \IfFileExists{supp-pdf.mkii}{\let\GPT@found=Y}{% - \IfFileExists{supp-pdf}{\let\GPT@found=Y}{}% - }% - \ifx Y\GPT@found - \InputIfFileExists{supp-mis.mkii}{}{% - \InputIfFileExists{supp-mis}{}{\let\GPT@found=N}% - }% - \ifx Y\GPT@found - \InputIfFileExists{supp-mpe.mkii}{}{% - \InputIfFileExists{supp-mpe}{}{\let\GPT@found=N}% - }% - \ifx Y\GPT@found - \MPcmykcolorstrue - \MPspotcolorstrue - \chardef\makeMPintoPDFobject=1 % - \else - \GPT@warn{% - Cannot enable MetaPost Special Extensions,\MessageBreak - because `supp-mpe.mkii' (or `supp-mpe.tex')\MessageBreak - is missing% - }% - \fi - \else - \GPT@warn{% - Cannot enable MetaPost Special Extensions,\MessageBreak - because `supp-mis.mkii' (or `supp-mis.tex')\MessageBreak - is missing% - }% - \fi - \else - \GPT@warn{% - Cannot enable support for MetaPost images,\MessageBreak - because `supp-pdf.mkii' (or `supp-pdf.tex')\MessageBreak - is missing% - }% - \fi -%%% \GPT@restore@mpe - }{}% - }% - \let\LoadMetaPostSpecialExtensions\relax -} -\ltx@IfUndefined{@onlypreamble}{% -}{% - \@onlypreamble\LoadMetaPostSpecialExtensions -} - - -% Bail out here if it's not latex or a better emulation than miniltx -\ifx\@ifpackageloaded\@undefined\expandafter\endinput\fi - -\ifx\DoNotLoadEpstopdf\@undefined -% EPS to PDF conversion -% delay to begin document to check graphics is loaded (shared -% config with color) if \DoNotLoadEpstopdf is defined (to anything) -% skip this. - \AtBeginDocument{% - \ifx\includegraphics\@undefined\else +% Load package epstopdf if +% a) LaTeX is running (plain TeX users are on their own), +% b) and shell escape is enabled (possibly restricted), +% c) and \DoNotLoadEpstopdf either does not exist or is not \relax, +% d) and neither pst-pdf nor pdftricks is loaded (by \begin{document}). +% +% In other words, by default .eps files will be automatically +% converted to .pdf files when outputting pdf. This can be wrong! +% If the .pdf is the source, rather than the .eps, you should put +% \newcommand{\DoNotLoadEpstopdf}{} +% before even the \documentclass line of your document. +% +% More information about the epstopdf run will be in the .log file; +% see http://ctan.org/pkg/epstopdf-pkg for more info about the +% epstopdf package itself. In turn, it calls the epstopdf script +% (http://ctan.org/pkg/epstopdf). +% +% For the first discussion and background on this, see the thread on latex-l: +% http://thread.gmane.org/gmane.comp.tex.latex.latex3/1465 +% +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname DoNotLoadEpstopdf\endcsname\relax + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname AtEndOfPackage\endcsname\relax + \else + \AtEndOfPackage{% + \AtBeginDocument{% + \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}% - }% - }% - \fi - } -\fi
\ No newline at end of file + \@ifpackageloaded{graphics}{% + \ifnum\directlua{tex.sprint(status.shell_escape)}>0 % + % only add .eps to file extension list if epstopdf is loaded + \edef\Gin@extensions{\Gin@extensions,.eps}% + \RequirePackage{epstopdf-base}[2009/07/12]% + \fi}{} + }% pdftricks not loaded + }% pst-pdf not loaded + \fi + }% AtBeginDocument block + }% AtEndofPackage block + \fi % AtEndofPackage not defined +\fi % DoNotLoadEpstopdf not defined +\endinput diff --git a/Master/texmf-dist/tex/latex/graphics-def/pdftex.def b/Master/texmf-dist/tex/latex/graphics-def/pdftex.def index 76ebd378a2e..fcfafd06c3d 100644 --- a/Master/texmf-dist/tex/latex/graphics-def/pdftex.def +++ b/Master/texmf-dist/tex/latex/graphics-def/pdftex.def @@ -1,17 +1,7 @@ -\ProvidesFile{pdftex.def}[2017/01/12 v0.06k Graphics/color for pdfTeX] -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% -%% LaTeX Colour and Graphics support for PDFTeX -%% -%% License -%% ======= -%% -%% Copyright (C) 2000-2015 -%% David Carlisle, Sebastian Rahtz, Hans Hagen, -%% Heiko Oberdiek and Martin Schr\"oder -%% -%% 2016-2017 LaTeX3 project and Heiko Oberdiek -%% https://github.com/latex3/graphics-def/issues +%% pdftex.def Copyright (C) 2000-2015 David Carlisle, Sebastian Rahtz, +%% Hans Hagen, Heiko Oberdiek and +%% Martin Schr\"oder +%% Copyright (C) 2016-2017 LaTeX3 project and Heiko Oberdiek %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -23,481 +13,22 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainers of this work are -%% LaTeX3 project and Heiko Oberdiek -%% -%% This work consists of the file pdftex.def. -%% -%% Usage -%% ===== -%% -%% It may be used by specifying the pdftex option to any of the -%% supported packages, for example: +%% The Current Maintainer of this work is the LaTeX3 Project. %% -%% \usepackage[pdftex]{graphicx} +%% https://github.com/latex3/graphics-def/issues %% -%% * pdfTeX determines the bounding box of the images by means of -%% itself. Therefore the bounding box options should not be used. -%% In this cases a warning is issued and viewport is used instead. -%% * Option "page" (graphicx) for selecting a page of a multipage -%% PDF document. -%% * \pagecolor is supported. \nopagecolor disables the page color. -%% * Option "quiet" (graphicx/experimental): log messages are suppressed. -%% * Option "resolution" (graphicx/experimental): this sets -%% \pdfimageresolution, see pdfTeX documentation. -%% * Option "print" (graphicx/experimental): specifies an alternate -%% print image (bitmaps only), see PDF specification. -%% * pdftex.def can be used under plain-TeX with miniltx support. -%% -%% "Experimental" means that these features can change or vanish -%% in later versions. -%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% History -% ... -% 2000/04/20 v0.02s: -% * gray color model directly supported (HO). -% 2000/05/02 v0.02t: -% * \pagecolor supported (HO). -% 2000/05/12 v0.02u: -% * support for multipage pdf files, option `page' added (HO). -% 2000/05/31 v0.02v: -% * Option `page' is defined at begin document, -% if package `keyval' is loaded after `pdftex.def'. -% 2000/06/16 v0.03a: -% * Added Heiko to author list (DPC). -% 2000/08/31 v0.03b: -% * support for alternate print images: option `print' added (HO). -% * This feature is not supported by Ghostscript, xpdf, or AR3. -% * The images should have the same dimensions/resolution. -% * Two experimental options added (HO): -% * `quiet': log messages are suppressed. -% * `resolution': sets \pdfimageresolution. -% Because these options are not supported by graphicx, -% they have to be set after \usepackage{graphicx}, eg. -% \setkeys{Gin}{quiet,resolution=300} -% Option `quiet' (for pdftex) can be make known to graphic{s,x} -% with this line in graphics.cfg: -% \DeclareOption{quiet}{\let\Gin@log\@gobble} -% Caution: both options are experimental and can be -% change in next versions! -% * \pdfpage{width,height} are only set, if \paperwidth -% is defined (HO). -% 2000/09/04 v0.03c -% * Redefinition of `natwidth' and `natheight' \AtBeginDocument (HO). -% 2000/09/14 v0.03d -% * Fixes for `viewport' and `trim' (HO). -% * Clip support added for viewport and trim (HO). -% 2000/09/14 v0.03e -% * Options `bbllx', `bblly', `bburx', `bbury' disabled, -% option `bb' redirected with a warning to `viewport' (HO). -% 2000/11/10 v0.03f -% * Bug, that produces an error message, if package `graphics' -% is used (introduced in 0.03d), fixed: If \Gin@vllx is not -% defined (graphics), then clipping and the moves of options -% viewport/trim are silently disabled (HO). -% 2001/05/25 v0.03g -% * \pdfpagewidth and \pdfpageheight are not set to zero, -% if \paperwidth and \paperheight are not set (HO). -% 2001/09/01 v0.03h -% * Compatibilty for miniltx.tex, problems fixed: -% \@ifpackageloaded, \PackageWarning, \PackageWarningNoLine, -% \@currname. -% 2001/11/29 v0.03i -% * Problem with \if@inlabel (plain format) fixed. -% 2002/06/18 v0.03j -% * Contribution by P\'etiard Fran\c{c}ois <petiard@math.univ-fcomte.fr>: -% Improvement of \Ginclude@mps (support of viewport and clip). -% 2002/06/19 v0.03k -% * Correction by P\'etiard Fran\c{c}ois for \GPT@DoEndClip. -% 2005/06/15 v0.03l -% * \usebox patch fixed (\aftergroup part removed) (HO). -% 2005/06/20 v0.03m -% * .tif support is removed for pdfTeX >= 1.10a (HO). -% 2006/02/23 v0.03n -% * Compatibility for plain-TeX: file can be loaded multiple times; -% colorfix is not applied for undefined macros (HO). -% 2006/02/24 v0.03o -% * Catcode protections mainly because of babel's shorthands (HO). -% 2006/03/02 v0.03p -% * \pagecolor support for plain-TeX fixed (HO). -% 2006/05/17 v0.03q -% * Error message if ConTeXt's supp-pdf.tex is missing and -% support of MPS files is not available (Markus Kohm = MK, HO). -% 2006/06/06 v0.03r -% * \nopagecolor/\no@page@color added (HO). -% 2006/07/16 v0.03s (HO) -% * LPPL 1.3c. -% * A little usage. -% * Test for \MessageBreak changed (comp.text.tex, -% message id: <44baca88$0$10529$9b4e6d93@newsread4.arcor-online.net>). -% 2006/08/14 v0.03t (HO) -% * Extensions added: .jpeg, .JPG, .JPEG, .PNG, .PDF -% No variants for .tif, because TIFF support is no longer available. -% No need for uppercase variant of .mps. -% 2007/01/01 v0.04a (HO) -% * Support of color stack, introduced in pdfTeX 1.40.0. -% * Support of transform matrix commands of pdfTeX 1.40.0. -% * The argument for option `page' can be a register. -% 2007/01/02 v0.04b (HO) -% * Internal change: Switching of color stacks is easier by using -% \@pdfcolorstack for the stack number. Thus this command -% should be redefined, if someone wants to use another color stack -% (e.g. for footnotes). \main@pdfcolorstack should not be changed -% for this purpose. -% 2007/01/06 v0.04c (HO) -% * Support for JBIG2 added (pdfTeX 1.40.0). -% 2007/01/08 v0.04d (HO) -% * Bug fix: .mps forgotten for extension list if pdfTeX >= 1.40.0 -% * .jbig2 and .jb2 are not listed in the extension list -% if \pdfminorversion < 4. Thus \pdfminorversion should have -% the correct value, if pdftex.def is loaded. -% 2007/03/15 v0.04e (HO) -% * Missing comma in \Gin@extensions added (found by Reinhard Kotucha). -% 2007/04/06 v0.04f (HO) -% * Fix for \pagecolor, text before page color can lead to an invalid -% page stream. Therefore "page" is now used instead of "direct" -% as modifier for \pdfliteral. -% * Boolean option `resetcolor' added (pdfTeX >= 0.12n). -% The current color is used for PDF or MPS images, unless -% the images contain their own color settings. -% If option `resetcolor' is set to `true', then the current color -% is reset to \normalcolor during image inclusion. -% 2007/04/17 v0.04g (HO) -% * Small improvement of robustness of \pagecolor -% and using e-TeX if available. -% 2007/06/12 v0.04h (HO) -% * Fix for \pagecolor: v0.04f uses keyword `page' for \pdfliteral, -% but this keyword is not available before pdfTeX 1.30.0. -% 2007/12/04 v0.04i (HO) -% * Fatal error is avoided if image file does not exists. -% 2007/12/06 v0.04j (HO) -% * Option xmpfile added for adding metadata (experimental). -% 2008/07/16 v0.04k (HO) -% * \LoadMetaPostSpecialExtensions -% loads additional support for MetaPost images (transparency) -% by loading supp-mpe.tex and supp-mis.tex -% (method posted in comp.text.tex by Jeremy Lea). -% As side effect MetaPost images are put in separate objects -% and are not inlined in the page stream. -% Status: experimental. -% 2008/09/08 v0.04l (HO) -% * Adds an error message, if pdfTeX is called in DVI mode. -% * Aborts loading of the package with an error message, -% if pdfTeX is missing. -% 2009/08/25 v0.04m (HO) -% * Catcodes are preserved and initialized for loading of -% pdftex.def and ConTeXt's support files. -% * ConTeXt's support files have now the extension `.mkii' instead -% of `.tex'. -% 2010/02/14 v0.04n (HO) -% * \GPT@catcodes extended for xmlTeX (pdftex.def loads -% supp-pdf.mkii at begin document where xmlTeX's catcodes -% are already active). -% 2010/03/11 v0.04o (HO) -% * Ensure that \undefined is undefined during loading of -% ConTeXt files. -% 2010/03/12 v0.04p (HO) -% * \undefined is also undefined during conversion of MPS. -% 2010/04/14 v0.04q (HO) -% * Optimizations for rotating and scaling: -% * remove unnecessary identity transformations -% * numbers are normalized -% 2010/04/15 v0.04r (HO) -% * Fix for scale values without integer part. -% 2010/09/09 v0.05a (HO) -% * Option `pagebox' added for specifying the pdf page box -% of the included image. Values are `mediabox', `cropbox', -% `bleedbox', `trimbox' and `artbox'. Default is `cropbox'. (MS/HO) -% * Option `interpolate' added for bitmaps, see PDF specification. -% Values are `true' or `false', default is `false'. -% * Option `decodearray' added for bitmaps, see PDF specification, -% key /Decode of image dictionaries. The value for option -% `decodearray' is the value for /Decode without `[' and ']'. -% * Option `maskarray' added for bitmaps, see PDF specification, -% key /Mask of image dictionaries with array as value. -% The value of `maskarray' is the array value for /Mask -% without `[' and ']'. -% * Option `intent' added for the rendering intent of bitmap -% images, see PDF specification, key /Intent of image -% dictionaries. The value is a name without a leading slash, -% the standard names of the PDF specification: -% `AbsoluteColorimetric', `RelativeColorimetric', -% `Saturation', `Perceptual'. -% * Options `ocobjnum' and `ocobjref' are hooks for those who wants -% to work with optional content. The options can be used for both -% bitmap and PDF images and are unsupported for MPS. -% The optional content dictionary is given by an external -% object. Option `ocobjnum' expects the number of that object -% (e.g. \pdflastobj). It's a positive integer (greater than zero). -% Option `ocobjref' takes the full object reference -% (positive integer, followed by ` 0 R' in case of pdfTeX). -% Other drivers might support `ocobjref' as well, in case of -% PostScript/pdfmark drivers, the object is usually referenced by -% a name in curly braces. -% * Tiff support removed for driver versions between 1.10a and 1.30. -% 2010/09/14 v0.05b (HO) -% * Fix, \pagecolor got broken accidentally (in v0.05a). -% 2010/11/26 v0.05c (HO) -% * \stockwidth and \stockheight of class `memoir' respected. -% 2011/01/28 v0.05d (HO) -% * Patching trig.sty is improved by doing it earlier in some -% cases, e.g. if one of class `memoir', package `scrlfile' or -% package `filehook' is loaded. -% 2011/04/21 v0.06a (HO) -% * The use info on the screen goes with an information -% entry in the .log file that also tells the requested -% width (feature request of Axel Berger). -% * Use of packages `infwarerr' and `ltxcmds'. -% 2011/04/25 v0.06b (HO) -% * Fix in \GPT@NormalizeNumber. -% * Date fixed in \ProvidesFile. -% 2011/05/18 v0.06c (HO) -% * The ConTeXt support files `supp-pdf.*' and `supp-mpe.*' do -% not prevent reloading. Therefore `pdftex.def' only tries to load -% them if \convertMPtoPDF and \assignMPStransparency are not -% available. This fixes a compatibilty issue with class `combine'. -% 2011/05/27 v0.06d (HO) -% * Fix for v0.06a, package `ltxcmds' was not loaded in plain TeX. -% 2016/01/23 v0.6e (DPC) -% * Move EPS handler here from graphics.cfg -% 2016/06/04 v0.6f (DPC) -% * support graphcs/color option (no)setpagesize -% 2016/06/15 v0.6g (DPC) -% * typo -% 2016/06/17 v0.6h (DPC) -% * guards for contributed packages and plain TeX -% 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 -% - - -% Prefix of internal commands for this file `pdftex.def': -% \GPT@ (Graphics bundle PdfTex driver) - -\expandafter\edef\csname GPT@AtEnd\endcsname{% - \expandafter\noexpand\csname GPT@restore@\endcsname - \catcode35 \the\catcode35\relax % # - \catcode64 \the\catcode64\relax % @ - \noexpand\endinput -} -\catcode35 6 % # -\catcode64 11 % @ -\def\GPT@catcodes#1{% - \expandafter\edef\csname GPT@restore@#1\endcsname{% - \let\noexpand\undefined - \expandafter\noexpand\csname GPTorg@#1@undefined\endcsname - \let\expandafter\noexpand\csname GPTorg@#1@undefined\endcsname - \noexpand\@undefined - \endlinechar \the\endlinechar - \catcode9 \the\catcode9 % tab - \catcode13 \the\catcode13 % ^^M - \catcode32 \the\catcode32 % space - \catcode33 \the\catcode33 % ! - \catcode34 \the\catcode34 % " - \catcode35 \the\catcode35 % # - \catcode36 \the\catcode36 % $ - \catcode37 \the\catcode37 % % - \catcode38 \the\catcode38 % & - \catcode39 \the\catcode39 % ' - \catcode40 \the\catcode40 % ( - \catcode41 \the\catcode41 % ) - \catcode42 \the\catcode42 % * - \catcode43 \the\catcode43 % + - \catcode44 \the\catcode44 % , - \catcode45 \the\catcode45 % - - \catcode46 \the\catcode46 % . - \catcode47 \the\catcode47 % / - \catcode58 \the\catcode58 % : - \catcode59 \the\catcode59 % ; - \catcode60 \the\catcode60 % < - \catcode61 \the\catcode61 % = - \catcode62 \the\catcode62 % > - \catcode63 \the\catcode63 % ? - \catcode64 \the\catcode64 % @ - \catcode91 \the\catcode91 % [ - \catcode92 \the\catcode92 % \ - \catcode93 \the\catcode93 % ] - \catcode94 \the\catcode94 % ^ - \catcode95 \the\catcode95 % _ - \catcode96 \the\catcode96 % ` - \catcode123 \the\catcode123 % { - \catcode124 \the\catcode124 % | - \catcode125 \the\catcode125 % } - \catcode126 \the\catcode126 % ~ - }% - \endlinechar 13 % - \catcode9 10 % tab - \catcode13 5 % ^^M (end of line) - \catcode64 11 % - \catcode61 12 % = - \catcode32 10 % space - \catcode33 12 % ! - \catcode34 12 % " - \catcode35 6 % # - \catcode36 3 % $ - \catcode37 14 % % - \catcode38 4 % & - \catcode39 12 % ' - \catcode40 12 % ( - \catcode41 12 % ) - \catcode42 12 % * - \catcode43 12 % + - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode59 12 % ; - \catcode60 12 % < - \catcode61 12 % = - \catcode62 12 % > - \catcode63 12 % ? - \catcode64 11 % @ - \catcode91 12 % [ - \catcode92 0 % \ - \catcode93 12 % ] - \catcode94 7 % ^ - \catcode95 8 % _ - \catcode96 12 % ` - \catcode123 1 % { - \catcode124 12 % | - \catcode125 2 % } - \catcode126 13 % ~ - \expandafter\let\csname GPTorg@#1@undefined\endcsname\undefined - \let\undefined\@undefined -} -\GPT@catcodes{} - -% 1.10a: .tif support was dropped -% 1.10a: keywords mediabox|cropbox|... for \pdfximage -% 1.30.0: keyword `page' for \pdfliteral added. -% 1.40.0: JBIG2 support added in pdfTeX 1.40.0 - -\ifx\pdftexversion\@undefined - \def\driver@release{1}% -\else - \ifnum\pdftexversion<12 % - \def\driver@release{2}% - \else - \ifnum\pdftexversion<13 % - \ifnum\expandafter`\pdftexrevision<`n % - \def\driver@release{3}% - \else - \def\driver@release{4}% - \fi - \else - \ifnum\pdftexversion=13 % - \def\driver@release{5}% - \else - \ifnum\pdftexversion=14 % - \def\driver@release{6}% - \else - \ifnum\pdftexversion<110 % - \def\driver@release{7}% - \else - \ifnum\pdftexversion<130 % - \def\driver@release{8}% - \else - \ifnum\pdftexversion<140 % - \def\driver@release{9}% - \else - \def\driver@release{10}% - \fi - \fi - \fi - \fi - \fi - \fi - \fi -\fi - -\begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname RequirePackage\endcsname\relax - \input infwarerr.sty\relax - \input ltxcmds.sty\relax -\else - \RequirePackage{infwarerr}[2007/09/09]% - \RequirePackage{ltxcmds}[2010/12/07]% -\fi - -\def\GPT@error{\@PackageError{pdftex.def}}% -\def\GPT@warn{\@PackageWarning{pdftex.def}}% -\ifx\Gin@log\@undefined - \def\Gin@log{\message}% -\fi -\def\GPT@info{\@PackageInfoNoLine{pdftex.def}}% - -% Are we running under PDFTeX? -\ltx@IfUndefined{pdftexversion}{% - \GPT@error{% - Option `pdftex' requires pdfTeX,\MessageBreak - but pdfTeX features are missing.\MessageBreak - Loading of this driver file is aborted% - }\@ehc - \expandafter\GPT@AtEnd -}{} - -% Ensure PDF mode -\ifnum\pdfoutput<1 % - \GPT@error{% - PDF mode expected, but DVI mode detected!\MessageBreak - If you are using `latex', then call `pdflatex'.\MessageBreak - Otherwise check and correct the driver options.\MessageBreak - Error recovery by switching to PDF mode% - }\@ehc - \pdfoutput=1 % -\fi -\@ifundefined{ifGin@setpagesize} - {\expandafter\let\csname ifGin@setpagesize\expandafter\endcsname - \csname iftrue\endcsname} - {} -\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}{% - }{% - \ifdim\paperwidth>0pt\relax - \ifdim\paperheight>0pt\relax - \pdfpagewidth=\paperwidth - \pdfpageheight=\paperheight - \fi - \fi - }% -}{% - \ifdim\stockwidth>0pt\relax - \ifdim\stockheight>0pt\relax - \pdfpagewidth=\stockwidth - \pdfpageheight=\stockheight - \fi - \fi -}% -\fi -} -\fi -\fi - -% Colour Support. The following models may be used. -% * cmyk supported directly. -% * rgb supported directly. -% * RGB converted to rgb by this file. -% * gray supported directly. -% * named converted to cmyk by this file. -% +\ProvidesFile{pdftex.def} + [2017/06/01 v1.0a Graphics/color driver for pdftex] \def\c@lor@arg#1{% \dimen@#1\p@ \ifdim\dimen@<\z@\dimen@\maxdimen\fi \ifdim\dimen@>\p@ \PackageError{color}{Argument `#1' not in range [0,1]}\@ehd - \fi -} + \fi} +\def\color@gray#1#2{% + \c@lor@arg{#2}% + \edef#1{#2 g #2 G}% + } \def\color@cmyk#1#2{\c@lor@@cmyk#2\@@#1} \def\c@lor@@cmyk#1,#2,#3,#4\@@#5{% \c@lor@arg{#4}% @@ -505,78 +36,40 @@ \c@lor@arg{#2}% \c@lor@arg{#3}% \edef#5{#1 #2 #3 #4 k #1 #2 #3 #4 K}% -} -\def\color@gray#1#2{% - \c@lor@arg{#2}% - \edef#1{#2 g #2 G}% -} + } \def\color@rgb#1#2{\c@lor@@rgb#2\@@#1} \def\c@lor@@rgb#1,#2,#3\@@#4{% \c@lor@arg{#1}% \c@lor@arg{#2}% \c@lor@arg{#3}% \edef#4{#1 #2 #3 rg #1 #2 #3 RG}% -} + } \def\color@RGB#1#2{\c@lor@@RGB#2\@@#1} \def\c@lor@@RGB#1,#2,#3\@@#4{% - \c@lor@RGB@rgb{#1}\@tempa - \c@lor@RGB@rgb{#2}\@tempb - \c@lor@RGB@rgb{#3}\@tempc - \c@lor@@rgb\@tempa,\@tempb,\@tempc\@@#4% -} + \c@lor@RGB@rgb{#1}\@tempa + \c@lor@RGB@rgb{#2}\@tempb + \c@lor@RGB@rgb{#3}\@tempc + \c@lor@@rgb\@tempa,\@tempb,\@tempc\@@#4% + } \def\c@lor@RGB@rgb#1#2{% \dimen@#1\p@ \divide\dimen@\@cclv - \edef#2{\strip@pt\dimen@}% -} - + \edef#2{\strip@pt\dimen@}} \def\color@named#1#2{\c@lor@@named#2,,\@@#1} \def\c@lor@@named#1,#2,#3\@@#4{% - \ltx@IfUndefined{col@#1}{% - \PackageError{color}{Undefined color `#1'}\@ehd - }{% - \edef#4{\csname col@#1\endcsname}% - }% -} - -\ltx@IfUndefined{pdfcolorstack}{% - \def\set@color{% - \pdfliteral{\current@color}% - \aftergroup\reset@color - }% - \def\reset@color{% - \pdfliteral{\current@color}% - }% -}{% - \chardef\main@pdfcolorstack=0 % - \ltx@ifundefined{@pdfcolorstack}{% - \def\@pdfcolorstack{\main@pdfcolorstack}% - }{}% - \def\set@color{% - \pdfcolorstack\@pdfcolorstack push{\current@color}% - \aftergroup\reset@color - }% - \def\reset@color{% - \pdfcolorstack\@pdfcolorstack pop\relax - }% -} -\def\define@color@named#1#2{% - \expandafter\edef\csname col@#1\endcsname{#2}% -} + \@ifundefined{col@#1}% + {\PackageError{color}{Undefined color `#1'}\@ehd}% + {\edef#4{\csname col@#1\endcsname}}% + } +\chardef\main@pdfcolorstack=0 % +\@ifundefined{@pdfcolorstack} + {\def\@pdfcolorstack{\main@pdfcolorstack}}{} \def\current@color{0 g 0 G} - -% v0.02t: support for \pagecolor -% fixed in v0.02p by using a box register, see -% http://tug.org/pipermail/pdftex/2005-August/005916.html -% -% v0.03r: \nopagecolor/\no@page@color added. -\ltx@newglobalif\ifGPT@pagecolor -\ltx@ifundefined{nopagecolor}{% - \def\nopagecolor{\no@page@color}% -}{} -\def\no@page@color{% - \GPT@pagecolorfalse -} +\def\set@color{% + \pdfcolorstack\@pdfcolorstack push{\current@color}% + \aftergroup\reset@color} +\def\reset@color{\pdfcolorstack\@pdfcolorstack pop\relax} +\newif\ifGPT@pagecolor \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname currentgrouplevel\endcsname\relax \catcode`X=9 % ignore @@ -588,11 +81,11 @@ \def\set@page@color{% \GPT@pagecolortrue \global\let\current@page@color\current@color - \ltx@ifundefined{GPT@outputbox}{% + \ifundefined{GPT@outputbox}{% % \newbox is outer in plain \csname newbox\endcsname\GPT@outputbox }{}% - \ltx@ifundefined{GPTorg@shipout}{% + \@ifundefined{GPTorg@shipout}{% \global\let\GPTorg@shipout\shipout \gdef\shipout{% X % ensure \GPT@outputbox is really void @@ -613,7 +106,7 @@ E \else }% \gdef\GPT@@shipout{% \ifvoid\GPT@outputbox\relax - \GPT@warn{Ignoring void output box}% + \PackageInfo{pdftex.def}{Ignoring void output box}% \else \setbox\GPT@outputbox=\vbox{% \GPT@pageliteral @@ -624,12 +117,12 @@ E \else }% \gdef\GPT@pageliteral{% \ifGPT@pagecolor - \pdfliteral\ifnum\driver@release>8 page\else direct\fi{% + \pdfliteral page{% q % gsave - \current@page@color\ltx@space + \current@page@color\space n % newpath - 0 0 \strip@pt\pdfpagewidth\ltx@space - \strip@pt\pdfpageheight\ltx@space re % rectangle + 0 0 \strip@pt\pdfpagewidth\space + \strip@pt\pdfpageheight\space re % rectangle % there is no need to convert to bp f % fill Q% grestore @@ -640,726 +133,144 @@ E \else } \catcode`\X=11 % \catcode`\E=11 % - -% Need the `colorfix' modifications as no internal colour stack -% is maintained -%<*colorfix> -\begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdfcolorstack\endcsname\relax - \AtBeginDocument{% - \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname color\endcsname\relax - % Without color we don't need any fixes. - \else - \ltx@ifundefined{@ldc@l@r}{% - \let\@ldc@l@r\color - \def\color{% - \ltx@IfUndefined{if@inlabel}{}{% - \csname if@inlabel\expandafter\endcsname - \expandafter\leavevmode\csname fi\endcsname - }% - \@ldc@l@r - }% - }{}% - \ltx@ifundefined{@lduseb@x}{% - \ltx@IfUndefined{usebox}{}{% - \let\@lduseb@x\usebox - \def\usebox#1{\@lduseb@x{#1}\reset@color}% - }% - }{}% - \fi - }% -\fi -%</colorfix> - -% -% Graphic inclusion. Currently supports .png, .jpg, .mps and .pdf inclusion; -% .tif support is dropped since pdfTeX 1.10a. -% .mps is MetaPost output. -% .mps inclusion depends on loading a CONTEXT module by Hans Hagen; -% .pdf also needs a Context module unless pdftex 0.12n or later. -% -% PNG bitmaps may be scaled/rotated as usual -% by the graphics commands or keyword arguments. -% -% Note the magic in front of the file name after \pdfimage, to -% prevent it fouling up with file names starting with "depth". -\def\Gread@png{% - \GPT@read\Gread@@png -} -\def\Gread@@png#1{% - \setbox\@tempboxa\hbox{% - \pdfimage\noexpand\noexpand\noexpand\ltx@empty#1\relax - }% - \def\Gin@llx{0}\let\Gin@lly\Gin@llx - \Gin@defaultbp\Gin@urx{\wd\@tempboxa}% - \Gin@defaultbp\Gin@ury{\ht\@tempboxa}% -} - -% -% support for -% * multipage pdf images (pdfTeX v0.14+) -% * alternate print image (bitmaps only) -% * driver version>=5 (0.14) -% * printed image can be resused, but not the base image, -% because it's dictionary contains the additional key /Alternates. -% * not supported by Ghostscript or xpdf. -% * option quiet -% * option resetcolor -% * option xmpfile -% -% \GPT@page: page number of pdf image or \ltx@empty otherwise. -\let\GPT@page\ltx@empty -% \GPT@print: file name for alternate image or \ltx@empty otherwise. -\let\GPT@print\ltx@empty -\let\GPT@xmpfile\ltx@empty -\let\GPT@pagebox\ltx@empty -\let\GPT@pagebox@\ltx@empty -\let\GPT@interpolate\ltx@empty -\let\GPT@decodearray\ltx@empty -\let\GPT@mask\ltx@empty -\let\GPT@intent\ltx@empty -\let\GPT@ocobjnum\ltx@empty -\ltx@newif\ifGPT@ResetColor -\let\GPT@ResetColorEnd\relax -\def\GPT@ResetColorBegin{% - \ifGPT@ResetColor - \ifGPT@IsBitmap - \else - \begingroup - \normalcolor - \let\GPT@ResetColorEnd\endgroup - \fi - \fi -} -\begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdfmatch\endcsname\relax - \def\GPT@match#1#2#3#4{}% - \def\GPT@pat@real/{}% -\else - \def\GPT@match#1#2{% - \ifnum\pdfmatch{#2}{#1}=1 % - \expandafter\ltx@firstoftwo - \else - \expandafter\ltx@secondoftwo - \fi - }% - \def\GPT@pat@real/{% - (% - 0(\ltx@backslashchar.[0-9]*)?|% - \ltx@backslashchar.[0-9]+|% - 1(\ltx@backslashchar.0*)?% - )% - }% -\fi -\begingroup - \toks@{% - \define@key{Gin}{resetcolor}[true]{% - \csname GPT@ResetColor% - \expandafter\ifx\csname iftrue\expandafter\endcsname - \csname if#1\endcsname - true% - \else - false% - \fi - \endcsname - }% - \ifnum\driver@release>5 % - \define@key{Gin}{page}{% - \def\GPT@page{#1}% - \ifx\GPT@page\ltx@empty - \else - \edef\GPT@page{\number\GPT@page}% - \fi - }% - \define@key{Gin}{print}{% - \def\GPT@print{#1}% - }% - \else - \define@key{Gin}{page}{% - \GPT@warn{% - pdfTeX >= 0.14 required for option\MessageBreak `page'% - }% - }% - \define@key{Gin}{print}{% - \GPT@warn{% - pdfTeX >= 0.14 required for option\MessageBreak `print'% - }% - }% - \fi - \ifnum\driver@release>7 % - % option pagebox - \define@key{Gin}{pagebox}{% - \expandafter\let\expandafter\GPT@pagebox - \csname GPT@pagebox@#1\endcsname - \ifx\GPT@pagebox\relax - \let\GPT@pagebox\ltx@empty - \GPT@warn{% - Unknown value `#1' for `pagebox'.\MessageBreak - Supported values:\MessageBreak - mediabox, cropbox, bleedbox, trimbox, artbox% - }% - \fi - }% - \def\GPT@pagebox@mediabox{mediabox}% - \let\GPT@pagebox@cropbox\ltx@empty - \def\GPT@pagebox@bleedbox{bleedbox}% - \def\GPT@pagebox@trimbox{trimbox}% - \def\GPT@pagebox@artbox{artbox}% - % option interpolate - \define@key{Gin}{interpolate}[true]{% - \expandafter\let\expandafter\GPT@interpolate - \csname GPT@interpolate@#1\endcsname - \ifx\GPT@interpolate\relax - \let\GPT@interpolate\ltx@empty - \GPT@warn{% - Unknown value `#1' for `interpolate'.\MessageBreak - Supported values: true, false% - }% - \fi - }% - \let\GPT@interpolate@false\ltx@empty - \def\GPT@interpolate@true{1}% non-empty, value does not matter - % option decodearray - \define@key{Gin}{decodearray}{% - \def\GPT@decodearray{#1}% - \ifx\GPT@decodearray\ltx@empty - \else - \GPT@match\GPT@decodearray{% - ((^| )\GPT@pat@real/ \GPT@pat@real/)+$% - }{}{% - \GPT@warn{% - Invalid value (\GPT@decodearray)\MessageBreak - for `decodearray' is ignored% - }% - \let\GPT@decodearray\ltx@empty - }% - \fi - }% - % option maskarray - \define@key{Gin}{maskarray}{% - \def\GPT@mask{#1}% - \ifx\GPT@mask\ltx@empty - \else - \GPT@match\GPT@mask{% - ((^| )[0-9]+ [0-9]+)+$% - }{}{% - \GPT@warn{% - Invalid value (\GPT@mask)\MessageBreak - for `maskarray' is ignored% - }% - \let\GPT@mask\ltx@empty - }% - \ifx\GPT@mask\ltx@empty - \else - \edef\GPT@mask{[\GPT@mask]}% - \fi - \fi - }% - % option intent - \define@key{Gin}{intent}{% - \def\GPT@intent{#1}% - \ifx\GPT@intent\ltx@empty - \else - \GPT@match\GPT@intent{% - ^((Absolute|Relative)Colorimetric|Saturation|Perceptual)$% - }{}{% - \GPT@match\GPT@intent{% - ^[A-Za-z0-9_]+$% - }{% - \GPT@warn{% - Rendering intent `\GPT@intent'\MessageBreak - is not a standard name of the PDF specification% - }% - }{% - \GPT@warn{% - Ignoring intent `\GPT@intent'\MessageBreak - with unusual characters% - }% - \let\GPT@intent\ltx@empty - }% - }% - \fi - }% - % option ocobjnum - \define@key{Gin}{ocobjnum}{% - \edef\GPT@ocobjnum{#1}% - \ifx\GPT@ocobjnum\ltx@empty - \else - \edef\GPT@ocobjnum{\number\GPT@ocobjnum}% - \GPT@match\GPT@ocobjnum{^[1-9]+[0-9]*$}{% - }{% - \GPT@warn{% - Invalid value (\GPT@ocobjnum)\MessageBreak - for `ocobjnum' is ignored% - }% - \let\GPT@ocobjnum\ltx@empty - }% - \ifx\GPT@ocobjnum\ltx@empty - \else - \edef\GPT@ocobjnum{\number\GPT@ocobjnum}% - \fi - \fi - }% - % option ocobjref - \define@key{Gin}{ocobjref}{% - \edef\GPT@ocobjnum{#1}% - \ifx\GPT@ocobjnum\ltx@empty - \else - \edef\GPT@ocobjnum{% - \expandafter\strip@prefix\meaning\GPT@ocobjnum - }% - \GPT@match\GPT@ocobjnum{^[1-9]+[0-9]* 0 R$}{% - }{% - \GPT@warn{% - Invalid value (\GPT@ocobjnum)\MessageBreak - for `ocobjref' is ignored% - }% - \let\GPT@ocobjnum\ltx@empty - }% - \ifx\GPT@ocobjnum\ltx@empty - \else - \begingroup - \def\GPT@temp##1 ##2\@nil{\endgroup - \def\GPT@ocobjnum{##1}% - }% - \expandafter\GPT@temp\GPT@ocobjnum\@nil - \edef\GPT@ocobjnum{\number\GPT@ocobjnum}% - \fi - \fi - }% - \else - \def\GPT@temp#1{% - \define@key{Gin}{#1}{% - \GPT@warn{% - pdfTeX >= 1.10a required for option `#1'% - }% - }% - }% - \GPT@temp{pagebox}% - \GPT@temp{interpolate}% - \GPT@temp{decodearray}% - \GPT@temp{maskarray}% - \GPT@temp{intent}% - \GPT@temp{ocobjnum}% - \GPT@temp{ocobjref}% - \fi - \define@key{Gin}{quiet}[]{% - \let\Gin@log\ltx@gobble - }% - \define@key{Gin}{resolution}{% - \pdfimageresolution#1\relax - }% - \define@key{Gin}{xmpfile}[\Gin@base.xmp]{% - \def\GPT@xmpfile{#1}% - }% - }% - \ltx@IfUndefined{define@key}{% - \edef\x{\endgroup - \noexpand\AtBeginDocument{% - \noexpand\ltx@IfUndefined{define@key}{}{\the\toks@}% - }% - }\x - }{% - \expandafter\endgroup\the\toks@ - }% - -% redefinitions of some graphicx options: -\def\GPT@disable#1{% - \GPT@warn{% - Option `#1' is not supported, use\MessageBreak - option `viewport' instead% - }% +\def\define@color@named#1#2{% + \expandafter\edef\csname col@#1\endcsname{#2}} +\def\no@page@color{% + \GPT@pagecolorfalse } -\def\GPT@fix{% - \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname define@key\endcsname\relax +\def\Gread@pdftex#1{% + \expandafter\ifx\expandafter\relax\pdffilesize{#1}\relax + \expandafter\@secondoftwo \else - \def\KV@Gin@bb{% - \GPT@warn{% - Option `bb' does not make sense,\MessageBreak - using `viewport' instead% - }% - \KV@Gin@viewport - }% - \define@key{Gin}{bbllx}{\GPT@disable{bbllx}}% - \define@key{Gin}{bblly}{\GPT@disable{bblly}}% - \define@key{Gin}{bburx}{\GPT@disable{bburx}}% - \define@key{Gin}{bbury}{\GPT@disable{bbury}}% + \expandafter\@firstoftwo \fi -} -\AtBeginDocument{\GPT@fix} - -% -% Check for image file existence -% -\begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdffilesize\endcsname\relax - \ifnum\driver@release>9 % - \RequirePackage{pdftexcmds}\relax - \fi - \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname pdf@filesize\endcsname\relax - \def\GPT@IfFileExists#1{% - \IfFileExists{#1}% - }% - \else - \def\GPT@IfFileExists#1{% - \expandafter\expandafter\expandafter\ifx - \expandafter\expandafter\expandafter\relax\pdf@filesize{#1}\relax - \expandafter\ltx@secondoftwo + {\Gread@@pdftex{#1}}% + {% + \def\Gin@llx{0}% + \let\Gin@lly\Gin@llx + \def\Gin@urx{72}% + \let\Gin@ury\Gin@urx + \ifGin@draft \else - \expandafter\ltx@firstoftwo + \PackageError{pdftex.def}{File `#1' not found: using draft setting}% + \@ehc + \Gin@drafttrue \fi }% - \fi -\else - \def\GPT@IfFileExists#1{% - \expandafter\ifx\expandafter\relax\pdffilesize{#1}\relax - \expandafter\ltx@secondoftwo - \else - \expandafter\ltx@firstoftwo - \fi - }% -\fi - -% -% Wrapper for \Gread@... that checks image existence first. -% -\def\GPT@read#1#2{% - \GPT@IfFileExists{#2}% - {% - #1{#2}% - }{% - \def\Gin@llx{0}% - \let\Gin@lly\Gin@llx - \def\Gin@urx{72}% - \let\Gin@ury\Gin@urx - \ifGin@draft - \else - \GPT@error{File `#2' not found}{% - Using draft setting for this image.\MessageBreak - \@ehc - }% - \Gin@drafttrue - \fi - }% -} - -% -% mechanism for re-use of objects also -% allows us to get the size by deriving it from the initial storage; -% this works for all graphics types. -% -\ltx@ifundefined{Gread@gobject}{% - \csname newcount\endcsname\Gread@gobject -}{} -\def\GPT@ReusedName#1{% - \ifx\GPT@print\ltx@empty - #1% - \else - \GPT@print - \fi -} -\def\GPT@objref{ 0 R} -\def\Gread@pdftex{% - \GPT@read\Gread@@pdftex } +\let\Gin@attr@hash\@empty +\@ifundefined{Gin@log} + {\let\Gin@log\wlog} + {} +\@ifundefined{Gin@page} + {\let\Gin@page\@empty} + {} +\@ifundefined{Gin@pagebox} + {\def\Gin@page{cropbox}} + {} +\@ifundefined{Gin@interpolate} + {\csname newif\endcsname\ifGin@interpolate} + {} \def\Gread@@pdftex#1{% - % Ensure that option `print' works only on bitmap images. - \let\GPT@Attr\ltx@empty - \let\GPT@AttrShort\ltx@empty - \ifnum\driver@release>7 % - \ifx\GPT@ocobjnum\ltx@empty + \edef\Gin@attr@hash{% + \ifx\Gin@pagebox\@empty \else - \edef\GPT@AttrShort{\GPT@AttrShort - :OC\GPT@ocobjnum - }% - \edef\GPT@Attr{\GPT@Attr - /OC \GPT@ocobjnum\GPT@objref - }% + :\Gin@pagebox \fi - \fi - \ifGPT@IsBitmap - \let\GPT@page\ltx@empty - \let\GPT@pagebox\ltx@empty - \ifnum\driver@release>7 % - \ifx\GPT@xmpfile\ltx@empty - \else - \ltx@IfUndefined{GPT@XMP@\GPT@xmpfile}{% - \GPT@IfFileExists{\GPT@xmpfile}{% - \begingroup - \pdfcompresslevel=0 % - \immediate\pdfobj stream attr{% - /Type/Metadata% - /Subtype/XML% - }file{\GPT@xmpfile}% - \expandafter\xdef\csname GPT@XMP@\GPT@xmpfile\endcsname{% - \the\pdflastobj - }% - \endgroup - }{% - \GPT@warn{Missing XMP file (\GPT@xmpfile)}% - }% - }{}% - \ltx@IfUndefined{GPT@XMP@\GPT@xmpfile}{}{% - \edef\GPT@Attr{\GPT@Attr - /Metadata \@nameuse{GPT@XMP@\GPT@xmpfile}\GPT@objref - }% - \edef\GPT@AttrShort{\GPT@AttrShort - :MD\@nameuse{GPT@XMP@\GPT@xmpfile}% - }% - }% - \fi - \ifx\GPT@interpolate\ltx@empty - \else - \edef\GPT@Attr{\GPT@Attr - /Interpolate true% - }% - \edef\GPT@AttrShort{\GPT@AttrShort - :I% - }% - \fi - \ifx\GPT@decodearray\ltx@empty - \else - \edef\GPT@Attr{\GPT@Attr - /Decode[\GPT@decodearray]% - }% - \edef\GPT@AttrShort{\GPT@AttrShort - :D[\GPT@decodearray]% - }% - \fi - \ifx\GPT@mask\ltx@empty - \else - \edef\GPT@Attr{\GPT@Attr - /Mask\GPT@mask - }% - \edef\GPT@AttrShort{\GPT@AttrShort - :M\GPT@mask - }% - \fi - \ifx\GPT@intent\ltx@empty - \else - \edef\GPT@AttrShort{\GPT@AttrShort - :RI\GPT@intent - }% - \expandafter\ifx\csname pdfescapename\endcsname\relax - \expandafter\ifx\csname pdf@escapename\endcsname\relax - \else - \edef\GPT@intent{\pdf@escapename{\GPT@intent}}% - \fi - \else - \edef\GPT@intent{\pdfescapename{\GPT@intent}}% - \fi - \edef\GPT@Attr{\GPT@Attr - /Intent/\GPT@intent - }% - \fi - \fi - \else - \let\GPT@interpolate\ltx@empty - \let\GPT@decodearray\ltx@empty - \let\GPT@mask\ltx@empty - \let\GPT@intent\ltx@empty - \ifx\GPT@page\ltx@empty + \ifx\Gin@page\@empty \else - \edef\GPT@AttrShort{\GPT@AttrShort - :P\GPT@page - }% + :P\Gin@page \fi - \ifx\GPT@pagebox\ltx@empty - \else - \edef\GPT@AttrShort{% - \GPT@AttrShort - :\expandafter\ltx@car\GPT@pagebox{}\@nil b% - }% + \ifGin@interpolate + :I% \fi - \ifx\GPT@print\ltx@empty - \else - \GPT@warn{% - Option `print' can only be used\MessageBreak - for bitmap images% - }% - \let\GPT@print\ltx@empty - \fi - \fi - % Check if print image exists. - \ifx\GPT@print\ltx@empty - \else - \GPT@IfFileExists{\GPT@print}{% - }{% - \GPT@error{Print image `\GPT@print' not found}{% - The print version of the image is ignored.\MessageBreak - \@ehc - }% - \let\GPT@print\ltx@empty - }% - \fi - % If option `print' is set, the screen image object - % will contain an additional /Alternate entry - % and will not be reused. - \ifx\GPT@print\ltx@empty - \else - \expandafter\expandafter\expandafter\ltx@firstoftwo\expandafter\ltx@gobbletwo - \fi - \ltx@ifundefined{#1 image\GPT@AttrShort}{% - \ifnum\driver@release>4 % - \ifnum\driver@release>5 % - \ifx\GPT@print\ltx@empty - \ifx\GPT@Attr\ltx@empty - \let\GPT@RuleAttr\ltx@empty - \else - \edef\GPT@RuleAttr{attr{\GPT@Attr}}% - \fi - \else - \ltx@ifundefined{\GPT@print\ltx@space image\GPT@AttrShort}{% - \immediate\pdfximage{\GPT@print}% - \setbox\@tempboxa=\hbox{\pdfrefximage\pdflastximage}% - \edef\GPT@PrintObj{\the\pdflastximage}% - \expandafter\xdef\csname\GPT@print\ltx@space - image\GPT@AttrShort\endcsname{% - \pdfrefximage\GPT@PrintObj\relax - }% - \immediate\pdfobj{% - [<<% - /Image \GPT@PrintObj\GPT@objref - /DefaultForPrinting true% - >>]% - }% - \def\GPT@RuleAttr{% - width\wd\@tempboxa height\ht\@tempboxa - attr{% - \GPT@Attr - /Alternates \the\pdflastobj\GPT@objref - }% - }% - }{% - \edef\GPT@PrintObj{% - \expandafter\expandafter\expandafter\ltx@gobble - \csname\GPT@print\ltx@space image\GPT@AttrShort\endcsname - }% - \immediate\pdfobj{% - [<<% - /Image \GPT@PrintObj\GPT@objref - /DefaultForPrinting true% - >>]% - }% - \def\GPT@RuleAttr{% - width \csname\GPT@print\ltx@space width\GPT@AttrShort\endcsname - height \csname\GPT@print\ltx@space height\GPT@AttrShort\endcsname - attr{% - \GPT@Attr - /Alternates \the\pdflastobj\GPT@objref - }% - }% - }% - \fi - \pdfximage\GPT@RuleAttr - \ifx\GPT@page\ltx@empty - \else - page \GPT@page - \fi - \GPT@pagebox + }% + \@ifundefined{#1 image\Gin@attr@hash}% + {% + \pdfximage + \ifGin@interpolate attr{/Interpolate true}\fi + \ifx\Gin@page\@empty\else page \Gin@page\fi + \Gin@pagebox {#1}% - \setbox\@tempboxa=\hbox{\pdfrefximage\pdflastximage}% - \else - \setbox\@tempboxa=\hbox{\pdfimage{#1}}% - \fi - \else - \setbox\@tempboxa=\hbox{% - \pdfimage\noexpand\noexpand\noexpand\ltx@empty#1\relax + \setbox\@tempboxa=\hbox{\pdfrefximage\pdflastximage}% + \def\Gin@llx{0}\let\Gin@lly\Gin@llx + \Gin@defaultbp\Gin@urx{\wd\@tempboxa}% + \Gin@defaultbp\Gin@ury{\ht\@tempboxa}% + \expandafter\xdef\csname #1 image\Gin@attr@hash\endcsname + {\pdfrefximage\the\pdflastximage}% + \expandafter\xdef\csname #1 height\Gin@attr@hash\endcsname + {\the\ht\@tempboxa}% + \expandafter\xdef\csname #1 width\Gin@attr@hash\endcsname + {\the\wd\@tempboxa}% + \Gin@log{% + <#1, % + id=\the\pdflastximage, % + \ifx\Gin@page\@empty\else page=\Gin@page , \fi + \ifx\Gin@pagebox\@empty\else pagebox=\Gin@pagebox , \fi + \ifGin@interpolate interpolate=true, \fi + \the\wd\@tempboxa\space x \the\ht\@tempboxa + >% }% - \fi - \def\Gin@llx{0}\let\Gin@lly\Gin@llx - \Gin@defaultbp\Gin@urx{\wd\@tempboxa}% - \Gin@defaultbp\Gin@ury{\ht\@tempboxa}% - \expandafter\xdef\csname\GPT@ReusedName{#1} width\GPT@AttrShort\endcsname{% - \the\wd\@tempboxa - }% - \expandafter\xdef\csname\GPT@ReusedName{#1} height\GPT@AttrShort\endcsname{% - \the\ht\@tempboxa + }{% + \def\Gin@llx{0}\let\Gin@lly\Gin@llx + \Gin@defaultbp\Gin@urx{\csname #1 width\Gin@attr@hash\endcsname}% + \Gin@defaultbp\Gin@ury{\csname #1 height\Gin@attr@hash\endcsname}% }% - \ifnum\driver@release>5 % - \expandafter\xdef\csname #1 image\GPT@AttrShort - \ifx\GPT@print\ltx@empty\else!\fi\endcsname{% - \pdfrefximage\the\pdflastximage - }% - \else - \pdfform\@tempboxa - \Gread@gobject=\pdflastform - \expandafter\xdef\csname#1 image\endcsname{% - \pdfrefform\the\Gread@gobject - }% - \fi - \Gin@log{% - <#1, id=% - \ifnum\driver@release>5 % - \the\pdflastximage - \ifx\GPT@page\ltx@empty\else , page=\GPT@page\fi - \ifx\GPT@pagebox\ltx@empty\else, pagebox=\GPT@pagebox\fi - \ifx\GPT@interpolate\ltx@empty\else, interpolate=true\fi - \ifx\GPT@print\ltx@empty - \else - , print=\GPT@print, id=\GPT@PrintObj - \fi - \else - \the\Gread@gobject - \fi - , \the\wd\@tempboxa\ltx@space x \the\ht\@tempboxa - >% - }% - }{% - \def\Gin@llx{0}\let\Gin@lly\Gin@llx - \Gin@defaultbp\Gin@urx{\csname#1 width\GPT@AttrShort\endcsname}% - \Gin@defaultbp\Gin@ury{\csname#1 height\GPT@AttrShort\endcsname}% - }% } -\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\Gread@png#1{% + \let\Gin@page\@empty + \let\Gin@pagebox\@empty + \Gread@pdftex{#1}% +} +\let\Gread@jpg\Gread@png +\expandafter\let\csname Gread@jbig2\endcsname\Gread@png +\def\Gread@pdf#1{% + \Gin@interpolatefalse + \Gread@pdftex{#1}% +} +\let\Gread@mps\Gread@eps +\def\GPT@setup@scale{% \def\@tempa{!}% \ifx\Gin@scaley\@tempa \let\Gin@scaley\Gin@scalex \else \ifx\Gin@scalex\@tempa\let\Gin@scalex\Gin@scaley\fi \fi +} +\def\Ginclude@pdftex#1{% + \GPT@setup@scale \Gin@log{% <use #1% - \ifx\GPT@page\ltx@empty\else, page \GPT@page\fi + \ifx\Gin@page\@empty\else, page \Gin@page\fi >% }% - \GPT@info{% - #1\ifx\GPT@page\ltx@empty\else, page\GPT@page\fi - \ltx@space used\on@line.\MessageBreak + \PackageInfo{pdftex.def}{% + #1 \ifx\Gin@page\@empty\else, page\Gin@page\fi + \space used\ifx\on@line\@undefined\else\on@line\fi.}% + \PackageInfo{pdftex.def}{% Requested size: % - \the\Gin@req@width\ltx@space x \the\Gin@req@height + \the\Gin@req@width\space x \the\Gin@req@height }% + \Ginclude@@pdftex{\@nameuse{#1 image\Gin@attr@hash}}% +} +\def\Ginclude@mps#1{% + \GPT@setup@scale + \Ginclude@@pdftex{\convertMPtoPDF{#1}{1}{1}}% +} +\def\Ginclude@@pdftex#1{% \hbox{% - \GPT@ResetColorBegin \Gscale@box{\Gin@scalex}[\Gin@scaley]{% - \ltx@IfUndefined{Gin@vllx}{% + \@ifundefined{Gin@vllx}{% \GPT@viewportfalse % without viewport/trim clipping does not make sense % for pdfTeX \Gin@clipfalse }{}% \ifGin@clip - \ifnum\driver@release<6 % - \GPT@warn{No clipping support in pdfTeX < 0.14}% + \if!\Gin@vllx\Gin@vlly\Gin@vurx\Gin@vury!% \else - \if!\Gin@vllx\Gin@vlly\Gin@vurx\Gin@vury!% - \else - \let\GPT@clipend\GPT@DoClipEnd - \setbox\@tempboxa\hbox\bgroup - \fi + \let\GPT@clipend\GPT@DoClipEnd + \setbox\@tempboxa\hbox\bgroup \fi \fi \ifGPT@viewport @@ -1372,9 +283,7 @@ E \else \hskip-\Gin@vllx bp\relax \fi \fi - \csname#1 image\GPT@AttrShort - \ifx\GPT@print\ltx@empty\else!\fi - \endcsname + #1% \ifGPT@viewport \ifdim\Gin@vlly\p@=\z@ \else @@ -1383,10 +292,9 @@ E \else \GPT@clipend \fi }% - \GPT@ResetColorEnd }% } -\ltx@newif\ifGPT@viewport +\newif\ifGPT@viewport \GPT@viewporttrue \let\GPT@clipend\relax \def\GPT@DoClipEnd{% @@ -1395,261 +303,59 @@ E \else % \Gin@urx and \Gin@ury already contain the correct values, % so both cases viewport and trim can be handled together: \dimen@\Gin@urx\p@ - % v0.03k \Gin@vllx replaced by \Gin@llx \advance\dimen@ -\Gin@llx\p@ \wd\@tempboxa\strip@pt\dimen@ bp\relax \dimen@\Gin@ury\p@ - % v0.03k \Gin@vlly replaced by \Gin@lly \advance\dimen@ -\Gin@lly\p@ \ht\@tempboxa\strip@pt\dimen@ bp\relax - \let\GPT@temp\ltx@empty - \ifnum\driver@release>7 % - \ifx\GPT@ocobjnum\ltx@empty - \else - \edef\GPT@temp{attr{/OC \GPT@ocobjnum\GPT@objref}}% - \fi - \fi - \expandafter\pdfxform\GPT@temp\@tempboxa + \pdfxform\@tempboxa \pdfrefxform\pdflastxform } -\ltx@newif\ifGPT@IsBitmap -\def\Gread@pdfbitmap#1{% - \GPT@IsBitmaptrue - \Gread@pdftex{#1}% - \GPT@IsBitmapfalse -} - -\edef\Gread@MBox{/MediaBox} -\def\Gread@pdf{% - \GPT@read\Gread@@pdf -} -\def\Gread@@pdf#1{% - \begingroup - \@tempcnta\z@ - \loop - \ifnum\@tempcnta<\@xxxii - \catcode\@tempcnta14 % - \advance\@tempcnta\@ne - \repeat - \catcode127=14 % - \let\do\@makeother\dospecials\catcode`\ 10 % - \catcode\endlinechar5 % - \immediate\openin\@inputcheck#1 % - \ifeof\@inputcheck - \@latex@error{File `#1' not found}\@ehc - \else - \Gread@true - \let\@tempb\Gread@false - \loop -% v0.02e: use \. not \@tempa so the space is preserved before [ - \read\@inputcheck to\.% - \ifeof\@inputcheck - \Gread@false - \else - \expandafter\Gread@find@mbox\. []\\% - \fi - \ifGread@ - \repeat - \immediate\closein\@inputcheck - \fi - \ifGin@bbox - \else - \@latex@error - {Cannot determine size of graphic in #1 (no BoundingBox)}% - \@ehc - \gdef\@gtempa{0 0 72 72 }% - \fi - \endgroup - \expandafter\Gread@parse@bb\@gtempa\\% -} -\long\def\Gread@find@mbox#1 [#2]#3\\{% hash-ok - \def\@tempa{#1}% - \ifx\@tempa\Gread@MBox - \gdef\@gtempa{#2 }% - \@tempb - \Gin@bboxtrue - \fi -} -\def\Ginclude@png#1{% - \hbox{% -% v0.02f add \@depth\z@ (from Sebastian) - \pdfimage - \@height\Gin@req@height \@width\Gin@req@width \@depth\z@ - \noexpand\noexpand\noexpand\ltx@empty#1\relax - }% -} - -\def\Ginclude@mps#1{% - \def\@tempa{!}% - \ifx\Gin@scaley\@tempa - \let\Gin@scaley\Gin@scalex - \else - \ifx\Gin@scalex\@tempa\let\Gin@scalex\Gin@scaley\fi - \fi - \hbox{% - \GPT@ResetColorBegin - \Gscale@box{\Gin@scalex}[\Gin@scaley]{% - \ltx@IfUndefined{Gin@vllx}{% - \GPT@viewportfalse - % without viewport/trim clipping does not make sense - % for pdfTeX - \Gin@clipfalse - }{}% - \ifGin@clip - \ifnum\driver@release<6 % - \GPT@warn{No clipping support in pdfTeX < 0.14}% - \else - \if!\Gin@vllx\Gin@vlly\Gin@vurx\Gin@vury!% - \else - \let\GPT@clipend\GPT@DoClipEnd - \setbox\@tempboxa\hbox\bgroup - \fi - \fi - \fi - \ifGPT@viewport - \ifdim\Gin@vlly\p@=\z@ - \else - \lower\Gin@vlly bp\hbox\bgroup - \fi - \ifdim\Gin@vllx\p@=\z@ - \else - \hskip-\Gin@vllx bp\relax - \fi - \fi - \GPT@catcodes{mps}% - \convertMPtoPDF{#1}{1}{1}% - \GPT@restore@mps - \ifGPT@viewport - \ifdim\Gin@vlly\p@=\z@ - \else - \egroup - \fi - \GPT@clipend - \fi - }% - \GPT@ResetColorEnd - }% -} -\def\Gread@mps{% - \GPT@read\Gread@eps -} -\ifnum\driver@release>3 % - \let\Ginclude@png\Ginclude@pdftex - \let\Ginclude@jpg\Ginclude@pdftex - \let\Ginclude@pdf\Ginclude@pdftex - \let\Gread@pdf\Gread@pdftex - \let\Gread@png\Gread@pdfbitmap - \let\Gread@jpg\Gread@pdfbitmap - \ifnum\driver@release>5 % - \ifnum\driver@release<8 % - \let\Gread@tif\Gread@pdfbitmap - \let\Ginclude@tif\Ginclude@pdftex - \else - \ifnum\driver@release>9 % - \expandafter\let\csname Gread@jbig2\endcsname\Gread@pdfbitmap - \expandafter\let\csname Ginclude@jbig2\endcsname\Ginclude@pdftex - \fi - \fi - \fi -\else - \def\Ginclude@pdf#1{% - \def\@tempa{!}% - \ifx\Gin@scaley\@tempa - \let\Gin@scaley\Gin@scalex - \else - \ifx\Gin@scalex\@tempa\let\Gin@scalex\Gin@scaley\fi - \fi - \hbox{% - \GPT@catcodes{pdf}% - \convertPDFtoPDF{#1}{\Gin@scalex}{\Gin@scaley} {0bp} {0bp}% - {\Gin@req@width}{\Gin@req@height}% - \GPT@restore@pdf - }% - }% -\fi - -% v0.02e: restrict the rules to just the types that pdftex can currently -% deal with. -\ifnum\driver@release>3 % - \def\Gin@extensions{.png,.pdf,.jpg,.mps,.jpeg,.PNG,.PDF,.JPG,.JPEG}% - \@namedef{Gin@rule@.jpg}#1{{jpg}{.jpg}{#1}}% - \@namedef{Gin@rule@.jpeg}#1{{jpg}{.jpeg}{#1}}% - \@namedef{Gin@rule@.JPG}#1{{jpg}{.JPG}{#1}}% - \@namedef{Gin@rule@.JPEG}#1{{jpg}{.JPEG}{#1}}% - \ifnum\driver@release>5 % - \ifnum\driver@release<8 % - \def\Gin@extensions{% - .png,.pdf,.jpg,.mps,.tif,.jpeg,% - .PNG,.PDF,.JPG,.JPEG% - }% - \@namedef{Gin@rule@.tif}#1{{tif}{.tif}{#1}}% - \else - \ifnum\driver@release>9 % - \ifnum\pdfminorversion>3 % - \def\Gin@extensions{% - .png,.pdf,.jpg,.mps,.jpeg,.jbig2,.jb2,% - .PNG,.PDF,.JPG,.JPEG,.JBIG2,.JB2}% - \fi - \@namedef{Gin@rule@.jb2}#1{{jbig2}{.jb2}{#1}}% - \@namedef{Gin@rule@.jbig2}#1{{jbig2}{.jbig2}{#1}}% - \fi - \fi - \fi -\else - \def\Gin@extensions{.png,.pdf,.mps,.PNG,.PDF}% -\fi -\@namedef{Gin@rule@.png}#1{{png}{.png}{#1}} -\@namedef{Gin@rule@.PNG}#1{{png}{.PNG}{#1}} -\@namedef{Gin@rule@.mps}#1{{mps}{.mps}{#1}} -\@namedef{Gin@rule@.pdf}#1{{pdf}{.pdf}{#1}} -\@namedef{Gin@rule@.PDF}#1{{pdf}{.PDF}{#1}} -\@namedef{Gin@rule@.eps}#1{{eps}{.eps}{#1}} - -% Rotation -% slightly hacky, but set width of box 0 to 0pt otherwise -% the CTM gets restored in the wrong place. - +\let\Ginclude@png\Ginclude@pdftex +\let\Ginclude@jpg\Ginclude@pdftex +\let\Ginclude@pdf\Ginclude@pdftex +\expandafter\let\csname Ginclude@jbig2\endcsname\Ginclude@pdftex \def\GPT@MatrixIdentity{1 0 0 1} \def\GPT@Zero{0} \def\GPT@Minus{-} \def\GPT@NormalizeNumber#1{% \edef#1{#1}% - \edef#1{\expandafter\ltx@zapspace\expandafter{#1}}% + \edef#1{\expandafter\zap@space#1 \@empty}% \edef#1{\expandafter\GPT@ZapPlus#1+\@nil}% \edef#1{\expandafter\GPT@ZapMinusMinus#1--\@nil}% \expandafter\GPT@Split#1..\@nil - \ifx\GPT@frac\ltx@empty + \ifx\GPT@frac\@empty \else \edef\GPT@frac{% \expandafter\GPT@Reverse\expandafter{\expandafter}\GPT@frac\@nil }% \edef\GPT@frac{% - \expandafter\GPT@ZapLeadingZeros\GPT@frac\ltx@empty + \expandafter\GPT@ZapLeadingZeros\GPT@frac\@empty }% - \ifx\GPT@frac\ltx@empty + \ifx\GPT@frac\@empty \else \edef\GPT@frac{% \expandafter\GPT@Reverse\expandafter{\expandafter}\GPT@frac\@nil }% \fi \fi - \edef\GPT@sign{\expandafter\ltx@car\GPT@int\ltx@empty\@nil}% + \edef\GPT@sign{\expandafter\@car\GPT@int\@empty\@nil}% \ifx\GPT@sign\GPT@Minus - \edef\GPT@int{\expandafter\ltx@cdr\GPT@int\@nil}% + \edef\GPT@int{\expandafter\@cdr\GPT@int\@nil}% \else \def\GPT@sign{}% \fi \edef\GPT@int{% - \expandafter\GPT@ZapLeadingZeros\GPT@int\ltx@empty + \expandafter\GPT@ZapLeadingZeros\GPT@int\@empty }% \edef\GPT@temp{\GPT@int\GPT@frac}% - \ifx\GPT@temp\ltx@empty + \ifx\GPT@temp\@empty \def#1{0}% \else \edef#1{% \GPT@sign \GPT@int - \ifx\GPT@frac\ltx@empty + \ifx\GPT@frac\@empty \else .\GPT@frac \fi @@ -1658,8 +364,8 @@ E \else } \def\GPT@ZapPlus#1+#2\@nil{% #1% - \ifx\ltx@empty#2\ltx@empty - \expandafter\ltx@gobble + \ifx\@empty#2\@empty + \expandafter\@gobble \else \expandafter\@firstofone \fi @@ -1669,8 +375,8 @@ E \else } \def\GPT@ZapMinusMinus#1--#2\@nil{% #1% - \ifx\ltx@empty#2\ltx@empty - \expandafter\ltx@gobble + \ifx\@empty#2\@empty + \expandafter\@gobble \else \expandafter\@firstofone \fi @@ -1680,18 +386,18 @@ E \else } \def\GPT@Split#1.#2.#3\@nil{% \def\GPT@int{#1}% - \ifx\ltx@empty#2\ltx@empty - \let\GPT@frac\ltx@empty + \ifx\@empty#2\@empty + \let\GPT@frac\@empty \else \def\GPT@frac{#2}% \fi } \def\GPT@Reverse#1#2#3\@nil{% - \ifx\ltx@empty#3\ltx@empty + \ifx\@empty#3\@empty #2#1% - \expandafter\ltx@gobble + \expandafter\@gobble \else - \expandafter\ltx@firstofone + \expandafter\@firstofone \fi {% \GPT@Reverse{#2#1}#3\@nil @@ -1704,144 +410,104 @@ E \else #1% \fi } -\begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdfsetmatrix\endcsname\relax - % Patrick Daly found an error here with doubled minus signs when - % \Grot@sin is negative. Fixed. - \def\Grot@start{% - \GPT@NormalizeNumber\Grot@sin - \GPT@NormalizeNumber\Grot@cos - \edef\GPT@temp{% - \Grot@cos\ltx@space\Grot@sin\ltx@space - \if-\GPT@sin +\def\Grot@start{% + \GPT@NormalizeNumber\Grot@sin + \GPT@NormalizeNumber\Grot@cos + \edef\GPT@temp{% + \Grot@cos\space\Grot@sin\space + \if-\Grot@sin + \else + \ifx\Grot@sin\GPT@Zero + \GPT@Zero \else - % avoid negative zero - \ifx\Grot@sin\GPT@Zero - \GPT@Zero - \else - -\Grot@sin - \fi + -\Grot@sin \fi - \ltx@space\Grot@cos - }% - \ifx\GPT@temp\GPT@MatrixIdentity - \def\Grot@end{}% - \else - \pdfliteral{ q \GPT@temp\ltx@space 0 0 cm}% - \wd\z@\z@ \fi - \wd\z@\z@ + \space\Grot@cos }% - \def\Grot@end{% - \pdfliteral{ Q}% - }% - % Scaling is OK, as graphics package does it right here. - \def\Gscale@start{% - \GPT@NormalizeNumber\Gscale@x - \GPT@NormalizeNumber\Gscale@y - \edef\GPT@temp{% - \Gscale@x\ltx@space0 0 \Gscale@y - }% - \ifx\GPT@temp\GPT@MatrixIdentity - \def\Gscale@end{}% - \else - \pdfliteral{ q \GPT@temp\ltx@space 0 0 cm}% - \fi + \ifx\GPT@temp\GPT@MatrixIdentity + \def\Grot@end{}% + \else + \pdfsave + \pdfsetmatrix{\GPT@temp}% + % Slightly hacky, but set width of box 0 to 0pt otherwise + % the CTM gets restored in the wrong place + \wd\z@\z@ + \fi +} +\def\Grot@end{\pdfrestore} +\def\Gscale@start{% + \GPT@NormalizeNumber\Gscale@x + \GPT@NormalizeNumber\Gscale@y + \edef\GPT@temp{% + \Gscale@x\space0 0 \Gscale@y }% -\else - \def\Grot@start{% - \GPT@NormalizeNumber\Grot@sin - \GPT@NormalizeNumber\Grot@cos - \edef\GPT@temp{% - \Grot@cos\ltx@space\Grot@sin\ltx@space - \if-\Grot@sin - \else - \ifx\Grot@sin\GPT@Zero - \GPT@Zero - \else - -\Grot@sin - \fi + \ifx\GPT@temp\GPT@MatrixIdentity + \def\Gscale@end{}% + \else + \pdfsave + \pdfsetmatrix{\GPT@temp}% + \fi +} +\def\Gscale@end{\pdfrestore} +\@ifundefined{ifGin@setpagesize} + {\expandafter\let\csname ifGin@setpagesize\expandafter\endcsname + \csname iftrue\endcsname} + {} +\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 + \@ifundefined{stockwidth}{% + \@ifundefined{paperwidth}{% + }{% + \ifdim\paperwidth>0pt\relax + \ifdim\paperheight>0pt\relax + \pdfpagewidth=\paperwidth + \pdfpageheight=\paperheight \fi - \ltx@space\Grot@cos - }% - \ifx\GPT@temp\GPT@MatrixIdentity - \def\Grot@end{}% - \else - \pdfsave - \pdfsetmatrix{\GPT@temp}% - \wd\z@\z@ \fi }% - \def\Grot@end{\pdfrestore}% - \def\Gscale@start{% - \GPT@NormalizeNumber\Gscale@x - \GPT@NormalizeNumber\Gscale@y - \edef\GPT@temp{% - \Gscale@x\ltx@space0 0 \Gscale@y - }% - \ifx\GPT@temp\GPT@MatrixIdentity - \def\Gscale@end{}% - \else - \pdfsave - \pdfsetmatrix{\GPT@temp}% +}{% + \ifdim\stockwidth>0pt\relax + \ifdim\stockheight>0pt\relax + \pdfpagewidth=\stockwidth + \pdfpageheight=\stockheight \fi - }% + \fi +}% \fi -\let\Gscale@end\Grot@end - -% undo the trig.sty `optimization' so that these 0 1 and -1 values -% get written out as digits, not unexpandable TeX primitives. -% 0.04q: space added to remain consistent with trig.sty. -\def\GPT@PatchTrig{% - \def\GPT@temp##1(##2)=##3 {% - \expandafter\def\csname ##1(##2)\endcsname{##3 }% - }% - \GPT@temp sin(0)=0 % - \GPT@temp cos(0)=1 % - \GPT@temp sin(90)=1 % - \GPT@temp cos(90)=0 % - \GPT@temp sin(-90)=-1 % - \GPT@temp cos(-90)=0 % - \GPT@temp sin(180)=0 % - \GPT@temp cos(180)=-1 % - % added in 0.04q - \GPT@temp sin(270)=-1 % - \GPT@temp cos(270)=0 % - \GPT@temp sin(360)=0 % - \GPT@temp cos(360)=1 % - \GPT@temp sin(-180)=0 % - \GPT@temp cos(-180)=-1 % - \GPT@temp sin(-270)=1 % - \GPT@temp cos(-270)=0 % - \GPT@temp sin(-360)=0 % - \GPT@temp cos(-360)=1 % - \ltx@ifpackageloaded{trig}{% - \let\GPT@PatchTrig\relax - }{}% -} -\AtBeginDocument{\GPT@PatchTrig} -\ltx@ifpackageloaded{trig}{\GPT@PatchTrig}{} -\ltx@IfUndefined{AfterPackage}{}{% scrlfile.sty - \AfterPackage{trig}{\GPT@PatchTrig}% -} -\ltx@IfUndefined{AtEndOfPackageFile}{}{% filehook.sty - \AtEndOfPackageFile{trig}{\GPT@PatchTrig}% -} -\ltx@IfUndefined{AtEndPackage}{}{% memoir.cls - \AtEndPackage{trig}{\GPT@PatchTrig}% } - -% v0.02e: Restore catcodes of context letters. -% Not needed with current version of supp-pdf -% but protects against older versions. -% v0.03o: Catcode protection of '=' because of turkish.ldf. +\fi +\fi +\def\Gin@extensions{% + .pdf,.png,.jpg,.mps,.jpeg,.jbig2,.jb2,% + .PDF,.PNG,.JPG,.JPEG,.JBIG2,.JB2 +} +\@namedef{Gin@rule@.jpg}#1{{jpg}{.jpg}{#1}} +\@namedef{Gin@rule@.jpeg}#1{{jpg}{.jpeg}{#1}} +\@namedef{Gin@rule@.JPG}#1{{jpg}{.JPG}{#1}} +\@namedef{Gin@rule@.JPEG}#1{{jpg}{.JPEG}{#1}} +\@namedef{Gin@rule@.jb2}#1{{jbig2}{.jb2}{#1}}% +\@namedef{Gin@rule@.jbig2}#1{{jbig2}{.jbig2}{#1}}% +\@namedef{Gin@rule@.png}#1{{png}{.png}{#1}} +\@namedef{Gin@rule@.PNG}#1{{png}{.PNG}{#1}} +\@namedef{Gin@rule@.mps}#1{{mps}{.mps}{#1}} +\@namedef{Gin@rule@.pdf}#1{{pdf}{.pdf}{#1}} +\@namedef{Gin@rule@.PDF}#1{{pdf}{.PDF}{#1}} +\@namedef{Gin@rule@.eps}#1{{eps}{.eps}{#1}} +% MPS conversion \def\GPT@LoadSuppPdf{% - \ltx@IfUndefined{convertMPtoPDF}{% - \GPT@catcodes{supp}% - \InputIfFileExists{supp-pdf.mkii}{}{% - \InputIfFileExists{supp-pdf}{}{}% - }% - \GPT@restore@supp + \@ifundefined{convertMPtoPDF}{% + \edef\@tempa{% + \catcode`\noexpand\<\the\catcode`\<\relax + \catcode`\noexpand\>\the\catcode`\>\relax + }% + \@makeother\<\@makeother\<% + \InputIfFileExists{supp-pdf.mkii}{}{}% + \@tempa }{% % supp-pdf is probably already loaded. }% @@ -1850,18 +516,18 @@ E \else % of \InputIfFileExists will not work: % * \InputIfFileExists has problems with parameters (#1). % * Implementation of \providecommand is insufficient in miniltx.tex - \ltx@ifundefined{convertMPtoPDF}{% - \newcommand{\convertMPtoPDF}[3]{% - \GPT@error{% - Cannot convert ##1 from MPS to PDF.\MessageBreak + \@ifundefined{convertMPtoPDF}{% +% 2016/05/21 v0.01c use \newcommand here not \newcommand* graphics/4472 +\newcommand{\convertMPtoPDF}[3]{% + \PackageError{pdftex.def}{% + Cannot convert ##1 from MPS to PDF. The support file `supp-pdf.mkii' (supp-pdf.tex) is missing% }{% - The graphics driver for pdfTeX needs `supp-pdf.mkii'\MessageBreak - (or `supp-pdf.tex' and/or `supp-mis.tex')\MessageBreak - to convert MetaPost output files to PDF.\MessageBreak + The graphics driver for pdfTeX needs `supp-pdf.mkii' + (or `supp-pdf.tex' and/or `supp-mis.tex') + to convert MetaPost output files to PDF. These files are part of ConTeXt and can also be found here:% - \MessageBreak - \ltx@space\ltx@space CTAN:macros/pdftex/graphics/\MessageBreak + \space\space CTAN:macros/pdftex/graphics/. You'll get more errors if you'll continue now.% }% }% @@ -1871,59 +537,6 @@ E \else \AtBeginDocument{% \GPT@LoadSuppPdf } - -% Adds support for extended MetaPost features (transparency) -\def\LoadMetaPostSpecialExtensions{% - \AtBeginDocument{% - \ltx@IfUndefined{assignMPStransparency}{% - \GPT@catcodes{mpe}% - \let\GPT@found=N% - \IfFileExists{supp-pdf.mkii}{\let\GPT@found=Y}{% - \IfFileExists{supp-pdf}{\let\GPT@found=Y}{}% - }% - \ifx Y\GPT@found - \InputIfFileExists{supp-mis.mkii}{}{% - \InputIfFileExists{supp-mis}{}{\let\GPT@found=N}% - }% - \ifx Y\GPT@found - \InputIfFileExists{supp-mpe.mkii}{}{% - \InputIfFileExists{supp-mpe}{}{\let\GPT@found=N}% - }% - \ifx Y\GPT@found - \MPcmykcolorstrue - \MPspotcolorstrue - \chardef\makeMPintoPDFobject=1 % - \else - \GPT@warn{% - Cannot enable MetaPost Special Extensions,\MessageBreak - because `supp-mpe.mkii' (or `supp-mpe.tex')\MessageBreak - is missing% - }% - \fi - \else - \GPT@warn{% - Cannot enable MetaPost Special Extensions,\MessageBreak - because `supp-mis.mkii' (or `supp-mis.tex')\MessageBreak - is missing% - }% - \fi - \else - \GPT@warn{% - Cannot enable support for MetaPost images,\MessageBreak - because `supp-pdf.mkii' (or `supp-pdf.tex')\MessageBreak - is missing% - }% - \fi - \GPT@restore@mpe - }{}% - }% - \let\LoadMetaPostSpecialExtensions\relax -} -\ltx@IfUndefined{@onlypreamble}{% -}{% - \@onlypreamble\LoadMetaPostSpecialExtensions -} - % Load package epstopdf if % a) LaTeX is running (plain TeX users are on their own), % b) and shell escape (\write18) is enabled (possibly restricted), @@ -1954,21 +567,17 @@ E \else \ifx\includegraphics\@undefined\else \@ifpackageloaded{pst-pdf}{}{% \@ifpackageloaded{pdftricks}{}{% - \RequirePackage{pdftexcmds}[2007/11/11]% - \expandafter\ifx\csname pdf@shellescape\endcsname\relax - \else - \@ifpackageloaded{graphics}{ - \ifnum\pdf@shellescape>0 % - % only add .eps to file extension list if epstopdf is loaded - \edef\Gin@extensions{\Gin@extensions,.eps}% + \@ifpackageloaded{graphics}{% + \ifnum\pdfshellescape>0 % + % only add .eps to file extension list if epstopdf is loaded + \edef\Gin@extensions{\Gin@extensions,.eps}% \RequirePackage{epstopdf-base}[2009/07/12]% \fi}{} - \fi }% pdftricks not loaded }% pst-pdf not loaded - \fi + \fi }% AtBeginDocument block }% AtEndofPackage block \fi % AtEndofPackage not defined \fi % DoNotLoadEpstopdf not defined -\GPT@AtEnd +\endinput diff --git a/Master/texmf-dist/tex/latex/graphics-def/xetex.def b/Master/texmf-dist/tex/latex/graphics-def/xetex.def index a432f12802f..e3f72cd0f8b 100644 --- a/Master/texmf-dist/tex/latex/graphics-def/xetex.def +++ b/Master/texmf-dist/tex/latex/graphics-def/xetex.def @@ -1,16 +1,13 @@ -%% This is file `xetex.def' for XeTeX, -%% based upon other drivers for LaTeX color and graphics support. +%% xetex.def Copyright (C) 2005-2017 LaTeX3 Project, Jin-Hwan Cho, Shunsaku Hirata +%% (with contributions from many others) %% -%% Copyright 2004-2007, 2009, 2013-2016 -%% Ross Moore <ross@maths.mq.edu.au> -%% modified by Jonathan Kew et al. -%% -%% Copyright 2016 LaTeX3 project and above named authors. -%% -%% This file is not part of the Standard LaTeX `Graphics Bundle'. -%% It may be distributed under the terms of the LaTeX Project Public -%% License, as described in lppl.txt in the base LaTeX distribution. -%% Either version 1.0 or, at your option, any later version. +%% 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. %% %% This work has the LPPL maintenance status `maintained'. %% @@ -18,154 +15,8 @@ %% %% https://github.com/latex3/graphics-def/issues %% -%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% Version History -%% -%% 2016/07/11 [DPC] [v4.10] \mag test added to all the files -%% Remove spurious dependency on external packages. -%% Avoid \@ehd help text (not defined by miniltx) -%% -%% 2016/07/02 [DPC] [v4.09] support new (no)setpagesize options of -%% color and graphics packages. -%% revert pagecolor code to match dvips -%% -%% 2016/04/06 [AK] [v4.08] Support new suffix .mps (or .MPS) for eps files -%% created by MetaPost. In TeX Live 2016, the option --mvorigin -%% for [x]dvipdfmx is necessary to include MetaPost-created eps -%% files by the usual \Ginclude@eps. This may a bit be inconvenient. -%% Thus we introduce a new command \Ginclude@mps for the suffix -%% .mps (or .MPS). In \Ginclude@mps, llx, lly, urx, and ury are -%% natural compared with those in \Ginclude@eps. Thus the origin -%% should not be translated, that is the option --mvorigin should -%% not be given. -%% -%% 2015/09/11 [AK, NA, TY] [v4.06] Support pagebox=artbox, etc. in xelatex, -%% like in pdflatex. It requires new xetex and xdvipdfmx, which -%% will be available in TeX Live 2016. Interested users may build -%% new binaries by using new sources in the TeX Live repository. -%% -%% 2015/03/26 [SH] [v4.04] JPEG 2000 (.jp2, .jpf) support, written for -%% dvipdfmx. -%% -%% 2014/04/28 [KB] [v4.03] \newif outside \def. Skipped 4.02. -%% -%% 2014/04/28 [HO] [v4.01] .CAPS extensions. -%% [KB] ordering: find .jpeg just after .jpg, -%% more like dvipdfmx.def. Also remove .sga/.sgi, -%% which were mismatched and never noticed. -%% Change version number to match dvipdfmx.def. -%% -%% 2014/04/07 [AK] [v0.99] remove spurious spaces. -%% -%% 2014/03/24 [AK] [v0.98] non-origin viewport, avoid double bp conversion. -%% -%% 2014/03/21 [KB] doc tweaks for project home at puszcza.gnu.org.ua. -%% -%% 2013/05/27 [KB] Version v0.97 non-commutative operations. -%% (code provided by Bruno Voisin) -%% -%% 2013/04/29 [KB] Version v0.96 handle non-origin ll corner. -%% (code provided by Bruno Voisin) -%% -%% 2013/02/04 [RRM] Version v0.95 added clipping support. -%% (code provided by Joseph Wright and Martin Scharrer) -%% -%% 2009/11/21 [KB] Version v0.94 merge the two 0.93's. -%% -%% 2009/10/28 [RRM] Version v0.93 fix big-point incompatibility; -%% -%% 2007/10/25 [JK] Version v0.93 added EPS support from dvipdfmx.def -%% (for use with xdvipdfmx, default driver in xetex 0.997) -%% -%% 2006/08/10 [JK] Version v0.92 correct type-check in \G@measure@QTm; -%% remove \G@PDF@ext, apply \lowercase instead; -%% make \XeTeXquote have catcode 12 rather than 11; -%% explicit space after "filename.ext" (reqd by xetex 0.995) -%% -%% 2006/07/19 [JK] Version v0.91 use \special{color ...} rather than -%% \special{x:textcolor ...} etc, for compatibility with -%% both xdv2pdf and xdvipdfmx drivers; -%% added .bmp to list of recognized graphics extensions -%% -%% 2006/01/09 [JK] Version v0.9 removed support for XeTeX versions -%% prior to 0.6 (when the \XeTeXpicfile parameters were -%% modified), to avoid problem when \XeTeXrevision inc. letters -%% -%% 2005/10/12 Version v0.8 removed spurious space in \convertHEX@ -%% -- found by Morten Hogholm -%% -%% 2004/05/09 Version v0.7 changed support for \pagecolor, adapted -%% from pdftex.def, to put a \special in the \shipout ; -%% this driver should now work with miniltx.tex ; -%% changed some control-sequence names; -%% implemented HSB to RGB color conversion -%% identified the redundant (v0.5) coding more clearly. -%% -%% 2004/05/08 Version v0.6 properly implements scaling and rotations -%% following the coding used with pdftex.def ; -%% implemented `viewport' and prepared for `clip'; -%% don't rely on " to have correct catcode; -%% altered the suffix order for graphics, to be: -%% .pdf .png .jpg .pict .tif .... -%% -%% 2004/04/29 Version v0.5 adapts to the changed names for the -%% graphics inclusion primitives, and version strings. -%% -%% 2004/04/23 Version v0.41 works with graphics.sty as well as -%% graphicx.sty ; \G@pdf@ext is '.pdf'; -%% similarly define and use \G@PDF@ext for '.PDF'; -%% removed some log-messages. -%% -%% 2004/04/22 Version v0.4 designed to work with XeTeX v0.4 -%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% emacs-page \ProvidesFile{xetex.def} - [2016/07/11 v4.10 LaTeX color/graphics driver for XeTeX (L3/RRM/JK)] -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -% make sure we can use " with correct catcode -{\catcode`\"=12 - \gdef\XeTeXquote{"}% -} - -% miniltx.tex does not define \PackageWarning -\@ifundefined{PackageWarning}{% - \def\PackageWarning#1#2{% - \begingroup - \def\@spaces{\space\space\space\space}% - \ifx\on@line\@undefined\def\on@line{}\fi - \newlinechar=10 % - \def\MessageBreak{% - ^^J(#1)\@spaces\@spaces\@spaces\@spaces - }% - \immediate\write16{^^JPackage #1 Warning: #2\on@line.^^J}% - \endgroup - }% -}{} - -\def\GPT@warn{\PackageWarning{xetex.def}}% - -\@ifundefined{on@line}{% - \def\on@line{ on input line \the\inputlineno}% -}{} -\@ifundefined{@spaces}{% - \def\@spaces{\space\space\space\space}% -}{} -\def\GXT@warn{\PackageWarning{xetex.def}}% -\ifx\Gin@log\@undefined - \def\Gin@log{\message} -\fi - -% Colour Support. The following models may be used. -% * rgb \ -% * cmyk \ -% * gray /-- all passed directly to the driver -% * hsb / -% * RGB ---- converted to rgb here -% * named -% + [2017/06/01 v5.0a Graphics/color driver for xetex] \def\c@lor@arg#1{% \dimen@#1\p@ \ifdim\dimen@<\z@\dimen@\maxdimen\fi @@ -174,7 +25,7 @@ \fi} \def\color@gray#1#2{% \c@lor@arg{#2}% - \edef#1{gray #2}% + \edef#1{[#2]}% } \def\color@cmyk#1#2{\c@lor@@cmyk#2\@@#1} \def\c@lor@@cmyk#1,#2,#3,#4\@@#5{% @@ -182,14 +33,14 @@ \c@lor@arg{#1}% \c@lor@arg{#2}% \c@lor@arg{#3}% - \edef#5{cmyk #1 #2 #3 #4}% + \edef#5{[#1 #2 #3 #4]}% } \def\color@rgb#1#2{\c@lor@@rgb#2\@@#1} \def\c@lor@@rgb#1,#2,#3\@@#4{% \c@lor@arg{#1}% \c@lor@arg{#2}% \c@lor@arg{#3}% - \edef#4{rgb #1 #2 #3}% + \edef#4{[#1 #2 #3]}% } \def\color@RGB#1#2{\c@lor@@RGB#2\@@#1} \def\c@lor@@RGB#1,#2,#3\@@#4{% @@ -202,404 +53,188 @@ \dimen@#1\p@ \divide\dimen@\@cclv \edef#2{\strip@pt\dimen@}} -\def\color@hsb#1#2{\c@lor@@hsb#2\@@#1} -\def\c@lor@@hsb#1,#2,#3\@@#4{% - \c@lor@arg{#1}% - \c@lor@arg{#2}% - \c@lor@arg{#3}% - \edef#4{hsb #1 #2 #3}% - } \def\color@named#1#2{\c@lor@@named#2,,\@@#1} \def\c@lor@@named#1,#2,#3\@@#4{% \@ifundefined{col@#1}% {\PackageError{color}{Undefined color `#1'}{}}% {\edef#4{ #1}}% } - -\def\current@color{gray 0} - -% -% v0.02t: support for \pagecolor -% not used by default but may be re-activated -% with \oldxetexpagecolorcode -% see http://tug.org/pipermail/xetex/2016-June/026696.html -% -\def\oldxetexpagecolorcode{% -\def\set@page@color{% - \global\let\current@page@color\current@color - \@ifundefined{GXTorg@shipout}{% - \global\let\GXTorg@shipout\shipout - \gdef\shipout{% - \afterassignment\GXT@shipout - \global\setbox\@cclv=% - }% - \gdef\GXT@shipout{% - \ifvoid\@cclv\relax - \aftergroup\GXT@@shipout - \GXT@setpagecolor - \else - \GXTorg@shipout\vbox{% - \GXT@setpagecolor - \box\@cclv - }% - \fi - }% - \gdef\GXT@@shipout{% - \GXTorg@shipout\box\@cclv\relax - }% - \gdef\GXT@setpagecolor{% - \special{background \current@page@color}% - }% - }{}% -}% -} -\def\set@page@color{\special{background \current@color}} - -\def\set@color@stack{% - \special{color push \current@color}% - \aftergroup\reset@color -} -\def\set@color@nostack{% - \special{color \current@color}% - \aftergroup\reset@color -} -\def\reset@color@nostack{% - \special{color \current@color}% - \expandafter\checkfor@moreresets +\def\c@lor@to@ps#1 #2\@@{\csname c@lor@ps@#1\endcsname#2 \@@} +\def\c@lor@ps@#1 #2\@@{TeXDict begin #1 end} +\def\c@lor@ps@rgb#1\@@{#1 setrgbcolor} +\def\c@lor@ps@hsb#1\@@{#1 sethsbcolor} +\def\c@lor@ps@cmyk#1\@@{#1 setcmykcolor} +\def\c@lor@ps@gray#1\@@{#1 setgray} +\def\current@color{[0]} +\def\set@color{% + \special{pdf:bcolor \current@color + }\aftergroup\reset@color} +\def\reset@color{\special{% + pdf:ecolor}} +\def\set@page@color{\special{% + pdf:bgcolor \current@color}} +\def\define@color@named#1#2{% + \expandafter\let\csname col@#1\endcsname\@nnil} +\@ifundefined{Gin@page} + {\let\Gin@page\@empty} + {} +\@ifundefined{Gin@pagebox} + {\def\Gin@pagebox{cropbox}} + {} +\@ifundefined{Gin@interpolate} + {\csname newif\endcsname\ifGin@interpolate} + {} +\def\Gread@pdf#1{% + \Gin@interpolatefalse + \Gread@@xetex\XeTeXpdffile } -\def\reset@color@stack{% - \special{color pop}% - \expandafter\checkfor@moreresets +\def\Gread@bmp#1{% + \let\Gin@page\@empty + \let\Gin@pagebox\@empty + \Gread@@xetex\XeTeXpicfile } -\def\checkfor@moreresets{\futurelet\tmp\checkfor@moreresets@} -\def\checkfor@moreresets@{% - \ifx\tmp\reset@color\expandafter\gobble@color\fi} -\def\gobble@color#1{\checkfor@moreresets} - -\def\define@color@named#1#2{% - \expandafter\edef\csname col@#1\endcsname{#2}} -% -\def\check@for@XeTeX@colorstack{% - \expandafter\ifx\csname use@XeTeX@colorstack\endcsname\relax - \let\set@color\set@color@stack - \let\reset@color\reset@color@stack - \let\checkfor@moreresets\relax - \else - \let\set@color\set@color@nostack - \let\reset@color\reset@color@nostack - \fi +\def\Gread@@xetex#1{% + \IfFileExists{\Gin@base.bb}% + {\Gread@eps{\Gin@base.bb}}% + {\Gread@@xetex@aux#1}% } -% -% use \noXeTeXcolorstack to turn off the color-stack -% mechanism; use it within the preamble only. -% This may be useful with some packages -% e.g. TeXpower which makes partial page-builds. -% -\def\noXeTeXcolorstack{\def\use@XeTeX@colorstack{}} -\AtBeginDocument{\check@for@XeTeX@colorstack} -% -% < end of color support for XeTeX > - -% < graphics inclusion for XeTeX > -% -% PDF is a special case which has extra features -\def\G@pdf@ext{.pdf} -% -% import from pdftex.def to support pagebox=artbox etc. in XeLaTeX -% -% \Gin@XeTeX@page: page number of pdf image or \@empty otherwise. -% This code adapted from pdftex.def -\let\Gin@XeTeX@page\@empty -\let\GPT@pagebox\@empty -\begingroup - \toks@{\define@key{Gin}{page}{\def\Gin@XeTeX@page{#1}} -\define@key{Gin}{pagebox}{% - \expandafter\let\expandafter\GPT@pagebox% - \csname GPT@pagebox@#1\endcsname - \ifx\GPT@pagebox\relax - \let\GPT@pagebox\@empty - \GPT@warn{% - Unknown value `#1' for `pagebox'.\MessageBreak - Supported values:\MessageBreak - mediabox, cropbox, bleedbox, trimbox, artbox% - }% - \fi% -}% -}% - \@ifundefined{define@key}{% - \edef\x{\endgroup\noexpand\AtBeginDocument{% - \noexpand\@ifundefined{define@key}{}{\the\toks@}}% - }\x - }{\expandafter\endgroup\the\toks@} - -\def\GPT@pagebox@cropbox{crop}% -\def\GPT@pagebox@mediabox{media}% -\def\GPT@pagebox@artbox{art}% -\def\GPT@pagebox@trimbox{trim}% -\def\GPT@pagebox@bleedbox{bleed}% -% -% rotating graphics is supported, but -% rotation of arbitrary material is not supported yet -% -\def\GXT@erotate#1#2{\Grot@setangle{#1}\hbox{#2}}% -\def\set@GXT@erotate{\let\Gin@erotate\GXT@erotate} -%\AtBeginDocument{\set@GXT@erotate} - -\expandafter\ifx\csname XeTeXpicfile\endcsname\relax - \let\picfile@cmd\picfile - \let\pdffile@cmd\pdffile -\else - \let\picfile@cmd\XeTeXpicfile - \let\pdffile@cmd\XeTeXpdffile -\fi - -% all graphics are handled by Apple's QuickTime -% -\def\XeTeX@include@QTm#1{% - \def\picpage{}% - \def\picpagebox{}% - \edef\type@ext{% - \noexpand\lowercase{% - \noexpand\def\noexpand\type@ext{\Gin@ext}% - }% - }\type@ext - \ifx\type@ext\G@pdf@ext - \ifx\GPT@pagebox\@empty\else - \edef\picpagebox{ \GPT@pagebox}\fi - \ifx\Gin@XeTeX@page\@empty\else - \edef\picpage{ page\Gin@XeTeX@page}\fi - \def\picfilecommand{\pdffile@cmd}% - \else - \def\picfilecommand{\picfile@cmd}% - \fi - \edef\picfileargs{ \XeTeXquote#1\XeTeXquote\space\picpage\picpagebox}% - \Gin@log{% - <use \picfileargs>% +\def\Gread@@xetex@aux#1{% + \edef\Gin@attr@hash{% + \ifx\Gin@pagebox\@empty + \else + :\Gin@pagebox + \fi + \ifx\Gin@page\@empty + \else + :P\Gin@page + \fi }% - \ifx\Gscale@start\relax - \setbox\z@=\hbox{\expandafter\picfilecommand\picfileargs}% - \edef\next{\box\z@\egroup - \def\noexpand\width{\the\wd\z@}\relax - \def\noexpand\height{\the\ht\z@}\bgroup}% - \expandafter\next - \else - \XeTeX@scaleinclude{#1}% - \fi + \edef\Gin@@name{\Gin@base\Gin@ext}% + \@ifundefined{\Gin@@name\space height\Gin@attr@hash}% + {% + \setbox\@tempboxa=\hbox{% + #1"\Gin@@name"\space + \ifx\Gin@page\@empty\else page \Gin@page\fi + \ifx\Gin@pagebox\@empty\else\expandafter\Gread@@xetex@box\Gin@pagebox\fi + }% + \def\Gin@llx{0}\let\Gin@lly\Gin@llx + \Gin@defaultbp\Gin@urx{\wd\@tempboxa}% + \Gin@defaultbp\Gin@ury{\ht\@tempboxa}% + \expandafter\xdef\csname \Gin@@name\space height\Gin@attr@hash\endcsname + {\the\ht\@tempboxa}% + \expandafter\xdef\csname \Gin@@name\space width\Gin@attr@hash\endcsname + {\the\wd\@tempboxa}% + }{% + \def\Gin@llx{0}\let\Gin@lly\Gin@llx + \Gin@defaultbp\Gin@urx + {\csname \Gin@@name\space width\Gin@attr@hash\endcsname}% + \Gin@defaultbp\Gin@ury + {\csname \Gin@@name\space height\Gin@attr@hash\endcsname}% + }% } -\def\XeTeX@scaleinclude#1{% +\def\Gread@@xetex@box#1box{#1} +\def\GPT@setup@scale{% \def\@tempa{!}% \ifx\Gin@scaley\@tempa - \let\Gin@scaley\Gin@scalex + \let\Gin@scaley\Gin@scalex \else - \ifx\Gin@scalex\@tempa\let\Gin@scalex\Gin@scaley\fi + \ifx\Gin@scalex\@tempa\let\Gin@scalex\Gin@scaley\fi \fi +} +\def\Ginclude@pdf#1{% + \GPT@setup@scale + \Gin@log{% + <use #1% + \ifx\Gin@page\@empty\else, page \Gin@page\fi + >% + }% \hbox{% \Gscale@box{\Gin@scalex}[\Gin@scaley]{% \@ifundefined{Gin@vllx}{% - \GXT@viewportfalse + \GPT@viewportfalse % without viewport/trim clipping does not make sense - % for XeTeX + % for pdfTeX \Gin@clipfalse }{}% - \ifGin@clip - \if!\Gin@vllx\Gin@vlly\Gin@vurx\Gin@vury!% - \else - \let\GXT@clipend\GXT@DoClipEnd - \setbox\@tempboxa\hbox\bgroup + \ifGin@clip + \if!\Gin@vllx\Gin@vlly\Gin@vurx\Gin@vury!% + \else + \let\GPT@clipend\GPT@DoClipEnd + \setbox\@tempboxa\hbox\bgroup + \fi \fi - \fi - \ifGXT@viewport - \ifdim\Gin@vlly\p@=\z@ - \else - \lower\Gin@vlly bp\hbox\bgroup + \ifGPT@viewport + \ifdim\Gin@vlly\p@=\z@ + \else + \lower\Gin@vlly bp\hbox\bgroup + \fi + \ifdim\Gin@vllx\p@=\z@ + \else + \hskip-\Gin@vllx bp\relax + \fi \fi - \ifdim\Gin@vllx\p@=\z@ - \else - \hskip-\Gin@vllx bp\relax + \XeTeXpdffile"#1" % + \ifx\Gin@page\@empty\else page \Gin@page\fi + \ifx\Gin@pagebox\@empty\else\expandafter\Gread@@xetex@box\Gin@pagebox\fi + \ifGPT@viewport + \ifdim\Gin@vlly\p@=\z@ + \else + \egroup + \fi + \GPT@clipend \fi - \fi -% - \expandafter\picfilecommand\picfileargs -% - \ifGXT@viewport - \ifdim\Gin@vlly\p@=\z@ - \else - \egroup - \fi - \GXT@clipend - \fi }% }% } -\newif\ifGXT@viewport -\GXT@viewporttrue -\let\GXT@clipend\relax -\def\GXT@DoClipEnd{% +\newif\ifGPT@viewport +\GPT@viewporttrue +\let\GPT@clipend\relax +\def\GPT@DoClipEnd{% \egroup \dp\@tempboxa\z@ % \Gin@urx and \Gin@ury already contain the correct values, % so both cases viewport and trim can be handled together: \dimen@\Gin@urx\p@ - \advance\dimen@ -\Gin@vllx\p@ + \advance\dimen@ -\Gin@llx\p@ \wd\@tempboxa\strip@pt\dimen@ bp\relax -% \wd\@tempboxa\dimen@ \relax \dimen@\Gin@ury\p@ - \advance\dimen@ -\Gin@vlly\p@ + \advance\dimen@ -\Gin@lly\p@ \ht\@tempboxa\strip@pt\dimen@ bp\relax -% \ht\@tempboxa\dimen@ \relax - % Clip box to its official size - \GXT@clipbox\@tempboxa + \GPT@clipbox\@tempboxa \box\@tempboxa } -% Clipping support added by Martin Scharrer and Joseph Wright, Nov 2011 -% under the LPPL v1.0 or later. -\def\GXT@clipbox#1{% - \setbox#1=\hbox{% - \Gin@defaultbp\WIDTH{\wd#1}% - \Gin@defaultbp\DEPTH{\dp#1}% - \@tempdima\ht#1% - \advance\@tempdima\dp#1% - \Gin@defaultbp\TOTALHEIGHT{\@tempdima}% - \special{pdf:content q }% - \special{% - pdf:literal direct - 0 -\DEPTH\space \WIDTH\space \TOTALHEIGHT\space re - }% - \special{pdf:literal direct W }% - \special{pdf:literal direct n }% - \special{pdf:literal direct -1 0 0 -1 0 0 cm }% - \special{pdf:content q }% - \special{pdf:literal direct -1 0 0 -1 0 0 cm }% - \box#1% - \special{pdf:literal direct Q }% - \special{pdf:literal direct Q }% - }% -} -% End of clipping code - -% -\def\Gread@QTm#1{\IfFileExists{\Gin@base.bb}% - {\Gread@eps{\Gin@base.bb}}% - {\G@measure@QTm{\Gin@base}{\Gin@ext}}% +\def\GPT@clipbox#1{% + \setbox#1=\hbox{% + \Gin@defaultbp\WIDTH{\wd#1}% + \Gin@defaultbp\DEPTH{\dp#1}% + \@tempdima\ht#1% + \advance\@tempdima\dp#1% + \Gin@defaultbp\TOTALHEIGHT{\@tempdima}% + \special{x:gsave}% + \special{% + pdf:literal + 0 -\DEPTH\space \WIDTH\space \TOTALHEIGHT\space re W n + }% + \rlap{\box#1}% + \special{x:grestore}% + \hskip\wd#1% + }% } -\def\G@measure@QTm#1#2{% - % \@warning{measuring size of QuickTime graphic #1#2}% +\def\Ginclude@bmp#1{% + \Gin@log{<#1>}% \bgroup - \edef\type@ext{% - \noexpand\lowercase{% - \noexpand\def\noexpand\type@ext{#2}% - }% - }\type@ext - \ifx\type@ext\G@pdf@ext - \ifx\Gin@XeTeX@page\@empty \def\picpage{}% - \else \edef\picpage{ page\Gin@XeTeX@page}\fi - \ifx\GPT@pagebox\@empty \def\picpagebox{}% - \else \edef\picpagebox{ \GPT@pagebox}\fi - \fi - \setbox0=\hbox{% - \ifx\type@ext\G@pdf@ext - \edef\piccommand{\noexpand\pdffile@cmd - \XeTeXquote#1#2\XeTeXquote\space\picpage\picpagebox}% - \else - \edef\piccommand{\noexpand\picfile@cmd - \XeTeXquote#1#2\XeTeXquote\space}% - \fi - \piccommand - }\dimen0=\wd0 \dimen2=\ht0 - \edef\next{\egroup - \edef\noexpand\Gin@urx{\the\dimen0}% - \edef\noexpand\Gin@ury{\the\dimen2}% - }% - \next - \Gin@defaultbp\Gin@llx{0}% - \Gin@defaultbp\Gin@lly{0}% - \expandafter\Gin@defaultbp\expandafter\Gin@urx\expandafter{\Gin@urx}% - \expandafter\Gin@defaultbp\expandafter\Gin@ury\expandafter{\Gin@ury}% -% \typeout{XeTeX: HiRes BoundingBox = (0,0)\space x (\Gin@urx,\Gin@ury) }% - \Gin@nat@width=\Gin@urx\p@ - \Gin@nat@height=\Gin@ury\p@ - % these emulate \@begin@tempboxa - \edef\width{\the\Gin@nat@width}% - \edef\height{\the\Gin@nat@height}% - \def\depth{0pt}% - \let\totalheight\@ovri - \totalheight\height -} - -\let\Ginclude@QTm\XeTeX@include@QTm - -% For a new graphics type, you can include a line here ... -\@namedef{Gin@rule@.pdf}#1{{QTm}{QTm}{#1}} -\@namedef{Gin@rule@.PDF}#1{{QTm}{QTm}{#1}} -% -\@namedef{Gin@rule@.eps}#1{{eps}{.eps}{#1}} -\@namedef{Gin@rule@.EPS}#1{{eps}{.EPS}{#1}} -% -\@namedef{Gin@rule@.mps}#1{{mps}{.mps}{#1}} -\@namedef{Gin@rule@.MPS}#1{{mps}{.MPS}{#1}} -% -\@namedef{Gin@rule@.ps}#1{{eps}{.ps}{#1}} -\@namedef{Gin@rule@.PS}#1{{eps}{.PS}{#1}} -% -\@namedef{Gin@rule@.png}#1{{QTm}{QTm}{#1}} -\@namedef{Gin@rule@.PNG}#1{{QTm}{QTm}{#1}} -% -\@namedef{Gin@rule@.jpg}#1{{QTm}{QTm}{#1}} -\@namedef{Gin@rule@.JPG}#1{{QTm}{QTm}{#1}} -\@namedef{Gin@rule@.jpeg}#1{{QTm}{QTm}{#1}} -\@namedef{Gin@rule@.JPEG}#1{{QTm}{QTm}{#1}} -% -\@namedef{Gin@rule@.jp2}#1{{QTm}{QTm}{#1}} -\@namedef{Gin@rule@.JP2}#1{{QTm}{QTm}{#1}} -% -\@namedef{Gin@rule@.jpf}#1{{QTm}{QTm}{#1}} -\@namedef{Gin@rule@.JPF}#1{{QTm}{QTm}{#1}} -% -\@namedef{Gin@rule@.bmp}#1{{QTm}{QTm}{#1}} -\@namedef{Gin@rule@.BMP}#1{{QTm}{QTm}{#1}} -% -\@namedef{Gin@rule@.pict}#1{{QTm}{QTm}{#1}} -\@namedef{Gin@rule@.PICT}#1{{QTm}{QTm}{#1}} -% -\@namedef{Gin@rule@.psd}#1{{QTm}{QTm}{#1}} -\@namedef{Gin@rule@.PSD}#1{{QTm}{QTm}{#1}} -% -\@namedef{Gin@rule@.mac}#1{{QTm}{QTm}{#1}} -\@namedef{Gin@rule@.MAC}#1{{QTm}{QTm}{#1}} -\@namedef{Gin@rule@.tga}#1{{QTm}{QTm}{#1}} -\@namedef{Gin@rule@.TGA}#1{{QTm}{QTm}{#1}} -% -\@namedef{Gin@rule@.gif}#1{{QTm}{QTm}{#1}} -\@namedef{Gin@rule@.GIF}#1{{QTm}{QTm}{#1}} -% -\@namedef{Gin@rule@.tif}#1{{QTm}{QTm}{#1}} -\@namedef{Gin@rule@.TIF}#1{{QTm}{QTm}{#1}} -\@namedef{Gin@rule@.tiff}#1{{QTm}{QTm}{#1}} -\@namedef{Gin@rule@.TIFF}#1{{QTm}{QTm}{#1}} - -% movies not supported yet: -%\@namedef{Gin@rule@.qt}#1{{QTm}{QTm}{#1}} -%\@namedef{Gin@rule@.mpg}#1{{QTm}{QTm}{#1}} -%\@namedef{Gin@rule@.mov}#1{{QTm}{QTm}{#1}} -%\@namedef{Gin@rule@.moov}#1{{QTm}{QTm}{#1}} - - -% ... though this default rule will try QuickTime anyway ... -\@namedef{Gin@rule@*}#1{{QTm}{QTm}{#1}} - -% ... and add its extension here -\def\Gin@extensions{% order here is like dvipdfmx.def, except for PS - .pdf,.PDF,.eps,.EPS,.mps,.MPS,.ps,.PS,% - .png,.PNG,.jpg,.JPG,.jpeg,.JPEG,.jp2,.JP2,.jpf,.JPF,.bmp,.BMP,% - .pict,.PICT,.psd,.PSD,.mac,.MAC,.TGA,.tga,% - .gif,.GIF,.tif,.TIF,.tiff,.TIFF,% -} - -% xdvipdfmx is now the default driver, and can support EPS images, -% so we borrow code for this from dvipdfmx.def (and add the extensions above) + \def\@tempa{!}% + \special{pdf:image\space + bbox\space\Gin@llx\space\Gin@lly\space\Gin@urx\space\Gin@ury\space + clip\space\ifGin@clip 1\else 0\fi\space + \ifx\Gin@scalex\@tempa\else width\space\the\Gin@req@width\space\fi + \ifx\Gin@scaley\@tempa\else height\space\the\Gin@req@height\space\fi + (#1)\space + \ifGin@interpolate<</Interpolate\space true>>\fi}% + \egroup} \newif\if@trim@vport \def\Ginclude@eps#1{% - \message{<#1>}% + \Gin@log{<#1>}% \bgroup \ifx\Undefined\Gin@vllx\else\@trim@vporttrue\fi \def\@tempa{!}% @@ -639,14 +274,14 @@ % the origin accordingly if we use \Ginclude@eps for eps files created by % MetaPost. In TeX Live 2015, the translation of the origin was the default. % After TeX Live 2016, however, the translation of the origin is enabled only -% if the --mvorigin option is given for dvipdfmx or xdvipdfmx. -% This may be a bit inconvenient, especially in the case of XeTeX where +% if the --mvorigin option is given for xdvipdfmx +% This may be a bit inconvenient, especially as % xdvipdfmx is usually called as a pipe. Therefore we introduce a new suffix % .mps(or .MPS) to support inclusion of eps files created by MetaPost without % the option --mvorigin. % \def\Ginclude@mps#1{% - \message{<#1>}% + \Gin@log{<#1>}% \bgroup \def\@tempa{!}% \dimen@\Gin@req@width @@ -664,23 +299,92 @@ \ifGin@clip clip\fi}% \egroup} % -% Rotation & Scaling -% supported from xetex v0.6 onwards -% - -\def\Grot@start{\wd\z@\z@ - \special{x:gsave}\special{x:rotate \Grot@angle}} -\def\Grot@end{\special{x:grestore}} +\def\Grot@start{% +\special{pdf:btrans rotate \Grot@angle}} +\def\Grot@end{\special{pdf:etrans}} +% 4.13 add support for ptex vertical writing mode +% inspired by pxtatescale package (Hironobu Yamashita) +\ifx\kanjiskip\@undefined \def\Gscale@start{% - \special{x:gsave}% - \special{pdf:literal \Gscale@x\space 0 0 \Gscale@y\space 0 0 cm}} -\let\Gscale@end\Grot@end + \special{pdf:btrans}% + \special{x:scale \Gscale@x\space\Gscale@y}% +} +\else +\edef\Gscale@start{% + \special{pdf:btrans}% + \special{x:scale + \expandafter\noexpand\csname iftdir\endcsname + \noexpand\Gscale@y\noexpand\space\noexpand\Gscale@x + \expandafter\noexpand\csname else\endcsname + \noexpand\Gscale@x\noexpand\space\noexpand\Gscale@y + \expandafter\noexpand\csname fi\endcsname}} +\fi % - +\def\Gscale@end{\special{pdf:etrans}} +\def\Gin@PS@raw#1{\special{ps: #1}} +\def\Gin@PS@restored#1{\special{" #1}} +\def\Gin@PS@literal@header#1{\AtBeginDvi{\special{! #1}}} +\def\Gin@PS@file@header#1{\AtBeginDvi{\special{header=#1}}} +\def\Gin@extensions{% order here is like pdftex.def, except for PS + .pdf,.PDF,.ai,.AI,% + .png,.PNG,.jpg,.JPG,.jpeg,.JPEG,.jp2,.JP2,.jpf,.JPF,.bmp,.BMP,% + .ps,.PS,.eps,.EPS,.mps,.MPS,% + .pz,.eps.Z,.ps.Z,.ps.gz,.eps.gz} +% +\@namedef{Gin@rule@.pdf}#1{{pdf}{.xbb}{#1}} +\@namedef{Gin@rule@.PDF}#1{{pdf}{.xbb}{#1}} +% +\@namedef{Gin@rule@.ai}#1{{pdf}{.xbb}{#1}} +\@namedef{Gin@rule@.AI}#1{{pdf}{.xbb}{#1}} % -% (no)setpagesize option +\@namedef{Gin@rule@.jp2}#1{{bmp}{.xbb}{#1}} +\@namedef{Gin@rule@.JP2}#1{{bmp}{.xbb}{#1}} % +\@namedef{Gin@rule@.jpf}#1{{bmp}{.xbb}{#1}} +\@namedef{Gin@rule@.JPF}#1{{bmp}{.xbb}{#1}} +% +\@namedef{Gin@rule@.png}#1{{bmp}{.xbb}{#1}} +\@namedef{Gin@rule@.PNG}#1{{bmp}{.xbb}{#1}} +% +\@namedef{Gin@rule@.jpg}#1{{bmp}{.xbb}{#1}} +\@namedef{Gin@rule@.JPG}#1{{bmp}{.xbb}{#1}} +% +\@namedef{Gin@rule@.jpeg}#1{{bmp}{.xbb}{#1}} +\@namedef{Gin@rule@.JPEG}#1{{bmp}{.xbb}{#1}} +% +\@namedef{Gin@rule@.jp2}#1{{bmp}{.xbb}{#1}} +\@namedef{Gin@rule@.JP2}#1{{bmp}{.xbb}{#1}} +% +\@namedef{Gin@rule@.jpf}#1{{bmp}{.xbb}{#1}} +\@namedef{Gin@rule@.JPF}#1{{bmp}{.xbb}{#1}} +% +\@namedef{Gin@rule@.bmp}#1{{bmp}{.xbb}{#1}} +\@namedef{Gin@rule@.BMP}#1{{bmp}{.xbb}{#1}} +% +\@namedef{Gin@rule@.ps}#1{{eps}{.ps}{#1}} +\@namedef{Gin@rule@.PS}#1{{eps}{.ps}{#1}} +% +\@namedef{Gin@rule@.eps}#1{{eps}{.eps}{#1}} +\@namedef{Gin@rule@.EPS}#1{{eps}{.eps}{#1}} +% +\@namedef{Gin@rule@.mps}#1{{mps}{.mps}{#1}} +\@namedef{Gin@rule@.MPS}#1{{mps}{.mps}{#1}} +% (don't bother with uppercase versions for these Unixish extensions) +\@namedef{Gin@rule@.pz}#1{{eps}{.xbb}{`gunzip -c #1}} +\@namedef{Gin@rule@.eps.Z}#1{{eps}{.eps.xbb}{`gunzip -c #1}} +\@namedef{Gin@rule@.ps.Z}#1{{eps}{.ps.xbb}{`gunzip -c #1}} +\@namedef{Gin@rule@.ps.gz}#1{{eps}{.ps.xbb}{`gunzip -c #1}} +\@namedef{Gin@rule@.eps.gz}#1{{eps}{.eps.xbb}{`gunzip -c #1}} +% +\@namedef{Gin@rule@*}#1{{eps}{\Gin@ext}{#1}} + + +% v4.10 +% Support new (no)setpagesize option of graphics and color. +% v4.11 +% Use \special{pdf:pagesize ...} instead of \special{papersize=...} +% to support \mag (xetex only) \@ifundefined{ifGin@setpagesize} {\expandafter\let\csname ifGin@setpagesize\expandafter\endcsname \csname iftrue\endcsname} @@ -691,29 +395,19 @@ % If a package has changed \mag, assume it knows what it is doing % and leave page size alone \ifnum\mag=\@m -\@ifundefined{stockwidth}{% -\@ifundefined{paperwidth}{% -}{% -\ifdim\paperwidth>0pt\relax -\ifdim\paperheight>0pt\relax -\pdfpagewidth=\paperwidth -\pdfpageheight=\paperheight -\fi +\AtBeginDvi{% +\begingroup +\ifx\stockwidth\@undefined\else +\paperwidth\stockwidth +\paperheight\stockheight \fi -}% -}{% -\ifdim\stockwidth>0pt\relax -\ifdim\stockheight>0pt\relax -\pdfpagewidth=\stockwidth -\pdfpageheight=\stockheight +\ifdim\paperwidth>\z@ +\ifdim\paperheight>\z@ +\special{pdf:pagesize width \the\paperwidth\space height \the\paperheight}% \fi \fi -}% +\endgroup}% \fi } \fi -\fi - -\endinput -%% -%% End of file `xetex.def'. +\fi |