[latex3-commits] [git/LaTeX3-latex3-latex3] master: Use separate lines for rectangles when CTM is active (7acbe7e)
Joseph Wright
joseph.wright at morningstar2.co.uk
Sun Mar 4 21:55:52 CET 2018
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/7acbe7ef99e5b9c707f0bf9f579938f2050f1c02
>---------------------------------------------------------------
commit 7acbe7ef99e5b9c707f0bf9f579938f2050f1c02
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Sun Mar 4 20:55:52 2018 +0000
Use separate lines for rectangles when CTM is active
>---------------------------------------------------------------
7acbe7ef99e5b9c707f0bf9f579938f2050f1c02
l3experimental/l3draw/l3draw-paths.dtx | 4 +++-
l3experimental/l3draw/testfiles/m3draw003.lvt | 7 +++++++
l3experimental/l3draw/testfiles/m3draw003.ptex.tlg | 20 ++++++++++++++++++++
l3experimental/l3draw/testfiles/m3draw003.tlg | 20 ++++++++++++++++++++
.../l3draw/testfiles/m3draw003.uptex.tlg | 20 ++++++++++++++++++++
.../l3draw/testfiles/m3draw003.xetex.tlg | 20 ++++++++++++++++++++
6 files changed, 90 insertions(+), 1 deletion(-)
diff --git a/l3experimental/l3draw/l3draw-paths.dtx b/l3experimental/l3draw/l3draw-paths.dtx
index 8ac7a02..02b4804 100644
--- a/l3experimental/l3draw/l3draw-paths.dtx
+++ b/l3experimental/l3draw/l3draw-paths.dtx
@@ -711,7 +711,9 @@
{
\@@_point_process:nnn
{
- \bool_if:NTF \l_@@_corner_arc_bool
+ \bool_lazy_or:nnTF
+ { \l_@@_corner_arc_bool }
+ { \l_@@_matrix_active_bool }
{ \@@_path_rectangle_rounded:nnnn }
{ \@@_path_rectangle:nnnn }
}
diff --git a/l3experimental/l3draw/testfiles/m3draw003.lvt b/l3experimental/l3draw/testfiles/m3draw003.lvt
index c9f48b3..eabaca5 100644
--- a/l3experimental/l3draw/testfiles/m3draw003.lvt
+++ b/l3experimental/l3draw/testfiles/m3draw003.lvt
@@ -163,6 +163,13 @@
}
\test:n
{
+ \draw_transform_matrix:nnnn { 1 } { 0 } { 1 } { 1 }
+ \draw_path_rectangle:nn
+ { \draw_point_vec:nn { 2 } { 2 } }
+ { \draw_point_vec:nn { 1 } { 1 } }
+ }
+ \test:n
+ {
\draw_path_corner_arc:nn { 2pt } { 2pt }
\draw_path_rectangle:nn
{ \draw_point_vec:nn { 2 } { 2 } }
diff --git a/l3experimental/l3draw/testfiles/m3draw003.ptex.tlg b/l3experimental/l3draw/testfiles/m3draw003.ptex.tlg
index c5341a9..1e24efe 100644
--- a/l3experimental/l3draw/testfiles/m3draw003.ptex.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw003.ptex.tlg
@@ -368,6 +368,26 @@ 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
+...\special{pdf:literal q}
+...\special{pdf:literal 0.3985 w}
+...\special{color push gray 0}
+...\special{pdf:literal 226.77168 85.03938 m}
+...\special{pdf:literal 198.42522 85.03938 l}
+...\special{pdf:literal 170.07875 56.69292 l}
+...\special{pdf:literal 198.42522 56.69292 l}
+...\special{pdf:literal h}
+...\special{pdf:literal 170.07875 56.69292 m}
+...\special{pdf:literal S}
+...\special{pdf:literal Q}
+...\special{color pop}
+! OK.
+<argument> \l_tmpa_box
+l. ... }
+> \box...=
\hbox(28.85275+0.0)x28.85275
.\hbox(28.85275+0.0)x28.85275
..\glue -56.70552
diff --git a/l3experimental/l3draw/testfiles/m3draw003.tlg b/l3experimental/l3draw/testfiles/m3draw003.tlg
index 04af838..d5cde56 100644
--- a/l3experimental/l3draw/testfiles/m3draw003.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw003.tlg
@@ -368,6 +368,26 @@ 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
+...\pdfliteral{q}
+...\pdfliteral{0.3985 w}
+...\pdfcolorstack 0 push {0 g 0 G}
+...\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{h}
+...\pdfliteral{170.07875 56.69292 m}
+...\pdfliteral{S}
+...\pdfliteral{Q}
+...\pdfcolorstack 0 pop
+! OK.
+<argument> \l_tmpa_box
+l. ... }
+> \box...=
\hbox(28.85275+0.0)x28.85275
.\hbox(28.85275+0.0)x28.85275
..\glue -56.70552
diff --git a/l3experimental/l3draw/testfiles/m3draw003.uptex.tlg b/l3experimental/l3draw/testfiles/m3draw003.uptex.tlg
index c5341a9..1e24efe 100644
--- a/l3experimental/l3draw/testfiles/m3draw003.uptex.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw003.uptex.tlg
@@ -368,6 +368,26 @@ 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
+...\special{pdf:literal q}
+...\special{pdf:literal 0.3985 w}
+...\special{color push gray 0}
+...\special{pdf:literal 226.77168 85.03938 m}
+...\special{pdf:literal 198.42522 85.03938 l}
+...\special{pdf:literal 170.07875 56.69292 l}
+...\special{pdf:literal 198.42522 56.69292 l}
+...\special{pdf:literal h}
+...\special{pdf:literal 170.07875 56.69292 m}
+...\special{pdf:literal S}
+...\special{pdf:literal Q}
+...\special{color pop}
+! OK.
+<argument> \l_tmpa_box
+l. ... }
+> \box...=
\hbox(28.85275+0.0)x28.85275
.\hbox(28.85275+0.0)x28.85275
..\glue -56.70552
diff --git a/l3experimental/l3draw/testfiles/m3draw003.xetex.tlg b/l3experimental/l3draw/testfiles/m3draw003.xetex.tlg
index c5341a9..1e24efe 100644
--- a/l3experimental/l3draw/testfiles/m3draw003.xetex.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw003.xetex.tlg
@@ -368,6 +368,26 @@ 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
+...\special{pdf:literal q}
+...\special{pdf:literal 0.3985 w}
+...\special{color push gray 0}
+...\special{pdf:literal 226.77168 85.03938 m}
+...\special{pdf:literal 198.42522 85.03938 l}
+...\special{pdf:literal 170.07875 56.69292 l}
+...\special{pdf:literal 198.42522 56.69292 l}
+...\special{pdf:literal h}
+...\special{pdf:literal 170.07875 56.69292 m}
+...\special{pdf:literal S}
+...\special{pdf:literal Q}
+...\special{color pop}
+! OK.
+<argument> \l_tmpa_box
+l. ... }
+> \box...=
\hbox(28.85275+0.0)x28.85275
.\hbox(28.85275+0.0)x28.85275
..\glue -56.70552
More information about the latex3-commits
mailing list