[latex3-commits] [git/LaTeX3-latex3-latex3] master: Correctly quote files names for XeTeX images (7b596f0)

[Joseph Wright]

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

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

commit 7b596f0a47e3e6e0f79c132af3a01ad7dfb1a4e3
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Tue May 7 21:36:04 2019 +0100

    Correctly quote files names for XeTeX images


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

7b596f0a47e3e6e0f79c132af3a01ad7dfb1a4e3
 l3kernel/l3drivers-image.dtx           |    6 +++++-
 l3kernel/testfiles/m3expl001.xetex.tlg |    1 +
 l3kernel/testfiles/m3expl003.xetex.tlg |    1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/l3kernel/l3drivers-image.dtx b/l3kernel/l3drivers-image.dtx
index 66eb958..5d28800 100644
--- a/l3kernel/l3drivers-image.dtx
+++ b/l3kernel/l3drivers-image.dtx
@@ -448,6 +448,7 @@
 % \end{macro}
 %
 % \begin{macro}{\@@_image_include_pdf:n}
+% \begin{macro}{\@@_image_include_bitmap_quote:w}
 %   For PDF images, properly supporting the |pagebox| concept in \XeTeX{}
 %   is best done using the |\tex_XeTeXpdffile:D| primitive. The syntax here
 %   is the same as for the image measurement part, although we know at this
@@ -455,11 +456,14 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_image_include_pdf:n #1
   {
-    \tex_XeTeXpdffile:D "#1" ~
+    \tex_XeTeXpdffile:D
+      \@@_image_include_pdf_quote:w #1 "#1" \q_stop \c_space_tl
       \int_compare:nNnT \l_image_page_int > 0
         { page ~ \int_use:N \l_image_page_int \c_space_tl }
         \exp_after:wN \@@_image_getbb_pagebox:w \l_image_pagebox_tl
   }
+\cs_new:Npn \@@_image_include_pdf_quote:w #1 " #2 " #3 \q_stop
+  { " #2 " }
 %    \end{macrocode}
 % \end{macro}
 %
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index b3f64bd..d90852d 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -6494,6 +6494,7 @@ Defining \__driver_image_getbb_auxv:nNnn on line ...
 Defining \__driver_image_getbb_auxvi:nNnn on line ...
 Defining \__driver_image_getbb_pagebox:w on line ...
 Defining \__driver_image_include_pdf:n on line ...
+Defining \__driver_image_include_pdf_quote:w on line ...
 Defining \__driver_pdf:n on line ...
 Defining \__driver_pdf:x on line ...
 Defining \driver_pdf_catalog_gput:nn on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index b3f64bd..d90852d 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -6494,6 +6494,7 @@ Defining \__driver_image_getbb_auxv:nNnn on line ...
 Defining \__driver_image_getbb_auxvi:nNnn on line ...
 Defining \__driver_image_getbb_pagebox:w on line ...
 Defining \__driver_image_include_pdf:n on line ...
+Defining \__driver_image_include_pdf_quote:w on line ...
 Defining \__driver_pdf:n on line ...
 Defining \__driver_pdf:x on line ...
 Defining \driver_pdf_catalog_gput:nn on line ...