[latex3-commits] [l3svn] branch master updated: Skip rescanning empty tl (fixes #266)

[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.

The following commit(s) were added to refs/heads/master by this push:
       new  ac3b8c4   Skip rescanning empty tl (fixes #266)
ac3b8c4 is described below

commit ac3b8c4518b5bceb4721f9521bf78ce5e5b781e6
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Tue Sep 8 17:31:44 2015 +0100

    Skip rescanning empty tl (fixes #266)
---
 l3kernel/l3tl.dtx |   23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/l3kernel/l3tl.dtx b/l3kernel/l3tl.dtx
index 1bdf293..763b214 100644
--- a/l3kernel/l3tl.dtx
+++ b/l3kernel/l3tl.dtx
@@ -1526,16 +1526,19 @@
   { \@@_set_rescan:NNnn \prg_do_nothing: \use:n }
 \cs_new_protected:Npn \@@_set_rescan:NNnn #1#2#3#4
   {
-    \group_begin:
-      \exp_args:No \etex_everyeof:D { \c_@@_rescan_marker_tl \exp_not:N }
-      \int_compare:nNnT \tex_endlinechar:D = { 32 }
-        { \tex_endlinechar:D \c_minus_one }
-      \tex_newlinechar:D \tex_endlinechar:D
-      #3 \scan_stop:
-      \exp_args:No \@@_set_rescan:n { \tl_to_str:n {#4} }
-      \exp_args:NNNo
-    \group_end:
-    #1 #2 \l_@@_internal_a_tl
+    \tl_if_empty:nF {#4}
+      {
+        \group_begin:
+          \exp_args:No \etex_everyeof:D { \c_@@_rescan_marker_tl \exp_not:N }
+          \int_compare:nNnT \tex_endlinechar:D = { 32 }
+            { \tex_endlinechar:D \c_minus_one }
+          \tex_newlinechar:D \tex_endlinechar:D
+          #3 \scan_stop:
+          \exp_args:No \@@_set_rescan:n { \tl_to_str:n {#4} }
+          \exp_args:NNNo
+        \group_end:
+        #1 #2 \l_@@_internal_a_tl
+    }
   }
 \cs_new_protected:Npn \@@_set_rescan_multi:n #1
   {

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