[latex3-commits] [l3svn] 02/02: Reorder some functions

noreply at latex-project.org noreply at latex-project.org
Wed May 18 08:00:30 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 3f81ffc21ab9e11063bcc91f3f68d32ecae99ed5
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Tue May 17 21:17:10 2016 +0100

    Reorder some functions
---
 l3kernel/l3drivers.dtx                  |   42 +++++++++++++++----------------
 l3kernel/testfiles/m3expl001.luatex.tlg |    4 +--
 l3kernel/testfiles/m3expl001.ptex.tlg   |    4 +--
 l3kernel/testfiles/m3expl001.tlg        |    4 +--
 l3kernel/testfiles/m3expl001.uptex.tlg  |    4 +--
 l3kernel/testfiles/m3expl001.xetex.tlg  |    4 +--
 l3kernel/testfiles/m3expl003.luatex.tlg |    4 +--
 l3kernel/testfiles/m3expl003.ptex.tlg   |    4 +--
 l3kernel/testfiles/m3expl003.tlg        |    4 +--
 l3kernel/testfiles/m3expl003.uptex.tlg  |    4 +--
 l3kernel/testfiles/m3expl003.xetex.tlg  |    4 +--
 11 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/l3kernel/l3drivers.dtx b/l3kernel/l3drivers.dtx
index ac6b5eb..fe2d848 100755
--- a/l3kernel/l3drivers.dtx
+++ b/l3kernel/l3drivers.dtx
@@ -848,32 +848,14 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}[int]{\@@_draw_transformcm:nnnnnn}
-%   The first four arguments here are floats (the affine matrix), the last
-%   two are a displacement vector. Once again, force evaluation to allow for
-%   caching.
-%     \begin{macrocode}
-\cs_new_protected:Npn \@@_draw_transformcm:nnnnnn #1#2#3#4#5#6
-  {
-    \@@_draw_literal:x
-      {
-        \fp_eval:n {#1} ~ \fp_eval:n {#2} ~
-        \fp_eval:n {#3} ~ \fp_eval:n {#4} ~
-        \dim_to_decimal_in_bp:n {#5} ~ \dim_to_decimal_in_bp:n {#6} ~
-        cm
-      }
-  }
-%    \end{macrocode}
-% \end{macro}
-%
 % \begin{macro}[int]{\@@_draw_dash:nn}
 % \begin{macro}[aux]{\@@_draw_dash:n}
 % \begin{macro}[int]{\@@_draw_linewidth:n}
 % \begin{macro}[int]{\@@_draw_miterlimit:n}
 % \begin{macro}[int]^^A
 %   {
-%     \@@_draw_cap_butt:,  \@@_draw_cap_round:,  \@@_draw_cap_rectangle:,
-%     \@@_draw_join_butt:, \@@_draw_join_round:, \@@_draw_join_bevel:
+%     \@@_draw_cap_butt:, \@@_draw_cap_round:, \@@_draw_cap_rectangle:,
+%     \@@_draw_join_miter:, \@@_draw_join_round:, \@@_draw_join_bevel:
 %   }
 %   Converting paths to output is again a case of mapping directly to
 %   PDF operations.
@@ -903,7 +885,7 @@
   { \@@_draw_literal:n { 1 ~ J } }
 \cs_new_protected_nopar:Npn \@@_draw_cap_rectangle:
   { \@@_draw_literal:n { 2 ~ J } }
-\cs_new_protected_nopar:Npn \@@_draw_join_mitre:
+\cs_new_protected_nopar:Npn \@@_draw_join_miter:
   { \@@_draw_literal:n { 0 ~ j } }
 \cs_new_protected_nopar:Npn \@@_draw_join_round:
   { \@@_draw_literal:n { 1 ~ j } }
@@ -962,6 +944,24 @@
 % \end{macro}
 % \end{macro}
 %
+% \begin{macro}[int]{\@@_draw_transformcm:nnnnnn}
+%   The first four arguments here are floats (the affine matrix), the last
+%   two are a displacement vector. Once again, force evaluation to allow for
+%   caching.
+%     \begin{macrocode}
+\cs_new_protected:Npn \@@_draw_transformcm:nnnnnn #1#2#3#4#5#6
+  {
+    \@@_draw_literal:x
+      {
+        \fp_eval:n {#1} ~ \fp_eval:n {#2} ~
+        \fp_eval:n {#3} ~ \fp_eval:n {#4} ~
+        \dim_to_decimal_in_bp:n {#5} ~ \dim_to_decimal_in_bp:n {#6} ~
+        cm
+      }
+  }
+%    \end{macrocode}
+% \end{macro}
+%
 % \begin{macro}[int]{\@@_draw_hbox:Nnnnnnn}
 % \begin{variable}[aux]{\l_@@_tmp_box}
 %   Inserting a \TeX{} box transformed to the requested position and using
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 52e8fae..aa20860 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -4807,7 +4807,6 @@ Defining \__driver_draw_fill: on line ...
 Defining \__driver_draw_fillstroke: on line ...
 Defining \__driver_draw_clip: on line ...
 Defining \__driver_draw_discardpath: on line ...
-Defining \__driver_draw_transformcm:nnnnnn on line ...
 Defining \__driver_draw_dash:nn on line ...
 Defining \__driver_draw_dash:n on line ...
 Defining \__driver_draw_linewidth:n on line ...
@@ -4815,7 +4814,7 @@ Defining \__driver_draw_miterlimit:n on line ...
 Defining \__driver_draw_cap_butt: on line ...
 Defining \__driver_draw_cap_round: on line ...
 Defining \__driver_draw_cap_rectangle: on line ...
-Defining \__driver_draw_join_mitre: on line ...
+Defining \__driver_draw_join_miter: on line ...
 Defining \__driver_draw_join_round: on line ...
 Defining \__driver_draw_join_bevel: on line ...
 Defining \__driver_draw_color_cmyk_fill:nnnn on line ...
@@ -4824,6 +4823,7 @@ Defining \__driver_draw_color_gray_fill:n on line ...
 Defining \__driver_draw_color_gray_stroke:n on line ...
 Defining \__driver_draw_color_rgb_fill:nnn on line ...
 Defining \__driver_draw_color_rgb_stroke:nnn on line ...
+Defining \__driver_draw_transformcm:nnnnnn on line ...
 Defining \__driver_draw_hbox:Nnnnnnn on line ...
 Defining \l__driver_tmp_box on line ...
 \l__driver_tmp_box=\box71
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index cb98423..889940c 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -4796,7 +4796,6 @@ Defining \__driver_draw_fill: on line ...
 Defining \__driver_draw_fillstroke: on line ...
 Defining \__driver_draw_clip: on line ...
 Defining \__driver_draw_discardpath: on line ...
-Defining \__driver_draw_transformcm:nnnnnn on line ...
 Defining \__driver_draw_dash:nn on line ...
 Defining \__driver_draw_dash:n on line ...
 Defining \__driver_draw_linewidth:n on line ...
@@ -4804,7 +4803,7 @@ Defining \__driver_draw_miterlimit:n on line ...
 Defining \__driver_draw_cap_butt: on line ...
 Defining \__driver_draw_cap_round: on line ...
 Defining \__driver_draw_cap_rectangle: on line ...
-Defining \__driver_draw_join_mitre: on line ...
+Defining \__driver_draw_join_miter: on line ...
 Defining \__driver_draw_join_round: on line ...
 Defining \__driver_draw_join_bevel: on line ...
 Defining \__driver_draw_color_cmyk_fill:nnnn on line ...
@@ -4813,6 +4812,7 @@ Defining \__driver_draw_color_gray_fill:n on line ...
 Defining \__driver_draw_color_gray_stroke:n on line ...
 Defining \__driver_draw_color_rgb_fill:nnn on line ...
 Defining \__driver_draw_color_rgb_stroke:nnn on line ...
+Defining \__driver_draw_transformcm:nnnnnn on line ...
 Defining \__driver_draw_hbox:Nnnnnnn on line ...
 Defining \l__driver_tmp_box on line ...
 \l__driver_tmp_box=\box71
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 9d15def..1185e5e 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -4999,7 +4999,6 @@ Defining \__driver_draw_fill: on line ...
 Defining \__driver_draw_fillstroke: on line ...
 Defining \__driver_draw_clip: on line ...
 Defining \__driver_draw_discardpath: on line ...
-Defining \__driver_draw_transformcm:nnnnnn on line ...
 Defining \__driver_draw_dash:nn on line ...
 Defining \__driver_draw_dash:n on line ...
 Defining \__driver_draw_linewidth:n on line ...
@@ -5007,7 +5006,7 @@ Defining \__driver_draw_miterlimit:n on line ...
 Defining \__driver_draw_cap_butt: on line ...
 Defining \__driver_draw_cap_round: on line ...
 Defining \__driver_draw_cap_rectangle: on line ...
-Defining \__driver_draw_join_mitre: on line ...
+Defining \__driver_draw_join_miter: on line ...
 Defining \__driver_draw_join_round: on line ...
 Defining \__driver_draw_join_bevel: on line ...
 Defining \__driver_draw_color_cmyk_fill:nnnn on line ...
@@ -5016,6 +5015,7 @@ Defining \__driver_draw_color_gray_fill:n on line ...
 Defining \__driver_draw_color_gray_stroke:n on line ...
 Defining \__driver_draw_color_rgb_fill:nnn on line ...
 Defining \__driver_draw_color_rgb_stroke:nnn on line ...
+Defining \__driver_draw_transformcm:nnnnnn on line ...
 Defining \__driver_draw_hbox:Nnnnnnn on line ...
 Defining \l__driver_tmp_box on line ...
 \l__driver_tmp_box=\box71
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 0c6bb99..193b30e 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -4997,7 +4997,6 @@ Defining \__driver_draw_fill: on line ...
 Defining \__driver_draw_fillstroke: on line ...
 Defining \__driver_draw_clip: on line ...
 Defining \__driver_draw_discardpath: on line ...
-Defining \__driver_draw_transformcm:nnnnnn on line ...
 Defining \__driver_draw_dash:nn on line ...
 Defining \__driver_draw_dash:n on line ...
 Defining \__driver_draw_linewidth:n on line ...
@@ -5005,7 +5004,7 @@ Defining \__driver_draw_miterlimit:n on line ...
 Defining \__driver_draw_cap_butt: on line ...
 Defining \__driver_draw_cap_round: on line ...
 Defining \__driver_draw_cap_rectangle: on line ...
-Defining \__driver_draw_join_mitre: on line ...
+Defining \__driver_draw_join_miter: on line ...
 Defining \__driver_draw_join_round: on line ...
 Defining \__driver_draw_join_bevel: on line ...
 Defining \__driver_draw_color_cmyk_fill:nnnn on line ...
@@ -5014,6 +5013,7 @@ Defining \__driver_draw_color_gray_fill:n on line ...
 Defining \__driver_draw_color_gray_stroke:n on line ...
 Defining \__driver_draw_color_rgb_fill:nnn on line ...
 Defining \__driver_draw_color_rgb_stroke:nnn on line ...
+Defining \__driver_draw_transformcm:nnnnnn on line ...
 Defining \__driver_draw_hbox:Nnnnnnn on line ...
 Defining \l__driver_tmp_box on line ...
 \l__driver_tmp_box=\box71
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 4e9614e..5774eba 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -4803,7 +4803,6 @@ Defining \__driver_draw_fill: on line ...
 Defining \__driver_draw_fillstroke: on line ...
 Defining \__driver_draw_clip: on line ...
 Defining \__driver_draw_discardpath: on line ...
-Defining \__driver_draw_transformcm:nnnnnn on line ...
 Defining \__driver_draw_dash:nn on line ...
 Defining \__driver_draw_dash:n on line ...
 Defining \__driver_draw_linewidth:n on line ...
@@ -4811,7 +4810,7 @@ Defining \__driver_draw_miterlimit:n on line ...
 Defining \__driver_draw_cap_butt: on line ...
 Defining \__driver_draw_cap_round: on line ...
 Defining \__driver_draw_cap_rectangle: on line ...
-Defining \__driver_draw_join_mitre: on line ...
+Defining \__driver_draw_join_miter: on line ...
 Defining \__driver_draw_join_round: on line ...
 Defining \__driver_draw_join_bevel: on line ...
 Defining \__driver_draw_color_cmyk_fill:nnnn on line ...
@@ -4820,6 +4819,7 @@ Defining \__driver_draw_color_gray_fill:n on line ...
 Defining \__driver_draw_color_gray_stroke:n on line ...
 Defining \__driver_draw_color_rgb_fill:nnn on line ...
 Defining \__driver_draw_color_rgb_stroke:nnn on line ...
+Defining \__driver_draw_transformcm:nnnnnn on line ...
 Defining \__driver_draw_hbox:Nnnnnnn on line ...
 Defining \l__driver_tmp_box on line ...
 \l__driver_tmp_box=\box71
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 5ea1717..c52948f 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -4808,7 +4808,6 @@ Defining \__driver_draw_fill: on line ...
 Defining \__driver_draw_fillstroke: on line ...
 Defining \__driver_draw_clip: on line ...
 Defining \__driver_draw_discardpath: on line ...
-Defining \__driver_draw_transformcm:nnnnnn on line ...
 Defining \__driver_draw_dash:nn on line ...
 Defining \__driver_draw_dash:n on line ...
 Defining \__driver_draw_linewidth:n on line ...
@@ -4816,7 +4815,7 @@ Defining \__driver_draw_miterlimit:n on line ...
 Defining \__driver_draw_cap_butt: on line ...
 Defining \__driver_draw_cap_round: on line ...
 Defining \__driver_draw_cap_rectangle: on line ...
-Defining \__driver_draw_join_mitre: on line ...
+Defining \__driver_draw_join_miter: on line ...
 Defining \__driver_draw_join_round: on line ...
 Defining \__driver_draw_join_bevel: on line ...
 Defining \__driver_draw_color_cmyk_fill:nnnn on line ...
@@ -4825,6 +4824,7 @@ Defining \__driver_draw_color_gray_fill:n on line ...
 Defining \__driver_draw_color_gray_stroke:n on line ...
 Defining \__driver_draw_color_rgb_fill:nnn on line ...
 Defining \__driver_draw_color_rgb_stroke:nnn on line ...
+Defining \__driver_draw_transformcm:nnnnnn on line ...
 Defining \__driver_draw_hbox:Nnnnnnn on line ...
 Defining \l__driver_tmp_box on line ...
 \l__driver_tmp_box=\box71
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 3de0c06..d0faa94 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -4797,7 +4797,6 @@ Defining \__driver_draw_fill: on line ...
 Defining \__driver_draw_fillstroke: on line ...
 Defining \__driver_draw_clip: on line ...
 Defining \__driver_draw_discardpath: on line ...
-Defining \__driver_draw_transformcm:nnnnnn on line ...
 Defining \__driver_draw_dash:nn on line ...
 Defining \__driver_draw_dash:n on line ...
 Defining \__driver_draw_linewidth:n on line ...
@@ -4805,7 +4804,7 @@ Defining \__driver_draw_miterlimit:n on line ...
 Defining \__driver_draw_cap_butt: on line ...
 Defining \__driver_draw_cap_round: on line ...
 Defining \__driver_draw_cap_rectangle: on line ...
-Defining \__driver_draw_join_mitre: on line ...
+Defining \__driver_draw_join_miter: on line ...
 Defining \__driver_draw_join_round: on line ...
 Defining \__driver_draw_join_bevel: on line ...
 Defining \__driver_draw_color_cmyk_fill:nnnn on line ...
@@ -4814,6 +4813,7 @@ Defining \__driver_draw_color_gray_fill:n on line ...
 Defining \__driver_draw_color_gray_stroke:n on line ...
 Defining \__driver_draw_color_rgb_fill:nnn on line ...
 Defining \__driver_draw_color_rgb_stroke:nnn on line ...
+Defining \__driver_draw_transformcm:nnnnnn on line ...
 Defining \__driver_draw_hbox:Nnnnnnn on line ...
 Defining \l__driver_tmp_box on line ...
 \l__driver_tmp_box=\box71
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index a6cf28b..c31152e 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -5000,7 +5000,6 @@ Defining \__driver_draw_fill: on line ...
 Defining \__driver_draw_fillstroke: on line ...
 Defining \__driver_draw_clip: on line ...
 Defining \__driver_draw_discardpath: on line ...
-Defining \__driver_draw_transformcm:nnnnnn on line ...
 Defining \__driver_draw_dash:nn on line ...
 Defining \__driver_draw_dash:n on line ...
 Defining \__driver_draw_linewidth:n on line ...
@@ -5008,7 +5007,7 @@ Defining \__driver_draw_miterlimit:n on line ...
 Defining \__driver_draw_cap_butt: on line ...
 Defining \__driver_draw_cap_round: on line ...
 Defining \__driver_draw_cap_rectangle: on line ...
-Defining \__driver_draw_join_mitre: on line ...
+Defining \__driver_draw_join_miter: on line ...
 Defining \__driver_draw_join_round: on line ...
 Defining \__driver_draw_join_bevel: on line ...
 Defining \__driver_draw_color_cmyk_fill:nnnn on line ...
@@ -5017,6 +5016,7 @@ Defining \__driver_draw_color_gray_fill:n on line ...
 Defining \__driver_draw_color_gray_stroke:n on line ...
 Defining \__driver_draw_color_rgb_fill:nnn on line ...
 Defining \__driver_draw_color_rgb_stroke:nnn on line ...
+Defining \__driver_draw_transformcm:nnnnnn on line ...
 Defining \__driver_draw_hbox:Nnnnnnn on line ...
 Defining \l__driver_tmp_box on line ...
 \l__driver_tmp_box=\box71
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 574b61e..c93a8b9 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -4998,7 +4998,6 @@ Defining \__driver_draw_fill: on line ...
 Defining \__driver_draw_fillstroke: on line ...
 Defining \__driver_draw_clip: on line ...
 Defining \__driver_draw_discardpath: on line ...
-Defining \__driver_draw_transformcm:nnnnnn on line ...
 Defining \__driver_draw_dash:nn on line ...
 Defining \__driver_draw_dash:n on line ...
 Defining \__driver_draw_linewidth:n on line ...
@@ -5006,7 +5005,7 @@ Defining \__driver_draw_miterlimit:n on line ...
 Defining \__driver_draw_cap_butt: on line ...
 Defining \__driver_draw_cap_round: on line ...
 Defining \__driver_draw_cap_rectangle: on line ...
-Defining \__driver_draw_join_mitre: on line ...
+Defining \__driver_draw_join_miter: on line ...
 Defining \__driver_draw_join_round: on line ...
 Defining \__driver_draw_join_bevel: on line ...
 Defining \__driver_draw_color_cmyk_fill:nnnn on line ...
@@ -5015,6 +5014,7 @@ Defining \__driver_draw_color_gray_fill:n on line ...
 Defining \__driver_draw_color_gray_stroke:n on line ...
 Defining \__driver_draw_color_rgb_fill:nnn on line ...
 Defining \__driver_draw_color_rgb_stroke:nnn on line ...
+Defining \__driver_draw_transformcm:nnnnnn on line ...
 Defining \__driver_draw_hbox:Nnnnnnn on line ...
 Defining \l__driver_tmp_box on line ...
 \l__driver_tmp_box=\box71
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 464cb2a..102b083 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -4804,7 +4804,6 @@ Defining \__driver_draw_fill: on line ...
 Defining \__driver_draw_fillstroke: on line ...
 Defining \__driver_draw_clip: on line ...
 Defining \__driver_draw_discardpath: on line ...
-Defining \__driver_draw_transformcm:nnnnnn on line ...
 Defining \__driver_draw_dash:nn on line ...
 Defining \__driver_draw_dash:n on line ...
 Defining \__driver_draw_linewidth:n on line ...
@@ -4812,7 +4811,7 @@ Defining \__driver_draw_miterlimit:n on line ...
 Defining \__driver_draw_cap_butt: on line ...
 Defining \__driver_draw_cap_round: on line ...
 Defining \__driver_draw_cap_rectangle: on line ...
-Defining \__driver_draw_join_mitre: on line ...
+Defining \__driver_draw_join_miter: on line ...
 Defining \__driver_draw_join_round: on line ...
 Defining \__driver_draw_join_bevel: on line ...
 Defining \__driver_draw_color_cmyk_fill:nnnn on line ...
@@ -4821,6 +4820,7 @@ Defining \__driver_draw_color_gray_fill:n on line ...
 Defining \__driver_draw_color_gray_stroke:n on line ...
 Defining \__driver_draw_color_rgb_fill:nnn on line ...
 Defining \__driver_draw_color_rgb_stroke:nnn on line ...
+Defining \__driver_draw_transformcm:nnnnnn on line ...
 Defining \__driver_draw_hbox:Nnnnnnn on line ...
 Defining \l__driver_tmp_box on line ...
 \l__driver_tmp_box=\box71

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

More information about the latex3-commits mailing list