[latex3-commits] [git/LaTeX3-latex3-latex3] master: Use l3coffins internal interface for \number (1bda958)
Joseph Wright
joseph.wright at morningstar2.co.uk
Sun Mar 25 16:22:08 CEST 2018
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/1bda95800c942c007237fe65912c331b10d8c1db
>---------------------------------------------------------------
commit 1bda95800c942c007237fe65912c331b10d8c1db
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Sun Mar 25 10:55:10 2018 +0100
Use l3coffins internal interface for \number
>---------------------------------------------------------------
1bda95800c942c007237fe65912c331b10d8c1db
l3kernel/l3candidates.dtx | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/l3kernel/l3candidates.dtx b/l3kernel/l3candidates.dtx
index e9dd5cd..67040b2 100644
--- a/l3kernel/l3candidates.dtx
+++ b/l3kernel/l3candidates.dtx
@@ -1369,9 +1369,9 @@
% The corners and poles of the coffin can now be rotated around the
% origin. This is best achieved using mapping functions.
% \begin{macrocode}
- \prop_map_inline:cn { l_@@_corners_ \__int_value:w #1 _prop }
+ \prop_map_inline:cn { l_@@_corners_ \@@_to_value:N #1 _prop }
{ \@@_rotate_corner:Nnnn #1 {##1} ##2 }
- \prop_map_inline:cn { l_@@_poles_ \__int_value:w #1 _prop }
+ \prop_map_inline:cn { l_@@_poles_ \@@_to_value:N #1 _prop }
{ \@@_rotate_pole:Nnnnnn #1 {##1} ##2 }
% \end{macrocode}
% The bounding box of the coffin needs to be rotated, and to do this
@@ -1423,9 +1423,9 @@
% The final task is to move the poles and corners such that they are
% back in alignment with the box reference point.
% \begin{macrocode}
- \prop_map_inline:cn { l_@@_corners_ \__int_value:w #1 _prop }
+ \prop_map_inline:cn { l_@@_corners_ \@@_to_value:N #1 _prop }
{ \@@_shift_corner:Nnnn #1 {##1} ##2 }
- \prop_map_inline:cn { l_@@_poles_ \__int_value:w #1 _prop }
+ \prop_map_inline:cn { l_@@_poles_ \@@_to_value:N #1 _prop }
{ \@@_shift_pole:Nnnnnn #1 {##1} ##2 }
}
\cs_generate_variant:Nn \coffin_rotate:Nn { c }
@@ -1468,7 +1468,7 @@
\cs_new_protected:Npn \@@_rotate_corner:Nnnn #1#2#3#4
{
\@@_rotate_vector:nnNN {#3} {#4} \l_@@_x_dim \l_@@_y_dim
- \prop_put:cnx { l_@@_corners_ \__int_value:w #1 _prop } {#2}
+ \prop_put:cnx { l_@@_corners_ \@@_to_value:N #1 _prop } {#2}
{ { \dim_use:N \l_@@_x_dim } { \dim_use:N \l_@@_y_dim } }
}
% \end{macrocode}
@@ -1539,7 +1539,7 @@
\dim_set:Nn \l_@@_right_corner_dim { -\c_max_dim }
\dim_set:Nn \l_@@_bottom_corner_dim { \c_max_dim }
\dim_set:Nn \l_@@_left_corner_dim { \c_max_dim }
- \prop_map_inline:cn { l_@@_corners_ \__int_value:w #1 _prop }
+ \prop_map_inline:cn { l_@@_corners_ \@@_to_value:N #1 _prop }
{ \@@_find_corner_maxima_aux:nn ##2 }
}
\cs_new_protected:Npn \@@_find_corner_maxima_aux:nn #1#2
@@ -1586,7 +1586,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_shift_corner:Nnnn #1#2#3#4
{
- \prop_put:cnx { l_@@_corners_ \__int_value:w #1 _ prop } {#2}
+ \prop_put:cnx { l_@@_corners_ \@@_to_value:N #1 _ prop } {#2}
{
{ \dim_eval:n { #3 - \l_@@_left_corner_dim } }
{ \dim_eval:n { #4 - \l_@@_bottom_corner_dim } }
@@ -1594,7 +1594,7 @@
}
\cs_new_protected:Npn \@@_shift_pole:Nnnnnn #1#2#3#4#5#6
{
- \prop_put:cnx { l_@@_poles_ \__int_value:w #1 _ prop } {#2}
+ \prop_put:cnx { l_@@_poles_ \@@_to_value:N #1 _ prop } {#2}
{
{ \dim_eval:n { #3 - \l_@@_left_corner_dim } }
{ \dim_eval:n { #4 - \l_@@_bottom_corner_dim } }
@@ -1656,9 +1656,9 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_resize_common:Nnn #1#2#3
{
- \prop_map_inline:cn { l_@@_corners_ \__int_value:w #1 _prop }
+ \prop_map_inline:cn { l_@@_corners_ \@@_to_value:N #1 _prop }
{ \@@_scale_corner:Nnnn #1 {##1} ##2 }
- \prop_map_inline:cn { l_@@_poles_ \__int_value:w #1 _prop }
+ \prop_map_inline:cn { l_@@_poles_ \@@_to_value:N #1 _prop }
{ \@@_scale_pole:Nnnnnn #1 {##1} ##2 }
% \end{macrocode}
% Negative $x$-scaling values place the poles in the wrong
@@ -1666,9 +1666,9 @@
% \begin{macrocode}
\fp_compare:nNnT \l_@@_scale_x_fp < \c_zero_fp
{
- \prop_map_inline:cn { l_@@_corners_ \__int_value:w #1 _prop }
+ \prop_map_inline:cn { l_@@_corners_ \@@_to_value:N #1 _prop }
{ \@@_x_shift_corner:Nnnn #1 {##1} ##2 }
- \prop_map_inline:cn { l_@@_poles_ \__int_value:w #1 _prop }
+ \prop_map_inline:cn { l_@@_poles_ \@@_to_value:N #1 _prop }
{ \@@_x_shift_pole:Nnnnnn #1 {##1} ##2 }
}
}
@@ -1723,7 +1723,7 @@
\cs_new_protected:Npn \@@_scale_corner:Nnnn #1#2#3#4
{
\@@_scale_vector:nnNN {#3} {#4} \l_@@_x_dim \l_@@_y_dim
- \prop_put:cnx { l_@@_corners_ \__int_value:w #1 _prop } {#2}
+ \prop_put:cnx { l_@@_corners_ \@@_to_value:N #1 _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
@@ -1746,14 +1746,14 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_x_shift_corner:Nnnn #1#2#3#4
{
- \prop_put:cnx { l_@@_corners_ \__int_value:w #1 _prop } {#2}
+ \prop_put:cnx { l_@@_corners_ \@@_to_value:N #1 _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:cnx { l_@@_poles_ \__int_value:w #1 _prop } {#2}
+ \prop_put:cnx { l_@@_poles_ \@@_to_value:N #1 _prop } {#2}
{
{ \dim_eval:n { #3 + \box_wd:N #1 } } {#4}
{#5} {#6}
More information about the latex3-commits
mailing list