[latex3-commits] [l3svn] r6446 - Fix l3str-format-new parsing of fp_to_scientific output

[noreply at latex-project.org]

Author: bruno
Date: 2016-03-25 05:43:44 +0100 (Fri, 25 Mar 2016)
New Revision: 6446

Modified:
   trunk/l3trial/l3str-format-new/l3str-format-new.dtx
Log:
Fix l3str-format-new parsing of fp_to_scientific output

Since fp_to_scientific now produces 'e' with catcode letter
rather than other, l3str-format-new should use a letter 'e'
as its delimiter rather than an other 'e'.


Modified: trunk/l3trial/l3str-format-new/l3str-format-new.dtx
===================================================================
--- trunk/l3trial/l3str-format-new/l3str-format-new.dtx	2016-03-25 04:30:31 UTC (rev 6445)
+++ trunk/l3trial/l3str-format-new/l3str-format-new.dtx	2016-03-25 04:43:44 UTC (rev 6446)
@@ -725,27 +725,21 @@
 % \begin{macro}[aux,EXP]
 %   {\@@_fp_split_auxi:Nwww, \@@_fp_split_auxii:NwwwnN}
 %    \begin{macrocode}
-\group_begin:
-  \char_set_catcode_other:N \E
-  \tex_lowercase:D
-    {
-      \cs_new:Npn \@@_fp_split:nN #1
-        {
-          \exp_last_unbraced:Nf \@@_fp_split_auxi:Nwww
-            { \fp_to_scientific:n {#1} } E 0 E \q_stop
-        }
-      \cs_new:Npn \@@_fp_split_auxi:Nwww #1#2 E #3 E #4 \q_stop
-        {
-          \token_if_eq_charcode:NNTF - #1
-            { \@@_fp_split_auxii:NwwwnN }
-            { \@@_fp_split_auxii:NwwwnN + }
-            #1 #2 . . \q_stop
-          {#3}
-        }
-      \cs_new:Npn \@@_fp_split_auxii:NwwwnN
-          #1#2 . #3 . #4 \q_stop #5#6 { #6 #1 #2 {#3} {#5} }
-    }
-\group_end:
+\cs_new:Npn \@@_fp_split:nN #1
+  {
+    \exp_last_unbraced:Nf \@@_fp_split_auxi:Nwww
+      { \fp_to_scientific:n {#1} } e 0 e \q_stop
+  }
+\cs_new:Npn \@@_fp_split_auxi:Nwww #1#2 e #3 e #4 \q_stop
+  {
+    \token_if_eq_charcode:NNTF - #1
+      { \@@_fp_split_auxii:NwwwnN }
+      { \@@_fp_split_auxii:NwwwnN + }
+      #1 #2 . . \q_stop
+    {#3}
+  }
+\cs_new:Npn \@@_fp_split_auxii:NwwwnN
+    #1#2 . #3 . #4 \q_stop #5#6 { #6 #1 #2 {#3} {#5} }
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}