[latex3-commits] [git/LaTeX3-latex3-latex3] master: Draw grids 'in order' (4fccc3c)

Joseph Wright joseph.wright at morningstar2.co.uk
Sun Feb 18 15:24:15 CET 2018


Repository : https://github.com/latex3/latex3
On branch  : master
Link       : https://github.com/latex3/latex3/commit/4fccc3c522ee1099952b55ea75b671f07ca7197b

>---------------------------------------------------------------

commit 4fccc3c522ee1099952b55ea75b671f07ca7197b
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Sun Feb 18 14:24:15 2018 +0000

    Draw grids 'in order'


>---------------------------------------------------------------

4fccc3c522ee1099952b55ea75b671f07ca7197b
 l3trial/l3draw/l3draw-paths.dtx              |    4 +--
 l3trial/l3draw/testfiles/m3draw003.ptex.tlg  |   48 +++++++++++++-------------
 l3trial/l3draw/testfiles/m3draw003.tlg       |   48 +++++++++++++-------------
 l3trial/l3draw/testfiles/m3draw003.uptex.tlg |   48 +++++++++++++-------------
 l3trial/l3draw/testfiles/m3draw003.xetex.tlg |   48 +++++++++++++-------------
 5 files changed, 98 insertions(+), 98 deletions(-)

diff --git a/l3trial/l3draw/l3draw-paths.dtx b/l3trial/l3draw/l3draw-paths.dtx
index 7dc41d8..c778967 100644
--- a/l3trial/l3draw/l3draw-paths.dtx
+++ b/l3trial/l3draw/l3draw-paths.dtx
@@ -748,13 +748,13 @@
 \cs_new_protected:Npn \@@_path_grid:nnnnnn #1#2#3#4#5#6
   {
     \dim_step_inline:nnnn
-      { \dim_min:nn {#3} {#5} } { \dim_abs:n {#1} } { \dim_max:nn {#3} {#5} }
+      {#3} { \dim_compare:nNnF {#3} < {#5} { - } \dim_abs:n {#1} } {#5}
       {
         \draw_path_moveto:n { ##1 , #4 }
         \draw_path_lineto:n { ##1 , #6 }
       }
     \dim_step_inline:nnnn
-      { \dim_min:nn {#4} {#6} } { \dim_abs:n {#2} } { \dim_max:nn {#4} {#6} }
+      {#4} { \dim_compare:nNnF {#4} < {#6} { - } \dim_abs:n {#2} } {#6}
       {
         \draw_path_moveto:n { #3 , ##1 }
         \draw_path_lineto:n { #5 , ##1 }
diff --git a/l3trial/l3draw/testfiles/m3draw003.ptex.tlg b/l3trial/l3draw/testfiles/m3draw003.ptex.tlg
index db9873b..a56c710 100644
--- a/l3trial/l3draw/testfiles/m3draw003.ptex.tlg
+++ b/l3trial/l3draw/testfiles/m3draw003.ptex.tlg
@@ -407,30 +407,30 @@ l. ...  }
 ..\hbox(0.0+0.0)x0.0
 ...\special{pdf:literal q}
 ...\special{pdf:literal 0.3985 w}
-...\special{pdf:literal 0 141.73228 m}
-...\special{pdf:literal 0 0 l}
-...\special{pdf:literal 28.34645 141.73228 m}
-...\special{pdf:literal 28.34645 0 l}
-...\special{pdf:literal 56.69289 141.73228 m}
-...\special{pdf:literal 56.69289 0 l}
-...\special{pdf:literal 85.03934 141.73228 m}
-...\special{pdf:literal 85.03934 0 l}
-...\special{pdf:literal 113.38577 141.73228 m}
-...\special{pdf:literal 113.38577 0 l}
-...\special{pdf:literal 141.73222 141.73228 m}
-...\special{pdf:literal 141.73222 0 l}
-...\special{pdf:literal 141.73228 0 m}
-...\special{pdf:literal 0 0 l}
-...\special{pdf:literal 141.73228 28.34645 m}
-...\special{pdf:literal 0 28.34645 l}
-...\special{pdf:literal 141.73228 56.69289 m}
-...\special{pdf:literal 0 56.69289 l}
-...\special{pdf:literal 141.73228 85.03934 m}
-...\special{pdf:literal 0 85.03934 l}
-...\special{pdf:literal 141.73228 113.38577 m}
-...\special{pdf:literal 0 113.38577 l}
-...\special{pdf:literal 141.73228 141.73222 m}
-...\special{pdf:literal 0 141.73222 l}
+...\special{pdf:literal 141.73228 141.73228 m}
+...\special{pdf:literal 141.73228 0 l}
+...\special{pdf:literal 113.38583 141.73228 m}
+...\special{pdf:literal 113.38583 0 l}
+...\special{pdf:literal 85.0394 141.73228 m}
+...\special{pdf:literal 85.0394 0 l}
+...\special{pdf:literal 56.69295 141.73228 m}
+...\special{pdf:literal 56.69295 0 l}
+...\special{pdf:literal 28.34651 141.73228 m}
+...\special{pdf:literal 28.34651 0 l}
+...\special{pdf:literal 0.00006 141.73228 m}
+...\special{pdf:literal 0.00006 0 l}
+...\special{pdf:literal 141.73228 141.73228 m}
+...\special{pdf:literal 0 141.73228 l}
+...\special{pdf:literal 141.73228 113.38583 m}
+...\special{pdf:literal 0 113.38583 l}
+...\special{pdf:literal 141.73228 85.0394 m}
+...\special{pdf:literal 0 85.0394 l}
+...\special{pdf:literal 141.73228 56.69295 m}
+...\special{pdf:literal 0 56.69295 l}
+...\special{pdf:literal 141.73228 28.34651 m}
+...\special{pdf:literal 0 28.34651 l}
+...\special{pdf:literal 141.73228 0.00006 m}
+...\special{pdf:literal 0 0.00006 l}
 ...\special{pdf:literal S}
 ...\special{pdf:literal Q}
 ! OK.
diff --git a/l3trial/l3draw/testfiles/m3draw003.tlg b/l3trial/l3draw/testfiles/m3draw003.tlg
index 6cafb72..c871478 100644
--- a/l3trial/l3draw/testfiles/m3draw003.tlg
+++ b/l3trial/l3draw/testfiles/m3draw003.tlg
@@ -407,30 +407,30 @@ l. ...  }
 ..\hbox(0.0+0.0)x0.0
 ...\pdfliteral{q}
 ...\pdfliteral{0.3985 w}
-...\pdfliteral{0 141.73228 m}
-...\pdfliteral{0 0 l}
-...\pdfliteral{28.34645 141.73228 m}
-...\pdfliteral{28.34645 0 l}
-...\pdfliteral{56.69289 141.73228 m}
-...\pdfliteral{56.69289 0 l}
-...\pdfliteral{85.03934 141.73228 m}
-...\pdfliteral{85.03934 0 l}
-...\pdfliteral{113.38577 141.73228 m}
-...\pdfliteral{113.38577 0 l}
-...\pdfliteral{141.73222 141.73228 m}
-...\pdfliteral{141.73222 0 l}
-...\pdfliteral{141.73228 0 m}
-...\pdfliteral{0 0 l}
-...\pdfliteral{141.73228 28.34645 m}
-...\pdfliteral{0 28.34645 l}
-...\pdfliteral{141.73228 56.69289 m}
-...\pdfliteral{0 56.69289 l}
-...\pdfliteral{141.73228 85.03934 m}
-...\pdfliteral{0 85.03934 l}
-...\pdfliteral{141.73228 113.38577 m}
-...\pdfliteral{0 113.38577 l}
-...\pdfliteral{141.73228 141.73222 m}
-...\pdfliteral{0 141.73222 l}
+...\pdfliteral{141.73228 141.73228 m}
+...\pdfliteral{141.73228 0 l}
+...\pdfliteral{113.38583 141.73228 m}
+...\pdfliteral{113.38583 0 l}
+...\pdfliteral{85.0394 141.73228 m}
+...\pdfliteral{85.0394 0 l}
+...\pdfliteral{56.69295 141.73228 m}
+...\pdfliteral{56.69295 0 l}
+...\pdfliteral{28.34651 141.73228 m}
+...\pdfliteral{28.34651 0 l}
+...\pdfliteral{0.00006 141.73228 m}
+...\pdfliteral{0.00006 0 l}
+...\pdfliteral{141.73228 141.73228 m}
+...\pdfliteral{0 141.73228 l}
+...\pdfliteral{141.73228 113.38583 m}
+...\pdfliteral{0 113.38583 l}
+...\pdfliteral{141.73228 85.0394 m}
+...\pdfliteral{0 85.0394 l}
+...\pdfliteral{141.73228 56.69295 m}
+...\pdfliteral{0 56.69295 l}
+...\pdfliteral{141.73228 28.34651 m}
+...\pdfliteral{0 28.34651 l}
+...\pdfliteral{141.73228 0.00006 m}
+...\pdfliteral{0 0.00006 l}
 ...\pdfliteral{S}
 ...\pdfliteral{Q}
 ! OK.
diff --git a/l3trial/l3draw/testfiles/m3draw003.uptex.tlg b/l3trial/l3draw/testfiles/m3draw003.uptex.tlg
index db9873b..a56c710 100644
--- a/l3trial/l3draw/testfiles/m3draw003.uptex.tlg
+++ b/l3trial/l3draw/testfiles/m3draw003.uptex.tlg
@@ -407,30 +407,30 @@ l. ...  }
 ..\hbox(0.0+0.0)x0.0
 ...\special{pdf:literal q}
 ...\special{pdf:literal 0.3985 w}
-...\special{pdf:literal 0 141.73228 m}
-...\special{pdf:literal 0 0 l}
-...\special{pdf:literal 28.34645 141.73228 m}
-...\special{pdf:literal 28.34645 0 l}
-...\special{pdf:literal 56.69289 141.73228 m}
-...\special{pdf:literal 56.69289 0 l}
-...\special{pdf:literal 85.03934 141.73228 m}
-...\special{pdf:literal 85.03934 0 l}
-...\special{pdf:literal 113.38577 141.73228 m}
-...\special{pdf:literal 113.38577 0 l}
-...\special{pdf:literal 141.73222 141.73228 m}
-...\special{pdf:literal 141.73222 0 l}
-...\special{pdf:literal 141.73228 0 m}
-...\special{pdf:literal 0 0 l}
-...\special{pdf:literal 141.73228 28.34645 m}
-...\special{pdf:literal 0 28.34645 l}
-...\special{pdf:literal 141.73228 56.69289 m}
-...\special{pdf:literal 0 56.69289 l}
-...\special{pdf:literal 141.73228 85.03934 m}
-...\special{pdf:literal 0 85.03934 l}
-...\special{pdf:literal 141.73228 113.38577 m}
-...\special{pdf:literal 0 113.38577 l}
-...\special{pdf:literal 141.73228 141.73222 m}
-...\special{pdf:literal 0 141.73222 l}
+...\special{pdf:literal 141.73228 141.73228 m}
+...\special{pdf:literal 141.73228 0 l}
+...\special{pdf:literal 113.38583 141.73228 m}
+...\special{pdf:literal 113.38583 0 l}
+...\special{pdf:literal 85.0394 141.73228 m}
+...\special{pdf:literal 85.0394 0 l}
+...\special{pdf:literal 56.69295 141.73228 m}
+...\special{pdf:literal 56.69295 0 l}
+...\special{pdf:literal 28.34651 141.73228 m}
+...\special{pdf:literal 28.34651 0 l}
+...\special{pdf:literal 0.00006 141.73228 m}
+...\special{pdf:literal 0.00006 0 l}
+...\special{pdf:literal 141.73228 141.73228 m}
+...\special{pdf:literal 0 141.73228 l}
+...\special{pdf:literal 141.73228 113.38583 m}
+...\special{pdf:literal 0 113.38583 l}
+...\special{pdf:literal 141.73228 85.0394 m}
+...\special{pdf:literal 0 85.0394 l}
+...\special{pdf:literal 141.73228 56.69295 m}
+...\special{pdf:literal 0 56.69295 l}
+...\special{pdf:literal 141.73228 28.34651 m}
+...\special{pdf:literal 0 28.34651 l}
+...\special{pdf:literal 141.73228 0.00006 m}
+...\special{pdf:literal 0 0.00006 l}
 ...\special{pdf:literal S}
 ...\special{pdf:literal Q}
 ! OK.
diff --git a/l3trial/l3draw/testfiles/m3draw003.xetex.tlg b/l3trial/l3draw/testfiles/m3draw003.xetex.tlg
index db9873b..a56c710 100644
--- a/l3trial/l3draw/testfiles/m3draw003.xetex.tlg
+++ b/l3trial/l3draw/testfiles/m3draw003.xetex.tlg
@@ -407,30 +407,30 @@ l. ...  }
 ..\hbox(0.0+0.0)x0.0
 ...\special{pdf:literal q}
 ...\special{pdf:literal 0.3985 w}
-...\special{pdf:literal 0 141.73228 m}
-...\special{pdf:literal 0 0 l}
-...\special{pdf:literal 28.34645 141.73228 m}
-...\special{pdf:literal 28.34645 0 l}
-...\special{pdf:literal 56.69289 141.73228 m}
-...\special{pdf:literal 56.69289 0 l}
-...\special{pdf:literal 85.03934 141.73228 m}
-...\special{pdf:literal 85.03934 0 l}
-...\special{pdf:literal 113.38577 141.73228 m}
-...\special{pdf:literal 113.38577 0 l}
-...\special{pdf:literal 141.73222 141.73228 m}
-...\special{pdf:literal 141.73222 0 l}
-...\special{pdf:literal 141.73228 0 m}
-...\special{pdf:literal 0 0 l}
-...\special{pdf:literal 141.73228 28.34645 m}
-...\special{pdf:literal 0 28.34645 l}
-...\special{pdf:literal 141.73228 56.69289 m}
-...\special{pdf:literal 0 56.69289 l}
-...\special{pdf:literal 141.73228 85.03934 m}
-...\special{pdf:literal 0 85.03934 l}
-...\special{pdf:literal 141.73228 113.38577 m}
-...\special{pdf:literal 0 113.38577 l}
-...\special{pdf:literal 141.73228 141.73222 m}
-...\special{pdf:literal 0 141.73222 l}
+...\special{pdf:literal 141.73228 141.73228 m}
+...\special{pdf:literal 141.73228 0 l}
+...\special{pdf:literal 113.38583 141.73228 m}
+...\special{pdf:literal 113.38583 0 l}
+...\special{pdf:literal 85.0394 141.73228 m}
+...\special{pdf:literal 85.0394 0 l}
+...\special{pdf:literal 56.69295 141.73228 m}
+...\special{pdf:literal 56.69295 0 l}
+...\special{pdf:literal 28.34651 141.73228 m}
+...\special{pdf:literal 28.34651 0 l}
+...\special{pdf:literal 0.00006 141.73228 m}
+...\special{pdf:literal 0.00006 0 l}
+...\special{pdf:literal 141.73228 141.73228 m}
+...\special{pdf:literal 0 141.73228 l}
+...\special{pdf:literal 141.73228 113.38583 m}
+...\special{pdf:literal 0 113.38583 l}
+...\special{pdf:literal 141.73228 85.0394 m}
+...\special{pdf:literal 0 85.0394 l}
+...\special{pdf:literal 141.73228 56.69295 m}
+...\special{pdf:literal 0 56.69295 l}
+...\special{pdf:literal 141.73228 28.34651 m}
+...\special{pdf:literal 0 28.34651 l}
+...\special{pdf:literal 141.73228 0.00006 m}
+...\special{pdf:literal 0 0.00006 l}
 ...\special{pdf:literal S}
 ...\special{pdf:literal Q}
 ! OK.





More information about the latex3-commits mailing list