[latex3-commits] [git/LaTeX3-latex3-latex3] master: Avoid evaluation of drawing points unless requested (a00a9ab)
Joseph Wright
joseph.wright at morningstar2.co.uk
Sun Feb 10 20:26:52 CET 2019
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/a00a9ab665b78497a07594d4c137ed7ccf216ebb
>---------------------------------------------------------------
commit a00a9ab665b78497a07594d4c137ed7ccf216ebb
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Sun Feb 10 15:50:03 2019 +0000
Avoid evaluation of drawing points unless requested
There are changes to values in the test files:
small rounding-based issues.
>---------------------------------------------------------------
a00a9ab665b78497a07594d4c137ed7ccf216ebb
l3experimental/l3draw/l3draw-boxes.dtx | 11 +--
l3experimental/l3draw/l3draw-paths.dtx | 8 +-
l3experimental/l3draw/l3draw-points.dtx | 27 ++-----
l3experimental/l3draw/l3draw-transforms.dtx | 4 +-
l3experimental/l3draw/testfiles/m3draw001.tlg | 34 ++++-----
l3experimental/l3draw/testfiles/m3draw002.lvt | 46 +++++------
l3experimental/l3draw/testfiles/m3draw003.lvt | 36 ++++-----
l3experimental/l3draw/testfiles/m3draw003.tlg | 102 ++++++++++++-------------
l3experimental/l3draw/testfiles/m3draw004.tlg | 12 +--
l3experimental/l3draw/testfiles/m3draw006.tlg | 8 +-
10 files changed, 139 insertions(+), 149 deletions(-)
diff --git a/l3experimental/l3draw/l3draw-boxes.dtx b/l3experimental/l3draw/l3draw-boxes.dtx
index 59bf5ac..d70aa3f 100644
--- a/l3experimental/l3draw/l3draw-boxes.dtx
+++ b/l3experimental/l3draw/l3draw-boxes.dtx
@@ -136,13 +136,14 @@
\group_begin:
\hbox_set:Nn \l_@@_tmp_box
{ \coffin_typeset:Nnnnn #1 {#2} {#3} { 0pt } { 0pt } }
- \@@_box_use:Nnnnn \l_@@_tmp_box
- { \box_wd:N \l_@@_tmp_box - \coffin_wd:N #1 }
- { -\box_dp:N \l_@@_tmp_box }
- { \box_wd:N \l_@@_tmp_box }
- { \box_ht:N \l_@@_tmp_box }
+ \exp_args:NNffff \@@_box_use:Nnnnn \l_@@_tmp_box
+ { \dim_eval:n { \box_wd:N \l_@@_tmp_box - \coffin_wd:N #1 } }
+ { \dim_eval:n { -\box_dp:N \l_@@_tmp_box } }
+ { \dim_eval:n { \box_wd:N \l_@@_tmp_box } }
+ { \dim_eval:n { \box_ht:N \l_@@_tmp_box } }
\group_end:
}
+\exp_args_generate:n { Nffff }
% \end{macrocode}
% \end{macro}
%
diff --git a/l3experimental/l3draw/l3draw-paths.dtx b/l3experimental/l3draw/l3draw-paths.dtx
index 3fbf3b7..2f1ad51 100644
--- a/l3experimental/l3draw/l3draw-paths.dtx
+++ b/l3experimental/l3draw/l3draw-paths.dtx
@@ -718,10 +718,10 @@
}
\cs_new_protected:Npn \@@_path_rectangle_rounded:nnnn #1#2#3#4
{
- \draw_path_moveto:n { #1 + #3 , #2 + #4 }
- \draw_path_lineto:n { #1 , #2 + #4 }
+ \draw_path_moveto:n { \draw_point:nn { #1 + #3 } { #2 + #4 } }
+ \draw_path_lineto:n { \draw_point:nn {#1} { #2 + #4 } }
\draw_path_lineto:n { #1 , #2 }
- \draw_path_lineto:n { #1 + #3 , #2 }
+ \draw_path_lineto:n { \draw_point:nn { #1 + #3 } {#2} }
\draw_path_close:
\draw_path_moveto:n { #1 , #2 }
}
@@ -740,7 +740,7 @@
{#1} {#2}
}
\cs_new_protected:Npn \@@_path_rectangle_corners:nnnnn #1#2#3#4#5
- { \draw_path_rectangle:nn {#1} { #4 - #2 , #5 - #3 } }
+ { \draw_path_rectangle:nn {#1} { \draw_point:nn { #4 - #2 } { #5 - #3 } } }
% \end{macrocode}
% \end{macro}
% \end{macro}
diff --git a/l3experimental/l3draw/l3draw-points.dtx b/l3experimental/l3draw/l3draw-points.dtx
index fe461d6..13809d2 100644
--- a/l3experimental/l3draw/l3draw-points.dtx
+++ b/l3experimental/l3draw/l3draw-points.dtx
@@ -112,8 +112,7 @@
\cs_new:Npn \@@_point_process:nn #1#2
{
\exp_args:Nf \@@_point_process_auxi:nn
- { \@@_point_to_dim:n {#2} }
- {#1}
+ {#2} {#1}
}
\cs_new:Npn \@@_point_process_auxi:nn #1#2
{ \@@_point_process_auxii:nw {#2} #1 \q_stop }
@@ -122,9 +121,7 @@
\cs_new:Npn \@@_point_process:nnn #1#2#3
{
\exp_args:Nff \@@_point_process_auxiii:nnn
- { \@@_point_to_dim:n {#2} }
- { \@@_point_to_dim:n {#3} }
- {#1}
+ {#2} {#3} {#1}
}
\cs_new:Npn \@@_point_process_auxiii:nnn #1#2#3
{ \@@_point_process_auxiv:nw {#3} #1 \q_mark #2 \q_stop }
@@ -133,10 +130,7 @@
\cs_new:Npn \@@_point_process:nnnn #1#2#3#4
{
\exp_args:Nfff \@@_point_process_auxv:nnnn
- { \@@_point_to_dim:n {#2} }
- { \@@_point_to_dim:n {#3} }
- { \@@_point_to_dim:n {#4} }
- {#1}
+ {#2} {#3} {#4} {#1}
}
\cs_new:Npn \@@_point_process_auxv:nnnn #1#2#3#4
{ \@@_point_process_auxvi:nw {#4} #1 \q_mark #2 \q_mark #3 \q_stop }
@@ -146,11 +140,7 @@
\cs_new:Npn \@@_point_process:nnnnn #1#2#3#4#5
{
\exp_args:Nffff \@@_point_process_auxvii:nnnnn
- { \@@_point_to_dim:n {#2} }
- { \@@_point_to_dim:n {#3} }
- { \@@_point_to_dim:n {#4} }
- { \@@_point_to_dim:n {#5} }
- {#1}
+ {#2} {#3} {#4} {#5} {#1}
}
\cs_new:Npn \@@_point_process_auxvii:nnnnn #1#2#3#4#5
{
@@ -525,7 +515,10 @@
\@@_point_interpolate_distance:fnnnn
{ \fp_eval:n {#1} } {#3} {#4}
}
- { \draw_point_unit_vector:n { ( #2 ) - ( #3 , #4 ) } }
+ {
+ \draw_point_unit_vector:n
+ { \@@_point_to_dim:n { ( #2 ) - ( #3 , #4 ) } }
+ }
}
\cs_new:Npn \@@_point_interpolate_distance:nnnnn #1#2#3#4#5
{ \@@_point_to_dim:n { #2 + #1 * #4 , #3 + #1 * #5 } }
@@ -896,17 +889,13 @@
{
\@@_point_to_dim:n
{
- (
\l_@@_matrix_a_fp * #1
+ \l_@@_matrix_c_fp * #2
+ \l_@@_xshift_dim
- )
,
- (
\l_@@_matrix_b_fp * #1
+ \l_@@_matrix_d_fp * #2
+ \l_@@_yshift_dim
- )
}
}
{
diff --git a/l3experimental/l3draw/l3draw-transforms.dtx b/l3experimental/l3draw/l3draw-transforms.dtx
index e7b7445..cbaaa90 100644
--- a/l3experimental/l3draw/l3draw-transforms.dtx
+++ b/l3experimental/l3draw/l3draw-transforms.dtx
@@ -293,9 +293,9 @@
\cs_new_protected:Npn \draw_transform_yscale:n #1
{ \draw_transform_matrix_concat:nnnn { 1 } { 0 } { 0 } { #1 } }
\cs_new_protected:Npn \draw_transform_xshift:n #1
- { \draw_transform_shift_concat:n { #1 , 0 } }
+ { \draw_transform_shift_concat:n { #1 , 0pt } }
\cs_new_protected:Npn \draw_transform_yshift:n #1
- { \draw_transform_shift_concat:n { 0 , #1 } }
+ { \draw_transform_shift_concat:n { 0pt , #1 } }
\cs_new_protected:Npn \draw_transform_xslant:n #1
{ \draw_transform_matrix_concat:nnnn { 1 } { 0 } { #1 } { 1 } }
\cs_new_protected:Npn \draw_transform_yslant:n #1
diff --git a/l3experimental/l3draw/testfiles/m3draw001.tlg b/l3experimental/l3draw/testfiles/m3draw001.tlg
index 0d3f99c..1c7a89b 100644
--- a/l3experimental/l3draw/testfiles/m3draw001.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw001.tlg
@@ -22,18 +22,18 @@ TEST 3: \draw_point_unit_vector:n
============================================================
TEST 4: \draw_point_intersect_lines:nnnn
============================================================
-28.4527587890625pt,-0.000000000000004117465614979737pt
-10.51039396997536pt,10.51039396997536pt
+28.45274353027345pt,-0.000000000000008234940062507525pt
+10.51038833340825pt,10.51038833340825pt
============================================================
============================================================
TEST 5: \draw_point_intersect_circles:nnnnn
============================================================
-0.00000288355082pt,0.00000288355084pt
+-0.00001237523567pt,-0.00001237523569pt
============================================================
============================================================
TEST 6: \draw_point_interpolate_line:nnn
============================================================
-28.4527587890625pt,56.905517578125pt
+28.45274353027344pt,56.90548706054688pt
============================================================
============================================================
TEST 7: \draw_point_interpolate_distance:nnn
@@ -49,21 +49,21 @@ TEST 8: \draw_point_interpolate_arcaxes:nnnnnn
============================================================
TEST 9: \draw_point_interpolate_curve:nnnnnn
============================================================
-28.4527587890625pt,35.56594848632813pt
+28.45274353027344pt,35.5659294128418pt
============================================================
============================================================
TEST 10: \draw_set_ <axis>vec:n
============================================================
-> 17.49844360351562pt,17.49844360351562pt.
+> 17.49859619140625pt,17.49859619140625pt.
<recently read> }
l. ... }
-> 17.49844360351562pt,45.95120239257812pt.
+> 17.49859619140625pt,45.95133972167969pt.
<recently read> }
l. ... }
-> 45.95120239257812pt,45.95120239257812pt.
+> 45.95133972167969pt,45.95133972167969pt.
<recently read> }
l. ... }
-> 85.3582763671875pt,85.3582763671875pt.
+> 85.35823059082032pt,85.35823059082032pt.
<recently read> }
l. ... }
============================================================
@@ -71,21 +71,21 @@ l. ... }
TEST 11: \draw_point_vec:nn
============================================================
0pt,0pt
-28.4527587890625pt,28.4527587890625pt
-28.4527587890625pt,56.905517578125pt
-28.4527587890625pt,28.4527587890625pt
+28.45274353027344pt,28.45274353027344pt
+28.45274353027344pt,56.90548706054688pt
+28.45274353027344pt,28.45274353027344pt
============================================================
============================================================
TEST 12: \draw_point_vec:nnn
============================================================
0pt,0pt
--10.95431518554688pt,-10.95431518554688pt
-0pt,28.4527587890625pt
--10.95431518554688pt,17.49844360351562pt
+-10.95414733886719pt,-10.95414733886719pt
+0pt,28.45274353027344pt
+-10.95414733886719pt,17.49859619140625pt
============================================================
============================================================
TEST 13: \draw_point_vec_polar:nn (n)
============================================================
-49.28162383815817pt,28.4527587890625pt
-24.64081191907909pt,28.4527587890625pt
+49.28159740916025pt,28.45274353027344pt
+24.64079870458013pt,28.45274353027344pt
============================================================
diff --git a/l3experimental/l3draw/testfiles/m3draw002.lvt b/l3experimental/l3draw/testfiles/m3draw002.lvt
index c27a223..960c4f1 100644
--- a/l3experimental/l3draw/testfiles/m3draw002.lvt
+++ b/l3experimental/l3draw/testfiles/m3draw002.lvt
@@ -19,70 +19,70 @@
\TEST { \draw_transform_matrix:nnnn }
{
- \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1 , 1 } }
+ \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1pt , 1pt } }
\draw_transform_matrix:nnnn { 1 } { 1 } { 1 } { 1 }
- \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1 ,1 } }
+ \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1pt , 1pt } }
}
\TEST { \draw_transform_matrix_concat:nnnnn }
{
- \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1 , 1 } }
+ \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1pt , 1pt } }
\draw_transform_matrix_concat:nnnn { 1 } { 1 } { 1 } { 1 }
- \exp_args:Nx \tl_show:n { \draw_point_transform:n { ( 1 , 1 ) } }
+ \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1pt , 1pt } }
\draw_transform_matrix_concat:nnnn { 2 } { 0 } { 0 } { 1 }
- \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1 , 1 } }
+ \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1pt , 1pt } }
}
\TEST { \draw_transform_triangle: }
{
\draw_transform_triangle:nnn { 0cm , 0cm } { 1cm , 1cm } { -1cm , 1cm }
- \exp_args:Nx \tl_show:n { \draw_point_transform:n { 0.5 , 0.5 } }
+ \exp_args:Nx \tl_show:n { \draw_point_transform:n { 0.5pt , 0.5pt } }
}
\TEST { \draw_transform_rotate:n }
{
- \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1 , 1 } }
+ \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1pt , 1pt } }
\draw_transform_rotate:n { 30 }
- \exp_args:Nx \tl_show:n { \draw_point_transform:n { ( 1 , 1 ) } }
+ \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1pt , 1pt } }
\draw_transform_rotate:n { -45 }
- \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1 , 1 } }
+ \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1pt , 1pt } }
}
\TEST { \draw_transform_scale:n }
{
- \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1 , 1 } }
+ \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1pt , 1pt } }
\draw_transform_scale:n { 2 }
- \exp_args:Nx \tl_show:n { \draw_point_transform:n { ( 1 , 1 ) } }
+ \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1pt , 1pt } }
\draw_transform_xscale:n { 2 }
- \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1 , 1 } }
+ \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1pt , 1pt } }
\draw_transform_yscale:n { 1/3 }
- \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1 , 1 } }
+ \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1pt , 1pt } }
}
\TEST { \draw_transform_shift:n }
{
- \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1 , 1 } }
+ \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1pt , 1pt } }
\draw_transform_shift:n { 10pt, 10pt }
- \exp_args:Nx \tl_show:n { \draw_point_transform:n { ( 1 , 1 ) } }
+ \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1pt , 1pt } }
\draw_transform_xshift:n { -5pt }
- \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1 , 1 } }
+ \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1pt , 1pt } }
\draw_transform_yshift:n { 12pt }
- \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1 , 1 } }
+ \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1pt , 1pt } }
}
\TEST { \draw_transform_slant:n }
{
- \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1 , 1 } }
+ \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1pt , 1pt } }
\draw_transform_xslant:n { 2 }
- \exp_args:Nx \tl_show:n { \draw_point_transform:n { ( 1 , 1 ) } }
+ \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1pt , 1pt } }
\draw_transform_yslant:n { 3 }
- \exp_args:Nx \tl_show:n { \draw_point_transform:n { ( 1 , 1 ) } }
+ \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1pt , 1pt } }
}
\TEST { \draw_transform_matrix_invert: }
{
\draw_transform_matrix:nnnn { 1 } { 0 } { 1 } { 1 }
- \tl_set:Nx \l_tmpa_tl { \draw_point_transform:n { 1 , 1 } }
+ \tl_set:Nx \l_tmpa_tl { \draw_point_transform:n { 1pt , 1pt } }
\tl_show:N \l_tmpa_tl
\draw_transform_matrix_invert:
\exp_args:Nx \tl_show:n { \draw_point_transform:n { \l_tmpa_tl } }
@@ -92,14 +92,14 @@
{
\draw_transform_matrix:nnnn { 1 } { 0 } { 1 } { 1 }
\draw_transform_matrix_reset:
- \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1 , 1 } }
+ \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1pt , 1pt } }
}
\TEST { \draw_transform_shift_reset: }
{
\draw_transform_shift:n { 10pt , 0pt }
\draw_transform_shift_reset:
- \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1 , 1 } }
+ \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1pt , 1pt } }
}
\END
diff --git a/l3experimental/l3draw/testfiles/m3draw003.lvt b/l3experimental/l3draw/testfiles/m3draw003.lvt
index dae2696..1d15cca 100644
--- a/l3experimental/l3draw/testfiles/m3draw003.lvt
+++ b/l3experimental/l3draw/testfiles/m3draw003.lvt
@@ -56,10 +56,10 @@
{
\test:n
{
- \draw_path_moveto:n { 0 , 0 }
- \draw_path_lineto:n { 1 , 0 }
- \draw_path_lineto:n { 1 , 1 }
- \draw_path_lineto:n { 0 , 1 }
+ \draw_path_moveto:n { 0pt , 0pt }
+ \draw_path_lineto:n { 1pt , 0 }
+ \draw_path_lineto:n { 1pt , 1pt }
+ \draw_path_lineto:n { 0pt , 1pt }
\draw_path_close:
}
}
@@ -78,47 +78,47 @@
{
\test:n
{
- \draw_path_moveto:n { 0 , 0 }
+ \draw_path_moveto:n { 0pt , 0pt }
\draw_path_arc:nnn { 0 } { 90 } { 2cm }
}
\test:n
{
- \draw_path_moveto:n { 0 , 0 }
+ \draw_path_moveto:n { 0pt , 0pt }
\draw_path_arc:nnn { 0 } { 180 } { 2cm }
}
\test:n
{
- \draw_path_moveto:n { 0 , 0 }
+ \draw_path_moveto:n { 0pt , 0pt }
\draw_path_arc:nnn { 0 } { 220 } { 2cm }
}
\test:n
{
- \draw_path_moveto:n { 0 , 0 }
+ \draw_path_moveto:n { 0pt , 0pt }
\draw_path_arc:nnn { 0 } { 360 } { 2cm }
}
\test:n
{
- \draw_path_moveto:n { 0 , 0 }
+ \draw_path_moveto:n { 0pt , 0pt }
\draw_path_arc:nnn { 0 } { -90 } { 2cm }
}
\test:n
{
- \draw_path_moveto:n { 0 , 0 }
+ \draw_path_moveto:n { 0pt , 0pt }
\draw_path_arc:nnn { 0 } { -180 } { 2cm }
}
\test:n
{
- \draw_path_moveto:n { 0 , 0 }
+ \draw_path_moveto:n { 0pt , 0pt }
\draw_path_arc:nnn { 0 } { -270 } { 2cm }
}
\test:n
{
- \draw_path_moveto:n { 0 , 0 }
+ \draw_path_moveto:n { 0pt , 0pt }
\draw_path_arc:nnn { 0 } { -360 } { 2cm }
}
\test:n
{
- \draw_path_moveto:n { 0 , 0 }
+ \draw_path_moveto:n { 0pt , 0pt }
\draw_path_arc:nnnn { 0 } { 90 } { 1cm } { 2cm }
}
}
@@ -137,7 +137,7 @@
{
\test:n
{
- \draw_path_ellipse:nnn { 1 , 1 } { 1 , 1 } { -2 , 2 }
+ \draw_path_ellipse:nnn { 1pt , 1pt } { 1pt , 1pt } { -2pt , 2pt }
}
\test:n
{
@@ -149,7 +149,7 @@
{
\test:n
{
- \draw_path_circle:nn { 1 , 1 } { 3cm }
+ \draw_path_circle:nn { 1pt , 1pt } { 3cm }
}
}
@@ -225,7 +225,7 @@
{
\draw_path_canvas_moveto:n { 10pt , 10pt }
\draw_transform_matrix:nnnn { 2 } { 1 } { 0 } { 1 }
- \draw_transform_shift:n { 10 , 10 }
+ \draw_transform_shift:n { 10pt , 10pt }
\draw_path_canvas_moveto:n { 10pt , 10pt }
}
}
@@ -236,7 +236,7 @@
{
\draw_path_canvas_lineto:n { 10pt , 10pt }
\draw_transform_matrix:nnnn { 2 } { 1 } { 0 } { 1 }
- \draw_transform_shift:n { 10 , 10 }
+ \draw_transform_shift:n { 10pt , 10pt }
\draw_path_canvas_lineto:n { 10pt , 10pt }
}
}
@@ -250,7 +250,7 @@
{ \draw_point_vec:nn { 1 } { 1 } }
{ \draw_point_vec:nn { 1 } { 2 } }
\draw_transform_matrix:nnnn { 2 } { 1 } { 0 } { 1 }
- \draw_transform_shift:n { 10 , 10 }
+ \draw_transform_shift:n { 10pt , 10pt }
\draw_path_canvas_curveto:nnn
{ \draw_point_vec:nn { 0 } { 1 } }
{ \draw_point_vec:nn { 1 } { 1 } }
diff --git a/l3experimental/l3draw/testfiles/m3draw003.tlg b/l3experimental/l3draw/testfiles/m3draw003.tlg
index 70583b1..ee96534 100644
--- a/l3experimental/l3draw/testfiles/m3draw003.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw003.tlg
@@ -50,10 +50,10 @@ l. ... }
TEST 3: \draw_path_curveto:nnn
============================================================
> \box...=
-\hbox(28.85275+0.0)x28.85275
-.\hbox(28.85275+0.0)x28.85275
+\hbox(28.85274+0.0)x28.85274
+.\hbox(28.85274+0.0)x28.85274
..\glue 0.2
-..\hbox(0.0+0.0)x0.0, shifted 28.25276
+..\hbox(0.0+0.0)x0.0, shifted 28.25275
...\pdfsave
...\pdfliteral{0.3985 w}
...\pdfcolorstack 0 push {0 g 0 G}
@@ -61,7 +61,7 @@ TEST 3: \draw_path_curveto:nnn
...\pdfliteral{0 j}
...\pdfliteral{10 M}
...\pdfliteral{[] 0 d}
-...\pdfliteral{0 28.34647 28.34647 28.34647 28.34647 56.69292 c}
+...\pdfliteral{0 28.34645 28.34645 28.34645 28.34645 56.69289 c}
...\pdfliteral{S}
...\pdfrestore
...\pdfcolorstack 0 pop
@@ -100,9 +100,9 @@ l. ... }
TEST 5: \draw_path_curveto:nnn
============================================================
> \box...=
-\hbox(38.00368+0.0)x9.88425
-.\hbox(38.00368+0.0)x9.88425
-..\glue -18.76851
+\hbox(38.00365+0.0)x9.88425
+.\hbox(38.00365+0.0)x9.88425
+..\glue -18.7685
..\hbox(0.0+0.0)x0.0, shifted 19.10184
...\pdfsave
...\pdfliteral{0.3985 w}
@@ -111,7 +111,7 @@ TEST 5: \draw_path_curveto:nnn
...\pdfliteral{0 j}
...\pdfliteral{10 M}
...\pdfliteral{[] 0 d}
-...\pdfliteral{18.89764 19.22972 28.34647 37.79527 28.34647 56.69292 c}
+...\pdfliteral{18.89763 19.22972 28.34645 37.79526 28.34645 56.69289 c}
...\pdfliteral{S}
...\pdfrestore
...\pdfcolorstack 0 pop
@@ -319,10 +319,10 @@ l. ... }
TEST 7: \draw_path_arc_axes:nnnn
============================================================
> \box...=
-\hbox(25.87746+0.0)x57.30551
-.\hbox(25.87746+0.0)x57.30551
-..\glue 85.55827
-..\hbox(0.0+0.0)x0.0, shifted 88.13358
+\hbox(25.87744+0.0)x57.30548
+.\hbox(25.87744+0.0)x57.30548
+..\glue 85.55824
+..\hbox(0.0+0.0)x0.0, shifted 88.13356
...\pdfsave
...\pdfliteral{0.3985 w}
...\pdfcolorstack 0 push {0 g 0 G}
@@ -330,7 +330,7 @@ TEST 7: \draw_path_arc_axes:nnnn
...\pdfliteral{0 j}
...\pdfliteral{10 M}
...\pdfliteral{[] 0 d}
-...\pdfliteral{-28.34647 88.00356 -53.72874 113.38583 -85.03938 113.38583 c}
+...\pdfliteral{-28.34647 88.00354 -53.72873 113.3858 -85.03935 113.3858 c}
...\pdfliteral{S}
...\pdfrestore
...\pdfcolorstack 0 pop
@@ -425,10 +425,10 @@ l. ... }
TEST 10: \draw_path_rectangle:nn
============================================================
> \box...=
-\hbox(28.85275+0.0)x28.85275
-.\hbox(28.85275+0.0)x28.85275
-..\glue -56.70552
-..\hbox(0.0+0.0)x0.0, shifted 56.70552
+\hbox(28.85274+0.0)x28.85274
+.\hbox(28.85274+0.0)x28.85274
+..\glue -56.70549
+..\hbox(0.0+0.0)x0.0, shifted 56.70549
...\pdfsave
...\pdfliteral{0.3985 w}
...\pdfcolorstack 0 push {0 g 0 G}
@@ -436,7 +436,7 @@ TEST 10: \draw_path_rectangle:nn
...\pdfliteral{0 j}
...\pdfliteral{10 M}
...\pdfliteral{[] 0 d}
-...\pdfliteral{56.69292 56.69292 28.34647 28.34647 re}
+...\pdfliteral{56.69289 56.69289 28.34645 28.34645 re}
...\pdfliteral{S}
...\pdfrestore
...\pdfcolorstack 0 pop
@@ -444,10 +444,10 @@ TEST 10: \draw_path_rectangle:nn
<argument> \l_tmpa_box
l. ... }
> \box...=
-\hbox(28.85275+0.0)x57.30551
-.\hbox(28.85275+0.0)x57.30551
-..\glue -170.51656
-..\hbox(0.0+0.0)x0.0, shifted 56.70552
+\hbox(28.85274+0.0)x57.30548
+.\hbox(28.85274+0.0)x57.30548
+..\glue -170.51646
+..\hbox(0.0+0.0)x0.0, shifted 56.70549
...\pdfsave
...\pdfliteral{0.3985 w}
...\pdfcolorstack 0 push {0 g 0 G}
@@ -455,12 +455,12 @@ l. ... }
...\pdfliteral{0 j}
...\pdfliteral{10 M}
...\pdfliteral{[] 0 d}
-...\pdfliteral{226.77168 85.03938 m}
-...\pdfliteral{198.42522 85.03938 l}
-...\pdfliteral{170.07875 56.69292 l}
-...\pdfliteral{198.42522 56.69292 l}
+...\pdfliteral{226.77156 85.03934 m}
+...\pdfliteral{198.42511 85.03934 l}
+...\pdfliteral{170.07866 56.69289 l}
+...\pdfliteral{198.42511 56.69289 l}
...\pdfliteral{h}
-...\pdfliteral{170.07875 56.69292 m}
+...\pdfliteral{170.07866 56.69289 m}
...\pdfliteral{S}
...\pdfrestore
...\pdfcolorstack 0 pop
@@ -468,10 +468,10 @@ l. ... }
<argument> \l_tmpa_box
l. ... }
> \box...=
-\hbox(28.85275+0.0)x28.85275
-.\hbox(28.85275+0.0)x28.85275
-..\glue -56.70552
-..\hbox(0.0+0.0)x0.0, shifted 56.70552
+\hbox(28.85274+0.0)x28.85274
+.\hbox(28.85274+0.0)x28.85274
+..\glue -56.70549
+..\hbox(0.0+0.0)x0.0, shifted 56.70549
...\pdfsave
...\pdfliteral{0.3985 w}
...\pdfcolorstack 0 push {0 g 0 G}
@@ -479,17 +479,17 @@ l. ... }
...\pdfliteral{0 j}
...\pdfliteral{10 M}
...\pdfliteral{[] 0 d}
-...\pdfliteral{83.04684 85.03938 m}
-...\pdfliteral{58.68544 85.03938 l}
-...\pdfliteral{57.585 85.03938 56.69292 84.1473 56.69292 83.04684 c}
-...\pdfliteral{56.69292 58.68544 l}
-...\pdfliteral{56.69292 57.585 57.585 56.69292 58.68544 56.69292 c}
-...\pdfliteral{83.04684 56.69292 l}
-...\pdfliteral{84.1473 56.69292 85.03938 57.585 85.03938 58.68544 c}
-...\pdfliteral{85.03938 83.04684 l}
-...\pdfliteral{85.03938 84.1473 84.1473 85.03938 83.04684 85.03938 c}
+...\pdfliteral{83.0468 85.03934 m}
+...\pdfliteral{58.68541 85.03934 l}
+...\pdfliteral{57.58498 85.03934 56.69289 84.14725 56.69289 83.0468 c}
+...\pdfliteral{56.69289 58.68541 l}
+...\pdfliteral{56.69289 57.58498 57.58498 56.69289 58.68541 56.69289 c}
+...\pdfliteral{83.0468 56.69289 l}
+...\pdfliteral{84.14725 56.69289 85.03934 57.58498 85.03934 58.68541 c}
+...\pdfliteral{85.03934 83.0468 l}
+...\pdfliteral{85.03934 84.14725 84.14725 85.03934 83.0468 85.03934 c}
...\pdfliteral{h}
-...\pdfliteral{56.69292 56.69292 m}
+...\pdfliteral{56.69289 56.69289 m}
...\pdfliteral{S}
...\pdfrestore
...\pdfcolorstack 0 pop
@@ -497,10 +497,10 @@ l. ... }
<argument> \l_tmpa_box
l. ... }
> \box...=
-\hbox(28.85275+0.0)x28.85275
-.\hbox(28.85275+0.0)x28.85275
-..\glue -56.70552
-..\hbox(0.0+0.0)x0.0, shifted 56.70552
+\hbox(28.85274+0.0)x28.85274
+.\hbox(28.85274+0.0)x28.85274
+..\glue -56.70549
+..\hbox(0.0+0.0)x0.0, shifted 56.70549
...\pdfsave
...\pdfliteral{0.3985 w}
...\pdfcolorstack 0 push {0 g 0 G}
@@ -508,7 +508,7 @@ l. ... }
...\pdfliteral{0 j}
...\pdfliteral{10 M}
...\pdfliteral{[] 0 d}
-...\pdfliteral{56.69292 56.69292 28.34647 28.34647 re}
+...\pdfliteral{56.69289 56.69289 28.34645 28.34645 re}
...\pdfliteral{S}
...\pdfrestore
...\pdfcolorstack 0 pop
@@ -734,10 +734,10 @@ l. ... }
TEST 14: \draw_path_canvas_curveto:nnn
============================================================
> \box...=
-\hbox(28.85275+0.0)x28.85275
-.\hbox(28.85275+0.0)x28.85275
+\hbox(28.85274+0.0)x28.85274
+.\hbox(28.85274+0.0)x28.85274
..\glue 0.2
-..\hbox(0.0+0.0)x0.0, shifted 28.25276
+..\hbox(0.0+0.0)x0.0, shifted 28.25275
...\pdfsave
...\pdfliteral{0.3985 w}
...\pdfcolorstack 0 push {0 g 0 G}
@@ -745,8 +745,8 @@ TEST 14: \draw_path_canvas_curveto:nnn
...\pdfliteral{0 j}
...\pdfliteral{10 M}
...\pdfliteral{[] 0 d}
-...\pdfliteral{0 28.34647 28.34647 28.34647 28.34647 56.69292 c}
-...\pdfliteral{0 28.34647 28.34647 28.34647 28.34647 56.69292 c}
+...\pdfliteral{0 28.34645 28.34645 28.34645 28.34645 56.69289 c}
+...\pdfliteral{0 28.34645 28.34645 28.34645 28.34645 56.69289 c}
...\pdfliteral{S}
...\pdfrestore
...\pdfcolorstack 0 pop
diff --git a/l3experimental/l3draw/testfiles/m3draw004.tlg b/l3experimental/l3draw/testfiles/m3draw004.tlg
index 18f02a5..84fe0bf 100644
--- a/l3experimental/l3draw/testfiles/m3draw004.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw004.tlg
@@ -391,10 +391,10 @@ l. ... }
...\pdfliteral{10 M}
...\pdfliteral{[] 0 d}
...\pdfcolorstack 0 push {1 0 0 rg 1 0 0 RG}
-...\pdfliteral{0 0 28.34647 28.34647 re}
+...\pdfliteral{0 0 28.34645 28.34645 re}
...\pdfliteral{f}
...\pdfcolorstack 0 push {1 0 0 rg 1 0 0 RG}
-...\pdfliteral{0 0 28.34647 28.34647 re}
+...\pdfliteral{0 0 28.34645 28.34645 re}
...\pdfliteral{B}
...\pdfcolorstack 0 push {1 0 0 rg 1 0 0 RG}
...\pdfliteral{0 0 m}
@@ -426,10 +426,10 @@ TEST 8: \draw_color_fill:n
...\pdfliteral{10 M}
...\pdfliteral{[] 0 d}
...\pdfcolorstack 0 push {1 0 0 rg}
-...\pdfliteral{0 0 28.34647 28.34647 re}
+...\pdfliteral{0 0 28.34645 28.34645 re}
...\pdfliteral{f}
...\pdfcolorstack 0 push {1 0 0 rg}
-...\pdfliteral{0 0 28.34647 28.34647 re}
+...\pdfliteral{0 0 28.34645 28.34645 re}
...\pdfliteral{B}
...\pdfcolorstack 0 push {1 0 0 rg}
...\pdfliteral{0 0 m}
@@ -461,10 +461,10 @@ TEST 9: \draw_color_stroke:n
...\pdfliteral{10 M}
...\pdfliteral{[] 0 d}
...\pdfcolorstack 0 push {1 0 0 RG}
-...\pdfliteral{0 0 28.34647 28.34647 re}
+...\pdfliteral{0 0 28.34645 28.34645 re}
...\pdfliteral{f}
...\pdfcolorstack 0 push {1 0 0 RG}
-...\pdfliteral{0 0 28.34647 28.34647 re}
+...\pdfliteral{0 0 28.34645 28.34645 re}
...\pdfliteral{B}
...\pdfcolorstack 0 push {1 0 0 RG}
...\pdfliteral{0 0 m}
diff --git a/l3experimental/l3draw/testfiles/m3draw006.tlg b/l3experimental/l3draw/testfiles/m3draw006.tlg
index d519fe1..bd1354c 100644
--- a/l3experimental/l3draw/testfiles/m3draw006.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw006.tlg
@@ -129,8 +129,8 @@ l. ... }
...\pdfliteral{141.73228 141.73228 l}
...\pdfliteral{S}
...\hbox(0.0+0.0)x0.0
-....\kern 56.90552
-....\hbox(6.94444+0.0)x0.0, shifted -56.90552
+....\kern 56.9055
+....\hbox(6.94444+0.0)x0.0, shifted -56.9055
.....\pdfsave
.....\pdfsetmatrix{1 0 0 1}
.....\hbox(6.94444+0.0)x0.0, glue set - 22.50005fil
@@ -341,8 +341,8 @@ l. ... }
...\pdfliteral{141.73228 141.73228 l}
...\pdfliteral{S}
...\hbox(0.0+0.0)x0.0
-....\kern 56.90552
-....\hbox(6.94444+0.0)x0.0, shifted -56.90552
+....\kern 56.9055
+....\hbox(6.94444+0.0)x0.0, shifted -56.9055
.....\pdfsave
.....\pdfsetmatrix{1 0 0 1}
.....\hbox(6.94444+0.0)x0.0, glue set - 22.50005fil
More information about the latex3-commits
mailing list