graphics-def (21jun17)

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

1 files changed, 33 insertions, 32 deletions

diff --git a/Master/texmf-dist/tex/latex/graphics-def/xetex.def b/Master/texmf-dist/tex/latex/graphics-def/xetex.def
index aa5f7a48f56..6440f6d1944 100644
--- a/Master/texmf-dist/tex/latex/graphics-def/xetex.def
+++ b/Master/texmf-dist/tex/latex/graphics-def/xetex.def
@@ -16,7 +16,8 @@
 %% https://github.com/latex3/graphics-def/issues
 %%
 \ProvidesFile{xetex.def}
-  [2017/06/16 v5.0e Graphics/color driver for xetex]
+  [2017/06/20 v5.0g Graphics/color driver for xetex]
+\def\GPT@space{ }
 \def\c@lor@arg#1{%
   \dimen@#1\p@
   \ifdim\dimen@<\z@\dimen@\maxdimen\fi
@@ -118,26 +119,26 @@
     \fi
   }%
   \edef\Gin@@name{\Gin@base\Gin@ext}%
-  \@ifundefined{\Gin@@name\space height\Gin@attr@hash}%
+  \@ifundefined{\Gin@@name\GPT@space height\Gin@attr@hash}%
     {%
       \setbox\@tempboxa=\hbox{%
-        #1"\Gin@@name"\space
+        #1"\Gin@@name"\GPT@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
+      \expandafter\xdef\csname \Gin@@name\GPT@space height\Gin@attr@hash\endcsname
         {\the\ht\@tempboxa}%
-      \expandafter\xdef\csname \Gin@@name\space width\Gin@attr@hash\endcsname
+      \expandafter\xdef\csname \Gin@@name\GPT@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}%
+        {\csname \Gin@@name\GPT@space width\Gin@attr@hash\endcsname}%
       \Gin@defaultbp\Gin@ury
-        {\csname \Gin@@name\space height\Gin@attr@hash\endcsname}%
+        {\csname \Gin@@name\GPT@space height\Gin@attr@hash\endcsname}%
     }%
 }
 \def\Gread@@xetex@box#1box{#1}
@@ -221,7 +222,7 @@
     \special{x:gsave}%
     \special{%
       pdf:literal
-      0 -\DEPTH\space \WIDTH\space \TOTALHEIGHT\space re  W n
+      0 -\DEPTH\GPT@space \WIDTH\GPT@space \TOTALHEIGHT\GPT@space re  W n
     }%
     \rlap{\box#1}%
     \special{x:grestore}%
@@ -232,13 +233,13 @@
   \Gin@log{<#1>}%
   \bgroup
   \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}%
+    \special{pdf:image\GPT@space
+      bbox\GPT@space\Gin@llx\GPT@space\Gin@lly\GPT@space\Gin@urx\GPT@space\Gin@ury\GPT@space
+      clip\GPT@space\ifGin@clip 1\else 0\fi\GPT@space
+      \ifx\Gin@scalex\@tempa\else width\GPT@space\the\Gin@req@width\GPT@space\fi
+      \ifx\Gin@scaley\@tempa\else height\GPT@space\the\Gin@req@height\GPT@space\fi
+      (#1)\GPT@space
+      \ifGin@interpolate<</Interpolate\GPT@space true>>\fi}%
   \egroup}
 \newif\if@trim@vport
 \def\Ginclude@eps#1{%
@@ -263,15 +264,15 @@
   \divide\dimen@\dimen@ii
   \@tempdima\Gin@req@height
   \divide\@tempdima\dimen@ii
-    \special{PSfile="#1"\space
+    \special{PSfile="#1"\GPT@space
       \if@trim@vport
-      llx=\Gin@vllx\space
-      lly=\Gin@vlly\space
+      llx=\Gin@vllx\GPT@space
+      lly=\Gin@vlly\GPT@space
       \fi
-      urx=\Gin@urx\space
-      ury=\Gin@ury\space
-      \ifx\Gin@scalex\@tempa\else rwi=\number\dimen@\space\fi
-      \ifx\Gin@scaley\@tempa\else rhi=\number\@tempdima\space\fi
+      urx=\Gin@urx\GPT@space
+      ury=\Gin@ury\GPT@space
+      \ifx\Gin@scalex\@tempa\else rwi=\number\dimen@\GPT@space\fi
+      \ifx\Gin@scaley\@tempa\else rhi=\number\@tempdima\GPT@space\fi
       \ifGin@clip clip\fi}%
   \egroup}
 %
@@ -297,13 +298,13 @@
   \divide\dimen@\dimen@ii
   \@tempdima\Gin@req@height
   \divide\@tempdima\dimen@ii
-    \special{PSfile="#1"\space
-      llx=\Gin@llx\space
-      lly=\Gin@lly\space
-      urx=\Gin@urx\space
-      ury=\Gin@ury\space
-      \ifx\Gin@scalex\@tempa\else rwi=\number\dimen@\space\fi
-      \ifx\Gin@scaley\@tempa\else rhi=\number\@tempdima\space\fi
+    \special{PSfile="#1"\GPT@space
+      llx=\Gin@llx\GPT@space
+      lly=\Gin@lly\GPT@space
+      urx=\Gin@urx\GPT@space
+      ury=\Gin@ury\GPT@space
+      \ifx\Gin@scalex\@tempa\else rwi=\number\dimen@\GPT@space\fi
+      \ifx\Gin@scaley\@tempa\else rhi=\number\@tempdima\GPT@space\fi
       \ifGin@clip clip\fi}%
   \egroup}
 %
@@ -316,16 +317,16 @@
 \ifx\kanjiskip\@undefined
 \def\Gscale@start{%
   \special{pdf:btrans}%
-  \special{x:scale \Gscale@x\space\Gscale@y}%
+  \special{x:scale \Gscale@x\GPT@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
+    \noexpand\Gscale@y\noexpand\GPT@space\noexpand\Gscale@x
   \expandafter\noexpand\csname else\endcsname
-    \noexpand\Gscale@x\noexpand\space\noexpand\Gscale@y
+    \noexpand\Gscale@x\noexpand\GPT@space\noexpand\Gscale@y
   \expandafter\noexpand\csname fi\endcsname}}
 \fi
 %