[latex3-commits] [git/LaTeX3-latex3-latex3] backend: Missed drawing functions (9353a8b)
Joseph Wright
joseph.wright at morningstar2.co.uk
Sun Jun 2 08:27:57 CEST 2019
Repository : https://github.com/latex3/latex3
On branch : backend
Link : https://github.com/latex3/latex3/commit/9353a8b9500fa68aecd217299695e77e903ddccc
>---------------------------------------------------------------
commit 9353a8b9500fa68aecd217299695e77e903ddccc
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Sun Jun 2 07:27:57 2019 +0100
Missed drawing functions
>---------------------------------------------------------------
9353a8b9500fa68aecd217299695e77e903ddccc
l3experimental/l3draw/l3draw-boxes.dtx | 2 +-
l3experimental/l3draw/l3draw-layers.dtx | 4 ++--
l3experimental/l3draw/l3draw-paths.dtx | 6 +++---
l3experimental/l3draw/l3draw-scopes.dtx | 8 ++++----
l3experimental/l3draw/l3draw-softpath.dtx | 10 +++++-----
l3experimental/l3draw/l3draw-state.dtx | 30 ++++++++++++++---------------
6 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/l3experimental/l3draw/l3draw-boxes.dtx b/l3experimental/l3draw/l3draw-boxes.dtx
index e3994c4..efc9d10 100644
--- a/l3experimental/l3draw/l3draw-boxes.dtx
+++ b/l3experimental/l3draw/l3draw-boxes.dtx
@@ -104,7 +104,7 @@
{
\use:x
{
- \driver_draw_box_use:Nnnnn #1
+ \@@_backend_box_use:Nnnnn #1
{ \fp_use:N \l_@@_matrix_a_fp }
{ \fp_use:N \l_@@_matrix_b_fp }
{ \fp_use:N \l_@@_matrix_c_fp }
diff --git a/l3experimental/l3draw/l3draw-layers.dtx b/l3experimental/l3draw/l3draw-layers.dtx
index a24b87b..9222e75 100644
--- a/l3experimental/l3draw/l3draw-layers.dtx
+++ b/l3experimental/l3draw/l3draw-layers.dtx
@@ -158,10 +158,10 @@
\box_use_drop:N \l_@@_layer_main_box
}
{
- \driver_draw_scope_begin:
+ \@@_backend_scope_begin:
\box_gset_wd:cn { g_@@_layer_ ##1 _box } { 0pt }
\box_use_drop:c { g_@@_layer_ ##1 _box }
- \driver_draw_scope_end:
+ \@@_backend_scope_end:
}
}
}
diff --git a/l3experimental/l3draw/l3draw-paths.dtx b/l3experimental/l3draw/l3draw-paths.dtx
index f3c76c0..2a4753f 100644
--- a/l3experimental/l3draw/l3draw-paths.dtx
+++ b/l3experimental/l3draw/l3draw-paths.dtx
@@ -891,11 +891,11 @@
\@@_softpath_use:
\bool_if:NT \l_@@_path_use_clip_bool
{
- \driver_draw_clip:
+ \@@_backend_clip:
\bool_lazy_or:nnF
{ \l_@@_path_use_fill_bool }
{ \l_@@_path_use_stroke_bool }
- { \driver_draw_discardpath: }
+ { \@@_backend_discardpath: }
}
\bool_lazy_or:nnT
{ \l_@@_path_use_fill_bool }
@@ -903,7 +903,7 @@
{
\use:c
{
- driver_draw_
+ @@_backend_
\bool_if:NT \l_@@_path_use_fill_bool { fill }
\bool_if:NT \l_@@_path_use_stroke_bool { stroke }
:
diff --git a/l3experimental/l3draw/l3draw-scopes.dtx b/l3experimental/l3draw/l3draw-scopes.dtx
index 3797642..6346373 100644
--- a/l3experimental/l3draw/l3draw-scopes.dtx
+++ b/l3experimental/l3draw/l3draw-scopes.dtx
@@ -124,7 +124,7 @@
\group_begin:
\int_gincr:N \g_@@_id_int
\hbox_set:Nw \l_@@_main_box
- \driver_draw_begin:
+ \@@_backend_begin:
\@@_reset_bb:
\@@_path_reset_limits:
\bool_set_true:N \l_draw_bb_update_bool
@@ -145,7 +145,7 @@
\exp_args:NNNV \hbox_set_end:
\clist_set:Nn \l_draw_layers_clist \l_draw_layers_clist
\@@_layers_insert:
- \driver_draw_end:
+ \@@_backend_end:
\hbox_set_end:
\dim_compare:nNnT \g_@@_xmin_dim = \c_max_dim
{
@@ -191,7 +191,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \draw_scope_begin:
{
- \driver_draw_scope_begin:
+ \@@_backend_scope_begin:
\group_begin:
\dim_set_eq:NN \l_@@_linewidth_dim \g_@@_linewidth_dim
\draw_path_scope_begin:
@@ -201,7 +201,7 @@
\draw_path_scope_end:
\dim_gset_eq:NN \g_@@_linewidth_dim \l_@@_linewidth_dim
\group_end:
- \driver_draw_scope_end:
+ \@@_backend_scope_end:
}
% \end{macrocode}
% \end{macro}
diff --git a/l3experimental/l3draw/l3draw-softpath.dtx b/l3experimental/l3draw/l3draw-softpath.dtx
index b1cbf83..2c94d33 100644
--- a/l3experimental/l3draw/l3draw-softpath.dtx
+++ b/l3experimental/l3draw/l3draw-softpath.dtx
@@ -221,24 +221,24 @@
% round point, hence being quark-like.
% \begin{macrocode}
\cs_new_protected:Npn \@@_softpath_close_op:nn #1#2
- { \driver_draw_closepath: }
+ { \@@_backend_closepath: }
\cs_new_protected:Npn \@@_softpath_curveto_opi:nn #1#2
{ \@@_softpath_curveto_opi:nnNnnNnn {#1} {#2} }
\cs_new_protected:Npn \@@_softpath_curveto_opi:nnNnnNnn #1#2#3#4#5#6#7#8
- { \driver_draw_curveto:nnnnnn {#1} {#2} {#4} {#5} {#7} {#8} }
+ { \@@_backend_curveto:nnnnnn {#1} {#2} {#4} {#5} {#7} {#8} }
\cs_new_protected:Npn \@@_softpath_curveto_opii:nn #1#2
{ \@@_softpath_curveto_opii:nn }
\cs_new_protected:Npn \@@_softpath_curveto_opiii:nn #1#2
{ \@@_softpath_curveto_opiii:nn }
\cs_new_protected:Npn \@@_softpath_lineto_op:nn #1#2
- { \driver_draw_lineto:nn {#1} {#2} }
+ { \@@_backend_lineto:nn {#1} {#2} }
\cs_new_protected:Npn \@@_softpath_moveto_op:nn #1#2
- { \driver_draw_moveto:nn {#1} {#2} }
+ { \@@_backend_moveto:nn {#1} {#2} }
\cs_new_protected:Npn \@@_softpath_roundpoint_op:nn #1#2 { }
\cs_new_protected:Npn \@@_softpath_rectangle_opi:nn #1#2
{ \@@_softpath_rectangle_opi:nnNnn {#1} {#2} }
\cs_new_protected:Npn \@@_softpath_rectangle_opi:nnNnn #1#2#3#4#5
- { \driver_draw_rectangle:nnnn {#1} {#2} {#4} {#5} }
+ { \@@_backend_rectangle:nnnn {#1} {#2} {#4} {#5} }
\cs_new_protected:Npn \@@_softpath_rectangle_opii:nn #1#2 { }
% \end{macrocode}
% \end{macro}
diff --git a/l3experimental/l3draw/l3draw-state.dtx b/l3experimental/l3draw/l3draw-state.dtx
index cbf1eca..a0857d2 100644
--- a/l3experimental/l3draw/l3draw-state.dtx
+++ b/l3experimental/l3draw/l3draw-state.dtx
@@ -92,7 +92,7 @@
\cs_new_protected:Npn \draw_linewidth:n #1
{
\dim_gset:Nn \g_@@_linewidth_dim { \fp_to_dim:n {#1} }
- \driver_draw_linewidth:n \g_@@_linewidth_dim
+ \@@_backend_linewidth:n \g_@@_linewidth_dim
}
% \end{macrocode}
% \end{macro}
@@ -109,7 +109,7 @@
{ \fp_to_dim:n {##1} }
\use:x
{
- \driver_draw_dash_pattern:nn
+ \@@_backend_dash_pattern:nn
{ \seq_use:Nn \l_@@_tmp_seq { , } }
{ \fp_to_dim:n {#2} }
}
@@ -124,7 +124,7 @@
% Pass through to the driver layer.
% \begin{macrocode}
\cs_new_protected:Npn \draw_miterlimit:n #1
- { \driver_draw_miterlimit:n { \fp_eval:n {#1} } }
+ { \@@_backend_miterlimit:n { \fp_eval:n {#1} } }
% \end{macrocode}
% \end{macro}
%
@@ -136,14 +136,14 @@
% }
% All straight wrappers.
% \begin{macrocode}
-\cs_new_protected:Npn \draw_cap_butt: { \driver_draw_cap_butt: }
-\cs_new_protected:Npn \draw_cap_rectangle: { \driver_draw_cap_rectangle: }
-\cs_new_protected:Npn \draw_cap_round: { \driver_draw_cap_round: }
-\cs_new_protected:Npn \draw_evenodd_rule: { \driver_draw_evenodd_rule: }
-\cs_new_protected:Npn \draw_nonzero_rule: { \driver_draw_nonzero_rule: }
-\cs_new_protected:Npn \draw_join_bevel: { \driver_draw_join_bevel: }
-\cs_new_protected:Npn \draw_join_miter: { \driver_draw_join_miter: }
-\cs_new_protected:Npn \draw_join_round: { \driver_draw_join_round: }
+\cs_new_protected:Npn \draw_cap_butt: { \@@_backend_cap_butt: }
+\cs_new_protected:Npn \draw_cap_rectangle: { \@@_backend_cap_rectangle: }
+\cs_new_protected:Npn \draw_cap_round: { \@@_backend_cap_round: }
+\cs_new_protected:Npn \draw_evenodd_rule: { \@@_backend_evenodd_rule: }
+\cs_new_protected:Npn \draw_nonzero_rule: { \@@_backend_nonzero_rule: }
+\cs_new_protected:Npn \draw_join_bevel: { \@@_backend_join_bevel: }
+\cs_new_protected:Npn \draw_join_miter: { \@@_backend_join_miter: }
+\cs_new_protected:Npn \draw_join_round: { \@@_backend_join_round: }
% \end{macrocode}
% \end{macro}
%
@@ -182,13 +182,13 @@
\cs_new_protected:Npn \@@_color:nw #1#2 ~ #3 \q_stop
{ \use:c { @@_color_ #2 :nw } {#1} #3 \q_stop }
\cs_new_protected:Npn \@@_color_cmyk:nw #1#2 ~ #3 ~ #4 ~ #5 \q_stop
- { \use:c { driver_draw_color_ #1 _cmyk:nnnn } {#2} {#3} {#4} {#5} }
+ { \use:c { @@_backend_color_ #1 _cmyk:nnnn } {#2} {#3} {#4} {#5} }
\cs_new_protected:Npn \@@_color_gray:nw #1#2 \q_stop
- { \use:c { driver_draw_color_ #1 _gray:n } {#2} }
+ { \use:c { @@_backend_color_ #1 _gray:n } {#2} }
\cs_new_protected:Npn \@@_color_rgb:nw #1#2 ~ #3 ~ #4 \q_stop
- { \use:c { driver_draw_color_ #1 _rgb:nnn } {#2} {#3} {#4} }
+ { \use:c { @@_backend_color_ #1 _rgb:nnn } {#2} {#3} {#4} }
\cs_new_protected:Npn \@@_color_spot:nw #1#2 ~ #3 \q_stop
- { \use:c { driver_draw_color_ #1 _spot:nn } {#2} {#3} }
+ { \use:c { @@_backend_color_ #1 _spot:nn } {#2} {#3} }
% \end{macrocode}
% \end{macro}
% \end{macro}
More information about the latex3-commits
mailing list