[latex3-commits] [l3svn] 01/05: Revert "Drop "rectangle" construct"
noreply at latex-project.org
noreply at latex-project.org
Wed May 18 22:55:44 CEST 2016
This is an automated email from the git hooks/post-receive script.
joseph pushed a commit to branch master
in repository l3svn.
commit 908805be6a43a3a0dac25e1af19a8c109924f0e7
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Wed May 18 20:34:50 2016 +0100
Revert "Drop "rectangle" construct"
This reverts commit 86dc1a177c3797b6fd29e9f090ac5ab7feec4506.
---
l3kernel/l3drivers.dtx | 23 +++++++++++++++++++++++
l3kernel/testfiles/m3expl001.luatex.tlg | 1 +
l3kernel/testfiles/m3expl001.ptex.tlg | 1 +
l3kernel/testfiles/m3expl001.tlg | 1 +
l3kernel/testfiles/m3expl001.uptex.tlg | 1 +
l3kernel/testfiles/m3expl001.xetex.tlg | 1 +
l3kernel/testfiles/m3expl003.luatex.tlg | 1 +
l3kernel/testfiles/m3expl003.ptex.tlg | 1 +
l3kernel/testfiles/m3expl003.tlg | 1 +
l3kernel/testfiles/m3expl003.uptex.tlg | 1 +
l3kernel/testfiles/m3expl003.xetex.tlg | 1 +
11 files changed, 33 insertions(+)
diff --git a/l3kernel/l3drivers.dtx b/l3kernel/l3drivers.dtx
index 3e318a4..593cab7 100755
--- a/l3kernel/l3drivers.dtx
+++ b/l3kernel/l3drivers.dtx
@@ -231,6 +231,18 @@
% without appearing itself.
% \end{function}
%
+% \begin{function}{\__driver_draw_rectangle:nnnn}
+% \begin{syntax}
+% \cs{__driver_draw_rectangle:nnnn} \Arg{x_1} \Arg{y_1} \Arg{x_2} \Arg{y_2}
+% \end{syntax}
+% Adds rectangular path from (\meta{x_1}, \meta{y_1}) to
+% (\meta{x_2}, \meta{y_2}); any active transformation
+% matrix will apply. Note that nothing is drawn until a fill or stroke
+% operation is applied, and that the path may be discarded or used as a clip
+% without appearing itself. The drawing cursor will be at
+% (\meta{x_2}, \meta{y_2}) once the rectangle is constructed.
+% \end{function}
+%
% \begin{function}{\__driver_draw_closepath:}
% \begin{syntax}
% \cs{__driver_draw_closepath:}
@@ -773,6 +785,7 @@
%
% \begin{macro}[int]{\@@_draw_moveto:nn, \@@_draw_lineto:nn}
% \begin{macro}[int]{\@@_draw_curveto:nnnnnn}
+% \begin{macro}[int]{\@@_draw_rectangle:nnnn}
% Path creation operations all resolve directly to PDF primitive steps, with
% only the need to convert to \texttt{bp}. Notice that \texttt{x}-type
% expansion is included here to ensure that any variable values are
@@ -798,9 +811,19 @@
c
}
}
+\cs_new_protected:Npn \@@_draw_rectangle:nnnn #1#2#3#4
+ {
+ \@@_draw_literal:x
+ {
+ \dim_to_decimal_in_bp:n {#1} ~ \dim_to_decimal_in_bp:n {#2} ~
+ \dim_to_decimal_in_bp:n {#3} ~ \dim_to_decimal_in_bp:n {#4} ~
+ re
+ }
+ }
% \end{macrocode}
% \end{macro}
% \end{macro}
+% \end{macro}
%
% \begin{variable}[int]{\@@_draw_eor_bool}
% The even-odd rule here can be implemented as a simply switch.
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 144c1ad..f4ba080 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -4799,6 +4799,7 @@ Defining \__driver_draw_scope_end: on line ...
Defining \__driver_draw_moveto:nn on line ...
Defining \__driver_draw_lineto:nn on line ...
Defining \__driver_draw_curveto:nnnnnn on line ...
+Defining \__driver_draw_rectangle:nnnn on line ...
Defining \__driver_draw_eor_bool on line ...
Defining \__driver_draw_closepath: on line ...
Defining \__driver_draw_stroke: on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 495d0be..8d520fd 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -4788,6 +4788,7 @@ Defining \__driver_draw_scope_end: on line ...
Defining \__driver_draw_moveto:nn on line ...
Defining \__driver_draw_lineto:nn on line ...
Defining \__driver_draw_curveto:nnnnnn on line ...
+Defining \__driver_draw_rectangle:nnnn on line ...
Defining \__driver_draw_eor_bool on line ...
Defining \__driver_draw_closepath: on line ...
Defining \__driver_draw_stroke: on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index aeaa83f..17af81d 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -4991,6 +4991,7 @@ Defining \__driver_draw_scope_end: on line ...
Defining \__driver_draw_moveto:nn on line ...
Defining \__driver_draw_lineto:nn on line ...
Defining \__driver_draw_curveto:nnnnnn on line ...
+Defining \__driver_draw_rectangle:nnnn on line ...
Defining \__driver_draw_eor_bool on line ...
Defining \__driver_draw_closepath: on line ...
Defining \__driver_draw_stroke: on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 2254331..05c4e1b 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -4989,6 +4989,7 @@ Defining \__driver_draw_scope_end: on line ...
Defining \__driver_draw_moveto:nn on line ...
Defining \__driver_draw_lineto:nn on line ...
Defining \__driver_draw_curveto:nnnnnn on line ...
+Defining \__driver_draw_rectangle:nnnn on line ...
Defining \__driver_draw_eor_bool on line ...
Defining \__driver_draw_closepath: on line ...
Defining \__driver_draw_stroke: on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 2d89a52..4c70e8e 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -4795,6 +4795,7 @@ Defining \__driver_draw_scope_end: on line ...
Defining \__driver_draw_moveto:nn on line ...
Defining \__driver_draw_lineto:nn on line ...
Defining \__driver_draw_curveto:nnnnnn on line ...
+Defining \__driver_draw_rectangle:nnnn on line ...
Defining \__driver_draw_eor_bool on line ...
Defining \__driver_draw_closepath: on line ...
Defining \__driver_draw_stroke: on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 275b149..dd38b63 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -4800,6 +4800,7 @@ Defining \__driver_draw_scope_end: on line ...
Defining \__driver_draw_moveto:nn on line ...
Defining \__driver_draw_lineto:nn on line ...
Defining \__driver_draw_curveto:nnnnnn on line ...
+Defining \__driver_draw_rectangle:nnnn on line ...
Defining \__driver_draw_eor_bool on line ...
Defining \__driver_draw_closepath: on line ...
Defining \__driver_draw_stroke: on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 5f0064b..2a624bb 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -4789,6 +4789,7 @@ Defining \__driver_draw_scope_end: on line ...
Defining \__driver_draw_moveto:nn on line ...
Defining \__driver_draw_lineto:nn on line ...
Defining \__driver_draw_curveto:nnnnnn on line ...
+Defining \__driver_draw_rectangle:nnnn on line ...
Defining \__driver_draw_eor_bool on line ...
Defining \__driver_draw_closepath: on line ...
Defining \__driver_draw_stroke: on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 1c0abdf..c493c1b 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -4992,6 +4992,7 @@ Defining \__driver_draw_scope_end: on line ...
Defining \__driver_draw_moveto:nn on line ...
Defining \__driver_draw_lineto:nn on line ...
Defining \__driver_draw_curveto:nnnnnn on line ...
+Defining \__driver_draw_rectangle:nnnn on line ...
Defining \__driver_draw_eor_bool on line ...
Defining \__driver_draw_closepath: on line ...
Defining \__driver_draw_stroke: on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index dd4cc80..7bdfb27 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -4990,6 +4990,7 @@ Defining \__driver_draw_scope_end: on line ...
Defining \__driver_draw_moveto:nn on line ...
Defining \__driver_draw_lineto:nn on line ...
Defining \__driver_draw_curveto:nnnnnn on line ...
+Defining \__driver_draw_rectangle:nnnn on line ...
Defining \__driver_draw_eor_bool on line ...
Defining \__driver_draw_closepath: on line ...
Defining \__driver_draw_stroke: on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 524c94c..f3aa3ca 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -4796,6 +4796,7 @@ Defining \__driver_draw_scope_end: on line ...
Defining \__driver_draw_moveto:nn on line ...
Defining \__driver_draw_lineto:nn on line ...
Defining \__driver_draw_curveto:nnnnnn on line ...
+Defining \__driver_draw_rectangle:nnnn on line ...
Defining \__driver_draw_eor_bool on line ...
Defining \__driver_draw_closepath: on line ...
Defining \__driver_draw_stroke: on line ...
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the latex3-commits
mailing list