[latex3-commits] [l3svn] branch master updated: More \int_use:N => \__int_value:w changes
noreply at latex-project.org
noreply at latex-project.org
Thu Mar 24 11:59:42 CET 2016
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 6f641d1 More \int_use:N => \__int_value:w changes
6f641d1 is described below
commit 6f641d1d9e7576f25ea5cd58c42466d9584ce4e8
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Thu Mar 24 10:59:09 2016 +0000
More \int_use:N => \__int_value:w changes
There are dim/skip cases to think about still.
---
l3experimental/l3sort/l3sort.dtx | 2 +-
l3experimental/l3str/l3flag.dtx | 4 ++--
l3experimental/l3str/l3regex.dtx | 10 +++++-----
l3experimental/l3str/l3str-convert.dtx | 10 +++++-----
l3experimental/l3str/l3tl-analysis.dtx | 12 ++++++------
l3experimental/xgalley/l3galley.dtx | 14 +++++++-------
l3trial/l3fp-extras/l3fp-functions.dtx | 4 ++--
l3trial/l3tree/l3tree.dtx | 4 ++--
8 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/l3experimental/l3sort/l3sort.dtx b/l3experimental/l3sort/l3sort.dtx
index 19df115..0a89367 100644
--- a/l3experimental/l3sort/l3sort.dtx
+++ b/l3experimental/l3sort/l3sort.dtx
@@ -394,7 +394,7 @@
\if_int_compare:w #3 < \l_@@_length_int
#1 #2 { \tex_the:D \tex_toks:D #3 }
\exp_after:wN \@@_toks:NNw \exp_after:wN #1 \exp_after:wN #2
- \int_use:N \__int_eval:w #3 + \c_one \exp_after:wN ;
+ \__int_value:w \__int_eval:w #3 + \c_one \exp_after:wN ;
\fi:
}
% \end{macrocode}
diff --git a/l3experimental/l3str/l3flag.dtx b/l3experimental/l3str/l3flag.dtx
index 403ff45..8d49767 100644
--- a/l3experimental/l3str/l3flag.dtx
+++ b/l3experimental/l3str/l3flag.dtx
@@ -226,7 +226,7 @@
\fi:
\cs_set_eq:cN { @@_#2_#1: } \tex_undefined:D
\exp_after:wN \@@_clear:ww
- \int_use:N \__int_eval:w \c_one + #1 ;
+ \__int_value:w \__int_eval:w \c_one + #1 ;
#2 \q_stop
}
% \end{macrocode}
@@ -288,7 +288,7 @@
\cs_new:Npn \@@_height_loop:ww #1 ; #2 \q_stop
{
\if_cs_exist:w @@_#2_#1: \cs_end:
- \exp_after:wN \@@_height_loop:ww \int_use:N \__int_eval:w \c_one +
+ \exp_after:wN \@@_height_loop:ww \__int_value:w \__int_eval:w \c_one +
\else:
\exp_after:wN \@@_height_end:ww
\fi:
diff --git a/l3experimental/l3str/l3regex.dtx b/l3experimental/l3str/l3regex.dtx
index 7fb456d..5e1af31 100644
--- a/l3experimental/l3str/l3regex.dtx
+++ b/l3experimental/l3str/l3regex.dtx
@@ -4383,7 +4383,7 @@
{ \__int_value:w \tex_skip:D #1 }
{ \tex_the:D \tex_toks:D #1 }
\exp_after:wN \@@_match_one_active:w
- \int_use:N \__int_eval:w #1 + \c_one \exp_after:wN ;
+ \__int_value:w \__int_eval:w #1 + \c_one \exp_after:wN ;
\fi:
}
% \end{macrocode}
@@ -4542,7 +4542,7 @@
\cs_new_protected:Npn \@@_action_cost:n #1
{
\exp_args:No \@@_store_state:n
- { \int_use:N \__int_eval:w \l_@@_current_state_int + #1 }
+ { \__int_value:w \__int_eval:w \l_@@_current_state_int + #1 }
}
% \end{macrocode}
% \end{macro}
@@ -4715,8 +4715,8 @@
\cs_new:Npn \@@_query_range:nn #1#2
{
\exp_after:wN \@@_query_range_loop:ww
- \int_use:N \__int_eval:w #1 \exp_after:wN ;
- \int_use:N \__int_eval:w #2 ;
+ \__int_value:w \__int_eval:w #1 \exp_after:wN ;
+ \__int_value:w \__int_eval:w #2 ;
\__prg_break_point:
}
\cs_new:Npn \@@_query_range_loop:ww #1 ; #2 ;
@@ -4727,7 +4727,7 @@
\fi:
\tex_the:D \tex_toks:D #1 \exp_stop_f:
\exp_after:wN \@@_query_range_loop:ww
- \int_use:N \__int_eval:w #1 + \c_one ; #2 ;
+ \__int_value:w \__int_eval:w #1 + \c_one ; #2 ;
}
% \end{macrocode}
% \end{macro}
diff --git a/l3experimental/l3str/l3str-convert.dtx b/l3experimental/l3str/l3str-convert.dtx
index 33865dc..b638af9 100644
--- a/l3experimental/l3str/l3str-convert.dtx
+++ b/l3experimental/l3str/l3str-convert.dtx
@@ -615,7 +615,7 @@
{
\exp_after:wN \exp_after:wN
\exp_after:wN \use_i:nnn
- \cs:w c_@@_byte_ \int_use:N \__int_eval:w
+ \cs:w c_@@_byte_ \__int_value:w \__int_eval:w
}
\cs_new:Npn \@@_output_hexadecimal:n #1
{ \@@_output_hexadecimal:w #1 \@@_output_end: }
@@ -623,7 +623,7 @@
{
\exp_after:wN \exp_after:wN
\exp_after:wN \use_none:n
- \cs:w c_@@_byte_ \int_use:N \__int_eval:w
+ \cs:w c_@@_byte_ \__int_value:w \__int_eval:w
}
\cs_new_nopar:Npn \@@_output_end:
{ \__int_eval_end: _tl \cs_end: }
@@ -2177,7 +2177,7 @@
\fi:
\else:
\exp_after:wN \@@_decode_utf_viii_continuation:wwN
- \int_use:N \__int_eval:w `#1 - "C0 \exp_after:wN \__int_eval_end:
+ \__int_value:w \__int_eval:w `#1 - "C0 \exp_after:wN \__int_eval_end:
\fi:
\s__tl
\use_none_delimit_by_q_stop:w {"80} {"800} {"10000} {"110000} \q_stop
@@ -2192,7 +2192,7 @@
"C0 \exp_stop_f:
#3
\exp_after:wN \@@_decode_utf_viii_aux:wNnnwN
- \int_use:N \__int_eval:w
+ \__int_value:w \__int_eval:w
#1 * "40 + `#3 - "80
\exp_after:wN \__int_eval_end:
\else:
@@ -2222,7 +2222,7 @@
\@@_decode_utf_viii_overflow:w #1
\fi:
\exp_after:wN \@@_decode_utf_viii_continuation:wwN
- \int_use:N \__int_eval:w #1 - #4 \exp_after:wN \__int_eval_end:
+ \__int_value:w \__int_eval:w #1 - #4 \exp_after:wN \__int_eval_end:
\fi:
\s__tl
#2 {#4} #5
diff --git a/l3experimental/l3str/l3tl-analysis.dtx b/l3experimental/l3str/l3tl-analysis.dtx
index 0f346d6..c7921b8 100644
--- a/l3experimental/l3str/l3tl-analysis.dtx
+++ b/l3experimental/l3str/l3tl-analysis.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-%% File: l3tl-analysis.dtx Copyright (C) 2011-2012,2015 The LaTeX3 Project
+%% File: l3tl-analysis.dtx Copyright (C) 2011-2012,2015,2016 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
@@ -815,7 +815,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_use:N \exp_not:N \__int_eval:w \c_minus_one +
+ \exp_not:N \__int_value:w \exp_not:N \__int_eval:w \c_minus_one +
}
% \end{macrocode}
% \end{macro}
@@ -835,7 +835,7 @@
\cs_new:Npn \@@_b_cs_test:ww #1 ; #2 ; #3 ; #4 ;
{
\exp_after:wN \@@_b_normals:ww
- \int_use:N \__int_eval:w
+ \__int_value:w \__int_eval:w
\if_int_compare:w #1 = \c_zero
#3
\else:
@@ -843,7 +843,7 @@
\fi:
- #2
\exp_after:wN ;
- \int_use:N \__int_eval:w #4 + #1 ;
+ \__int_value:w \__int_eval:w #4 + #1 ;
}
% \end{macrocode}
% \end{macro}
@@ -878,9 +878,9 @@
\else: 2
\fi:
\if_int_odd:w \etex_gluestretch:D \tex_skip:D #1 \exp_stop_f:
- \exp_after:wN \@@_b_special_char:wN \int_use:N
+ \exp_after:wN \@@_b_special_char:wN \__int_value:w
\else:
- \exp_after:wN \@@_b_special_space:w \int_use:N
+ \exp_after:wN \@@_b_special_space:w \__int_value:w
\fi:
\__int_eval:w \c_one + #1 \exp_after:wN ;
\token_to_str:N
diff --git a/l3experimental/xgalley/l3galley.dtx b/l3experimental/xgalley/l3galley.dtx
index f872237..e7a2de2 100644
--- a/l3experimental/xgalley/l3galley.dtx
+++ b/l3experimental/xgalley/l3galley.dtx
@@ -1798,7 +1798,7 @@
\@@_parshape_set_cutouts:
\tl_set:Nx \l_@@_tmp_tl
{
- \int_use:N \tex_parshape:D
+ \__int_value:w \tex_parshape:D
\int_step_function:nnnN \c_one \c_one \tex_parshape:D
\tmp
}
@@ -1806,8 +1806,8 @@
}
\def\tmp#1{%
\c_space_tl
- \int_use:N \etex_parshapeindent:D #1 \c_space_tl \c_space_tl
- \int_use:N \etex_parshapelength:D #1 \c_space_tl
+ \__int_value:w \etex_parshapeindent:D #1 \c_space_tl \c_space_tl
+ \__int_value:w \etex_parshapelength:D #1 \c_space_tl
}
% \end{macrocode}
% Setting the margins is simple. Either they are zero, using the full measure,
@@ -2408,7 +2408,7 @@
}
}
\cs_new:Npn \@@_save_display_club_penalties:n #1
- { \int_use:N \etex_clubpenalties:D \__int_eval:w #1 \__int_eval_end: , }
+ { \__int_value:w \etex_clubpenalties:D \__int_eval:w #1 \__int_eval_end: , }
\cs_new_protected:Npn \galley_save_display_widow_penalties:N #1
{
\clist_set:Nx #1
@@ -2419,7 +2419,7 @@
}
}
\cs_new:Npn \@@_save_display_widow_penalties:n #1
- { \int_use:N \etex_displaywidowpenalties:D \__int_eval:w #1 \__int_eval_end: , }
+ { \__int_value:w \etex_displaywidowpenalties:D \__int_eval:w #1 \__int_eval_end: , }
\cs_new_protected:Npn \galley_save_widow_penalties:N #1
{
\clist_set:Nx #1
@@ -2430,14 +2430,14 @@
}
}
\cs_new:Npn \@@_save_widow_penalties:n #1
- { \int_use:N \etex_widowpenalties:D \__int_eval:w #1 \__int_eval_end: , }
+ { \__int_value:w \etex_widowpenalties:D \__int_eval:w #1 \__int_eval_end: , }
% \end{macrocode}
% This one is not an array, but is stored in a primitive, so there is
% a simple conversion. The general interline penalty is always the
% last value in the primitive array.
% \begin{macrocode}
\cs_new_protected_nopar:Npn \galley_interline_penalty:
- { \int_use:N \etex_interlinepenalties:D \etex_interlinepenalties:D \c_zero }
+ { \__int_value:w \etex_interlinepenalties:D \etex_interlinepenalties:D \c_zero }
% \end{macrocode}
% \end{macro}
% \end{macro}
diff --git a/l3trial/l3fp-extras/l3fp-functions.dtx b/l3trial/l3fp-extras/l3fp-functions.dtx
index 7cf4a05..9160a1b 100644
--- a/l3trial/l3fp-extras/l3fp-functions.dtx
+++ b/l3trial/l3fp-extras/l3fp-functions.dtx
@@ -1,6 +1,6 @@
% \iffalse
%
-%% File l3fp-functions.dtx (C) Copyright 2012-2015 The LaTeX3 Project
+%% File l3fp-functions.dtx (C) Copyright 2012-2016 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
@@ -264,7 +264,7 @@
\@@_use_i_until_s:nw
{
\exp_after:wN \@@_function_arg_o:w
- \int_use:N \__int_eval:w #1 - \c_one .
+ \__int_value:w \__int_eval:w #1 - \c_one .
}
#2
}
diff --git a/l3trial/l3tree/l3tree.dtx b/l3trial/l3tree/l3tree.dtx
index 3e6d5ac..2614505 100644
--- a/l3trial/l3tree/l3tree.dtx
+++ b/l3trial/l3tree/l3tree.dtx
@@ -1,6 +1,6 @@
% \iffalse
%
-%% File l3tree.dtx (C) Copyright 2012 The LaTeX3 Project
+%% File l3tree.dtx (C) Copyright 2012,2016 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
@@ -340,7 +340,7 @@
\fi:
\exp_not:N \__seq_item:n { \__int_value:w \tex_dimen:D #1 }
\exp_after:wN \tree_extract_loop:w
- \int_use:N \__int_eval:w #1 - \c_one ;
+ \__int_value:w \__int_eval:w #1 - \c_one ;
}
% \end{macrocode}
% \end{macro}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the latex3-commits
mailing list