summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-12-29 23:03:42 +0000
committerKarl Berry <karl@freefriends.org>2011-12-29 23:03:42 +0000
commit7a50f35d6fd3bd705c78298b1ccc085991638f87 (patch)
tree7f749391d34aa12a37a30a33c00b3098b2320e7c /Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx
parent0bc9393ae50667d7ff769a76321a9548a70351fc (diff)
l3kernel 3109 (29dec11)
git-svn-id: svn://tug.org/texlive/trunk@24971 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.dtx124
1 files changed, 62 insertions, 62 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx b/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx
index 34bbe53d2fd..75d48a6becb 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx
@@ -36,7 +36,7 @@
%
%<*driver|package>
\RequirePackage{l3names}
-\GetIdInfo$Id: l3coffins.dtx 2963 2011-11-15 22:06:41Z joseph $
+\GetIdInfo$Id: l3coffins.dtx 3086 2011-12-22 17:55:46Z bruno $
{L3 Experimental coffin code layer}
%</driver|package>
%<*driver>
@@ -280,7 +280,7 @@
% therefore analogous to carrying out an alignment where the
% \enquote{parent} coffin is the current insertion point.
% \end{function}
-%
+%
% \section{Measuring coffins}
%
% \begin{function}{\coffin_dp:N, \coffin_dp:c}
@@ -580,7 +580,7 @@
% Clearing coffins means emptying the box and resetting all of the
% structures.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \coffin_clear:N #1
+\cs_new_protected:Npn \coffin_clear:N #1
{
\coffin_if_exist:NT #1
{
@@ -599,7 +599,7 @@
% This means that the usual rule about \cs{l_\ldots} variables has
% to be broken.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \coffin_new:N #1
+\cs_new_protected:Npn \coffin_new:N #1
{
\box_new:N #1
\prop_clear_new:c { l_coffin_corners_ \int_value:w #1 _prop }
@@ -678,7 +678,7 @@
% These are the \enquote{begin}/\enquote{end} versions of the above:
% watch the grouping!
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \hcoffin_set:Nw #1
+\cs_new_protected:Npn \hcoffin_set:Nw #1
{
\coffin_if_exist:NT #1
{
@@ -703,7 +703,7 @@
% \begin{macro}{\vcoffin_set_end:}
% The same for vertical coffins.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \vcoffin_set:Nnw #1#2
+\cs_new_protected:Npn \vcoffin_set:Nnw #1#2
{
\coffin_if_exist:NT #1
{
@@ -744,7 +744,7 @@
% }
% Setting two coffins equal is just a wrapper around other functions.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \coffin_set_eq:NN #1#2
+\cs_new_protected:Npn \coffin_set_eq:NN #1#2
{
\coffin_if_exist:NT #1
{
@@ -771,16 +771,16 @@
% \end{variable}
% \end{variable}
% \end{variable}
-%
+%
% \subsection{Measuring coffins}
-%
+%
% \begin{macro}
% {
% \coffin_dp:N, \coffin_dp:c, \coffin_ht:N, \coffin_ht:c,
% \coffin_wd:N, \coffin_wd:c
% }
% Coffins are just boxes when it comes to measurement. However, semantically
-% a separate set of functions are required.
+% a separate set of functions are required.
% \begin{macrocode}
\cs_new_eq:NN \coffin_dp:N \box_dp:N
\cs_new_eq:NN \coffin_dp:c \box_dp:c
@@ -797,7 +797,7 @@
% A simple wrapper around the recovery of a coffin pole, with some
% error checking and recovery built-in.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \coffin_get_pole:NnN #1#2#3
+\cs_new_protected:Npn \coffin_get_pole:NnN #1#2#3
{
\prop_get:cnNF
{ l_coffin_poles_ \int_value:w #1 _prop } {#2} #3
@@ -813,7 +813,7 @@
% \begin{macro}{\coffin_reset_structure:N}
% Resetting the structure is a simple copy job.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \coffin_reset_structure:N #1
+\cs_new_protected:Npn \coffin_reset_structure:N #1
{
\prop_set_eq:cN { l_coffin_corners_ \int_value:w #1 _prop }
\c_coffin_corners_prop
@@ -827,14 +827,14 @@
% Setting coffin structures equal simply means copying the property
% list.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \coffin_set_eq_structure:NN #1#2
+\cs_new_protected:Npn \coffin_set_eq_structure:NN #1#2
{
\prop_set_eq:cc { l_coffin_corners_ \int_value:w #1 _prop }
{ l_coffin_corners_ \int_value:w #2 _prop }
\prop_set_eq:cc { l_coffin_poles_ \int_value:w #1 _prop }
{ l_coffin_poles_ \int_value:w #2 _prop }
}
-\cs_new_protected_nopar:Npn \coffin_gset_eq_structure:NN #1#2
+\cs_new_protected:Npn \coffin_gset_eq_structure:NN #1#2
{
\prop_gset_eq:cc { l_coffin_corners_ \int_value:w #1 _prop }
{ l_coffin_corners_ \int_value:w #2 _prop }
@@ -853,7 +853,7 @@
% These make design-level names for the dimensions of a coffin easy to
% get at.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \coffin_set_user_dimensions:N #1
+\cs_new_protected:Npn \coffin_set_user_dimensions:N #1
{
\cs_set_eq:NN \coffin_saved_Height: \Height
\cs_set_eq:NN \coffin_saved_Depth: \Depth
@@ -892,7 +892,7 @@
% 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_nopar:Npn \coffin_set_horizontal_pole:Nnn #1#2#3
+\cs_new_protected:Npn \coffin_set_horizontal_pole:Nnn #1#2#3
{
\coffin_if_exist:NT #1
{
@@ -905,7 +905,7 @@
\coffin_end_user_dimensions:
}
}
-\cs_new_protected_nopar:Npn \coffin_set_vertical_pole:Nnn #1#2#3
+\cs_new_protected:Npn \coffin_set_vertical_pole:Nnn #1#2#3
{
\coffin_if_exist:NT #1
{
@@ -918,7 +918,7 @@
\coffin_end_user_dimensions:
}
}
-\cs_new_protected_nopar:Npn \coffin_set_pole:Nnn #1#2#3
+\cs_new_protected:Npn \coffin_set_pole:Nnn #1#2#3
{ \prop_put:cnn { l_coffin_poles_ \int_value:w #1 _prop } {#2} {#3} }
\cs_generate_variant:Nn \coffin_set_horizontal_pole:Nnn { c }
\cs_generate_variant:Nn \coffin_set_vertical_pole:Nnn { c }
@@ -933,7 +933,7 @@
% there can be no rotation. So the corners of the content are just those
% of the underlying \TeX{} box.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \coffin_update_corners:N #1
+\cs_new_protected:Npn \coffin_update_corners:N #1
{
\prop_put:cnx { l_coffin_corners_ \int_value:w #1 _prop } { tl }
{ { 0 pt } { \dim_use:N \box_ht:N #1 } }
@@ -954,7 +954,7 @@
% It also does not set poles which are relevant only to vertical
% coffins.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \coffin_update_poles:N #1
+\cs_new_protected:Npn \coffin_update_poles:N #1
{
\prop_put:cnx { l_coffin_poles_ \int_value:w #1 _prop } { hc }
{
@@ -1001,7 +1001,7 @@
% may of course not be an intersection, for which an error trap is
% needed.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \coffin_calculate_intersection:Nnn #1#2#3
+\cs_new_protected:Npn \coffin_calculate_intersection:Nnn #1#2#3
{
\coffin_get_pole:NnN #1 {#2} \l_coffin_pole_a_tl
\coffin_get_pole:NnN #1 {#3} \l_coffin_pole_b_tl
@@ -1028,7 +1028,7 @@
% is either horizontal or vertical then one or more of $c$, $d$,
% $c'$ and $d'$ will be zero and a special case is needed.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \coffin_calculate_intersection:nnnnnnnn
+\cs_new_protected:Npn \coffin_calculate_intersection:nnnnnnnn
#1#2#3#4#5#6#7#8
{
\dim_compare:nNnTF {#3} = { \c_zero_dim }
@@ -1174,7 +1174,7 @@
% Thus |#4| and |#5| should be the directions of the pole while
% |#2| and |#3| are co-ordinates.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \coffin_calculate_intersection_aux:nnnnnN
+\cs_new_protected:Npn \coffin_calculate_intersection_aux:nnnnnN
#1#2#3#4#5#6
{
\fp_set_from_dim:Nn \l_coffin_calc_result_fp {#1}
@@ -1206,7 +1206,7 @@
% reset to standard values. First, the more basic alignment function is
% used to get things started.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \coffin_join:NnnNnnnn #1#2#3#4#5#6#7#8
+\cs_new_protected:Npn \coffin_join:NnnNnnnn #1#2#3#4#5#6#7#8
{
\coffin_align:NnnNnnnnN
#1 {#2} {#3} #4 {#5} {#6} {#7} {#8} \l_coffin_aligned_coffin
@@ -1275,7 +1275,7 @@
% a position is hear also as it is similar but without the structure
% updates.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \coffin_attach:NnnNnnnn #1#2#3#4#5#6#7#8
+\cs_new_protected:Npn \coffin_attach:NnnNnnnn #1#2#3#4#5#6#7#8
{
\coffin_align:NnnNnnnnN
#1 {#2} {#3} #4 {#5} {#6} {#7} {#8} \l_coffin_aligned_coffin
@@ -1293,7 +1293,7 @@
\coffin_update_vertical_poles:NNN #1 #4 \l_coffin_aligned_coffin
\coffin_set_eq:NN #1 \l_coffin_aligned_coffin
}
-\cs_new_protected_nopar:Npn \coffin_attach_mark:NnnNnnnn #1#2#3#4#5#6#7#8
+\cs_new_protected:Npn \coffin_attach_mark:NnnNnnnn #1#2#3#4#5#6#7#8
{
\coffin_align:NnnNnnnnN
#1 {#2} {#3} #4 {#5} {#6} {#7} {#8} \l_coffin_aligned_coffin
@@ -1318,7 +1318,7 @@
% input coffins. The default poles are then set up, but the final result
% will depend on how the bounding box is being handled.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \coffin_align:NnnNnnnnN #1#2#3#4#5#6#7#8#9
+\cs_new_protected:Npn \coffin_align:NnnNnnnnN #1#2#3#4#5#6#7#8#9
{
\coffin_calculate_intersection:Nnn #4 {#5} {#6}
\dim_set:Nn \l_coffin_x_prime_dim { \l_coffin_x_dim }
@@ -1352,12 +1352,12 @@
% or handle names, and that multiple alignments do not result in a
% whole set of values.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \coffin_offset_poles:Nnn #1#2#3
+\cs_new_protected:Npn \coffin_offset_poles:Nnn #1#2#3
{
\prop_map_inline:cn { l_coffin_poles_ \int_value:w #1 _prop }
{ \coffin_offset_pole:Nnnnnnn #1 {##1} ##2 {#2} {#3} }
}
-\cs_new_protected_nopar:Npn \coffin_offset_pole:Nnnnnnn #1#2#3#4#5#6#7#8
+\cs_new_protected:Npn \coffin_offset_pole:Nnnnnnn #1#2#3#4#5#6#7#8
{
\dim_set:Nn \l_coffin_x_dim { #3 + #7 }
\dim_set:Nn \l_coffin_y_dim { #4 + #8 }
@@ -1381,12 +1381,12 @@
% there is no need to worry about naming: every corner can be saved
% here as order is unimportant.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \coffin_offset_corners:Nnn #1#2#3
+\cs_new_protected:Npn \coffin_offset_corners:Nnn #1#2#3
{
\prop_map_inline:cn { l_coffin_corners_ \int_value:w #1 _prop }
{ \coffin_offset_corner:Nnnnn #1 {##1} ##2 {#2} {#3} }
}
-\cs_new_protected_nopar:Npn \coffin_offset_corner:Nnnnn #1#2#3#4#5#6
+\cs_new_protected:Npn \coffin_offset_corner:Nnnnn #1#2#3#4#5#6
{
\prop_put:cnx
{ l_coffin_corners_ \int_value:w \l_coffin_aligned_coffin _prop }
@@ -1408,7 +1408,7 @@
% the poles, but this is of course only logical when the poles are
% horizontal.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \coffin_update_vertical_poles:NNN #1#2#3
+\cs_new_protected:Npn \coffin_update_vertical_poles:NNN #1#2#3
{
\coffin_get_pole:NnN #3 { #1 -T } \l_coffin_pole_a_tl
\coffin_get_pole:NnN #3 { #2 -T } \l_coffin_pole_b_tl
@@ -1419,7 +1419,7 @@
\exp_last_two_unbraced:Noo \coffin_update_B:nnnnnnnnN
\l_coffin_pole_a_tl \l_coffin_pole_b_tl #3
}
-\cs_new_protected_nopar:Npn \coffin_update_T:nnnnnnnnN #1#2#3#4#5#6#7#8#9
+\cs_new_protected:Npn \coffin_update_T:nnnnnnnnN #1#2#3#4#5#6#7#8#9
{
\dim_compare:nNnTF {#2} < {#6}
{
@@ -1431,7 +1431,7 @@
{ { 0 pt } {#2} { 1000 pt } { 0 pt } }
}
}
-\cs_new_protected_nopar:Npn \coffin_update_B:nnnnnnnnN #1#2#3#4#5#6#7#8#9
+\cs_new_protected:Npn \coffin_update_B:nnnnnnnnN #1#2#3#4#5#6#7#8#9
{
\dim_compare:nNnTF {#2} < {#6}
{
@@ -1453,7 +1453,7 @@
% which is done using a coffin with no content at all. As well as aligning to
% the empty coffin, there is also a need to leave vertical mode, if necessary.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \coffin_typeset:Nnnnn #1#2#3#4#5
+\cs_new_protected:Npn \coffin_typeset:Nnnnn #1#2#3#4#5
{
\coffin_align:NnnNnnnnN \c_empty_coffin { H } { l }
#1 {#2} {#3} {#4} {#5} \l_coffin_aligned_coffin
@@ -1505,7 +1505,7 @@
% \cs{l_coffin_cos_fp}, which are carried through unchanged for the rest
% of the procedure.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \coffin_rotate:Nn #1#2
+\cs_new_protected:Npn \coffin_rotate:Nn #1#2
{
\fp_set:Nn \l_coffin_tmp_fp {#2}
\fp_div:Nn \l_coffin_tmp_fp { 180 }
@@ -1579,7 +1579,7 @@
% is the same code as for the corners of the material itself, but
% using a dedicated property list.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \coffin_set_bounding:N #1
+\cs_new_protected:Npn \coffin_set_bounding:N #1
{
\prop_put:Nnx \l_coffin_bounding_prop { tl }
{ { 0 pt } { \dim_use:N \box_ht:N #1 } }
@@ -1601,13 +1601,13 @@
% treatment is used for the corners of the material itself and the
% bounding box.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \coffin_rotate_bounding:nnn #1#2#3
+\cs_new_protected:Npn \coffin_rotate_bounding:nnn #1#2#3
{
\coffin_rotate_vector:nnNN {#2} {#3} \l_coffin_x_dim \l_coffin_y_dim
\prop_put:Nnx \l_coffin_bounding_prop {#1}
{ { \dim_use:N \l_coffin_x_dim } { \dim_use:N \l_coffin_y_dim } }
}
-\cs_new_protected_nopar:Npn \coffin_rotate_corner:Nnnn #1#2#3#4
+\cs_new_protected:Npn \coffin_rotate_corner:Nnnn #1#2#3#4
{
\coffin_rotate_vector:nnNN {#3} {#4} \l_coffin_x_dim \l_coffin_y_dim
\prop_put:cnx { l_coffin_corners_ \int_value:w #1 _prop } {#2}
@@ -1622,7 +1622,7 @@
% the pole and its direction. The rotation here is about the bottom-left
% corner of the coffin.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \coffin_rotate_pole:Nnnnnn #1#2#3#4#5#6
+\cs_new_protected:Npn \coffin_rotate_pole:Nnnnnn #1#2#3#4#5#6
{
\coffin_rotate_vector:nnNN {#3} {#4} \l_coffin_x_dim \l_coffin_y_dim
\coffin_rotate_vector:nnNN {#5} {#6}
@@ -1645,7 +1645,7 @@
% minimum: for any given rotation the sin and cosine values do no
% change, after all.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \coffin_rotate_vector:nnNN #1#2#3#4
+\cs_new_protected:Npn \coffin_rotate_vector:nnNN #1#2#3#4
{
\fp_set_from_dim:Nn \l_coffin_x_fp {#1}
\fp_set_from_dim:Nn \l_coffin_y_fp {#2}
@@ -1673,7 +1673,7 @@
% corners. The values start at the maximum dimensions so that the
% case where all are positive or all are negative works out correctly.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \coffin_find_corner_maxima:N #1
+\cs_new_protected:Npn \coffin_find_corner_maxima:N #1
{
\dim_set:Nn \l_coffin_top_corner_dim { -\c_max_dim }
\dim_set:Nn \l_coffin_right_corner_dim { -\c_max_dim }
@@ -1682,7 +1682,7 @@
\prop_map_inline:cn { l_coffin_corners_ \int_value:w #1 _prop }
{ \coffin_find_corner_maxima_aux:nn ##2 }
}
-\cs_new_protected_nopar:Npn \coffin_find_corner_maxima_aux:nn #1#2
+\cs_new_protected:Npn \coffin_find_corner_maxima_aux:nn #1#2
{
\dim_set_min:Nn \l_coffin_left_corner_dim {#1}
\dim_set_max:Nn \l_coffin_right_corner_dim {#1}
@@ -1705,7 +1705,7 @@
\prop_map_inline:Nn \l_coffin_bounding_prop
{ \coffin_find_bounding_shift_aux:nn ##2 }
}
-\cs_new_protected_nopar:Npn \coffin_find_bounding_shift_aux:nn #1#2
+\cs_new_protected:Npn \coffin_find_bounding_shift_aux:nn #1#2
{ \dim_set_min:Nn \l_coffin_bounding_shift_dim {#1} }
% \end{macrocode}
% \end{macro}
@@ -1717,7 +1717,7 @@
% appropriate values from the $x$- and $y$-components. For
% the poles, this means that the direction vector is unchanged.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \coffin_shift_corner:Nnnn #1#2#3#4
+\cs_new_protected:Npn \coffin_shift_corner:Nnnn #1#2#3#4
{
\prop_put:cnx { l_coffin_corners_ \int_value:w #1 _ prop } {#2}
{
@@ -1725,7 +1725,7 @@
{ \dim_eval:n { #4 - \l_coffin_bottom_corner_dim } }
}
}
-\cs_new_protected_nopar:Npn \coffin_shift_pole:Nnnnnn #1#2#3#4#5#6
+\cs_new_protected:Npn \coffin_shift_pole:Nnnnnn #1#2#3#4#5#6
{
\prop_put:cnx { l_coffin_poles_ \int_value:w #1 _ prop } {#2}
{
@@ -1767,7 +1767,7 @@
% underlying box, but that operation is grouped and so the same
% calculation is done here.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \coffin_resize:Nnn #1#2#3
+\cs_new_protected:Npn \coffin_resize:Nnn #1#2#3
{
\coffin_set_user_dimensions:N #1
\box_resize:Nnn #1 {#2} {#3}
@@ -1787,7 +1787,7 @@
% The poles and corners of the coffin are scaled to the appropriate
% places before actually resizing the underlying box.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \coffin_resize_common:Nnn #1#2#3
+\cs_new_protected:Npn \coffin_resize_common:Nnn #1#2#3
{
\prop_map_inline:cn { l_coffin_corners_ \int_value:w #1 _prop }
{ \coffin_scale_corner:Nnnn #1 {##1} ##2 }
@@ -1816,7 +1816,7 @@
% the \TeX{} way as this works properly with floating point values
% without needing to use the \texttt{fp} module.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \coffin_scale:Nnn #1#2#3
+\cs_new_protected:Npn \coffin_scale:Nnn #1#2#3
{
\box_scale:Nnn #1 {#2} {#3}
\coffin_set_user_dimensions:N #1
@@ -1840,7 +1840,7 @@
% factors in $x$ and $y$. This is a much less complex operation
% than rotation, and as a result the code is a lot clearer.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \coffin_scale_vector:nnNN #1#2#3#4
+\cs_new_protected:Npn \coffin_scale_vector:nnNN #1#2#3#4
{
\fp_set_from_dim:Nn \l_coffin_tmp_fp {#1}
\fp_mul:Nn \l_coffin_tmp_fp { \l_coffin_scale_x_fp }
@@ -1857,13 +1857,13 @@
% Scaling both corners and poles is a simple calculation using the
% preceding vector scaling.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \coffin_scale_corner:Nnnn #1#2#3#4
+\cs_new_protected:Npn \coffin_scale_corner:Nnnn #1#2#3#4
{
\coffin_scale_vector:nnNN {#3} {#4} \l_coffin_x_dim \l_coffin_y_dim
\prop_put:cnx { l_coffin_corners_ \int_value:w #1 _prop } {#2}
{ { \dim_use:N \l_coffin_x_dim } { \dim_use:N \l_coffin_y_dim } }
}
-\cs_new_protected_nopar:Npn \coffin_scale_pole:Nnnnnn #1#2#3#4#5#6
+\cs_new_protected:Npn \coffin_scale_pole:Nnnnnn #1#2#3#4#5#6
{
\coffin_scale_vector:nnNN {#3} {#4} \l_coffin_x_dim \l_coffin_y_dim
\coffin_set_pole:Nnx #1 {#2}
@@ -1881,14 +1881,14 @@
% These functions correct for the $x$ displacement that takes
% place with a negative horizontal scaling.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \coffin_x_shift_corner:Nnnn #1#2#3#4
+\cs_new_protected:Npn \coffin_x_shift_corner:Nnnn #1#2#3#4
{
\prop_put:cnx { l_coffin_corners_ \int_value:w #1 _prop } {#2}
{
{ \dim_eval:n { #3 + \box_wd:N #1 } } {#4}
}
}
-\cs_new_protected_nopar:Npn \coffin_x_shift_pole:Nnnnnn #1#2#3#4#5#6
+\cs_new_protected:Npn \coffin_x_shift_pole:Nnnnnn #1#2#3#4#5#6
{
\prop_put:cnx { l_coffin_poles_ \int_value:w #1 _prop } {#2}
{
@@ -2019,7 +2019,7 @@
% Contrast with the more optimised version for showing all handles which
% comes next.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \coffin_mark_handle:Nnnn #1#2#3#4
+\cs_new_protected:Npn \coffin_mark_handle:Nnnn #1#2#3#4
{
\hcoffin_set:Nn \l_coffin_display_pole_coffin
{
@@ -2066,7 +2066,7 @@
\l_coffin_tmp_tl #1 {#2} {#3}
}
}
-\cs_new_protected_nopar:Npn \coffin_mark_handle_aux:nnnnNnn #1#2#3#4#5#6#7
+\cs_new_protected:Npn \coffin_mark_handle_aux:nnnnNnn #1#2#3#4#5#6#7
{
\coffin_attach_mark:NnnNnnnn #5 {#6} {#7}
\l_coffin_display_coord_coffin {#1} {#2}
@@ -2088,7 +2088,7 @@
% handles for all of these poles. This is done such that poles are
% removed during the loops to avoid duplication.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \coffin_display_handles:Nn #1#2
+\cs_new_protected:Npn \coffin_display_handles:Nn #1#2
{
\hcoffin_set:Nn \l_coffin_display_pole_coffin
{
@@ -2124,7 +2124,7 @@
% and used to align the pole coffin with the main coffin for output.
% The positions are recovered from the preset list if available.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \coffin_display_handles_aux:nnnnnn #1#2#3#4#5#6
+\cs_new_protected:Npn \coffin_display_handles_aux:nnnnnn #1#2#3#4#5#6
{
\prop_map_inline:Nn \l_coffin_display_poles_prop
{
@@ -2173,7 +2173,7 @@
}
}
}
-\cs_new_protected_nopar:Npn \coffin_display_handles_aux:nnnn #1#2#3#4
+\cs_new_protected:Npn \coffin_display_handles_aux:nnnn #1#2#3#4
{
\coffin_display_attach:Nnnnn
\l_coffin_display_coord_coffin {#1} {#2}
@@ -2187,7 +2187,7 @@
% and stored for the display coffin the code simply uses it directly,
% with no calculation.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \coffin_display_attach:Nnnnn #1#2#3#4#5
+\cs_new_protected:Npn \coffin_display_attach:Nnnnn #1#2#3#4#5
{
\coffin_calculate_intersection:Nnn #1 {#2} {#3}
\dim_set:Nn \l_coffin_x_prime_dim { \l_coffin_x_dim }
@@ -2224,7 +2224,7 @@
% a way that keeps things relatively readable. If there is no apparent
% structure then the code complains.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \coffin_show_structure:N #1
+\cs_new_protected:Npn \coffin_show_structure:N #1
{
\cs_if_exist:cTF { l_coffin_poles_ \int_value:w #1 _prop }
{
@@ -2256,7 +2256,7 @@
\iow_newline: > \c_space_tl \c_space_tl
#1 \c_space_tl \c_space_tl => \c_space_tl \c_space_tl \exp_not:n {#2}
}
-\cs_new_nopar:Npn \coffin_show_aux:w #1 > ~ { }
+\cs_new:Npn \coffin_show_aux:w #1 > ~ { }
\cs_generate_variant:Nn \coffin_show_structure:N { c }
% \end{macrocode}
% \end{macro}