[latex3-commits] [git/LaTeX3-latex3-latex2e] main: Update graphics-def to 2022-04-16 (add9377c)
Joseph Wright
joseph.wright at morningstar2.co.uk
Thu Apr 21 07:47:54 CEST 2022
Repository : https://github.com/latex3/latex2e
On branch : main
Link : https://github.com/latex3/latex2e/commit/add9377c1887ce00237f4983ee0d89a559bc72dd
>---------------------------------------------------------------
commit add9377c1887ce00237f4983ee0d89a559bc72dd
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Thu Apr 21 06:47:54 2022 +0100
Update graphics-def to 2022-04-16
>---------------------------------------------------------------
add9377c1887ce00237f4983ee0d89a559bc72dd
required/tools/testfiles/github-0072.xetex.tlg | 19 ++++++--------
required/tools/testfiles/github-0100.xetex.tlg | 35 ++++++++++++--------------
required/tools/testfiles/sx138783.xetex.tlg | 28 ++++++++++-----------
required/tools/testfiles/sx138783b.xetex.tlg | 32 +++++++++++------------
texmf/tex/latex/graphics-def/dvipdfmx.def | 3 ++-
texmf/tex/latex/graphics-def/xetex.def | 3 ++-
6 files changed, 58 insertions(+), 62 deletions(-)
diff --git a/required/tools/testfiles/github-0072.xetex.tlg b/required/tools/testfiles/github-0072.xetex.tlg
index 0ac2167f..74399454 100644
--- a/required/tools/testfiles/github-0072.xetex.tlg
+++ b/required/tools/testfiles/github-0072.xetex.tlg
@@ -6,16 +6,14 @@ LaTeX Font Info: External font `cmex10' loaded for size
(Font) <5> on input line ....
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
...\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 483.4595fil
@@ -38,14 +36,14 @@ Completed box being shipped out [1]
..........\glue(\leftskip) 0.0 plus 1.0fil
..........\hbox(0.0+0.0)x0.0
..........\rule(8.39996+*)x0.0
-..........\special{pdfcolorstack 1 push (1 0 0 rg 1 0 0 RG)}
+..........\special{color push rgb 1 0 0}
..........\OT1/cmr/m/n/10 A
..........\penalty 10000
..........\rule(0.0+3.60004)x0.0
..........\penalty 10000
..........\glue(\parfillskip) 0.0
..........\glue(\rightskip) 0.0 plus 1.0fil
-.........\special{pdfcolorstack 1 pop}
+.........\special{color pop}
........\glue 0.0 plus 1.0fil
........\glue 6.0
........\rule(*+*)x0.4
@@ -140,14 +138,14 @@ Completed box being shipped out [1]
..........\glue(\leftskip) 0.0 plus 1.0fil
..........\hbox(0.0+0.0)x0.0
..........\rule(8.39996+*)x0.0
-..........\special{pdfcolorstack 1 push (0 0 1 rg 0 0 1 RG)}
+..........\special{color push rgb 0 0 1}
..........\OT1/cmr/m/n/10 A
..........\penalty 10000
..........\rule(0.0+3.60004)x0.0
..........\penalty 10000
..........\glue(\parfillskip) 0.0
..........\glue(\rightskip) 0.0 plus 1.0fil
-.........\special{pdfcolorstack 1 pop}
+.........\special{color pop}
........\glue 6.0
........\rule(*+*)x0.4
.......\glue(\tabskip) 0.0
@@ -225,11 +223,10 @@ Completed box being shipped out [1]
...\glue 0.0 plus 0.0001fil
..\glue(\baselineskip) 23.55556
..\hbox(6.44444+0.0)x345.0
-...\special{pdfcolorstack 1 push (0 g 0 G)}
+...\special{color push Black}
...\hbox(6.44444+0.0)x345.0, glue set 170.0fil
....\glue 0.0 plus 1.0fil
....\OT1/cmr/m/n/10 1
....\glue 0.0 plus 1.0fil
-...\special{pdfcolorstack 1 pop}
-.\kern 0.0
+...\special{color pop}
(github-0072.aux)
diff --git a/required/tools/testfiles/github-0100.xetex.tlg b/required/tools/testfiles/github-0100.xetex.tlg
index 79cedb63..ad798015 100644
--- a/required/tools/testfiles/github-0100.xetex.tlg
+++ b/required/tools/testfiles/github-0100.xetex.tlg
@@ -6,16 +6,14 @@ LaTeX Font Info: External font `cmex10' loaded for size
(Font) <5> on input line ....
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
...\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 305.52309fil
@@ -99,7 +97,7 @@ Completed box being shipped out [1]
........\glue 6.0
........\glue 0.0 plus 1.0fil
........\vbox(8.39996+3.60004)x71.13188
-.........\special{pdfcolorstack 1 push (0 0 1 rg 0 0 1 RG)}
+.........\special{color push rgb 0 0 1}
.........\glue(\parskip) 0.0
.........\glue(\parskip) 0.0
.........\hbox(8.39996+3.60004)x71.13188, glue set 56.13185fil
@@ -113,7 +111,7 @@ Completed box being shipped out [1]
..........\penalty 10000
..........\glue(\parfillskip) 0.0 plus 1.0fil
..........\glue(\rightskip) 0.0
-.........\special{pdfcolorstack 1 pop}
+.........\special{color pop}
........\glue 6.0
.......\glue(\tabskip) 0.0
.......\hbox(8.39996+3.60004)x29.52785, glue set 0.98613fil
@@ -136,7 +134,7 @@ Completed box being shipped out [1]
........\glue 6.0
........\glue 0.0 plus 1.0fil
........\vbox(8.39996+3.60004)x71.13188
-.........\special{pdfcolorstack 1 push (0 0 1 rg 0 0 1 RG)}
+.........\special{color push rgb 0 0 1}
.........\glue(\parskip) 0.0
.........\glue(\parskip) 0.0
.........\hbox(8.39996+3.60004)x71.13188, glue set 48.88185fil
@@ -152,7 +150,7 @@ Completed box being shipped out [1]
..........\penalty 10000
..........\glue(\parfillskip) 0.0 plus 1.0fil
..........\glue(\rightskip) 0.0
-.........\special{pdfcolorstack 1 pop}
+.........\special{color pop}
........\glue 6.0
.......\glue(\tabskip) 0.0
.......\hbox(8.39996+3.60004)x29.52785
@@ -305,11 +303,11 @@ Completed box being shipped out [1]
.....\glue 6.0
.....\glue 0.0 plus 1.0fil
.....\glue 0.00002
-.....\special{pdfcolorstack 1 push (0 0 1 rg 0 0 1 RG)}
+.....\special{color push rgb 0 0 1}
.....\OT1/cmr/m/n/10 o
.....\OT1/cmr/m/n/10 n
.....\OT1/cmr/m/n/10 e
-.....\special{pdfcolorstack 1 pop}
+.....\special{color pop}
.....\glue 0.0 plus 1.0fil
.....\glue 6.0
....\glue(\tabskip) 0.0
@@ -333,13 +331,13 @@ Completed box being shipped out [1]
.....\glue 6.0
.....\glue 0.0 plus 1.0fil
.....\glue 0.00002
-.....\special{pdfcolorstack 1 push (0 0 1 rg 0 0 1 RG)}
+.....\special{color push rgb 0 0 1}
.....\OT1/cmr/m/n/10 t
.....\OT1/cmr/m/n/10 h
.....\OT1/cmr/m/n/10 r
.....\OT1/cmr/m/n/10 e
.....\OT1/cmr/m/n/10 e
-.....\special{pdfcolorstack 1 pop}
+.....\special{color pop}
.....\glue 0.0 plus 1.0fil
.....\glue 6.0
....\glue(\tabskip) 0.0
@@ -495,7 +493,7 @@ Completed box being shipped out [1]
......\hbox(8.39996+3.60004)x71.13188, glue set 56.13185fil
.......\hbox(0.0+0.0)x0.0
.......\rule(8.39996+*)x0.0
-.......\special{pdfcolorstack 1 push (0 0 1 rg 0 0 1 RG)}
+.......\special{color push rgb 0 0 1}
.......\OT1/cmr/m/n/10 o
.......\OT1/cmr/m/n/10 n
.......\OT1/cmr/m/n/10 e
@@ -504,7 +502,7 @@ Completed box being shipped out [1]
.......\penalty 10000
.......\glue(\parfillskip) 0.0 plus 1.0fil
.......\glue(\rightskip) 0.0
-......\special{pdfcolorstack 1 pop}
+......\special{color pop}
.....\glue 6.0
....\glue(\tabskip) 0.0
....\hbox(8.39996+3.60004)x29.52785, glue set 0.98613fil
@@ -530,7 +528,7 @@ Completed box being shipped out [1]
......\hbox(8.39996+3.60004)x71.13188, glue set 48.88185fil
.......\hbox(0.0+0.0)x0.0
.......\rule(8.39996+*)x0.0
-.......\special{pdfcolorstack 1 push (0 0 1 rg 0 0 1 RG)}
+.......\special{color push rgb 0 0 1}
.......\OT1/cmr/m/n/10 t
.......\OT1/cmr/m/n/10 h
.......\OT1/cmr/m/n/10 r
@@ -541,7 +539,7 @@ Completed box being shipped out [1]
.......\penalty 10000
.......\glue(\parfillskip) 0.0 plus 1.0fil
.......\glue(\rightskip) 0.0
-......\special{pdfcolorstack 1 pop}
+......\special{color pop}
.....\glue 6.0
....\glue(\tabskip) 0.0
....\hbox(8.39996+3.60004)x29.52785
@@ -645,11 +643,10 @@ Completed box being shipped out [1]
...\glue 0.0 plus 0.0001fil
..\glue(\baselineskip) 23.55556
..\hbox(6.44444+0.0)x345.0
-...\special{pdfcolorstack 1 push (0 g 0 G)}
+...\special{color push Black}
...\hbox(6.44444+0.0)x345.0, glue set 170.0fil
....\glue 0.0 plus 1.0fil
....\OT1/cmr/m/n/10 1
....\glue 0.0 plus 1.0fil
-...\special{pdfcolorstack 1 pop}
-.\kern 0.0
+...\special{color pop}
(github-0100.aux)
diff --git a/required/tools/testfiles/sx138783.xetex.tlg b/required/tools/testfiles/sx138783.xetex.tlg
index b65927be..1cabc2e0 100644
--- a/required/tools/testfiles/sx138783.xetex.tlg
+++ b/required/tools/testfiles/sx138783.xetex.tlg
@@ -7,9 +7,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 265.97159fil
@@ -440,14 +440,14 @@ Completed box being shipped out [1]
...\penalty 0
...\glue 12.0 plus 2.0 minus 2.0
...\vbox(94.0+0.0)x345.0
-....\special{pdfcolorstack 1 push (0 g 0 G)}
+....\special{color push Black}
....\vbox(94.0+0.0)x345.0
.....\hbox(82.0+1.94444)x345.0, glue set 5.0fil
......\vbox(82.0+0.0)x167.5
.......\glue 0.0 plus -2.0
-.......\special{pdfcolorstack 1 push (0 g 0 G)}
-.......\special{pdfcolorstack 1 push (1 0 0 rg 1 0 0 RG)}
-.......\special{pdfcolorstack 1 push (0 g 0 G)}
+.......\special{color push Black}
+.......\special{color push rgb 1 0 0}
+.......\special{color push Black}
.......\glue(\splittopskip) 3.05556 plus 2.0
.......\hbox(6.94444+1.94444)x167.5, glue set 2.41664
........\hbox(0.0+0.0)x0.0
@@ -714,9 +714,9 @@ Completed box being shipped out [1]
........\OT1/cmr/m/n/10 d
........\glue(\rightskip) 0.0
......\glue 0.0 plus 1.0fil minus 1.0fil
-......\special{pdfcolorstack 1 push (0 g 0 G)}
+......\special{color push Black}
......\rule(*+*)x0.0
-......\special{pdfcolorstack 1 pop}
+......\special{color pop}
......\glue 0.0 plus 1.0fil minus 1.0fil
......\vbox(82.0+0.0)x167.5, glue set 10.05556fil
.......\glue 0.0 plus -2.0
@@ -944,9 +944,9 @@ Completed box being shipped out [1]
........\penalty 10000
........\glue(\parfillskip) 0.0 plus 1.0fil
........\glue(\rightskip) 0.0
-.......\special{pdfcolorstack 1 pop}
-.......\special{pdfcolorstack 1 pop}
-.......\special{pdfcolorstack 1 pop}
+.......\special{color pop}
+.......\special{color pop}
+.......\special{color pop}
.......\glue 0.0 plus 1.0fil
......\hbox(4.30554+1.94444)x0.0, glue set - 5.55557fil
.......\hbox(4.30554+1.94444)x5.55557
@@ -954,7 +954,7 @@ Completed box being shipped out [1]
.....\kern -1.94444
.....\glue 12.0 plus 4.0 minus 3.0
.....\glue 0.0
-....\special{pdfcolorstack 1 pop}
+....\special{color pop}
...\penalty 0
...\glue 12.0 plus 2.0 minus 2.0
...\penalty 10000
@@ -1686,10 +1686,10 @@ Completed box being shipped out [1]
...\glue 0.0 plus 0.0001fil
..\glue(\baselineskip) 23.55556
..\hbox(6.44444+0.0)x345.0
-...\special{pdfcolorstack 1 push (0 g 0 G)}
+...\special{color push Black}
...\hbox(6.44444+0.0)x345.0, glue set 170.0fil
....\glue 0.0 plus 1.0fil
....\OT1/cmr/m/n/10 1
....\glue 0.0 plus 1.0fil
-...\special{pdfcolorstack 1 pop}
+...\special{color pop}
(sx138783.aux)
diff --git a/required/tools/testfiles/sx138783b.xetex.tlg b/required/tools/testfiles/sx138783b.xetex.tlg
index 01a5efca..b93a71a1 100644
--- a/required/tools/testfiles/sx138783b.xetex.tlg
+++ b/required/tools/testfiles/sx138783b.xetex.tlg
@@ -11,9 +11,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 500.94649fil
@@ -27,7 +27,7 @@ Completed box being shipped out [1]
.....\hbox(30.0+1.94444)x172.5, glue set 5.0fil
......\vbox(30.0+0.0)x81.25
.......\glue 0.0 plus -2.0
-.......\special{pdfcolorstack 1 push (0 g 0 G)}
+.......\special{color push Black}
.......\glue(\splittopskip) 5.62607 plus 2.0
.......\hbox(4.37393+0.0)x56.24997, glue set 50.97217fil, shifted 25.00003
........\hbox(4.37393+0.0)x0.0
@@ -35,12 +35,12 @@ Completed box being shipped out [1]
.........\glue -20.00003
.........\glue -5.0
.........\hbox(4.37393+0.0)x20.00003, glue set 20.00003fil
-..........\special{pdfcolorstack 1 push (0 g 0 G)}
+..........\special{color push Black}
..........\glue 0.0 plus 1.0fil minus 1.0fil
..........\hbox(4.37393+0.0)x0.0, glue set - 4.99878fil
...........\glue 0.0 plus 1.0fil minus 1.0fil
...........\TS1/cmr/m/n/10 ^^88
-..........\special{pdfcolorstack 1 pop}
+..........\special{color pop}
.........\glue 5.0
........\penalty 0
........\OT1/cmr/m/n/10 x
@@ -58,12 +58,12 @@ Completed box being shipped out [1]
.........\glue -20.00003
.........\glue -5.0
.........\hbox(4.37393+0.0)x20.00003, glue set 20.00003fil
-..........\special{pdfcolorstack 1 push (0 g 0 G)}
+..........\special{color push Black}
..........\glue 0.0 plus 1.0fil minus 1.0fil
..........\hbox(4.37393+0.0)x0.0, glue set - 4.99878fil
...........\glue 0.0 plus 1.0fil minus 1.0fil
...........\TS1/cmr/m/n/10 ^^88
-..........\special{pdfcolorstack 1 pop}
+..........\special{color pop}
.........\glue 5.0
........\penalty 0
........\OT1/cmr/m/n/10 l
@@ -75,9 +75,9 @@ Completed box being shipped out [1]
........\glue(\parfillskip) 0.0 plus 1.0fil
........\glue(\rightskip) 0.0
......\glue 0.0 plus 1.0fil minus 1.0fil
-......\special{pdfcolorstack 1 push (0 g 0 G)}
+......\special{color push Black}
......\rule(*+*)x0.0
-......\special{pdfcolorstack 1 pop}
+......\special{color pop}
......\glue 0.0 plus 1.0fil minus 1.0fil
......\vbox(30.0+1.94444)x81.25
.......\glue 0.0 plus -2.0
@@ -88,12 +88,12 @@ Completed box being shipped out [1]
.........\glue -20.00003
.........\glue -5.0
.........\hbox(4.37393+0.0)x20.00003, glue set 20.00003fil
-..........\special{pdfcolorstack 1 push (0 g 0 G)}
+..........\special{color push Black}
..........\glue 0.0 plus 1.0fil minus 1.0fil
..........\hbox(4.37393+0.0)x0.0, glue set - 4.99878fil
...........\glue 0.0 plus 1.0fil minus 1.0fil
...........\TS1/cmr/m/n/10 ^^88
-..........\special{pdfcolorstack 1 pop}
+..........\special{color pop}
.........\glue 5.0
........\penalty 0
........\OT1/cmr/m/n/10 x
@@ -111,12 +111,12 @@ Completed box being shipped out [1]
.........\glue -20.00003
.........\glue -5.0
.........\hbox(4.37393+0.0)x20.00003, glue set 20.00003fil
-..........\special{pdfcolorstack 1 push (0 g 0 G)}
+..........\special{color push Black}
..........\glue 0.0 plus 1.0fil minus 1.0fil
..........\hbox(4.37393+0.0)x0.0, glue set - 4.99878fil
...........\glue 0.0 plus 1.0fil minus 1.0fil
...........\TS1/cmr/m/n/10 ^^88
-..........\special{pdfcolorstack 1 pop}
+..........\special{color pop}
.........\glue 5.0
........\penalty 0
........\OT1/cmr/m/n/10 r
@@ -129,7 +129,7 @@ Completed box being shipped out [1]
........\penalty 10000
........\glue(\parfillskip) 0.0 plus 1.0fil
........\glue(\rightskip) 0.0
-.......\special{pdfcolorstack 1 pop}
+.......\special{color pop}
......\hbox(4.30554+1.94444)x0.0, glue set - 5.55557fil
.......\hbox(4.30554+1.94444)x5.55557
.......\glue 0.0 plus 1.0fil minus 1.0fil
@@ -145,10 +145,10 @@ Completed box being shipped out [1]
...\glue 0.0 plus 0.0001fil
..\glue(\baselineskip) 23.55556
..\hbox(6.44444+0.0)x345.0
-...\special{pdfcolorstack 1 push (0 g 0 G)}
+...\special{color push Black}
...\hbox(6.44444+0.0)x345.0, glue set 170.0fil
....\glue 0.0 plus 1.0fil
....\OT1/cmr/m/n/10 1
....\glue 0.0 plus 1.0fil
-...\special{pdfcolorstack 1 pop}
+...\special{color pop}
(sx138783b.aux)
diff --git a/texmf/tex/latex/graphics-def/dvipdfmx.def b/texmf/tex/latex/graphics-def/dvipdfmx.def
index f8a984cb..1d82661b 100644
--- a/texmf/tex/latex/graphics-def/dvipdfmx.def
+++ b/texmf/tex/latex/graphics-def/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/texmf/tex/latex/graphics-def/xetex.def b/texmf/tex/latex/graphics-def/xetex.def
index 0ddde80f..72933793 100644
--- a/texmf/tex/latex/graphics-def/xetex.def
+++ b/texmf/tex/latex/graphics-def/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.