summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/l3experimental/l3str/l3tl-analysis.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/l3experimental/l3str/l3tl-analysis.dtx')
-rw-r--r--Master/texmf-dist/source/latex/l3experimental/l3str/l3tl-analysis.dtx53
1 files changed, 27 insertions, 26 deletions
diff --git a/Master/texmf-dist/source/latex/l3experimental/l3str/l3tl-analysis.dtx b/Master/texmf-dist/source/latex/l3experimental/l3str/l3tl-analysis.dtx
index 340125f1313..f08009cbb24 100644
--- a/Master/texmf-dist/source/latex/l3experimental/l3str/l3tl-analysis.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/l3str/l3tl-analysis.dtx
@@ -22,7 +22,7 @@
%
%<*driver|package>
\RequirePackage{expl3}
-\GetIdInfo$Id: l3tl-analysis.dtx 6805 2016-12-28 22:15:52Z joseph $
+\GetIdInfo$Id: l3tl-analysis.dtx 6948 2017-02-18 14:50:25Z bruno $
{L3 Experimental token lists analysis}
%</driver|package>
%<*driver>
@@ -289,7 +289,7 @@
\cs_new:Npn \@@_cs_space_count:NN #1 #2
{
\exp_after:wN #1
- \__int_value:w \__int_eval:w \c_zero
+ \__int_value:w \__int_eval:w 0
\exp_after:wN \@@_cs_space_count:w
\token_to_str:N #2
\fi: \@@_cs_space_count_end:w ; ~ !
@@ -297,7 +297,7 @@
\cs_new:Npn \@@_cs_space_count:w #1 ~
{
\if_false: #1 #1 \fi:
- + \c_one
+ + 1
\@@_cs_space_count:w
}
\cs_new:Npn \@@_cs_space_count_end:w ; #1 \fi: #2 !
@@ -399,7 +399,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_setup:n #1
{
- \int_set:Nn \tex_escapechar:D { - \c_one }
+ \int_set:Nn \tex_escapechar:D { -1 }
\exp_after:wN \@@_disable_loop:N
\tl_to_str:n {#1} { ~ } { ? ~ \__prg_break: }
\__prg_break_point:
@@ -408,7 +408,7 @@
\char_set_catcode_active:N \^^@
\cs_new_protected:Npn \@@_disable_loop:N #1
{
- \tex_lccode:D \c_zero `#1 ~
+ \tex_lccode:D 0 = `#1 ~
\tex_lowercase:D { \tex_let:D ^^@ } \tex_undefined:D
\@@_disable_loop:N
}
@@ -501,18 +501,19 @@
{
\l_@@_type_int =
\if_meaning:w \l_@@_token \c_space_token
- \c_zero
+ 0
\else:
\if_catcode:w \exp_not:N \l_@@_token \c_group_begin_token
- \c_one
+ 1
\else:
\if_catcode:w \exp_not:N \l_@@_token \c_group_end_token
- - \c_one
+ - 1
\else:
- \c_two
+ 2
\fi:
\fi:
\fi:
+ \exp_stop_f:
\if_case:w \l_@@_type_int
\exp_after:wN \@@_a_space:w
\or: \exp_after:wN \@@_a_bgroup:w
@@ -593,9 +594,9 @@
\group_end:
\cs_new_protected:Npn \@@_a_group:nw #1
{
- \tex_lccode:D \c_zero = \@@_extract_charcode: \scan_stop:
+ \tex_lccode:D 0 = \@@_extract_charcode: \scan_stop:
\tex_lowercase:D { \tex_toks:D \l_@@_index_int {#1} }
- \if_int_compare:w \tex_lccode:D \c_zero = \tex_escapechar:D
+ \if_int_compare:w \tex_lccode:D 0 = \tex_escapechar:D
\int_set:Nn \tex_escapechar:D { 139 - \tex_escapechar:D }
\fi:
\tex_afterassignment:D \@@_a_group_test:w
@@ -650,14 +651,14 @@
\cs_new_protected:Npn \@@_a_store:
{
\tex_advance:D \l_@@_nesting_int \l_@@_type_int
- \if_int_compare:w \tex_lccode:D \c_zero = \c_thirty_two
- \tex_multiply:D \l_@@_type_int \c_two
+ \if_int_compare:w \tex_lccode:D 0 = `\ \exp_stop_f:
+ \tex_multiply:D \l_@@_type_int 2 \exp_stop_f:
\fi:
\tex_skip:D \l_@@_index_int
= \l_@@_normal_int sp plus \l_@@_type_int sp \scan_stop:
\int_incr:N \l_@@_index_int
\int_zero:N \l_@@_normal_int
- \if_int_compare:w \l_@@_nesting_int = - \c_one
+ \if_int_compare:w \l_@@_nesting_int = -1 \exp_stop_f:
\cs_set_eq:NN \@@_a_loop:w \scan_stop:
\fi:
}
@@ -698,9 +699,9 @@
}
\cs_new_protected:Npn \@@_a_cs:ww #1; #2;
{
- \if_int_compare:w #1 > \c_zero
+ \if_int_compare:w #1 > 0 \exp_stop_f:
\tex_skip:D \l_@@_index_int
- = \__int_eval:w \l_@@_normal_int + \c_one sp \scan_stop:
+ = \__int_eval:w \l_@@_normal_int + 1 sp \scan_stop:
\tex_advance:D \l_@@_index_int #1 \exp_stop_f:
\l_@@_normal_int #2 \exp_stop_f:
\else:
@@ -756,7 +757,7 @@
% \begin{macrocode}
\cs_new:Npn \@@_b_normals:ww #1;
{
- \if_int_compare:w #1 = \c_zero
+ \if_int_compare:w #1 = 0 \exp_stop_f:
\@@_b_special:w
\fi:
\@@_b_normal:wwN #1;
@@ -802,7 +803,7 @@
\exp_not:n { \fi: \fi: \fi: \fi: \fi: \fi: \fi: \fi: }
\exp_not:N \__int_value:w `#1 \s__tl
\exp_not:N \exp_after:wN \exp_not:N \@@_b_normals:ww
- \exp_not:N \__int_value:w \exp_not:N \__int_eval:w - \c_one +
+ \exp_not:N \__int_value:w \exp_not:N \__int_eval:w - 1 +
}
% \end{macrocode}
% \end{macro}
@@ -823,7 +824,7 @@
{
\exp_after:wN \@@_b_normals:ww
\__int_value:w \__int_eval:w
- \if_int_compare:w #1 = \c_zero
+ \if_int_compare:w #1 = 0 \exp_stop_f:
#3
\else:
\tex_skip:D \__int_eval:w #4 + #1 \__int_eval_end:
@@ -869,7 +870,7 @@
\else:
\exp_after:wN \@@_b_special_space:w \__int_value:w
\fi:
- \__int_eval:w \c_one + #1 \exp_after:wN ;
+ \__int_eval:w 1 + #1 \exp_after:wN ;
\token_to_str:N
}
\group_end:
@@ -982,10 +983,10 @@
{
\use_none:n #2
\exp_not:n { \\ > \ \ }
- \if_int_compare:w "#2 = \c_zero
+ \if_int_compare:w "#2 = 0 \exp_stop_f:
\exp_after:wN \@@_show_cs:n
\else:
- \if_int_compare:w "#2 = \c_thirteen
+ \if_int_compare:w "#2 = 13 \exp_stop_f:
\exp_after:wN \exp_after:wN
\exp_after:wN \@@_show_active:n
\else:
@@ -1028,7 +1029,7 @@
\token_if_toks_register:NTF #1 \__prg_break: { }
\use_none:nnn
\__prg_break_point:
- \use:n { = \tex_the:D #1 }
+ \use:n { \exp_after:wN = \tex_the:D #1 }
}
}
% \end{macrocode}
@@ -1058,11 +1059,11 @@
{
\int_compare:nNnTF
{ \str_count:n { #1 ~ ( #4 #2 #3 ) } }
- > { \l_iow_line_count_int - \c_three }
+ > { \l_iow_line_count_int - 3 }
{
- \str_range:nnn { #1 ~ ( #4 #2 #3 ) } \c_one
+ \str_range:nnn { #1 ~ ( #4 #2 #3 ) } { 1 }
{
- \l_iow_line_count_int - \c_three
+ \l_iow_line_count_int - 3
- \str_count:N \c_@@_show_etc_str
}
\c_@@_show_etc_str