[latex3-commits] [git/LaTeX3-latex3-graphics-def] main: dvipdfmx stacks currently still problematic (3736eee)
Joseph Wright
joseph.wright at morningstar2.co.uk
Sat Apr 16 19:14:19 CEST 2022
Repository : https://github.com/latex3/graphics-def
On branch : main
Link : https://github.com/latex3/graphics-def/commit/3736eee7a25ec6576c1aeb52fd9c3adb9a875a5d
>---------------------------------------------------------------
commit 3736eee7a25ec6576c1aeb52fd9c3adb9a875a5d
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Sat Apr 16 18:14:19 2022 +0100
dvipdfmx stacks currently still problematic
>---------------------------------------------------------------
3736eee7a25ec6576c1aeb52fd9c3adb9a875a5d
dvipdfmx.def | 3 ++-
testfiles/dvipdfmx001.luatex.tlg | 1 -
testfiles/dvipdfmx001.tlg | 1 -
testfiles/pagecolor-001.xetex.tlg | 40 +++++++++++++++++++--------------------
testfiles/pagecolor-002.xetex.tlg | 16 ++++++++--------
testfiles/pagecolor-003.xetex.tlg | 18 +++++++++---------
testfiles/xetex001.luatex.tlg | 5 -----
testfiles/xetex001.tlg | 5 -----
testfiles/xetex001.xetex.tlg | 4 ----
xetex.def | 3 ++-
10 files changed, 41 insertions(+), 55 deletions(-)
diff --git a/dvipdfmx.def b/dvipdfmx.def
index f8a984c..1d82661 100644
--- a/dvipdfmx.def
+++ b/dvipdfmx.def
@@ -17,7 +17,7 @@
%% https://github.com/latex3/graphics-def/issues
%%
\ProvidesFile{dvipdfmx.def}
- [2022/04/12 v5.0k Graphics/color driver for dvipdfmx]
+ [2022/04/16 v5.0l Graphics/color driver for dvipdfmx]
\def\GPT at space{ }
\def\c at lor@arg#1{%
\dimen@#1\p@
@@ -329,6 +329,7 @@
}
\fi
\fi
+\endinput
% Conversion functions so the internal representation stays unchanged
\let\init at current@color\current at color
\def\convert at color#1{%
diff --git a/testfiles/dvipdfmx001.luatex.tlg b/testfiles/dvipdfmx001.luatex.tlg
index e5bfe39..ac4507f 100644
--- a/testfiles/dvipdfmx001.luatex.tlg
+++ b/testfiles/dvipdfmx001.luatex.tlg
@@ -11,7 +11,6 @@ File: az2.pdf Graphic file (type pdf)
Completed box being shipped out [1]
\vbox(633.0+0.0)x407.0, direction TLT
.\hbox(0.0+0.0)x0.0, direction TLT
-..\special{pdfcolorstackinit 1 page direct (0 g 0 G)}
..\special{pdf:pagesize width 614.295pt height 794.96999pt}
.\glue 16.0
.\vbox(617.0+0.0)x345.0, shifted 62.0, direction TLT
diff --git a/testfiles/dvipdfmx001.tlg b/testfiles/dvipdfmx001.tlg
index 60bd903..be62256 100644
--- a/testfiles/dvipdfmx001.tlg
+++ b/testfiles/dvipdfmx001.tlg
@@ -11,7 +11,6 @@ File: az2.pdf Graphic file (type pdf)
Completed box being shipped out [1]
\vbox(633.0+0.0)x407.0
.\hbox(0.0+0.0)x0.0
-..\special{pdfcolorstackinit 1 page direct (0 g 0 G)}
..\special{pdf:pagesize width 614.295pt height 794.96999pt}
.\glue 16.0
.\vbox(617.0+0.0)x345.0, shifted 62.0
diff --git a/testfiles/pagecolor-001.xetex.tlg b/testfiles/pagecolor-001.xetex.tlg
index f8b3419..2d0da4f 100644
--- a/testfiles/pagecolor-001.xetex.tlg
+++ b/testfiles/pagecolor-001.xetex.tlg
@@ -22,9 +22,9 @@ Completed box being shipped out [1]
..\vbox(12.0+0.0)x345.0, glue set 12.0fil
...\glue 0.0 plus 1.0fil
...\hbox(0.0+0.0)x345.0
-....\special{pdfcolorstack 1 push (0 g 0 G)}
+....\special{color push Black}
....\hbox(0.0+0.0)x345.0
-....\special{pdfcolorstack 1 pop}
+....\special{color pop}
..\glue 25.0
..\glue(\lineskip) 0.0
..\vbox(550.0+0.0)x345.0, glue set 539.94232fil
@@ -44,12 +44,12 @@ Completed box being shipped out [1]
...\glue 0.0 plus 0.0001fil
..\glue(\baselineskip) 23.34
..\hbox(6.66+0.0)x345.0
-...\special{pdfcolorstack 1 push (0 g 0 G)}
+...\special{color push Black}
...\hbox(6.66+0.0)x345.0, glue set 170.0fil
....\glue 0.0 plus 1.0fil
....\TU/lmr/m/n/10 1
....\glue 0.0 plus 1.0fil
-...\special{pdfcolorstack 1 pop}
+...\special{color pop}
.\kern 0.0
.\kern 0.0
Completed box being shipped out [2]
@@ -72,9 +72,9 @@ Completed box being shipped out [2]
..\vbox(12.0+0.0)x345.0, glue set 12.0fil
...\glue 0.0 plus 1.0fil
...\hbox(0.0+0.0)x345.0
-....\special{pdfcolorstack 1 push (0 g 0 G)}
+....\special{color push Black}
....\hbox(0.0+0.0)x345.0
-....\special{pdfcolorstack 1 pop}
+....\special{color pop}
..\glue 25.0
..\glue(\lineskip) 0.0
..\vbox(550.0+0.0)x345.0, glue set 539.94232fil
@@ -94,12 +94,12 @@ Completed box being shipped out [2]
...\glue 0.0 plus 0.0001fil
..\glue(\baselineskip) 23.34
..\hbox(6.66+0.0)x345.0
-...\special{pdfcolorstack 1 push (0 g 0 G)}
+...\special{color push Black}
...\hbox(6.66+0.0)x345.0, glue set 170.0fil
....\glue 0.0 plus 1.0fil
....\TU/lmr/m/n/10 2
....\glue 0.0 plus 1.0fil
-...\special{pdfcolorstack 1 pop}
+...\special{color pop}
.\kern 0.0
Completed box being shipped out [3]
\vbox(633.0+0.21999)x407.0
@@ -121,9 +121,9 @@ Completed box being shipped out [3]
..\vbox(12.0+0.0)x345.0, glue set 12.0fil
...\glue 0.0 plus 1.0fil
...\hbox(0.0+0.0)x345.0
-....\special{pdfcolorstack 1 push (0 g 0 G)}
+....\special{color push Black}
....\hbox(0.0+0.0)x345.0
-....\special{pdfcolorstack 1 pop}
+....\special{color pop}
..\glue 25.0
..\glue(\lineskip) 0.0
..\vbox(550.0+0.0)x345.0, glue set 539.94232fil
@@ -145,12 +145,12 @@ Completed box being shipped out [3]
...\glue 0.0 plus 0.0001fil
..\glue(\baselineskip) 23.34
..\hbox(6.66+0.21999)x345.0
-...\special{pdfcolorstack 1 push (0 g 0 G)}
+...\special{color push Black}
...\hbox(6.66+0.21999)x345.0, glue set 170.0fil
....\glue 0.0 plus 1.0fil
....\TU/lmr/m/n/10 3
....\glue 0.0 plus 1.0fil
-...\special{pdfcolorstack 1 pop}
+...\special{color pop}
.\kern 0.0
Completed box being shipped out [4]
\vbox(633.0+0.0)x407.0
@@ -172,9 +172,9 @@ Completed box being shipped out [4]
..\vbox(12.0+0.0)x345.0, glue set 12.0fil
...\glue 0.0 plus 1.0fil
...\hbox(0.0+0.0)x345.0
-....\special{pdfcolorstack 1 push (0 g 0 G)}
+....\special{color push Black}
....\hbox(0.0+0.0)x345.0
-....\special{pdfcolorstack 1 pop}
+....\special{color pop}
..\glue 25.0
..\glue(\lineskip) 0.0
..\vbox(550.0+0.0)x345.0, glue set 539.94232fil
@@ -194,12 +194,12 @@ Completed box being shipped out [4]
...\glue 0.0 plus 0.0001fil
..\glue(\baselineskip) 23.23
..\hbox(6.77+0.0)x345.0
-...\special{pdfcolorstack 1 push (0 g 0 G)}
+...\special{color push Black}
...\hbox(6.77+0.0)x345.0, glue set 170.0fil
....\glue 0.0 plus 1.0fil
....\TU/lmr/m/n/10 4
....\glue 0.0 plus 1.0fil
-...\special{pdfcolorstack 1 pop}
+...\special{color pop}
.\kern 0.0
Completed box being shipped out [5]
\vbox(633.0+0.21999)x407.0
@@ -221,9 +221,9 @@ Completed box being shipped out [5]
..\vbox(12.0+0.0)x345.0, glue set 12.0fil
...\glue 0.0 plus 1.0fil
...\hbox(0.0+0.0)x345.0
-....\special{pdfcolorstack 1 push (0 g 0 G)}
+....\special{color push Black}
....\hbox(0.0+0.0)x345.0
-....\special{pdfcolorstack 1 pop}
+....\special{color pop}
..\glue 25.0
..\glue(\lineskip) 0.0
..\vbox(550.0+0.0)x345.0, glue set 539.94232fil
@@ -242,11 +242,11 @@ Completed box being shipped out [5]
...\glue 0.0 plus 0.0001fil
..\glue(\baselineskip) 23.34
..\hbox(6.66+0.21999)x345.0
-...\special{pdfcolorstack 1 push (0 g 0 G)}
+...\special{color push Black}
...\hbox(6.66+0.21999)x345.0, glue set 170.0fil
....\glue 0.0 plus 1.0fil
....\TU/lmr/m/n/10 5
....\glue 0.0 plus 1.0fil
-...\special{pdfcolorstack 1 pop}
+...\special{color pop}
.\kern 0.0
(pagecolor-001.aux)
diff --git a/testfiles/pagecolor-002.xetex.tlg b/testfiles/pagecolor-002.xetex.tlg
index 93e2d69..1084705 100644
--- a/testfiles/pagecolor-002.xetex.tlg
+++ b/testfiles/pagecolor-002.xetex.tlg
@@ -9,9 +9,9 @@ Completed box being shipped out [1]
..\vbox(12.0+0.0)x345.0, glue set 12.0fil
...\glue 0.0 plus 1.0fil
...\hbox(0.0+0.0)x345.0
-....\special{pdfcolorstack 1 push (0 g 0 G)}
+....\special{color push Black}
....\hbox(0.0+0.0)x345.0
-....\special{pdfcolorstack 1 pop}
+....\special{color pop}
..\glue 25.0
..\glue(\lineskip) 0.0
..\vbox(550.0+0.0)x345.0, glue set 539.94232fil
@@ -31,12 +31,12 @@ Completed box being shipped out [1]
...\glue 0.0 plus 0.0001fil
..\glue(\baselineskip) 23.34
..\hbox(6.66+0.0)x345.0
-...\special{pdfcolorstack 1 push (0 g 0 G)}
+...\special{color push Black}
...\hbox(6.66+0.0)x345.0, glue set 170.0fil
....\glue 0.0 plus 1.0fil
....\TU/lmr/m/n/10 1
....\glue 0.0 plus 1.0fil
-...\special{pdfcolorstack 1 pop}
+...\special{color pop}
.\kern 0.0
Completed box being shipped out [2]
\vbox(633.0+0.0)x407.0
@@ -45,9 +45,9 @@ Completed box being shipped out [2]
..\vbox(12.0+0.0)x345.0, glue set 12.0fil
...\glue 0.0 plus 1.0fil
...\hbox(0.0+0.0)x345.0
-....\special{pdfcolorstack 1 push (0 g 0 G)}
+....\special{color push Black}
....\hbox(0.0+0.0)x345.0
-....\special{pdfcolorstack 1 pop}
+....\special{color pop}
..\glue 25.0
..\glue(\lineskip) 0.0
..\vbox(550.0+0.0)x345.0, glue set 539.94232fil
@@ -67,10 +67,10 @@ Completed box being shipped out [2]
...\glue 0.0 plus 0.0001fil
..\glue(\baselineskip) 23.34
..\hbox(6.66+0.0)x345.0
-...\special{pdfcolorstack 1 push (0 g 0 G)}
+...\special{color push Black}
...\hbox(6.66+0.0)x345.0, glue set 170.0fil
....\glue 0.0 plus 1.0fil
....\TU/lmr/m/n/10 2
....\glue 0.0 plus 1.0fil
-...\special{pdfcolorstack 1 pop}
+...\special{color pop}
(pagecolor-002.aux)
diff --git a/testfiles/pagecolor-003.xetex.tlg b/testfiles/pagecolor-003.xetex.tlg
index 0c2304a..1bf6f6c 100644
--- a/testfiles/pagecolor-003.xetex.tlg
+++ b/testfiles/pagecolor-003.xetex.tlg
@@ -9,15 +9,15 @@ Completed box being shipped out [1]
..\vbox(12.0+0.0)x345.0, glue set 12.0fil
...\glue 0.0 plus 1.0fil
...\hbox(0.0+0.0)x345.0
-....\special{pdfcolorstack 1 push (0 g 0 G)}
+....\special{color push Black}
....\hbox(0.0+0.0)x345.0
-....\special{pdfcolorstack 1 pop}
+....\special{color pop}
..\glue 25.0
..\glue(\lineskip) 0.0
..\vbox(550.0+0.0)x345.0, glue set 539.94232fil
...\write-{}
...\special{background rgb 1 0 0}
-...\special{pdfcolorstack 1 push (0 0 1 0 k 0 0 1 0 K)}
+...\special{color push cmyk 0 0 1 0}
...\glue(\topskip) 3.06
...\hbox(6.94+2.05998)x345.0, glue set 276.08fil
....\hbox(0.0+0.0)x15.0
@@ -33,12 +33,12 @@ Completed box being shipped out [1]
...\glue 0.0 plus 0.0001fil
..\glue(\baselineskip) 23.34
..\hbox(6.66+0.0)x345.0
-...\special{pdfcolorstack 1 push (0 g 0 G)}
+...\special{color push Black}
...\hbox(6.66+0.0)x345.0, glue set 170.0fil
....\glue 0.0 plus 1.0fil
....\TU/lmr/m/n/10 1
....\glue 0.0 plus 1.0fil
-...\special{pdfcolorstack 1 pop}
+...\special{color pop}
.\kern 0.0
Completed box being shipped out [2]
\vbox(633.0+0.0)x407.0
@@ -47,9 +47,9 @@ Completed box being shipped out [2]
..\vbox(12.0+0.0)x345.0, glue set 12.0fil
...\glue 0.0 plus 1.0fil
...\hbox(0.0+0.0)x345.0
-....\special{pdfcolorstack 1 push (0 g 0 G)}
+....\special{color push Black}
....\hbox(0.0+0.0)x345.0
-....\special{pdfcolorstack 1 pop}
+....\special{color pop}
..\glue 25.0
..\glue(\lineskip) 0.0
..\vbox(550.0+0.0)x345.0, glue set 539.94232fil
@@ -68,10 +68,10 @@ Completed box being shipped out [2]
...\glue 0.0 plus 0.0001fil
..\glue(\baselineskip) 23.34
..\hbox(6.66+0.0)x345.0
-...\special{pdfcolorstack 1 push (0 g 0 G)}
+...\special{color push Black}
...\hbox(6.66+0.0)x345.0, glue set 170.0fil
....\glue 0.0 plus 1.0fil
....\TU/lmr/m/n/10 2
....\glue 0.0 plus 1.0fil
-...\special{pdfcolorstack 1 pop}
+...\special{color pop}
(pagecolor-003.aux)
diff --git a/testfiles/xetex001.luatex.tlg b/testfiles/xetex001.luatex.tlg
index 29147e1..6a13519 100644
--- a/testfiles/xetex001.luatex.tlg
+++ b/testfiles/xetex001.luatex.tlg
@@ -93,7 +93,6 @@ File: clip-1-2.jpg Graphic file (type bmp)
Completed box being shipped out [1]
\vbox(633.0+0.0)x407.0, direction TLT
.\hbox(0.0+0.0)x0.0, direction TLT
-..\special{pdfcolorstackinit 1 page direct (0 g 0 G)}
.\glue 16.0
.\vbox(617.0+0.0)x345.0, shifted 62.0, direction TLT
..\vbox(12.0+0.0)x345.0, glue set 12.0fil, direction TLT
@@ -168,7 +167,6 @@ Completed box being shipped out [1]
..........\TU/lmr/m/n/10 p
.........\glue 0.0 plus 1.0fil minus 1.0fil
........\special{pdf:etrans}
-........\special{pdfcolorstack 1 current}
.......\kern122.25
.......\glue 0.0 plus 1.0fil minus 1.0fil
....\penalty 10000
@@ -232,7 +230,6 @@ Completed box being shipped out [1]
..........\TU/lmr/m/n/10 p
.........\glue 0.0 plus 1.0fil minus 1.0fil
........\special{pdf:etrans}
-........\special{pdfcolorstack 1 current}
.......\kern150.58
.......\glue 0.0 plus 1.0fil minus 1.0fil
....\penalty 10000
@@ -274,7 +271,6 @@ Completed box being shipped out [1]
..........\TU/lmr/m/n/10 p
.........\glue 0.0 plus 1.0fil minus 1.0fil
........\special{pdf:etrans}
-........\special{pdfcolorstack 1 current}
.......\kern63.65
.......\glue 0.0 plus 1.0fil minus 1.0fil
....\penalty 10000
@@ -315,7 +311,6 @@ Completed box being shipped out [1]
..........\TU/lmr/m/n/10 t
.........\glue 0.0 plus 1.0fil minus 1.0fil
........\special{pdf:etrans}
-........\special{pdfcolorstack 1 current}
.......\kern57.54
.......\glue 0.0 plus 1.0fil minus 1.0fil
....\penalty 10000
diff --git a/testfiles/xetex001.tlg b/testfiles/xetex001.tlg
index 88fd487..55b0cdc 100644
--- a/testfiles/xetex001.tlg
+++ b/testfiles/xetex001.tlg
@@ -98,7 +98,6 @@ File: clip-1-2.jpg Graphic file (type bmp)
Completed box being shipped out [1]
\vbox(633.0+0.0)x407.0
.\hbox(0.0+0.0)x0.0
-..\special{pdfcolorstackinit 1 page direct (0 g 0 G)}
.\glue 16.0
.\vbox(617.0+0.0)x345.0, shifted 62.0
..\vbox(12.0+0.0)x345.0, glue set 12.0fil
@@ -149,7 +148,6 @@ Completed box being shipped out [1]
..........\OT1/cmr/m/n/10 p
.........\glue 0.0 plus 1.0fil minus 1.0fil
........\special{pdf:etrans}
-........\special{pdfcolorstack 1 current}
.......\kern 122.52806
.......\glue 0.0 plus 1.0fil minus 1.0fil
....\penalty 10000
@@ -203,7 +201,6 @@ Completed box being shipped out [1]
..........\OT1/cmr/m/n/10 p
.........\glue 0.0 plus 1.0fil minus 1.0fil
........\special{pdf:etrans}
-........\special{pdfcolorstack 1 current}
.......\kern 150.86145
.......\glue 0.0 plus 1.0fil minus 1.0fil
....\penalty 10000
@@ -239,7 +236,6 @@ Completed box being shipped out [1]
..........\OT1/cmr/m/n/10 p
.........\glue 0.0 plus 1.0fil minus 1.0fil
........\special{pdf:etrans}
-........\special{pdfcolorstack 1 current}
.......\kern 63.91682
.......\glue 0.0 plus 1.0fil minus 1.0fil
....\penalty 10000
@@ -274,7 +270,6 @@ Completed box being shipped out [1]
..........\OT1/cmr/m/n/10 t
.........\glue 0.0 plus 1.0fil minus 1.0fil
........\special{pdf:etrans}
-........\special{pdfcolorstack 1 current}
.......\kern 57.80571
.......\glue 0.0 plus 1.0fil minus 1.0fil
....\penalty 10000
diff --git a/testfiles/xetex001.xetex.tlg b/testfiles/xetex001.xetex.tlg
index bd62e41..bb1ea42 100644
--- a/testfiles/xetex001.xetex.tlg
+++ b/testfiles/xetex001.xetex.tlg
@@ -36,7 +36,6 @@ Completed box being shipped out [1]
..........\XeTeXpdffile "./example-image-a.pdf"
.........\glue 0.0 plus 1.0fil minus 1.0fil
........\special{pdf:etrans}
-........\special{pdfcolorstack 1 current}
.......\kern 321.20001
.......\glue 0.0 plus 1.0fil minus 1.0fil
....\penalty 10000
@@ -58,7 +57,6 @@ Completed box being shipped out [1]
..........\XeTeXpdffile "./example-image-a.pdf"
.........\glue 0.0 plus 1.0fil minus 1.0fil
........\special{pdf:etrans}
-........\special{pdfcolorstack 1 current}
.......\kern 321.20001
.......\glue 0.0 plus 1.0fil minus 1.0fil
....\penalty 10000
@@ -80,7 +78,6 @@ Completed box being shipped out [1]
..........\XeTeXpdffile "./az2.pdf"
.........\glue 0.0 plus 1.0fil minus 1.0fil
........\special{pdf:etrans}
-........\special{pdfcolorstack 1 current}
.......\kern 30.1125
.......\glue 0.0 plus 1.0fil minus 1.0fil
....\penalty 10000
@@ -126,7 +123,6 @@ Completed box being shipped out [2]
..........\XeTeXpdffile "./az2.pdf"
.........\glue 0.0 plus 1.0fil minus 1.0fil
........\special{pdf:etrans}
-........\special{pdfcolorstack 1 current}
.......\kern 36.135
.......\glue 0.0 plus 1.0fil minus 1.0fil
....\penalty 10000
diff --git a/xetex.def b/xetex.def
index 0ddde80..7293379 100644
--- a/xetex.def
+++ b/xetex.def
@@ -17,7 +17,7 @@
%% https://github.com/latex3/graphics-def/issues
%%
\ProvidesFile{xetex.def}
- [2022/04/12 v5.0l Graphics/color driver for xetex]
+ [2022/04/16 v5.0m Graphics/color driver for xetex]
\def\GPT at space{ }
\def\c at lor@arg#1{%
\dimen@#1\p@
@@ -428,6 +428,7 @@
}
\fi
\fi
+\endinput
% Conversion functions so the internal representation stays unchanged
\let\init at current@color\current at color
\def\convert at color#1{%
More information about the latex3-commits
mailing list.