[latex3-commits] [git/LaTeX3-latex3-latex3] master: PDF Objects should have pure string names (adb186d)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : master
Link       : https://github.com/latex3/latex3/commit/adb186d1e769f77e5556fddd28f355dc5a913f27

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

commit adb186d1e769f77e5556fddd28f355dc5a913f27
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Sun Sep 2 08:33:13 2018 +0100

    PDF Objects should have pure string names


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

adb186d1e769f77e5556fddd28f355dc5a913f27
 l3kernel/l3drivers.dtx |   23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/l3kernel/l3drivers.dtx b/l3kernel/l3drivers.dtx
index 93599e7..825646e 100644
--- a/l3kernel/l3drivers.dtx
+++ b/l3kernel/l3drivers.dtx
@@ -1686,11 +1686,11 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \driver_pdf_dictionary_declare:n #1
   {
-    \prop_if_exist:cF { g_@@_pdf_dictionary_ #1 _prop }
+    \prop_if_exist:cF { g_@@_pdf_dictionary_ \tl_to_str:n {#1} _prop }
       {
         \@@_pdf_object_declare:n {#1}
         \seq_gput_right:Nn \g_@@_pdf_dictionary_seq {#1}
-        \prop_new:c { g_@@_pdf_dictionary_ #1 _prop }
+        \prop_new:c { g_@@_pdf_dictionary_ \tl_to_str:n {#1} _prop }
       }
   }
 \cs_new_protected:Npx \@@_pdf_object_declare:n #1
@@ -1698,12 +1698,13 @@
     \cs_if_exist:NTF \tex_pdfextension:D
       {
         \tex_pdfextension:D obj ~ reserveobjnum ~
-        \int_const:cn { g_@@_pdf_object_ #1 _int }
+        \int_const:cn { g_@@_pdf_object_ \tl_to_str:n {#1} _int }
           { \tex_pdffeedback:D lastobj ~ }
       }
       {
         \tex_pdfobj:D reserveobjnum ~
-        \int_const:cn { g_@@_pdf_object_ #1 _int } { \tex_pdflastobj:D }
+        \int_const:cn { g_@@_pdf_object_ \tl_to_str:n {#1} _int }
+          { \tex_pdflastobj:D }
       }
   }
 %    \end{macrocode}
@@ -1714,9 +1715,11 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \driver_pdf_dictionary_gput:nnn #1#2#3
   {
-    \prop_if_exist:cF { g_@@_pdf_dictionary_ #1 _prop }
+    \prop_if_exist:cF { g_@@_pdf_dictionary_ \tl_to_str:n {#1} _prop }
       { \driver_pdf_dictionary_declare:n {#1} }
-    \prop_gput:cnn { g_@@_pdf_dictionary_ #1 _prop } {#2} {#3}
+    \prop_gput:cnn
+      { g_@@_pdf_dictionary_ \tl_to_str:n {#1} _prop }
+      {#2} {#3}
   }
 %    \end{macrocode}
 % \end{macro}
@@ -1733,15 +1736,17 @@
         \cs_if_exist:NTF \tex_pdfextension:D
           { \tex_immediate:D \tex_pdfextension:D obj ~ }
           { \tex_immediate:D \tex_pdfobj:D }
-          useobjnum ~ \exp_not:N \int_use:c { g_@@_pdf_object_ ##1 _int }
+          useobjnum ~
+            \exp_not:N \int_use:c
+              { g_@@_pdf_object_ \tl_to_str:n {##1} _int }
             {
               <<
               \c_space_tl
               \exp_not:N \prop_if_empty:cF
-                { g_@@_pdf_dictionary_ ##1 _prop }
+                { g_@@_pdf_dictionary_ \tl_to_str:n {##1} _prop }
                 {
                   \exp_not:N \prop_map_function:cN 
-                    { g_@@_pdf_dictionary_ ##1 _prop }
+                    { g_@@_pdf_dictionary_ \tl_to_str:n {##1} _prop }
                     \exp_not:N \@@_pdf_dictionary_finalise:nn
                   \c_space_tl
                 }