[latex3-commits] [l3svn] branch master updated: Various box tests updated

noreply at latex-project.org noreply at latex-project.org
Fri May 13 23:18:10 CEST 2016 

This is an automated email from the git hooks/post-receive script.

joseph pushed a commit to branch master
in repository l3svn.

The following commit(s) were added to refs/heads/master by this push:
       new  52e932a   Various box tests updated
52e932a is described below

commit 52e932a88e954c073b1c088a3403e43f556d7ba5
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Fri May 13 21:18:46 2016 +0100

    Various box tests updated
---
 .../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/testfiles/m3expl003.luatex.tlg            |   14 ++--
 l3kernel/testfiles/m3expl003.ptex.tlg              |   14 ++--
 l3kernel/testfiles/m3expl003.tlg                   |   14 ++--
 l3kernel/testfiles/m3expl003.uptex.tlg             |   14 ++--
 l3kernel/testfiles/m3expl003.xetex.tlg             |   14 ++--
 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 ++++++-------
 17 files changed, 281 insertions(+), 281 deletions(-)

diff --git a/l3experimental/xcoffins/testfiles/xcoffins002.ptex.tlg b/l3experimental/xcoffins/testfiles/xcoffins002.ptex.tlg
index 3f019aa..899700e 100644
--- a/l3experimental/xcoffins/testfiles/xcoffins002.ptex.tlg
+++ b/l3experimental/xcoffins/testfiles/xcoffins002.ptex.tlg
@@ -28,9 +28,9 @@ TEST 2: 2: setting coffins
 ============================================================
 > \box71=
 \hbox(6.83331+0.0)x7.50002
-.\special{color push gray 0}
+.\special{pdf:bcolor [0]}
 .\OT1/cmr/m/n/10 A
-.\special{color pop}
+.\special{pdf:ecolor}
 ! 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 3f019aa..899700e 100644
--- a/l3experimental/xcoffins/testfiles/xcoffins002.uptex.tlg
+++ b/l3experimental/xcoffins/testfiles/xcoffins002.uptex.tlg
@@ -28,9 +28,9 @@ TEST 2: 2: setting coffins
 ============================================================
 > \box71=
 \hbox(6.83331+0.0)x7.50002
-.\special{color push gray 0}
+.\special{pdf:bcolor [0]}
 .\OT1/cmr/m/n/10 A
-.\special{color pop}
+.\special{pdf:ecolor}
 ! 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 3f019aa..899700e 100644
--- a/l3experimental/xcoffins/testfiles/xcoffins002.xetex.tlg
+++ b/l3experimental/xcoffins/testfiles/xcoffins002.xetex.tlg
@@ -28,9 +28,9 @@ TEST 2: 2: setting coffins
 ============================================================
 > \box71=
 \hbox(6.83331+0.0)x7.50002
-.\special{color push gray 0}
+.\special{pdf:bcolor [0]}
 .\OT1/cmr/m/n/10 A
-.\special{color pop}
+.\special{pdf:ecolor}
 ! 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 d0b1fbb..c9c7d96 100644
--- a/l3experimental/xcoffins/testfiles/xcoffins003.ptex.tlg
+++ b/l3experimental/xcoffins/testfiles/xcoffins003.ptex.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{color push gray 0}
+....\special{pdf:bcolor [0]}
 ....\hbox(1.0+0.0)x1.0
 .....\rule(1.0+0.0)x1.0
-....\special{color pop}
+....\special{pdf:ecolor}
 ..\kern 0.0
 ..\kern -20.11115
 ..\hbox(7.5+2.5)x18.11115, shifted 9.5
-...\special{color push gray 0}
+...\special{pdf:bcolor [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{color pop}
+...\special{pdf:ecolor}
 .\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{color push gray 0}
+....\special{pdf:bcolor [0]}
 ....\hbox(1.0+0.0)x1.0
 .....\rule(1.0+0.0)x1.0
-....\special{color pop}
+....\special{pdf:ecolor}
 ..\kern 0.0
 ..\kern -13.41669
 ..\hbox(7.5+2.5)x26.83339, shifted -0.5
-...\special{color push gray 0}
+...\special{pdf:bcolor [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{color pop}
+...\special{pdf:ecolor}
 ! 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 d0b1fbb..c9c7d96 100644
--- a/l3experimental/xcoffins/testfiles/xcoffins003.uptex.tlg
+++ b/l3experimental/xcoffins/testfiles/xcoffins003.uptex.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{color push gray 0}
+....\special{pdf:bcolor [0]}
 ....\hbox(1.0+0.0)x1.0
 .....\rule(1.0+0.0)x1.0
-....\special{color pop}
+....\special{pdf:ecolor}
 ..\kern 0.0
 ..\kern -20.11115
 ..\hbox(7.5+2.5)x18.11115, shifted 9.5
-...\special{color push gray 0}
+...\special{pdf:bcolor [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{color pop}
+...\special{pdf:ecolor}
 .\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{color push gray 0}
+....\special{pdf:bcolor [0]}
 ....\hbox(1.0+0.0)x1.0
 .....\rule(1.0+0.0)x1.0
-....\special{color pop}
+....\special{pdf:ecolor}
 ..\kern 0.0
 ..\kern -13.41669
 ..\hbox(7.5+2.5)x26.83339, shifted -0.5
-...\special{color push gray 0}
+...\special{pdf:bcolor [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{color pop}
+...\special{pdf:ecolor}
 ! 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 d0b1fbb..c9c7d96 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{color push gray 0}
+....\special{pdf:bcolor [0]}
 ....\hbox(1.0+0.0)x1.0
 .....\rule(1.0+0.0)x1.0
-....\special{color pop}
+....\special{pdf:ecolor}
 ..\kern 0.0
 ..\kern -20.11115
 ..\hbox(7.5+2.5)x18.11115, shifted 9.5
-...\special{color push gray 0}
+...\special{pdf:bcolor [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{color pop}
+...\special{pdf:ecolor}
 .\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{color push gray 0}
+....\special{pdf:bcolor [0]}
 ....\hbox(1.0+0.0)x1.0
 .....\rule(1.0+0.0)x1.0
-....\special{color pop}
+....\special{pdf:ecolor}
 ..\kern 0.0
 ..\kern -13.41669
 ..\hbox(7.5+2.5)x26.83339, shifted -0.5
-...\special{color push gray 0}
+...\special{pdf:bcolor [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{color pop}
+...\special{pdf:ecolor}
 ! OK.
 <argument> ...]\bbb [B,hc](30pt,0pt)\showbox \aaa 
                                                   x\fbox {\usebox \aaa }x
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index a9b4df0..b09044b 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -4777,20 +4777,20 @@ Defining key expl/check-declarations on line ...
 Defining key expl/log-functions on line ...
 Defining \c__expl_def_ext_tl on line ...
  (l3pdfmode.def
-Defining \__driver_state_save: on line ...
-Defining \__driver_state_restore: on line ...
 Defining \__driver_literal:n on line ...
+Defining \__driver_scope_begin: on line ...
+Defining \__driver_scope_end: on line ...
 Defining \__driver_matrix:n on line ...
-Defining \__driver_box_use_clip:N on line ...
-Defining \__driver_box_rotate_begin: on line ...
-Defining \__driver_box_rotate_end: on line ...
-Defining \__driver_box_scale_begin: on line ...
-Defining \__driver_box_scale_end: on line ...
 Defining \l__driver_current_color_tl on line ...
 Defining \l__driver_color_stack_int on line ...
 \l__driver_color_stack_int=\count134
 Defining \__driver_color_ensure_current: on line ...
 Defining \__driver_color_reset: on line ...
+Defining \__driver_box_use_clip:N on line ...
+Defining \__driver_box_use_rotate:Nn on line ...
+Defining \l__driver_cos_fp on line ...
+Defining \l__driver_sin_fp on line ...
+Defining \__driver_box_use_scale:Nnn on line ...
 )
 Defining \__expl_status_pop:w on line ...
 Defining \l__expl_status_stack_tl on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 94d8447..4a0ce44 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -4768,18 +4768,18 @@ Defining key expl/check-declarations on line ...
 Defining key expl/log-functions on line ...
 Defining \c__expl_def_ext_tl on line ...
  (l3dvipdfmx.def
-Defining \__driver_state_save: on line ...
-Defining \__driver_state_restore: on line ...
 Defining \__driver_literal:n on line ...
+Defining \__driver_scope_begin: on line ...
+Defining \__driver_scope_end: on line ...
 Defining \__driver_matrix:n on line ...
-Defining \__driver_box_use_clip:N on line ...
-Defining \__driver_box_rotate_begin: on line ...
-Defining \__driver_box_rotate_end: on line ...
-Defining \__driver_box_scale_begin: on line ...
-Defining \__driver_box_scale_end: on line ...
 Defining \l__driver_current_color_tl on line ...
 Defining \__driver_color_ensure_current: on line ...
 Defining \__driver_color_reset: on line ...
+Defining \__driver_box_use_clip:N on line ...
+Defining \__driver_box_use_rotate:Nn on line ...
+Defining \l__driver_cos_fp on line ...
+Defining \l__driver_sin_fp on line ...
+Defining \__driver_box_use_scale:Nnn on line ...
 )
 Defining \__expl_status_pop:w on line ...
 Defining \l__expl_status_stack_tl on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index dc04393..47fe1c4 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -4969,20 +4969,20 @@ Defining key expl/check-declarations on line ...
 Defining key expl/log-functions on line ...
 Defining \c__expl_def_ext_tl on line ...
  (l3pdfmode.def
-Defining \__driver_state_save: on line ...
-Defining \__driver_state_restore: on line ...
 Defining \__driver_literal:n on line ...
+Defining \__driver_scope_begin: on line ...
+Defining \__driver_scope_end: on line ...
 Defining \__driver_matrix:n on line ...
-Defining \__driver_box_use_clip:N on line ...
-Defining \__driver_box_rotate_begin: on line ...
-Defining \__driver_box_rotate_end: on line ...
-Defining \__driver_box_scale_begin: on line ...
-Defining \__driver_box_scale_end: on line ...
 Defining \l__driver_current_color_tl on line ...
 Defining \l__driver_color_stack_int on line ...
 \l__driver_color_stack_int=\count134
 Defining \__driver_color_ensure_current: on line ...
 Defining \__driver_color_reset: on line ...
+Defining \__driver_box_use_clip:N on line ...
+Defining \__driver_box_use_rotate:Nn on line ...
+Defining \l__driver_cos_fp on line ...
+Defining \l__driver_sin_fp on line ...
+Defining \__driver_box_use_scale:Nnn on line ...
 )
 Defining \__expl_status_pop:w on line ...
 Defining \l__expl_status_stack_tl on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 187d046..f6f02ea 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -4969,18 +4969,18 @@ Defining key expl/check-declarations on line ...
 Defining key expl/log-functions on line ...
 Defining \c__expl_def_ext_tl on line ...
  (l3dvipdfmx.def
-Defining \__driver_state_save: on line ...
-Defining \__driver_state_restore: on line ...
 Defining \__driver_literal:n on line ...
+Defining \__driver_scope_begin: on line ...
+Defining \__driver_scope_end: on line ...
 Defining \__driver_matrix:n on line ...
-Defining \__driver_box_use_clip:N on line ...
-Defining \__driver_box_rotate_begin: on line ...
-Defining \__driver_box_rotate_end: on line ...
-Defining \__driver_box_scale_begin: on line ...
-Defining \__driver_box_scale_end: on line ...
 Defining \l__driver_current_color_tl on line ...
 Defining \__driver_color_ensure_current: on line ...
 Defining \__driver_color_reset: on line ...
+Defining \__driver_box_use_clip:N on line ...
+Defining \__driver_box_use_rotate:Nn on line ...
+Defining \l__driver_cos_fp on line ...
+Defining \l__driver_sin_fp on line ...
+Defining \__driver_box_use_scale:Nnn on line ...
 )
 Defining \__expl_status_pop:w on line ...
 Defining \l__expl_status_stack_tl on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 89d69a7..e3cba1b 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -4775,18 +4775,18 @@ Defining key expl/check-declarations on line ...
 Defining key expl/log-functions on line ...
 Defining \c__expl_def_ext_tl on line ...
  (l3xdvipdfmx.def
-Defining \__driver_state_save: on line ...
-Defining \__driver_state_restore: on line ...
 Defining \__driver_literal:n on line ...
+Defining \__driver_scope_begin: on line ...
+Defining \__driver_scope_end: on line ...
 Defining \__driver_matrix:n on line ...
-Defining \__driver_box_use_clip:N on line ...
-Defining \__driver_box_rotate_begin: on line ...
-Defining \__driver_box_rotate_end: on line ...
-Defining \__driver_box_scale_begin: on line ...
-Defining \__driver_box_scale_end: on line ...
 Defining \l__driver_current_color_tl on line ...
 Defining \__driver_color_ensure_current: on line ...
 Defining \__driver_color_reset: on line ...
+Defining \__driver_box_use_clip:N on line ...
+Defining \__driver_box_use_rotate:Nn on line ...
+Defining \l__driver_cos_fp on line ...
+Defining \l__driver_sin_fp on line ...
+Defining \__driver_box_use_scale:Nnn on line ...
 )
 Defining \__expl_status_pop:w on line ...
 Defining \l__expl_status_stack_tl on line ...
diff --git a/l3trial/xbox/testfiles/xbox001.ptex.tlg b/l3trial/xbox/testfiles/xbox001.ptex.tlg
index 0765a8b..aad9ce0 100644
--- a/l3trial/xbox/testfiles/xbox001.ptex.tlg
+++ b/l3trial/xbox/testfiles/xbox001.ptex.tlg
@@ -51,7 +51,7 @@ TEST 2: \sbox
 ============================================================
 > \box74=
 \hbox(6.94444+0.0)x50.02786
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
@@ -74,7 +74,7 @@ LaTeX Font Info:    External font `cmex10' loaded for size
 (Font)              <5> on input line ....
 > \box74=
 \hbox(5.83333+1.94444)x49.63992
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box74=
 \hbox(5.83333+1.94444)x49.63992
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box74=
 \hbox(6.94444+1.94444)x62.58345
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box74=
 \hbox(5.83333+1.94444)x49.63992
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
@@ -173,7 +173,7 @@ TEST 3: \savebox as \sbox
 ============================================================
 > \box74=
 \hbox(6.94444+0.0)x50.02786
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box74=
 \hbox(5.83333+1.94444)x49.63992
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box74=
 \hbox(5.83333+1.94444)x49.63992
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box74=
 \hbox(6.94444+1.94444)x62.58345
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box74=
 \hbox(5.83333+1.94444)x49.63992
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
@@ -291,7 +291,7 @@ TEST 4: \savebox to various widths
 ============================================================
 > \box74=
 \hbox(6.94444+0.0)x10.0
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box74=
 \hbox(6.94444+0.0)x20.0
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box74=
 \hbox(6.94444+0.0)x100.05573
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box74=
 \hbox(6.94444+0.0)x56.9723
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
@@ -383,7 +383,7 @@ TEST 5: \savebox to width with alignment
 ============================================================
 > \box74=
 \hbox(6.94444+0.0)x100.05573
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box74=
 \hbox(6.94444+0.0)x100.05573
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box74=
 \hbox(6.94444+0.0)x100.05573
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
@@ -462,7 +462,7 @@ Underfull \hbox (badness 10000) detected at line 87
 .\OT1/cmr/m/n/10 d
 > \box74=
 \hbox(6.94444+0.0)x100.05573
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
@@ -505,7 +505,7 @@ TEST 7: lrbox
 ============================================================
 > \box74=
 \hbox(6.83331+2.22223)x167.2214
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
@@ -553,7 +553,7 @@ TEST 8: \usebox
 ============================================================
 > \box74=
 \hbox(6.94444+0.0)x50.02786
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box73=
 \hbox(6.94444+0.0)x50.02786
-.\special{color push gray 0}
+.\special{pdf:bcolor [0]}
 .\hbox(6.94444+0.0)x50.02786
-..\special{color push gray 0}
+..\special{pdf:bcolor [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{color pop}
-.\special{color pop}
+..\special{pdf:ecolor}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxb 
 l. ...  }
diff --git a/l3trial/xbox/testfiles/xbox001.uptex.tlg b/l3trial/xbox/testfiles/xbox001.uptex.tlg
index 0765a8b..aad9ce0 100644
--- a/l3trial/xbox/testfiles/xbox001.uptex.tlg
+++ b/l3trial/xbox/testfiles/xbox001.uptex.tlg
@@ -51,7 +51,7 @@ TEST 2: \sbox
 ============================================================
 > \box74=
 \hbox(6.94444+0.0)x50.02786
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
@@ -74,7 +74,7 @@ LaTeX Font Info:    External font `cmex10' loaded for size
 (Font)              <5> on input line ....
 > \box74=
 \hbox(5.83333+1.94444)x49.63992
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box74=
 \hbox(5.83333+1.94444)x49.63992
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box74=
 \hbox(6.94444+1.94444)x62.58345
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box74=
 \hbox(5.83333+1.94444)x49.63992
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
@@ -173,7 +173,7 @@ TEST 3: \savebox as \sbox
 ============================================================
 > \box74=
 \hbox(6.94444+0.0)x50.02786
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box74=
 \hbox(5.83333+1.94444)x49.63992
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box74=
 \hbox(5.83333+1.94444)x49.63992
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box74=
 \hbox(6.94444+1.94444)x62.58345
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box74=
 \hbox(5.83333+1.94444)x49.63992
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
@@ -291,7 +291,7 @@ TEST 4: \savebox to various widths
 ============================================================
 > \box74=
 \hbox(6.94444+0.0)x10.0
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box74=
 \hbox(6.94444+0.0)x20.0
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box74=
 \hbox(6.94444+0.0)x100.05573
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box74=
 \hbox(6.94444+0.0)x56.9723
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
@@ -383,7 +383,7 @@ TEST 5: \savebox to width with alignment
 ============================================================
 > \box74=
 \hbox(6.94444+0.0)x100.05573
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box74=
 \hbox(6.94444+0.0)x100.05573
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box74=
 \hbox(6.94444+0.0)x100.05573
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
@@ -462,7 +462,7 @@ Underfull \hbox (badness 10000) detected at line 87
 .\OT1/cmr/m/n/10 d
 > \box74=
 \hbox(6.94444+0.0)x100.05573
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
@@ -505,7 +505,7 @@ TEST 7: lrbox
 ============================================================
 > \box74=
 \hbox(6.83331+2.22223)x167.2214
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
@@ -553,7 +553,7 @@ TEST 8: \usebox
 ============================================================
 > \box74=
 \hbox(6.94444+0.0)x50.02786
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box73=
 \hbox(6.94444+0.0)x50.02786
-.\special{color push gray 0}
+.\special{pdf:bcolor [0]}
 .\hbox(6.94444+0.0)x50.02786
-..\special{color push gray 0}
+..\special{pdf:bcolor [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{color pop}
-.\special{color pop}
+..\special{pdf:ecolor}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxb 
 l. ...  }
diff --git a/l3trial/xbox/testfiles/xbox001.xetex.tlg b/l3trial/xbox/testfiles/xbox001.xetex.tlg
index f9334ae..9dc9c39 100644
--- a/l3trial/xbox/testfiles/xbox001.xetex.tlg
+++ b/l3trial/xbox/testfiles/xbox001.xetex.tlg
@@ -51,7 +51,7 @@ TEST 2: \sbox
 ============================================================
 > \box74=
 \hbox(6.94444+0.0)x50.02786
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
@@ -74,7 +74,7 @@ LaTeX Font Info:    External font `cmex10' loaded for size
 (Font)              <5> on input line ....
 > \box74=
 \hbox(5.83333+1.94444)x49.63992
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box74=
 \hbox(5.83333+1.94444)x49.63992
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box74=
 \hbox(6.94444+1.94444)x62.58345
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box74=
 \hbox(5.83333+1.94444)x49.63992
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
@@ -173,7 +173,7 @@ TEST 3: \savebox as \sbox
 ============================================================
 > \box74=
 \hbox(6.94444+0.0)x50.02786
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box74=
 \hbox(5.83333+1.94444)x49.63992
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box74=
 \hbox(5.83333+1.94444)x49.63992
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box74=
 \hbox(6.94444+1.94444)x62.58345
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box74=
 \hbox(5.83333+1.94444)x49.63992
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
@@ -291,7 +291,7 @@ TEST 4: \savebox to various widths
 ============================================================
 > \box74=
 \hbox(6.94444+0.0)x10.0
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box74=
 \hbox(6.94444+0.0)x20.0
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box74=
 \hbox(6.94444+0.0)x100.05573
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box74=
 \hbox(6.94444+0.0)x56.9723
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
@@ -383,7 +383,7 @@ TEST 5: \savebox to width with alignment
 ============================================================
 > \box74=
 \hbox(6.94444+0.0)x100.05573
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box74=
 \hbox(6.94444+0.0)x100.05573
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box74=
 \hbox(6.94444+0.0)x100.05573
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
@@ -462,7 +462,7 @@ Underfull \hbox (badness 10000) detected at line 87
 .\OT1/cmr/m/n/10 d
 > \box74=
 \hbox(6.94444+0.0)x100.05573
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
@@ -505,7 +505,7 @@ TEST 7: lrbox
 ============================================================
 > \box74=
 \hbox(6.83331+2.22223)x167.2214
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
@@ -554,7 +554,7 @@ TEST 8: \usebox
 ============================================================
 > \box74=
 \hbox(6.94444+0.0)x50.02786
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box73=
 \hbox(6.94444+0.0)x50.02786
-.\special{color push gray 0}
+.\special{pdf:bcolor [0]}
 .\hbox(6.94444+0.0)x50.02786
-..\special{color push gray 0}
+..\special{pdf:bcolor [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{color pop}
-.\special{color pop}
+..\special{pdf:ecolor}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxb 
 l. ...  }
diff --git a/l3trial/xbox/testfiles/xbox002.ptex.tlg b/l3trial/xbox/testfiles/xbox002.ptex.tlg
index 421036f..50d406f 100644
--- a/l3trial/xbox/testfiles/xbox002.ptex.tlg
+++ b/l3trial/xbox/testfiles/xbox002.ptex.tlg
@@ -6,7 +6,7 @@ TEST 1: \mbox
 ============================================================
 > \box72=
 \hbox(6.94444+0.0)x50.02786
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
@@ -30,7 +30,7 @@ LaTeX Font Info:    External font `cmex10' loaded for size
 (Font)              <5> on input line ....
 > \box72=
 \hbox(5.83333+1.94444)x49.63992
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box72=
 \hbox(5.83333+1.94444)x49.63992
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
@@ -76,7 +76,7 @@ TEST 2: \makebox as \mbox
 ============================================================
 > \box72=
 \hbox(6.94444+0.0)x50.02786
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box72=
 \hbox(5.83333+1.94444)x49.63992
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box72=
 \hbox(5.83333+1.94444)x49.63992
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
@@ -142,7 +142,7 @@ TEST 3: \makebox to various widths
 ============================================================
 > \box72=
 \hbox(6.94444+0.0)x10.0
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box72=
 \hbox(6.94444+0.0)x20.0
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box72=
 \hbox(6.94444+0.0)x100.05573
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box72=
 \hbox(6.94444+0.0)x56.9723
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
@@ -234,7 +234,7 @@ TEST 4: \makebox to width with alignment
 ============================================================
 > \box72=
 \hbox(6.94444+0.0)x100.05573
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box72=
 \hbox(6.94444+0.0)x100.05573
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box72=
 \hbox(6.94444+0.0)x100.05573
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
@@ -313,7 +313,7 @@ Underfull \hbox (badness 10000) detected at line 66
 .\OT1/cmr/m/n/10 d
 > \box72=
 \hbox(6.94444+0.0)x100.05573
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
diff --git a/l3trial/xbox/testfiles/xbox002.uptex.tlg b/l3trial/xbox/testfiles/xbox002.uptex.tlg
index 421036f..50d406f 100644
--- a/l3trial/xbox/testfiles/xbox002.uptex.tlg
+++ b/l3trial/xbox/testfiles/xbox002.uptex.tlg
@@ -6,7 +6,7 @@ TEST 1: \mbox
 ============================================================
 > \box72=
 \hbox(6.94444+0.0)x50.02786
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
@@ -30,7 +30,7 @@ LaTeX Font Info:    External font `cmex10' loaded for size
 (Font)              <5> on input line ....
 > \box72=
 \hbox(5.83333+1.94444)x49.63992
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box72=
 \hbox(5.83333+1.94444)x49.63992
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
@@ -76,7 +76,7 @@ TEST 2: \makebox as \mbox
 ============================================================
 > \box72=
 \hbox(6.94444+0.0)x50.02786
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box72=
 \hbox(5.83333+1.94444)x49.63992
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box72=
 \hbox(5.83333+1.94444)x49.63992
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
@@ -142,7 +142,7 @@ TEST 3: \makebox to various widths
 ============================================================
 > \box72=
 \hbox(6.94444+0.0)x10.0
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box72=
 \hbox(6.94444+0.0)x20.0
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box72=
 \hbox(6.94444+0.0)x100.05573
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box72=
 \hbox(6.94444+0.0)x56.9723
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
@@ -234,7 +234,7 @@ TEST 4: \makebox to width with alignment
 ============================================================
 > \box72=
 \hbox(6.94444+0.0)x100.05573
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box72=
 \hbox(6.94444+0.0)x100.05573
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box72=
 \hbox(6.94444+0.0)x100.05573
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
@@ -313,7 +313,7 @@ Underfull \hbox (badness 10000) detected at line 66
 .\OT1/cmr/m/n/10 d
 > \box72=
 \hbox(6.94444+0.0)x100.05573
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
diff --git a/l3trial/xbox/testfiles/xbox002.xetex.tlg b/l3trial/xbox/testfiles/xbox002.xetex.tlg
index 421036f..50d406f 100644
--- a/l3trial/xbox/testfiles/xbox002.xetex.tlg
+++ b/l3trial/xbox/testfiles/xbox002.xetex.tlg
@@ -6,7 +6,7 @@ TEST 1: \mbox
 ============================================================
 > \box72=
 \hbox(6.94444+0.0)x50.02786
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
@@ -30,7 +30,7 @@ LaTeX Font Info:    External font `cmex10' loaded for size
 (Font)              <5> on input line ....
 > \box72=
 \hbox(5.83333+1.94444)x49.63992
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box72=
 \hbox(5.83333+1.94444)x49.63992
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
@@ -76,7 +76,7 @@ TEST 2: \makebox as \mbox
 ============================================================
 > \box72=
 \hbox(6.94444+0.0)x50.02786
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box72=
 \hbox(5.83333+1.94444)x49.63992
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box72=
 \hbox(5.83333+1.94444)x49.63992
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
@@ -142,7 +142,7 @@ TEST 3: \makebox to various widths
 ============================================================
 > \box72=
 \hbox(6.94444+0.0)x10.0
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box72=
 \hbox(6.94444+0.0)x20.0
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box72=
 \hbox(6.94444+0.0)x100.05573
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box72=
 \hbox(6.94444+0.0)x56.9723
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
@@ -234,7 +234,7 @@ TEST 4: \makebox to width with alignment
 ============================================================
 > \box72=
 \hbox(6.94444+0.0)x100.05573
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box72=
 \hbox(6.94444+0.0)x100.05573
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
 > \box72=
 \hbox(6.94444+0.0)x100.05573
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! OK.
 <argument> \myboxa 
 l. ...  }
@@ -313,7 +313,7 @@ Underfull \hbox (badness 10000) detected at line 66
 .\OT1/cmr/m/n/10 d
 > \box72=
 \hbox(6.94444+0.0)x100.05573
-.\special{color push gray 0}
+.\special{pdf:bcolor [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{color pop}
+.\special{pdf:ecolor}
 ! 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