[latex3-commits] [l3svn] r5887 - Replaced \tex_romannumeral:D ... \c_zero with \exp:w ... \exp_end

[noreply at latex-project.org]

Author: mittelba
Date: 2015-08-24 18:00:09 +0200 (Mon, 24 Aug 2015)
New Revision: 5887

Modified:
   trunk/l3leftovers/l3toks.dtx
   trunk/l3leftovers/tl-act.dtx
Log:
Replaced \tex_romannumeral:D ... \c_zero with \exp:w ... \exp_end
Replaced \tex_romannumeral:D ... -`0     with \exp:w ... \ex_continue_f:w
Replaced \__int_to_roman:w  where it was there only for expansion purposes

Have not tried to do all of that in the fp code (probably several \c_zero's need to be changed there but I'll thought I better leave this to somebody understanding this code by heart :-)

May have missed one or the other ... so a second sweep is advisable

Modified: trunk/l3leftovers/l3toks.dtx
===================================================================
--- trunk/l3leftovers/l3toks.dtx	2015-08-24 15:59:04 UTC (rev 5886)
+++ trunk/l3leftovers/l3toks.dtx	2015-08-24 16:00:09 UTC (rev 5887)
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-%% File: l3toks.dtx Copyright (C) 1990-2011 The LaTeX3 project
+%% File: l3toks.dtx Copyright (C) 1990-2011,2015 The LaTeX3 project
 %%
 %% It may be distributed and/or modified under the conditions of the
 %% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -152,14 +152,14 @@
 %<*!check>
 \cs_new_eq:NN       \toks_set:Nn \prg_do_nothing:
 \cs_new_protected:Npn \toks_set:NV #1#2 {
-  #1 \exp_after:wN { \__int_to_roman:w -`0 \__exp_eval_register:N #2 }
+  #1 \exp_after:wN { \exp:w \exp_continue_f:w \__exp_eval_register:N #2 }
 }
 \cs_new_protected:Npn \toks_set:Nv #1#2 {
-  #1 \exp_after:wN { \__int_to_roman:w -`0 \__exp_eval_register:c {#2} }
+  #1 \exp_after:wN { \exp:w \exp_continue_f:w \__exp_eval_register:c {#2} }
 }
 \cs_new_protected:Npn \toks_set:No #1#2 { #1 \exp_after:wN {#2} }
 \cs_new_protected:Npn \toks_set:Nf #1#2 {
-  #1 \exp_after:wN { \__int_to_roman:w -`0#2 }
+  #1 \exp_after:wN { \exp:w \exp_continue_f:w #2 }
 }
 %</!check>
 %    \end{macrocode}
@@ -414,7 +414,7 @@
 \cs_new_protected:Npn \toks_put_right:NV #1#2 {
   #1 \exp_after:wN \exp_after:wN \exp_after:wN {
      \exp_after:wN \toks_use:N \exp_after:wN #1
-     \__int_to_roman:w -`0 \__exp_eval_register:N #2
+     \exp:w \exp_continue_f:w \__exp_eval_register:N #2
   }
 }
 \cs_new_protected:Npn \toks_put_right:No #1#2 {
@@ -450,7 +450,7 @@
 %<*!check>
 \cs_new_protected:Npn \toks_put_right:Nf #1#2 {
   #1 \exp_after:wN \exp_after:wN \exp_after:wN {
-     \exp_after:wN \toks_use:N \exp_after:wN #1 \__int_to_roman:w -`0#2
+     \exp_after:wN \toks_use:N \exp_after:wN #1 \exp:w \exp_continue_f:w #2
   }
 }
 %</!check>

Modified: trunk/l3leftovers/tl-act.dtx
===================================================================
--- trunk/l3leftovers/tl-act.dtx	2015-08-24 15:59:04 UTC (rev 5886)
+++ trunk/l3leftovers/tl-act.dtx	2015-08-24 16:00:09 UTC (rev 5887)
@@ -123,7 +123,7 @@
 %    \begin{macrocode}
 \cs_new:Npn \tl_act_expand:n
   {
-    \tex_romannumeral:D
+    \exp:w
     \@@_act:NNNnn
       \tl_act_expand_normal:nN
       \tl_act_expand_group:nn
@@ -191,7 +191,7 @@
 \cs_new:Npn \tl_act_expand_unexpanded:w \tl_act_loop:w
   {
     \exp_after:wN \tl_act_expand_unexpanded_aux:n
-    \tex_romannumeral:D \tl_act_expand_filler:w
+    \exp:w \tl_act_expand_filler:w
   }
 \cs_new:Npn \tl_act_expand_unexpanded_aux:n #1
   {
@@ -201,11 +201,11 @@
 %    \end{macrocode}
 %   \meta{Fillers} are not yet expanded properly.
 %    \begin{macrocode}
-\cs_new:Npn \tl_act_expand_filler:w { -`0 }
+\cs_new:Npn \tl_act_expand_filler:w { \exp_continue_f:w }
 % \cs_new:Npn \tl_act_expand_filler:w
 %   {
 %     \exp_after:wN \tl_act_expand_filler_aux:w
-%     \tex_romannumeral:D -`0
+%     \exp:w \exp_continue_f:w
 %   }
 % \cs_new:Npn \tl_act_expand_filler_aux:w #1 \q_tl_act_stop
 %   {
@@ -213,10 +213,10 @@
 %       { \tl_act_expand_filler_aux_ii:N }
 %       {
 %         \tl_if_head_begin_group:nTF {#1}
-%           { \c_zero }
+%           { \exp_end: }
 %           {
 %             \exp_after:wN \tl_act_expand_filler:w
-%             \tex_romannumeral:D -`0
+%             \exp:w \exp_continue_f:w
 %           }
 %       }
 %     #1 \q_tl_act_stop
@@ -230,7 +230,7 @@
 %         ...
 %         \token_if_eq_catcode:NNTF #1 \c_space_token
 %           { \exp_after:wN \tl_act_expand_filler:w \use_none:n }
-%           { \c_zero }
+%           { \exp_end: }
 %       }
 %   }
 %    \end{macrocode}