summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/l3experimental
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-10-11 03:02:59 +0000
committerNorbert Preining <norbert@preining.info>2023-10-11 03:02:59 +0000
commit366cf31a771ded1f10860be3212058d48020398d (patch)
tree99ee483a9fd05dfd4ec908582abb44028bdffbd1 /macros/latex/contrib/l3experimental
parent48eedda2cb4d2644886b862409b24a1d8e9a136f (diff)
CTAN sync 202310110302
Diffstat (limited to 'macros/latex/contrib/l3experimental')
-rw-r--r--macros/latex/contrib/l3experimental/CHANGELOG.md9
-rw-r--r--macros/latex/contrib/l3experimental/README.md2
-rw-r--r--macros/latex/contrib/l3experimental/l3benchmark.dtx14
-rw-r--r--macros/latex/contrib/l3experimental/l3benchmark.pdfbin308866 -> 308535 bytes
-rw-r--r--macros/latex/contrib/l3experimental/l3bitset.dtx20
-rw-r--r--macros/latex/contrib/l3experimental/l3bitset.pdfbin404724 -> 404408 bytes
-rw-r--r--macros/latex/contrib/l3experimental/l3draw-boxes.dtx4
-rw-r--r--macros/latex/contrib/l3experimental/l3draw-code.pdfbin679710 -> 679935 bytes
-rw-r--r--macros/latex/contrib/l3experimental/l3draw-layers.dtx2
-rw-r--r--macros/latex/contrib/l3experimental/l3draw-paths.dtx12
-rw-r--r--macros/latex/contrib/l3experimental/l3draw-points.dtx2
-rw-r--r--macros/latex/contrib/l3experimental/l3draw-scopes.dtx4
-rw-r--r--macros/latex/contrib/l3experimental/l3draw-softpath.dtx20
-rw-r--r--macros/latex/contrib/l3experimental/l3draw-state.dtx6
-rw-r--r--macros/latex/contrib/l3experimental/l3draw-transforms.dtx8
-rw-r--r--macros/latex/contrib/l3experimental/l3draw.dtx4
-rw-r--r--macros/latex/contrib/l3experimental/l3draw.pdfbin518125 -> 517831 bytes
-rw-r--r--macros/latex/contrib/l3experimental/l3galley.dtx26
-rw-r--r--macros/latex/contrib/l3experimental/l3galley.pdfbin409224 -> 408917 bytes
-rw-r--r--macros/latex/contrib/l3experimental/l3graphics.dtx44
-rw-r--r--macros/latex/contrib/l3experimental/l3graphics.pdfbin383963 -> 383648 bytes
-rw-r--r--macros/latex/contrib/l3experimental/l3opacity.dtx4
-rw-r--r--macros/latex/contrib/l3experimental/l3opacity.pdfbin313919 -> 313597 bytes
-rw-r--r--macros/latex/contrib/l3experimental/l3str-format.dtx8
-rw-r--r--macros/latex/contrib/l3experimental/l3str-format.pdfbin368353 -> 368030 bytes
-rw-r--r--macros/latex/contrib/l3experimental/l3sys-shell.dtx28
-rw-r--r--macros/latex/contrib/l3experimental/l3sys-shell.pdfbin348383 -> 348054 bytes
-rw-r--r--macros/latex/contrib/l3experimental/xcoffins.dtx10
-rw-r--r--macros/latex/contrib/l3experimental/xcoffins.pdfbin394797 -> 394481 bytes
-rw-r--r--macros/latex/contrib/l3experimental/xgalley.dtx30
-rw-r--r--macros/latex/contrib/l3experimental/xgalley.pdfbin299962 -> 299638 bytes
31 files changed, 132 insertions, 125 deletions
diff --git a/macros/latex/contrib/l3experimental/CHANGELOG.md b/macros/latex/contrib/l3experimental/CHANGELOG.md
index e440354bfb..7befc1cdf8 100644
--- a/macros/latex/contrib/l3experimental/CHANGELOG.md
+++ b/macros/latex/contrib/l3experimental/CHANGELOG.md
@@ -7,6 +7,12 @@ this project uses date-based 'snapshot' version identifiers.
## [Unreleased]
+## [2023-10-10]
+
+### Changed
+- Slowdown a l3benchmark slow branch code slightly to gain test suite
+ robustness (issue \#1274)
+
## [2023-05-11]
### Changed
@@ -275,7 +281,8 @@ this project uses date-based 'snapshot' version identifiers.
- New `l3color` module using `xcolor`-like expression syntax
- New `l3draw` module, based on `pgf` layer of the TikZ system
-[Unreleased]: https://github.com/latex3/latex3/compare/2023-05-11...HEAD
+[Unreleased]: https://github.com/latex3/latex3/compare/2023-10-10...HEAD
+[2023-10-10]: https://github.com/latex3/latex3/compare/2023-05-11...2023-10-10
[2023-05-11]: https://github.com/latex3/latex3/compare/2023-04-19...2023-05-11
[2023-04-19]: https://github.com/latex3/latex3/compare/2023-03-30...2023-04-19
[2023-03-30]: https://github.com/latex3/latex3/compare/2023-01-24...2023-03-30
diff --git a/macros/latex/contrib/l3experimental/README.md b/macros/latex/contrib/l3experimental/README.md
index fad6c09a3b..f78ecff28a 100644
--- a/macros/latex/contrib/l3experimental/README.md
+++ b/macros/latex/contrib/l3experimental/README.md
@@ -1,7 +1,7 @@
Experimental LaTeX3 Concepts
============================
-Release 2023-05-11
+Release 2023-10-10
Overview
--------
diff --git a/macros/latex/contrib/l3experimental/l3benchmark.dtx b/macros/latex/contrib/l3experimental/l3benchmark.dtx
index c02099765d..cd41c2103e 100644
--- a/macros/latex/contrib/l3experimental/l3benchmark.dtx
+++ b/macros/latex/contrib/l3experimental/l3benchmark.dtx
@@ -46,7 +46,7 @@
% }^^A
% }
%
-% \date{Released 2023-05-11}
+% \date{Released 2023-10-10}
%
% \maketitle
%
@@ -122,7 +122,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplPackage{l3benchmark}{2023-05-11}{}
+\ProvidesExplPackage{l3benchmark}{2023-10-10}{}
{L3 Experimental benchmarking}
% \end{macrocode}
%
@@ -225,13 +225,13 @@
}
\cs_new_protected:Npn \@@_raw_replicate_large:nnN #1#2
{
- \cs_set:Npx \@@_tmp:w ##1 { \prg_replicate:nn { 5000 } {##1} }
+ \cs_set:Npe \@@_tmp:w ##1 { \prg_replicate:nn { 5000 } {##1} }
\exp_args:Nno \@@_raw_replicate:nnN { #1 / 5000 }
{ \@@_tmp:w {#2} }
}
\cs_new_protected:Npn \@@_raw_replicate_small:nnN #1#2
{
- \cs_set:Npx \@@_tmp:w ##1##2 { \prg_replicate:nn {#1} {##1} }
+ \cs_set:Npe \@@_tmp:w ##1##2 { \prg_replicate:nn {#1} {##1} }
\@@_raw:nN { \@@_tmp:w {#2} { } } \g_@@_time_int
\exp_args:No \@@_raw_replicate_aux:nnN
{ \int_use:N \g_@@_time_int } {#2}
@@ -439,7 +439,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_display:
{
- \iow_term:x
+ \iow_term:e
{
\@@_fp_to_tl:N \g_benchmark_time_fp \c_space_tl seconds \c_space_tl
( \@@_fp_to_tl:N \g_benchmark_ops_fp \c_space_tl ops)
@@ -474,7 +474,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \benchmark_tic:
{
- \iow_term:x { \@@_tictoc_prefix: TIC }
+ \iow_term:e { \@@_tictoc_prefix: TIC }
\exp_args:NNf \seq_gput_right:Nn \g_@@_tictoc_seq { \sys_timer: }
\int_gincr:N \g_@@_tictoc_int
}
@@ -494,7 +494,7 @@
\int_gdecr:N \g_@@_tictoc_int
\fp_gset:Nn \g_benchmark_time_fp
{ ( \sys_timer: - \l_@@_tictoc_pop_tl ) / 65536 }
- \iow_term:x
+ \iow_term:e
{
\@@_tictoc_prefix:
TOC: \c_space_tl
diff --git a/macros/latex/contrib/l3experimental/l3benchmark.pdf b/macros/latex/contrib/l3experimental/l3benchmark.pdf
index c8c57e9169..a4f0054473 100644
--- a/macros/latex/contrib/l3experimental/l3benchmark.pdf
+++ b/macros/latex/contrib/l3experimental/l3benchmark.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3experimental/l3bitset.dtx b/macros/latex/contrib/l3experimental/l3bitset.dtx
index c15e0288e2..6d342b0955 100644
--- a/macros/latex/contrib/l3experimental/l3bitset.dtx
+++ b/macros/latex/contrib/l3experimental/l3bitset.dtx
@@ -42,7 +42,7 @@
% }^^A
% }
%
-% \date{Released 2023-05-11}
+% \date{Released 2023-10-10}
%
% \maketitle
% \begin{documentation}
@@ -264,7 +264,7 @@
%<@@=bitset>
% \end{macrocode}
% \begin{macrocode}
-\ProvidesExplPackage{l3bitset}{2023-05-11}{}
+\ProvidesExplPackage{l3bitset}{2023-10-10}{}
{L3 Experimental bitset support}
% \end{macrocode}
% A bitset is a string variable.
@@ -337,13 +337,13 @@
% then inserting an $1$. It is not checked if the value was already $1$.
% \begin{macrocode}
\cs_new_protected:Npn \@@_set_true:Nn #1#2
- { \@@_set:NNnN \str_set:Nx #1 {#2} 1 }
+ { \@@_set:NNnN \str_set:Ne #1 {#2} 1 }
\cs_new_protected:Npn \@@_gset_true:Nn #1#2
- { \@@_set:NNnN \str_gset:Nx #1 {#2} 1 }
+ { \@@_set:NNnN \str_gset:Ne #1 {#2} 1 }
\cs_new_protected:Npn \@@_set_false:Nn #1#2
- { \@@_set:NNnN \str_set:Nx #1 {#2} 0 }
+ { \@@_set:NNnN \str_set:Ne #1 {#2} 0 }
\cs_new_protected:Npn \@@_gset_false:Nn #1#2
- { \@@_set:NNnN \str_gset:Nx #1 {#2} 0 }
+ { \@@_set:NNnN \str_gset:Ne #1 {#2} 0 }
\cs_new_protected:Npn \@@_set:NNnN #1#2#3#4
{
\int_compare:nNnT {#3} > { 0 }
@@ -434,7 +434,7 @@
\prop_gput:cnn { g_@@_ \cs_to_str:N #2 _name_prop } {#3} {#3}
}
{
- \msg_warning:nnxx { bitset } { unknown-name }
+ \msg_warning:nnee { bitset } { unknown-name }
{ \token_to_str:N #2 }
{ \tl_to_str:n {#3} }
}
@@ -531,11 +531,11 @@
% \bitset_log:N, \bitset_log:c
% }
% \begin{macrocode}
-\cs_new_protected:Npn \bitset_show:N { \@@_show:NN \msg_show:nnxxxx }
+\cs_new_protected:Npn \bitset_show:N { \@@_show:NN \msg_show:nneeee }
\cs_generate_variant:Nn \bitset_show:N { c }
-\cs_new_protected:Npn \bitset_log:N { \@@_show:NN \msg_log:nnxxxx }
+\cs_new_protected:Npn \bitset_log:N { \@@_show:NN \msg_log:nneeee }
\cs_generate_variant:Nn \bitset_log:N { c }
-\cs_new_protected:Npn \bitset_show_named_index:N { \@@_show_named_index:NN \msg_show:nnxxxx }
+\cs_new_protected:Npn \bitset_show_named_index:N { \@@_show_named_index:NN \msg_show:nneeee }
\cs_generate_variant:Nn \bitset_show_named_index:N { c }
\cs_new_protected:Npn \@@_show:NN #1#2
{
diff --git a/macros/latex/contrib/l3experimental/l3bitset.pdf b/macros/latex/contrib/l3experimental/l3bitset.pdf
index b7744fd2b6..095a3dd391 100644
--- a/macros/latex/contrib/l3experimental/l3bitset.pdf
+++ b/macros/latex/contrib/l3experimental/l3bitset.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3experimental/l3draw-boxes.dtx b/macros/latex/contrib/l3experimental/l3draw-boxes.dtx
index d8704e4545..b48aa9d995 100644
--- a/macros/latex/contrib/l3experimental/l3draw-boxes.dtx
+++ b/macros/latex/contrib/l3experimental/l3draw-boxes.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2023-05-11}
+% \date{Released 2023-10-10}
%
% \maketitle
%
@@ -102,7 +102,7 @@
\group_begin:
\hbox_set:Nn \l_@@_tmp_box
{
- \use:x
+ \use:e
{
\@@_backend_box_use:Nnnnn #1
{ \fp_use:N \l_@@_matrix_a_fp }
diff --git a/macros/latex/contrib/l3experimental/l3draw-code.pdf b/macros/latex/contrib/l3experimental/l3draw-code.pdf
index 4926dccaa7..9e5404c221 100644
--- a/macros/latex/contrib/l3experimental/l3draw-code.pdf
+++ b/macros/latex/contrib/l3experimental/l3draw-code.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3experimental/l3draw-layers.dtx b/macros/latex/contrib/l3experimental/l3draw-layers.dtx
index 0303081b15..e85f370c34 100644
--- a/macros/latex/contrib/l3experimental/l3draw-layers.dtx
+++ b/macros/latex/contrib/l3experimental/l3draw-layers.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2023-05-11}
+% \date{Released 2023-10-10}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3experimental/l3draw-paths.dtx b/macros/latex/contrib/l3experimental/l3draw-paths.dtx
index 702ef922f9..41e866e563 100644
--- a/macros/latex/contrib/l3experimental/l3draw-paths.dtx
+++ b/macros/latex/contrib/l3experimental/l3draw-paths.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2023-05-11}
+% \date{Released 2023-10-10}
%
% \maketitle
%
@@ -346,7 +346,7 @@
{
\fp_set:Nn \l_@@_path_tmpa_fp { \c_@@_path_curveto_b_fp * #1 }
\fp_set:Nn \l_@@_path_tmpb_fp { \c_@@_path_curveto_b_fp * #2 }
- \use:x
+ \use:e
{
\@@_path_mark_corner:
\@@_path_curveto:nnnnnn
@@ -409,7 +409,7 @@
{ \draw_path_arc:nnnn {#1} {#2} {#3} {#3} }
\cs_new_protected:Npn \draw_path_arc:nnnn #1#2#3#4
{
- \use:x
+ \use:e
{
\@@_path_arc:nnnn
{ \fp_eval:n {#1} }
@@ -464,7 +464,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_path_arc_auxi:nnnnNnn #1#2#3#4#5#6#7
{
- \use:x
+ \use:e
{
\@@_path_arc_auxii:nnnNnnnn
{#1} {#2} {#4} #5 {#6} {#7}
@@ -564,7 +564,7 @@
}
\cs_new_protected:Npn \@@_path_arc_aux_add:nn #1#2
{
- \tl_put_right:Nx \l_@@_path_tmp_tl
+ \tl_put_right:Ne \l_@@_path_tmp_tl
{ { \fp_to_dim:n {#1} } { \fp_to_dim:n {#2} } }
}
\fp_new:N \l_@@_path_arc_delta_fp
@@ -624,7 +624,7 @@
}
\cs_new_protected:Npn \@@_path_ellipse:nnnnnn #1#2#3#4#5#6
{
- \use:x
+ \use:e
{
\@@_path_moveto:nn
{ \fp_to_dim:n { #1 + #3 } } { \fp_to_dim:n { #2 + #4 } }
diff --git a/macros/latex/contrib/l3experimental/l3draw-points.dtx b/macros/latex/contrib/l3experimental/l3draw-points.dtx
index e858b98f10..044f01a374 100644
--- a/macros/latex/contrib/l3experimental/l3draw-points.dtx
+++ b/macros/latex/contrib/l3experimental/l3draw-points.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2023-05-11}
+% \date{Released 2023-10-10}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3experimental/l3draw-scopes.dtx b/macros/latex/contrib/l3experimental/l3draw-scopes.dtx
index 75b5238b38..4017e46f17 100644
--- a/macros/latex/contrib/l3experimental/l3draw-scopes.dtx
+++ b/macros/latex/contrib/l3experimental/l3draw-scopes.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2023-05-11}
+% \date{Released 2023-10-10}
%
% \maketitle
%
@@ -247,7 +247,7 @@
{
\bool_if:NTF \l_@@_baseline_bool
{
- \use:x
+ \use:e
{
\exp_not:n {#1}
\@@_finalise_baseline:n { \dim_use:N \l_@@_baseline_dim }
diff --git a/macros/latex/contrib/l3experimental/l3draw-softpath.dtx b/macros/latex/contrib/l3experimental/l3draw-softpath.dtx
index 867164c026..44524fb17b 100644
--- a/macros/latex/contrib/l3experimental/l3draw-softpath.dtx
+++ b/macros/latex/contrib/l3experimental/l3draw-softpath.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2023-05-11}
+% \date{Released 2023-10-10}
%
% \maketitle
%
@@ -96,11 +96,11 @@
% \end{macrocode}
% \end{variable}
%
-% \begin{macro}{\@@_softpath_add:n, \@@_softpath_add:o, \@@_softpath_add:x}
+% \begin{macro}{\@@_softpath_add:n, \@@_softpath_add:o, \@@_softpath_add:e}
% \begin{macrocode}
\cs_new_protected:Npn \@@_softpath_add:n
{ \tl_build_gput_right:Nn \g_@@_softpath_main_tl }
-\cs_generate_variant:Nn \@@_softpath_add:n { o, x }
+\cs_generate_variant:Nn \@@_softpath_add:n { o, e }
% \end{macrocode}
% \end{macro}
%
@@ -150,7 +150,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_softpath_closepath:
{
- \@@_softpath_add:x
+ \@@_softpath_add:e
{
\@@_softpath_close_op:nn
{ \dim_use:N \g_@@_softpath_lastx_dim }
@@ -466,19 +466,19 @@
% corner, in order to work out where the curve we are adding will start
% and end. From those, plus the points we already have, we work out where
% the control points will lie. All of this is done in an expansion to
-% avoid multiple calls to |\tl_put_right:Nx|. The end point of the line
+% avoid multiple calls to |\tl_put_right:Ne|. The end point of the line
% is worked out up-front and saved: we need that if dealing with a
% close-path operation.
% \begin{macrocode}
\cs_new_protected:Npn \@@_softpath_round_calc:NnnNnn #1#2#3#4#5#6
{
- \tl_set:Nx \l_@@_softpath_curve_end_tl
+ \tl_set:Ne \l_@@_softpath_curve_end_tl
{
\draw_point_interpolate_distance:nnn
\l_@@_softpath_cornerii_dim
{ #5 , #6 } { #2 , #3 }
}
- \tl_put_right:Nx \l_@@_softpath_part_tl
+ \tl_put_right:Ne \l_@@_softpath_part_tl
{
\exp_not:N #4
\@@_softpath_round_calc:fVnnnn
@@ -546,11 +546,11 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_softpath_round_close:nn #1#2
{
- \use:x
+ \use:e
{
\@@_softpath_round_calc:NnnNnn
{
- \tl_set:Nx \exp_not:N \l_@@_softpath_move_tl
+ \tl_set:Ne \exp_not:N \l_@@_softpath_move_tl
{
\@@_softpath_moveto_op:nn
\exp_not:N \exp_after:wN
@@ -558,7 +558,7 @@
\exp_not:N \l_@@_softpath_curve_end_tl
\s_@@_stop
}
- \use:x
+ \use:e
{
\exp_not:N \exp_not:N \exp_not:N \use_i:nnnn
{
diff --git a/macros/latex/contrib/l3experimental/l3draw-state.dtx b/macros/latex/contrib/l3experimental/l3draw-state.dtx
index fca6f78389..e1a67309e2 100644
--- a/macros/latex/contrib/l3experimental/l3draw-state.dtx
+++ b/macros/latex/contrib/l3experimental/l3draw-state.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2023-05-11}
+% \date{Released 2023-10-10}
%
% \maketitle
%
@@ -107,7 +107,7 @@
\seq_set_from_clist:Nn \l_@@_tmp_seq {#1}
\seq_set_map:NNn \l_@@_tmp_seq \l_@@_tmp_seq
{ \fp_to_dim:n {##1} }
- \use:x
+ \use:e
{
\@@_backend_dash_pattern:nn
{ \seq_use:Nn \l_@@_tmp_seq { , } }
@@ -124,7 +124,7 @@
% Pass through to the driver layer.
% \begin{macrocode}
\cs_new_protected:Npn \draw_miterlimit:n #1
- { \exp_args:Nx \@@_backend_miterlimit:n { \fp_eval:n {#1} } }
+ { \exp_args:Ne \@@_backend_miterlimit:n { \fp_eval:n {#1} } }
% \end{macrocode}
% \end{macro}
%
diff --git a/macros/latex/contrib/l3experimental/l3draw-transforms.dtx b/macros/latex/contrib/l3experimental/l3draw-transforms.dtx
index 901b0b6f84..35b31395db 100644
--- a/macros/latex/contrib/l3experimental/l3draw-transforms.dtx
+++ b/macros/latex/contrib/l3experimental/l3draw-transforms.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2023-05-11}
+% \date{Released 2023-10-10}
%
% \maketitle
%
@@ -172,7 +172,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \draw_transform_matrix:nnnn #1#2#3#4
{
- \use:x
+ \use:e
{
\@@_transform:nnnn
{ \fp_eval:n {#1} }
@@ -183,7 +183,7 @@
}
\cs_new_protected:Npn \@@_transform:nnnn #1#2#3#4
{
- \use:x
+ \use:e
{
\draw_transform_matrix_absolute:nnnn
{ #1 * \l_@@_matrix_a_fp + #2 * \l_@@_matrix_c_fp }
@@ -269,7 +269,7 @@
}
\cs_new_protected:Npn \@@_transform_triangle:nnnnnn #1#2#3#4#5#6
{
- \use:x
+ \use:e
{
\draw_transform_matrix_absolute:nnnn
{ #3 - #1 }
diff --git a/macros/latex/contrib/l3experimental/l3draw.dtx b/macros/latex/contrib/l3experimental/l3draw.dtx
index 7d4afed84f..d1e604d42d 100644
--- a/macros/latex/contrib/l3experimental/l3draw.dtx
+++ b/macros/latex/contrib/l3experimental/l3draw.dtx
@@ -110,7 +110,7 @@
% }^^A
% }
%
-% \date{Released 2023-05-11}
+% \date{Released 2023-10-10}
%
% \maketitle
%
@@ -1173,7 +1173,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplPackage{l3draw}{2023-05-11}{}
+\ProvidesExplPackage{l3draw}{2023-10-10}{}
{L3 Experimental core drawing support}
% \end{macrocode}
%
diff --git a/macros/latex/contrib/l3experimental/l3draw.pdf b/macros/latex/contrib/l3experimental/l3draw.pdf
index 81f9aa126c..485b4ded36 100644
--- a/macros/latex/contrib/l3experimental/l3draw.pdf
+++ b/macros/latex/contrib/l3experimental/l3draw.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3experimental/l3galley.dtx b/macros/latex/contrib/l3experimental/l3galley.dtx
index a40688f42a..7272d8625e 100644
--- a/macros/latex/contrib/l3experimental/l3galley.dtx
+++ b/macros/latex/contrib/l3experimental/l3galley.dtx
@@ -61,7 +61,7 @@
% }^^A
% }
%
-% \date{Released 2023-05-11}
+% \date{Released 2023-10-10}
%
% \maketitle
%
@@ -686,7 +686,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplPackage{l3galley}{2023-05-11}{}
+\ProvidesExplPackage{l3galley}{2023-10-10}{}
{L3 Experimental galley code}
% \end{macrocode}
%
@@ -1325,7 +1325,7 @@
{
\tl_if_empty:NF #1
{
- \tl_gput_right:Nx \g_galley_restore_running_tl
+ \tl_gput_right:Ne \g_galley_restore_running_tl
{
\int_gset:Nn \exp_not:N \g_galley_penalty_int
{ \int_use:N \g_galley_penalty_int }
@@ -1337,7 +1337,7 @@
{
\tl_if_empty:NF #1
{
- \tl_gput_right:Nx \g_galley_restore_running_tl
+ \tl_gput_right:Ne \g_galley_restore_running_tl
{
\skip_gset:Nn \exp_not:N \g_galley_vspace_skip
{ \skip_use:N \g_galley_vspace_skip }
@@ -1755,7 +1755,7 @@
{
\seq_gpop_left:NNF #2 \l_@@_tmp_tl
{ \tl_set:Nn \l_@@_tmp_tl { 0pt } }
- \seq_put_right:Nx \l_@@_tmp_seq
+ \seq_put_right:Ne \l_@@_tmp_seq
{ \dim_eval:n { ##1 + \l_@@_tmp_tl } }
}
}
@@ -1950,10 +1950,10 @@
% deals with this nicely.
% \begin{macrocode}
\cs_new_protected:Npn \galley_penalty_set_single:n #1
- { \tl_gset:Nx \g_@@_interpar_penalty_user_tl { \int_eval:n {#1} } }
+ { \tl_gset:Ne \g_@@_interpar_penalty_user_tl { \int_eval:n {#1} } }
\cs_new_protected:Npn \galley_penalty_add_single:n #1
{
- \tl_gset:Nx \g_@@_interpar_penalty_user_tl
+ \tl_gset:Ne \g_@@_interpar_penalty_user_tl
{
\int_eval:n
{
@@ -1964,10 +1964,10 @@
}
}
\cs_new_protected:Npn \galley_vspace_set_single:n #1
- { \tl_gset:Nx \g_@@_interpar_vspace_user_tl { \skip_eval:n {#1} } }
+ { \tl_gset:Ne \g_@@_interpar_vspace_user_tl { \skip_eval:n {#1} } }
\cs_new_protected:Npn \galley_vspace_add_single:n #1
{
- \tl_gset:Nx \g_@@_interpar_vspace_user_tl
+ \tl_gset:Ne \g_@@_interpar_vspace_user_tl
{
\skip_eval:n
{
@@ -2408,11 +2408,11 @@
{ \clist_set_eq:NN #1 \l_galley_line_penalties_clist }
% \end{macrocode}
% These all require appropriate mappings, using the fact that
-% \cs{clist_set:Nx} will tidy up the excess comma.
+% \cs{clist_set:Ne} will tidy up the excess comma.
% \begin{macrocode}
\cs_new_protected:Npn \galley_save_display_club_penalties:N #1
{
- \clist_set:Nx #1
+ \clist_set:Ne #1
{
\int_step_function:nN { \tex_clubpenalties:D 0 - 1 }
\@@_save_display_club_penalties:n
@@ -2422,7 +2422,7 @@
{ \int_value:w \tex_clubpenalties:D \int_eval:n {#1} , }
\cs_new_protected:Npn \galley_save_display_widow_penalties:N #1
{
- \clist_set:Nx #1
+ \clist_set:Ne #1
{
\int_step_function:nN { \tex_displaywidowpenalties:D 0 - 1 }
\@@_save_display_widow_penalties:n
@@ -2435,7 +2435,7 @@
}
\cs_new_protected:Npn \galley_save_widow_penalties:N #1
{
- \clist_set:Nx #1
+ \clist_set:Ne #1
{
\int_step_function:nN { \tex_widowpenalties:D 0 - 1 }
\@@_save_widow_penalties:n
diff --git a/macros/latex/contrib/l3experimental/l3galley.pdf b/macros/latex/contrib/l3experimental/l3galley.pdf
index e0ca0b85d4..3ba577c159 100644
--- a/macros/latex/contrib/l3experimental/l3galley.pdf
+++ b/macros/latex/contrib/l3experimental/l3galley.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3experimental/l3graphics.dtx b/macros/latex/contrib/l3experimental/l3graphics.dtx
index 3209e4793c..0266b711fa 100644
--- a/macros/latex/contrib/l3experimental/l3graphics.dtx
+++ b/macros/latex/contrib/l3experimental/l3graphics.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-05-11}
+% \date{Released 2023-10-10}
%
% \maketitle
%
@@ -184,7 +184,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplPackage{l3graphics}{2023-05-11}{}
+\ProvidesExplPackage{l3graphics}{2023-10-10}{}
{L3 Experimental graphics inclusion support}
% \end{macrocode}
%
@@ -236,8 +236,8 @@
pagebox .choices:nn =
{ art , bleed , crop , media , trim }
{
- \tl_set:Nx \l_@@_pagebox_tl
- { \tl_use:N \l_keys_choice_tl box }
+ \tl_set:Ne \l_@@_pagebox_tl
+ { \l_keys_choice_tl box }
} ,
pagebox .initial:n =
crop ,
@@ -267,8 +267,8 @@
% \end{macrocode}
% \end{variable}
%
-% \begin{macro}{\@@_bb_save:n, \@@_bb_save:x}
-% \begin{macro}{\@@_bb_restore:nF, \@@_bb_restore:xF}
+% \begin{macro}{\@@_bb_save:n, \@@_bb_save:e}
+% \begin{macro}{\@@_bb_restore:nF, \@@_bb_restore:eF}
% Caching graphic bounding boxes is sensible, and these functions are needed both
% here and for drive-specific work. So they are made available as documented
% functions. To save on registers, the \enquote{origin} is only saved if it is
@@ -287,7 +287,7 @@
\dim_const:cn { c_@@_ #1 _ury_dim } { \l_@@_ury_dim }
}
}
-\cs_generate_variant:Nn \@@_bb_save:n { x }
+\cs_generate_variant:Nn \@@_bb_save:n { e }
\cs_new_protected:Npn \@@_bb_restore:nF #1#2
{
\dim_if_exist:cTF { c_@@_ #1 _urx_dim }
@@ -303,7 +303,7 @@
}
{#2}
}
-\cs_generate_variant:Nn \@@_bb_restore:nF { x }
+\cs_generate_variant:Nn \@@_bb_restore:nF { e }
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -375,7 +375,7 @@
\@@_bb_restore:nF {#1#2}
{ \@@_read_bb_auxii:nnnn {#3} {#4} {#1} {#2} }
}
-\cs_new_protected:Npx \@@_read_bb_auxii:nnnn #1#2#3#4
+\cs_new_protected:Npe \@@_read_bb_auxii:nnnn #1#2#3#4
{
#1
\exp_not:N \ior_if_eof:NTF \exp_not:N \l_@@_internal_ior
@@ -390,15 +390,15 @@
}
\ior_close:N \exp_not:N \l_@@_internal_ior
}
-\use:x
+\use:e
{
\cs_new_protected:Npn \exp_not:N \@@_read_bb_auxiii:w
- ##1 \c_colon_str ##2 \s_@@_stop
+ #1 \c_colon_str #2 \s_@@_stop
{
\exp_not:N \str_if_eq:nnT
{ \c_percent_str \c_percent_str BoundingBox }
- {##1}
- { \exp_not:N \@@_read_bb_auxiv:w ##2 ( ) \s_@@_stop }
+ {#1}
+ { \exp_not:N \@@_read_bb_auxiv:w #2 ( ) \s_@@_stop }
}
}
% \end{macrocode}
@@ -413,7 +413,7 @@
{
\str_if_eq:nnF {#2} { atend }
{
- \tl_set_rescan:Nnx \l_@@_internal_tl
+ \tl_set_rescan:Nne \l_@@_internal_tl
{
\char_set_catcode_space:n { 9 }
\char_set_catcode_space:n { 32 }
@@ -552,7 +552,7 @@
\cs_if_exist:cTF { @@_backend_include_ #1 :n }
{
\tl_set_eq:NN \l_@@_final_name_str \l_@@_full_name_str
- \str_set:Nx \l_@@_full_name_str
+ \str_set:Ne \l_@@_full_name_str
{ \exp_args:NV \__kernel_file_name_quote:n \l_@@_full_name_str }
\exp_args:NnV \use:c { @@_backend_getbb_ #1 :n }
\l_@@_full_name_str
@@ -615,8 +615,8 @@
% \begin{macro}[EXP]{\@@_list_aux:n}
% A function to list all graphic files used.
% \begin{macrocode}
-\cs_new_protected:Npn \graphics_show_list: { \@@_list:N \msg_show:nnxxxx }
-\cs_new_protected:Npn \graphics_log_list: { \@@_list:N \msg_log:nnxxxx }
+\cs_new_protected:Npn \graphics_show_list: { \@@_list:N \msg_show:nneeee }
+\cs_new_protected:Npn \graphics_log_list: { \@@_list:N \msg_log:nneeee }
\cs_new_protected:Npn \@@_list:N #1
{
\seq_remove_duplicates:N \g_@@_record_seq
@@ -714,7 +714,7 @@
\exp_args:NNNV \group_end:
\tl_set:Nn #2 #2
}
-\cs_new_protected:Npx \@@_get_pagecount:n #1
+\cs_new_protected:Npe \@@_get_pagecount:n #1
{
\ior_shell_open:Nn \exp_not:N \l_@@_internal_ior
{ extractbb~-O~#1 }
@@ -731,16 +731,16 @@
}
\ior_close:N \exp_not:N \l_@@_internal_ior
}
-\use:x
+\use:e
{
\cs_new_protected:Npn \exp_not:N \@@_get_pagecount:nw
- ##1##2 \c_colon_str ##3 \c_colon_str ##4 \s_@@_stop
+ #1#2 \c_colon_str #3 \c_colon_str #4 \s_@@_stop
{
\exp_not:N \str_if_eq:nnT
{ \c_percent_str \c_percent_str Pages }
- {##2}
+ {#2}
{
- \int_const:cn { c_@@_ ##1 _pages_int } {##3}
+ \int_const:cn { c_@@_ #1 _pages_int } {#3}
\exp_not:N \ior_map_break:
}
}
diff --git a/macros/latex/contrib/l3experimental/l3graphics.pdf b/macros/latex/contrib/l3experimental/l3graphics.pdf
index e51c8b2650..dd86d0bd76 100644
--- a/macros/latex/contrib/l3experimental/l3graphics.pdf
+++ b/macros/latex/contrib/l3experimental/l3graphics.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3experimental/l3opacity.dtx b/macros/latex/contrib/l3experimental/l3opacity.dtx
index 0412372235..3fce2c27d1 100644
--- a/macros/latex/contrib/l3experimental/l3opacity.dtx
+++ b/macros/latex/contrib/l3experimental/l3opacity.dtx
@@ -46,7 +46,7 @@
% }^^A
% }
%
-% \date{Released 2023-05-11}
+% \date{Released 2023-10-10}
%
% \maketitle
%
@@ -96,7 +96,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplPackage{l3opacity}{2023-05-11}{}
+\ProvidesExplPackage{l3opacity}{2023-10-10}{}
{L3 Experimental opacity support}
% \end{macrocode}
%
diff --git a/macros/latex/contrib/l3experimental/l3opacity.pdf b/macros/latex/contrib/l3experimental/l3opacity.pdf
index 8a1140d1cb..bd73f200d5 100644
--- a/macros/latex/contrib/l3experimental/l3opacity.pdf
+++ b/macros/latex/contrib/l3experimental/l3opacity.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3experimental/l3str-format.dtx b/macros/latex/contrib/l3experimental/l3str-format.dtx
index af0ad23e9f..10ccfb2f79 100644
--- a/macros/latex/contrib/l3experimental/l3str-format.dtx
+++ b/macros/latex/contrib/l3experimental/l3str-format.dtx
@@ -48,7 +48,7 @@
% }^^A
% }
%
-% \date{Released 2023-05-11}
+% \date{Released 2023-10-10}
%
% \maketitle
%
@@ -166,7 +166,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplPackage{l3str-format}{2023-05-11}{}
+\ProvidesExplPackage{l3str-format}{2023-10-10}{}
{L3 Experimental string formatting}
% \end{macrocode}
%
@@ -256,7 +256,7 @@
\exp_last_unbraced:Nf \@@_format_parse_auxi:NN
{ \__kernel_str_to_other:n {#1} } \s_@@_stop \s_@@_stop {#1}
}
-\cs_new:Npx \@@_format_parse_auxi:NN #1#2
+\cs_new:Npe \@@_format_parse_auxi:NN #1#2
{
\exp_not:N \@@_format_if_in:nNTF { < > = ^ } #2
{ \exp_not:N \@@_format_parse_auxiii:nN { #1 #2 } }
@@ -271,7 +271,7 @@
{ \@@_format_parse_auxiii:nN { #1 #2 } }
{ \@@_format_parse_auxiii:nN { #1 ? } #2 }
}
-\cs_new:Npx \@@_format_parse_auxiii:nN #1#2
+\cs_new:Npe \@@_format_parse_auxiii:nN #1#2
{
\exp_not:N \@@_format_if_in:nNTF
{ + - \c_catcode_other_space_tl }
diff --git a/macros/latex/contrib/l3experimental/l3str-format.pdf b/macros/latex/contrib/l3experimental/l3str-format.pdf
index 5c7e16f870..dbc0058ace 100644
--- a/macros/latex/contrib/l3experimental/l3str-format.pdf
+++ b/macros/latex/contrib/l3experimental/l3str-format.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3experimental/l3sys-shell.dtx b/macros/latex/contrib/l3experimental/l3sys-shell.dtx
index dfc2fb188a..0cc622dbbb 100644
--- a/macros/latex/contrib/l3experimental/l3sys-shell.dtx
+++ b/macros/latex/contrib/l3experimental/l3sys-shell.dtx
@@ -46,7 +46,7 @@
% }^^A
% }
%
-% \date{Released 2023-05-11}
+% \date{Released 2023-10-10}
%
% \maketitle
%
@@ -151,7 +151,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplPackage{l3sys-shell}{2023-05-11}{}
+\ProvidesExplPackage{l3sys-shell}{2023-10-10}{}
{L3 Experimental system shell functions}
% \end{macrocode}
%
@@ -213,11 +213,11 @@
% Simple Unix-like file copying: at some stage we may need a directory-only
% version as Windows and Unix have different requirements here.
% \begin{macrocode}
-\cs_new_protected:Npx \sys_shell_cp:nn #1#2
+\cs_new_protected:Npe \sys_shell_cp:nn #1#2
{
\sys_if_shell_unrestricted:T
{
- \sys_shell_now:x
+ \sys_shell_now:e
{
\sys_if_platform_unix:T
{
@@ -240,11 +240,11 @@
% issues a warning if the directory already exists: avoid by including a
% test.
% \begin{macrocode}
-\cs_new_protected:Npx \sys_shell_mkdir:n #1
+\cs_new_protected:Npe \sys_shell_mkdir:n #1
{
\sys_if_shell_unrestricted:T
{
- \sys_shell_now:x
+ \sys_shell_now:e
{
\sys_if_platform_unix:T
{ mkdir~-p~ \exp_not:N \tl_to_str:n {#1} }
@@ -264,11 +264,11 @@
% On Windows we do not have a single |mv| operation, so copy-and-delete
% instead.
% \begin{macrocode}
-\cs_new_protected:Npx \sys_shell_mv:nn #1#2
+\cs_new_protected:Npe \sys_shell_mv:nn #1#2
{
\sys_if_shell_unrestricted:T
{
- \sys_shell_now:x
+ \sys_shell_now:e
{
\sys_if_platform_unix:T
{
@@ -291,11 +291,11 @@
% \begin{macro}{\sys_shell_rm:n}
% Deletion: obviously a big health warning here!
% \begin{macrocode}
-\cs_new_protected:Npx \sys_shell_rm:n #1
+\cs_new_protected:Npe \sys_shell_rm:n #1
{
\sys_if_shell_unrestricted:T
{
- \sys_shell_now:x
+ \sys_shell_now:e
{
\sys_if_platform_unix:T
{ rm~-f~ \exp_not:N \tl_to_str:n {#1} }
@@ -311,12 +311,12 @@
% When removing a directory, we create it first as that avoids errors in
% the Windows case.
% \begin{macrocode}
-\cs_new_protected:Npx \sys_shell_rmdir:n #1
+\cs_new_protected:Npe \sys_shell_rmdir:n #1
{
\sys_if_shell_unrestricted:T
{
\sys_shell_mkdir:n {#1}
- \sys_shell_now:x
+ \sys_shell_now:e
{
\sys_if_platform_unix:T
{ rm~-rf~ \exp_not:N \tl_to_str:n {#1} }
@@ -341,7 +341,7 @@
% that does not require shell escape. However, it's hard to see how it might
% be useful without the other file functions.)
% \begin{macrocode}
-\cs_new_protected:Npx \sys_get_shell_pwd:N #1
+\cs_new_protected:Npe \sys_get_shell_pwd:N #1
{
\sys_if_shell_unrestricted:T
{
@@ -371,7 +371,7 @@
% just a case of tidying up. The listing always ends in |^^M| so there is an
% extra entry to trim.
% \begin{macrocode}
-\cs_new_protected:Npx \sys_shell_split_ls:nN #1#2
+\cs_new_protected:Npe \sys_shell_split_ls:nN #1#2
{
\sys_if_shell_unrestricted:T
{
diff --git a/macros/latex/contrib/l3experimental/l3sys-shell.pdf b/macros/latex/contrib/l3experimental/l3sys-shell.pdf
index fb739697fd..2416721b43 100644
--- a/macros/latex/contrib/l3experimental/l3sys-shell.pdf
+++ b/macros/latex/contrib/l3experimental/l3sys-shell.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3experimental/xcoffins.dtx b/macros/latex/contrib/l3experimental/xcoffins.dtx
index 97f1432be0..8e8a9f0ca1 100644
--- a/macros/latex/contrib/l3experimental/xcoffins.dtx
+++ b/macros/latex/contrib/l3experimental/xcoffins.dtx
@@ -53,7 +53,7 @@
% }^^A
% }
%
-% \date{Released 2023-05-11}
+% \date{Released 2023-10-10}
%
% \maketitle
%
@@ -672,7 +672,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplPackage{xcoffins}{2023-05-11}{}
+\ProvidesExplPackage{xcoffins}{2023-10-10}{}
{L3 Experimental design level coffins}
% \end{macrocode}
%
@@ -781,7 +781,7 @@
{
\group_begin:
\@@_design_names:N #1
- \use:x
+ \use:e
{
\group_end:
\coffin_set_horizontal_pole:Nnn #1
@@ -792,7 +792,7 @@
{
\group_begin:
\@@_design_names:N #1
- \use:x
+ \use:e
{
\group_end:
\coffin_set_vertical_pole:Nnn #1
@@ -831,7 +831,7 @@
{
\group_begin:
\keys_set:nn { coffin } {#1}
- \tl_set:Nx \l_@@_tmp_tl
+ \tl_set:Ne \l_@@_tmp_tl
{
\group_end:
\bool_if:NTF \l_@@_bound_box_grow_bool
diff --git a/macros/latex/contrib/l3experimental/xcoffins.pdf b/macros/latex/contrib/l3experimental/xcoffins.pdf
index f67094abd6..4e7d4f9a57 100644
--- a/macros/latex/contrib/l3experimental/xcoffins.pdf
+++ b/macros/latex/contrib/l3experimental/xcoffins.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3experimental/xgalley.dtx b/macros/latex/contrib/l3experimental/xgalley.dtx
index c7731b0b66..abda67cc7e 100644
--- a/macros/latex/contrib/l3experimental/xgalley.dtx
+++ b/macros/latex/contrib/l3experimental/xgalley.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2023-05-11}
+% \date{Released 2023-10-10}
%
% \maketitle
%
@@ -731,7 +731,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplPackage{xgalley}{2023-05-11}{}
+\ProvidesExplPackage{xgalley}{2023-10-10}{}
{L3 Experimental galley}
\RequirePackage{xtemplate,l3galley}
% \end{macrocode}
@@ -1057,7 +1057,7 @@
stretch-last-line = \l_galley_par_stretch_last_bool
}
{
- \tl_put_left:Nx \l_@@_justification_other_tl
+ \tl_put_left:Ne \l_@@_justification_other_tl
{
\skip_set:Nn \exp_not:N \l_galley_par_end_skip
{ \skip_use:N \l_galley_par_end_skip }
@@ -1355,7 +1355,7 @@
% \begin{macrocode}
\tl_if_empty:NF \l_@@_interline_penalty_tl
{
- \tl_gput_right:Nx \g_galley_par_reset_hook_tl
+ \tl_gput_right:Ne \g_galley_par_reset_hook_tl
{
\int_set:Nn \exp_not:N \l_@@_interline_penalty_int
{ \galley_interline_penalty: }
@@ -1365,7 +1365,7 @@
}
\tl_if_empty:NF \l_@@_parbreak_fuzz_tl
{
- \tl_gput_right:Nx \g_galley_par_reset_hook_tl
+ \tl_gput_right:Ne \g_galley_par_reset_hook_tl
{
\dim_set:Nn \exp_not:N \l_galley_parbreak_fuzz_dim
{ \dim_use:N \l_galley_parbreak_fuzz_dim }
@@ -1380,7 +1380,7 @@
{
\tl_if_empty:cF { l_galley_ ##1 _tl }
{
- \tl_gput_right:Nx \g_galley_par_reset_hook_tl
+ \tl_gput_right:Ne \g_galley_par_reset_hook_tl
{
\int_set:Nn \exp_not:c { l_galley_ ##1 _int }
{ \int_use:c { l_galley_ ##1 _int } }
@@ -1399,7 +1399,7 @@
\tl_if_empty:cF { l_galley_ ##1 _tl }
{
\use:c { galley_save_ ##1 :N } \l_@@_tmpa_clist
- \tl_gput_right:Nx \g_galley_par_reset_hook_tl
+ \tl_gput_right:Ne \g_galley_par_reset_hook_tl
{
\exp_not:c { galley_set_ ##1 :n }
{ \exp_not:o \l_@@_tmpa_clist }
@@ -1486,22 +1486,22 @@
{
\tl_if_empty:NF \l_galley_display_begin_par_vpenalty_tl
{
- \tl_set:Nx \l_galley_display_begin_par_vpenalty_tl
+ \tl_set:Ne \l_galley_display_begin_par_vpenalty_tl
{ \int_eval:n { \l_galley_display_begin_par_vpenalty_tl } }
}
\tl_if_empty:NF \l_galley_display_begin_par_vspace_tl
{
- \tl_set:Nx \l_galley_display_begin_par_vspace_tl
+ \tl_set:Ne \l_galley_display_begin_par_vspace_tl
{ \skip_eval:n { \l_galley_display_begin_par_vspace_tl } }
}
\tl_if_empty:NF \l_galley_display_begin_vpenalty_tl
{
- \tl_set:Nx \l_galley_display_begin_vpenalty_tl
+ \tl_set:Ne \l_galley_display_begin_vpenalty_tl
{ \int_eval:n { \l_galley_display_begin_vpenalty_tl } }
}
\tl_if_empty:NF \l_galley_display_begin_vspace_tl
{
- \tl_set:Nx \l_galley_display_begin_vspace_tl
+ \tl_set:Ne \l_galley_display_begin_vspace_tl
{ \skip_eval:n { \l_galley_display_begin_vspace_tl } }
}
}
@@ -1515,22 +1515,22 @@
{
\tl_if_empty:NF \l_galley_display_end_par_vpenalty_tl
{
- \tl_set:Nx \l_galley_display_end_par_vpenalty_tl
+ \tl_set:Ne \l_galley_display_end_par_vpenalty_tl
{ \int_eval:n { \l_galley_display_end_par_vpenalty_tl } }
}
\tl_if_empty:NF \l_galley_display_end_par_vspace_tl
{
- \tl_set:Nx \l_galley_display_end_par_vspace_tl
+ \tl_set:Ne \l_galley_display_end_par_vspace_tl
{ \skip_eval:n { \l_galley_display_end_par_vspace_tl } }
}
\tl_if_empty:NF \l_galley_display_end_vpenalty_tl
{
- \tl_set:Nx \l_galley_display_end_vpenalty_tl
+ \tl_set:Ne \l_galley_display_end_vpenalty_tl
{ \int_eval:n { \l_galley_display_end_vpenalty_tl } }
}
\tl_if_empty:NF \l_galley_display_end_vspace_tl
{
- \tl_set:Nx \l_galley_display_end_vspace_tl
+ \tl_set:Ne \l_galley_display_end_vspace_tl
{ \skip_eval:n { \l_galley_display_end_vspace_tl } }
}
}
diff --git a/macros/latex/contrib/l3experimental/xgalley.pdf b/macros/latex/contrib/l3experimental/xgalley.pdf
index 8fbd8fb0a0..eacea34401 100644
--- a/macros/latex/contrib/l3experimental/xgalley.pdf
+++ b/macros/latex/contrib/l3experimental/xgalley.pdf
Binary files differ