[latex3-commits] [l3svn] r6963 - Remove use of named integers everywhere
noreply at latex-project.org
noreply at latex-project.org
Mon Feb 20 03:29:02 CET 2017
Author: bruno
Date: 2017-02-20 03:29:02 +0100 (Mon, 20 Feb 2017)
New Revision: 6963
Modified:
trunk/l3experimental/xgalley/l3galley.dtx
trunk/l3experimental/xgalley/xgalley.dtx
trunk/l3leftovers/l3calc.dtx
trunk/l3leftovers/l3chk.dtx
trunk/l3leftovers/l3xref.dtx
trunk/l3trial/l3auxdata/l3auxdata.dtx
trunk/l3trial/l3benchmark/l3benchmark.dtx
trunk/l3trial/l3bigint/l3bigint.dtx
trunk/l3trial/l3check/l3check.dtx
trunk/l3trial/l3fp-extras/l3fp-extras.dtx
trunk/l3trial/l3fp-extras/l3fp-functions.dtx
trunk/l3trial/l3fp-extras/l3fp-types.dtx
trunk/l3trial/l3kernel-extras/l3kernel-extras.dtx
trunk/l3trial/l3ldb/l3ldb.dtx
trunk/l3trial/l3ldb/l3ldbparse.dtx
trunk/l3trial/l3str-format-new/l3str-format-new.dtx
trunk/l3trial/l3tree/l3tree.dtx
trunk/l3trial/xfont/l3font.dtx
trunk/l3trial/xfont/xfss.dtx
Log:
Remove use of named integers everywhere
Modified: trunk/l3experimental/xgalley/l3galley.dtx
===================================================================
--- trunk/l3experimental/xgalley/l3galley.dtx 2017-02-19 22:58:35 UTC (rev 6962)
+++ trunk/l3experimental/xgalley/l3galley.dtx 2017-02-20 02:29:02 UTC (rev 6963)
@@ -1,7 +1,7 @@
% \iffalse
%
%% File: l3galley.dtx Copyright (C) 1999-2001, 2004-2009 Frank Mittelbach
-%% (C) 2010-2016 The LaTeX3 Project
+%% (C) 2010-2017 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
@@ -964,6 +964,13 @@
% \end{macrocode}
% \end{variable}
%
+% \begin{variable}{\c_@@_max_penalty_int}
+% \enquote{Infinite} penalty.
+% \begin{macrocode}
+\int_const:Nn \c_@@_max_penalty_int { 10000 }
+% \end{macrocode}
+% \end{variable}
+%
% \subsection{Independent galley levels}
%
% As well as the main vertical list, independent galleys are required
@@ -1227,7 +1234,7 @@
% \cs{tex_parskip:D}, which will leave an unwanted break-point here
% otherwise.
% \begin{macrocode}
- \tex_penalty:D \c_ten_thousand
+ \tex_penalty:D \c_@@_max_penalty_int
}
% \end{macrocode}
% Once a cutout has been set, properly tidying up needs some work. The
@@ -1577,7 +1584,7 @@
\tl_if_empty:NTF \g_@@_interpar_penalty_user_tl
{
\bool_if:NTF \g_galley_no_break_next_bool
- { \tex_penalty:D \c_ten_thousand }
+ { \tex_penalty:D \c_@@_max_penalty_int }
{ \tex_penalty:D \l_galley_interpar_penalty_int }
}
{
@@ -1832,10 +1839,10 @@
\bool_lazy_and:nnTF
{ \dim_compare_p:nNn \l_galley_total_left_margin_dim = \c_zero_dim }
{ \dim_compare_p:nNn \l_galley_total_right_margin_dim = \c_zero_dim }
- { \tex_parshape:D \c_zero }
+ { \tex_parshape:D 0 \exp_stop_f: }
{
\tex_parshape:D
- \c_one
+ 1 \exp_stop_f:
\l_galley_total_left_margin_dim
\l_galley_text_width_dim
}
@@ -1899,7 +1906,7 @@
\seq_count:N \l_@@_cutout_left_indent_seq
- \seq_count:N \l_@@_cutout_right_indent_seq
}
- \int_compare:nNnTF \l_@@_tmp_int > \c_zero
+ \int_compare:nNnTF \l_@@_tmp_int > 0
{ \@@_parshape_set_cutouts:N \l_@@_cutout_right_indent_seq }
{ \@@_parshape_set_cutouts:N \l_@@_cutout_left_indent_seq }
\@@_parshape_set_indents:NN
@@ -1933,9 +1940,9 @@
{
\seq_count:N \g_@@_tmpa_seq
- \seq_count:N \g_@@_tmpb_seq
- + \c_one
+ + 1
}
- \int_compare:nNnT \l_@@_tmp_int > \c_zero
+ \int_compare:nNnT \l_@@_tmp_int > 0
{
\prg_replicate:nn
{ \l_@@_tmp_int }
@@ -2092,10 +2099,10 @@
{
\bool_if:NTF #1
{ % TODO Hook for font changes required!
- \dim_compare:nNnTF { \tex_fontdimen:D \c_three \tex_font:D }
+ \dim_compare:nNnTF { \tex_fontdimen:D 3 \tex_font:D }
= \c_zero_dim
{ \tex_spaceskip:D \c_zero_dim }
- { \tex_spaceskip:D \tex_fontdimen:D \c_two \tex_font:D }
+ { \tex_spaceskip:D \tex_fontdimen:D 2 \tex_font:D }
}
{ \tex_spaceskip:D \c_zero_dim }
}
@@ -2162,12 +2169,12 @@
{
\tex_unskip:D
\bool_if:NF #1
- { \tex_vadjust:D { \tex_penalty:D \c_ten_thousand } }
+ { \tex_vadjust:D { \tex_penalty:D \c_@@_max_penalty_int } }
\dim_compare:nNnF {#2} = \c_zero_dim
{ \tex_vadjust:D { \skip_vertical:n {#2} } }
- \tex_penalty:D \c_ten_thousand
+ \tex_penalty:D \c_@@_max_penalty_int
\tex_hfil:D
- \tex_penalty:D -\c_ten_thousand
+ \tex_penalty:D - \c_@@_max_penalty_int
}
}
% \end{macrocode}
@@ -2226,17 +2233,17 @@
\cs_new_protected:Npn \galley_display_widow_penalties_set:n #1
{
\etex_displaywidowpenalties:D
- \__int_eval:w \clist_count:n {#1} + \c_one \__int_eval_end:
+ \__int_eval:w \clist_count:n {#1} + 1 \__int_eval_end:
\clist_map_function:nN {#1} \@@_set_aux:n
- \c_zero
+ 0 \exp_stop_f:
}
\cs_generate_variant:Nn \galley_display_widow_penalties_set:n { V , v }
\cs_new_protected:Npn \galley_widow_penalties_set:n #1
{
\etex_widowpenalties:D
- \__int_eval:w \clist_count:n {#1} + \c_one \__int_eval_end:
+ \__int_eval:w \clist_count:n {#1} + 1 \__int_eval_end:
\clist_map_function:nN {#1} \@@_set_aux:n
- \c_zero
+ 0 \exp_stop_f:
}
\cs_generate_variant:Nn \galley_widow_penalties_set:n { V , v }
\cs_new:Npn \@@_set_aux:n #1 { \int_eval:n {#1} ~ }
@@ -2285,9 +2292,9 @@
\cs_new_protected:Npn \galley_display_club_penalties_set:n #1
{
\etex_clubpenalties:D
- \__int_eval:w \clist_count:n {#1} + \c_one \__int_eval_end:
+ \__int_eval:w \clist_count:n {#1} + 1 \__int_eval_end:
\clist_map_function:nN {#1} \@@_set_aux:n
- \c_zero
+ 0 \exp_stop_f:
\@@_calc_interline_penalties:
}
\cs_generate_variant:Nn \galley_display_club_penalties_set:n { V , v }
@@ -2310,9 +2317,9 @@
% \begin{macrocode}
\cs_new_protected:Npn \galley_interline_penalty_set:n #1
{
- \int_compare:nNnTF { \etex_interlinepenalties:D \c_zero } = \c_zero
+ \int_compare:nNnTF { \etex_interlinepenalties:D 0 } = 0
{
- \etex_interlinepenalties:D \c_one \__int_eval:w #1 \__int_eval_end:
+ \etex_interlinepenalties:D 1 = \__int_eval:w #1 \__int_eval_end:
\@@_calc_interline_penalties:
}
{
@@ -2320,7 +2327,7 @@
{
\__int_eval:w
\etex_interlinepenalties:D ##1
- - \etex_interlinepenalties:D \etex_interlinepenalties:D \c_zero
+ - \etex_interlinepenalties:D \etex_interlinepenalties:D 0
+ #1
\__int_eval_end:
}
@@ -2331,11 +2338,11 @@
\cs_new_protected:Npn \@@_set_interline_penalty:nn #1#2
{
\etex_interlinepenalties:D
- \etex_interlinepenalties:D \c_zero
- \int_step_function:nnnN \c_one \c_one {#1}
+ \etex_interlinepenalties:D 0 \exp_stop_f:
+ \int_step_function:nnnN { 1 } { 1 } {#1}
\@@_set_interline_penalty_auxi:n
- \int_step_function:nnnN { #1 + \c_one } \c_one
- { \etex_interlinepenalties:D \c_zero - \c_one }
+ \int_step_function:nnnN { #1 + 1 } { 1 }
+ { \etex_interlinepenalties:D 0 - 1 }
\@@_set_interline_penalty_auxii:n
\__int_eval:w #2 \__int_eval_end:
}
@@ -2366,17 +2373,11 @@
\exp_args:Nff \@@_calc_interline_penalties:nn
{
\int_max:nn
+ { \clist_count:N \l_galley_club_penalties_clist + 1 }
{
- \clist_count:N \l_galley_club_penalties_clist
- + \c_one
- }
- {
\int_max:nn
- {
- \clist_count:N \l_galley_line_penalties_clist
- + \c_one
- }
- { \etex_clubpenalties:D \c_zero }
+ { \clist_count:N \l_galley_line_penalties_clist + 1 }
+ { \etex_clubpenalties:D 0 }
}
}
{ \clist_count:N \l_galley_line_penalties_clist }
@@ -2390,11 +2391,11 @@
\cs_new_protected:Npn \@@_calc_interline_penalties:nn #1#2
{
\etex_interlinepenalties:D #1 ~
- \int_step_function:nnnN \c_one \c_one {#2}
+ \int_step_function:nnnN { 1 } { 1 } {#2}
\@@_calc_interline_penalties_auxi:n
- \int_step_function:nnnN { #2 + \c_one } \c_one { #1 - \c_one }
+ \int_step_function:nnnN { #2 + 1 } { 1 } { #1 - 1 }
\@@_calc_interline_penalties_auxii:n
- \etex_interlinepenalties:D \etex_interlinepenalties:D \c_zero
+ \etex_interlinepenalties:D \etex_interlinepenalties:D 0 \exp_stop_f:
}
\cs_new:Npn \@@_calc_interline_penalties_auxi:n #1
{
@@ -2407,7 +2408,7 @@
\cs_new:Npn \@@_calc_interline_penalties_auxii:n #1
{
\__int_eval:w
- \etex_interlinepenalties:D \etex_interlinepenalties:D \c_zero
+ \etex_interlinepenalties:D \etex_interlinepenalties:D 0 \exp_stop_f:
+ 0 \clist_item:Nn \l_galley_club_penalties_clist {#1}
- \etex_clubpenalties:D #1 ~
\__int_eval_end:
@@ -2447,8 +2448,8 @@
{
\clist_set:Nx #1
{
- \int_step_function:nnnN \c_one \c_one
- { \etex_clubpenalties:D \c_zero - \c_one }
+ \int_step_function:nnnN { 1 } { 1 }
+ { \etex_clubpenalties:D 0 - 1 }
\@@_save_display_club_penalties:n
}
}
@@ -2458,8 +2459,8 @@
{
\clist_set:Nx #1
{
- \int_step_function:nnnN \c_one \c_one
- { \etex_displaywidowpenalties:D \c_zero - \c_one }
+ \int_step_function:nnnN { 1 } { 1 }
+ { \etex_displaywidowpenalties:D 0 - 1 }
\@@_save_display_widow_penalties:n
}
}
@@ -2472,8 +2473,8 @@
{
\clist_set:Nx #1
{
- \int_step_function:nnnN \c_one \c_one
- { \etex_widowpenalties:D \c_zero - \c_one }
+ \int_step_function:nnnN { 1 } { 1 }
+ { \etex_widowpenalties:D 0 - 1 }
\@@_save_widow_penalties:n
}
}
@@ -2485,7 +2486,7 @@
% last value in the primitive array.
% \begin{macrocode}
\cs_new_protected:Npn \galley_interline_penalty:
- { \__int_value:w \etex_interlinepenalties:D \etex_interlinepenalties:D \c_zero }
+ { \__int_value:w \etex_interlinepenalties:D \etex_interlinepenalties:D 0 \exp_stop_f: }
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -2513,7 +2514,7 @@
{
\mode_if_vertical:T
{
- \int_compare:nNnT \@dbltopnum = { - \c_one }
+ \int_compare:nNnT \@dbltopnum = { -1 }
{
\dim_compare:nNnT \tex_pagetotal:D < \topskip
{ \tex_hbox:D { } }
@@ -2633,7 +2634,7 @@
\leavevmode
\setbox \@tempboxa = \hbox { {#1} }
\galley_parshape_set_single:nnnN
- \c_one
+ { 1 }
{ \box_wd:N \@tempboxa }
\c_zero_dim
\c_false_bool
Modified: trunk/l3experimental/xgalley/xgalley.dtx
===================================================================
--- trunk/l3experimental/xgalley/xgalley.dtx 2017-02-19 22:58:35 UTC (rev 6962)
+++ trunk/l3experimental/xgalley/xgalley.dtx 2017-02-20 02:29:02 UTC (rev 6963)
@@ -1,7 +1,7 @@
% \iffalse
%
%% File: xgalley.dtx Copyright (C) 1999-2001, 2004-2009 Frank Mittelbach
-%% (C) 2010-2012,2014,2106 The LaTeX3 Project
+%% (C) 2010-2012,2014,2016-2017 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
@@ -892,14 +892,14 @@
\bool_if:NTF \l_@@_parshape_on_left_bool
{
\galley_parshape_set_single:nVVN
- \c_zero
+ { 0 }
\l_@@_tmpa_clist
\l_@@_tmpb_clist
\c_true_bool
}
{
\galley_parshape_set_single:nVVN
- \c_zero
+ { 0 }
\l_@@_tmpb_clist
\l_@@_tmpa_clist
\c_true_bool
@@ -1047,7 +1047,7 @@
\tl_clear:N \l_@@_justification_other_tl
\galley_interword_spacing_set:N \l_galley_fixed_spacing_bool
\bool_if:NTF \l_galley_par_stretch_last_bool
- { \int_set_eq:NN \l_galley_last_line_fit_int \c_one_thousand }
+ { \int_set:Nn \l_galley_last_line_fit_int { 1000 } }
{ \int_zero:N \l_galley_last_line_fit_int }
\skip_set:Nn \@rightskip { \l_galley_line_right_skip }
}
@@ -1095,7 +1095,7 @@
\AssignTemplateKeys
\galley_interword_spacing_set:N \l_galley_fixed_spacing_bool
\bool_if:NTF \l_galley_par_stretch_last_bool
- { \int_set_eq:NN \l_galley_last_line_fit_int \c_one_thousand }
+ { \int_set:Nn \l_galley_last_line_fit_int { 1000 } }
{ \int_zero:N \l_galley_last_line_fit_int }
\skip_set:Nn \@rightskip { \l_galley_line_right_skip }
}
Modified: trunk/l3leftovers/l3calc.dtx
===================================================================
--- trunk/l3leftovers/l3calc.dtx 2017-02-19 22:58:35 UTC (rev 6962)
+++ trunk/l3leftovers/l3calc.dtx 2017-02-20 02:29:02 UTC (rev 6963)
@@ -289,6 +289,14 @@
%<*initex|package>
% \end{macrocode}
%
+% \begin{macro}{\c__calc_int_type_int, \c__calc_dim_type_int, \c__calc_skip_type_int, \c__calc_muskip_type_int}
+% \begin{macrocode}
+\int_const:Nn \c__calc_int_type_int { 0 }
+\int_const:Nn \c__calc_dim_type_int { 1 }
+\int_const:Nn \c__calc_skip_type_int { 2 }
+\int_const:Nn \c__calc_muskip_type_int { 3 }
+% \end{macrocode}
+% \end{macro}
%
% \begin{macro}{\l_calc_expression_tl}
% \begin{macro}{\g_calc_A_register}
@@ -400,22 +408,22 @@
% types. First integer registers.
% \begin{macrocode}
\cs_new_nopar:Npn\calc_int_set:Nn{
- \calc_assign_generic:NNNNnn\c_zero\g_calc_A_int\l_calc_B_int\int_set:Nn
+ \calc_assign_generic:NNNNnn\c__calc_int_type_int\g_calc_A_int\l_calc_B_int\int_set:Nn
}
\cs_new_nopar:Npn\calc_int_gset:Nn{
- \calc_assign_generic:NNNNnn\c_zero\g_calc_A_int\l_calc_B_int\int_gset:Nn
+ \calc_assign_generic:NNNNnn\c__calc_int_type_int\g_calc_A_int\l_calc_B_int\int_gset:Nn
}
\cs_new_nopar:Npn\calc_int_add:Nn{
- \calc_assign_generic:NNNNnn\c_zero\g_calc_A_int\l_calc_B_int\int_add:Nn
+ \calc_assign_generic:NNNNnn\c__calc_int_type_int\g_calc_A_int\l_calc_B_int\int_add:Nn
}
\cs_new_nopar:Npn\calc_int_gadd:Nn{
- \calc_assign_generic:NNNNnn\c_zero\g_calc_A_int\l_calc_B_int\int_gadd:Nn
+ \calc_assign_generic:NNNNnn\c__calc_int_type_int\g_calc_A_int\l_calc_B_int\int_gadd:Nn
}
\cs_new_nopar:Npn\calc_int_sub:Nn{
- \calc_assign_generic:NNNNnn\c_zero\g_calc_A_int\l_calc_B_int\int_sub:Nn
+ \calc_assign_generic:NNNNnn\c__calc_int_type_int\g_calc_A_int\l_calc_B_int\int_sub:Nn
}
\cs_new_nopar:Npn\calc_int_gsub:Nn{
- \calc_assign_generic:NNNNnn\c_zero\g_calc_A_int\l_calc_B_int\int_gsub:Nn
+ \calc_assign_generic:NNNNnn\c__calc_int_type_int\g_calc_A_int\l_calc_B_int\int_gsub:Nn
}
% \end{macrocode}
% \end{macro}
@@ -434,22 +442,22 @@
% Dimens.
% \begin{macrocode}
\cs_new_nopar:Npn\calc_dim_set:Nn{
- \calc_assign_generic:NNNNnn\c_one\g_calc_A_dim\l_calc_B_dim\dim_set:Nn
+ \calc_assign_generic:NNNNnn\c__calc_dim_type_int\g_calc_A_dim\l_calc_B_dim\dim_set:Nn
}
\cs_new_nopar:Npn\calc_dim_gset:Nn{
- \calc_assign_generic:NNNNnn\c_one\g_calc_A_dim\l_calc_B_dim\dim_gset:Nn
+ \calc_assign_generic:NNNNnn\c__calc_dim_type_int\g_calc_A_dim\l_calc_B_dim\dim_gset:Nn
}
\cs_new_nopar:Npn\calc_dim_add:Nn{
- \calc_assign_generic:NNNNnn\c_one\g_calc_A_dim\l_calc_B_dim\dim_add:Nn
+ \calc_assign_generic:NNNNnn\c__calc_dim_type_int\g_calc_A_dim\l_calc_B_dim\dim_add:Nn
}
\cs_new_nopar:Npn\calc_dim_gadd:Nn{
- \calc_assign_generic:NNNNnn\c_one\g_calc_A_dim\l_calc_B_dim\dim_gadd:Nn
+ \calc_assign_generic:NNNNnn\c__calc_dim_type_int\g_calc_A_dim\l_calc_B_dim\dim_gadd:Nn
}
\cs_new_nopar:Npn\calc_dim_sub:Nn{
- \calc_assign_generic:NNNNnn\c_one\g_calc_A_int\l_calc_B_int\dim_sub:Nn
+ \calc_assign_generic:NNNNnn\c__calc_dim_type_int\g_calc_A_int\l_calc_B_int\dim_sub:Nn
}
\cs_new_nopar:Npn\calc_dim_gsub:Nn{
- \calc_assign_generic:NNNNnn\c_one\g_calc_A_int\l_calc_B_int\dim_gsub:Nn
+ \calc_assign_generic:NNNNnn\c__calc_dim_type_int\g_calc_A_int\l_calc_B_int\dim_gsub:Nn
}
% \end{macrocode}
% \end{macro}
@@ -468,22 +476,22 @@
% Skips.
% \begin{macrocode}
\cs_new_nopar:Npn\calc_skip_set:Nn{
- \calc_assign_generic:NNNNnn\c_two\g_calc_A_skip\l_calc_B_skip\skip_set:Nn
+ \calc_assign_generic:NNNNnn\c__calc_skip_type_int\g_calc_A_skip\l_calc_B_skip\skip_set:Nn
}
\cs_new_nopar:Npn\calc_skip_gset:Nn{
- \calc_assign_generic:NNNNnn\c_two\g_calc_A_skip\l_calc_B_skip\skip_gset:Nn
+ \calc_assign_generic:NNNNnn\c__calc_skip_type_int\g_calc_A_skip\l_calc_B_skip\skip_gset:Nn
}
\cs_new_nopar:Npn\calc_skip_add:Nn{
- \calc_assign_generic:NNNNnn\c_two\g_calc_A_skip\l_calc_B_skip\skip_add:Nn
+ \calc_assign_generic:NNNNnn\c__calc_skip_type_int\g_calc_A_skip\l_calc_B_skip\skip_add:Nn
}
\cs_new_nopar:Npn\calc_skip_gadd:Nn{
- \calc_assign_generic:NNNNnn\c_two\g_calc_A_skip\l_calc_B_skip\skip_gadd:Nn
+ \calc_assign_generic:NNNNnn\c__calc_skip_type_int\g_calc_A_skip\l_calc_B_skip\skip_gadd:Nn
}
\cs_new_nopar:Npn\calc_skip_sub:Nn{
- \calc_assign_generic:NNNNnn\c_two\g_calc_A_skip\l_calc_B_skip\skip_sub:Nn
+ \calc_assign_generic:NNNNnn\c__calc_skip_type_int\g_calc_A_skip\l_calc_B_skip\skip_sub:Nn
}
\cs_new_nopar:Npn\calc_skip_gsub:Nn{
- \calc_assign_generic:NNNNnn\c_two\g_calc_A_skip\l_calc_B_skip\skip_gsub:Nn
+ \calc_assign_generic:NNNNnn\c__calc_skip_type_int\g_calc_A_skip\l_calc_B_skip\skip_gsub:Nn
}
% \end{macrocode}
% \end{macro}
@@ -502,27 +510,27 @@
% Muskips.
% \begin{macrocode}
\cs_new_nopar:Npn\calc_muskip_set:Nn{
- \calc_assign_generic:NNNNnn\c_three\g_calc_A_muskip\l_calc_B_muskip
+ \calc_assign_generic:NNNNnn\c__calc_muskip_type_int\g_calc_A_muskip\l_calc_B_muskip
\muskip_set:Nn
}
\cs_new_nopar:Npn\calc_muskip_gset:Nn{
- \calc_assign_generic:NNNNnn\c_three\g_calc_A_muskip\l_calc_B_muskip
+ \calc_assign_generic:NNNNnn\c__calc_muskip_type_int\g_calc_A_muskip\l_calc_B_muskip
\muskip_gset:Nn
}
\cs_new_nopar:Npn\calc_muskip_add:Nn{
- \calc_assign_generic:NNNNnn\c_three\g_calc_A_muskip\l_calc_B_muskip
+ \calc_assign_generic:NNNNnn\c__calc_muskip_type_int\g_calc_A_muskip\l_calc_B_muskip
\muskip_add:Nn
}
\cs_new_nopar:Npn\calc_muskip_gadd:Nn{
- \calc_assign_generic:NNNNnn\c_three\g_calc_A_muskip\l_calc_B_muskip
+ \calc_assign_generic:NNNNnn\c__calc_muskip_type_int\g_calc_A_muskip\l_calc_B_muskip
\muskip_gadd:Nn
}
\cs_new_nopar:Npn\calc_muskip_sub:Nn{
- \calc_assign_generic:NNNNnn\c_three\g_calc_A_muskip\l_calc_B_muskip
+ \calc_assign_generic:NNNNnn\c__calc_muskip_type_int\g_calc_A_muskip\l_calc_B_muskip
\muskip_add:Nn
}
\cs_new_nopar:Npn\calc_muskip_gsub:Nn{
- \calc_assign_generic:NNNNnn\c_three\g_calc_A_muskip\l_calc_B_muskip
+ \calc_assign_generic:NNNNnn\c__calc_muskip_type_int\g_calc_A_muskip\l_calc_B_muskip
\muskip_gadd:Nn
}
% \end{macrocode}
@@ -795,13 +803,13 @@
%
% \begin{macro}{\calc_ratio_multiply:nn}
% \begin{macro}{\calc_ratio_divide:nn}
-% Evaluate a ratio. If we were already evaluation a \meta{muskip}
+% Evaluate a ratio. If we were already evaluating a \meta{muskip}
% register, the ratio is probably also done with this type and we'll
% have to convert them to regular points.
% \begin{macrocode}
\cs_set_protected:Npn\calc_ratio_multiply:nn#1#2{
\group_end:\group_begin:
- \if_int_compare:w\l_calc_current_type_int < \c_three
+ \if_int_compare:w\l_calc_current_type_int < \c__calc_muskip_type_int
\calc_dim_set:Nn\l_calc_B_int{#1}
\calc_dim_set:Nn\l_calc_C_int{#2}
\else:
Modified: trunk/l3leftovers/l3chk.dtx
===================================================================
--- trunk/l3leftovers/l3chk.dtx 2017-02-19 22:58:35 UTC (rev 6962)
+++ trunk/l3leftovers/l3chk.dtx 2017-02-20 02:29:02 UTC (rev 6963)
@@ -306,17 +306,17 @@
% We do the settings by hand to avoid uninteresting lines in the
% log file as much as possible.
% \begin{macrocode}
- \tex_global:D\g_trace_commands_status\c_two
- \tex_global:D\g_trace_statistics_status\c_two
- \tex_global:D\g_trace_pages_status\c_one
- \tex_global:D\g_trace_output_status\c_one
- \tex_global:D\g_trace_chars_status\c_one
- \tex_global:D\g_trace_macros_status\c_two
- \tex_global:D\g_trace_paragraphs_status\c_one
- \tex_global:D\g_trace_restores_status\c_one
- \tex_global:D\g_trace_box_breadth_int\c_ten_thousand
- \tex_global:D\g_trace_box_depth_int\c_ten_thousand
- \tex_global:D\g_trace_online_status\c_one
+ \tex_global:D\g_trace_commands_status 2 ~
+ \tex_global:D\g_trace_statistics_status 2 ~
+ \tex_global:D\g_trace_pages_status 1 ~
+ \tex_global:D\g_trace_output_status 1 ~
+ \tex_global:D\g_trace_chars_status 1 ~
+ \tex_global:D\g_trace_macros_status 2 ~
+ \tex_global:D\g_trace_paragraphs_status 1 ~
+ \tex_global:D\g_trace_restores_status 1 ~
+ \tex_global:D\g_trace_box_breadth_int 10000 ~
+ \tex_global:D\g_trace_box_depth_int 10000 ~
+ \tex_global:D\g_trace_online_status 1 ~
\tex_errorstopmode:D}
%
% Use LaTeX2e definition for now.
@@ -337,17 +337,17 @@
% rubbish on the terminal. Of course, in the log file all
% assignments are shown.
% \begin{macrocode}
- \tex_global:D\g_trace_online_status\c_zero
- \tex_global:D\g_trace_commands_status\c_zero
- \tex_global:D\g_trace_statistics_status\c_zero
- \tex_global:D\g_trace_pages_status\c_zero
- \tex_global:D\g_trace_output_status\c_zero
- \tex_global:D\g_trace_chars_status\c_zero
- \tex_global:D\g_trace_macros_status\c_zero
- \tex_global:D\g_trace_paragraphs_status\c_zero
- \tex_global:D\g_trace_restores_status\c_zero
- \tex_global:D\g_trace_box_breadth_int\c_zero
- \tex_global:D\g_trace_box_depth_int\c_zero
+ \tex_global:D\g_trace_online_status 0 ~
+ \tex_global:D\g_trace_commands_status 0 ~
+ \tex_global:D\g_trace_statistics_status 0 ~
+ \tex_global:D\g_trace_pages_status 0 ~
+ \tex_global:D\g_trace_output_status 0 ~
+ \tex_global:D\g_trace_chars_status 0 ~
+ \tex_global:D\g_trace_macros_status 0 ~
+ \tex_global:D\g_trace_paragraphs_status 0 ~
+ \tex_global:D\g_trace_restores_status 0 ~
+ \tex_global:D\g_trace_box_breadth_int 0 ~
+ \tex_global:D\g_trace_box_depth_int 0 ~
}
% \end{macrocode}
% \end{macro}
Modified: trunk/l3leftovers/l3xref.dtx
===================================================================
--- trunk/l3leftovers/l3xref.dtx 2017-02-19 22:58:35 UTC (rev 6962)
+++ trunk/l3leftovers/l3xref.dtx 2017-02-20 02:29:02 UTC (rev 6963)
@@ -273,7 +273,7 @@
% \begin{macrocode}
\cs_new_protected_nopar:Npn \xref_define_label:nn {
\group_begin:
- \char_set_catcode:nn {`\ }\c_ten
+ \char_set_catcode:nn {`\ } { 10 }
\xref_define_label_aux:nn
}
% \end{macrocode}
Modified: trunk/l3trial/l3auxdata/l3auxdata.dtx
===================================================================
--- trunk/l3trial/l3auxdata/l3auxdata.dtx 2017-02-19 22:58:35 UTC (rev 6962)
+++ trunk/l3trial/l3auxdata/l3auxdata.dtx 2017-02-20 02:29:02 UTC (rev 6963)
@@ -6,7 +6,7 @@
%<*ins>
\iffalse meta-comment
-File l3auxdata.ins Copyright (C) 2014 The LaTeX3 Project
+File l3auxdata.ins Copyright (C) 2014,2017 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
@@ -709,7 +709,7 @@
% \begin{macrocode}
\cs_new:Npn \@@_iow_count_avail:
{
- \int_eval:n { \c_sixteen - \count17 } % 2e only!!
+ \int_eval:n { 16 - \count17 } % 2e only!!
}
% \end{macrocode}
% \end{macro}
@@ -721,7 +721,7 @@
\int_eval:n
{ 0 \prop_map_inline:NN #1 \@@_prop_count:nn }
}
-\cs_new:Nn \@@_prop_count:nn { + \c_one }
+\cs_new:Nn \@@_prop_count:nn { + 1 }
% \end{macrocode}
% \end{macro}
%
Modified: trunk/l3trial/l3benchmark/l3benchmark.dtx
===================================================================
--- trunk/l3trial/l3benchmark/l3benchmark.dtx 2017-02-19 22:58:35 UTC (rev 6962)
+++ trunk/l3trial/l3benchmark/l3benchmark.dtx 2017-02-20 02:29:02 UTC (rev 6963)
@@ -1,6 +1,6 @@
% \iffalse
%
-%% File l3benchmark.dtx Copyright (C) 2011,2012,2014,2016 The LaTeX3 Project
+%% File l3benchmark.dtx Copyright (C) 2011,2012,2014,2016,2017 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
@@ -155,7 +155,7 @@
{
\cs_if_exist:NTF \shellescape
{
- \int_compare:nNnF \shellescape = \c_one
+ \int_compare:nNnF \shellescape = 1
{ \bool_set_true:N \l_benchmark_time_fail_bool }
}
{ \bool_set_true:N \l_benchmark_time_fail_bool }
@@ -185,7 +185,7 @@
\cs_new_protected:Npn \benchmark_display:n #1
{ \iow_term:x { \tl_to_str:n {#1} ~ seconds } }
\fp_new:N \l_benchmark_duration_fp
- \fp_set_eq:NN \l_benchmark_duration_fp \c_one_fp
+ \fp_set:Nn \l_benchmark_duration_fp { 1 }
\msg_critical:nn { benchmark } { no-time }
}
% \end{macrocode}
@@ -374,7 +374,7 @@
% seconds, unless one iteration of the code takes longer.
% \begin{macrocode}
\fp_new:N \l_benchmark_duration_fp
-\fp_set_eq:NN \l_benchmark_duration_fp \c_one_fp
+\fp_set:Nn \l_benchmark_duration_fp { 1 }
% \end{macrocode}
% \end{variable}
%
@@ -438,7 +438,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \benchmark:n #1
{
- \int_set_eq:NN \l_@@_repeat_int \c_one
+ \int_set:Nn \l_@@_repeat_int { 1 }
\@@_raw:n {#1}
\bool_while_do:nn
{
Modified: trunk/l3trial/l3bigint/l3bigint.dtx
===================================================================
--- trunk/l3trial/l3bigint/l3bigint.dtx 2017-02-19 22:58:35 UTC (rev 6962)
+++ trunk/l3trial/l3bigint/l3bigint.dtx 2017-02-20 02:29:02 UTC (rev 6963)
@@ -1,6 +1,6 @@
% \iffalse
%
-%% File l3bigint.dtx Copyright (C) 2011-2016 The LaTeX3 Project
+%% File l3bigint.dtx Copyright (C) 2011-2017 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
@@ -111,7 +111,7 @@
% following are valid \meta{big integer expressions} equal to $11100$.
% \begin{verbatim}
% 10000+--1100
-% 111 * ( \c_ten * \c_nine + "A )
+% 111 * ( 10 * 9 + "A )
% `o * `\d
% 0 ~ 1 \c_space_tl 110 ~ 0
% 1 \prg_replicate:nn { 2 } { 1 } \prg_replicate:nn { 2 } { ~ 0 }
@@ -757,7 +757,7 @@
{
\cs_new:cpn { @@_parse_digits_ #1 :NN } ##1##2
{
- \if_int_compare:w \c_one < ##1 1 \token_to_str:N ##2 \exp_stop_f:
+ \if_int_compare:w 1 < ##1 1 \token_to_str:N ##2 \exp_stop_f:
\token_to_str:N ##2
\exp_after:wN #2 \exp_after:wN ##1 \exp:w
\else:
@@ -870,10 +870,14 @@
%
% \subsubsection{Main parsing functions}
%
-% \begin{variable}{\c_@@_prec_end_int}
-% Precedence of the start of the expression.
+% \begin{variable}{\c_@@_prec_end_int, \c_@@_prec_zero_int, \c_@@_prec_add_int, \c_@@_prec_mul_int, \c_@@_prec_neg_int}
+% Precedence for various operators.
% \begin{macrocode}
\int_const:Nn \c_@@_prec_end_int { -1 }
+\int_const:Nn \c_@@_prec_zero_int { 0 }
+\int_const:Nn \c_@@_prec_add_int { 9 }
+\int_const:Nn \c_@@_prec_mul_int { 10 }
+\int_const:Nn \c_@@_prec_neg_int { 12 }
% \end{macrocode}
% \end{variable}
%
@@ -985,7 +989,7 @@
\exp_after:wN \@@_parse_one_register:NN
\fi:
\else:
- \if_int_compare:w \c_nine < 1 \token_to_str:N #2 \exp_stop_f:
+ \if_int_compare:w 9 < 1 \token_to_str:N #2 \exp_stop_f:
\exp_after:wN \exp_after:wN
\exp_after:wN \@@_parse_one_digit:NN
\else:
@@ -1091,7 +1095,7 @@
;
}
\cs_new:Npn \@@_parse_one_register_aux:N #1
- { \if_int_compare:w \c_ten < 1 #1 ~ \exp_after:wN + \fi: #1 }
+ { \if_int_compare:w 10 < 1 #1 ~ \exp_after:wN + \fi: #1 }
% \end{macrocode}
% \end{macro}
%
@@ -1168,7 +1172,7 @@
\exp_after:wN #1
\exp_after:wN \s_@@
\exp_after:wN \@@_chk:w
- \@@_int_value:w \@@_int_eval:w \c_zero
+ \@@_int_value:w \@@_int_eval:w 0
\@@_parse_trim_zeros:N
}
% \end{macrocode}
@@ -1192,7 +1196,7 @@
\cs_new:Npn \@@_parse_trim_end:w #1 \fi: \exp_end_continue_f:nw
{
\fi:
- \if_int_compare:w \c_nine < 1 \token_to_str:N #1 \exp_stop_f:
+ \if_int_compare:w 9 < 1 \token_to_str:N #1 \exp_stop_f:
\exp_after:wN \@@_parse_decimal:N
\else:
\exp_after:wN \@@_parse_zero:
@@ -1242,7 +1246,7 @@
\cs_new:Npn \@@_parse_decimal_count:NNNNNNNN #1#2#3#4#5#6#7#8
{
\use_none:n #1
- + \c_one \@@_parse_decimal_count:NNNNNNNN
+ + 1 \@@_parse_decimal_count:NNNNNNNN
}
\cs_new:Npn \@@_parse_decimal_count_end:w #1 ; { . + }
% \end{macrocode}
@@ -1276,7 +1280,7 @@
% \begin{macro}[EXP, aux]{\@@_parse_prefix_-:Nw}
% The unary~|-| is harder: we parse the operand using
% a precedence equal to the maximum of the previous precedence~|##1|
-% and the precedence \cs{c_twelve} of the unary operator, then call
+% and the precedence of the unary operator, then call
% the appropriate function \cs{@@_set_sign_o:w}.
% \begin{macrocode}
\cs_new:cpn { @@_parse_prefix_ - :Nw } #1
@@ -1286,10 +1290,10 @@
\exp_after:wN ?
\exp_after:wN \@@_set_sign_o:w
\exp:w
- \if_int_compare:w \c_twelve < #1
+ \if_int_compare:w \c_@@_prec_neg_int < #1
\@@_parse_operand:Nw #1
\else:
- \@@_parse_operand:Nw \c_twelve
+ \@@_parse_operand:Nw \c_@@_prec_neg_int
\fi:
\exp_end_continue_f:nw
}
@@ -1316,11 +1320,7 @@
\exp_after:wN \@@_parse_lparen_after:NwN
\exp_after:wN #1
\exp:w
- \if_int_compare:w #1 = \c_sixteen
- \@@_parse_operand:Nw \c_one
- \else:
- \@@_parse_operand:Nw \c_zero
- \fi:
+ \@@_parse_operand:Nw \c_@@_prec_zero_int
\exp_end_continue_f:nw
}
\cs_new:Npn \@@_parse_lparen_after:NwN #1#2 @ #3
@@ -1413,7 +1413,7 @@
\char_set_catcode_letter:N \)
\cs_new:Npn \@@_parse_infix_):N #1
{
- \if_int_compare:w #1 < \c_zero
+ \if_int_compare:w #1 = \c_@@_prec_end_int
\msg_expandable_error:nnn { bigint } { extra } { ) }
\exp_after:wN \@@_parse_infix:NN
\exp_after:wN #1
@@ -1469,10 +1469,10 @@
\fi:
}
}
- % \@@_tmp:w \@@_parse_infix_/:N / \c_ten \c_ten
- \@@_tmp:w \@@_parse_infix_*:N * \c_ten \c_ten
- \@@_tmp:w \@@_parse_infix_-:N - \c_nine \c_nine
- \@@_tmp:w \@@_parse_infix_+:N + \c_nine \c_nine
+ % \@@_tmp:w \@@_parse_infix_/:N / \c_@@_prec_mul_int \c_@@_prec_mul_int
+ \@@_tmp:w \@@_parse_infix_*:N * \c_@@_prec_mul_int \c_@@_prec_mul_int
+ \@@_tmp:w \@@_parse_infix_-:N - \c_@@_prec_add_int \c_@@_prec_add_int
+ \@@_tmp:w \@@_parse_infix_+:N + \c_@@_prec_add_int \c_@@_prec_add_int
\group_end:
% \end{macrocode}
% \end{macro}
@@ -1503,11 +1503,11 @@
% \begin{macrocode}
\cs_new:Npn \@@_parse_infix_juxtapose:N #1
{
- \if_int_compare:w #1 < \c_ten
+ \if_int_compare:w #1 < \c_@@_prec_mul_int
\exp_after:wN @
\exp_after:wN \@@_parse_apply_juxtapose:NwwN
\exp:w
- \@@_parse_operand:Nw \c_ten
+ \@@_parse_operand:Nw \c_@@_prec_mul_int
\exp_after:wN \exp_end_continue_f:nw
\else:
\exp_after:wN @
@@ -1556,7 +1556,7 @@
% \begin{macrocode}
\cs_new:Npn \@@_tree_dp:n % expects "{<digits>}" (non-zero multiple of 8 digits, first block non-zero), outputs "<depth>.<tree>"
{
- \@@_int_value:w \@@_int_eval:w - \c_one
+ \@@_int_value:w \@@_int_eval:w -1
\@@_tree_dp_aux:n
}
\cs_new:Npn \@@_tree_dp_aux:n #1
@@ -1591,7 +1591,7 @@
{ #2 #3 \@@_tree_extend:nnw ; \q_stop }
\cs_new:Npn \@@_tree_collect:w ; #1 #2 ; #3
{
- + \c_one
+ + 1
\if_meaning:w \@@_tree_extend:nnw #3
\exp_after:wN \@@_tree_power:w
\fi:
@@ -1602,7 +1602,7 @@
\cs_new:Npn \@@_tree_power:w #1#2#3#4 ; #5 \q_stop ; { . #4 }
\cs_new:Npn \@@_tree_collect_aux:w #1 ; #2 #3 ;
{
- + \c_one
+ + 1
\if_meaning:w \@@_tree_extend:nnw #2
\exp_after:wN \@@_tree_end:w
\fi:
@@ -1674,7 +1674,7 @@
\int_const:Nn \c_@@_carry_int { 2 0000 0000 }
\cs_new_protected:Npn \@@_carry:N #1
{
- + #1 - \c_two
+ + #1 - 2
\@@_int_eval_end:
}
\cs_new_protected:Npn \@@:w
@@ -1691,13 +1691,13 @@
% \begin{macrocode}
\cs_new:Npn \@@_wrapup:Nw #1
{
- + \c_one
+ + 1
\@@_wrapup_zeros:wNNNNNNNN . #1 00000000 0000000
}
\cs_new:Npn \@@_wrapup_zeros:wNNNNNNNN . #1 00000000 #2#3#4#5#6#7#8#9
{
- \if_int_compare:w #2#3#4#5#6#7#8#9 = \c_zero
- - \c_one \exp_after:wN \@@_wrapup_zeros:wNNNNNNNN
+ \if_int_compare:w #2#3#4#5#6#7#8#9 = 0 \exp_stop_f:
+ - 1 \exp_after:wN \@@_wrapup_zeros:wNNNNNNNN
\fi:
. #1 #2#3#4#5#6#7#8#9
}
@@ -1782,7 +1782,7 @@
\fi:
\exp_after:wN \@@_wrapup:Nw
\exp_after:wN #7
- \@@_int_value:w \@@_int_eval:w \c_zero
+ \@@_int_value:w \@@_int_eval:w 0
\prg_replicate:nn { #1 - #3 } { \@@_add_unwrap:w }
\if_meaning:w #6 #7
\exp_after:wN \@@_add_auxv:Nw \exp_after:wN +
@@ -1796,14 +1796,14 @@
} % for now, put larges tree first for pruning by \@@_wrapup:Nw, then exchange so that testing for 1... is faster.
% Also add \exp_after:wN so drop "_o" from names.
\cs_new:Npn \@@_add_zero:w \fi: #1 ; #2 ;
- { \fi: * \c_zero \exp_after:wN . \exp_after:wN 0 }
+ { \fi: * 0 \exp_after:wN . \exp_after:wN 0 }
\cs_new:Npn \@@_add_swap:Nw
#1 \fi: \fi: #2 \q_mark #3 ; #4 ;
{
\fi: \fi:
\exp_after:wN \@@_wrapup:Nw
\exp_after:wN #1
- \@@_int_value:w \@@_int_eval:w \c_zero
+ \@@_int_value:w \@@_int_eval:w 0
\@@_add_auxv:Nw - \q_mark #4 ; #3 ;
}
\cs_new:Npn \@@_add_unwrap:w #1 \q_mark 0 #2 #3 ;
@@ -1886,7 +1886,7 @@
\exp_after:wN \@@_wrapup:Nw
\exp_after:wN - \@@_int_value:w
\fi:
- \@@_int_eval:w \c_zero
+ \@@_int_eval:w 0
\exp_after:wN \@@_mul_auxii:w
\@@_int_value:w \@@_tree_dp:n {#3} ;
}
@@ -1923,7 +1923,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_carry_v:N #1#2 .
{
- \@@_int_value:w \@@_int_eval:w #1 - \c_two .
+ \@@_int_value:w \@@_int_eval:w #1 - 2 .
2 #2 +
}
\cs_new_protected:Npn \@@_v:Nw #1 #2 .
@@ -2487,7 +2487,7 @@
\if_int_compare:w
\@@_parse_do:nn {#3}
{ \@@_parse_do:nn {#1} \@@_compare:ww }
- #2 \c_zero
+ #2 0 \exp_stop_f:
\prg_return_true:
\else:
\prg_return_false:
@@ -2602,7 +2602,7 @@
\or:
\if_int_compare:w
\@@_str_cmp_x:nn {#3} { 00000021 47483648 }
- = - \c_one
+ = - 1 \exp_stop_f:
\prg_return_true:
\else:
\prg_return_false:
Modified: trunk/l3trial/l3check/l3check.dtx
===================================================================
--- trunk/l3trial/l3check/l3check.dtx 2017-02-19 22:58:35 UTC (rev 6962)
+++ trunk/l3trial/l3check/l3check.dtx 2017-02-20 02:29:02 UTC (rev 6963)
@@ -1,6 +1,6 @@
% \iffalse
%
-%% File l3check.dtx (C) Copyright 2012,2014-2016 The LaTeX3 Project
+%% File l3check.dtx (C) Copyright 2012,2014-2017 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
@@ -1684,7 +1684,7 @@
\cs_set_protected:Npn \check_tmp:w #1#2#3#4#5
{
\tex_catcode:D `#1 = \__int_eval:w #2 \__int_eval_end:
- #3 { \tex_catcode:D `#1 / \c_two } = \c_six
+ #3 { \tex_catcode:D `#1 / 2 } = { 6 }
{
\group_begin: \exp_args:NNc \group_end:
\__char_set_catcode:NNN {#1} #4 #5
@@ -1695,7 +1695,7 @@
\cs_gset_protected:Npn \__char_set_catcode:NnNNN #1#2#3#4#5
{
\tex_catcode:D `#1 = \__int_eval:w #2 \__int_eval_end:
- #3 { \tex_catcode:D `#1 / \c_two } = \c_six
+ #3 { \tex_catcode:D `#1 / 2 } = { 6 }
{
\group_begin: \exp_after:wN \group_end:
\exp_after:wN \__char_set_catcode:NNN \cs:w #1 \cs_end: #4 #5
@@ -1873,7 +1873,6 @@
%
% \subsubsection{\pkg{l3fp}}
%
-% |\fp_flag_on:n| must not use \cs{exp_args:Nc}.
% |\fp_function:Nn|, |\fp_new_function:Npn|, |\fp_if_exist:(N/c)|(TF),
% |\fp_compare:nNn|(TF), |\fp_(do_until/do_while/until_do/while_do):nNnn|
% |\fp_to_(scientific/decimal/tl/dim/int):N|, |\fp_use:N|,
Modified: trunk/l3trial/l3fp-extras/l3fp-extras.dtx
===================================================================
--- trunk/l3trial/l3fp-extras/l3fp-extras.dtx 2017-02-19 22:58:35 UTC (rev 6962)
+++ trunk/l3trial/l3fp-extras/l3fp-extras.dtx 2017-02-20 02:29:02 UTC (rev 6963)
@@ -1,39 +1,25 @@
% \iffalse
%
-%% File l3fp-extras.dtx (C) Copyright 2012-2013 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
-%% license or (at your option) any later version. The latest version
-%% of this license is in the file
-%%
-%% http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3trial bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%% http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%% Snapshots taken from the repository represent work in progress and may
-%% not work or may contain conflicting material! We therefore ask
-%% people _not_ to put them into distributions, archives, etc. without
-%% prior consultation with the LaTeX Project Team.
-%%
-%% -----------------------------------------------------------------------
-%%
+%% File l3fp-extras.dtx (C) Copyright 2012-2013,2017 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
+% license or (at your option) any later version. The latest version
+% of this license is in the file
+%
+% http://www.latex-project.org/lppl.txt
+%
+% This file is part of the "l3trial bundle" (The Work in LPPL)
+% and all files in that bundle must be distributed together.
+%
+% -----------------------------------------------------------------------
+%
+% The development version of the bundle can be found at
+%
+% https://github.com/latex3/latex3
+%
+% for those people who are interested.
+%
%<*driver|package>
\RequirePackage{expl3}
\GetIdInfo$Id$
Modified: trunk/l3trial/l3fp-extras/l3fp-functions.dtx
===================================================================
--- trunk/l3trial/l3fp-extras/l3fp-functions.dtx 2017-02-19 22:58:35 UTC (rev 6962)
+++ trunk/l3trial/l3fp-extras/l3fp-functions.dtx 2017-02-20 02:29:02 UTC (rev 6963)
@@ -1,39 +1,25 @@
% \iffalse
%
-%% 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
-%% license or (at your option) any later version. The latest version
-%% of this license is in the file
-%%
-%% http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3trial bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%% http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%% Snapshots taken from the repository represent work in progress and may
-%% not work or may contain conflicting material! We therefore ask
-%% people _not_ to put them into distributions, archives, etc. without
-%% prior consultation with the LaTeX Project Team.
-%%
-%% -----------------------------------------------------------------------
-%%
+%% File l3fp-functions.dtx (C) Copyright 2012-2017 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
+% license or (at your option) any later version. The latest version
+% of this license is in the file
+%
+% http://www.latex-project.org/lppl.txt
+%
+% This file is part of the "l3trial bundle" (The Work in LPPL)
+% and all files in that bundle must be distributed together.
+%
+% -----------------------------------------------------------------------
+%
+% The development version of the bundle can be found at
+%
+% https://github.com/latex3/latex3
+%
+% for those people who are interested.
+%
%<*driver|package>
\RequirePackage{expl3}
\GetIdInfo$Id$
@@ -258,13 +244,13 @@
\if_meaning:w @ #2
\exp_after:wN \@@_function_arg_few:w
\fi:
- \if_int_compare:w #1 = \c_one
+ \if_int_compare:w #1 = 1 \exp_stop_f:
\exp_after:wN \@@_function_arg_get:w
\fi:
\@@_use_i_until_s:nw
{
\exp_after:wN \@@_function_arg_o:w
- \__int_value:w \__int_eval:w #1 - \c_one .
+ \__int_value:w \__int_eval:w #1 - 1 .
}
#2
}
Modified: trunk/l3trial/l3fp-extras/l3fp-types.dtx
===================================================================
--- trunk/l3trial/l3fp-extras/l3fp-types.dtx 2017-02-19 22:58:35 UTC (rev 6962)
+++ trunk/l3trial/l3fp-extras/l3fp-types.dtx 2017-02-20 02:29:02 UTC (rev 6963)
@@ -1,39 +1,25 @@
% \iffalse
%
-%% File l3fp-types.dtx (C) Copyright 2012 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
-%% license or (at your option) any later version. The latest version
-%% of this license is in the file
-%%
-%% http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3trial bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%% http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%% Snapshots taken from the repository represent work in progress and may
-%% not work or may contain conflicting material! We therefore ask
-%% people _not_ to put them into distributions, archives, etc. without
-%% prior consultation with the LaTeX Project Team.
-%%
-%% -----------------------------------------------------------------------
-%%
+%% File l3fp-types.dtx (C) Copyright 2012,2017 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
+% license or (at your option) any later version. The latest version
+% of this license is in the file
+%
+% http://www.latex-project.org/lppl.txt
+%
+% This file is part of the "l3trial bundle" (The Work in LPPL)
+% and all files in that bundle must be distributed together.
+%
+% -----------------------------------------------------------------------
+%
+% The development version of the bundle can be found at
+%
+% https://github.com/latex3/latex3
+%
+% for those people who are interested.
+%
%<*driver|package>
\RequirePackage{expl3}
\GetIdInfo$Id$
@@ -139,7 +125,7 @@
% \begin{macro}[EXP, aux]{\@@_parse_prefix_-:Nw, \@@_parse_prefix_!:Nw}
% The unary~|-| and boolean not are harder than the unary~|+|: we
% parse the operand using a precedence equal to the maximum of the
-% previous precedence~|##1| and the precedence \cs{c_twelve} of the
+% previous precedence~|##1| and the precedence \cs{c_@@_prec_not_int} of the
% unary operator, then call the appropriate
% |\__fp_|\meta{operation}\meta{type}|_o:w| function, where the
% \meta{type} is extracted by \cs{@@_parse_unary_type:N} and the
@@ -163,8 +149,8 @@
\@@_parse_expand:w
}
}
-\@@_tmp:w - \c_twelve { set_sign } 2
-\@@_tmp:w ! \c_twelve { not } ?
+\@@_tmp:w - \c_@@_prec_not_int { set_sign } 2
+\@@_tmp:w ! \c_@@_prec_not_int { not } ?
% \end{macrocode}
% \end{macro}
%
@@ -182,7 +168,7 @@
\exp_after:wN #2
\cs:w @@_ #1 \exp_after:wN \@@_parse_unary_type:N
\exp:w
- \@@_parse_operand:Nw \c_fifteen \@@_parse_expand:w
+ \@@_parse_operand:Nw \c_@@_prec_func_int \@@_parse_expand:w
}
% \end{macrocode}
% \end{macro}
Modified: trunk/l3trial/l3kernel-extras/l3kernel-extras.dtx
===================================================================
--- trunk/l3trial/l3kernel-extras/l3kernel-extras.dtx 2017-02-19 22:58:35 UTC (rev 6962)
+++ trunk/l3trial/l3kernel-extras/l3kernel-extras.dtx 2017-02-20 02:29:02 UTC (rev 6963)
@@ -1,6 +1,6 @@
% \iffalse
%
-%% File l3kernel-extras.dtx (C) Copyright 2012,2015,2016 The LaTeX3 Project
+%% File l3kernel-extras.dtx (C) Copyright 2012,2015-2017 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
@@ -484,7 +484,7 @@
% Check that packages are loaded at $\tn{currentgrouplevel}=0$, for
% example by adding
% \begin{verbatim}
-% \int_compare:nNnF \etex_currentgrouplevel:D = \c_zero
+% \int_compare:nNnF \etex_currentgrouplevel:D = 0
% {
% \__msg_kernel_error:nnnnnn
% { kernel } { package-in-group } {#1} {#2} {#3} {#4}
@@ -667,7 +667,7 @@
\exp_args:Nf \__msg_expandable_warning_aux:nn
{
\exp_args:Nno \prg_replicate:nn
- { \int_max:nn { \c_zero } { \tex_inputlineno:D - \c_two } }
+ { \int_max:nn { 0 } { \tex_inputlineno:D - 2 } }
{ \iow_newline: }
}
}
@@ -1073,7 +1073,7 @@
\tl_put_right:Nx \l__char_internal_tl
{ \\ not ~ in ~ current ~ font }
}
- \int_compare:nF { \__char_show_code:n { ef } = \c_zero }
+ \int_compare:nF { \__char_show_code:n { ef } = 0 }
{
\tl_put_right:Nx \l__char_internal_tl
{
@@ -1125,13 +1125,15 @@
\group_end:
}
\cs_new:Npn \__char_show_p:n #1
- { \int_compare_p:n { \__char_show_code:n {#1} = \c_zero } }
+ { \int_compare_p:n { \__char_show_code:n {#1} = 0 } }
\cs_new:Npn \__char_show_code:n #1
{
- \tex_the:D
- \cs_if_exist_use:cF { pdftex_#1code:D }
- { \cs_if_exist_use:cF { #1 code } { \c_zero \use_none:nn } }
- \tex_font:D \l__char_code_int
+ \int_eval:n
+ {
+ \cs_if_exist_use:cF { pdftex_#1code:D }
+ { \cs_if_exist_use:cF { #1 code } { 0 \use_none:nn } }
+ \tex_font:D \l__char_code_int
+ }
}
\prg_new_conditional:Npnn \__char_if_in_font:nN #1#2 { TF }
{
@@ -1424,14 +1426,14 @@
{
\tl_set:Nx \l__tl_replace_name_tl
{ #3 _replace_ \exp_not:n { \int_use:N \l__tl_replace_int } :nwwn }
- \int_set_eq:NN \l__tl_replace_int \c_one
+ \int_set:Nn \l__tl_replace_int { 1 }
\tl_clear:N \l__tl_replace_code_tl
\__tl_replace_set_loop:Nnn #1
#4
\q_recursion_tail \q_recursion_tail
\q_recursion_stop
#2 { \l__tl_replace_name_tl } \__tl_replace_end:nwn
- \int_set_eq:NN \l__tl_replace_int \c_one
+ \int_set:Nn \l__tl_replace_int { 1 }
#1 { #3_replace:n } ##1
{
\exp_not:N \exp_not:f
Modified: trunk/l3trial/l3ldb/l3ldb.dtx
===================================================================
--- trunk/l3trial/l3ldb/l3ldb.dtx 2017-02-19 22:58:35 UTC (rev 6962)
+++ trunk/l3trial/l3ldb/l3ldb.dtx 2017-02-20 02:29:02 UTC (rev 6963)
@@ -1,7 +1,7 @@
% \iffalse meta-comment
%
%% File l3ldb.dtx (C) Copyright 2011 Frank Mittelbach, the LaTeX3 Project
-%% (C) Copyright 2012,2016 The LaTeX3 Project
+%% (C) Copyright 2012,2016-2017 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
@@ -360,7 +360,7 @@
% is done by simply calling \cs{g_ldb_triples_tl} which contains a
% function in front of every triple so that we can safely proceed.
% \begin{macrocode}
- \exp_after:wN \ldb_decide_root:nn \g_ldb_triples_tl \c_three \c_zero
+ \exp_after:wN \ldb_decide_root:nn \g_ldb_triples_tl \c__ldb_other_bdg \c__ldb_begin_type
%<trace> \show_ldb_entry:nnn {#1} {#2} {#3}
}
% \end{macrocode}
@@ -371,8 +371,8 @@
% \begin{macrocode}
\cs_new_protected:Npn \ldb_decide_root:nn #1#2
{
- \if_meaning:w #1 \c_zero
- \if_meaning:w #2 \c_zero
+ \if_meaning:w #1 \c__ldb_sequenced_bdg
+ \if_meaning:w #2 \c__ldb_begin_type
\tl_set:Nn \l_ldb_curr_node_tl { \g_ldb_begin_root_prop }
\else:
\tl_set:Nn \l_ldb_curr_node_tl { \g_ldb_end_root_prop }
@@ -1038,13 +1038,13 @@
% \begin{macrocode}
\cs_new_protected:Npn \trace_ldb:x #1
{
- \if_int_compare:w \g_trace_ldb_status > \c_zero
+ \if_int_compare:w \g_trace_ldb_status > 0 \exp_stop_f:
\iow_term:x { LDB:~ #1 }
\fi:
}
\cs_new_protected:Npn \trace_ldb_internal:x #1
{
- \if_int_compare:w \g_trace_ldb_status > \c_one
+ \if_int_compare:w \g_trace_ldb_status > 1 \exp_stop_f:
\iow_term:x { LDB:~ #1 }
\fi:
}
Modified: trunk/l3trial/l3ldb/l3ldbparse.dtx
===================================================================
--- trunk/l3trial/l3ldb/l3ldbparse.dtx 2017-02-19 22:58:35 UTC (rev 6962)
+++ trunk/l3trial/l3ldb/l3ldbparse.dtx 2017-02-20 02:29:02 UTC (rev 6963)
@@ -1,7 +1,7 @@
% \iffalse meta-comment
%
%% File l3ldbparse.dtx (C) Copyright 2011 Frank Mittelbach, The LaTeX3 Project
-%% (C) Copyright 2012,2016 The LaTeX3 Project
+%% (C) Copyright 2012,2016-2017 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
@@ -98,8 +98,7 @@
% \begin{center}
% |(0,0,A)(1,0,B)(0,2,C)(0,0,D)(2,1,E)|
% \end{center}
-% except that we use the integer constants \cs{c_zero}, \cs{c_one} and
-% \cs{c_two} instead.
+% except that we use integer constants instead.
%
% \end{documentation}
%
@@ -118,7 +117,45 @@
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
% \end{macrocode}
%
+% \begin{variable}{\c__ldb_prebdg_mode, \c__ldb_bdg_mode, \c__ldb_less_mode, \c__ldb_begin_mode, \c__ldb_ident_mode}
+% Modes before a binding, after a binding, after |<|, after |<foo|, and after |foo|.
+% \begin{macrocode}
+\int_const:Nn \c__ldb_prebdg_mode { 0 }
+\int_const:Nn \c__ldb_bdg_mode { 1 }
+\int_const:Nn \c__ldb_less_mode { 2 }
+\int_const:Nn \c__ldb_begin_mode { 3 }
+\int_const:Nn \c__ldb_ident_mode { 4 }
+% \end{macrocode}
+% \end{variable}
%
+% \begin{variable}{\c__ldb_begin_type, \c__ldb_end_type, \c__ldb_completed_type}
+% \begin{macrocode}
+\int_const:Nn \c__ldb_begin_type { 0 }
+\int_const:Nn \c__ldb_end_type { 1 }
+\int_const:Nn \c__ldb_completed_type { 2 }
+% \end{macrocode}
+% \end{variable}
+%
+% \begin{variable}{\c__ldb_sequenced_bdg, \c__ldb_tight_bdg, \c__ldb_loose_bdg, \c__ldb_other_bdg}
+% The \enquote{other} binding is only used in \pkg{l3ldb}, probably to mark the end of \cs{g_ldb_triples_tl}.
+% \begin{macrocode}
+\int_const:Nn \c__ldb_sequenced_bdg { 0 }
+\int_const:Nn \c__ldb_tight_bdg { 1 }
+\int_const:Nn \c__ldb_loose_bdg { 2 }
+\int_const:Nn \c__ldb_other_bdg { 3 }
+% \end{macrocode}
+% \end{variable}
+%
+% \begin{variable}{\c__ldb_initial_segment, \c__ldb_main_segment, \c__ldb_after_segment, \c__ldb_end_segment, \c__ldb_begin_segment}
+% \begin{macrocode}
+\int_const:Nn \c__ldb_initial_segment { 0 }
+\int_const:Nn \c__ldb_main_segment { 1 }
+\int_const:Nn \c__ldb_after_segment { 2 }
+\int_const:Nn \c__ldb_end_segment { 3 }
+\int_const:Nn \c__ldb_begin_segment { 4 }
+% \end{macrocode}
+% \end{variable}
+%
% \begin{macro}{\glet_gtmp:N, \gdef_gtmp:n, \gdef_gtmp:x}
% Very convenient abbreviations for defining a continuation in
% |\gtmp:w| for immediate use.
@@ -173,10 +210,10 @@
% \MakeShortVerb{\|}
% \end{center}
% \begin{macrocode}
-\cs_new_eq:NN \g_ldb_mode \c_zero
-\cs_new_eq:NN \g_ldb_type \c_zero
-\cs_new_eq:NN \g_ldb_bdg \c_zero
-\cs_new_eq:NN \g_ldb_segment \c_zero
+\cs_new_eq:NN \g_ldb_mode \c__ldb_prebdg_mode
+\cs_new_eq:NN \g_ldb_type \c__ldb_begin_type
+\cs_new_eq:NN \g_ldb_bdg \c__ldb_sequenced_bdg
+\cs_new_eq:NN \g_ldb_segment \c__ldb_initial_segment
% \end{macrocode}
% \end{variable}
%
@@ -208,10 +245,10 @@
\tl_gset:Nn \g_ldb_spec_tl {#1}
\tl_gclear:N \g_ldb_triples_tl
\tl_gclear:N \g_ldb_tag_tl
- \cs_gset_eq:NN \g_ldb_mode \c_zero
- \cs_gset_eq:NN \g_ldb_type \c_zero
- \cs_gset_eq:NN \g_ldb_bdg \c_zero
- \cs_gset_eq:NN \g_ldb_segment\c_zero
+ \cs_gset_eq:NN \g_ldb_mode \c__ldb_prebdg_mode
+ \cs_gset_eq:NN \g_ldb_type \c__ldb_begin_type
+ \cs_gset_eq:NN \g_ldb_bdg \c__ldb_sequenced_bdg
+ \cs_gset_eq:NN \g_ldb_segment\c__ldb_initial_segment
% \end{macrocode}
% Then it proceeds to expand the abbreviations. The empty pair of
% abbreviations marks the end of the list of abbreviations. The
@@ -280,7 +317,10 @@
\or: \ldb_gtmp_error:
\else:
\gdef_gtmp:n
- { \ldb_flush:NNN \c_zero \c_zero \c_zero \ldb_parse_done:w }
+ {
+ \ldb_flush:NNN \c__ldb_begin_type \c__ldb_sequenced_bdg \c__ldb_prebdg_mode
+ \ldb_parse_done:w
+ }
\fi:
\gtmp:w
}
@@ -419,8 +459,8 @@
% \end{macro}
%
% \begin{macro}{\ldb_push_bdg:N}
-% Takes a constant integer as an argument. \cs{c_one} for a tight
-% binding, \cs{c_two} for a loose binding. The only places a binding
+% Takes a constant integer as an argument. \cs{c__ldb_tight_bdg} for a tight
+% binding, \cs{c__ldb_loose_bdg} for a loose binding. The only places a binding
% is allowed is after |<foo| or |foo|, \emph{i.e.} in mode 3 or~4. In that
% case, we flush the pending triple and reset \cs{g_ldb_type} to~0,
% \cs{g_ldb_bdg} to the given constant, and \cs{g_ldb_mode} to~1 to
@@ -428,10 +468,10 @@
% \begin{macrocode}
\cs_new_protected:Npn \ldb_push_bdg:N #1
{
- \if_int_compare:w \g_ldb_mode < \c_three
+ \if_int_compare:w \g_ldb_mode < \c__ldb_begin_mode
\ldb_gtmp_error:
\else:
- \gdef_gtmp:n { \ldb_flush:NNN \c_zero #1 \c_one }
+ \gdef_gtmp:n { \ldb_flush:NNN \c__ldb_begin_type #1 \c__ldb_bdg_mode }
\fi:
\gtmp:w
}
@@ -441,8 +481,8 @@
% \begin{macro}{\ldb_push_dot:, \ldb_push_star:}
% Record a tight or a loose binding.
% \begin{macrocode}
-\cs_new_protected:Npn \ldb_push_dot: { \ldb_push_bdg:N \c_one }
-\cs_new_protected:Npn \ldb_push_star: { \ldb_push_bdg:N \c_two }
+\cs_new_protected:Npn \ldb_push_dot: { \ldb_push_bdg:N \c__ldb_tight_bdg }
+\cs_new_protected:Npn \ldb_push_star: { \ldb_push_bdg:N \c__ldb_loose_bdg }
% \end{macrocode}
% \end{macro}
%
@@ -458,13 +498,13 @@
% \begin{macrocode}
\cs_new_protected:Npn \ldb_push_begin:
{
- \if_int_compare:w \g_ldb_mode = \c_two
+ \if_int_compare:w \g_ldb_mode = \c__ldb_less_mode
\ldb_gtmp_error:
\else:
- \if_int_compare:w \g_ldb_mode < \c_two
- \gdef_gtmp:n { \cs_gset_eq:NN \g_ldb_mode \c_two }
+ \if_int_compare:w \g_ldb_mode < \c__ldb_less_mode
+ \gdef_gtmp:n { \cs_gset_eq:NN \g_ldb_mode \c__ldb_less_mode }
\else:
- \gdef_gtmp:n { \ldb_flush:NNN \c_zero \c_zero \c_two }
+ \gdef_gtmp:n { \ldb_flush:NNN \c__ldb_begin_type \c__ldb_sequenced_bdg \c__ldb_less_mode }
\fi:
\fi:
\gtmp:w
@@ -483,14 +523,14 @@
% \begin{macrocode}
\cs_new_protected:Npn \ldb_push_tag:n #1
{
- \if_int_compare:w \g_ldb_mode > \c_two
+ \if_int_compare:w \g_ldb_mode > \c__ldb_less_mode
\exp_after:wN \ldb_error:w
\else:
\tl_gset:Nn \g_ldb_tag_tl {#1}
- \if_int_compare:w \g_ldb_mode = \c_two
- \cs_gset_eq:NN \g_ldb_mode \c_three
+ \if_int_compare:w \g_ldb_mode = \c__ldb_less_mode
+ \cs_gset_eq:NN \g_ldb_mode \c__ldb_begin_mode
\else:
- \cs_gset_eq:NN \g_ldb_mode \c_four
+ \cs_gset_eq:NN \g_ldb_mode \c__ldb_ident_mode
\fi:
\fi:
}
@@ -509,15 +549,15 @@
% \begin{macrocode}
\cs_new_protected:Npn \ldb_push_end:
{
- \if_int_compare:w \g_ldb_mode < \c_three
+ \if_int_compare:w \g_ldb_mode < \c__ldb_begin_mode
\ldb_gtmp_error:
\else:
- \if_int_compare:w \g_ldb_mode = \c_three
- \cs_gset_eq:NN \g_ldb_type \c_two
+ \if_int_compare:w \g_ldb_mode = \c__ldb_begin_mode
+ \cs_gset_eq:NN \g_ldb_type \c__ldb_completed_type
\else:
- \cs_gset_eq:NN \g_ldb_type \c_one
+ \cs_gset_eq:NN \g_ldb_type \c__ldb_end_type
\fi:
- \gdef_gtmp:n { \ldb_flush:NNN \c_zero \c_zero \c_zero }
+ \gdef_gtmp:n { \ldb_flush:NNN \c__ldb_begin_type \c__ldb_sequenced_bdg \c__ldb_prebdg_mode }
\fi:
\gtmp:w
}
@@ -549,8 +589,8 @@
% \cs{g_ldb_segment}~$>$~1. If we find such a situation, we must
% signal an error since only sequencing is permitted.
% \begin{macrocode}
- \if_int_compare:w \g_ldb_bdg = \c_zero \else: %^^A todo: ">\c_zero" ?
- \if_int_compare:w \g_ldb_segment > \c_one
+ \if_int_compare:w \g_ldb_bdg > \c__ldb_sequenced_bdg
+ \if_int_compare:w \g_ldb_segment > \c__ldb_main_segment
\ldb_gtmp_error:
\fi:
\fi:
@@ -582,8 +622,16 @@
{
\tl_gput_right:Nx \g_ldb_triples_tl
{
- \if_case:w \g_ldb_bdg \c_zero \or: \c_one \else: \c_two \fi:
- \if_case:w \g_ldb_type \c_zero \or: \c_one \else: \c_two \fi:
+ \if_case:w \g_ldb_bdg
+ \c__ldb_sequenced_bdg
+ \or: \c__ldb_tight_bdg
+ \else: \c__ldb_loose_bdg
+ \fi:
+ \if_case:w \g_ldb_type
+ \c__ldb_begin_type
+ \or: \c__ldb_end_type
+ \else: \c__ldb_completed_type
+ \fi:
\exp_not:N \ldb_triple:nNN { \exp_not:o\g_ldb_tag_tl }
}
}
@@ -614,10 +662,10 @@
% \begin{macrocode}
\cs_new_protected:Npn \ldb_push_begin_tag:
{
- \if_int_compare:w \g_ldb_segment<\c_three
- \cs_gset_eq:NN \g_ldb_segment \c_one
+ \if_int_compare:w \g_ldb_segment<\c__ldb_end_segment
+ \cs_gset_eq:NN \g_ldb_segment \c__ldb_main_segment
\else:
- \cs_gset_eq:NN \g_ldb_segment \c_four
+ \cs_gset_eq:NN \g_ldb_segment \c__ldb_begin_segment
\fi:
}
% \end{macrocode}
@@ -641,13 +689,13 @@
% \begin{macrocode}
\cs_new_protected:Npn \ldb_push_compl_tag:
{
- \if_int_compare:w \g_ldb_segment > \c_two
+ \if_int_compare:w \g_ldb_segment > \c__ldb_after_segment
\ldb_gtmp_error:
\else:
\if_meaning:w \g_ldb_tag_tl \c_ldb_dash_tl
\ldb_gtmp_error:
\else:
- \gdef_gtmp:n { \cs_gset_eq:NN \g_ldb_segment \c_two }
+ \gdef_gtmp:n { \cs_gset_eq:NN \g_ldb_segment \c__ldb_after_segment }
\fi:
\fi:
\gtmp:w
@@ -670,12 +718,15 @@
% \begin{macrocode}
\cs_new_protected:Npn \ldb_push_end_tag:
{
- \gdef_gtmp:n { \cs_gset_eq:NN \g_ldb_segment \c_three }
+ \gdef_gtmp:n { \cs_gset_eq:NN \g_ldb_segment \c__ldb_end_segment }
\if_case:w\g_ldb_segment
- \if_int_compare:w \g_ldb_bdg = \c_zero \else: \ldb_gtmp_error: \fi:
- \or: \if_int_compare:w \g_ldb_bdg = \c_two \else: \ldb_gtmp_error: \fi:
+ \if_int_compare:w \g_ldb_bdg = \c__ldb_sequenced_bdg \else:
+ \ldb_gtmp_error: \fi:
+ \or: \if_int_compare:w \g_ldb_bdg = \c__ldb_loose_bdg \else:
+ \ldb_gtmp_error: \fi:
\or: \ldb_gtmp_error:
- \or: \if_int_compare:w \g_ldb_bdg = \c_zero \else: \ldb_gtmp_error: \fi:
+ \or: \if_int_compare:w \g_ldb_bdg = \c__ldb_sequenced_bdg \else:
+ \ldb_gtmp_error: \fi:
\else: \ldb_gtmp_error: \fi:
\gtmp:w
}
Modified: trunk/l3trial/l3str-format-new/l3str-format-new.dtx
===================================================================
--- trunk/l3trial/l3str-format-new/l3str-format-new.dtx 2017-02-19 22:58:35 UTC (rev 6962)
+++ trunk/l3trial/l3str-format-new/l3str-format-new.dtx 2017-02-20 02:29:02 UTC (rev 6963)
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-%% File: l3str-format-new.dtx (C) Copyright 2014-2016 The LaTeX3 Project
+%% File: l3str-format-new.dtx (C) Copyright 2014-2017 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
@@ -584,7 +584,7 @@
\cs_new:cpn { @@ / width :nn } #1#2
{
\@@_val_set:ff { \str_head:n {#1} } { \int_eval:n {#2} }
- \@@_val_do:fn { \str_head:n {#1} } \int_compare:nNnT < \c_zero
+ \@@_val_do:fn { \str_head:n {#1} } \int_compare:nNnT < 0
{
\@@_val_do:fn { \str_head:n {#1} }
{
@@ -895,7 +895,7 @@
\@@_align:f
{
\use:nf
- { \int_compare:nNnTF {#5} > \c_zero { #2 . #3 } {#2} }
+ { \int_compare:nNnTF {#5} > 0 { #2 . #3 } {#2} }
{
\prg_replicate:nn
{ \int_max:nn { 0 } { #5 - \str_count:n {#3} } } { 0 }
@@ -942,7 +942,7 @@
{
\use:nf {#1}
{
- \int_compare:nNnT {#4} > \c_zero
+ \int_compare:nNnT {#4} > 0
{
\use:nf { . #2 }
{ \prg_replicate:nn { #4 - \str_count:n {#2} } {0} }
@@ -1023,7 +1023,7 @@
% \begin{macrocode}
\prg_new_conditional:Npnn \@@_if_digit:N #1 { TF }
{
- \if_int_compare:w \c_nine < 1 #1 \exp_stop_f:
+ \if_int_compare:w 9 < 1 #1 \exp_stop_f:
\prg_return_true: \else: \prg_return_false: \fi:
}
% \end{macrocode}
@@ -1346,7 +1346,7 @@
\token_if_eq_charcode:NNTF #2 ?
{ \@@_put:nw { #1 > } }
{ \@@_put:nw { #1 #2 } }
- \int_compare:nNnTF {#7} < \c_zero
+ \int_compare:nNnTF {#7} < 0
{ \@@_put:nw { - } }
{
\str_case:nnF {#3}
Modified: trunk/l3trial/l3tree/l3tree.dtx
===================================================================
--- trunk/l3trial/l3tree/l3tree.dtx 2017-02-19 22:58:35 UTC (rev 6962)
+++ trunk/l3trial/l3tree/l3tree.dtx 2017-02-20 02:29:02 UTC (rev 6963)
@@ -1,6 +1,6 @@
% \iffalse
%
-%% File l3tree.dtx (C) Copyright 2012,2016 The LaTeX3 Project
+%% File l3tree.dtx (C) Copyright 2012,2016-2017 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
@@ -318,10 +318,10 @@
\if_hbox:N \l_tree_first_box
\hbox_unpack_clear:N \l_tree_first_box
\else:
- \if_int_compare:w \tex_ht:D \l_tree_first_box = \c_zero
+ \if_int_compare:w \tex_ht:D \l_tree_first_box = 0 \exp_stop_f:
\exp_after:wN \exp_after:wN \exp_after:wN \use_none:n
\else:
- \tex_advance:D \l_tree_index_int \c_one
+ \tex_advance:D \l_tree_index_int 1 \exp_stop_f:
\tex_dimen:D \l_tree_index_int \tex_ht:D \l_tree_first_box
\fi:
\fi:
@@ -335,12 +335,12 @@
% \begin{macrocode}
\cs_new:Npn \tree_extract_loop:w #1 ;
{
- \if_int_compare:w #1 = \c_zero
+ \if_int_compare:w #1 = 0 \exp_stop_f:
\exp_after:wN \__prg_break:
\fi:
\exp_not:N \__seq_item:n { \__int_value:w \tex_dimen:D #1 }
\exp_after:wN \tree_extract_loop:w
- \__int_value:w \__int_eval:w #1 - \c_one ;
+ \__int_value:w \__int_eval:w #1 - 1 ;
}
% \end{macrocode}
% \end{macro}
Modified: trunk/l3trial/xfont/l3font.dtx
===================================================================
--- trunk/l3trial/xfont/l3font.dtx 2017-02-19 22:58:35 UTC (rev 6962)
+++ trunk/l3trial/xfont/l3font.dtx 2017-02-20 02:29:02 UTC (rev 6963)
@@ -1,6 +1,6 @@
% \iffalse
%
-%% File: l3font.dtx Copyright (C) 2011,2012,2015,2016 LaTeX3 project
+%% File: l3font.dtx Copyright (C) 2011,2012,2015-2017 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
@@ -437,17 +437,17 @@
\sys_if_engine_luatex:TF
{
\cs_new_protected:Npn \font_suppress_not_found_error:
- { \luatexsuppressfontnotfounderror = \c_one }
+ { \int_set:Nn \luatexsuppressfontnotfounderror { 1 } }
\cs_new_protected:Npn \font_enable_not_found_error:
- { \luatexsuppressfontnotfounderror = \c_zero }
+ { \int_set:Nn \luatexsuppressfontnotfounderror { 0 } }
}
{
\sys_if_engine_xetex:TF
{
\cs_new_protected:Npn \font_suppress_not_found_error:
- { \suppressfontnotfounderror = \c_one }
+ { \int_set:Nn \suppressfontnotfounderror { 1 } }
\cs_new_protected:Npn \font_enable_not_found_error:
- { \suppressfontnotfounderror = \c_zero }
+ { \int_set:Nn \suppressfontnotfounderror { 0 } }
}
{
\cs_new_protected:Npn \font_suppress_not_found_error:
Modified: trunk/l3trial/xfont/xfss.dtx
===================================================================
--- trunk/l3trial/xfont/xfss.dtx 2017-02-19 22:58:35 UTC (rev 6962)
+++ trunk/l3trial/xfont/xfss.dtx 2017-02-20 02:29:02 UTC (rev 6963)
@@ -1,6 +1,6 @@
% \iffalse
%
-%% File xfss.dtx Copyright (C) 2011,2012,2015,2016 The LaTeX3 Project
+%% File xfss.dtx Copyright (C) 2011,2012,2015-2017 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
@@ -195,7 +195,7 @@
\cs_new_eq:NN \mathgroup_new:N \new at mathgroup
%</package>
%<*initex>
-\__alloc_new:nnnN {mathgroup} \c_zero \c_sixteen \tex_chardef:D
+\__alloc_new:nnnN {mathgroup} { 0 } { 16 } \tex_chardef:D
%</initex>
\cs_generate_variant:Nn \mathgroup_new:N {c}
% \end{macrocode}
@@ -517,7 +517,7 @@
##1.##2 \tl_to_str:n {pt} ##3 \exp_not:N \q_stop
{
##1
- \exp_not:N \int_compare:nNnT {##2} > \c_zero {.##2}
+ \exp_not:N \int_compare:nNnT {##2} > { 0 } {.##2}
}
}
% \end{macrocode}
@@ -1434,7 +1434,7 @@
\cs_if_exist:cF { \g_xfss_fontface_csname_tl }
{
\group_begin:
- \int_set:Nn \tex_escapechar:D { - \c_one }
+ \int_set:Nn \tex_escapechar:D { -1 }
\exp_after:wN \xfss_fontface_split:w \g_xfss_fontface_csname_tl \q_nil
\xfss_font_try_load_family: % try always
\cs_if_exist:cTF { \l_xfss_current_font_tl }
@@ -1942,7 +1942,7 @@
\cs_new_protected:Npn \xfss_process_table_check_error_font:
{
\group_begin:
- \int_set:Nn \tex_escapechar:D { - \c_one }
+ \int_set:Nn \tex_escapechar:D { -1 }
\xfss_error_font:
\cs_if_exist:cF {\l_xfss_current_font_tl}
{
@@ -1960,7 +1960,7 @@
% \subsection{Other}
%
% \begin{macrocode}
-\count18=\c_zero % what is that for??
+\count18=0\scan_stop: % what is that for??
\cs_set:Npn \tracingfonts
{
\FIXME % implement
@@ -2041,7 +2041,7 @@
\bool_if:NT \l_xfss_math_fonts_bool
{
\group_begin:
- \int_set:Nn \tex_escapechar:D { - \c_one }
+ \int_set:Nn \tex_escapechar:D { -1 }
\xfss_math_version_use:x { \l_xfss_math_version_tl }
\l_xfss_math_fonts_assign_tl
\tl_gset_eq:NN \g_xfss_setup_currsize_tl \l_xfss_size_tl
@@ -2954,7 +2954,7 @@
< \c_max_math_fonts_int
{
\group_begin:
- \int_set:Nn \tex_escapechar:D { - \c_one }
+ \int_set:Nn \tex_escapechar:D { -1 }
\exp_args:Nv \xfss_get_and_define_fonts:nn
{g_xfss_mversion_ \l_xfss_math_version_tl _int} #3
\l_xfss_math_fonts_assign_tl
More information about the latex3-commits
mailing list