[latex3-commits] [latex3/latex3] main: Correct l3draw baseline calc. (fixes #1400) (c1b959a24)
github at latex-project.org
github at latex-project.org
Sun Dec 31 18:27:54 CET 2023
Repository : https://github.com/latex3/latex3
On branch : main
Link : https://github.com/latex3/latex3/commit/c1b959a24da5cb634d42ad6aa8bf2218d87aa0f8
>---------------------------------------------------------------
commit c1b959a24da5cb634d42ad6aa8bf2218d87aa0f8
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Sun Dec 31 17:27:54 2023 +0000
Correct l3draw baseline calc. (fixes #1400)
>---------------------------------------------------------------
c1b959a24da5cb634d42ad6aa8bf2218d87aa0f8
l3experimental/CHANGELOG.md | 1 +
l3experimental/l3draw/l3draw-scopes.dtx | 2 +-
l3experimental/l3draw/testfiles/m3draw004.etex-dvips.tlg | 8 ++++----
l3experimental/l3draw/testfiles/m3draw004.etex-dvisvgm.tlg | 8 ++++----
l3experimental/l3draw/testfiles/m3draw004.tlg | 8 ++++----
l3experimental/l3draw/testfiles/m3draw004.uptex.tlg | 8 ++++----
l3experimental/l3draw/testfiles/m3draw004.xetex.tlg | 8 ++++----
7 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/l3experimental/CHANGELOG.md b/l3experimental/CHANGELOG.md
index bdf35287a..672fd84c2 100644
--- a/l3experimental/CHANGELOG.md
+++ b/l3experimental/CHANGELOG.md
@@ -12,6 +12,7 @@ this project uses date-based 'snapshot' version identifiers.
### Fixed
- Remove a stray scaling in `\draw_path_rectangle:nn` (issue \#1386)
+- Correct baseline calculations in some `l3draw` cases (issue \#1400)
## [2023-12-08]
diff --git a/l3experimental/l3draw/l3draw-scopes.dtx b/l3experimental/l3draw/l3draw-scopes.dtx
index ae8869d6b..5c7504cdf 100644
--- a/l3experimental/l3draw/l3draw-scopes.dtx
+++ b/l3experimental/l3draw/l3draw-scopes.dtx
@@ -210,7 +210,7 @@
{ 0pt }
}
\box_set_ht:Nn \l_@@_main_box
- { \g_@@_ymax_dim + #1 }
+ { \g_@@_ymax_dim - #1 }
}
% \end{macrocode}
% \end{macro}
diff --git a/l3experimental/l3draw/testfiles/m3draw004.etex-dvips.tlg b/l3experimental/l3draw/testfiles/m3draw004.etex-dvips.tlg
index 8198ac9aa..6f2e57d1d 100644
--- a/l3experimental/l3draw/testfiles/m3draw004.etex-dvips.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw004.etex-dvips.tlg
@@ -684,8 +684,8 @@ TEST 10: \draw_baseline:n
<argument> \l_tmpa_box
l. ... }
> \box...=
-\hbox(426.99133+142.46378)x57.30551
-.\hbox(426.99133+142.46378)x57.30551
+\hbox(142.46378+142.46378)x57.30551
+.\hbox(142.46378+142.46378)x57.30551
..\glue 0.2
..\hbox(0.0+0.0)x0.0, shifted 142.26378
...\special{ps::[begin]}
@@ -713,8 +713,8 @@ l. ... }
<argument> \l_tmpa_box
l. ... }
> \box...=
-\hbox(142.46378+0.0)x57.30551
-.\hbox(142.46378+0.0)x57.30551
+\hbox(426.99133+0.0)x57.30551
+.\hbox(426.99133+0.0)x57.30551
..\glue 0.2
..\hbox(0.0+0.0)x0.0, shifted -142.26378
...\special{ps::[begin]}
diff --git a/l3experimental/l3draw/testfiles/m3draw004.etex-dvisvgm.tlg b/l3experimental/l3draw/testfiles/m3draw004.etex-dvisvgm.tlg
index 84ffc98d6..18edef786 100644
--- a/l3experimental/l3draw/testfiles/m3draw004.etex-dvisvgm.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw004.etex-dvisvgm.tlg
@@ -706,8 +706,8 @@ TEST 10: \draw_baseline:n
<argument> \l_tmpa_box
l. ... }
> \box...=
-\hbox(426.99133+142.46378)x57.30551
-.\hbox(426.99133+142.46378)x57.30551
+\hbox(142.46378+142.46378)x57.30551
+.\hbox(142.46378+142.46378)x57.30551
..\glue 0.2
..\hbox(0.0+0.0)x0.0, shifted 142.26378
...\special{dvisvgm:raw <g>{?nl}}
@@ -734,8 +734,8 @@ l. ... }
<argument> \l_tmpa_box
l. ... }
> \box...=
-\hbox(142.46378+0.0)x57.30551
-.\hbox(142.46378+0.0)x57.30551
+\hbox(426.99133+0.0)x57.30551
+.\hbox(426.99133+0.0)x57.30551
..\glue 0.2
..\hbox(0.0+0.0)x0.0, shifted -142.26378
...\special{dvisvgm:raw <g>{?nl}}
diff --git a/l3experimental/l3draw/testfiles/m3draw004.tlg b/l3experimental/l3draw/testfiles/m3draw004.tlg
index 1e846f5c6..63443f819 100644
--- a/l3experimental/l3draw/testfiles/m3draw004.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw004.tlg
@@ -525,8 +525,8 @@ TEST 10: \draw_baseline:n
<argument> \l_tmpa_box
l. ... }
> \box...=
-\hbox(426.99133+142.46378)x57.30551
-.\hbox(426.99133+142.46378)x57.30551
+\hbox(142.46378+142.46378)x57.30551
+.\hbox(142.46378+142.46378)x57.30551
..\glue 0.2
..\hbox(0.0+0.0)x0.0, shifted 142.26378
...\pdfsave
@@ -547,8 +547,8 @@ l. ... }
<argument> \l_tmpa_box
l. ... }
> \box...=
-\hbox(142.46378+0.0)x57.30551
-.\hbox(142.46378+0.0)x57.30551
+\hbox(426.99133+0.0)x57.30551
+.\hbox(426.99133+0.0)x57.30551
..\glue 0.2
..\hbox(0.0+0.0)x0.0, shifted -142.26378
...\pdfsave
diff --git a/l3experimental/l3draw/testfiles/m3draw004.uptex.tlg b/l3experimental/l3draw/testfiles/m3draw004.uptex.tlg
index 8198ac9aa..6f2e57d1d 100644
--- a/l3experimental/l3draw/testfiles/m3draw004.uptex.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw004.uptex.tlg
@@ -684,8 +684,8 @@ TEST 10: \draw_baseline:n
<argument> \l_tmpa_box
l. ... }
> \box...=
-\hbox(426.99133+142.46378)x57.30551
-.\hbox(426.99133+142.46378)x57.30551
+\hbox(142.46378+142.46378)x57.30551
+.\hbox(142.46378+142.46378)x57.30551
..\glue 0.2
..\hbox(0.0+0.0)x0.0, shifted 142.26378
...\special{ps::[begin]}
@@ -713,8 +713,8 @@ l. ... }
<argument> \l_tmpa_box
l. ... }
> \box...=
-\hbox(142.46378+0.0)x57.30551
-.\hbox(142.46378+0.0)x57.30551
+\hbox(426.99133+0.0)x57.30551
+.\hbox(426.99133+0.0)x57.30551
..\glue 0.2
..\hbox(0.0+0.0)x0.0, shifted -142.26378
...\special{ps::[begin]}
diff --git a/l3experimental/l3draw/testfiles/m3draw004.xetex.tlg b/l3experimental/l3draw/testfiles/m3draw004.xetex.tlg
index 6d0667c22..9309dafdd 100644
--- a/l3experimental/l3draw/testfiles/m3draw004.xetex.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw004.xetex.tlg
@@ -525,8 +525,8 @@ TEST 10: \draw_baseline:n
<argument> \l_tmpa_box
l. ... }
> \box...=
-\hbox(426.99133+142.46378)x57.30551
-.\hbox(426.99133+142.46378)x57.30551
+\hbox(142.46378+142.46378)x57.30551
+.\hbox(142.46378+142.46378)x57.30551
..\glue 0.2
..\hbox(0.0+0.0)x0.0, shifted 142.26378
...\special{x:gsave}
@@ -547,8 +547,8 @@ l. ... }
<argument> \l_tmpa_box
l. ... }
> \box...=
-\hbox(142.46378+0.0)x57.30551
-.\hbox(142.46378+0.0)x57.30551
+\hbox(426.99133+0.0)x57.30551
+.\hbox(426.99133+0.0)x57.30551
..\glue 0.2
..\hbox(0.0+0.0)x0.0, shifted -142.26378
...\special{x:gsave}
More information about the latex3-commits
mailing list.