[latex3-commits] [l3svn] 04/06: Image file names should be strings already

[noreply at latex-project.org]

This is an automated email from the git hooks/post-receive script.

joseph pushed a commit to branch master
in repository l3svn.

commit 3cb650715dd7addbbd05adc457f7e40c429a7eb9
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Sun May 14 10:21:43 2017 +0100

    Image file names should be strings already
    
    ... so no need to make the code more complex. (Underlying assumption here
    is that #1 will be passed after full santization.)
---
 l3trial/l3image/l3image.dtx |   26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/l3trial/l3image/l3image.dtx b/l3trial/l3image/l3image.dtx
index 97b939b..f0ca59c 100644
--- a/l3trial/l3image/l3image.dtx
+++ b/l3trial/l3image/l3image.dtx
@@ -233,17 +233,13 @@
 %   \begin{macrocode}
 \cs_new_protected:Npx \@@_read_bb_auxi:nnn #1#2#3
   {
-    \dim_if_exist:cTF { c_@@_ \tl_to_str:n {#1} _llx_dim }
+    \dim_if_exist:cTF { c_@@_ #1 _llx_dim }
       {
         \bool_set_true:N \l__image_bb_found_bool
-        \dim_set_eq:Nc \l__image_llx_dim
-          { c_@@_ \tl_to_str:n {#1} _llx_dim }
-        \dim_set_eq:Nc \l__image_lly_dim
-          { c_@@_ \tl_to_str:n {#1} _lly_dim }
-        \dim_set_eq:Nc \l__image_urx_dim
-          { c_@@_ \tl_to_str:n {#1} _urx_dim }
-        \dim_set_eq:Nc \l__image_ury_dim
-          { c_@@_ \tl_to_str:n {#1} _ury_dim }
+        \dim_set_eq:Nc \l__image_llx_dim { c_@@_ #1 _llx_dim }
+        \dim_set_eq:Nc \l__image_lly_dim { c_@@_ #1 _lly_dim }
+        \dim_set_eq:Nc \l__image_urx_dim { c_@@_ #1 _urx_dim }
+        \dim_set_eq:Nc \l__image_ury_dim { c_@@_ #1 _ury_dim }
       }
       { \@@_read_bb_auxii:nnn {#2} {#3} {#1} }
   }
@@ -269,14 +265,10 @@
     \ior_close:N \exp_not:N \l_@@_tmp_ior
     \bool_if:NT \l__image_bb_found_bool
       {
-        \dim_const:cn { c_@@_ \tl_to_str:n {#1} _llx_dim }
-          { \l__image_llx_dim }
-        \dim_const:cn { c_@@_ \tl_to_str:n {#1} _lly_dim }
-          { \l__image_lly_dim }
-        \dim_const:cn { c_@@_ \tl_to_str:n {#1} _urx_dim }
-          { \l__image_urx_dim }
-        \dim_const:cn { c_@@_ \tl_to_str:n {#1} _ury_dim }
-          { \l__image_ury_dim }
+        \dim_const:cn { c_@@_ #1 _llx_dim } { \l__image_llx_dim }
+        \dim_const:cn { c_@@_ #1 _lly_dim } { \l__image_lly_dim }
+        \dim_const:cn { c_@@_ #1 _urx_dim } { \l__image_urx_dim }
+        \dim_const:cn { c_@@_ #1 _ury_dim } { \l__image_ury_dim }
       }
   }
 \use:x

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.