[latex3-commits] [git/LaTeX3-latex3-graphics-def] develop: unquote graphics name before passing to brace delimited luatex primitives (6530ef5)

[David Carlisle]

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

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

commit 6530ef5fe2b12685d980464164d8e2ed2a078789
Author: David Carlisle <d.p.carlisle at gmail.com>
Date:   Sat Jul 13 19:14:57 2019 +0100

    unquote graphics name before passing to brace delimited luatex primitives


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

6530ef5fe2b12685d980464164d8e2ed2a078789
 luatex.def | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/luatex.def b/luatex.def
index 84ed110..b3c6354 100644
--- a/luatex.def
+++ b/luatex.def
@@ -189,6 +189,7 @@
   {\csname newif\endcsname\ifGin at interpolate}
   {}
 \def\Gread@@pdftex#1{%
+  \edef\Gin at unquoted{\expandafter\unquote at name\expandafter{\expanded{#1}}}%
   \edef\Gin at attr@hash{%
     \ifx\Gin at pagebox\@empty
     \else
@@ -205,7 +206,7 @@
       :I%
     \fi
   }%
-  \@ifundefined{#1 image\Gin at attr@hash}%
+  \@ifundefined{\Gin at unquoted image\Gin at attr@hash}%
     {%
       \saveimageresource
         \ifnum0%
@@ -219,19 +220,19 @@
         \fi
         \ifx\Gin at page\@empty\else page \Gin at page\fi
         \Gin at pagebox
-        {#1}%
+        {\Gin at unquoted}%
       \setbox\@tempboxa=\hbox{\useimageresource\lastsavedimageresourceindex}%
       \def\Gin at llx{0}\let\Gin at lly\Gin at llx
       \Gin at defaultbp\Gin at urx{\wd\@tempboxa}%
       \Gin at defaultbp\Gin at ury{\ht\@tempboxa}%
-      \expandafter\xdef\csname #1 image\Gin at attr@hash\endcsname
+      \expandafter\xdef\csname\Gin at unquoted image\Gin at attr@hash\endcsname
         {\useimageresource\the\lastsavedimageresourceindex}%
-      \expandafter\xdef\csname #1 height\Gin at attr@hash\endcsname
+      \expandafter\xdef\csname\Gin at unquoted height\Gin at attr@hash\endcsname
         {\the\ht\@tempboxa}%
-      \expandafter\xdef\csname #1 width\Gin at attr@hash\endcsname
+      \expandafter\xdef\csname\Gin at unquoted width\Gin at attr@hash\endcsname
         {\the\wd\@tempboxa}%
       \Gin at log{%
-        <#1, %
+        <\Gin at unquoted, %
         id=\the\lastsavedimageresourceindex, %
         \ifx\Gin at page\@empty\else page=\Gin at page , \fi
         \ifx\Gin at pagebox\@empty\else\ifx\Gin at pagebox\GPT at cropbox\else
@@ -243,8 +244,8 @@
       }%
     }{%
       \def\Gin at llx{0}\let\Gin at lly\Gin at llx
-      \Gin at defaultbp\Gin at urx{\csname #1 width\Gin at attr@hash\endcsname}%
-      \Gin at defaultbp\Gin at ury{\csname #1 height\Gin at attr@hash\endcsname}%
+      \Gin at defaultbp\Gin at urx{\csname\Gin at unquoted width\Gin at attr@hash\endcsname}%
+      \Gin at defaultbp\Gin at ury{\csname\Gin at unquoted height\Gin at attr@hash\endcsname}%
     }%
 }
 \def\Gread at png#1{%