[latex3-commits] [git/latex3] master: Fix a few wrong local/global assignments detected by last commit (c8f4374)
Bruno Le Floch
bruno at le-floch.fr
Wed Nov 29 02:54:17 CET 2017
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/c8f4374f6b94aa76a4415ed485942d94bc55c59d
>---------------------------------------------------------------
commit c8f4374f6b94aa76a4415ed485942d94bc55c59d
Author: Bruno Le Floch <bruno at le-floch.fr>
Date: Tue Nov 28 20:54:17 2017 -0500
Fix a few wrong local/global assignments detected by last commit
>---------------------------------------------------------------
c8f4374f6b94aa76a4415ed485942d94bc55c59d
l3experimental/l3str/l3str-convert.dtx | 2 +-
l3experimental/xgalley/xgalley.dtx | 27 +++++++++++++++++++--------
l3packages/xtemplate/xtemplate.dtx | 12 +++++++-----
l3trial/l3ldb/l3precom.dtx | 2 +-
4 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/l3experimental/l3str/l3str-convert.dtx b/l3experimental/l3str/l3str-convert.dtx
index b5ed855..9873b98 100644
--- a/l3experimental/l3str/l3str-convert.dtx
+++ b/l3experimental/l3str/l3str-convert.dtx
@@ -1102,7 +1102,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_convert_decode_clist:
{
- \clist_set:No \g_@@_result_tl \g_@@_result_tl
+ \clist_gset:No \g_@@_result_tl \g_@@_result_tl
\tl_gset:Nx \g_@@_result_tl
{
\exp_args:No \clist_map_function:nN
diff --git a/l3experimental/xgalley/xgalley.dtx b/l3experimental/xgalley/xgalley.dtx
index 8f43445..37ec8d6 100644
--- a/l3experimental/xgalley/xgalley.dtx
+++ b/l3experimental/xgalley/xgalley.dtx
@@ -1402,6 +1402,7 @@
% \end{macrocode}
% A bit more complex for the array penalties. Although the interface here
% does not expose the arrays, it is necessary to correctly save them.
+% We suspend debugging to allow an assignment to a constant.
% \begin{macrocode}
\seq_map_inline:Nn \c_@@_parbreak_multi_seq
{
@@ -1418,15 +1419,25 @@
}
}
\seq_new:N \c_@@_parbreak_multi_seq
-\seq_gput_right:Nn \c_@@_parbreak_multi_seq { club_penalties }
-\seq_gput_right:Nn \c_@@_parbreak_multi_seq { display_club_penalties }
-\seq_gput_right:Nn \c_@@_parbreak_multi_seq { display_widow_penalties }
-\seq_gput_right:Nn \c_@@_parbreak_multi_seq { widow_penalties }
+\debug_suspend:
+\seq_gset_from_clist:Nn \c_@@_parbreak_multi_seq
+ {
+ club_penalties ,
+ display_club_penalties ,
+ display_widow_penalties ,
+ widow_penalties ,
+ }
+\debug_resume:
\seq_new:N \c_@@_parbreak_single_seq
-\seq_gput_right:Nn \c_@@_parbreak_single_seq { parbreak_badness }
-\seq_gput_right:Nn \c_@@_parbreak_single_seq { broken_penalty }
-\seq_gput_right:Nn \c_@@_parbreak_single_seq { post_display_penalty }
-\seq_gput_right:Nn \c_@@_parbreak_single_seq { pre_display_penalty }
+\debug_suspend:
+\seq_gset_from_clist:Nn \c_@@_parbreak_single_seq
+ {
+ parbreak_badness ,
+ broken_penalty ,
+ post_display_penalty ,
+ pre_display_penalty ,
+ }
+\debug_resume:
% \end{macrocode}
% \end{variable}
% \begin{macrocode}
diff --git a/l3packages/xtemplate/xtemplate.dtx b/l3packages/xtemplate/xtemplate.dtx
index 3119370..d574c3a 100644
--- a/l3packages/xtemplate/xtemplate.dtx
+++ b/l3packages/xtemplate/xtemplate.dtx
@@ -717,13 +717,15 @@
% \end{variable}
%
% \begin{variable}{\c_@@_keytypes_arg_seq}
-% A list of keytypes which also need additional data (an argument), used
-% to parse the keytype correctly.
+% A list of keytypes which also need additional data (an argument),
+% used to parse the keytype correctly. We suspend debugging to allow
+% an assignment to a constant.
% \begin{macrocode}
\seq_new:N \c_@@_keytypes_arg_seq
-\seq_put_right:Nn \c_@@_keytypes_arg_seq { choice }
-\seq_put_right:Nn \c_@@_keytypes_arg_seq { function }
-\seq_put_right:Nn \c_@@_keytypes_arg_seq { instance }
+\debug_suspend:
+\seq_gset_from_clist:Nn \c_@@_keytypes_arg_seq
+ { choice , function , instance }
+\debug_resume:
% \end{macrocode}
% \end{variable}
%
diff --git a/l3trial/l3ldb/l3precom.dtx b/l3trial/l3ldb/l3precom.dtx
index 6bc165a..2c1e579 100644
--- a/l3trial/l3ldb/l3precom.dtx
+++ b/l3trial/l3ldb/l3precom.dtx
@@ -110,7 +110,7 @@
% This \meta{tl} is used to store the name of the file.
% \begin{macrocode}
\tl_new:N \g_cs_dump_name_tl
-\tl_set:Nn \g_cs_dump_name_tl { \c_sys_jobname_str -default.dmp }
+\tl_gset:Nn \g_cs_dump_name_tl { \c_sys_jobname_str -default.dmp }
% \end{macrocode}
% \end{variable}
%
More information about the latex3-commits
mailing list