[latex3-commits] [git/LaTeX3-latex3-latex3] master: Fillstroke support (4dd1cc7)
Joseph Wright
joseph.wright at morningstar2.co.uk
Fri Feb 23 10:59:22 CET 2018
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/4dd1cc7cf5b24a845534a207c85da4d208eb1807
>---------------------------------------------------------------
commit 4dd1cc7cf5b24a845534a207c85da4d208eb1807
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Fri Feb 23 09:59:22 2018 +0000
Fillstroke support
>---------------------------------------------------------------
4dd1cc7cf5b24a845534a207c85da4d208eb1807
l3experimental/l3draw/l3draw-paths.dtx | 7 ++++-
l3experimental/l3draw/testfiles/m3draw004.ptex.tlg | 27 +++-----------------
l3experimental/l3draw/testfiles/m3draw004.tlg | 27 +++-----------------
.../l3draw/testfiles/m3draw004.uptex.tlg | 27 +++-----------------
.../l3draw/testfiles/m3draw004.xetex.tlg | 27 +++-----------------
5 files changed, 18 insertions(+), 97 deletions(-)
diff --git a/l3experimental/l3draw/l3draw-paths.dtx b/l3experimental/l3draw/l3draw-paths.dtx
index 8457142..d361843 100644
--- a/l3experimental/l3draw/l3draw-paths.dtx
+++ b/l3experimental/l3draw/l3draw-paths.dtx
@@ -817,7 +817,7 @@
%
% \begin{macro}{\draw_path_use:n, \draw_path_use_clear:n}
% \begin{macro}{\@@_path_use:n}
-% \begin{macro}{\@@_path_use_action_draw:}
+% \begin{macro}{\@@_path_use_action_draw:, \@@_path_use_action_fillstroke:}
% \begin{macro}{\@@_path_use_stroke_bb:}
% \begin{macro}{\@@_path_use_stroke_bb_aux:NnN}
% There are a range of actions which can apply to a path: they are handled
@@ -886,6 +886,11 @@
{
\bool_set_true:N \l_@@_path_use_stroke_bool
}
+\cs_new_protected:Npn \@@_path_use_action_fillstroke:
+ {
+ \bool_set_true:N \l_@@_path_use_fill_bool
+ \bool_set_true:N \l_@@_path_use_stroke_bool
+ }
% \end{macrocode}
% Where the path is relevant to size and is stroked, we need to allow for
% the part which overlaps the edge of the bounding box.
diff --git a/l3experimental/l3draw/testfiles/m3draw004.ptex.tlg b/l3experimental/l3draw/testfiles/m3draw004.ptex.tlg
index d628e48..bf89fb2 100644
--- a/l3experimental/l3draw/testfiles/m3draw004.ptex.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw004.ptex.tlg
@@ -216,14 +216,6 @@ TEST 6: \draw_color:n
! OK.
<argument> \l_tmpa_box
l. ... }
-! Undefined control sequence.
-<argument> \ERROR
-l. ... }
-The control sequence at the end of the top line
-of your error message was never \def'ed. If you have
-misspelled it (e.g., `\hobx'), type `I' and the correct
-spelling (e.g., `I\hbox'). Otherwise just continue,
-and I'll forget about whatever was undefined.
> \box...=
\hbox(569.45511+0.0)x57.30551
.\hbox(569.45511+0.0)x57.30551
@@ -236,6 +228,7 @@ and I'll forget about whatever was undefined.
...\special{pdf:literal f}
...\special{pdf:literal 1 0 0 rg 1 0 0 RG}
...\special{pdf:literal 0 0 28.34647 28.34647 re}
+...\special{pdf:literal B}
...\special{pdf:literal 1 0 0 rg 1 0 0 RG}
...\special{pdf:literal 28.34647 283.46457 l}
...\special{pdf:literal 56.69292 566.92912 l}
@@ -248,14 +241,6 @@ l. ... }
============================================================
TEST 7: \draw_color_fill:n
============================================================
-! Undefined control sequence.
-<argument> \ERROR
-l. ... }
-The control sequence at the end of the top line
-of your error message was never \def'ed. If you have
-misspelled it (e.g., `\hobx'), type `I' and the correct
-spelling (e.g., `I\hbox'). Otherwise just continue,
-and I'll forget about whatever was undefined.
> \box...=
\hbox(569.45511+0.0)x57.30551
.\hbox(569.45511+0.0)x57.30551
@@ -268,6 +253,7 @@ and I'll forget about whatever was undefined.
...\special{pdf:literal f}
...\special{pdf:literal 1 0 0 rg}
...\special{pdf:literal 0 0 28.34647 28.34647 re}
+...\special{pdf:literal B}
...\special{pdf:literal 1 0 0 rg}
...\special{pdf:literal 28.34647 283.46457 l}
...\special{pdf:literal 56.69292 566.92912 l}
@@ -280,14 +266,6 @@ l. ... }
============================================================
TEST 8: \draw_color_stroke:n
============================================================
-! Undefined control sequence.
-<argument> \ERROR
-l. ... }
-The control sequence at the end of the top line
-of your error message was never \def'ed. If you have
-misspelled it (e.g., `\hobx'), type `I' and the correct
-spelling (e.g., `I\hbox'). Otherwise just continue,
-and I'll forget about whatever was undefined.
> \box...=
\hbox(569.45511+0.0)x57.30551
.\hbox(569.45511+0.0)x57.30551
@@ -300,6 +278,7 @@ and I'll forget about whatever was undefined.
...\special{pdf:literal f}
...\special{pdf:literal 1 0 0 RG}
...\special{pdf:literal 0 0 28.34647 28.34647 re}
+...\special{pdf:literal B}
...\special{pdf:literal 1 0 0 RG}
...\special{pdf:literal 28.34647 283.46457 l}
...\special{pdf:literal 56.69292 566.92912 l}
diff --git a/l3experimental/l3draw/testfiles/m3draw004.tlg b/l3experimental/l3draw/testfiles/m3draw004.tlg
index 5d3a583..98c4568 100644
--- a/l3experimental/l3draw/testfiles/m3draw004.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw004.tlg
@@ -216,14 +216,6 @@ TEST 6: \draw_color:n
! OK.
<argument> \l_tmpa_box
l. ... }
-! Undefined control sequence.
-<argument> \ERROR
-l. ... }
-The control sequence at the end of the top line
-of your error message was never \def'ed. If you have
-misspelled it (e.g., `\hobx'), type `I' and the correct
-spelling (e.g., `I\hbox'). Otherwise just continue,
-and I'll forget about whatever was undefined.
> \box...=
\hbox(569.45511+0.0)x57.30551
.\hbox(569.45511+0.0)x57.30551
@@ -236,6 +228,7 @@ and I'll forget about whatever was undefined.
...\pdfliteral{f}
...\pdfliteral{1 0 0 rg 1 0 0 RG}
...\pdfliteral{0 0 28.34647 28.34647 re}
+...\pdfliteral{B}
...\pdfliteral{1 0 0 rg 1 0 0 RG}
...\pdfliteral{28.34647 283.46457 l}
...\pdfliteral{56.69292 566.92912 l}
@@ -248,14 +241,6 @@ l. ... }
============================================================
TEST 7: \draw_color_fill:n
============================================================
-! Undefined control sequence.
-<argument> \ERROR
-l. ... }
-The control sequence at the end of the top line
-of your error message was never \def'ed. If you have
-misspelled it (e.g., `\hobx'), type `I' and the correct
-spelling (e.g., `I\hbox'). Otherwise just continue,
-and I'll forget about whatever was undefined.
> \box...=
\hbox(569.45511+0.0)x57.30551
.\hbox(569.45511+0.0)x57.30551
@@ -268,6 +253,7 @@ and I'll forget about whatever was undefined.
...\pdfliteral{f}
...\pdfliteral{1 0 0 rg}
...\pdfliteral{0 0 28.34647 28.34647 re}
+...\pdfliteral{B}
...\pdfliteral{1 0 0 rg}
...\pdfliteral{28.34647 283.46457 l}
...\pdfliteral{56.69292 566.92912 l}
@@ -280,14 +266,6 @@ l. ... }
============================================================
TEST 8: \draw_color_stroke:n
============================================================
-! Undefined control sequence.
-<argument> \ERROR
-l. ... }
-The control sequence at the end of the top line
-of your error message was never \def'ed. If you have
-misspelled it (e.g., `\hobx'), type `I' and the correct
-spelling (e.g., `I\hbox'). Otherwise just continue,
-and I'll forget about whatever was undefined.
> \box...=
\hbox(569.45511+0.0)x57.30551
.\hbox(569.45511+0.0)x57.30551
@@ -300,6 +278,7 @@ and I'll forget about whatever was undefined.
...\pdfliteral{f}
...\pdfliteral{1 0 0 RG}
...\pdfliteral{0 0 28.34647 28.34647 re}
+...\pdfliteral{B}
...\pdfliteral{1 0 0 RG}
...\pdfliteral{28.34647 283.46457 l}
...\pdfliteral{56.69292 566.92912 l}
diff --git a/l3experimental/l3draw/testfiles/m3draw004.uptex.tlg b/l3experimental/l3draw/testfiles/m3draw004.uptex.tlg
index d628e48..bf89fb2 100644
--- a/l3experimental/l3draw/testfiles/m3draw004.uptex.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw004.uptex.tlg
@@ -216,14 +216,6 @@ TEST 6: \draw_color:n
! OK.
<argument> \l_tmpa_box
l. ... }
-! Undefined control sequence.
-<argument> \ERROR
-l. ... }
-The control sequence at the end of the top line
-of your error message was never \def'ed. If you have
-misspelled it (e.g., `\hobx'), type `I' and the correct
-spelling (e.g., `I\hbox'). Otherwise just continue,
-and I'll forget about whatever was undefined.
> \box...=
\hbox(569.45511+0.0)x57.30551
.\hbox(569.45511+0.0)x57.30551
@@ -236,6 +228,7 @@ and I'll forget about whatever was undefined.
...\special{pdf:literal f}
...\special{pdf:literal 1 0 0 rg 1 0 0 RG}
...\special{pdf:literal 0 0 28.34647 28.34647 re}
+...\special{pdf:literal B}
...\special{pdf:literal 1 0 0 rg 1 0 0 RG}
...\special{pdf:literal 28.34647 283.46457 l}
...\special{pdf:literal 56.69292 566.92912 l}
@@ -248,14 +241,6 @@ l. ... }
============================================================
TEST 7: \draw_color_fill:n
============================================================
-! Undefined control sequence.
-<argument> \ERROR
-l. ... }
-The control sequence at the end of the top line
-of your error message was never \def'ed. If you have
-misspelled it (e.g., `\hobx'), type `I' and the correct
-spelling (e.g., `I\hbox'). Otherwise just continue,
-and I'll forget about whatever was undefined.
> \box...=
\hbox(569.45511+0.0)x57.30551
.\hbox(569.45511+0.0)x57.30551
@@ -268,6 +253,7 @@ and I'll forget about whatever was undefined.
...\special{pdf:literal f}
...\special{pdf:literal 1 0 0 rg}
...\special{pdf:literal 0 0 28.34647 28.34647 re}
+...\special{pdf:literal B}
...\special{pdf:literal 1 0 0 rg}
...\special{pdf:literal 28.34647 283.46457 l}
...\special{pdf:literal 56.69292 566.92912 l}
@@ -280,14 +266,6 @@ l. ... }
============================================================
TEST 8: \draw_color_stroke:n
============================================================
-! Undefined control sequence.
-<argument> \ERROR
-l. ... }
-The control sequence at the end of the top line
-of your error message was never \def'ed. If you have
-misspelled it (e.g., `\hobx'), type `I' and the correct
-spelling (e.g., `I\hbox'). Otherwise just continue,
-and I'll forget about whatever was undefined.
> \box...=
\hbox(569.45511+0.0)x57.30551
.\hbox(569.45511+0.0)x57.30551
@@ -300,6 +278,7 @@ and I'll forget about whatever was undefined.
...\special{pdf:literal f}
...\special{pdf:literal 1 0 0 RG}
...\special{pdf:literal 0 0 28.34647 28.34647 re}
+...\special{pdf:literal B}
...\special{pdf:literal 1 0 0 RG}
...\special{pdf:literal 28.34647 283.46457 l}
...\special{pdf:literal 56.69292 566.92912 l}
diff --git a/l3experimental/l3draw/testfiles/m3draw004.xetex.tlg b/l3experimental/l3draw/testfiles/m3draw004.xetex.tlg
index d628e48..bf89fb2 100644
--- a/l3experimental/l3draw/testfiles/m3draw004.xetex.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw004.xetex.tlg
@@ -216,14 +216,6 @@ TEST 6: \draw_color:n
! OK.
<argument> \l_tmpa_box
l. ... }
-! Undefined control sequence.
-<argument> \ERROR
-l. ... }
-The control sequence at the end of the top line
-of your error message was never \def'ed. If you have
-misspelled it (e.g., `\hobx'), type `I' and the correct
-spelling (e.g., `I\hbox'). Otherwise just continue,
-and I'll forget about whatever was undefined.
> \box...=
\hbox(569.45511+0.0)x57.30551
.\hbox(569.45511+0.0)x57.30551
@@ -236,6 +228,7 @@ and I'll forget about whatever was undefined.
...\special{pdf:literal f}
...\special{pdf:literal 1 0 0 rg 1 0 0 RG}
...\special{pdf:literal 0 0 28.34647 28.34647 re}
+...\special{pdf:literal B}
...\special{pdf:literal 1 0 0 rg 1 0 0 RG}
...\special{pdf:literal 28.34647 283.46457 l}
...\special{pdf:literal 56.69292 566.92912 l}
@@ -248,14 +241,6 @@ l. ... }
============================================================
TEST 7: \draw_color_fill:n
============================================================
-! Undefined control sequence.
-<argument> \ERROR
-l. ... }
-The control sequence at the end of the top line
-of your error message was never \def'ed. If you have
-misspelled it (e.g., `\hobx'), type `I' and the correct
-spelling (e.g., `I\hbox'). Otherwise just continue,
-and I'll forget about whatever was undefined.
> \box...=
\hbox(569.45511+0.0)x57.30551
.\hbox(569.45511+0.0)x57.30551
@@ -268,6 +253,7 @@ and I'll forget about whatever was undefined.
...\special{pdf:literal f}
...\special{pdf:literal 1 0 0 rg}
...\special{pdf:literal 0 0 28.34647 28.34647 re}
+...\special{pdf:literal B}
...\special{pdf:literal 1 0 0 rg}
...\special{pdf:literal 28.34647 283.46457 l}
...\special{pdf:literal 56.69292 566.92912 l}
@@ -280,14 +266,6 @@ l. ... }
============================================================
TEST 8: \draw_color_stroke:n
============================================================
-! Undefined control sequence.
-<argument> \ERROR
-l. ... }
-The control sequence at the end of the top line
-of your error message was never \def'ed. If you have
-misspelled it (e.g., `\hobx'), type `I' and the correct
-spelling (e.g., `I\hbox'). Otherwise just continue,
-and I'll forget about whatever was undefined.
> \box...=
\hbox(569.45511+0.0)x57.30551
.\hbox(569.45511+0.0)x57.30551
@@ -300,6 +278,7 @@ and I'll forget about whatever was undefined.
...\special{pdf:literal f}
...\special{pdf:literal 1 0 0 RG}
...\special{pdf:literal 0 0 28.34647 28.34647 re}
+...\special{pdf:literal B}
...\special{pdf:literal 1 0 0 RG}
...\special{pdf:literal 28.34647 283.46457 l}
...\special{pdf:literal 56.69292 566.92912 l}
More information about the latex3-commits
mailing list