[latex3-commits] [git/LaTeX3-latex3-latex3] master: Test drawing suspension (1cb591e)
Joseph Wright
joseph.wright at morningstar2.co.uk
Sun Mar 4 21:41:24 CET 2018
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/1cb591e61c29f977ed3c497e3a93236002dca839
>---------------------------------------------------------------
commit 1cb591e61c29f977ed3c497e3a93236002dca839
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Sun Mar 4 20:32:35 2018 +0000
Test drawing suspension
Also making the scope tests produce something useful.
>---------------------------------------------------------------
1cb591e61c29f977ed3c497e3a93236002dca839
l3experimental/l3draw/testfiles/m3draw005.lvt | 28 ++++++++--
l3experimental/l3draw/testfiles/m3draw005.ptex.tlg | 56 ++++++++++++++++++--
l3experimental/l3draw/testfiles/m3draw005.tlg | 54 +++++++++++++++++--
.../l3draw/testfiles/m3draw005.uptex.tlg | 56 ++++++++++++++++++--
.../l3draw/testfiles/m3draw005.xetex.tlg | 56 ++++++++++++++++++--
5 files changed, 231 insertions(+), 19 deletions(-)
diff --git a/l3experimental/l3draw/testfiles/m3draw005.lvt b/l3experimental/l3draw/testfiles/m3draw005.lvt
index 77bc293..44c8ad0 100644
--- a/l3experimental/l3draw/testfiles/m3draw005.lvt
+++ b/l3experimental/l3draw/testfiles/m3draw005.lvt
@@ -21,7 +21,8 @@
{
\draw_begin:
#1
- \draw_path_lineto:n { 1cm, 10cm }
+ \draw_path_moveto:n { 0cm , 0cm }
+ \draw_path_lineto:n { 1cm , 10cm }
\draw_path_lineto:n { 2cm , 20cm }
\draw_path_use_clear:n { stroke }
\draw_end:
@@ -37,11 +38,32 @@
{
\draw_scope_begin:
\draw_linewidth:n { 1pt }
- \draw_path_lineto:n { 1cm, 10cm }
- \draw_path_lineto:n { 2cm , 20cm }
+ \draw_path_moveto:n { 0cm , 0cm }
+ \draw_path_lineto:n { 1cm , 10cm }
+ \draw_path_lineto:n { 2cm , 0cm }
\draw_path_use_clear:n { stroke }
\draw_scope_end:
}
}
+\TEST { \draw_suspend_begin: }
+ {
+ \test:n
+ {
+ \hbox_set:Nn \l_tmpb_box
+ {
+ \draw_suspend_begin:
+ \draw_begin:
+ \draw_linewidth:n { 1pt }
+ \draw_path_moveto:n { 0cm , 0cm }
+ \draw_path_lineto:n { 1cm, 10cm }
+ \draw_path_lineto:n { 2cm , 0cm }
+ \draw_path_use_clear:n { stroke }
+ \draw_end:
+ \draw_scope_end:
+ }
+ \draw_box_use:N \l_tmpb_box
+ }
+ }
+
\END
diff --git a/l3experimental/l3draw/testfiles/m3draw005.ptex.tlg b/l3experimental/l3draw/testfiles/m3draw005.ptex.tlg
index f576029..fec2697 100644
--- a/l3experimental/l3draw/testfiles/m3draw005.ptex.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw005.ptex.tlg
@@ -4,19 +4,67 @@ Don't change this file in any respect.
TEST 1: \draw_scope_begin:
============================================================
> \box...=
-\hbox(285.52756+0.0)x29.45276
-.\hbox(285.52756+0.0)x29.45276
-..\glue -27.95276
-..\hbox(0.0+0.0)x0.0, shifted 284.02756
+\hbox(569.75511+0.0)x57.90552
+.\hbox(569.75511+0.0)x57.90552
+..\glue 0.5
+..\hbox(0.0+0.0)x0.0, shifted -0.5
...\special{pdf:literal q}
...\special{pdf:literal 0.3985 w}
...\special{color push gray 0}
...\special{pdf:literal q}
...\special{pdf:literal 0.99626 w}
+...\special{pdf:literal 0 0 m}
+...\special{pdf:literal 28.34647 283.46457 l}
+...\special{pdf:literal 56.69292 0 l}
+...\special{pdf:literal S}
+...\special{pdf:literal Q}
+...\special{pdf:literal 0 0 m}
...\special{pdf:literal 28.34647 283.46457 l}
...\special{pdf:literal 56.69292 566.92912 l}
...\special{pdf:literal S}
...\special{pdf:literal Q}
+...\special{color pop}
+! OK.
+<argument> \l_tmpa_box
+l. ... }
+============================================================
+============================================================
+TEST 2: \draw_suspend_begin:
+============================================================
+> \box...=
+\hbox(569.55511+0.0)x58.40552
+.\hbox(569.55511+0.0)x58.40552
+..\glue 0.5
+..\hbox(0.0+0.0)x0.0, shifted -0.5
+...\special{pdf:literal q}
+...\special{pdf:literal 0.3985 w}
+...\special{color push gray 0}
+...\hbox(0.0+0.0)x0.0
+....\kern 0.0
+....\hbox(285.52756+0.0)x0.0
+.....\special{x:gsave}
+.....\special{x:rotate 22.5}
+.....\special{x:scale 1 1}
+.....\special{x:rotate -22.5}
+.....\hbox(285.52756+0.0)x0.0, glue set - 57.90552fil
+......\hbox(285.52756+0.0)x57.90552
+.......\hbox(285.52756+0.0)x57.90552
+........\glue 0.5
+........\hbox(0.0+0.0)x0.0, shifted -0.5
+.........\special{pdf:literal q}
+.........\special{pdf:literal 0.3985 w}
+.........\special{color push gray 0}
+.........\special{pdf:literal 0.99626 w}
+.........\special{pdf:literal 0 0 m}
+.........\special{pdf:literal 28.34647 283.46457 l}
+.........\special{pdf:literal 56.69292 0 l}
+.........\special{pdf:literal S}
+.........\special{pdf:literal Q}
+.........\special{color pop}
+.......\special{pdf:literal Q}
+......\glue 0.0 plus 1.0fil minus 1.0fil
+.....\special{x:grestore}
+...\special{pdf:literal 0 0 m}
...\special{pdf:literal 28.34647 283.46457 l}
...\special{pdf:literal 56.69292 566.92912 l}
...\special{pdf:literal S}
diff --git a/l3experimental/l3draw/testfiles/m3draw005.tlg b/l3experimental/l3draw/testfiles/m3draw005.tlg
index 4ce168c..3bd9fb1 100644
--- a/l3experimental/l3draw/testfiles/m3draw005.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw005.tlg
@@ -4,19 +4,65 @@ Don't change this file in any respect.
TEST 1: \draw_scope_begin:
============================================================
> \box...=
-\hbox(285.52756+0.0)x29.45276
-.\hbox(285.52756+0.0)x29.45276
-..\glue -27.95276
-..\hbox(0.0+0.0)x0.0, shifted 284.02756
+\hbox(569.75511+0.0)x57.90552
+.\hbox(569.75511+0.0)x57.90552
+..\glue 0.5
+..\hbox(0.0+0.0)x0.0, shifted -0.5
...\pdfliteral{q}
...\pdfliteral{0.3985 w}
...\pdfcolorstack 0 push {0 g 0 G}
...\pdfliteral{q}
...\pdfliteral{0.99626 w}
+...\pdfliteral{0 0 m}
+...\pdfliteral{28.34647 283.46457 l}
+...\pdfliteral{56.69292 0 l}
+...\pdfliteral{S}
+...\pdfliteral{Q}
+...\pdfliteral{0 0 m}
...\pdfliteral{28.34647 283.46457 l}
...\pdfliteral{56.69292 566.92912 l}
...\pdfliteral{S}
...\pdfliteral{Q}
+...\pdfcolorstack 0 pop
+! OK.
+<argument> \l_tmpa_box
+l. ... }
+============================================================
+============================================================
+TEST 2: \draw_suspend_begin:
+============================================================
+> \box...=
+\hbox(569.55511+0.0)x58.40552
+.\hbox(569.55511+0.0)x58.40552
+..\glue 0.5
+..\hbox(0.0+0.0)x0.0, shifted -0.5
+...\pdfliteral{q}
+...\pdfliteral{0.3985 w}
+...\pdfcolorstack 0 push {0 g 0 G}
+...\hbox(0.0+0.0)x0.0
+....\kern 0.0
+....\hbox(285.52756+0.0)x0.0
+.....\pdfsave
+.....\pdfsetmatrix{1 0 0 1}
+.....\hbox(285.52756+0.0)x0.0, glue set - 57.90552fil
+......\hbox(285.52756+0.0)x57.90552
+.......\hbox(285.52756+0.0)x57.90552
+........\glue 0.5
+........\hbox(0.0+0.0)x0.0, shifted -0.5
+.........\pdfliteral{q}
+.........\pdfliteral{0.3985 w}
+.........\pdfcolorstack 0 push {0 g 0 G}
+.........\pdfliteral{0.99626 w}
+.........\pdfliteral{0 0 m}
+.........\pdfliteral{28.34647 283.46457 l}
+.........\pdfliteral{56.69292 0 l}
+.........\pdfliteral{S}
+.........\pdfliteral{Q}
+.........\pdfcolorstack 0 pop
+.......\pdfliteral{Q}
+......\glue 0.0 plus 1.0fil minus 1.0fil
+.....\pdfrestore
+...\pdfliteral{0 0 m}
...\pdfliteral{28.34647 283.46457 l}
...\pdfliteral{56.69292 566.92912 l}
...\pdfliteral{S}
diff --git a/l3experimental/l3draw/testfiles/m3draw005.uptex.tlg b/l3experimental/l3draw/testfiles/m3draw005.uptex.tlg
index f576029..fec2697 100644
--- a/l3experimental/l3draw/testfiles/m3draw005.uptex.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw005.uptex.tlg
@@ -4,19 +4,67 @@ Don't change this file in any respect.
TEST 1: \draw_scope_begin:
============================================================
> \box...=
-\hbox(285.52756+0.0)x29.45276
-.\hbox(285.52756+0.0)x29.45276
-..\glue -27.95276
-..\hbox(0.0+0.0)x0.0, shifted 284.02756
+\hbox(569.75511+0.0)x57.90552
+.\hbox(569.75511+0.0)x57.90552
+..\glue 0.5
+..\hbox(0.0+0.0)x0.0, shifted -0.5
...\special{pdf:literal q}
...\special{pdf:literal 0.3985 w}
...\special{color push gray 0}
...\special{pdf:literal q}
...\special{pdf:literal 0.99626 w}
+...\special{pdf:literal 0 0 m}
+...\special{pdf:literal 28.34647 283.46457 l}
+...\special{pdf:literal 56.69292 0 l}
+...\special{pdf:literal S}
+...\special{pdf:literal Q}
+...\special{pdf:literal 0 0 m}
...\special{pdf:literal 28.34647 283.46457 l}
...\special{pdf:literal 56.69292 566.92912 l}
...\special{pdf:literal S}
...\special{pdf:literal Q}
+...\special{color pop}
+! OK.
+<argument> \l_tmpa_box
+l. ... }
+============================================================
+============================================================
+TEST 2: \draw_suspend_begin:
+============================================================
+> \box...=
+\hbox(569.55511+0.0)x58.40552
+.\hbox(569.55511+0.0)x58.40552
+..\glue 0.5
+..\hbox(0.0+0.0)x0.0, shifted -0.5
+...\special{pdf:literal q}
+...\special{pdf:literal 0.3985 w}
+...\special{color push gray 0}
+...\hbox(0.0+0.0)x0.0
+....\kern 0.0
+....\hbox(285.52756+0.0)x0.0
+.....\special{x:gsave}
+.....\special{x:rotate 22.5}
+.....\special{x:scale 1 1}
+.....\special{x:rotate -22.5}
+.....\hbox(285.52756+0.0)x0.0, glue set - 57.90552fil
+......\hbox(285.52756+0.0)x57.90552
+.......\hbox(285.52756+0.0)x57.90552
+........\glue 0.5
+........\hbox(0.0+0.0)x0.0, shifted -0.5
+.........\special{pdf:literal q}
+.........\special{pdf:literal 0.3985 w}
+.........\special{color push gray 0}
+.........\special{pdf:literal 0.99626 w}
+.........\special{pdf:literal 0 0 m}
+.........\special{pdf:literal 28.34647 283.46457 l}
+.........\special{pdf:literal 56.69292 0 l}
+.........\special{pdf:literal S}
+.........\special{pdf:literal Q}
+.........\special{color pop}
+.......\special{pdf:literal Q}
+......\glue 0.0 plus 1.0fil minus 1.0fil
+.....\special{x:grestore}
+...\special{pdf:literal 0 0 m}
...\special{pdf:literal 28.34647 283.46457 l}
...\special{pdf:literal 56.69292 566.92912 l}
...\special{pdf:literal S}
diff --git a/l3experimental/l3draw/testfiles/m3draw005.xetex.tlg b/l3experimental/l3draw/testfiles/m3draw005.xetex.tlg
index f576029..fec2697 100644
--- a/l3experimental/l3draw/testfiles/m3draw005.xetex.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw005.xetex.tlg
@@ -4,19 +4,67 @@ Don't change this file in any respect.
TEST 1: \draw_scope_begin:
============================================================
> \box...=
-\hbox(285.52756+0.0)x29.45276
-.\hbox(285.52756+0.0)x29.45276
-..\glue -27.95276
-..\hbox(0.0+0.0)x0.0, shifted 284.02756
+\hbox(569.75511+0.0)x57.90552
+.\hbox(569.75511+0.0)x57.90552
+..\glue 0.5
+..\hbox(0.0+0.0)x0.0, shifted -0.5
...\special{pdf:literal q}
...\special{pdf:literal 0.3985 w}
...\special{color push gray 0}
...\special{pdf:literal q}
...\special{pdf:literal 0.99626 w}
+...\special{pdf:literal 0 0 m}
+...\special{pdf:literal 28.34647 283.46457 l}
+...\special{pdf:literal 56.69292 0 l}
+...\special{pdf:literal S}
+...\special{pdf:literal Q}
+...\special{pdf:literal 0 0 m}
...\special{pdf:literal 28.34647 283.46457 l}
...\special{pdf:literal 56.69292 566.92912 l}
...\special{pdf:literal S}
...\special{pdf:literal Q}
+...\special{color pop}
+! OK.
+<argument> \l_tmpa_box
+l. ... }
+============================================================
+============================================================
+TEST 2: \draw_suspend_begin:
+============================================================
+> \box...=
+\hbox(569.55511+0.0)x58.40552
+.\hbox(569.55511+0.0)x58.40552
+..\glue 0.5
+..\hbox(0.0+0.0)x0.0, shifted -0.5
+...\special{pdf:literal q}
+...\special{pdf:literal 0.3985 w}
+...\special{color push gray 0}
+...\hbox(0.0+0.0)x0.0
+....\kern 0.0
+....\hbox(285.52756+0.0)x0.0
+.....\special{x:gsave}
+.....\special{x:rotate 22.5}
+.....\special{x:scale 1 1}
+.....\special{x:rotate -22.5}
+.....\hbox(285.52756+0.0)x0.0, glue set - 57.90552fil
+......\hbox(285.52756+0.0)x57.90552
+.......\hbox(285.52756+0.0)x57.90552
+........\glue 0.5
+........\hbox(0.0+0.0)x0.0, shifted -0.5
+.........\special{pdf:literal q}
+.........\special{pdf:literal 0.3985 w}
+.........\special{color push gray 0}
+.........\special{pdf:literal 0.99626 w}
+.........\special{pdf:literal 0 0 m}
+.........\special{pdf:literal 28.34647 283.46457 l}
+.........\special{pdf:literal 56.69292 0 l}
+.........\special{pdf:literal S}
+.........\special{pdf:literal Q}
+.........\special{color pop}
+.......\special{pdf:literal Q}
+......\glue 0.0 plus 1.0fil minus 1.0fil
+.....\special{x:grestore}
+...\special{pdf:literal 0 0 m}
...\special{pdf:literal 28.34647 283.46457 l}
...\special{pdf:literal 56.69292 566.92912 l}
...\special{pdf:literal S}
More information about the latex3-commits
mailing list