summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-10-10 20:27:00 +0000
committerKarl Berry <karl@freefriends.org>2023-10-10 20:27:00 +0000
commit1045e3f70340d9f7540d9c9328a282ee84f88a51 (patch)
treeab54e08e01a041bf9bfd650d8981c1f63214a169 /Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx
parentf92a7f650889a8bbbd6ff151a911a35c25fa2901 (diff)
l3 (10oct23)
git-svn-id: svn://tug.org/texlive/trunk@68507 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx')
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx84
1 files changed, 42 insertions, 42 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx b/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx
index 2269c6c6869..94824400de0 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-08-29}
+% \date{Released 2023-10-10}
%
% \maketitle
%
@@ -602,7 +602,7 @@
\coffin_if_exist:NTF #1
{ #2 }
{
- \msg_error:nnx { coffin } { unknown }
+ \msg_error:nne { coffin } { unknown }
{ \token_to_str:N #1 }
}
}
@@ -736,7 +736,7 @@
}
#5 #1
\vbox_set_top:Nn \l_@@_internal_box { \vbox_unpack:N #1 }
- \@@_set_pole:Nnx #1 { T }
+ \@@_set_pole:Nne #1 { T }
{
{ 0pt }
{
@@ -749,7 +749,7 @@
\box_clear:N \l_@@_internal_box
}
}
-\cs_new_protected:Npx \@@_set_vertical_aux:
+\cs_new_protected:Npe \@@_set_vertical_aux:
{
\bool_lazy_and:nnT
{ \cs_if_exist_p:N \fmtname }
@@ -834,7 +834,7 @@
#5
#6 #1
\vbox_set_top:Nn \l_@@_internal_box { \vbox_unpack:N #1 }
- \@@_set_pole:Nnx #1 { T }
+ \@@_set_pole:Nne #1 { T }
{
{ 0pt }
{
@@ -949,7 +949,7 @@
\prop_get:cnNF
{ coffin ~ \@@_to_value:N #1 ~ poles } {#2} #3
{
- \msg_error:nnxx { coffin } { unknown-pole }
+ \msg_error:nnee { coffin } { unknown-pole }
{ \exp_not:n {#2} } { \token_to_str:N #1 }
\tl_set:Nn #3 { { 0pt } { 0pt } { 0pt } { 0pt } }
}
@@ -989,17 +989,17 @@
% \coffin_gset_vertical_pole:Nnn, \coffin_gset_vertical_pole:cnn
% }
% \begin{macro}{\@@_set_vertical_pole:NnnN}
-% \begin{macro}{\@@_set_pole:Nnn, \@@_set_pole:Nnx}
+% \begin{macro}{\@@_set_pole:Nnn, \@@_set_pole:Nne}
% Setting the pole of a coffin at the user/designer level requires a
% bit more care. The idea here is to provide a reasonable interface to
% the system, then to do the setting with full expansion. The
% three-argument version is used internally to do a direct setting.
% \begin{macrocode}
\cs_new_protected:Npn \coffin_set_horizontal_pole:Nnn #1#2#3
- { \@@_set_horizontal_pole:NnnN #1 {#2} {#3} \prop_put:cnx }
+ { \@@_set_horizontal_pole:NnnN #1 {#2} {#3} \prop_put:cne }
\cs_generate_variant:Nn \coffin_set_horizontal_pole:Nnn { c }
\cs_new_protected:Npn \coffin_gset_horizontal_pole:Nnn #1#2#3
- { \@@_set_horizontal_pole:NnnN #1 {#2} {#3} \prop_gput:cnx }
+ { \@@_set_horizontal_pole:NnnN #1 {#2} {#3} \prop_gput:cne }
\cs_generate_variant:Nn \coffin_gset_horizontal_pole:Nnn { c }
\cs_new_protected:Npn \@@_set_horizontal_pole:NnnN #1#2#3#4
{
@@ -1014,10 +1014,10 @@
}
}
\cs_new_protected:Npn \coffin_set_vertical_pole:Nnn #1#2#3
- { \@@_set_vertical_pole:NnnN #1 {#2} {#3} \prop_put:cnx }
+ { \@@_set_vertical_pole:NnnN #1 {#2} {#3} \prop_put:cne }
\cs_generate_variant:Nn \coffin_set_vertical_pole:Nnn { c }
\cs_new_protected:Npn \coffin_gset_vertical_pole:Nnn #1#2#3
- { \@@_set_vertical_pole:NnnN #1 {#2} {#3} \prop_gput:cnx }
+ { \@@_set_vertical_pole:NnnN #1 {#2} {#3} \prop_gput:cne }
\cs_generate_variant:Nn \coffin_gset_vertical_pole:Nnn { c }
\cs_new_protected:Npn \@@_set_vertical_pole:NnnN #1#2#3#4
{
@@ -1036,7 +1036,7 @@
\prop_put:cnn { coffin ~ \@@_to_value:N #1 ~ poles }
{#2} {#3}
}
-\cs_generate_variant:Nn \@@_set_pole:Nnn { Nnx }
+\cs_generate_variant:Nn \@@_set_pole:Nnn { Nne }
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -1070,9 +1070,9 @@
% of the underlying \TeX{} box.
% \begin{macrocode}
\cs_new_protected:Npn \@@_update_corners:N #1
- { \@@_update_corners:NN #1 \prop_put:Nnx }
+ { \@@_update_corners:NN #1 \prop_put:Nne }
\cs_new_protected:Npn \@@_gupdate_corners:N #1
- { \@@_update_corners:NN #1 \prop_gput:Nnx }
+ { \@@_update_corners:NN #1 \prop_gput:Nne }
\cs_new_protected:Npn \@@_update_corners:NN #1#2
{
\exp_args:Nc \@@_update_corners:NNN
@@ -1115,9 +1115,9 @@
% coffins.
% \begin{macrocode}
\cs_new_protected:Npn \@@_update_poles:N #1
- { \@@_update_poles:NN #1 \prop_put:Nnx }
+ { \@@_update_poles:NN #1 \prop_put:Nne }
\cs_new_protected:Npn \@@_gupdate_poles:N #1
- { \@@_update_poles:NN #1 \prop_gput:Nnx }
+ { \@@_update_poles:NN #1 \prop_gput:Nne }
\cs_new_protected:Npn \@@_update_poles:NN #1#2
{
\exp_args:Nc \@@_update_poles:NNN
@@ -1277,7 +1277,7 @@
% more complexity, we now work out both slopes and pass to an auxiliary.
% \begin{macrocode}
{
- \use:x
+ \use:e
{
\@@_calculate_intersection:nnnnnn
{ \dim_to_fp:n {#4} / \dim_to_fp:n {#3} }
@@ -1494,17 +1494,17 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_set_bounding:N #1
{
- \prop_put:Nnx \l_@@_bounding_prop { tl }
+ \prop_put:Nne \l_@@_bounding_prop { tl }
{ { 0pt } { \dim_eval:n { \box_ht:N #1 } } }
- \prop_put:Nnx \l_@@_bounding_prop { tr }
+ \prop_put:Nne \l_@@_bounding_prop { tr }
{
{ \dim_eval:n { \box_wd:N #1 } }
{ \dim_eval:n { \box_ht:N #1 } }
}
\dim_set:Nn \l_@@_internal_dim { -\box_dp:N #1 }
- \prop_put:Nnx \l_@@_bounding_prop { bl }
+ \prop_put:Nne \l_@@_bounding_prop { bl }
{ { 0pt } { \dim_use:N \l_@@_internal_dim } }
- \prop_put:Nnx \l_@@_bounding_prop { br }
+ \prop_put:Nne \l_@@_bounding_prop { br }
{
{ \dim_eval:n { \box_wd:N #1 } }
{ \dim_use:N \l_@@_internal_dim }
@@ -1523,13 +1523,13 @@
\cs_new_protected:Npn \@@_rotate_bounding:nnn #1#2#3
{
\@@_rotate_vector:nnNN {#2} {#3} \l_@@_x_dim \l_@@_y_dim
- \prop_put:Nnx \l_@@_bounding_prop {#1}
+ \prop_put:Nne \l_@@_bounding_prop {#1}
{ { \dim_use:N \l_@@_x_dim } { \dim_use:N \l_@@_y_dim } }
}
\cs_new_protected:Npn \@@_rotate_corner:Nnnn #1#2#3#4
{
\@@_rotate_vector:nnNN {#3} {#4} \l_@@_x_dim \l_@@_y_dim
- \prop_put:Nnx \l_@@_corners_prop {#2}
+ \prop_put:Nne \l_@@_corners_prop {#2}
{ { \dim_use:N \l_@@_x_dim } { \dim_use:N \l_@@_y_dim } }
}
% \end{macrocode}
@@ -1546,7 +1546,7 @@
\@@_rotate_vector:nnNN {#3} {#4} \l_@@_x_dim \l_@@_y_dim
\@@_rotate_vector:nnNN {#5} {#6}
\l_@@_x_prime_dim \l_@@_y_prime_dim
- \prop_put:Nnx \l_@@_poles_prop {#2}
+ \prop_put:Nne \l_@@_poles_prop {#2}
{
{ \dim_use:N \l_@@_x_dim } { \dim_use:N \l_@@_y_dim }
{ \dim_use:N \l_@@_x_prime_dim }
@@ -1647,7 +1647,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_shift_corner:Nnnn #1#2#3#4
{
- \prop_put:Nnx \l_@@_corners_prop {#2}
+ \prop_put:Nne \l_@@_corners_prop {#2}
{
{ \dim_eval:n { #3 - \l_@@_left_corner_dim } }
{ \dim_eval:n { #4 - \l_@@_bottom_corner_dim } }
@@ -1655,7 +1655,7 @@
}
\cs_new_protected:Npn \@@_shift_pole:Nnnnnn #1#2#3#4#5#6
{
- \prop_put:Nnx \l_@@_poles_prop {#2}
+ \prop_put:Nne \l_@@_poles_prop {#2}
{
{ \dim_eval:n { #3 - \l_@@_left_corner_dim } }
{ \dim_eval:n { #4 - \l_@@_bottom_corner_dim } }
@@ -1821,13 +1821,13 @@
\cs_new_protected:Npn \@@_scale_corner:Nnnn #1#2#3#4
{
\@@_scale_vector:nnNN {#3} {#4} \l_@@_x_dim \l_@@_y_dim
- \prop_put:Nnx \l_@@_corners_prop {#2}
+ \prop_put:Nne \l_@@_corners_prop {#2}
{ { \dim_use:N \l_@@_x_dim } { \dim_use:N \l_@@_y_dim } }
}
\cs_new_protected:Npn \@@_scale_pole:Nnnnnn #1#2#3#4#5#6
{
\@@_scale_vector:nnNN {#3} {#4} \l_@@_x_dim \l_@@_y_dim
- \prop_put:Nnx \l_@@_poles_prop {#2}
+ \prop_put:Nne \l_@@_poles_prop {#2}
{
{ \dim_use:N \l_@@_x_dim } { \dim_use:N \l_@@_y_dim }
{#5} {#6}
@@ -1844,14 +1844,14 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_x_shift_corner:Nnnn #1#2#3#4
{
- \prop_put:Nnx \l_@@_corners_prop {#2}
+ \prop_put:Nne \l_@@_corners_prop {#2}
{
{ \dim_eval:n { #3 + \box_wd:N #1 } } {#4}
}
}
\cs_new_protected:Npn \@@_x_shift_pole:Nnnnnn #1#2#3#4#5#6
{
- \prop_put:Nnx \l_@@_poles_prop {#2}
+ \prop_put:Nne \l_@@_poles_prop {#2}
{
{ \dim_eval:n { #3 + \box_wd:N #1 } } {#4}
{#5} {#6}
@@ -2068,7 +2068,7 @@
\tl_if_in:nnTF {#2} { - }
{ \tl_set:Nn \l_@@_internal_tl { {#2} } }
{ \tl_set:Nn \l_@@_internal_tl { { #1 - #2 } } }
- \exp_last_unbraced:NNo \@@_set_pole:Nnx \l_@@_aligned_coffin
+ \exp_last_unbraced:NNo \@@_set_pole:Nne \l_@@_aligned_coffin
{ \l_@@_internal_tl }
{
{ \dim_use:N \l_@@_x_dim } { \dim_use:N \l_@@_y_dim }
@@ -2092,7 +2092,7 @@
}
\cs_new_protected:Npn \@@_offset_corner:Nnnnn #1#2#3#4#5#6
{
- \prop_put:cnx
+ \prop_put:cne
{
coffin ~ \@@_to_value:N \l_@@_aligned_coffin
\c_space_tl corners
@@ -2130,11 +2130,11 @@
{
\dim_compare:nNnTF {#2} < {#6}
{
- \@@_set_pole:Nnx #9 { T }
+ \@@_set_pole:Nne #9 { T }
{ { 0pt } {#6} { 1000pt } { 0pt } }
}
{
- \@@_set_pole:Nnx #9 { T }
+ \@@_set_pole:Nne #9 { T }
{ { 0pt } {#2} { 1000pt } { 0pt } }
}
}
@@ -2142,11 +2142,11 @@
{
\dim_compare:nNnTF {#2} < {#6}
{
- \@@_set_pole:Nnx #9 { B }
+ \@@_set_pole:Nne #9 { B }
{ { 0pt } {#2} { 1000pt } { 0pt } }
}
{
- \@@_set_pole:Nnx #9 { B }
+ \@@_set_pole:Nne #9 { B }
{ { 0pt } {#6} { 1000pt } { 0pt } }
}
}
@@ -2490,10 +2490,10 @@
% structure then the code complains.
% \begin{macrocode}
\cs_new_protected:Npn \coffin_show_structure:N
- { \@@_show_structure:NN \msg_show:nnxxxx }
+ { \@@_show_structure:NN \msg_show:nneeee }
\cs_generate_variant:Nn \coffin_show_structure:N { c }
\cs_new_protected:Npn \coffin_log_structure:N
- { \@@_show_structure:NN \msg_log:nnxxxx }
+ { \@@_show_structure:NN \msg_log:nneeee }
\cs_generate_variant:Nn \coffin_log_structure:N { c }
\cs_new_protected:Npn \@@_show_structure:NN #1#2
{
@@ -2525,8 +2525,8 @@
% }
% Essentially a combination of \cs{coffin_show_structure:N} and
% \cs{box_show:Nnn}, but we need to avoid having two prompts, so we
-% use \cs{msg_term:nnxxxx} instead of
-% \cs{msg_show:nnxxxx} in the |show| case.
+% use \cs{msg_term:nneeee} instead of
+% \cs{msg_show:nneeee} in the |show| case.
% \begin{macrocode}
\cs_new_protected:Npn \coffin_show:N #1
{ \coffin_show:Nnn #1 \c_max_int \c_max_int }
@@ -2535,10 +2535,10 @@
{ \coffin_log:Nnn #1 \c_max_int \c_max_int }
\cs_generate_variant:Nn \coffin_log:N { c }
\cs_new_protected:Npn \coffin_show:Nnn
- { \@@_show:NNNnn \msg_term:nnxxxx \box_show:Nnn }
+ { \@@_show:NNNnn \msg_term:nneeee \box_show:Nnn }
\cs_generate_variant:Nn \coffin_show:Nnn { c }
\cs_new_protected:Npn \coffin_log:Nnn
- { \@@_show:NNNnn \msg_log:nnxxxx \box_show:Nnn }
+ { \@@_show:NNNnn \msg_log:nneeee \box_show:Nnn }
\cs_generate_variant:Nn \coffin_log:Nnn { c }
\cs_new_protected:Npn \@@_show:NNNnn #1#2#3#4#5
{