[latex3-commits] [git/LaTeX3-latex3-graphics-def] develop: add unquoting for latex-dev (9a62d53)

[David Carlisle]

Repository : https://github.com/latex3/graphics-def
On branch  : develop
Link       : https://github.com/latex3/graphics-def/commit/9a62d531a20b64977350dd86ff3f8003fffa3dff

>---------------------------------------------------------------

commit 9a62d531a20b64977350dd86ff3f8003fffa3dff
Author: David Carlisle <d.p.carlisle at gmail.com>
Date:   Fri Jul 19 23:06:04 2019 +0100

    add unquoting for latex-dev


>---------------------------------------------------------------

9a62d531a20b64977350dd86ff3f8003fffa3dff
 pdftex.def | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pdftex.def b/pdftex.def
index 0c9d2da..311262c 100644
--- a/pdftex.def
+++ b/pdftex.def
@@ -18,7 +18,7 @@
 %% https://github.com/latex3/graphics-def/issues
 %%
 \ProvidesFile{pdftex.def}
-  [2018/01/08 v1.0l Graphics/color driver for pdftex]
+  [2018/01/08 v1.0l+dev Graphics/color driver for pdftex]
 \def\GPT at space{ }
 \def\c at lor@arg#1{%
   \dimen@#1\p@
@@ -278,26 +278,28 @@ E     \else
   \fi
 }
 \def\Ginclude at pdftex#1{%
+  \edef\Gin at unquoted{\expandafter\unquote at name\expandafter{\expanded{#1}}}%
   \GPT at setup@scale
   \Gin at log{%
-    <use #1%
+    <use \Gin at unquoted%
     \ifx\Gin at page\@empty\else, page \Gin at page\fi
     >%
   }%
   \PackageInfo{pdftex.def}{%
-    #1 \ifx\Gin at page\@empty\else, page\Gin at page\fi
+    \Gin at unquoted \ifx\Gin at page\@empty\else, page\Gin at page\fi
     \GPT at space used\on at line.\MessageBreak
     Requested size: %
     \the\Gin at req@width\GPT at space x \the\Gin at req@height
     \ifx\documentclass\@undefined\else\expandafter\@gobble\fi
   }%
-  \Ginclude@@pdftex{\@nameuse{#1 image\Gin at attr@hash}}%
+  \Ginclude@@pdftex{\@nameuse{\Gin at unquoted image\Gin at attr@hash}}%
 }
 \def\Ginclude at mps#1{%
   \GPT at setup@scale
   \Ginclude@@pdftex{\convertMPtoPDF{#1}{1}{1}}%
 }
 \def\Ginclude@@pdftex#1{%
+  \edef\Gin at unquoted{\expandafter\unquote at name\expandafter{\expanded{#1}}}%
   \hbox{%
     \Gscale at box{\Gin at scalex}[\Gin at scaley]{%
       \@ifundefined{Gin at vllx}{%
@@ -323,7 +325,7 @@ E     \else
           \hskip-\Gin at vllx bp\relax
         \fi
       \fi
-      #1%
+      "\Gin at unquoted"%
       \ifGPT at viewport
         \ifdim\Gin at vlly\p@=\z@
         \else