[latex3-commits] [l3svn] 02/02: Use dvips-like specials with (x)dvipdfmx
noreply at latex-project.org
noreply at latex-project.org
Wed Jun 14 16:45:18 CEST 2017
This is an automated email from the git hooks/post-receive script.
joseph pushed a commit to branch master
in repository l3svn.
commit 44dc51fc09dc03f9123129fdbbcb2e5fb9e1f4f5
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Wed Jun 14 15:44:07 2017 +0100
Use dvips-like specials with (x)dvipdfmx
As has come up with the LaTeX2e driver situation, this is likely to be
the best plan. Notably, it means there are only two forms of colour special
to support: dvips- and pdfTeX-like.
---
.../xcoffins/testfiles/xcoffins002.ptex.tlg | 4 +-
.../xcoffins/testfiles/xcoffins002.uptex.tlg | 4 +-
.../xcoffins/testfiles/xcoffins002.xetex.tlg | 4 +-
.../xcoffins/testfiles/xcoffins003.ptex.tlg | 16 +--
.../xcoffins/testfiles/xcoffins003.uptex.tlg | 16 +--
.../xcoffins/testfiles/xcoffins003.xetex.tlg | 16 +--
l3kernel/l3drivers.dtx | 112 +++++---------------
l3kernel/testfiles/d3dvipdfmx.tlg | 4 +-
l3kernel/testfiles/d3dvips.xetex.tlg | 4 +-
l3kernel/testfiles/d3dvisvgm.xetex.tlg | 4 +-
l3kernel/testfiles/d3pdfmode.xetex.tlg | 4 +-
l3kernel/testfiles/d3xdvipdfmx.xetex.tlg | 4 +-
l3kernel/testfiles/m3coffins001.ptex.tlg | 96 ++++++++---------
l3kernel/testfiles/m3coffins001.uptex.tlg | 96 ++++++++---------
l3kernel/testfiles/m3coffins001.xetex.tlg | 96 ++++++++---------
l3kernel/testfiles/m3expl001.ptex.tlg | 6 +-
l3kernel/testfiles/m3expl001.uptex.tlg | 6 +-
l3kernel/testfiles/m3expl001.xetex.tlg | 6 +-
l3kernel/testfiles/m3expl003.ptex.tlg | 6 +-
l3kernel/testfiles/m3expl003.uptex.tlg | 6 +-
l3kernel/testfiles/m3expl003.xetex.tlg | 6 +-
l3trial/xbox/testfiles/xbox001.ptex.tlg | 88 +++++++--------
l3trial/xbox/testfiles/xbox001.uptex.tlg | 88 +++++++--------
l3trial/xbox/testfiles/xbox001.xetex.tlg | 88 +++++++--------
l3trial/xbox/testfiles/xbox002.ptex.tlg | 56 +++++-----
l3trial/xbox/testfiles/xbox002.uptex.tlg | 56 +++++-----
l3trial/xbox/testfiles/xbox002.xetex.tlg | 56 +++++-----
27 files changed, 443 insertions(+), 505 deletions(-)
diff --git a/l3experimental/xcoffins/testfiles/xcoffins002.ptex.tlg b/l3experimental/xcoffins/testfiles/xcoffins002.ptex.tlg
index 30ebf1c..e50d8e3 100644
--- a/l3experimental/xcoffins/testfiles/xcoffins002.ptex.tlg
+++ b/l3experimental/xcoffins/testfiles/xcoffins002.ptex.tlg
@@ -28,9 +28,9 @@ TEST 2: 2: setting coffins
============================================================
> \box72=
\hbox(6.83331+0.0)x7.50002
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\OT1/cmr/m/n/10 A
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> ...izontalCoffin \aaa {A}\showbox \aaa
\ShowCoffinStructure \aaa ...
diff --git a/l3experimental/xcoffins/testfiles/xcoffins002.uptex.tlg b/l3experimental/xcoffins/testfiles/xcoffins002.uptex.tlg
index 30ebf1c..e50d8e3 100644
--- a/l3experimental/xcoffins/testfiles/xcoffins002.uptex.tlg
+++ b/l3experimental/xcoffins/testfiles/xcoffins002.uptex.tlg
@@ -28,9 +28,9 @@ TEST 2: 2: setting coffins
============================================================
> \box72=
\hbox(6.83331+0.0)x7.50002
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\OT1/cmr/m/n/10 A
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> ...izontalCoffin \aaa {A}\showbox \aaa
\ShowCoffinStructure \aaa ...
diff --git a/l3experimental/xcoffins/testfiles/xcoffins002.xetex.tlg b/l3experimental/xcoffins/testfiles/xcoffins002.xetex.tlg
index 30ebf1c..e50d8e3 100644
--- a/l3experimental/xcoffins/testfiles/xcoffins002.xetex.tlg
+++ b/l3experimental/xcoffins/testfiles/xcoffins002.xetex.tlg
@@ -28,9 +28,9 @@ TEST 2: 2: setting coffins
============================================================
> \box72=
\hbox(6.83331+0.0)x7.50002
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\OT1/cmr/m/n/10 A
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> ...izontalCoffin \aaa {A}\showbox \aaa
\ShowCoffinStructure \aaa ...
diff --git a/l3experimental/xcoffins/testfiles/xcoffins003.ptex.tlg b/l3experimental/xcoffins/testfiles/xcoffins003.ptex.tlg
index a2ac18d..89ea80c 100644
--- a/l3experimental/xcoffins/testfiles/xcoffins003.ptex.tlg
+++ b/l3experimental/xcoffins/testfiles/xcoffins003.ptex.tlg
@@ -724,20 +724,20 @@ TEST 2: Test 2: rotation+alignment
...\kern 0.0
...\kern -0.5
...\hbox(1.0+0.0)x1.0, shifted 0.5
-....\special{pdf:bcolor [0]}
+....\special{color push gray 0}
....\hbox(1.0+0.0)x1.0
.....\rule(1.0+0.0)x1.0
-....\special{pdf:ecolor}
+....\special{color pop}
..\kern 0.0
..\kern -20.11115
..\hbox(7.5+2.5)x18.11115, shifted 9.5
-...\special{pdf:bcolor [0]}
+...\special{color push gray 0}
...\OT1/cmss/m/n/10 (
...\OT1/cmss/m/n/10 b
...\OT1/cmss/m/n/10 ,
...\OT1/cmss/m/n/10 l
...\OT1/cmss/m/n/10 )
-...\special{pdf:ecolor}
+...\special{color pop}
.\kern 0.0
.\kern 30.0
.\hbox(0.0+0.0)x0.0
@@ -783,21 +783,21 @@ TEST 2: Test 2: rotation+alignment
...\kern 0.0
...\kern -0.5
...\hbox(1.0+0.0)x1.0, shifted 0.5
-....\special{pdf:bcolor [0]}
+....\special{color push gray 0}
....\hbox(1.0+0.0)x1.0
.....\rule(1.0+0.0)x1.0
-....\special{pdf:ecolor}
+....\special{color pop}
..\kern 0.0
..\kern -13.41669
..\hbox(7.5+2.5)x26.83339, shifted -0.5
-...\special{pdf:bcolor [0]}
+...\special{color push gray 0}
...\OT1/cmss/m/n/10 (
...\OT1/cmss/m/n/10 B
...\OT1/cmss/m/n/10 ,
...\OT1/cmss/m/n/10 h
...\OT1/cmss/m/n/10 c
...\OT1/cmss/m/n/10 )
-...\special{pdf:ecolor}
+...\special{color pop}
! OK.
<argument> ...]\bbb [B,hc](30pt,0pt)\showbox \aaa
x\fbox {\usebox \aaa }x
diff --git a/l3experimental/xcoffins/testfiles/xcoffins003.uptex.tlg b/l3experimental/xcoffins/testfiles/xcoffins003.uptex.tlg
index a2ac18d..89ea80c 100644
--- a/l3experimental/xcoffins/testfiles/xcoffins003.uptex.tlg
+++ b/l3experimental/xcoffins/testfiles/xcoffins003.uptex.tlg
@@ -724,20 +724,20 @@ TEST 2: Test 2: rotation+alignment
...\kern 0.0
...\kern -0.5
...\hbox(1.0+0.0)x1.0, shifted 0.5
-....\special{pdf:bcolor [0]}
+....\special{color push gray 0}
....\hbox(1.0+0.0)x1.0
.....\rule(1.0+0.0)x1.0
-....\special{pdf:ecolor}
+....\special{color pop}
..\kern 0.0
..\kern -20.11115
..\hbox(7.5+2.5)x18.11115, shifted 9.5
-...\special{pdf:bcolor [0]}
+...\special{color push gray 0}
...\OT1/cmss/m/n/10 (
...\OT1/cmss/m/n/10 b
...\OT1/cmss/m/n/10 ,
...\OT1/cmss/m/n/10 l
...\OT1/cmss/m/n/10 )
-...\special{pdf:ecolor}
+...\special{color pop}
.\kern 0.0
.\kern 30.0
.\hbox(0.0+0.0)x0.0
@@ -783,21 +783,21 @@ TEST 2: Test 2: rotation+alignment
...\kern 0.0
...\kern -0.5
...\hbox(1.0+0.0)x1.0, shifted 0.5
-....\special{pdf:bcolor [0]}
+....\special{color push gray 0}
....\hbox(1.0+0.0)x1.0
.....\rule(1.0+0.0)x1.0
-....\special{pdf:ecolor}
+....\special{color pop}
..\kern 0.0
..\kern -13.41669
..\hbox(7.5+2.5)x26.83339, shifted -0.5
-...\special{pdf:bcolor [0]}
+...\special{color push gray 0}
...\OT1/cmss/m/n/10 (
...\OT1/cmss/m/n/10 B
...\OT1/cmss/m/n/10 ,
...\OT1/cmss/m/n/10 h
...\OT1/cmss/m/n/10 c
...\OT1/cmss/m/n/10 )
-...\special{pdf:ecolor}
+...\special{color pop}
! OK.
<argument> ...]\bbb [B,hc](30pt,0pt)\showbox \aaa
x\fbox {\usebox \aaa }x
diff --git a/l3experimental/xcoffins/testfiles/xcoffins003.xetex.tlg b/l3experimental/xcoffins/testfiles/xcoffins003.xetex.tlg
index 99d8ab3..77446bf 100644
--- a/l3experimental/xcoffins/testfiles/xcoffins003.xetex.tlg
+++ b/l3experimental/xcoffins/testfiles/xcoffins003.xetex.tlg
@@ -716,20 +716,20 @@ TEST 2: Test 2: rotation+alignment
...\kern 0.0
...\kern -0.5
...\hbox(1.0+0.0)x1.0, shifted 0.5
-....\special{pdf:bcolor [0]}
+....\special{color push gray 0}
....\hbox(1.0+0.0)x1.0
.....\rule(1.0+0.0)x1.0
-....\special{pdf:ecolor}
+....\special{color pop}
..\kern 0.0
..\kern -20.11115
..\hbox(7.5+2.5)x18.11115, shifted 9.5
-...\special{pdf:bcolor [0]}
+...\special{color push gray 0}
...\OT1/cmss/m/n/10 (
...\OT1/cmss/m/n/10 b
...\OT1/cmss/m/n/10 ,
...\OT1/cmss/m/n/10 l
...\OT1/cmss/m/n/10 )
-...\special{pdf:ecolor}
+...\special{color pop}
.\kern 0.0
.\kern 30.0
.\hbox(0.0+0.0)x0.0
@@ -775,21 +775,21 @@ TEST 2: Test 2: rotation+alignment
...\kern 0.0
...\kern -0.5
...\hbox(1.0+0.0)x1.0, shifted 0.5
-....\special{pdf:bcolor [0]}
+....\special{color push gray 0}
....\hbox(1.0+0.0)x1.0
.....\rule(1.0+0.0)x1.0
-....\special{pdf:ecolor}
+....\special{color pop}
..\kern 0.0
..\kern -13.41669
..\hbox(7.5+2.5)x26.83339, shifted -0.5
-...\special{pdf:bcolor [0]}
+...\special{color push gray 0}
...\OT1/cmss/m/n/10 (
...\OT1/cmss/m/n/10 B
...\OT1/cmss/m/n/10 ,
...\OT1/cmss/m/n/10 h
...\OT1/cmss/m/n/10 c
...\OT1/cmss/m/n/10 )
-...\special{pdf:ecolor}
+...\special{color pop}
! OK.
<argument> ...]\bbb [B,hc](30pt,0pt)\showbox \aaa
x\fbox {\usebox \aaa }x
diff --git a/l3kernel/l3drivers.dtx b/l3kernel/l3drivers.dtx
index 36e6f26..b48b911 100644
--- a/l3kernel/l3drivers.dtx
+++ b/l3kernel/l3drivers.dtx
@@ -487,6 +487,18 @@
%</package>
% \end{macrocode}
%
+% The order of the driver code here is such that we get somewhat logical
+% outcomes in terms of code sharing whilst keeping things readable. (Trying to
+% mix all of the code by concept is almost unmanageable.) The key parts which
+% are shared are
+% \begin{itemize}
+% \item Color support is either \texttt{dvips}-like or \texttt{pdfmode}:
+% other drivers inherit from one of those two.
+% \item \texttt{pdfmode} and \texttt{(x)dvipdfmx} share drawing routines.
+% \item \texttt{xdvipdfmx} is largely the same as \texttt{dvipdfmx} so
+% takes most of the same code.
+% \end{itemize}
+%
% \subsection{\texttt{dvips} driver}
%
% \begin{macrocode}
@@ -617,6 +629,14 @@
%
% \subsubsection{Color}
%
+% The color support code for \texttt{dvips} is also used by other drivers
+% except \texttt{pdfmode}: rather than repeat everything it's therefore defined
+% here.
+% \begin{macrocode}
+%</dvips>
+%<*!pdfmode>
+% \end{macrocode}
+%
% \begin{variable}{\l_@@_color_current_tl}
% The current color in driver-dependent format.
% \begin{macrocode}
@@ -648,6 +668,11 @@
% \end{macro}
% \end{macro}
%
+% \begin{macrocode}
+%</!pdfmode>
+%<*dvips>
+% \end{macrocode}
+%
% \subsection{Images}
%
% \begin{macro}[int]{\@@_image_getbb_eps:n}
@@ -1516,39 +1541,6 @@
% \end{macrocode}
% \end{macro}
%
-% \subsubsection{Color}
-%
-% \begin{variable}{\l_@@_color_current_tl}
-% The current color in driver-dependent format.
-% \begin{macrocode}
-\tl_new:N \l_@@_color_current_tl
-\tl_set:Nn \l_@@_color_current_tl { [ 0 ] }
-%<*package>
-\AtBeginDocument
- {
- \@ifpackageloaded { color }
- { \tl_set:Nn \l_@@_color_current_tl { \current at color } }
- { }
- }
-%</package>
-% \end{macrocode}
-% \end{variable}
-%
-% \begin{macro}[int]{\@@_color_ensure_current:}
-% \begin{macro}[aux]{\@@_color_reset:}
-% Directly set the color using the specials with optimisation support.
-% \begin{macrocode}
-\cs_new_protected:Npn \@@_color_ensure_current:
- {
- \tex_special:D { pdf:bcolor~\l_@@_color_current_tl }
- \group_insert_after:N \@@_color_reset:
- }
-\cs_new_protected:Npn \@@_color_reset:
- { \tex_special:D { pdf:ecolor } }
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
% \subsection{Images}
%
% \begin{macro}[int]
@@ -1683,41 +1675,6 @@
%<*xdvipdfmx>
% \end{macrocode}
%
-% \subsubsection{Color}
-%
-% \begin{macro}[int]{\@@_color_ensure_current:}
-% \begin{macro}[aux]{\@@_color_reset:}
-% Older \LaTeXe{} drivers uses \texttt{dvips}-like specials so there has to
-% be a change of set up if \pkg{color} is loaded and if the current color
-% doesn't match the pattern expected for |dvipdfmx|.
-% \begin{macrocode}
-%<*package>
-\AtBeginDocument
- {
- \@ifpackageloaded { color }
- {
- \cs_set_protected:Npn \@@_tmp:w #1 [ #2 ] #3 \q_stop
- {
- \tl_if_empty:nT {#2}
- {
- \cs_set_protected:Npn \@@_color_ensure_current:
- {
- \tex_special:D { color~push~\l_@@_color_current_tl }
- \group_insert_after:N \@@_color_reset:
- }
- \cs_set_protected:Npn \@@_color_reset:
- { \tex_special:D { color~pop } }
- }
- }
- \exp_after:wN \@@_tmp:w \current at color [ ] \q_stop
- }
- { }
- }
-%</package>
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
% \subsection{Images}
%
% \begin{macro}[int]
@@ -2327,25 +2284,6 @@
% \end{macrocode}
% \end{macro}
%
-% \subsubsection{Color}
-%
-% \begin{variable}{\l_@@_color_current_tl}
-% The current color in driver-dependent format: the same as for
-% \texttt{dvips}.
-% \begin{macrocode}
-\tl_new:N \l_@@_color_current_tl
-\tl_set:Nn \l_@@_color_current_tl { gray~0 }
-%<*package>
-\AtBeginDocument
- {
- \@ifpackageloaded { color }
- { \tl_set:Nn \l_@@_color_current_tl { \current at color } }
- { }
- }
-%</package>
-% \end{macrocode}
-% \end{variable}
-%
% \begin{macro}[int]{\@@_color_ensure_current:}
% \begin{macro}[aux]{\@@_color_reset:}
% Directly set the color: same as \texttt{dvips}.
diff --git a/l3kernel/testfiles/d3dvipdfmx.tlg b/l3kernel/testfiles/d3dvipdfmx.tlg
index c481547..7860fcf 100644
--- a/l3kernel/testfiles/d3dvipdfmx.tlg
+++ b/l3kernel/testfiles/d3dvipdfmx.tlg
@@ -550,7 +550,7 @@ TEST 4: Color
============================================================
> \box72=
\hbox(6.94444+0.0)x50.02786
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\OT1/cmr/m/n/10 H
.\OT1/cmr/m/n/10 e
.\OT1/cmr/m/n/10 l
@@ -563,7 +563,7 @@ TEST 4: Color
.\OT1/cmr/m/n/10 r
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 d
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \l_tmpa_coffin
l. ... }
diff --git a/l3kernel/testfiles/d3dvips.xetex.tlg b/l3kernel/testfiles/d3dvips.xetex.tlg
index c481547..7860fcf 100644
--- a/l3kernel/testfiles/d3dvips.xetex.tlg
+++ b/l3kernel/testfiles/d3dvips.xetex.tlg
@@ -550,7 +550,7 @@ TEST 4: Color
============================================================
> \box72=
\hbox(6.94444+0.0)x50.02786
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\OT1/cmr/m/n/10 H
.\OT1/cmr/m/n/10 e
.\OT1/cmr/m/n/10 l
@@ -563,7 +563,7 @@ TEST 4: Color
.\OT1/cmr/m/n/10 r
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 d
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \l_tmpa_coffin
l. ... }
diff --git a/l3kernel/testfiles/d3dvisvgm.xetex.tlg b/l3kernel/testfiles/d3dvisvgm.xetex.tlg
index c481547..7860fcf 100644
--- a/l3kernel/testfiles/d3dvisvgm.xetex.tlg
+++ b/l3kernel/testfiles/d3dvisvgm.xetex.tlg
@@ -550,7 +550,7 @@ TEST 4: Color
============================================================
> \box72=
\hbox(6.94444+0.0)x50.02786
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\OT1/cmr/m/n/10 H
.\OT1/cmr/m/n/10 e
.\OT1/cmr/m/n/10 l
@@ -563,7 +563,7 @@ TEST 4: Color
.\OT1/cmr/m/n/10 r
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 d
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \l_tmpa_coffin
l. ... }
diff --git a/l3kernel/testfiles/d3pdfmode.xetex.tlg b/l3kernel/testfiles/d3pdfmode.xetex.tlg
index c481547..7860fcf 100644
--- a/l3kernel/testfiles/d3pdfmode.xetex.tlg
+++ b/l3kernel/testfiles/d3pdfmode.xetex.tlg
@@ -550,7 +550,7 @@ TEST 4: Color
============================================================
> \box72=
\hbox(6.94444+0.0)x50.02786
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\OT1/cmr/m/n/10 H
.\OT1/cmr/m/n/10 e
.\OT1/cmr/m/n/10 l
@@ -563,7 +563,7 @@ TEST 4: Color
.\OT1/cmr/m/n/10 r
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 d
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \l_tmpa_coffin
l. ... }
diff --git a/l3kernel/testfiles/d3xdvipdfmx.xetex.tlg b/l3kernel/testfiles/d3xdvipdfmx.xetex.tlg
index c481547..7860fcf 100644
--- a/l3kernel/testfiles/d3xdvipdfmx.xetex.tlg
+++ b/l3kernel/testfiles/d3xdvipdfmx.xetex.tlg
@@ -550,7 +550,7 @@ TEST 4: Color
============================================================
> \box72=
\hbox(6.94444+0.0)x50.02786
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\OT1/cmr/m/n/10 H
.\OT1/cmr/m/n/10 e
.\OT1/cmr/m/n/10 l
@@ -563,7 +563,7 @@ TEST 4: Color
.\OT1/cmr/m/n/10 r
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 d
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \l_tmpa_coffin
l. ... }
diff --git a/l3kernel/testfiles/m3coffins001.ptex.tlg b/l3kernel/testfiles/m3coffins001.ptex.tlg
index 42667ee..e5e3073 100644
--- a/l3kernel/testfiles/m3coffins001.ptex.tlg
+++ b/l3kernel/testfiles/m3coffins001.ptex.tlg
@@ -209,7 +209,7 @@ Defining \2 on line ...
......\kern 0.0
......\kern 0.0
......\hbox(10.34444+3.4)x45.1334, shifted -3.4
-.......\special{pdf:bcolor [0]}
+.......\special{color push gray 0}
.......\hbox(10.34444+3.4)x45.1334
........\hbox(13.74443+0.0)x45.1334, shifted 3.4
.........\vbox(13.74443+0.0)x45.1334
@@ -231,11 +231,11 @@ Defining \2 on line ...
............\glue 3.0
...........\rule(*+*)x0.4
..........\rule(0.4+0.0)x*
-.......\special{pdf:ecolor}
+.......\special{color pop}
.....\kern -45.1334
.....\kern -45.41116
.....\hbox(10.34444+3.4)x45.41116, shifted -3.4
-......\special{pdf:bcolor [0]}
+......\special{color push gray 0}
......\hbox(10.34444+3.4)x45.41116
.......\hbox(13.74443+0.0)x45.41116, shifted 3.4
........\vbox(13.74443+0.0)x45.41116
@@ -260,25 +260,25 @@ Defining \2 on line ...
...........\glue 3.0
..........\rule(*+*)x0.4
.........\rule(0.4+0.0)x*
-......\special{pdf:ecolor}
+......\special{color pop}
.....\kern 45.1334
....\kern -90.54457
....\kern -0.5
....\hbox(1.0+0.0)x1.0, shifted 0.5
-.....\special{pdf:bcolor [0]}
+.....\special{color push gray 0}
.....\hbox(1.0+0.0)x1.0
......\rule(1.0+0.0)x1.0
-.....\special{pdf:ecolor}
+.....\special{color pop}
...\kern -90.54457
...\kern -11.61815
...\hbox(3.75+1.25)x9.61815, shifted 5.75
-....\special{pdf:bcolor [0]}
+....\special{color push gray 0}
....\OT1/cmss/m/n/5 (
....\OT1/cmss/m/n/5 l
....\OT1/cmss/m/n/5 ,
....\OT1/cmss/m/n/5 b
....\OT1/cmss/m/n/5 )
-....\special{pdf:ecolor}
+....\special{color pop}
! OK.
<argument> \zzz
l. ...}
@@ -300,7 +300,7 @@ l. ...}
........\kern 0.0
........\kern 0.0
........\hbox(10.34444+3.4)x45.1334, shifted -3.4
-.........\special{pdf:bcolor [0]}
+.........\special{color push gray 0}
.........\hbox(10.34444+3.4)x45.1334
..........\hbox(13.74443+0.0)x45.1334, shifted 3.4
...........\vbox(13.74443+0.0)x45.1334
@@ -322,11 +322,11 @@ l. ...}
..............\glue 3.0
.............\rule(*+*)x0.4
............\rule(0.4+0.0)x*
-.........\special{pdf:ecolor}
+.........\special{color pop}
.......\kern -45.1334
.......\kern -45.41116
.......\hbox(10.34444+3.4)x45.41116, shifted -3.4
-........\special{pdf:bcolor [0]}
+........\special{color push gray 0}
........\hbox(10.34444+3.4)x45.41116
.........\hbox(13.74443+0.0)x45.41116, shifted 3.4
..........\vbox(13.74443+0.0)x45.41116
@@ -351,36 +351,36 @@ l. ...}
.............\glue 3.0
............\rule(*+*)x0.4
...........\rule(0.4+0.0)x*
-........\special{pdf:ecolor}
+........\special{color pop}
.......\kern 45.1334
......\kern -90.54457
......\kern -0.5
......\hbox(1.0+0.0)x1.0, shifted 0.5
-.......\special{pdf:bcolor [0]}
+.......\special{color push gray 0}
.......\hbox(1.0+0.0)x1.0
........\rule(1.0+0.0)x1.0
-.......\special{pdf:ecolor}
+.......\special{color pop}
.....\kern -90.54457
.....\kern -11.61815
.....\hbox(3.75+1.25)x9.61815, shifted 5.75
-......\special{pdf:bcolor [0]}
+......\special{color push gray 0}
......\OT1/cmss/m/n/5 (
......\OT1/cmss/m/n/5 l
......\OT1/cmss/m/n/5 ,
......\OT1/cmss/m/n/5 b
......\OT1/cmss/m/n/5 )
-......\special{pdf:ecolor}
+......\special{color pop}
....\kern -90.54457
....\kern 44.77228
....\hbox(1.0+0.0)x1.0, shifted -6.37222
-.....\special{pdf:bcolor [0]}
+.....\special{color push gray 0}
.....\hbox(1.0+0.0)x1.0
......\rule(1.0+0.0)x1.0
-.....\special{pdf:ecolor}
+.....\special{color pop}
...\kern -90.54457
...\kern 37.51178
...\hbox(3.75+1.25)x15.52101, shifted -5.62222
-....\special{pdf:bcolor [0]}
+....\special{color push gray 0}
....\OT1/cmss/m/n/5 (
....\OT1/cmss/m/n/5 h
....\OT1/cmss/m/n/5 c
@@ -388,7 +388,7 @@ l. ...}
....\OT1/cmss/m/n/5 v
....\OT1/cmss/m/n/5 c
....\OT1/cmss/m/n/5 )
-....\special{pdf:ecolor}
+....\special{color pop}
! OK.
<argument> \zzz
l. ...}
@@ -412,7 +412,7 @@ l. ...}
..........\kern 0.0
..........\kern 0.0
..........\hbox(10.34444+3.4)x45.1334, shifted -3.4
-...........\special{pdf:bcolor [0]}
+...........\special{color push gray 0}
...........\hbox(10.34444+3.4)x45.1334
............\hbox(13.74443+0.0)x45.1334, shifted 3.4
.............\vbox(13.74443+0.0)x45.1334
@@ -434,11 +434,11 @@ l. ...}
................\glue 3.0
...............\rule(*+*)x0.4
..............\rule(0.4+0.0)x*
-...........\special{pdf:ecolor}
+...........\special{color pop}
.........\kern -45.1334
.........\kern -45.41116
.........\hbox(10.34444+3.4)x45.41116, shifted -3.4
-..........\special{pdf:bcolor [0]}
+..........\special{color push gray 0}
..........\hbox(10.34444+3.4)x45.41116
...........\hbox(13.74443+0.0)x45.41116, shifted 3.4
............\vbox(13.74443+0.0)x45.41116
@@ -463,36 +463,36 @@ l. ...}
...............\glue 3.0
..............\rule(*+*)x0.4
.............\rule(0.4+0.0)x*
-..........\special{pdf:ecolor}
+..........\special{color pop}
.........\kern 45.1334
........\kern -90.54457
........\kern -0.5
........\hbox(1.0+0.0)x1.0, shifted 0.5
-.........\special{pdf:bcolor [0]}
+.........\special{color push gray 0}
.........\hbox(1.0+0.0)x1.0
..........\rule(1.0+0.0)x1.0
-.........\special{pdf:ecolor}
+.........\special{color pop}
.......\kern -90.54457
.......\kern -11.61815
.......\hbox(3.75+1.25)x9.61815, shifted 5.75
-........\special{pdf:bcolor [0]}
+........\special{color push gray 0}
........\OT1/cmss/m/n/5 (
........\OT1/cmss/m/n/5 l
........\OT1/cmss/m/n/5 ,
........\OT1/cmss/m/n/5 b
........\OT1/cmss/m/n/5 )
-........\special{pdf:ecolor}
+........\special{color pop}
......\kern -90.54457
......\kern 44.77228
......\hbox(1.0+0.0)x1.0, shifted -6.37222
-.......\special{pdf:bcolor [0]}
+.......\special{color push gray 0}
.......\hbox(1.0+0.0)x1.0
........\rule(1.0+0.0)x1.0
-.......\special{pdf:ecolor}
+.......\special{color pop}
.....\kern -90.54457
.....\kern 37.51178
.....\hbox(3.75+1.25)x15.52101, shifted -5.62222
-......\special{pdf:bcolor [0]}
+......\special{color push gray 0}
......\OT1/cmss/m/n/5 (
......\OT1/cmss/m/n/5 h
......\OT1/cmss/m/n/5 c
@@ -500,18 +500,18 @@ l. ...}
......\OT1/cmss/m/n/5 v
......\OT1/cmss/m/n/5 c
......\OT1/cmss/m/n/5 )
-......\special{pdf:ecolor}
+......\special{color pop}
....\kern -90.54457
....\kern 44.91116
....\hbox(1.0+0.0)x1.0, shifted 0.5
-.....\special{pdf:bcolor [0]}
+.....\special{color push gray 0}
.....\hbox(1.0+0.0)x1.0
......\rule(1.0+0.0)x1.0
-.....\special{pdf:ecolor}
+.....\special{color pop}
...\kern -90.54457
...\kern 46.41116
...\hbox(3.75+1.25)x23.78499, shifted 1.25
-....\special{pdf:bcolor [0]}
+....\special{color push gray 0}
....\OT1/cmss/m/n/5 (
....\OT1/cmss/m/n/5 \
....\OT1/cmss/m/n/5 1
@@ -523,7 +523,7 @@ l. ...}
....\OT1/cmss/m/n/5 -
....\OT1/cmss/m/n/5 b
....\OT1/cmss/m/n/5 )
-....\special{pdf:ecolor}
+....\special{color pop}
! OK.
<argument> \zzz
l. ...}
@@ -565,7 +565,7 @@ TEST 6: Rotation
.....\special{x:rotate 45}
.....\hbox(6.94444+0.0)x50.02786
......\hbox(6.94444+0.0)x50.02786
-.......\special{pdf:bcolor [0]}
+.......\special{color push gray 0}
.......\OT1/cmr/m/n/10 H
.......\OT1/cmr/m/n/10 e
.......\OT1/cmr/m/n/10 l
@@ -578,7 +578,7 @@ TEST 6: Rotation
.......\OT1/cmr/m/n/10 r
.......\OT1/cmr/m/n/10 l
.......\OT1/cmr/m/n/10 d
-.......\special{pdf:ecolor}
+.......\special{color pop}
.....\special{x:grestore}
! OK.
<argument> \aaa
@@ -621,7 +621,7 @@ l. ... }
...........\special{x:rotate 45}
...........\hbox(6.94444+0.0)x50.02786
............\hbox(6.94444+0.0)x50.02786
-.............\special{pdf:bcolor [0]}
+.............\special{color push gray 0}
.............\OT1/cmr/m/n/10 H
.............\OT1/cmr/m/n/10 e
.............\OT1/cmr/m/n/10 l
@@ -634,7 +634,7 @@ l. ... }
.............\OT1/cmr/m/n/10 r
.............\OT1/cmr/m/n/10 l
.............\OT1/cmr/m/n/10 d
-.............\special{pdf:ecolor}
+.............\special{color pop}
...........\special{x:grestore}
.....\special{x:grestore}
! OK.
@@ -688,7 +688,7 @@ l. ... }
.................\special{x:rotate 45}
.................\hbox(6.94444+0.0)x50.02786
..................\hbox(6.94444+0.0)x50.02786
-...................\special{pdf:bcolor [0]}
+...................\special{color push gray 0}
...................\OT1/cmr/m/n/10 H
...................\OT1/cmr/m/n/10 e
...................\OT1/cmr/m/n/10 l
@@ -701,7 +701,7 @@ l. ... }
...................\OT1/cmr/m/n/10 r
...................\OT1/cmr/m/n/10 l
...................\OT1/cmr/m/n/10 d
-...................\special{pdf:ecolor}
+...................\special{color pop}
.................\special{x:grestore}
...........\special{x:grestore}
.....\special{x:grestore}
@@ -737,7 +737,7 @@ TEST 7: Scaling
...\special{x:scale 1 1.1}
...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
....\hbox(6.94444+0.0)x50.02786
-.....\special{pdf:bcolor [0]}
+.....\special{color push gray 0}
.....\OT1/cmr/m/n/10 H
.....\OT1/cmr/m/n/10 e
.....\OT1/cmr/m/n/10 l
@@ -750,7 +750,7 @@ TEST 7: Scaling
.....\OT1/cmr/m/n/10 r
.....\OT1/cmr/m/n/10 l
.....\OT1/cmr/m/n/10 d
-.....\special{pdf:ecolor}
+.....\special{color pop}
....\glue 0.0 plus 1.0fil minus 1.0fil
...\special{x:grestore}
..\glue 0.0 plus 1.0fil minus 1.0fil
@@ -789,7 +789,7 @@ l. ... }
.......\special{x:scale 1 1.1}
.......\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
........\hbox(6.94444+0.0)x50.02786
-.........\special{pdf:bcolor [0]}
+.........\special{color push gray 0}
.........\OT1/cmr/m/n/10 H
.........\OT1/cmr/m/n/10 e
.........\OT1/cmr/m/n/10 l
@@ -802,7 +802,7 @@ l. ... }
.........\OT1/cmr/m/n/10 r
.........\OT1/cmr/m/n/10 l
.........\OT1/cmr/m/n/10 d
-.........\special{pdf:ecolor}
+.........\special{color pop}
........\glue 0.0 plus 1.0fil minus 1.0fil
.......\special{x:grestore}
......\glue 0.0 plus 1.0fil minus 1.0fil
@@ -841,7 +841,7 @@ TEST 8: Resizing
...\special{x:scale 0.56874 8.19439}
...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
....\hbox(6.94444+0.0)x50.02786
-.....\special{pdf:bcolor [0]}
+.....\special{color push gray 0}
.....\OT1/cmr/m/n/10 H
.....\OT1/cmr/m/n/10 e
.....\OT1/cmr/m/n/10 l
@@ -854,7 +854,7 @@ TEST 8: Resizing
.....\OT1/cmr/m/n/10 r
.....\OT1/cmr/m/n/10 l
.....\OT1/cmr/m/n/10 d
-.....\special{pdf:ecolor}
+.....\special{color pop}
....\glue 0.0 plus 1.0fil minus 1.0fil
...\special{x:grestore}
..\glue 0.0 plus 1.0fil minus 1.0fil
diff --git a/l3kernel/testfiles/m3coffins001.uptex.tlg b/l3kernel/testfiles/m3coffins001.uptex.tlg
index 2a8489a..6aa7479 100644
--- a/l3kernel/testfiles/m3coffins001.uptex.tlg
+++ b/l3kernel/testfiles/m3coffins001.uptex.tlg
@@ -213,7 +213,7 @@ LaTeX Font Info: Font shape `JY2/mc/m/n' will be
......\kern 0.0
......\kern 0.0
......\hbox(10.34444+3.4)x45.1334, shifted -3.4
-.......\special{pdf:bcolor [0]}
+.......\special{color push gray 0}
.......\hbox(10.34444+3.4)x45.1334
........\hbox(13.74443+0.0)x45.1334, shifted 3.4
.........\vbox(13.74443+0.0)x45.1334
@@ -235,11 +235,11 @@ LaTeX Font Info: Font shape `JY2/mc/m/n' will be
............\glue 3.0
...........\rule(*+*)x0.4
..........\rule(0.4+0.0)x*
-.......\special{pdf:ecolor}
+.......\special{color pop}
.....\kern -45.1334
.....\kern -45.41116
.....\hbox(10.34444+3.4)x45.41116, shifted -3.4
-......\special{pdf:bcolor [0]}
+......\special{color push gray 0}
......\hbox(10.34444+3.4)x45.41116
.......\hbox(13.74443+0.0)x45.41116, shifted 3.4
........\vbox(13.74443+0.0)x45.41116
@@ -264,25 +264,25 @@ LaTeX Font Info: Font shape `JY2/mc/m/n' will be
...........\glue 3.0
..........\rule(*+*)x0.4
.........\rule(0.4+0.0)x*
-......\special{pdf:ecolor}
+......\special{color pop}
.....\kern 45.1334
....\kern -90.54457
....\kern -0.5
....\hbox(1.0+0.0)x1.0, shifted 0.5
-.....\special{pdf:bcolor [0]}
+.....\special{color push gray 0}
.....\hbox(1.0+0.0)x1.0
......\rule(1.0+0.0)x1.0
-.....\special{pdf:ecolor}
+.....\special{color pop}
...\kern -90.54457
...\kern -11.61815
...\hbox(3.75+1.25)x9.61815, shifted 5.75
-....\special{pdf:bcolor [0]}
+....\special{color push gray 0}
....\OT1/cmss/m/n/5 (
....\OT1/cmss/m/n/5 l
....\OT1/cmss/m/n/5 ,
....\OT1/cmss/m/n/5 b
....\OT1/cmss/m/n/5 )
-....\special{pdf:ecolor}
+....\special{color pop}
! OK.
<argument> \zzz
l. ...}
@@ -304,7 +304,7 @@ l. ...}
........\kern 0.0
........\kern 0.0
........\hbox(10.34444+3.4)x45.1334, shifted -3.4
-.........\special{pdf:bcolor [0]}
+.........\special{color push gray 0}
.........\hbox(10.34444+3.4)x45.1334
..........\hbox(13.74443+0.0)x45.1334, shifted 3.4
...........\vbox(13.74443+0.0)x45.1334
@@ -326,11 +326,11 @@ l. ...}
..............\glue 3.0
.............\rule(*+*)x0.4
............\rule(0.4+0.0)x*
-.........\special{pdf:ecolor}
+.........\special{color pop}
.......\kern -45.1334
.......\kern -45.41116
.......\hbox(10.34444+3.4)x45.41116, shifted -3.4
-........\special{pdf:bcolor [0]}
+........\special{color push gray 0}
........\hbox(10.34444+3.4)x45.41116
.........\hbox(13.74443+0.0)x45.41116, shifted 3.4
..........\vbox(13.74443+0.0)x45.41116
@@ -355,36 +355,36 @@ l. ...}
.............\glue 3.0
............\rule(*+*)x0.4
...........\rule(0.4+0.0)x*
-........\special{pdf:ecolor}
+........\special{color pop}
.......\kern 45.1334
......\kern -90.54457
......\kern -0.5
......\hbox(1.0+0.0)x1.0, shifted 0.5
-.......\special{pdf:bcolor [0]}
+.......\special{color push gray 0}
.......\hbox(1.0+0.0)x1.0
........\rule(1.0+0.0)x1.0
-.......\special{pdf:ecolor}
+.......\special{color pop}
.....\kern -90.54457
.....\kern -11.61815
.....\hbox(3.75+1.25)x9.61815, shifted 5.75
-......\special{pdf:bcolor [0]}
+......\special{color push gray 0}
......\OT1/cmss/m/n/5 (
......\OT1/cmss/m/n/5 l
......\OT1/cmss/m/n/5 ,
......\OT1/cmss/m/n/5 b
......\OT1/cmss/m/n/5 )
-......\special{pdf:ecolor}
+......\special{color pop}
....\kern -90.54457
....\kern 44.77228
....\hbox(1.0+0.0)x1.0, shifted -6.37222
-.....\special{pdf:bcolor [0]}
+.....\special{color push gray 0}
.....\hbox(1.0+0.0)x1.0
......\rule(1.0+0.0)x1.0
-.....\special{pdf:ecolor}
+.....\special{color pop}
...\kern -90.54457
...\kern 37.51178
...\hbox(3.75+1.25)x15.52101, shifted -5.62222
-....\special{pdf:bcolor [0]}
+....\special{color push gray 0}
....\OT1/cmss/m/n/5 (
....\OT1/cmss/m/n/5 h
....\OT1/cmss/m/n/5 c
@@ -392,7 +392,7 @@ l. ...}
....\OT1/cmss/m/n/5 v
....\OT1/cmss/m/n/5 c
....\OT1/cmss/m/n/5 )
-....\special{pdf:ecolor}
+....\special{color pop}
! OK.
<argument> \zzz
l. ...}
@@ -416,7 +416,7 @@ l. ...}
..........\kern 0.0
..........\kern 0.0
..........\hbox(10.34444+3.4)x45.1334, shifted -3.4
-...........\special{pdf:bcolor [0]}
+...........\special{color push gray 0}
...........\hbox(10.34444+3.4)x45.1334
............\hbox(13.74443+0.0)x45.1334, shifted 3.4
.............\vbox(13.74443+0.0)x45.1334
@@ -438,11 +438,11 @@ l. ...}
................\glue 3.0
...............\rule(*+*)x0.4
..............\rule(0.4+0.0)x*
-...........\special{pdf:ecolor}
+...........\special{color pop}
.........\kern -45.1334
.........\kern -45.41116
.........\hbox(10.34444+3.4)x45.41116, shifted -3.4
-..........\special{pdf:bcolor [0]}
+..........\special{color push gray 0}
..........\hbox(10.34444+3.4)x45.41116
...........\hbox(13.74443+0.0)x45.41116, shifted 3.4
............\vbox(13.74443+0.0)x45.41116
@@ -467,36 +467,36 @@ l. ...}
...............\glue 3.0
..............\rule(*+*)x0.4
.............\rule(0.4+0.0)x*
-..........\special{pdf:ecolor}
+..........\special{color pop}
.........\kern 45.1334
........\kern -90.54457
........\kern -0.5
........\hbox(1.0+0.0)x1.0, shifted 0.5
-.........\special{pdf:bcolor [0]}
+.........\special{color push gray 0}
.........\hbox(1.0+0.0)x1.0
..........\rule(1.0+0.0)x1.0
-.........\special{pdf:ecolor}
+.........\special{color pop}
.......\kern -90.54457
.......\kern -11.61815
.......\hbox(3.75+1.25)x9.61815, shifted 5.75
-........\special{pdf:bcolor [0]}
+........\special{color push gray 0}
........\OT1/cmss/m/n/5 (
........\OT1/cmss/m/n/5 l
........\OT1/cmss/m/n/5 ,
........\OT1/cmss/m/n/5 b
........\OT1/cmss/m/n/5 )
-........\special{pdf:ecolor}
+........\special{color pop}
......\kern -90.54457
......\kern 44.77228
......\hbox(1.0+0.0)x1.0, shifted -6.37222
-.......\special{pdf:bcolor [0]}
+.......\special{color push gray 0}
.......\hbox(1.0+0.0)x1.0
........\rule(1.0+0.0)x1.0
-.......\special{pdf:ecolor}
+.......\special{color pop}
.....\kern -90.54457
.....\kern 37.51178
.....\hbox(3.75+1.25)x15.52101, shifted -5.62222
-......\special{pdf:bcolor [0]}
+......\special{color push gray 0}
......\OT1/cmss/m/n/5 (
......\OT1/cmss/m/n/5 h
......\OT1/cmss/m/n/5 c
@@ -504,18 +504,18 @@ l. ...}
......\OT1/cmss/m/n/5 v
......\OT1/cmss/m/n/5 c
......\OT1/cmss/m/n/5 )
-......\special{pdf:ecolor}
+......\special{color pop}
....\kern -90.54457
....\kern 44.91116
....\hbox(1.0+0.0)x1.0, shifted 0.5
-.....\special{pdf:bcolor [0]}
+.....\special{color push gray 0}
.....\hbox(1.0+0.0)x1.0
......\rule(1.0+0.0)x1.0
-.....\special{pdf:ecolor}
+.....\special{color pop}
...\kern -90.54457
...\kern 46.41116
...\hbox(3.75+1.25)x23.78499, shifted 1.25
-....\special{pdf:bcolor [0]}
+....\special{color push gray 0}
....\OT1/cmss/m/n/5 (
....\OT1/cmss/m/n/5 \
....\OT1/cmss/m/n/5 1
@@ -527,7 +527,7 @@ l. ...}
....\OT1/cmss/m/n/5 -
....\OT1/cmss/m/n/5 b
....\OT1/cmss/m/n/5 )
-....\special{pdf:ecolor}
+....\special{color pop}
! OK.
<argument> \zzz
l. ...}
@@ -569,7 +569,7 @@ TEST 6: Rotation
.....\special{x:rotate 45}
.....\hbox(6.94444+0.0)x50.02786
......\hbox(6.94444+0.0)x50.02786
-.......\special{pdf:bcolor [0]}
+.......\special{color push gray 0}
.......\OT1/cmr/m/n/10 H
.......\OT1/cmr/m/n/10 e
.......\OT1/cmr/m/n/10 l
@@ -582,7 +582,7 @@ TEST 6: Rotation
.......\OT1/cmr/m/n/10 r
.......\OT1/cmr/m/n/10 l
.......\OT1/cmr/m/n/10 d
-.......\special{pdf:ecolor}
+.......\special{color pop}
.....\special{x:grestore}
! OK.
<argument> \aaa
@@ -625,7 +625,7 @@ l. ... }
...........\special{x:rotate 45}
...........\hbox(6.94444+0.0)x50.02786
............\hbox(6.94444+0.0)x50.02786
-.............\special{pdf:bcolor [0]}
+.............\special{color push gray 0}
.............\OT1/cmr/m/n/10 H
.............\OT1/cmr/m/n/10 e
.............\OT1/cmr/m/n/10 l
@@ -638,7 +638,7 @@ l. ... }
.............\OT1/cmr/m/n/10 r
.............\OT1/cmr/m/n/10 l
.............\OT1/cmr/m/n/10 d
-.............\special{pdf:ecolor}
+.............\special{color pop}
...........\special{x:grestore}
.....\special{x:grestore}
! OK.
@@ -692,7 +692,7 @@ l. ... }
.................\special{x:rotate 45}
.................\hbox(6.94444+0.0)x50.02786
..................\hbox(6.94444+0.0)x50.02786
-...................\special{pdf:bcolor [0]}
+...................\special{color push gray 0}
...................\OT1/cmr/m/n/10 H
...................\OT1/cmr/m/n/10 e
...................\OT1/cmr/m/n/10 l
@@ -705,7 +705,7 @@ l. ... }
...................\OT1/cmr/m/n/10 r
...................\OT1/cmr/m/n/10 l
...................\OT1/cmr/m/n/10 d
-...................\special{pdf:ecolor}
+...................\special{color pop}
.................\special{x:grestore}
...........\special{x:grestore}
.....\special{x:grestore}
@@ -741,7 +741,7 @@ TEST 7: Scaling
...\special{x:scale 1 1.1}
...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
....\hbox(6.94444+0.0)x50.02786
-.....\special{pdf:bcolor [0]}
+.....\special{color push gray 0}
.....\OT1/cmr/m/n/10 H
.....\OT1/cmr/m/n/10 e
.....\OT1/cmr/m/n/10 l
@@ -754,7 +754,7 @@ TEST 7: Scaling
.....\OT1/cmr/m/n/10 r
.....\OT1/cmr/m/n/10 l
.....\OT1/cmr/m/n/10 d
-.....\special{pdf:ecolor}
+.....\special{color pop}
....\glue 0.0 plus 1.0fil minus 1.0fil
...\special{x:grestore}
..\glue 0.0 plus 1.0fil minus 1.0fil
@@ -793,7 +793,7 @@ l. ... }
.......\special{x:scale 1 1.1}
.......\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
........\hbox(6.94444+0.0)x50.02786
-.........\special{pdf:bcolor [0]}
+.........\special{color push gray 0}
.........\OT1/cmr/m/n/10 H
.........\OT1/cmr/m/n/10 e
.........\OT1/cmr/m/n/10 l
@@ -806,7 +806,7 @@ l. ... }
.........\OT1/cmr/m/n/10 r
.........\OT1/cmr/m/n/10 l
.........\OT1/cmr/m/n/10 d
-.........\special{pdf:ecolor}
+.........\special{color pop}
........\glue 0.0 plus 1.0fil minus 1.0fil
.......\special{x:grestore}
......\glue 0.0 plus 1.0fil minus 1.0fil
@@ -845,7 +845,7 @@ TEST 8: Resizing
...\special{x:scale 0.56874 8.19439}
...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
....\hbox(6.94444+0.0)x50.02786
-.....\special{pdf:bcolor [0]}
+.....\special{color push gray 0}
.....\OT1/cmr/m/n/10 H
.....\OT1/cmr/m/n/10 e
.....\OT1/cmr/m/n/10 l
@@ -858,7 +858,7 @@ TEST 8: Resizing
.....\OT1/cmr/m/n/10 r
.....\OT1/cmr/m/n/10 l
.....\OT1/cmr/m/n/10 d
-.....\special{pdf:ecolor}
+.....\special{color pop}
....\glue 0.0 plus 1.0fil minus 1.0fil
...\special{x:grestore}
..\glue 0.0 plus 1.0fil minus 1.0fil
diff --git a/l3kernel/testfiles/m3coffins001.xetex.tlg b/l3kernel/testfiles/m3coffins001.xetex.tlg
index 42667ee..e5e3073 100644
--- a/l3kernel/testfiles/m3coffins001.xetex.tlg
+++ b/l3kernel/testfiles/m3coffins001.xetex.tlg
@@ -209,7 +209,7 @@ Defining \2 on line ...
......\kern 0.0
......\kern 0.0
......\hbox(10.34444+3.4)x45.1334, shifted -3.4
-.......\special{pdf:bcolor [0]}
+.......\special{color push gray 0}
.......\hbox(10.34444+3.4)x45.1334
........\hbox(13.74443+0.0)x45.1334, shifted 3.4
.........\vbox(13.74443+0.0)x45.1334
@@ -231,11 +231,11 @@ Defining \2 on line ...
............\glue 3.0
...........\rule(*+*)x0.4
..........\rule(0.4+0.0)x*
-.......\special{pdf:ecolor}
+.......\special{color pop}
.....\kern -45.1334
.....\kern -45.41116
.....\hbox(10.34444+3.4)x45.41116, shifted -3.4
-......\special{pdf:bcolor [0]}
+......\special{color push gray 0}
......\hbox(10.34444+3.4)x45.41116
.......\hbox(13.74443+0.0)x45.41116, shifted 3.4
........\vbox(13.74443+0.0)x45.41116
@@ -260,25 +260,25 @@ Defining \2 on line ...
...........\glue 3.0
..........\rule(*+*)x0.4
.........\rule(0.4+0.0)x*
-......\special{pdf:ecolor}
+......\special{color pop}
.....\kern 45.1334
....\kern -90.54457
....\kern -0.5
....\hbox(1.0+0.0)x1.0, shifted 0.5
-.....\special{pdf:bcolor [0]}
+.....\special{color push gray 0}
.....\hbox(1.0+0.0)x1.0
......\rule(1.0+0.0)x1.0
-.....\special{pdf:ecolor}
+.....\special{color pop}
...\kern -90.54457
...\kern -11.61815
...\hbox(3.75+1.25)x9.61815, shifted 5.75
-....\special{pdf:bcolor [0]}
+....\special{color push gray 0}
....\OT1/cmss/m/n/5 (
....\OT1/cmss/m/n/5 l
....\OT1/cmss/m/n/5 ,
....\OT1/cmss/m/n/5 b
....\OT1/cmss/m/n/5 )
-....\special{pdf:ecolor}
+....\special{color pop}
! OK.
<argument> \zzz
l. ...}
@@ -300,7 +300,7 @@ l. ...}
........\kern 0.0
........\kern 0.0
........\hbox(10.34444+3.4)x45.1334, shifted -3.4
-.........\special{pdf:bcolor [0]}
+.........\special{color push gray 0}
.........\hbox(10.34444+3.4)x45.1334
..........\hbox(13.74443+0.0)x45.1334, shifted 3.4
...........\vbox(13.74443+0.0)x45.1334
@@ -322,11 +322,11 @@ l. ...}
..............\glue 3.0
.............\rule(*+*)x0.4
............\rule(0.4+0.0)x*
-.........\special{pdf:ecolor}
+.........\special{color pop}
.......\kern -45.1334
.......\kern -45.41116
.......\hbox(10.34444+3.4)x45.41116, shifted -3.4
-........\special{pdf:bcolor [0]}
+........\special{color push gray 0}
........\hbox(10.34444+3.4)x45.41116
.........\hbox(13.74443+0.0)x45.41116, shifted 3.4
..........\vbox(13.74443+0.0)x45.41116
@@ -351,36 +351,36 @@ l. ...}
.............\glue 3.0
............\rule(*+*)x0.4
...........\rule(0.4+0.0)x*
-........\special{pdf:ecolor}
+........\special{color pop}
.......\kern 45.1334
......\kern -90.54457
......\kern -0.5
......\hbox(1.0+0.0)x1.0, shifted 0.5
-.......\special{pdf:bcolor [0]}
+.......\special{color push gray 0}
.......\hbox(1.0+0.0)x1.0
........\rule(1.0+0.0)x1.0
-.......\special{pdf:ecolor}
+.......\special{color pop}
.....\kern -90.54457
.....\kern -11.61815
.....\hbox(3.75+1.25)x9.61815, shifted 5.75
-......\special{pdf:bcolor [0]}
+......\special{color push gray 0}
......\OT1/cmss/m/n/5 (
......\OT1/cmss/m/n/5 l
......\OT1/cmss/m/n/5 ,
......\OT1/cmss/m/n/5 b
......\OT1/cmss/m/n/5 )
-......\special{pdf:ecolor}
+......\special{color pop}
....\kern -90.54457
....\kern 44.77228
....\hbox(1.0+0.0)x1.0, shifted -6.37222
-.....\special{pdf:bcolor [0]}
+.....\special{color push gray 0}
.....\hbox(1.0+0.0)x1.0
......\rule(1.0+0.0)x1.0
-.....\special{pdf:ecolor}
+.....\special{color pop}
...\kern -90.54457
...\kern 37.51178
...\hbox(3.75+1.25)x15.52101, shifted -5.62222
-....\special{pdf:bcolor [0]}
+....\special{color push gray 0}
....\OT1/cmss/m/n/5 (
....\OT1/cmss/m/n/5 h
....\OT1/cmss/m/n/5 c
@@ -388,7 +388,7 @@ l. ...}
....\OT1/cmss/m/n/5 v
....\OT1/cmss/m/n/5 c
....\OT1/cmss/m/n/5 )
-....\special{pdf:ecolor}
+....\special{color pop}
! OK.
<argument> \zzz
l. ...}
@@ -412,7 +412,7 @@ l. ...}
..........\kern 0.0
..........\kern 0.0
..........\hbox(10.34444+3.4)x45.1334, shifted -3.4
-...........\special{pdf:bcolor [0]}
+...........\special{color push gray 0}
...........\hbox(10.34444+3.4)x45.1334
............\hbox(13.74443+0.0)x45.1334, shifted 3.4
.............\vbox(13.74443+0.0)x45.1334
@@ -434,11 +434,11 @@ l. ...}
................\glue 3.0
...............\rule(*+*)x0.4
..............\rule(0.4+0.0)x*
-...........\special{pdf:ecolor}
+...........\special{color pop}
.........\kern -45.1334
.........\kern -45.41116
.........\hbox(10.34444+3.4)x45.41116, shifted -3.4
-..........\special{pdf:bcolor [0]}
+..........\special{color push gray 0}
..........\hbox(10.34444+3.4)x45.41116
...........\hbox(13.74443+0.0)x45.41116, shifted 3.4
............\vbox(13.74443+0.0)x45.41116
@@ -463,36 +463,36 @@ l. ...}
...............\glue 3.0
..............\rule(*+*)x0.4
.............\rule(0.4+0.0)x*
-..........\special{pdf:ecolor}
+..........\special{color pop}
.........\kern 45.1334
........\kern -90.54457
........\kern -0.5
........\hbox(1.0+0.0)x1.0, shifted 0.5
-.........\special{pdf:bcolor [0]}
+.........\special{color push gray 0}
.........\hbox(1.0+0.0)x1.0
..........\rule(1.0+0.0)x1.0
-.........\special{pdf:ecolor}
+.........\special{color pop}
.......\kern -90.54457
.......\kern -11.61815
.......\hbox(3.75+1.25)x9.61815, shifted 5.75
-........\special{pdf:bcolor [0]}
+........\special{color push gray 0}
........\OT1/cmss/m/n/5 (
........\OT1/cmss/m/n/5 l
........\OT1/cmss/m/n/5 ,
........\OT1/cmss/m/n/5 b
........\OT1/cmss/m/n/5 )
-........\special{pdf:ecolor}
+........\special{color pop}
......\kern -90.54457
......\kern 44.77228
......\hbox(1.0+0.0)x1.0, shifted -6.37222
-.......\special{pdf:bcolor [0]}
+.......\special{color push gray 0}
.......\hbox(1.0+0.0)x1.0
........\rule(1.0+0.0)x1.0
-.......\special{pdf:ecolor}
+.......\special{color pop}
.....\kern -90.54457
.....\kern 37.51178
.....\hbox(3.75+1.25)x15.52101, shifted -5.62222
-......\special{pdf:bcolor [0]}
+......\special{color push gray 0}
......\OT1/cmss/m/n/5 (
......\OT1/cmss/m/n/5 h
......\OT1/cmss/m/n/5 c
@@ -500,18 +500,18 @@ l. ...}
......\OT1/cmss/m/n/5 v
......\OT1/cmss/m/n/5 c
......\OT1/cmss/m/n/5 )
-......\special{pdf:ecolor}
+......\special{color pop}
....\kern -90.54457
....\kern 44.91116
....\hbox(1.0+0.0)x1.0, shifted 0.5
-.....\special{pdf:bcolor [0]}
+.....\special{color push gray 0}
.....\hbox(1.0+0.0)x1.0
......\rule(1.0+0.0)x1.0
-.....\special{pdf:ecolor}
+.....\special{color pop}
...\kern -90.54457
...\kern 46.41116
...\hbox(3.75+1.25)x23.78499, shifted 1.25
-....\special{pdf:bcolor [0]}
+....\special{color push gray 0}
....\OT1/cmss/m/n/5 (
....\OT1/cmss/m/n/5 \
....\OT1/cmss/m/n/5 1
@@ -523,7 +523,7 @@ l. ...}
....\OT1/cmss/m/n/5 -
....\OT1/cmss/m/n/5 b
....\OT1/cmss/m/n/5 )
-....\special{pdf:ecolor}
+....\special{color pop}
! OK.
<argument> \zzz
l. ...}
@@ -565,7 +565,7 @@ TEST 6: Rotation
.....\special{x:rotate 45}
.....\hbox(6.94444+0.0)x50.02786
......\hbox(6.94444+0.0)x50.02786
-.......\special{pdf:bcolor [0]}
+.......\special{color push gray 0}
.......\OT1/cmr/m/n/10 H
.......\OT1/cmr/m/n/10 e
.......\OT1/cmr/m/n/10 l
@@ -578,7 +578,7 @@ TEST 6: Rotation
.......\OT1/cmr/m/n/10 r
.......\OT1/cmr/m/n/10 l
.......\OT1/cmr/m/n/10 d
-.......\special{pdf:ecolor}
+.......\special{color pop}
.....\special{x:grestore}
! OK.
<argument> \aaa
@@ -621,7 +621,7 @@ l. ... }
...........\special{x:rotate 45}
...........\hbox(6.94444+0.0)x50.02786
............\hbox(6.94444+0.0)x50.02786
-.............\special{pdf:bcolor [0]}
+.............\special{color push gray 0}
.............\OT1/cmr/m/n/10 H
.............\OT1/cmr/m/n/10 e
.............\OT1/cmr/m/n/10 l
@@ -634,7 +634,7 @@ l. ... }
.............\OT1/cmr/m/n/10 r
.............\OT1/cmr/m/n/10 l
.............\OT1/cmr/m/n/10 d
-.............\special{pdf:ecolor}
+.............\special{color pop}
...........\special{x:grestore}
.....\special{x:grestore}
! OK.
@@ -688,7 +688,7 @@ l. ... }
.................\special{x:rotate 45}
.................\hbox(6.94444+0.0)x50.02786
..................\hbox(6.94444+0.0)x50.02786
-...................\special{pdf:bcolor [0]}
+...................\special{color push gray 0}
...................\OT1/cmr/m/n/10 H
...................\OT1/cmr/m/n/10 e
...................\OT1/cmr/m/n/10 l
@@ -701,7 +701,7 @@ l. ... }
...................\OT1/cmr/m/n/10 r
...................\OT1/cmr/m/n/10 l
...................\OT1/cmr/m/n/10 d
-...................\special{pdf:ecolor}
+...................\special{color pop}
.................\special{x:grestore}
...........\special{x:grestore}
.....\special{x:grestore}
@@ -737,7 +737,7 @@ TEST 7: Scaling
...\special{x:scale 1 1.1}
...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
....\hbox(6.94444+0.0)x50.02786
-.....\special{pdf:bcolor [0]}
+.....\special{color push gray 0}
.....\OT1/cmr/m/n/10 H
.....\OT1/cmr/m/n/10 e
.....\OT1/cmr/m/n/10 l
@@ -750,7 +750,7 @@ TEST 7: Scaling
.....\OT1/cmr/m/n/10 r
.....\OT1/cmr/m/n/10 l
.....\OT1/cmr/m/n/10 d
-.....\special{pdf:ecolor}
+.....\special{color pop}
....\glue 0.0 plus 1.0fil minus 1.0fil
...\special{x:grestore}
..\glue 0.0 plus 1.0fil minus 1.0fil
@@ -789,7 +789,7 @@ l. ... }
.......\special{x:scale 1 1.1}
.......\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
........\hbox(6.94444+0.0)x50.02786
-.........\special{pdf:bcolor [0]}
+.........\special{color push gray 0}
.........\OT1/cmr/m/n/10 H
.........\OT1/cmr/m/n/10 e
.........\OT1/cmr/m/n/10 l
@@ -802,7 +802,7 @@ l. ... }
.........\OT1/cmr/m/n/10 r
.........\OT1/cmr/m/n/10 l
.........\OT1/cmr/m/n/10 d
-.........\special{pdf:ecolor}
+.........\special{color pop}
........\glue 0.0 plus 1.0fil minus 1.0fil
.......\special{x:grestore}
......\glue 0.0 plus 1.0fil minus 1.0fil
@@ -841,7 +841,7 @@ TEST 8: Resizing
...\special{x:scale 0.56874 8.19439}
...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
....\hbox(6.94444+0.0)x50.02786
-.....\special{pdf:bcolor [0]}
+.....\special{color push gray 0}
.....\OT1/cmr/m/n/10 H
.....\OT1/cmr/m/n/10 e
.....\OT1/cmr/m/n/10 l
@@ -854,7 +854,7 @@ TEST 8: Resizing
.....\OT1/cmr/m/n/10 r
.....\OT1/cmr/m/n/10 l
.....\OT1/cmr/m/n/10 d
-.....\special{pdf:ecolor}
+.....\special{color pop}
....\glue 0.0 plus 1.0fil minus 1.0fil
...\special{x:grestore}
..\glue 0.0 plus 1.0fil minus 1.0fil
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 47e2eb1..0bdb6ef 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -5642,15 +5642,15 @@ Defining key expl/log-functions/true on line ...
Defining key expl/log-functions/false on line ...
Defining \c__expl_def_ext_tl on line ...
(l3dvipdfmx.def
+Defining \l__driver_color_current_tl on line ...
+Defining \__driver_color_ensure_current: on line ...
+Defining \__driver_color_reset: on line ...
Defining \__driver_literal:n on line ...
Defining \__driver_scope_begin: on line ...
Defining \__driver_scope_end: on line ...
Defining \__driver_box_use_clip:N on line ...
Defining \__driver_box_use_rotate:Nn on line ...
Defining \__driver_box_use_scale:Nnn on line ...
-Defining \l__driver_color_current_tl on line ...
-Defining \__driver_color_ensure_current: on line ...
-Defining \__driver_color_reset: on line ...
Defining \__driver_image_getbb_eps:n on line ...
Defining \__driver_image_getbb_jpg:n on line ...
Defining \__driver_image_getbb_png:n on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index c06fe5b..ba6d092 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -5841,15 +5841,15 @@ Defining key expl/log-functions/true on line ...
Defining key expl/log-functions/false on line ...
Defining \c__expl_def_ext_tl on line ...
(l3dvipdfmx.def
+Defining \l__driver_color_current_tl on line ...
+Defining \__driver_color_ensure_current: on line ...
+Defining \__driver_color_reset: on line ...
Defining \__driver_literal:n on line ...
Defining \__driver_scope_begin: on line ...
Defining \__driver_scope_end: on line ...
Defining \__driver_box_use_clip:N on line ...
Defining \__driver_box_use_rotate:Nn on line ...
Defining \__driver_box_use_scale:Nnn on line ...
-Defining \l__driver_color_current_tl on line ...
-Defining \__driver_color_ensure_current: on line ...
-Defining \__driver_color_reset: on line ...
Defining \__driver_image_getbb_eps:n on line ...
Defining \__driver_image_getbb_jpg:n on line ...
Defining \__driver_image_getbb_png:n on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 1094d17..5d19c72 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -5625,15 +5625,15 @@ Defining key expl/log-functions/true on line ...
Defining key expl/log-functions/false on line ...
Defining \c__expl_def_ext_tl on line ...
(l3xdvipdfmx.def
+Defining \l__driver_color_current_tl on line ...
+Defining \__driver_color_ensure_current: on line ...
+Defining \__driver_color_reset: on line ...
Defining \__driver_literal:n on line ...
Defining \__driver_scope_begin: on line ...
Defining \__driver_scope_end: on line ...
Defining \__driver_box_use_clip:N on line ...
Defining \__driver_box_use_rotate:Nn on line ...
Defining \__driver_box_use_scale:Nnn on line ...
-Defining \l__driver_color_current_tl on line ...
-Defining \__driver_color_ensure_current: on line ...
-Defining \__driver_color_reset: on line ...
Defining \__driver_image_getbb_eps:n on line ...
Defining \g__driver_image_int on line ...
\g__driver_image_int=\count189
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 5616a0c..240a638 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -5643,15 +5643,15 @@ Defining key expl/log-functions/true on line ...
Defining key expl/log-functions/false on line ...
Defining \c__expl_def_ext_tl on line ...
(l3dvipdfmx.def
+Defining \l__driver_color_current_tl on line ...
+Defining \__driver_color_ensure_current: on line ...
+Defining \__driver_color_reset: on line ...
Defining \__driver_literal:n on line ...
Defining \__driver_scope_begin: on line ...
Defining \__driver_scope_end: on line ...
Defining \__driver_box_use_clip:N on line ...
Defining \__driver_box_use_rotate:Nn on line ...
Defining \__driver_box_use_scale:Nnn on line ...
-Defining \l__driver_color_current_tl on line ...
-Defining \__driver_color_ensure_current: on line ...
-Defining \__driver_color_reset: on line ...
Defining \__driver_image_getbb_eps:n on line ...
Defining \__driver_image_getbb_jpg:n on line ...
Defining \__driver_image_getbb_png:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 8a660ca..d8582e3 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -5842,15 +5842,15 @@ Defining key expl/log-functions/true on line ...
Defining key expl/log-functions/false on line ...
Defining \c__expl_def_ext_tl on line ...
(l3dvipdfmx.def
+Defining \l__driver_color_current_tl on line ...
+Defining \__driver_color_ensure_current: on line ...
+Defining \__driver_color_reset: on line ...
Defining \__driver_literal:n on line ...
Defining \__driver_scope_begin: on line ...
Defining \__driver_scope_end: on line ...
Defining \__driver_box_use_clip:N on line ...
Defining \__driver_box_use_rotate:Nn on line ...
Defining \__driver_box_use_scale:Nnn on line ...
-Defining \l__driver_color_current_tl on line ...
-Defining \__driver_color_ensure_current: on line ...
-Defining \__driver_color_reset: on line ...
Defining \__driver_image_getbb_eps:n on line ...
Defining \__driver_image_getbb_jpg:n on line ...
Defining \__driver_image_getbb_png:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 1b5d9c0..aa63090 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -5626,15 +5626,15 @@ Defining key expl/log-functions/true on line ...
Defining key expl/log-functions/false on line ...
Defining \c__expl_def_ext_tl on line ...
(l3xdvipdfmx.def
+Defining \l__driver_color_current_tl on line ...
+Defining \__driver_color_ensure_current: on line ...
+Defining \__driver_color_reset: on line ...
Defining \__driver_literal:n on line ...
Defining \__driver_scope_begin: on line ...
Defining \__driver_scope_end: on line ...
Defining \__driver_box_use_clip:N on line ...
Defining \__driver_box_use_rotate:Nn on line ...
Defining \__driver_box_use_scale:Nnn on line ...
-Defining \l__driver_color_current_tl on line ...
-Defining \__driver_color_ensure_current: on line ...
-Defining \__driver_color_reset: on line ...
Defining \__driver_image_getbb_eps:n on line ...
Defining \g__driver_image_int on line ...
\g__driver_image_int=\count189
diff --git a/l3trial/xbox/testfiles/xbox001.ptex.tlg b/l3trial/xbox/testfiles/xbox001.ptex.tlg
index f8c4be3..67006d5 100644
--- a/l3trial/xbox/testfiles/xbox001.ptex.tlg
+++ b/l3trial/xbox/testfiles/xbox001.ptex.tlg
@@ -51,7 +51,7 @@ TEST 2: \sbox
============================================================
> \box75=
\hbox(6.94444+0.0)x50.02786
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\OT1/cmr/m/n/10 H
.\OT1/cmr/m/n/10 e
.\OT1/cmr/m/n/10 l
@@ -64,7 +64,7 @@ TEST 2: \sbox
.\OT1/cmr/m/n/10 r
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 d
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
@@ -74,7 +74,7 @@ LaTeX Font Info: External font `cmex10' loaded for size
(Font) <5> on input line ....
> \box75=
\hbox(5.83333+1.94444)x49.63992
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\mathon
.\OML/cmm/m/it/10 y
.\kern0.35878
@@ -88,13 +88,13 @@ LaTeX Font Info: External font `cmex10' loaded for size
.\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
.\OML/cmm/m/it/10 c
.\mathoff
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box75=
\hbox(5.83333+1.94444)x49.63992
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\mathon
.\OML/cmm/m/it/10 y
.\kern0.35878
@@ -108,13 +108,13 @@ l. ... }
.\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
.\OML/cmm/m/it/10 c
.\mathoff
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box75=
\hbox(6.94444+1.94444)x62.58345
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\OT1/cmr/m/n/10 I
.\OT1/cmr/m/n/10 n
.\OT1/cmr/m/n/10 s
@@ -129,13 +129,13 @@ l. ... }
.\OT1/cmr/m/n/10 o
.\OT1/cmr/m/n/10 u
.\OT1/cmr/m/n/10 p
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box75=
\hbox(5.83333+1.94444)x49.63992
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\mathon
.\OML/cmm/m/it/10 y
.\kern0.35878
@@ -149,7 +149,7 @@ l. ... }
.\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
.\OML/cmm/m/it/10 c
.\mathoff
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
@@ -173,7 +173,7 @@ TEST 3: \savebox as \sbox
============================================================
> \box75=
\hbox(6.94444+0.0)x50.02786
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\OT1/cmr/m/n/10 H
.\OT1/cmr/m/n/10 e
.\OT1/cmr/m/n/10 l
@@ -186,13 +186,13 @@ TEST 3: \savebox as \sbox
.\OT1/cmr/m/n/10 r
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 d
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box75=
\hbox(5.83333+1.94444)x49.63992
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\mathon
.\OML/cmm/m/it/10 y
.\kern0.35878
@@ -206,13 +206,13 @@ l. ... }
.\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
.\OML/cmm/m/it/10 c
.\mathoff
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box75=
\hbox(5.83333+1.94444)x49.63992
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\mathon
.\OML/cmm/m/it/10 y
.\kern0.35878
@@ -226,13 +226,13 @@ l. ... }
.\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
.\OML/cmm/m/it/10 c
.\mathoff
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box75=
\hbox(6.94444+1.94444)x62.58345
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\OT1/cmr/m/n/10 I
.\OT1/cmr/m/n/10 n
.\OT1/cmr/m/n/10 s
@@ -247,13 +247,13 @@ l. ... }
.\OT1/cmr/m/n/10 o
.\OT1/cmr/m/n/10 u
.\OT1/cmr/m/n/10 p
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box75=
\hbox(5.83333+1.94444)x49.63992
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\mathon
.\OML/cmm/m/it/10 y
.\kern0.35878
@@ -267,7 +267,7 @@ l. ... }
.\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
.\OML/cmm/m/it/10 c
.\mathoff
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
@@ -291,7 +291,7 @@ TEST 4: \savebox to various widths
============================================================
> \box75=
\hbox(6.94444+0.0)x10.0
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x10.0, glue set - 20.01393fil
..\glue 0.0 plus 1.0fil minus 1.0fil
..\OT1/cmr/m/n/10 H
@@ -307,13 +307,13 @@ TEST 4: \savebox to various widths
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box75=
\hbox(6.94444+0.0)x20.0
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x20.0, glue set - 15.01393fil
..\glue 0.0 plus 1.0fil minus 1.0fil
..\OT1/cmr/m/n/10 H
@@ -329,13 +329,13 @@ l. ... }
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box75=
\hbox(6.94444+0.0)x100.05573
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x100.05573, glue set 25.01393fil
..\glue 0.0 plus 1.0fil minus 1.0fil
..\OT1/cmr/m/n/10 H
@@ -351,13 +351,13 @@ l. ... }
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box75=
\hbox(6.94444+0.0)x56.9723
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x56.9723, glue set 3.47223fil
..\glue 0.0 plus 1.0fil minus 1.0fil
..\OT1/cmr/m/n/10 H
@@ -373,7 +373,7 @@ l. ... }
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
@@ -383,7 +383,7 @@ TEST 5: \savebox to width with alignment
============================================================
> \box75=
\hbox(6.94444+0.0)x100.05573
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x100.05573, glue set 25.01393fil
..\glue 0.0 plus 1.0fil minus 1.0fil
..\OT1/cmr/m/n/10 H
@@ -399,13 +399,13 @@ TEST 5: \savebox to width with alignment
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box75=
\hbox(6.94444+0.0)x100.05573
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x100.05573, glue set 50.02786fil
..\OT1/cmr/m/n/10 H
..\OT1/cmr/m/n/10 e
@@ -420,13 +420,13 @@ l. ... }
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box75=
\hbox(6.94444+0.0)x100.05573
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x100.05573, glue set 50.02786fil
..\glue 0.0 plus 1.0fil minus 1.0fil
..\OT1/cmr/m/n/10 H
@@ -441,7 +441,7 @@ l. ... }
..\OT1/cmr/m/n/10 r
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
@@ -462,7 +462,7 @@ Underfull \hbox (badness 10000) detected at line 87
.\OT1/cmr/m/n/10 d
> \box75=
\hbox(6.94444+0.0)x100.05573
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x100.05573, glue set 30.0169
..\OT1/cmr/m/n/10 H
..\OT1/cmr/m/n/10 e
@@ -476,7 +476,7 @@ Underfull \hbox (badness 10000) detected at line 87
..\OT1/cmr/m/n/10 r
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
@@ -505,7 +505,7 @@ TEST 7: lrbox
============================================================
> \box75=
\hbox(6.83331+2.22223)x167.2214
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\OT1/cmr/m/n/10 S
.\OT1/cmr/m/n/10 o
.\OT1/cmr/m/n/10 m
@@ -543,7 +543,7 @@ TEST 7: lrbox
.\OT1/cmtt/m/n/10 t
.\OT1/cmtt/m/n/10 i
.\OT1/cmtt/m/n/10 m
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
@@ -553,7 +553,7 @@ TEST 8: \usebox
============================================================
> \box75=
\hbox(6.94444+0.0)x50.02786
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\OT1/cmr/m/n/10 H
.\OT1/cmr/m/n/10 e
.\OT1/cmr/m/n/10 l
@@ -566,15 +566,15 @@ TEST 8: \usebox
.\OT1/cmr/m/n/10 r
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 d
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box74=
\hbox(6.94444+0.0)x50.02786
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x50.02786
-..\special{pdf:bcolor [0]}
+..\special{color push gray 0}
..\OT1/cmr/m/n/10 H
..\OT1/cmr/m/n/10 e
..\OT1/cmr/m/n/10 l
@@ -587,8 +587,8 @@ l. ... }
..\OT1/cmr/m/n/10 r
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
-..\special{pdf:ecolor}
-.\special{pdf:ecolor}
+..\special{color pop}
+.\special{color pop}
! OK.
<argument> \myboxb
l. ... }
diff --git a/l3trial/xbox/testfiles/xbox001.uptex.tlg b/l3trial/xbox/testfiles/xbox001.uptex.tlg
index f8c4be3..67006d5 100644
--- a/l3trial/xbox/testfiles/xbox001.uptex.tlg
+++ b/l3trial/xbox/testfiles/xbox001.uptex.tlg
@@ -51,7 +51,7 @@ TEST 2: \sbox
============================================================
> \box75=
\hbox(6.94444+0.0)x50.02786
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\OT1/cmr/m/n/10 H
.\OT1/cmr/m/n/10 e
.\OT1/cmr/m/n/10 l
@@ -64,7 +64,7 @@ TEST 2: \sbox
.\OT1/cmr/m/n/10 r
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 d
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
@@ -74,7 +74,7 @@ LaTeX Font Info: External font `cmex10' loaded for size
(Font) <5> on input line ....
> \box75=
\hbox(5.83333+1.94444)x49.63992
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\mathon
.\OML/cmm/m/it/10 y
.\kern0.35878
@@ -88,13 +88,13 @@ LaTeX Font Info: External font `cmex10' loaded for size
.\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
.\OML/cmm/m/it/10 c
.\mathoff
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box75=
\hbox(5.83333+1.94444)x49.63992
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\mathon
.\OML/cmm/m/it/10 y
.\kern0.35878
@@ -108,13 +108,13 @@ l. ... }
.\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
.\OML/cmm/m/it/10 c
.\mathoff
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box75=
\hbox(6.94444+1.94444)x62.58345
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\OT1/cmr/m/n/10 I
.\OT1/cmr/m/n/10 n
.\OT1/cmr/m/n/10 s
@@ -129,13 +129,13 @@ l. ... }
.\OT1/cmr/m/n/10 o
.\OT1/cmr/m/n/10 u
.\OT1/cmr/m/n/10 p
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box75=
\hbox(5.83333+1.94444)x49.63992
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\mathon
.\OML/cmm/m/it/10 y
.\kern0.35878
@@ -149,7 +149,7 @@ l. ... }
.\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
.\OML/cmm/m/it/10 c
.\mathoff
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
@@ -173,7 +173,7 @@ TEST 3: \savebox as \sbox
============================================================
> \box75=
\hbox(6.94444+0.0)x50.02786
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\OT1/cmr/m/n/10 H
.\OT1/cmr/m/n/10 e
.\OT1/cmr/m/n/10 l
@@ -186,13 +186,13 @@ TEST 3: \savebox as \sbox
.\OT1/cmr/m/n/10 r
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 d
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box75=
\hbox(5.83333+1.94444)x49.63992
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\mathon
.\OML/cmm/m/it/10 y
.\kern0.35878
@@ -206,13 +206,13 @@ l. ... }
.\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
.\OML/cmm/m/it/10 c
.\mathoff
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box75=
\hbox(5.83333+1.94444)x49.63992
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\mathon
.\OML/cmm/m/it/10 y
.\kern0.35878
@@ -226,13 +226,13 @@ l. ... }
.\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
.\OML/cmm/m/it/10 c
.\mathoff
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box75=
\hbox(6.94444+1.94444)x62.58345
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\OT1/cmr/m/n/10 I
.\OT1/cmr/m/n/10 n
.\OT1/cmr/m/n/10 s
@@ -247,13 +247,13 @@ l. ... }
.\OT1/cmr/m/n/10 o
.\OT1/cmr/m/n/10 u
.\OT1/cmr/m/n/10 p
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box75=
\hbox(5.83333+1.94444)x49.63992
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\mathon
.\OML/cmm/m/it/10 y
.\kern0.35878
@@ -267,7 +267,7 @@ l. ... }
.\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
.\OML/cmm/m/it/10 c
.\mathoff
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
@@ -291,7 +291,7 @@ TEST 4: \savebox to various widths
============================================================
> \box75=
\hbox(6.94444+0.0)x10.0
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x10.0, glue set - 20.01393fil
..\glue 0.0 plus 1.0fil minus 1.0fil
..\OT1/cmr/m/n/10 H
@@ -307,13 +307,13 @@ TEST 4: \savebox to various widths
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box75=
\hbox(6.94444+0.0)x20.0
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x20.0, glue set - 15.01393fil
..\glue 0.0 plus 1.0fil minus 1.0fil
..\OT1/cmr/m/n/10 H
@@ -329,13 +329,13 @@ l. ... }
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box75=
\hbox(6.94444+0.0)x100.05573
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x100.05573, glue set 25.01393fil
..\glue 0.0 plus 1.0fil minus 1.0fil
..\OT1/cmr/m/n/10 H
@@ -351,13 +351,13 @@ l. ... }
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box75=
\hbox(6.94444+0.0)x56.9723
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x56.9723, glue set 3.47223fil
..\glue 0.0 plus 1.0fil minus 1.0fil
..\OT1/cmr/m/n/10 H
@@ -373,7 +373,7 @@ l. ... }
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
@@ -383,7 +383,7 @@ TEST 5: \savebox to width with alignment
============================================================
> \box75=
\hbox(6.94444+0.0)x100.05573
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x100.05573, glue set 25.01393fil
..\glue 0.0 plus 1.0fil minus 1.0fil
..\OT1/cmr/m/n/10 H
@@ -399,13 +399,13 @@ TEST 5: \savebox to width with alignment
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box75=
\hbox(6.94444+0.0)x100.05573
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x100.05573, glue set 50.02786fil
..\OT1/cmr/m/n/10 H
..\OT1/cmr/m/n/10 e
@@ -420,13 +420,13 @@ l. ... }
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box75=
\hbox(6.94444+0.0)x100.05573
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x100.05573, glue set 50.02786fil
..\glue 0.0 plus 1.0fil minus 1.0fil
..\OT1/cmr/m/n/10 H
@@ -441,7 +441,7 @@ l. ... }
..\OT1/cmr/m/n/10 r
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
@@ -462,7 +462,7 @@ Underfull \hbox (badness 10000) detected at line 87
.\OT1/cmr/m/n/10 d
> \box75=
\hbox(6.94444+0.0)x100.05573
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x100.05573, glue set 30.0169
..\OT1/cmr/m/n/10 H
..\OT1/cmr/m/n/10 e
@@ -476,7 +476,7 @@ Underfull \hbox (badness 10000) detected at line 87
..\OT1/cmr/m/n/10 r
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
@@ -505,7 +505,7 @@ TEST 7: lrbox
============================================================
> \box75=
\hbox(6.83331+2.22223)x167.2214
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\OT1/cmr/m/n/10 S
.\OT1/cmr/m/n/10 o
.\OT1/cmr/m/n/10 m
@@ -543,7 +543,7 @@ TEST 7: lrbox
.\OT1/cmtt/m/n/10 t
.\OT1/cmtt/m/n/10 i
.\OT1/cmtt/m/n/10 m
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
@@ -553,7 +553,7 @@ TEST 8: \usebox
============================================================
> \box75=
\hbox(6.94444+0.0)x50.02786
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\OT1/cmr/m/n/10 H
.\OT1/cmr/m/n/10 e
.\OT1/cmr/m/n/10 l
@@ -566,15 +566,15 @@ TEST 8: \usebox
.\OT1/cmr/m/n/10 r
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 d
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box74=
\hbox(6.94444+0.0)x50.02786
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x50.02786
-..\special{pdf:bcolor [0]}
+..\special{color push gray 0}
..\OT1/cmr/m/n/10 H
..\OT1/cmr/m/n/10 e
..\OT1/cmr/m/n/10 l
@@ -587,8 +587,8 @@ l. ... }
..\OT1/cmr/m/n/10 r
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
-..\special{pdf:ecolor}
-.\special{pdf:ecolor}
+..\special{color pop}
+.\special{color pop}
! OK.
<argument> \myboxb
l. ... }
diff --git a/l3trial/xbox/testfiles/xbox001.xetex.tlg b/l3trial/xbox/testfiles/xbox001.xetex.tlg
index b56f18f..448b34f 100644
--- a/l3trial/xbox/testfiles/xbox001.xetex.tlg
+++ b/l3trial/xbox/testfiles/xbox001.xetex.tlg
@@ -51,7 +51,7 @@ TEST 2: \sbox
============================================================
> \box75=
\hbox(6.94444+0.0)x50.02786
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\OT1/cmr/m/n/10 H
.\OT1/cmr/m/n/10 e
.\OT1/cmr/m/n/10 l
@@ -64,7 +64,7 @@ TEST 2: \sbox
.\OT1/cmr/m/n/10 r
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 d
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
@@ -74,7 +74,7 @@ LaTeX Font Info: External font `cmex10' loaded for size
(Font) <5> on input line ....
> \box75=
\hbox(5.83333+1.94444)x49.63992
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\mathon
.\OML/cmm/m/it/10 y
.\kern0.35878
@@ -88,13 +88,13 @@ LaTeX Font Info: External font `cmex10' loaded for size
.\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
.\OML/cmm/m/it/10 c
.\mathoff
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box75=
\hbox(5.83333+1.94444)x49.63992
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\mathon
.\OML/cmm/m/it/10 y
.\kern0.35878
@@ -108,13 +108,13 @@ l. ... }
.\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
.\OML/cmm/m/it/10 c
.\mathoff
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box75=
\hbox(6.94444+1.94444)x62.58345
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\OT1/cmr/m/n/10 I
.\OT1/cmr/m/n/10 n
.\OT1/cmr/m/n/10 s
@@ -129,13 +129,13 @@ l. ... }
.\OT1/cmr/m/n/10 o
.\OT1/cmr/m/n/10 u
.\OT1/cmr/m/n/10 p
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box75=
\hbox(5.83333+1.94444)x49.63992
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\mathon
.\OML/cmm/m/it/10 y
.\kern0.35878
@@ -149,7 +149,7 @@ l. ... }
.\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
.\OML/cmm/m/it/10 c
.\mathoff
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
@@ -173,7 +173,7 @@ TEST 3: \savebox as \sbox
============================================================
> \box75=
\hbox(6.94444+0.0)x50.02786
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\OT1/cmr/m/n/10 H
.\OT1/cmr/m/n/10 e
.\OT1/cmr/m/n/10 l
@@ -186,13 +186,13 @@ TEST 3: \savebox as \sbox
.\OT1/cmr/m/n/10 r
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 d
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box75=
\hbox(5.83333+1.94444)x49.63992
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\mathon
.\OML/cmm/m/it/10 y
.\kern0.35878
@@ -206,13 +206,13 @@ l. ... }
.\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
.\OML/cmm/m/it/10 c
.\mathoff
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box75=
\hbox(5.83333+1.94444)x49.63992
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\mathon
.\OML/cmm/m/it/10 y
.\kern0.35878
@@ -226,13 +226,13 @@ l. ... }
.\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
.\OML/cmm/m/it/10 c
.\mathoff
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box75=
\hbox(6.94444+1.94444)x62.58345
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\OT1/cmr/m/n/10 I
.\OT1/cmr/m/n/10 n
.\OT1/cmr/m/n/10 s
@@ -247,13 +247,13 @@ l. ... }
.\OT1/cmr/m/n/10 o
.\OT1/cmr/m/n/10 u
.\OT1/cmr/m/n/10 p
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box75=
\hbox(5.83333+1.94444)x49.63992
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\mathon
.\OML/cmm/m/it/10 y
.\kern0.35878
@@ -267,7 +267,7 @@ l. ... }
.\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
.\OML/cmm/m/it/10 c
.\mathoff
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
@@ -291,7 +291,7 @@ TEST 4: \savebox to various widths
============================================================
> \box75=
\hbox(6.94444+0.0)x10.0
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x10.0, glue set - 20.01393fil
..\glue 0.0 plus 1.0fil minus 1.0fil
..\OT1/cmr/m/n/10 H
@@ -307,13 +307,13 @@ TEST 4: \savebox to various widths
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box75=
\hbox(6.94444+0.0)x20.0
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x20.0, glue set - 15.01393fil
..\glue 0.0 plus 1.0fil minus 1.0fil
..\OT1/cmr/m/n/10 H
@@ -329,13 +329,13 @@ l. ... }
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box75=
\hbox(6.94444+0.0)x100.05573
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x100.05573, glue set 25.01393fil
..\glue 0.0 plus 1.0fil minus 1.0fil
..\OT1/cmr/m/n/10 H
@@ -351,13 +351,13 @@ l. ... }
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box75=
\hbox(6.94444+0.0)x56.9723
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x56.9723, glue set 3.47223fil
..\glue 0.0 plus 1.0fil minus 1.0fil
..\OT1/cmr/m/n/10 H
@@ -373,7 +373,7 @@ l. ... }
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
@@ -383,7 +383,7 @@ TEST 5: \savebox to width with alignment
============================================================
> \box75=
\hbox(6.94444+0.0)x100.05573
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x100.05573, glue set 25.01393fil
..\glue 0.0 plus 1.0fil minus 1.0fil
..\OT1/cmr/m/n/10 H
@@ -399,13 +399,13 @@ TEST 5: \savebox to width with alignment
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box75=
\hbox(6.94444+0.0)x100.05573
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x100.05573, glue set 50.02786fil
..\OT1/cmr/m/n/10 H
..\OT1/cmr/m/n/10 e
@@ -420,13 +420,13 @@ l. ... }
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box75=
\hbox(6.94444+0.0)x100.05573
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x100.05573, glue set 50.02786fil
..\glue 0.0 plus 1.0fil minus 1.0fil
..\OT1/cmr/m/n/10 H
@@ -441,7 +441,7 @@ l. ... }
..\OT1/cmr/m/n/10 r
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
@@ -462,7 +462,7 @@ Underfull \hbox (badness 10000) detected at line 87
.\OT1/cmr/m/n/10 d
> \box75=
\hbox(6.94444+0.0)x100.05573
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x100.05573, glue set 30.0169
..\OT1/cmr/m/n/10 H
..\OT1/cmr/m/n/10 e
@@ -476,7 +476,7 @@ Underfull \hbox (badness 10000) detected at line 87
..\OT1/cmr/m/n/10 r
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
@@ -505,7 +505,7 @@ TEST 7: lrbox
============================================================
> \box75=
\hbox(6.83331+2.22223)x167.2214
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\OT1/cmr/m/n/10 S
.\OT1/cmr/m/n/10 o
.\OT1/cmr/m/n/10 m
@@ -544,7 +544,7 @@ TEST 7: lrbox
.\OT1/cmtt/m/n/10 t
.\OT1/cmtt/m/n/10 i
.\OT1/cmtt/m/n/10 m
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
@@ -554,7 +554,7 @@ TEST 8: \usebox
============================================================
> \box75=
\hbox(6.94444+0.0)x50.02786
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\OT1/cmr/m/n/10 H
.\OT1/cmr/m/n/10 e
.\OT1/cmr/m/n/10 l
@@ -567,15 +567,15 @@ TEST 8: \usebox
.\OT1/cmr/m/n/10 r
.\OT1/cmr/m/n/10 l
.\OT1/cmr/m/n/10 d
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box74=
\hbox(6.94444+0.0)x50.02786
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x50.02786
-..\special{pdf:bcolor [0]}
+..\special{color push gray 0}
..\OT1/cmr/m/n/10 H
..\OT1/cmr/m/n/10 e
..\OT1/cmr/m/n/10 l
@@ -588,8 +588,8 @@ l. ... }
..\OT1/cmr/m/n/10 r
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
-..\special{pdf:ecolor}
-.\special{pdf:ecolor}
+..\special{color pop}
+.\special{color pop}
! OK.
<argument> \myboxb
l. ... }
diff --git a/l3trial/xbox/testfiles/xbox002.ptex.tlg b/l3trial/xbox/testfiles/xbox002.ptex.tlg
index 7811133..2eb2892 100644
--- a/l3trial/xbox/testfiles/xbox002.ptex.tlg
+++ b/l3trial/xbox/testfiles/xbox002.ptex.tlg
@@ -6,7 +6,7 @@ TEST 1: \mbox
============================================================
> \box73=
\hbox(6.94444+0.0)x50.02786
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x50.02786
..\OT1/cmr/m/n/10 H
..\OT1/cmr/m/n/10 e
@@ -20,7 +20,7 @@ TEST 1: \mbox
..\OT1/cmr/m/n/10 r
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
@@ -30,7 +30,7 @@ LaTeX Font Info: External font `cmex10' loaded for size
(Font) <5> on input line ....
> \box73=
\hbox(5.83333+1.94444)x49.63992
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(5.83333+1.94444)x49.63992
..\mathon
..\OML/cmm/m/it/10 y
@@ -45,13 +45,13 @@ LaTeX Font Info: External font `cmex10' loaded for size
..\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
..\OML/cmm/m/it/10 c
..\mathoff
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box73=
\hbox(5.83333+1.94444)x49.63992
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(5.83333+1.94444)x49.63992
..\mathon
..\OML/cmm/m/it/10 y
@@ -66,7 +66,7 @@ l. ... }
..\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
..\OML/cmm/m/it/10 c
..\mathoff
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
@@ -76,7 +76,7 @@ TEST 2: \makebox as \mbox
============================================================
> \box73=
\hbox(6.94444+0.0)x50.02786
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x50.02786
..\OT1/cmr/m/n/10 H
..\OT1/cmr/m/n/10 e
@@ -90,13 +90,13 @@ TEST 2: \makebox as \mbox
..\OT1/cmr/m/n/10 r
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box73=
\hbox(5.83333+1.94444)x49.63992
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(5.83333+1.94444)x49.63992
..\mathon
..\OML/cmm/m/it/10 y
@@ -111,13 +111,13 @@ l. ... }
..\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
..\OML/cmm/m/it/10 c
..\mathoff
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box73=
\hbox(5.83333+1.94444)x49.63992
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(5.83333+1.94444)x49.63992
..\mathon
..\OML/cmm/m/it/10 y
@@ -132,7 +132,7 @@ l. ... }
..\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
..\OML/cmm/m/it/10 c
..\mathoff
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
@@ -142,7 +142,7 @@ TEST 3: \makebox to various widths
============================================================
> \box73=
\hbox(6.94444+0.0)x10.0
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x10.0, glue set - 20.01393fil
..\glue 0.0 plus 1.0fil minus 1.0fil
..\OT1/cmr/m/n/10 H
@@ -158,13 +158,13 @@ TEST 3: \makebox to various widths
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box73=
\hbox(6.94444+0.0)x20.0
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x20.0, glue set - 15.01393fil
..\glue 0.0 plus 1.0fil minus 1.0fil
..\OT1/cmr/m/n/10 H
@@ -180,13 +180,13 @@ l. ... }
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box73=
\hbox(6.94444+0.0)x100.05573
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x100.05573, glue set 25.01393fil
..\glue 0.0 plus 1.0fil minus 1.0fil
..\OT1/cmr/m/n/10 H
@@ -202,13 +202,13 @@ l. ... }
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box73=
\hbox(6.94444+0.0)x56.9723
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x56.9723, glue set 3.47223fil
..\glue 0.0 plus 1.0fil minus 1.0fil
..\OT1/cmr/m/n/10 H
@@ -224,7 +224,7 @@ l. ... }
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
@@ -234,7 +234,7 @@ TEST 4: \makebox to width with alignment
============================================================
> \box73=
\hbox(6.94444+0.0)x100.05573
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x100.05573, glue set 25.01393fil
..\glue 0.0 plus 1.0fil minus 1.0fil
..\OT1/cmr/m/n/10 H
@@ -250,13 +250,13 @@ TEST 4: \makebox to width with alignment
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box73=
\hbox(6.94444+0.0)x100.05573
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x100.05573, glue set 50.02786fil
..\OT1/cmr/m/n/10 H
..\OT1/cmr/m/n/10 e
@@ -271,13 +271,13 @@ l. ... }
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box73=
\hbox(6.94444+0.0)x100.05573
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x100.05573, glue set 50.02786fil
..\glue 0.0 plus 1.0fil minus 1.0fil
..\OT1/cmr/m/n/10 H
@@ -292,7 +292,7 @@ l. ... }
..\OT1/cmr/m/n/10 r
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
@@ -313,7 +313,7 @@ Underfull \hbox (badness 10000) detected at line 66
.\OT1/cmr/m/n/10 d
> \box73=
\hbox(6.94444+0.0)x100.05573
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x100.05573, glue set 30.0169
..\OT1/cmr/m/n/10 H
..\OT1/cmr/m/n/10 e
@@ -327,7 +327,7 @@ Underfull \hbox (badness 10000) detected at line 66
..\OT1/cmr/m/n/10 r
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
diff --git a/l3trial/xbox/testfiles/xbox002.uptex.tlg b/l3trial/xbox/testfiles/xbox002.uptex.tlg
index 7811133..2eb2892 100644
--- a/l3trial/xbox/testfiles/xbox002.uptex.tlg
+++ b/l3trial/xbox/testfiles/xbox002.uptex.tlg
@@ -6,7 +6,7 @@ TEST 1: \mbox
============================================================
> \box73=
\hbox(6.94444+0.0)x50.02786
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x50.02786
..\OT1/cmr/m/n/10 H
..\OT1/cmr/m/n/10 e
@@ -20,7 +20,7 @@ TEST 1: \mbox
..\OT1/cmr/m/n/10 r
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
@@ -30,7 +30,7 @@ LaTeX Font Info: External font `cmex10' loaded for size
(Font) <5> on input line ....
> \box73=
\hbox(5.83333+1.94444)x49.63992
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(5.83333+1.94444)x49.63992
..\mathon
..\OML/cmm/m/it/10 y
@@ -45,13 +45,13 @@ LaTeX Font Info: External font `cmex10' loaded for size
..\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
..\OML/cmm/m/it/10 c
..\mathoff
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box73=
\hbox(5.83333+1.94444)x49.63992
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(5.83333+1.94444)x49.63992
..\mathon
..\OML/cmm/m/it/10 y
@@ -66,7 +66,7 @@ l. ... }
..\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
..\OML/cmm/m/it/10 c
..\mathoff
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
@@ -76,7 +76,7 @@ TEST 2: \makebox as \mbox
============================================================
> \box73=
\hbox(6.94444+0.0)x50.02786
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x50.02786
..\OT1/cmr/m/n/10 H
..\OT1/cmr/m/n/10 e
@@ -90,13 +90,13 @@ TEST 2: \makebox as \mbox
..\OT1/cmr/m/n/10 r
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box73=
\hbox(5.83333+1.94444)x49.63992
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(5.83333+1.94444)x49.63992
..\mathon
..\OML/cmm/m/it/10 y
@@ -111,13 +111,13 @@ l. ... }
..\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
..\OML/cmm/m/it/10 c
..\mathoff
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box73=
\hbox(5.83333+1.94444)x49.63992
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(5.83333+1.94444)x49.63992
..\mathon
..\OML/cmm/m/it/10 y
@@ -132,7 +132,7 @@ l. ... }
..\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
..\OML/cmm/m/it/10 c
..\mathoff
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
@@ -142,7 +142,7 @@ TEST 3: \makebox to various widths
============================================================
> \box73=
\hbox(6.94444+0.0)x10.0
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x10.0, glue set - 20.01393fil
..\glue 0.0 plus 1.0fil minus 1.0fil
..\OT1/cmr/m/n/10 H
@@ -158,13 +158,13 @@ TEST 3: \makebox to various widths
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box73=
\hbox(6.94444+0.0)x20.0
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x20.0, glue set - 15.01393fil
..\glue 0.0 plus 1.0fil minus 1.0fil
..\OT1/cmr/m/n/10 H
@@ -180,13 +180,13 @@ l. ... }
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box73=
\hbox(6.94444+0.0)x100.05573
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x100.05573, glue set 25.01393fil
..\glue 0.0 plus 1.0fil minus 1.0fil
..\OT1/cmr/m/n/10 H
@@ -202,13 +202,13 @@ l. ... }
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box73=
\hbox(6.94444+0.0)x56.9723
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x56.9723, glue set 3.47223fil
..\glue 0.0 plus 1.0fil minus 1.0fil
..\OT1/cmr/m/n/10 H
@@ -224,7 +224,7 @@ l. ... }
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
@@ -234,7 +234,7 @@ TEST 4: \makebox to width with alignment
============================================================
> \box73=
\hbox(6.94444+0.0)x100.05573
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x100.05573, glue set 25.01393fil
..\glue 0.0 plus 1.0fil minus 1.0fil
..\OT1/cmr/m/n/10 H
@@ -250,13 +250,13 @@ TEST 4: \makebox to width with alignment
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box73=
\hbox(6.94444+0.0)x100.05573
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x100.05573, glue set 50.02786fil
..\OT1/cmr/m/n/10 H
..\OT1/cmr/m/n/10 e
@@ -271,13 +271,13 @@ l. ... }
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box73=
\hbox(6.94444+0.0)x100.05573
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x100.05573, glue set 50.02786fil
..\glue 0.0 plus 1.0fil minus 1.0fil
..\OT1/cmr/m/n/10 H
@@ -292,7 +292,7 @@ l. ... }
..\OT1/cmr/m/n/10 r
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
@@ -313,7 +313,7 @@ Underfull \hbox (badness 10000) detected at line 66
.\OT1/cmr/m/n/10 d
> \box73=
\hbox(6.94444+0.0)x100.05573
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x100.05573, glue set 30.0169
..\OT1/cmr/m/n/10 H
..\OT1/cmr/m/n/10 e
@@ -327,7 +327,7 @@ Underfull \hbox (badness 10000) detected at line 66
..\OT1/cmr/m/n/10 r
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
diff --git a/l3trial/xbox/testfiles/xbox002.xetex.tlg b/l3trial/xbox/testfiles/xbox002.xetex.tlg
index 7811133..2eb2892 100644
--- a/l3trial/xbox/testfiles/xbox002.xetex.tlg
+++ b/l3trial/xbox/testfiles/xbox002.xetex.tlg
@@ -6,7 +6,7 @@ TEST 1: \mbox
============================================================
> \box73=
\hbox(6.94444+0.0)x50.02786
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x50.02786
..\OT1/cmr/m/n/10 H
..\OT1/cmr/m/n/10 e
@@ -20,7 +20,7 @@ TEST 1: \mbox
..\OT1/cmr/m/n/10 r
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
@@ -30,7 +30,7 @@ LaTeX Font Info: External font `cmex10' loaded for size
(Font) <5> on input line ....
> \box73=
\hbox(5.83333+1.94444)x49.63992
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(5.83333+1.94444)x49.63992
..\mathon
..\OML/cmm/m/it/10 y
@@ -45,13 +45,13 @@ LaTeX Font Info: External font `cmex10' loaded for size
..\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
..\OML/cmm/m/it/10 c
..\mathoff
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box73=
\hbox(5.83333+1.94444)x49.63992
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(5.83333+1.94444)x49.63992
..\mathon
..\OML/cmm/m/it/10 y
@@ -66,7 +66,7 @@ l. ... }
..\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
..\OML/cmm/m/it/10 c
..\mathoff
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
@@ -76,7 +76,7 @@ TEST 2: \makebox as \mbox
============================================================
> \box73=
\hbox(6.94444+0.0)x50.02786
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x50.02786
..\OT1/cmr/m/n/10 H
..\OT1/cmr/m/n/10 e
@@ -90,13 +90,13 @@ TEST 2: \makebox as \mbox
..\OT1/cmr/m/n/10 r
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box73=
\hbox(5.83333+1.94444)x49.63992
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(5.83333+1.94444)x49.63992
..\mathon
..\OML/cmm/m/it/10 y
@@ -111,13 +111,13 @@ l. ... }
..\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
..\OML/cmm/m/it/10 c
..\mathoff
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box73=
\hbox(5.83333+1.94444)x49.63992
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(5.83333+1.94444)x49.63992
..\mathon
..\OML/cmm/m/it/10 y
@@ -132,7 +132,7 @@ l. ... }
..\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
..\OML/cmm/m/it/10 c
..\mathoff
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
@@ -142,7 +142,7 @@ TEST 3: \makebox to various widths
============================================================
> \box73=
\hbox(6.94444+0.0)x10.0
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x10.0, glue set - 20.01393fil
..\glue 0.0 plus 1.0fil minus 1.0fil
..\OT1/cmr/m/n/10 H
@@ -158,13 +158,13 @@ TEST 3: \makebox to various widths
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box73=
\hbox(6.94444+0.0)x20.0
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x20.0, glue set - 15.01393fil
..\glue 0.0 plus 1.0fil minus 1.0fil
..\OT1/cmr/m/n/10 H
@@ -180,13 +180,13 @@ l. ... }
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box73=
\hbox(6.94444+0.0)x100.05573
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x100.05573, glue set 25.01393fil
..\glue 0.0 plus 1.0fil minus 1.0fil
..\OT1/cmr/m/n/10 H
@@ -202,13 +202,13 @@ l. ... }
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box73=
\hbox(6.94444+0.0)x56.9723
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x56.9723, glue set 3.47223fil
..\glue 0.0 plus 1.0fil minus 1.0fil
..\OT1/cmr/m/n/10 H
@@ -224,7 +224,7 @@ l. ... }
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
@@ -234,7 +234,7 @@ TEST 4: \makebox to width with alignment
============================================================
> \box73=
\hbox(6.94444+0.0)x100.05573
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x100.05573, glue set 25.01393fil
..\glue 0.0 plus 1.0fil minus 1.0fil
..\OT1/cmr/m/n/10 H
@@ -250,13 +250,13 @@ TEST 4: \makebox to width with alignment
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box73=
\hbox(6.94444+0.0)x100.05573
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x100.05573, glue set 50.02786fil
..\OT1/cmr/m/n/10 H
..\OT1/cmr/m/n/10 e
@@ -271,13 +271,13 @@ l. ... }
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
> \box73=
\hbox(6.94444+0.0)x100.05573
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x100.05573, glue set 50.02786fil
..\glue 0.0 plus 1.0fil minus 1.0fil
..\OT1/cmr/m/n/10 H
@@ -292,7 +292,7 @@ l. ... }
..\OT1/cmr/m/n/10 r
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
@@ -313,7 +313,7 @@ Underfull \hbox (badness 10000) detected at line 66
.\OT1/cmr/m/n/10 d
> \box73=
\hbox(6.94444+0.0)x100.05573
-.\special{pdf:bcolor [0]}
+.\special{color push gray 0}
.\hbox(6.94444+0.0)x100.05573, glue set 30.0169
..\OT1/cmr/m/n/10 H
..\OT1/cmr/m/n/10 e
@@ -327,7 +327,7 @@ Underfull \hbox (badness 10000) detected at line 66
..\OT1/cmr/m/n/10 r
..\OT1/cmr/m/n/10 l
..\OT1/cmr/m/n/10 d
-.\special{pdf:ecolor}
+.\special{color pop}
! OK.
<argument> \myboxa
l. ... }
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the latex3-commits
mailing list