[latex3-commits] [l3svn] 03/04: Use gsave/grestore for (x)dvipdfmx high-level scoping

noreply at latex-project.org noreply at latex-project.org
Tue May 9 11:17:12 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 d2cb13b193fdefbb9df422cec4410f1cdfa79465
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Tue May 9 09:56:20 2017 +0100

    Use gsave/grestore for (x)dvipdfmx high-level scoping
---
 .../xcoffins/testfiles/xcoffins003.ptex.tlg        |   28 ++--
 .../xcoffins/testfiles/xcoffins003.uptex.tlg       |   28 ++--
 .../xcoffins/testfiles/xcoffins003.xetex.tlg       |   28 ++--
 l3kernel/l3drivers.dtx                             |    6 +-
 l3kernel/testfiles/d3dvips.xetex.tlg               |   72 ++++-----
 l3kernel/testfiles/d3dvisvgm.xetex.tlg             |   72 ++++-----
 l3kernel/testfiles/d3pdfmode.xetex.tlg             |   72 ++++-----
 l3kernel/testfiles/d3xdvipdfmx.xetex.tlg           |   72 ++++-----
 l3kernel/testfiles/m3box004.ptex.tlg               |  168 ++++++++++----------
 l3kernel/testfiles/m3box004.uptex.tlg              |  168 ++++++++++----------
 l3kernel/testfiles/m3box004.xetex.tlg              |  168 ++++++++++----------
 l3kernel/testfiles/m3coffins001.ptex.tlg           |   40 ++---
 l3kernel/testfiles/m3coffins001.uptex.tlg          |   40 ++---
 l3kernel/testfiles/m3coffins001.xetex.tlg          |   40 ++---
 14 files changed, 501 insertions(+), 501 deletions(-)

diff --git a/l3experimental/xcoffins/testfiles/xcoffins003.ptex.tlg b/l3experimental/xcoffins/testfiles/xcoffins003.ptex.tlg
index becab47..68530b1 100644
--- a/l3experimental/xcoffins/testfiles/xcoffins003.ptex.tlg
+++ b/l3experimental/xcoffins/testfiles/xcoffins003.ptex.tlg
@@ -174,7 +174,7 @@ l. ...}
 ...\hbox(79.70663+32.17336)x111.87999
 ....\kern 35.7089
 ....\hbox(50.5+45.5)x0.0
-.....\special{pdf:literal q}
+.....\special{x:gsave}
 .....\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 .....\hbox(50.5+45.5)x0.0
 ......\hbox(50.5+45.5)x62.2222
@@ -334,7 +334,7 @@ l. ...}
 .........\rule(0.0+0.0)x62.2222
 ........\mathoff
 .......\hbox(0.0+0.0)x0.0
-.....\special{pdf:literal Q}
+.....\special{x:grestore}
 ! OK.
 <argument> ...RotateCoffin \aaa {45}\showbox \aaa 
                                                   x\fbox {\usebox \aaa }\Rot...
@@ -347,7 +347,7 @@ l. ...}
 ...\hbox(0.0+0.0)x0.0
 ....\kern 0.0
 ....\hbox(0.0+0.0)x0.0
-.....\special{pdf:literal q}
+.....\special{x:gsave}
 .....\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 .....\hbox(0.0+0.0)x0.0
 ......\hbox(0.0+0.0)x0.0
@@ -357,7 +357,7 @@ l. ...}
 .........\hbox(79.70663+32.17336)x111.87999
 ..........\kern 35.7089
 ..........\hbox(50.5+45.5)x0.0
-...........\special{pdf:literal q}
+...........\special{x:gsave}
 ...........\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 ...........\hbox(50.5+45.5)x0.0
 ............\hbox(50.5+45.5)x62.2222
@@ -517,8 +517,8 @@ l. ...}
 ...............\rule(0.0+0.0)x62.2222
 ..............\mathoff
 .............\hbox(0.0+0.0)x0.0
-...........\special{pdf:literal Q}
-.....\special{pdf:literal Q}
+...........\special{x:grestore}
+.....\special{x:grestore}
 ! OK.
 <argument> ...RotateCoffin \aaa {45}\showbox \aaa 
                                                   x\fbox {\usebox \aaa }
@@ -538,7 +538,7 @@ TEST 2: Test 2: rotation+alignment
 ......\hbox(0.0+0.0)x0.0
 .......\kern 0.0
 .......\hbox(0.0+0.0)x0.0
-........\special{pdf:literal q}
+........\special{x:gsave}
 ........\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 ........\hbox(0.0+0.0)x0.0
 .........\hbox(0.0+0.0)x0.0
@@ -548,7 +548,7 @@ TEST 2: Test 2: rotation+alignment
 ............\hbox(0.0+0.0)x0.0
 .............\kern 0.0
 .............\hbox(0.0+0.0)x0.0
-..............\special{pdf:literal q}
+..............\special{x:gsave}
 ..............\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 ..............\hbox(0.0+0.0)x0.0
 ...............\hbox(0.0+0.0)x0.0
@@ -558,7 +558,7 @@ TEST 2: Test 2: rotation+alignment
 ..................\hbox(79.70663+32.17336)x111.87999
 ...................\kern 35.7089
 ...................\hbox(50.5+45.5)x0.0
-....................\special{pdf:literal q}
+....................\special{x:gsave}
 ....................\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 ....................\hbox(50.5+45.5)x0.0
 .....................\hbox(50.5+45.5)x62.2222
@@ -718,9 +718,9 @@ TEST 2: Test 2: rotation+alignment
 ........................\rule(0.0+0.0)x62.2222
 .......................\mathoff
 ......................\hbox(0.0+0.0)x0.0
-....................\special{pdf:literal Q}
-..............\special{pdf:literal Q}
-........\special{pdf:literal Q}
+....................\special{x:grestore}
+..............\special{x:grestore}
+........\special{x:grestore}
 ...\kern 0.0
 ...\kern -0.5
 ...\hbox(1.0+0.0)x1.0, shifted 0.5
@@ -749,7 +749,7 @@ TEST 2: Test 2: rotation+alignment
 ......\hbox(52.82094+3.77908)x56.60002
 .......\kern 7.31462
 .......\hbox(10.34444+5.34444)x0.0
-........\special{pdf:literal q}
+........\special{x:gsave}
 ........\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 ........\hbox(10.34444+5.34444)x0.0
 .........\hbox(10.34444+5.34444)x64.35565
@@ -779,7 +779,7 @@ TEST 2: Test 2: rotation+alignment
 ...............\glue 3.0
 ..............\rule(*+*)x0.4
 .............\rule(0.4+0.0)x*
-........\special{pdf:literal Q}
+........\special{x:grestore}
 ...\kern 0.0
 ...\kern -0.5
 ...\hbox(1.0+0.0)x1.0, shifted 0.5
diff --git a/l3experimental/xcoffins/testfiles/xcoffins003.uptex.tlg b/l3experimental/xcoffins/testfiles/xcoffins003.uptex.tlg
index becab47..68530b1 100644
--- a/l3experimental/xcoffins/testfiles/xcoffins003.uptex.tlg
+++ b/l3experimental/xcoffins/testfiles/xcoffins003.uptex.tlg
@@ -174,7 +174,7 @@ l. ...}
 ...\hbox(79.70663+32.17336)x111.87999
 ....\kern 35.7089
 ....\hbox(50.5+45.5)x0.0
-.....\special{pdf:literal q}
+.....\special{x:gsave}
 .....\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 .....\hbox(50.5+45.5)x0.0
 ......\hbox(50.5+45.5)x62.2222
@@ -334,7 +334,7 @@ l. ...}
 .........\rule(0.0+0.0)x62.2222
 ........\mathoff
 .......\hbox(0.0+0.0)x0.0
-.....\special{pdf:literal Q}
+.....\special{x:grestore}
 ! OK.
 <argument> ...RotateCoffin \aaa {45}\showbox \aaa 
                                                   x\fbox {\usebox \aaa }\Rot...
@@ -347,7 +347,7 @@ l. ...}
 ...\hbox(0.0+0.0)x0.0
 ....\kern 0.0
 ....\hbox(0.0+0.0)x0.0
-.....\special{pdf:literal q}
+.....\special{x:gsave}
 .....\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 .....\hbox(0.0+0.0)x0.0
 ......\hbox(0.0+0.0)x0.0
@@ -357,7 +357,7 @@ l. ...}
 .........\hbox(79.70663+32.17336)x111.87999
 ..........\kern 35.7089
 ..........\hbox(50.5+45.5)x0.0
-...........\special{pdf:literal q}
+...........\special{x:gsave}
 ...........\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 ...........\hbox(50.5+45.5)x0.0
 ............\hbox(50.5+45.5)x62.2222
@@ -517,8 +517,8 @@ l. ...}
 ...............\rule(0.0+0.0)x62.2222
 ..............\mathoff
 .............\hbox(0.0+0.0)x0.0
-...........\special{pdf:literal Q}
-.....\special{pdf:literal Q}
+...........\special{x:grestore}
+.....\special{x:grestore}
 ! OK.
 <argument> ...RotateCoffin \aaa {45}\showbox \aaa 
                                                   x\fbox {\usebox \aaa }
@@ -538,7 +538,7 @@ TEST 2: Test 2: rotation+alignment
 ......\hbox(0.0+0.0)x0.0
 .......\kern 0.0
 .......\hbox(0.0+0.0)x0.0
-........\special{pdf:literal q}
+........\special{x:gsave}
 ........\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 ........\hbox(0.0+0.0)x0.0
 .........\hbox(0.0+0.0)x0.0
@@ -548,7 +548,7 @@ TEST 2: Test 2: rotation+alignment
 ............\hbox(0.0+0.0)x0.0
 .............\kern 0.0
 .............\hbox(0.0+0.0)x0.0
-..............\special{pdf:literal q}
+..............\special{x:gsave}
 ..............\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 ..............\hbox(0.0+0.0)x0.0
 ...............\hbox(0.0+0.0)x0.0
@@ -558,7 +558,7 @@ TEST 2: Test 2: rotation+alignment
 ..................\hbox(79.70663+32.17336)x111.87999
 ...................\kern 35.7089
 ...................\hbox(50.5+45.5)x0.0
-....................\special{pdf:literal q}
+....................\special{x:gsave}
 ....................\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 ....................\hbox(50.5+45.5)x0.0
 .....................\hbox(50.5+45.5)x62.2222
@@ -718,9 +718,9 @@ TEST 2: Test 2: rotation+alignment
 ........................\rule(0.0+0.0)x62.2222
 .......................\mathoff
 ......................\hbox(0.0+0.0)x0.0
-....................\special{pdf:literal Q}
-..............\special{pdf:literal Q}
-........\special{pdf:literal Q}
+....................\special{x:grestore}
+..............\special{x:grestore}
+........\special{x:grestore}
 ...\kern 0.0
 ...\kern -0.5
 ...\hbox(1.0+0.0)x1.0, shifted 0.5
@@ -749,7 +749,7 @@ TEST 2: Test 2: rotation+alignment
 ......\hbox(52.82094+3.77908)x56.60002
 .......\kern 7.31462
 .......\hbox(10.34444+5.34444)x0.0
-........\special{pdf:literal q}
+........\special{x:gsave}
 ........\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 ........\hbox(10.34444+5.34444)x0.0
 .........\hbox(10.34444+5.34444)x64.35565
@@ -779,7 +779,7 @@ TEST 2: Test 2: rotation+alignment
 ...............\glue 3.0
 ..............\rule(*+*)x0.4
 .............\rule(0.4+0.0)x*
-........\special{pdf:literal Q}
+........\special{x:grestore}
 ...\kern 0.0
 ...\kern -0.5
 ...\hbox(1.0+0.0)x1.0, shifted 0.5
diff --git a/l3experimental/xcoffins/testfiles/xcoffins003.xetex.tlg b/l3experimental/xcoffins/testfiles/xcoffins003.xetex.tlg
index b6e02d8..7d53de0 100644
--- a/l3experimental/xcoffins/testfiles/xcoffins003.xetex.tlg
+++ b/l3experimental/xcoffins/testfiles/xcoffins003.xetex.tlg
@@ -172,7 +172,7 @@ l. ...}
 ...\hbox(79.70663+32.17336)x111.87999
 ....\kern 35.7089
 ....\hbox(50.5+45.5)x0.0
-.....\special{pdf:literal q}
+.....\special{x:gsave}
 .....\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 .....\hbox(50.5+45.5)x0.0
 ......\hbox(50.5+45.5)x62.2222
@@ -330,7 +330,7 @@ l. ...}
 ..........\glue(\tabskip) 0.0
 .........\rule(0.0+0.0)x62.2222
 ........\mathoff
-.....\special{pdf:literal Q}
+.....\special{x:grestore}
 ! OK.
 <argument> ...RotateCoffin \aaa {45}\showbox \aaa 
                                                   x\fbox {\usebox \aaa }\Rot...
@@ -343,7 +343,7 @@ l. ...}
 ...\hbox(0.0+0.0)x0.0
 ....\kern 0.0
 ....\hbox(0.0+0.0)x0.0
-.....\special{pdf:literal q}
+.....\special{x:gsave}
 .....\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 .....\hbox(0.0+0.0)x0.0
 ......\hbox(0.0+0.0)x0.0
@@ -353,7 +353,7 @@ l. ...}
 .........\hbox(79.70663+32.17336)x111.87999
 ..........\kern 35.7089
 ..........\hbox(50.5+45.5)x0.0
-...........\special{pdf:literal q}
+...........\special{x:gsave}
 ...........\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 ...........\hbox(50.5+45.5)x0.0
 ............\hbox(50.5+45.5)x62.2222
@@ -511,8 +511,8 @@ l. ...}
 ................\glue(\tabskip) 0.0
 ...............\rule(0.0+0.0)x62.2222
 ..............\mathoff
-...........\special{pdf:literal Q}
-.....\special{pdf:literal Q}
+...........\special{x:grestore}
+.....\special{x:grestore}
 ! OK.
 <argument> ...RotateCoffin \aaa {45}\showbox \aaa 
                                                   x\fbox {\usebox \aaa }
@@ -532,7 +532,7 @@ TEST 2: Test 2: rotation+alignment
 ......\hbox(0.0+0.0)x0.0
 .......\kern 0.0
 .......\hbox(0.0+0.0)x0.0
-........\special{pdf:literal q}
+........\special{x:gsave}
 ........\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 ........\hbox(0.0+0.0)x0.0
 .........\hbox(0.0+0.0)x0.0
@@ -542,7 +542,7 @@ TEST 2: Test 2: rotation+alignment
 ............\hbox(0.0+0.0)x0.0
 .............\kern 0.0
 .............\hbox(0.0+0.0)x0.0
-..............\special{pdf:literal q}
+..............\special{x:gsave}
 ..............\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 ..............\hbox(0.0+0.0)x0.0
 ...............\hbox(0.0+0.0)x0.0
@@ -552,7 +552,7 @@ TEST 2: Test 2: rotation+alignment
 ..................\hbox(79.70663+32.17336)x111.87999
 ...................\kern 35.7089
 ...................\hbox(50.5+45.5)x0.0
-....................\special{pdf:literal q}
+....................\special{x:gsave}
 ....................\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 ....................\hbox(50.5+45.5)x0.0
 .....................\hbox(50.5+45.5)x62.2222
@@ -710,9 +710,9 @@ TEST 2: Test 2: rotation+alignment
 .........................\glue(\tabskip) 0.0
 ........................\rule(0.0+0.0)x62.2222
 .......................\mathoff
-....................\special{pdf:literal Q}
-..............\special{pdf:literal Q}
-........\special{pdf:literal Q}
+....................\special{x:grestore}
+..............\special{x:grestore}
+........\special{x:grestore}
 ...\kern 0.0
 ...\kern -0.5
 ...\hbox(1.0+0.0)x1.0, shifted 0.5
@@ -741,7 +741,7 @@ TEST 2: Test 2: rotation+alignment
 ......\hbox(52.82094+3.77908)x56.60002
 .......\kern 7.31462
 .......\hbox(10.34444+5.34444)x0.0
-........\special{pdf:literal q}
+........\special{x:gsave}
 ........\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 ........\hbox(10.34444+5.34444)x0.0
 .........\hbox(10.34444+5.34444)x64.35565
@@ -771,7 +771,7 @@ TEST 2: Test 2: rotation+alignment
 ...............\glue 3.0
 ..............\rule(*+*)x0.4
 .............\rule(0.4+0.0)x*
-........\special{pdf:literal Q}
+........\special{x:grestore}
 ...\kern 0.0
 ...\kern -0.5
 ...\hbox(1.0+0.0)x1.0, shifted 0.5
diff --git a/l3kernel/l3drivers.dtx b/l3kernel/l3drivers.dtx
index 0e598cb..e561f03 100644
--- a/l3kernel/l3drivers.dtx
+++ b/l3kernel/l3drivers.dtx
@@ -718,12 +718,12 @@
 % \end{macro}
 %
 % \begin{macro}[int]{\@@_scope_begin:, \@@_scope_end:}
-%   Scoping is done using direct PDF operations here.
+%   Scoping is done using the driver-specific specials.
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_scope_begin:
-  { \@@_literal:n { q } }
+  { \tex_special:D { x:gsave } }
 \cs_new_protected:Npn \@@_scope_end:
-  { \@@_literal:n { Q } }
+  { \tex_special:D { x:grestore } }
 %    \end{macrocode}
 % \end{macro}
 %
diff --git a/l3kernel/testfiles/d3dvips.xetex.tlg b/l3kernel/testfiles/d3dvips.xetex.tlg
index fd7baa4..b2f862d 100644
--- a/l3kernel/testfiles/d3dvips.xetex.tlg
+++ b/l3kernel/testfiles/d3dvips.xetex.tlg
@@ -6,7 +6,7 @@ TEST 1: Clip box
 ============================================================
 > \box27=
 \hbox(6.94444+1.0)x86.45851
-.\special{pdf:literal q}
+.\special{x:gsave}
 .\special{pdf:literal 0 -0.99626 86.1355 7.91476 re W n}
 .\hbox(6.94444+1.0)x0.0, glue set - 86.45851fil
 ..\hbox(6.94444+1.0)x86.45851
@@ -29,14 +29,14 @@ TEST 1: Clip box
 ...\OT1/cmr/m/n/10 w
 ...\OT1/cmr/m/n/10 n
 ..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:literal Q}
+.\special{x:grestore}
 .\glue 86.45851
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
 > \box27=
 \hbox(6.94444+0.0)x86.45851
-.\special{pdf:literal q}
+.\special{x:gsave}
 .\special{pdf:literal 0 0 86.1355 6.9185 re W n}
 .\hbox(6.94444+0.0)x0.0, glue set - 86.45851fil
 ..\hbox(6.94444+0.0)x86.45851
@@ -59,14 +59,14 @@ l. ...  }
 ...\OT1/cmr/m/n/10 w
 ...\OT1/cmr/m/n/10 n
 ..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:literal Q}
+.\special{x:grestore}
 .\glue 86.45851
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
 > \box27=
 \hbox(6.94444+1.0)x86.45851
-.\special{pdf:literal q}
+.\special{x:gsave}
 .\special{pdf:literal 0 -0.99626 86.1355 7.91476 re W n}
 .\hbox(6.94444+1.0)x0.0, glue set - 86.45851fil
 ..\hbox(6.94444+1.0)x86.45851
@@ -89,14 +89,14 @@ l. ...  }
 ...\OT1/cmr/m/n/10 w
 ...\OT1/cmr/m/n/10 n
 ..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:literal Q}
+.\special{x:grestore}
 .\glue 86.45851
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
 > \box27=
 \hbox(6.94444+1.94444)x20.0
-.\special{pdf:literal q}
+.\special{x:gsave}
 .\special{pdf:literal 0 -1.93718 19.92528 8.85568 re W n}
 .\hbox(6.94444+1.94444)x0.0, glue set - 20.0fil
 ..\hbox(6.94444+1.94444)x20.0
@@ -119,7 +119,7 @@ l. ...  }
 ...\OT1/cmr/m/n/10 w
 ...\OT1/cmr/m/n/10 n
 ..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:literal Q}
+.\special{x:grestore}
 .\glue 20.0
 ! OK.
 <argument> \l_tmpa_box 
@@ -150,7 +150,7 @@ l. ...  }
 .\hbox(6.94444+0.0)x50.02786
 ..\kern 0.0
 ..\hbox(6.94444+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1 0 0 1 0 0 cm}
 ...\hbox(6.94444+0.0)x0.0
 ....\hbox(6.94444+0.0)x50.02786
@@ -166,7 +166,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 r
 .....\OT1/cmr/m/n/10 l
 .....\OT1/cmr/m/n/10 d
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
@@ -175,7 +175,7 @@ l. ...  }
 .\hbox(31.028+0.0)x46.79762
 ..\kern 3.47223
 ..\hbox(6.94444+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.86603 0.5 -0.5 0.86603 0 0 cm}
 ...\hbox(6.94444+0.0)x0.0
 ....\hbox(6.94444+0.0)x50.02786
@@ -191,7 +191,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 r
 .....\OT1/cmr/m/n/10 l
 .....\OT1/cmr/m/n/10 d
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
@@ -200,7 +200,7 @@ l. ...  }
 .\hbox(40.2855+0.0)x40.2855
 ..\kern 4.91046
 ..\hbox(6.94444+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 ...\hbox(6.94444+0.0)x0.0
 ....\hbox(6.94444+0.0)x50.02786
@@ -216,7 +216,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 r
 .....\OT1/cmr/m/n/10 l
 .....\OT1/cmr/m/n/10 d
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
@@ -225,7 +225,7 @@ l. ...  }
 .\hbox(35.37505+4.91046)x40.2855
 ..\kern 40.2855
 ..\hbox(6.94444+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal -0.70711 0.70711 -0.70711 -0.70711 0 0 cm}
 ...\hbox(6.94444+0.0)x0.0
 ....\hbox(6.94444+0.0)x50.02786
@@ -241,7 +241,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 r
 .....\OT1/cmr/m/n/10 l
 .....\OT1/cmr/m/n/10 d
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
@@ -250,7 +250,7 @@ l. ...  }
 .\hbox(0.0+40.2855)x40.2855
 ..\kern 35.37505
 ..\hbox(6.94444+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal -0.70711 -0.70711 0.70711 -0.70711 0 0 cm}
 ...\hbox(6.94444+0.0)x0.0
 ....\hbox(6.94444+0.0)x50.02786
@@ -266,7 +266,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 r
 .....\OT1/cmr/m/n/10 l
 .....\OT1/cmr/m/n/10 d
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
@@ -275,7 +275,7 @@ l. ...  }
 .\hbox(4.91046+35.37505)x40.2855
 ..\kern 0.0
 ..\hbox(6.94444+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.70711 -0.70711 0.70711 0.70711 0 0 cm}
 ...\hbox(6.94444+0.0)x0.0
 ....\hbox(6.94444+0.0)x50.02786
@@ -291,7 +291,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 r
 .....\OT1/cmr/m/n/10 l
 .....\OT1/cmr/m/n/10 d
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
@@ -300,14 +300,14 @@ l. ...  }
 .\hbox(56.9723+0.0)x56.97232
 ..\kern 28.48616
 ..\hbox(40.2855+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 ...\hbox(40.2855+0.0)x0.0
 ....\hbox(40.2855+0.0)x40.2855
 .....\hbox(40.2855+0.0)x40.2855
 ......\kern 4.91046
 ......\hbox(6.94444+0.0)x0.0
-.......\special{pdf:literal q}
+.......\special{x:gsave}
 .......\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 .......\hbox(6.94444+0.0)x0.0
 ........\hbox(6.94444+0.0)x50.02786
@@ -323,8 +323,8 @@ l. ...  }
 .........\OT1/cmr/m/n/10 r
 .........\OT1/cmr/m/n/10 l
 .........\OT1/cmr/m/n/10 d
-.......\special{pdf:literal Q}
-...\special{pdf:literal Q}
+.......\special{x:grestore}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
@@ -354,7 +354,7 @@ l. ...  }
 .\hbox(6.94444+0.0)x50.02786
 ..\kern 0.0
 ..\hbox(6.94444+0.0)x50.02786
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1 0 0 1 0 0 cm}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
@@ -371,7 +371,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:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -381,7 +381,7 @@ l. ...  }
 .\hbox(6.94444+0.0)x125.06966
 ..\kern 0.0
 ..\hbox(6.94444+0.0)x125.06966
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 2.5 0 0 1 0 0 cm}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
@@ -398,7 +398,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:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -408,7 +408,7 @@ l. ...  }
 .\hbox(2.31477+0.0)x50.02786
 ..\kern 0.0
 ..\hbox(2.31477+0.0)x50.02786
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1 0 0 0.33333 0 0 cm}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
@@ -425,7 +425,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:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -435,7 +435,7 @@ l. ...  }
 .\hbox(6.94444+1.94444)x103.61133
 ..\kern 0.0
 ..\hbox(6.94444+1.94444)x103.61133
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1 0 0 1 0 0 cm}
 ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil
 ....\hbox(6.94444+1.94444)x103.61133
@@ -463,7 +463,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 w
 .....\OT1/cmr/m/n/10 n
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -473,7 +473,7 @@ l. ...  }
 .\hbox(20.83333+5.83333)x310.83398
 ..\kern 0.0
 ..\hbox(20.83333+5.83333)x310.83398
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 3 0 0 3 0 0 cm}
 ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil
 ....\hbox(6.94444+1.94444)x103.61133
@@ -501,7 +501,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 w
 .....\OT1/cmr/m/n/10 n
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -511,7 +511,7 @@ l. ...  }
 .\hbox(5.83333+20.83333)x310.83398
 ..\kern 310.83398
 ..\hbox(5.83333+20.83333)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal -3 0 0 -3 0 0 cm}
 ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil
 ....\hbox(6.94444+1.94444)x103.61133
@@ -539,7 +539,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 w
 .....\OT1/cmr/m/n/10 n
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
diff --git a/l3kernel/testfiles/d3dvisvgm.xetex.tlg b/l3kernel/testfiles/d3dvisvgm.xetex.tlg
index fd7baa4..b2f862d 100644
--- a/l3kernel/testfiles/d3dvisvgm.xetex.tlg
+++ b/l3kernel/testfiles/d3dvisvgm.xetex.tlg
@@ -6,7 +6,7 @@ TEST 1: Clip box
 ============================================================
 > \box27=
 \hbox(6.94444+1.0)x86.45851
-.\special{pdf:literal q}
+.\special{x:gsave}
 .\special{pdf:literal 0 -0.99626 86.1355 7.91476 re W n}
 .\hbox(6.94444+1.0)x0.0, glue set - 86.45851fil
 ..\hbox(6.94444+1.0)x86.45851
@@ -29,14 +29,14 @@ TEST 1: Clip box
 ...\OT1/cmr/m/n/10 w
 ...\OT1/cmr/m/n/10 n
 ..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:literal Q}
+.\special{x:grestore}
 .\glue 86.45851
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
 > \box27=
 \hbox(6.94444+0.0)x86.45851
-.\special{pdf:literal q}
+.\special{x:gsave}
 .\special{pdf:literal 0 0 86.1355 6.9185 re W n}
 .\hbox(6.94444+0.0)x0.0, glue set - 86.45851fil
 ..\hbox(6.94444+0.0)x86.45851
@@ -59,14 +59,14 @@ l. ...  }
 ...\OT1/cmr/m/n/10 w
 ...\OT1/cmr/m/n/10 n
 ..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:literal Q}
+.\special{x:grestore}
 .\glue 86.45851
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
 > \box27=
 \hbox(6.94444+1.0)x86.45851
-.\special{pdf:literal q}
+.\special{x:gsave}
 .\special{pdf:literal 0 -0.99626 86.1355 7.91476 re W n}
 .\hbox(6.94444+1.0)x0.0, glue set - 86.45851fil
 ..\hbox(6.94444+1.0)x86.45851
@@ -89,14 +89,14 @@ l. ...  }
 ...\OT1/cmr/m/n/10 w
 ...\OT1/cmr/m/n/10 n
 ..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:literal Q}
+.\special{x:grestore}
 .\glue 86.45851
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
 > \box27=
 \hbox(6.94444+1.94444)x20.0
-.\special{pdf:literal q}
+.\special{x:gsave}
 .\special{pdf:literal 0 -1.93718 19.92528 8.85568 re W n}
 .\hbox(6.94444+1.94444)x0.0, glue set - 20.0fil
 ..\hbox(6.94444+1.94444)x20.0
@@ -119,7 +119,7 @@ l. ...  }
 ...\OT1/cmr/m/n/10 w
 ...\OT1/cmr/m/n/10 n
 ..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:literal Q}
+.\special{x:grestore}
 .\glue 20.0
 ! OK.
 <argument> \l_tmpa_box 
@@ -150,7 +150,7 @@ l. ...  }
 .\hbox(6.94444+0.0)x50.02786
 ..\kern 0.0
 ..\hbox(6.94444+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1 0 0 1 0 0 cm}
 ...\hbox(6.94444+0.0)x0.0
 ....\hbox(6.94444+0.0)x50.02786
@@ -166,7 +166,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 r
 .....\OT1/cmr/m/n/10 l
 .....\OT1/cmr/m/n/10 d
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
@@ -175,7 +175,7 @@ l. ...  }
 .\hbox(31.028+0.0)x46.79762
 ..\kern 3.47223
 ..\hbox(6.94444+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.86603 0.5 -0.5 0.86603 0 0 cm}
 ...\hbox(6.94444+0.0)x0.0
 ....\hbox(6.94444+0.0)x50.02786
@@ -191,7 +191,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 r
 .....\OT1/cmr/m/n/10 l
 .....\OT1/cmr/m/n/10 d
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
@@ -200,7 +200,7 @@ l. ...  }
 .\hbox(40.2855+0.0)x40.2855
 ..\kern 4.91046
 ..\hbox(6.94444+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 ...\hbox(6.94444+0.0)x0.0
 ....\hbox(6.94444+0.0)x50.02786
@@ -216,7 +216,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 r
 .....\OT1/cmr/m/n/10 l
 .....\OT1/cmr/m/n/10 d
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
@@ -225,7 +225,7 @@ l. ...  }
 .\hbox(35.37505+4.91046)x40.2855
 ..\kern 40.2855
 ..\hbox(6.94444+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal -0.70711 0.70711 -0.70711 -0.70711 0 0 cm}
 ...\hbox(6.94444+0.0)x0.0
 ....\hbox(6.94444+0.0)x50.02786
@@ -241,7 +241,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 r
 .....\OT1/cmr/m/n/10 l
 .....\OT1/cmr/m/n/10 d
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
@@ -250,7 +250,7 @@ l. ...  }
 .\hbox(0.0+40.2855)x40.2855
 ..\kern 35.37505
 ..\hbox(6.94444+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal -0.70711 -0.70711 0.70711 -0.70711 0 0 cm}
 ...\hbox(6.94444+0.0)x0.0
 ....\hbox(6.94444+0.0)x50.02786
@@ -266,7 +266,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 r
 .....\OT1/cmr/m/n/10 l
 .....\OT1/cmr/m/n/10 d
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
@@ -275,7 +275,7 @@ l. ...  }
 .\hbox(4.91046+35.37505)x40.2855
 ..\kern 0.0
 ..\hbox(6.94444+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.70711 -0.70711 0.70711 0.70711 0 0 cm}
 ...\hbox(6.94444+0.0)x0.0
 ....\hbox(6.94444+0.0)x50.02786
@@ -291,7 +291,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 r
 .....\OT1/cmr/m/n/10 l
 .....\OT1/cmr/m/n/10 d
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
@@ -300,14 +300,14 @@ l. ...  }
 .\hbox(56.9723+0.0)x56.97232
 ..\kern 28.48616
 ..\hbox(40.2855+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 ...\hbox(40.2855+0.0)x0.0
 ....\hbox(40.2855+0.0)x40.2855
 .....\hbox(40.2855+0.0)x40.2855
 ......\kern 4.91046
 ......\hbox(6.94444+0.0)x0.0
-.......\special{pdf:literal q}
+.......\special{x:gsave}
 .......\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 .......\hbox(6.94444+0.0)x0.0
 ........\hbox(6.94444+0.0)x50.02786
@@ -323,8 +323,8 @@ l. ...  }
 .........\OT1/cmr/m/n/10 r
 .........\OT1/cmr/m/n/10 l
 .........\OT1/cmr/m/n/10 d
-.......\special{pdf:literal Q}
-...\special{pdf:literal Q}
+.......\special{x:grestore}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
@@ -354,7 +354,7 @@ l. ...  }
 .\hbox(6.94444+0.0)x50.02786
 ..\kern 0.0
 ..\hbox(6.94444+0.0)x50.02786
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1 0 0 1 0 0 cm}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
@@ -371,7 +371,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:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -381,7 +381,7 @@ l. ...  }
 .\hbox(6.94444+0.0)x125.06966
 ..\kern 0.0
 ..\hbox(6.94444+0.0)x125.06966
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 2.5 0 0 1 0 0 cm}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
@@ -398,7 +398,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:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -408,7 +408,7 @@ l. ...  }
 .\hbox(2.31477+0.0)x50.02786
 ..\kern 0.0
 ..\hbox(2.31477+0.0)x50.02786
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1 0 0 0.33333 0 0 cm}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
@@ -425,7 +425,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:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -435,7 +435,7 @@ l. ...  }
 .\hbox(6.94444+1.94444)x103.61133
 ..\kern 0.0
 ..\hbox(6.94444+1.94444)x103.61133
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1 0 0 1 0 0 cm}
 ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil
 ....\hbox(6.94444+1.94444)x103.61133
@@ -463,7 +463,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 w
 .....\OT1/cmr/m/n/10 n
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -473,7 +473,7 @@ l. ...  }
 .\hbox(20.83333+5.83333)x310.83398
 ..\kern 0.0
 ..\hbox(20.83333+5.83333)x310.83398
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 3 0 0 3 0 0 cm}
 ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil
 ....\hbox(6.94444+1.94444)x103.61133
@@ -501,7 +501,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 w
 .....\OT1/cmr/m/n/10 n
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -511,7 +511,7 @@ l. ...  }
 .\hbox(5.83333+20.83333)x310.83398
 ..\kern 310.83398
 ..\hbox(5.83333+20.83333)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal -3 0 0 -3 0 0 cm}
 ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil
 ....\hbox(6.94444+1.94444)x103.61133
@@ -539,7 +539,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 w
 .....\OT1/cmr/m/n/10 n
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
diff --git a/l3kernel/testfiles/d3pdfmode.xetex.tlg b/l3kernel/testfiles/d3pdfmode.xetex.tlg
index fd7baa4..b2f862d 100644
--- a/l3kernel/testfiles/d3pdfmode.xetex.tlg
+++ b/l3kernel/testfiles/d3pdfmode.xetex.tlg
@@ -6,7 +6,7 @@ TEST 1: Clip box
 ============================================================
 > \box27=
 \hbox(6.94444+1.0)x86.45851
-.\special{pdf:literal q}
+.\special{x:gsave}
 .\special{pdf:literal 0 -0.99626 86.1355 7.91476 re W n}
 .\hbox(6.94444+1.0)x0.0, glue set - 86.45851fil
 ..\hbox(6.94444+1.0)x86.45851
@@ -29,14 +29,14 @@ TEST 1: Clip box
 ...\OT1/cmr/m/n/10 w
 ...\OT1/cmr/m/n/10 n
 ..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:literal Q}
+.\special{x:grestore}
 .\glue 86.45851
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
 > \box27=
 \hbox(6.94444+0.0)x86.45851
-.\special{pdf:literal q}
+.\special{x:gsave}
 .\special{pdf:literal 0 0 86.1355 6.9185 re W n}
 .\hbox(6.94444+0.0)x0.0, glue set - 86.45851fil
 ..\hbox(6.94444+0.0)x86.45851
@@ -59,14 +59,14 @@ l. ...  }
 ...\OT1/cmr/m/n/10 w
 ...\OT1/cmr/m/n/10 n
 ..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:literal Q}
+.\special{x:grestore}
 .\glue 86.45851
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
 > \box27=
 \hbox(6.94444+1.0)x86.45851
-.\special{pdf:literal q}
+.\special{x:gsave}
 .\special{pdf:literal 0 -0.99626 86.1355 7.91476 re W n}
 .\hbox(6.94444+1.0)x0.0, glue set - 86.45851fil
 ..\hbox(6.94444+1.0)x86.45851
@@ -89,14 +89,14 @@ l. ...  }
 ...\OT1/cmr/m/n/10 w
 ...\OT1/cmr/m/n/10 n
 ..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:literal Q}
+.\special{x:grestore}
 .\glue 86.45851
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
 > \box27=
 \hbox(6.94444+1.94444)x20.0
-.\special{pdf:literal q}
+.\special{x:gsave}
 .\special{pdf:literal 0 -1.93718 19.92528 8.85568 re W n}
 .\hbox(6.94444+1.94444)x0.0, glue set - 20.0fil
 ..\hbox(6.94444+1.94444)x20.0
@@ -119,7 +119,7 @@ l. ...  }
 ...\OT1/cmr/m/n/10 w
 ...\OT1/cmr/m/n/10 n
 ..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:literal Q}
+.\special{x:grestore}
 .\glue 20.0
 ! OK.
 <argument> \l_tmpa_box 
@@ -150,7 +150,7 @@ l. ...  }
 .\hbox(6.94444+0.0)x50.02786
 ..\kern 0.0
 ..\hbox(6.94444+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1 0 0 1 0 0 cm}
 ...\hbox(6.94444+0.0)x0.0
 ....\hbox(6.94444+0.0)x50.02786
@@ -166,7 +166,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 r
 .....\OT1/cmr/m/n/10 l
 .....\OT1/cmr/m/n/10 d
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
@@ -175,7 +175,7 @@ l. ...  }
 .\hbox(31.028+0.0)x46.79762
 ..\kern 3.47223
 ..\hbox(6.94444+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.86603 0.5 -0.5 0.86603 0 0 cm}
 ...\hbox(6.94444+0.0)x0.0
 ....\hbox(6.94444+0.0)x50.02786
@@ -191,7 +191,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 r
 .....\OT1/cmr/m/n/10 l
 .....\OT1/cmr/m/n/10 d
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
@@ -200,7 +200,7 @@ l. ...  }
 .\hbox(40.2855+0.0)x40.2855
 ..\kern 4.91046
 ..\hbox(6.94444+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 ...\hbox(6.94444+0.0)x0.0
 ....\hbox(6.94444+0.0)x50.02786
@@ -216,7 +216,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 r
 .....\OT1/cmr/m/n/10 l
 .....\OT1/cmr/m/n/10 d
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
@@ -225,7 +225,7 @@ l. ...  }
 .\hbox(35.37505+4.91046)x40.2855
 ..\kern 40.2855
 ..\hbox(6.94444+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal -0.70711 0.70711 -0.70711 -0.70711 0 0 cm}
 ...\hbox(6.94444+0.0)x0.0
 ....\hbox(6.94444+0.0)x50.02786
@@ -241,7 +241,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 r
 .....\OT1/cmr/m/n/10 l
 .....\OT1/cmr/m/n/10 d
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
@@ -250,7 +250,7 @@ l. ...  }
 .\hbox(0.0+40.2855)x40.2855
 ..\kern 35.37505
 ..\hbox(6.94444+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal -0.70711 -0.70711 0.70711 -0.70711 0 0 cm}
 ...\hbox(6.94444+0.0)x0.0
 ....\hbox(6.94444+0.0)x50.02786
@@ -266,7 +266,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 r
 .....\OT1/cmr/m/n/10 l
 .....\OT1/cmr/m/n/10 d
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
@@ -275,7 +275,7 @@ l. ...  }
 .\hbox(4.91046+35.37505)x40.2855
 ..\kern 0.0
 ..\hbox(6.94444+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.70711 -0.70711 0.70711 0.70711 0 0 cm}
 ...\hbox(6.94444+0.0)x0.0
 ....\hbox(6.94444+0.0)x50.02786
@@ -291,7 +291,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 r
 .....\OT1/cmr/m/n/10 l
 .....\OT1/cmr/m/n/10 d
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
@@ -300,14 +300,14 @@ l. ...  }
 .\hbox(56.9723+0.0)x56.97232
 ..\kern 28.48616
 ..\hbox(40.2855+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 ...\hbox(40.2855+0.0)x0.0
 ....\hbox(40.2855+0.0)x40.2855
 .....\hbox(40.2855+0.0)x40.2855
 ......\kern 4.91046
 ......\hbox(6.94444+0.0)x0.0
-.......\special{pdf:literal q}
+.......\special{x:gsave}
 .......\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 .......\hbox(6.94444+0.0)x0.0
 ........\hbox(6.94444+0.0)x50.02786
@@ -323,8 +323,8 @@ l. ...  }
 .........\OT1/cmr/m/n/10 r
 .........\OT1/cmr/m/n/10 l
 .........\OT1/cmr/m/n/10 d
-.......\special{pdf:literal Q}
-...\special{pdf:literal Q}
+.......\special{x:grestore}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
@@ -354,7 +354,7 @@ l. ...  }
 .\hbox(6.94444+0.0)x50.02786
 ..\kern 0.0
 ..\hbox(6.94444+0.0)x50.02786
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1 0 0 1 0 0 cm}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
@@ -371,7 +371,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:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -381,7 +381,7 @@ l. ...  }
 .\hbox(6.94444+0.0)x125.06966
 ..\kern 0.0
 ..\hbox(6.94444+0.0)x125.06966
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 2.5 0 0 1 0 0 cm}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
@@ -398,7 +398,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:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -408,7 +408,7 @@ l. ...  }
 .\hbox(2.31477+0.0)x50.02786
 ..\kern 0.0
 ..\hbox(2.31477+0.0)x50.02786
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1 0 0 0.33333 0 0 cm}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
@@ -425,7 +425,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:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -435,7 +435,7 @@ l. ...  }
 .\hbox(6.94444+1.94444)x103.61133
 ..\kern 0.0
 ..\hbox(6.94444+1.94444)x103.61133
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1 0 0 1 0 0 cm}
 ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil
 ....\hbox(6.94444+1.94444)x103.61133
@@ -463,7 +463,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 w
 .....\OT1/cmr/m/n/10 n
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -473,7 +473,7 @@ l. ...  }
 .\hbox(20.83333+5.83333)x310.83398
 ..\kern 0.0
 ..\hbox(20.83333+5.83333)x310.83398
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 3 0 0 3 0 0 cm}
 ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil
 ....\hbox(6.94444+1.94444)x103.61133
@@ -501,7 +501,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 w
 .....\OT1/cmr/m/n/10 n
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -511,7 +511,7 @@ l. ...  }
 .\hbox(5.83333+20.83333)x310.83398
 ..\kern 310.83398
 ..\hbox(5.83333+20.83333)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal -3 0 0 -3 0 0 cm}
 ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil
 ....\hbox(6.94444+1.94444)x103.61133
@@ -539,7 +539,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 w
 .....\OT1/cmr/m/n/10 n
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
diff --git a/l3kernel/testfiles/d3xdvipdfmx.xetex.tlg b/l3kernel/testfiles/d3xdvipdfmx.xetex.tlg
index fd7baa4..b2f862d 100644
--- a/l3kernel/testfiles/d3xdvipdfmx.xetex.tlg
+++ b/l3kernel/testfiles/d3xdvipdfmx.xetex.tlg
@@ -6,7 +6,7 @@ TEST 1: Clip box
 ============================================================
 > \box27=
 \hbox(6.94444+1.0)x86.45851
-.\special{pdf:literal q}
+.\special{x:gsave}
 .\special{pdf:literal 0 -0.99626 86.1355 7.91476 re W n}
 .\hbox(6.94444+1.0)x0.0, glue set - 86.45851fil
 ..\hbox(6.94444+1.0)x86.45851
@@ -29,14 +29,14 @@ TEST 1: Clip box
 ...\OT1/cmr/m/n/10 w
 ...\OT1/cmr/m/n/10 n
 ..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:literal Q}
+.\special{x:grestore}
 .\glue 86.45851
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
 > \box27=
 \hbox(6.94444+0.0)x86.45851
-.\special{pdf:literal q}
+.\special{x:gsave}
 .\special{pdf:literal 0 0 86.1355 6.9185 re W n}
 .\hbox(6.94444+0.0)x0.0, glue set - 86.45851fil
 ..\hbox(6.94444+0.0)x86.45851
@@ -59,14 +59,14 @@ l. ...  }
 ...\OT1/cmr/m/n/10 w
 ...\OT1/cmr/m/n/10 n
 ..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:literal Q}
+.\special{x:grestore}
 .\glue 86.45851
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
 > \box27=
 \hbox(6.94444+1.0)x86.45851
-.\special{pdf:literal q}
+.\special{x:gsave}
 .\special{pdf:literal 0 -0.99626 86.1355 7.91476 re W n}
 .\hbox(6.94444+1.0)x0.0, glue set - 86.45851fil
 ..\hbox(6.94444+1.0)x86.45851
@@ -89,14 +89,14 @@ l. ...  }
 ...\OT1/cmr/m/n/10 w
 ...\OT1/cmr/m/n/10 n
 ..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:literal Q}
+.\special{x:grestore}
 .\glue 86.45851
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
 > \box27=
 \hbox(6.94444+1.94444)x20.0
-.\special{pdf:literal q}
+.\special{x:gsave}
 .\special{pdf:literal 0 -1.93718 19.92528 8.85568 re W n}
 .\hbox(6.94444+1.94444)x0.0, glue set - 20.0fil
 ..\hbox(6.94444+1.94444)x20.0
@@ -119,7 +119,7 @@ l. ...  }
 ...\OT1/cmr/m/n/10 w
 ...\OT1/cmr/m/n/10 n
 ..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{pdf:literal Q}
+.\special{x:grestore}
 .\glue 20.0
 ! OK.
 <argument> \l_tmpa_box 
@@ -150,7 +150,7 @@ l. ...  }
 .\hbox(6.94444+0.0)x50.02786
 ..\kern 0.0
 ..\hbox(6.94444+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1 0 0 1 0 0 cm}
 ...\hbox(6.94444+0.0)x0.0
 ....\hbox(6.94444+0.0)x50.02786
@@ -166,7 +166,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 r
 .....\OT1/cmr/m/n/10 l
 .....\OT1/cmr/m/n/10 d
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
@@ -175,7 +175,7 @@ l. ...  }
 .\hbox(31.028+0.0)x46.79762
 ..\kern 3.47223
 ..\hbox(6.94444+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.86603 0.5 -0.5 0.86603 0 0 cm}
 ...\hbox(6.94444+0.0)x0.0
 ....\hbox(6.94444+0.0)x50.02786
@@ -191,7 +191,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 r
 .....\OT1/cmr/m/n/10 l
 .....\OT1/cmr/m/n/10 d
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
@@ -200,7 +200,7 @@ l. ...  }
 .\hbox(40.2855+0.0)x40.2855
 ..\kern 4.91046
 ..\hbox(6.94444+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 ...\hbox(6.94444+0.0)x0.0
 ....\hbox(6.94444+0.0)x50.02786
@@ -216,7 +216,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 r
 .....\OT1/cmr/m/n/10 l
 .....\OT1/cmr/m/n/10 d
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
@@ -225,7 +225,7 @@ l. ...  }
 .\hbox(35.37505+4.91046)x40.2855
 ..\kern 40.2855
 ..\hbox(6.94444+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal -0.70711 0.70711 -0.70711 -0.70711 0 0 cm}
 ...\hbox(6.94444+0.0)x0.0
 ....\hbox(6.94444+0.0)x50.02786
@@ -241,7 +241,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 r
 .....\OT1/cmr/m/n/10 l
 .....\OT1/cmr/m/n/10 d
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
@@ -250,7 +250,7 @@ l. ...  }
 .\hbox(0.0+40.2855)x40.2855
 ..\kern 35.37505
 ..\hbox(6.94444+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal -0.70711 -0.70711 0.70711 -0.70711 0 0 cm}
 ...\hbox(6.94444+0.0)x0.0
 ....\hbox(6.94444+0.0)x50.02786
@@ -266,7 +266,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 r
 .....\OT1/cmr/m/n/10 l
 .....\OT1/cmr/m/n/10 d
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
@@ -275,7 +275,7 @@ l. ...  }
 .\hbox(4.91046+35.37505)x40.2855
 ..\kern 0.0
 ..\hbox(6.94444+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.70711 -0.70711 0.70711 0.70711 0 0 cm}
 ...\hbox(6.94444+0.0)x0.0
 ....\hbox(6.94444+0.0)x50.02786
@@ -291,7 +291,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 r
 .....\OT1/cmr/m/n/10 l
 .....\OT1/cmr/m/n/10 d
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
@@ -300,14 +300,14 @@ l. ...  }
 .\hbox(56.9723+0.0)x56.97232
 ..\kern 28.48616
 ..\hbox(40.2855+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 ...\hbox(40.2855+0.0)x0.0
 ....\hbox(40.2855+0.0)x40.2855
 .....\hbox(40.2855+0.0)x40.2855
 ......\kern 4.91046
 ......\hbox(6.94444+0.0)x0.0
-.......\special{pdf:literal q}
+.......\special{x:gsave}
 .......\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 .......\hbox(6.94444+0.0)x0.0
 ........\hbox(6.94444+0.0)x50.02786
@@ -323,8 +323,8 @@ l. ...  }
 .........\OT1/cmr/m/n/10 r
 .........\OT1/cmr/m/n/10 l
 .........\OT1/cmr/m/n/10 d
-.......\special{pdf:literal Q}
-...\special{pdf:literal Q}
+.......\special{x:grestore}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
@@ -354,7 +354,7 @@ l. ...  }
 .\hbox(6.94444+0.0)x50.02786
 ..\kern 0.0
 ..\hbox(6.94444+0.0)x50.02786
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1 0 0 1 0 0 cm}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
@@ -371,7 +371,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:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -381,7 +381,7 @@ l. ...  }
 .\hbox(6.94444+0.0)x125.06966
 ..\kern 0.0
 ..\hbox(6.94444+0.0)x125.06966
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 2.5 0 0 1 0 0 cm}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
@@ -398,7 +398,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:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -408,7 +408,7 @@ l. ...  }
 .\hbox(2.31477+0.0)x50.02786
 ..\kern 0.0
 ..\hbox(2.31477+0.0)x50.02786
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1 0 0 0.33333 0 0 cm}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
@@ -425,7 +425,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:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -435,7 +435,7 @@ l. ...  }
 .\hbox(6.94444+1.94444)x103.61133
 ..\kern 0.0
 ..\hbox(6.94444+1.94444)x103.61133
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1 0 0 1 0 0 cm}
 ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil
 ....\hbox(6.94444+1.94444)x103.61133
@@ -463,7 +463,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 w
 .....\OT1/cmr/m/n/10 n
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -473,7 +473,7 @@ l. ...  }
 .\hbox(20.83333+5.83333)x310.83398
 ..\kern 0.0
 ..\hbox(20.83333+5.83333)x310.83398
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 3 0 0 3 0 0 cm}
 ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil
 ....\hbox(6.94444+1.94444)x103.61133
@@ -501,7 +501,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 w
 .....\OT1/cmr/m/n/10 n
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -511,7 +511,7 @@ l. ...  }
 .\hbox(5.83333+20.83333)x310.83398
 ..\kern 310.83398
 ..\hbox(5.83333+20.83333)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal -3 0 0 -3 0 0 cm}
 ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil
 ....\hbox(6.94444+1.94444)x103.61133
@@ -539,7 +539,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 w
 .....\OT1/cmr/m/n/10 n
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
diff --git a/l3kernel/testfiles/m3box004.ptex.tlg b/l3kernel/testfiles/m3box004.ptex.tlg
index ee27401..a14282b 100644
--- a/l3kernel/testfiles/m3box004.ptex.tlg
+++ b/l3kernel/testfiles/m3box004.ptex.tlg
@@ -9,14 +9,14 @@ TEST 1: Rotate boxes
 .\hbox(4.30554+0.0)x15.00005
 ..\kern 0.0
 ..\hbox(4.30554+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1 0 0 1 0 0 cm}
 ...\hbox(4.30554+0.0)x0.0
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...}
@@ -25,14 +25,14 @@ l. ...}
 .\hbox(13.65111+0.0)x13.65111
 ..\kern 3.04448
 ..\hbox(4.30554+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 ...\hbox(4.30554+0.0)x0.0
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...}
@@ -41,14 +41,14 @@ l. ...}
 .\hbox(15.00005+0.0)x4.30554
 ..\kern 4.30554
 ..\hbox(4.30554+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0 1 -1 0 0 0 cm}
 ...\hbox(4.30554+0.0)x0.0
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...}
@@ -57,14 +57,14 @@ l. ...}
 .\hbox(10.60663+3.04448)x13.65111
 ..\kern 13.65111
 ..\hbox(4.30554+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal -0.70711 0.70711 -0.70711 -0.70711 0 0 cm}
 ...\hbox(4.30554+0.0)x0.0
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...}
@@ -73,14 +73,14 @@ l. ...}
 .\hbox(0.0+4.30554)x15.00005
 ..\kern 15.00005
 ..\hbox(4.30554+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal -1 0 0 -1 0 0 cm}
 ...\hbox(4.30554+0.0)x0.0
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...}
@@ -89,14 +89,14 @@ l. ...}
 .\hbox(0.0+13.65111)x13.65111
 ..\kern 10.60663
 ..\hbox(4.30554+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal -0.70711 -0.70711 0.70711 -0.70711 0 0 cm}
 ...\hbox(4.30554+0.0)x0.0
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...}
@@ -105,14 +105,14 @@ l. ...}
 .\hbox(3.04448+10.60663)x13.65111
 ..\kern 0.0
 ..\hbox(4.30554+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.70711 -0.70711 0.70711 0.70711 0 0 cm}
 ...\hbox(4.30554+0.0)x0.0
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...}
@@ -125,7 +125,7 @@ TEST 2: Scale boxes
 .\hbox(4.30554+0.0)x15.00005
 ..\kern 0.0
 ..\hbox(4.30554+0.0)x15.00005
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1 0 0 1 0 0 cm}
 ...\hbox(4.30554+0.0)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+0.0)x15.00005
@@ -133,7 +133,7 @@ TEST 2: Scale boxes
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -143,7 +143,7 @@ l. ...}
 .\hbox(4.30554+0.0)x15.00005
 ..\kern 15.00005
 ..\hbox(4.30554+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal -1 0 0 1 0 0 cm}
 ...\hbox(4.30554+0.0)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+0.0)x15.00005
@@ -151,7 +151,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -161,7 +161,7 @@ l. ...}
 .\hbox(0.0+4.30554)x15.00005
 ..\kern 0.0
 ..\hbox(0.0+4.30554)x15.00005
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1 0 0 -1 0 0 cm}
 ...\hbox(4.30554+0.0)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+0.0)x15.00005
@@ -169,7 +169,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -179,7 +179,7 @@ l. ...}
 .\hbox(4.30554+0.0)x7.50002
 ..\kern 0.0
 ..\hbox(4.30554+0.0)x7.50002
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.5 0 0 1 0 0 cm}
 ...\hbox(4.30554+0.0)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+0.0)x15.00005
@@ -187,7 +187,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -197,7 +197,7 @@ l. ...}
 .\hbox(2.15277+0.0)x15.00005
 ..\kern 0.0
 ..\hbox(2.15277+0.0)x15.00005
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1 0 0 0.5 0 0 cm}
 ...\hbox(4.30554+0.0)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+0.0)x15.00005
@@ -205,7 +205,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -215,7 +215,7 @@ l. ...}
 .\hbox(8.61108+0.0)x30.00009
 ..\kern 0.0
 ..\hbox(8.61108+0.0)x30.00009
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 2 0 0 2 0 0 cm}
 ...\hbox(4.30554+0.0)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+0.0)x15.00005
@@ -223,7 +223,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -233,7 +233,7 @@ l. ...}
 .\hbox(43.05542+0.0)x1.50009
 ..\kern 0.0
 ..\hbox(43.05542+0.0)x1.50009
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.1 0 0 10 0 0 cm}
 ...\hbox(4.30554+0.0)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+0.0)x15.00005
@@ -241,7 +241,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -255,7 +255,7 @@ TEST 3: Resize boxes
 .\hbox(19.60077+8.85197)x28.45274
 ..\kern 0.0
 ..\hbox(19.60077+8.85197)x28.45274
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1.89684 0 0 4.55245 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -263,7 +263,7 @@ TEST 3: Resize boxes
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -273,7 +273,7 @@ l. ...}
 .\hbox(19.60077+8.85197)x28.45274
 ..\kern 28.45274
 ..\hbox(19.60077+8.85197)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal -1.89684 0 0 4.55245 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -281,7 +281,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -291,7 +291,7 @@ l. ...}
 .\hbox(8.85197+19.60077)x28.45274
 ..\kern 0.0
 ..\hbox(8.85197+19.60077)x28.45274
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1.89684 0 0 -4.55245 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -299,7 +299,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -309,7 +309,7 @@ l. ...}
 .\hbox(19.60077+8.85197)x14.22636
 ..\kern 0.0
 ..\hbox(19.60077+8.85197)x14.22636
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.94842 0 0 4.55245 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -317,7 +317,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -327,7 +327,7 @@ l. ...}
 .\hbox(9.80038+4.42598)x28.45274
 ..\kern 0.0
 ..\hbox(9.80038+4.42598)x28.45274
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1.89684 0 0 2.27622 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -335,7 +335,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -345,7 +345,7 @@ l. ...}
 .\hbox(39.20154+17.70396)x56.9055
 ..\kern 0.0
 ..\hbox(39.20154+17.70396)x56.9055
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 3.79369 0 0 9.1049 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -353,7 +353,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -363,7 +363,7 @@ l. ...}
 .\hbox(196.00774+88.51982)x2.84544
 ..\kern 0.0
 ..\hbox(196.00774+88.51982)x2.84544
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.1897 0 0 45.52452 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -371,7 +371,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -385,7 +385,7 @@ TEST 4: Resize boxes proportionally
 .\hbox(28.45274+12.84966)x99.1263
 ..\kern 0.0
 ..\hbox(28.45274+12.84966)x99.1263
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 6.6084 0 0 6.6084 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -393,7 +393,7 @@ TEST 4: Resize boxes proportionally
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -403,7 +403,7 @@ l. ...}
 .\hbox(12.84966+28.45274)x99.1263
 ..\kern 99.1263
 ..\hbox(12.84966+28.45274)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal -6.6084 0 0 -6.6084 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -411,7 +411,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -421,7 +421,7 @@ l. ...}
 .\hbox(14.22636+6.42482)x49.56313
 ..\kern 0.0
 ..\hbox(14.22636+6.42482)x49.56313
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 3.3042 0 0 3.3042 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -429,7 +429,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -439,7 +439,7 @@ l. ...}
 .\hbox(56.9055+25.69931)x198.25266
 ..\kern 0.0
 ..\hbox(56.9055+25.69931)x198.25266
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 13.2168 0 0 13.2168 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -447,7 +447,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -457,7 +457,7 @@ l. ...}
 .\hbox(19.60077+8.85197)x68.28696
 ..\kern 0.0
 ..\hbox(19.60077+8.85197)x68.28696
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 4.55245 0 0 4.55245 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -465,7 +465,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -475,7 +475,7 @@ l. ...}
 .\hbox(8.85197+19.60077)x68.28696
 ..\kern 68.28696
 ..\hbox(8.85197+19.60077)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal -4.55245 0 0 -4.55245 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -483,7 +483,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -493,7 +493,7 @@ l. ...}
 .\hbox(9.80038+4.42598)x34.14346
 ..\kern 0.0
 ..\hbox(9.80038+4.42598)x34.14346
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 2.27622 0 0 2.27622 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -501,7 +501,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -511,7 +511,7 @@ l. ...}
 .\hbox(39.20154+17.70396)x136.57396
 ..\kern 0.0
 ..\hbox(39.20154+17.70396)x136.57396
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 9.1049 0 0 9.1049 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -519,7 +519,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -529,7 +529,7 @@ l. ...}
 .\hbox(8.16695+3.68831)x28.45274
 ..\kern 0.0
 ..\hbox(8.16695+3.68831)x28.45274
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1.89684 0 0 1.89684 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -537,7 +537,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -547,7 +547,7 @@ l. ...}
 .\hbox(3.68831+8.16695)x28.45274
 ..\kern 28.45274
 ..\hbox(3.68831+8.16695)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal -1.89684 0 0 -1.89684 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -555,7 +555,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -565,7 +565,7 @@ l. ...}
 .\hbox(4.08347+1.84415)x14.22636
 ..\kern 0.0
 ..\hbox(4.08347+1.84415)x14.22636
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.94842 0 0 0.94842 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -573,7 +573,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -583,7 +583,7 @@ l. ...}
 .\hbox(16.3339+7.37662)x56.9055
 ..\kern 0.0
 ..\hbox(16.3339+7.37662)x56.9055
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 3.79369 0 0 3.79369 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -591,7 +591,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -601,7 +601,7 @@ l. ...}
 .\hbox(28.45274+12.84966)x28.45274
 ..\kern 0.0
 ..\hbox(28.45274+12.84966)x28.45274
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1.89684 0 0 6.6084 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -609,7 +609,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -619,7 +619,7 @@ l. ...}
 .\hbox(28.45274+12.84966)x28.45274
 ..\kern 28.45274
 ..\hbox(28.45274+12.84966)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal -1.89684 0 0 6.6084 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -627,7 +627,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -637,7 +637,7 @@ l. ...}
 .\hbox(12.84966+28.45274)x28.45274
 ..\kern 0.0
 ..\hbox(12.84966+28.45274)x28.45274
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1.89684 0 0 -6.6084 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -645,7 +645,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -655,7 +655,7 @@ l. ...}
 .\hbox(28.45274+12.84966)x14.22636
 ..\kern 0.0
 ..\hbox(28.45274+12.84966)x14.22636
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.94842 0 0 6.6084 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -663,7 +663,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -673,7 +673,7 @@ l. ...}
 .\hbox(14.22636+6.42482)x28.45274
 ..\kern 0.0
 ..\hbox(14.22636+6.42482)x28.45274
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1.89684 0 0 3.3042 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -681,7 +681,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -691,7 +691,7 @@ l. ...}
 .\hbox(56.9055+25.69931)x56.9055
 ..\kern 0.0
 ..\hbox(56.9055+25.69931)x56.9055
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 3.79369 0 0 13.2168 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -699,7 +699,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -709,7 +709,7 @@ l. ...}
 .\hbox(284.52756+128.49661)x2.84544
 ..\kern 0.0
 ..\hbox(284.52756+128.49661)x2.84544
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.1897 0 0 66.08403 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -717,7 +717,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -731,7 +731,7 @@ TEST 5: Resize boxes automatically
 .\hbox(8.16696+3.68831)x28.45284
 ..\kern 0.0
 ..\hbox(8.16696+3.68831)x28.45284
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1.89684 0 0 1.89684 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -739,7 +739,7 @@ TEST 5: Resize boxes automatically
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -749,7 +749,7 @@ l. ...  }
 .\hbox(8.16696+3.68831)x28.45284
 ..\kern 0.0
 ..\hbox(8.16696+3.68831)x28.45284
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1.89684 0 0 1.89684 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -757,7 +757,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
diff --git a/l3kernel/testfiles/m3box004.uptex.tlg b/l3kernel/testfiles/m3box004.uptex.tlg
index ee27401..a14282b 100644
--- a/l3kernel/testfiles/m3box004.uptex.tlg
+++ b/l3kernel/testfiles/m3box004.uptex.tlg
@@ -9,14 +9,14 @@ TEST 1: Rotate boxes
 .\hbox(4.30554+0.0)x15.00005
 ..\kern 0.0
 ..\hbox(4.30554+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1 0 0 1 0 0 cm}
 ...\hbox(4.30554+0.0)x0.0
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...}
@@ -25,14 +25,14 @@ l. ...}
 .\hbox(13.65111+0.0)x13.65111
 ..\kern 3.04448
 ..\hbox(4.30554+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 ...\hbox(4.30554+0.0)x0.0
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...}
@@ -41,14 +41,14 @@ l. ...}
 .\hbox(15.00005+0.0)x4.30554
 ..\kern 4.30554
 ..\hbox(4.30554+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0 1 -1 0 0 0 cm}
 ...\hbox(4.30554+0.0)x0.0
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...}
@@ -57,14 +57,14 @@ l. ...}
 .\hbox(10.60663+3.04448)x13.65111
 ..\kern 13.65111
 ..\hbox(4.30554+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal -0.70711 0.70711 -0.70711 -0.70711 0 0 cm}
 ...\hbox(4.30554+0.0)x0.0
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...}
@@ -73,14 +73,14 @@ l. ...}
 .\hbox(0.0+4.30554)x15.00005
 ..\kern 15.00005
 ..\hbox(4.30554+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal -1 0 0 -1 0 0 cm}
 ...\hbox(4.30554+0.0)x0.0
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...}
@@ -89,14 +89,14 @@ l. ...}
 .\hbox(0.0+13.65111)x13.65111
 ..\kern 10.60663
 ..\hbox(4.30554+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal -0.70711 -0.70711 0.70711 -0.70711 0 0 cm}
 ...\hbox(4.30554+0.0)x0.0
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...}
@@ -105,14 +105,14 @@ l. ...}
 .\hbox(3.04448+10.60663)x13.65111
 ..\kern 0.0
 ..\hbox(4.30554+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.70711 -0.70711 0.70711 0.70711 0 0 cm}
 ...\hbox(4.30554+0.0)x0.0
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...}
@@ -125,7 +125,7 @@ TEST 2: Scale boxes
 .\hbox(4.30554+0.0)x15.00005
 ..\kern 0.0
 ..\hbox(4.30554+0.0)x15.00005
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1 0 0 1 0 0 cm}
 ...\hbox(4.30554+0.0)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+0.0)x15.00005
@@ -133,7 +133,7 @@ TEST 2: Scale boxes
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -143,7 +143,7 @@ l. ...}
 .\hbox(4.30554+0.0)x15.00005
 ..\kern 15.00005
 ..\hbox(4.30554+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal -1 0 0 1 0 0 cm}
 ...\hbox(4.30554+0.0)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+0.0)x15.00005
@@ -151,7 +151,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -161,7 +161,7 @@ l. ...}
 .\hbox(0.0+4.30554)x15.00005
 ..\kern 0.0
 ..\hbox(0.0+4.30554)x15.00005
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1 0 0 -1 0 0 cm}
 ...\hbox(4.30554+0.0)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+0.0)x15.00005
@@ -169,7 +169,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -179,7 +179,7 @@ l. ...}
 .\hbox(4.30554+0.0)x7.50002
 ..\kern 0.0
 ..\hbox(4.30554+0.0)x7.50002
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.5 0 0 1 0 0 cm}
 ...\hbox(4.30554+0.0)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+0.0)x15.00005
@@ -187,7 +187,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -197,7 +197,7 @@ l. ...}
 .\hbox(2.15277+0.0)x15.00005
 ..\kern 0.0
 ..\hbox(2.15277+0.0)x15.00005
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1 0 0 0.5 0 0 cm}
 ...\hbox(4.30554+0.0)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+0.0)x15.00005
@@ -205,7 +205,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -215,7 +215,7 @@ l. ...}
 .\hbox(8.61108+0.0)x30.00009
 ..\kern 0.0
 ..\hbox(8.61108+0.0)x30.00009
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 2 0 0 2 0 0 cm}
 ...\hbox(4.30554+0.0)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+0.0)x15.00005
@@ -223,7 +223,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -233,7 +233,7 @@ l. ...}
 .\hbox(43.05542+0.0)x1.50009
 ..\kern 0.0
 ..\hbox(43.05542+0.0)x1.50009
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.1 0 0 10 0 0 cm}
 ...\hbox(4.30554+0.0)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+0.0)x15.00005
@@ -241,7 +241,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -255,7 +255,7 @@ TEST 3: Resize boxes
 .\hbox(19.60077+8.85197)x28.45274
 ..\kern 0.0
 ..\hbox(19.60077+8.85197)x28.45274
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1.89684 0 0 4.55245 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -263,7 +263,7 @@ TEST 3: Resize boxes
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -273,7 +273,7 @@ l. ...}
 .\hbox(19.60077+8.85197)x28.45274
 ..\kern 28.45274
 ..\hbox(19.60077+8.85197)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal -1.89684 0 0 4.55245 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -281,7 +281,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -291,7 +291,7 @@ l. ...}
 .\hbox(8.85197+19.60077)x28.45274
 ..\kern 0.0
 ..\hbox(8.85197+19.60077)x28.45274
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1.89684 0 0 -4.55245 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -299,7 +299,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -309,7 +309,7 @@ l. ...}
 .\hbox(19.60077+8.85197)x14.22636
 ..\kern 0.0
 ..\hbox(19.60077+8.85197)x14.22636
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.94842 0 0 4.55245 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -317,7 +317,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -327,7 +327,7 @@ l. ...}
 .\hbox(9.80038+4.42598)x28.45274
 ..\kern 0.0
 ..\hbox(9.80038+4.42598)x28.45274
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1.89684 0 0 2.27622 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -335,7 +335,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -345,7 +345,7 @@ l. ...}
 .\hbox(39.20154+17.70396)x56.9055
 ..\kern 0.0
 ..\hbox(39.20154+17.70396)x56.9055
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 3.79369 0 0 9.1049 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -353,7 +353,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -363,7 +363,7 @@ l. ...}
 .\hbox(196.00774+88.51982)x2.84544
 ..\kern 0.0
 ..\hbox(196.00774+88.51982)x2.84544
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.1897 0 0 45.52452 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -371,7 +371,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -385,7 +385,7 @@ TEST 4: Resize boxes proportionally
 .\hbox(28.45274+12.84966)x99.1263
 ..\kern 0.0
 ..\hbox(28.45274+12.84966)x99.1263
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 6.6084 0 0 6.6084 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -393,7 +393,7 @@ TEST 4: Resize boxes proportionally
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -403,7 +403,7 @@ l. ...}
 .\hbox(12.84966+28.45274)x99.1263
 ..\kern 99.1263
 ..\hbox(12.84966+28.45274)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal -6.6084 0 0 -6.6084 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -411,7 +411,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -421,7 +421,7 @@ l. ...}
 .\hbox(14.22636+6.42482)x49.56313
 ..\kern 0.0
 ..\hbox(14.22636+6.42482)x49.56313
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 3.3042 0 0 3.3042 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -429,7 +429,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -439,7 +439,7 @@ l. ...}
 .\hbox(56.9055+25.69931)x198.25266
 ..\kern 0.0
 ..\hbox(56.9055+25.69931)x198.25266
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 13.2168 0 0 13.2168 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -447,7 +447,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -457,7 +457,7 @@ l. ...}
 .\hbox(19.60077+8.85197)x68.28696
 ..\kern 0.0
 ..\hbox(19.60077+8.85197)x68.28696
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 4.55245 0 0 4.55245 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -465,7 +465,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -475,7 +475,7 @@ l. ...}
 .\hbox(8.85197+19.60077)x68.28696
 ..\kern 68.28696
 ..\hbox(8.85197+19.60077)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal -4.55245 0 0 -4.55245 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -483,7 +483,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -493,7 +493,7 @@ l. ...}
 .\hbox(9.80038+4.42598)x34.14346
 ..\kern 0.0
 ..\hbox(9.80038+4.42598)x34.14346
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 2.27622 0 0 2.27622 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -501,7 +501,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -511,7 +511,7 @@ l. ...}
 .\hbox(39.20154+17.70396)x136.57396
 ..\kern 0.0
 ..\hbox(39.20154+17.70396)x136.57396
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 9.1049 0 0 9.1049 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -519,7 +519,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -529,7 +529,7 @@ l. ...}
 .\hbox(8.16695+3.68831)x28.45274
 ..\kern 0.0
 ..\hbox(8.16695+3.68831)x28.45274
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1.89684 0 0 1.89684 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -537,7 +537,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -547,7 +547,7 @@ l. ...}
 .\hbox(3.68831+8.16695)x28.45274
 ..\kern 28.45274
 ..\hbox(3.68831+8.16695)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal -1.89684 0 0 -1.89684 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -555,7 +555,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -565,7 +565,7 @@ l. ...}
 .\hbox(4.08347+1.84415)x14.22636
 ..\kern 0.0
 ..\hbox(4.08347+1.84415)x14.22636
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.94842 0 0 0.94842 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -573,7 +573,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -583,7 +583,7 @@ l. ...}
 .\hbox(16.3339+7.37662)x56.9055
 ..\kern 0.0
 ..\hbox(16.3339+7.37662)x56.9055
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 3.79369 0 0 3.79369 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -591,7 +591,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -601,7 +601,7 @@ l. ...}
 .\hbox(28.45274+12.84966)x28.45274
 ..\kern 0.0
 ..\hbox(28.45274+12.84966)x28.45274
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1.89684 0 0 6.6084 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -609,7 +609,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -619,7 +619,7 @@ l. ...}
 .\hbox(28.45274+12.84966)x28.45274
 ..\kern 28.45274
 ..\hbox(28.45274+12.84966)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal -1.89684 0 0 6.6084 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -627,7 +627,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -637,7 +637,7 @@ l. ...}
 .\hbox(12.84966+28.45274)x28.45274
 ..\kern 0.0
 ..\hbox(12.84966+28.45274)x28.45274
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1.89684 0 0 -6.6084 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -645,7 +645,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -655,7 +655,7 @@ l. ...}
 .\hbox(28.45274+12.84966)x14.22636
 ..\kern 0.0
 ..\hbox(28.45274+12.84966)x14.22636
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.94842 0 0 6.6084 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -663,7 +663,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -673,7 +673,7 @@ l. ...}
 .\hbox(14.22636+6.42482)x28.45274
 ..\kern 0.0
 ..\hbox(14.22636+6.42482)x28.45274
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1.89684 0 0 3.3042 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -681,7 +681,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -691,7 +691,7 @@ l. ...}
 .\hbox(56.9055+25.69931)x56.9055
 ..\kern 0.0
 ..\hbox(56.9055+25.69931)x56.9055
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 3.79369 0 0 13.2168 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -699,7 +699,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -709,7 +709,7 @@ l. ...}
 .\hbox(284.52756+128.49661)x2.84544
 ..\kern 0.0
 ..\hbox(284.52756+128.49661)x2.84544
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.1897 0 0 66.08403 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -717,7 +717,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -731,7 +731,7 @@ TEST 5: Resize boxes automatically
 .\hbox(8.16696+3.68831)x28.45284
 ..\kern 0.0
 ..\hbox(8.16696+3.68831)x28.45284
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1.89684 0 0 1.89684 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -739,7 +739,7 @@ TEST 5: Resize boxes automatically
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -749,7 +749,7 @@ l. ...  }
 .\hbox(8.16696+3.68831)x28.45284
 ..\kern 0.0
 ..\hbox(8.16696+3.68831)x28.45284
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1.89684 0 0 1.89684 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -757,7 +757,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
diff --git a/l3kernel/testfiles/m3box004.xetex.tlg b/l3kernel/testfiles/m3box004.xetex.tlg
index ee27401..a14282b 100644
--- a/l3kernel/testfiles/m3box004.xetex.tlg
+++ b/l3kernel/testfiles/m3box004.xetex.tlg
@@ -9,14 +9,14 @@ TEST 1: Rotate boxes
 .\hbox(4.30554+0.0)x15.00005
 ..\kern 0.0
 ..\hbox(4.30554+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1 0 0 1 0 0 cm}
 ...\hbox(4.30554+0.0)x0.0
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...}
@@ -25,14 +25,14 @@ l. ...}
 .\hbox(13.65111+0.0)x13.65111
 ..\kern 3.04448
 ..\hbox(4.30554+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 ...\hbox(4.30554+0.0)x0.0
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...}
@@ -41,14 +41,14 @@ l. ...}
 .\hbox(15.00005+0.0)x4.30554
 ..\kern 4.30554
 ..\hbox(4.30554+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0 1 -1 0 0 0 cm}
 ...\hbox(4.30554+0.0)x0.0
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...}
@@ -57,14 +57,14 @@ l. ...}
 .\hbox(10.60663+3.04448)x13.65111
 ..\kern 13.65111
 ..\hbox(4.30554+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal -0.70711 0.70711 -0.70711 -0.70711 0 0 cm}
 ...\hbox(4.30554+0.0)x0.0
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...}
@@ -73,14 +73,14 @@ l. ...}
 .\hbox(0.0+4.30554)x15.00005
 ..\kern 15.00005
 ..\hbox(4.30554+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal -1 0 0 -1 0 0 cm}
 ...\hbox(4.30554+0.0)x0.0
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...}
@@ -89,14 +89,14 @@ l. ...}
 .\hbox(0.0+13.65111)x13.65111
 ..\kern 10.60663
 ..\hbox(4.30554+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal -0.70711 -0.70711 0.70711 -0.70711 0 0 cm}
 ...\hbox(4.30554+0.0)x0.0
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...}
@@ -105,14 +105,14 @@ l. ...}
 .\hbox(3.04448+10.60663)x13.65111
 ..\kern 0.0
 ..\hbox(4.30554+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.70711 -0.70711 0.70711 0.70711 0 0 cm}
 ...\hbox(4.30554+0.0)x0.0
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ! OK.
 <argument> \l_tmpa_box 
 l. ...}
@@ -125,7 +125,7 @@ TEST 2: Scale boxes
 .\hbox(4.30554+0.0)x15.00005
 ..\kern 0.0
 ..\hbox(4.30554+0.0)x15.00005
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1 0 0 1 0 0 cm}
 ...\hbox(4.30554+0.0)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+0.0)x15.00005
@@ -133,7 +133,7 @@ TEST 2: Scale boxes
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -143,7 +143,7 @@ l. ...}
 .\hbox(4.30554+0.0)x15.00005
 ..\kern 15.00005
 ..\hbox(4.30554+0.0)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal -1 0 0 1 0 0 cm}
 ...\hbox(4.30554+0.0)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+0.0)x15.00005
@@ -151,7 +151,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -161,7 +161,7 @@ l. ...}
 .\hbox(0.0+4.30554)x15.00005
 ..\kern 0.0
 ..\hbox(0.0+4.30554)x15.00005
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1 0 0 -1 0 0 cm}
 ...\hbox(4.30554+0.0)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+0.0)x15.00005
@@ -169,7 +169,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -179,7 +179,7 @@ l. ...}
 .\hbox(4.30554+0.0)x7.50002
 ..\kern 0.0
 ..\hbox(4.30554+0.0)x7.50002
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.5 0 0 1 0 0 cm}
 ...\hbox(4.30554+0.0)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+0.0)x15.00005
@@ -187,7 +187,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -197,7 +197,7 @@ l. ...}
 .\hbox(2.15277+0.0)x15.00005
 ..\kern 0.0
 ..\hbox(2.15277+0.0)x15.00005
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1 0 0 0.5 0 0 cm}
 ...\hbox(4.30554+0.0)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+0.0)x15.00005
@@ -205,7 +205,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -215,7 +215,7 @@ l. ...}
 .\hbox(8.61108+0.0)x30.00009
 ..\kern 0.0
 ..\hbox(8.61108+0.0)x30.00009
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 2 0 0 2 0 0 cm}
 ...\hbox(4.30554+0.0)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+0.0)x15.00005
@@ -223,7 +223,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -233,7 +233,7 @@ l. ...}
 .\hbox(43.05542+0.0)x1.50009
 ..\kern 0.0
 ..\hbox(43.05542+0.0)x1.50009
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.1 0 0 10 0 0 cm}
 ...\hbox(4.30554+0.0)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+0.0)x15.00005
@@ -241,7 +241,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -255,7 +255,7 @@ TEST 3: Resize boxes
 .\hbox(19.60077+8.85197)x28.45274
 ..\kern 0.0
 ..\hbox(19.60077+8.85197)x28.45274
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1.89684 0 0 4.55245 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -263,7 +263,7 @@ TEST 3: Resize boxes
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -273,7 +273,7 @@ l. ...}
 .\hbox(19.60077+8.85197)x28.45274
 ..\kern 28.45274
 ..\hbox(19.60077+8.85197)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal -1.89684 0 0 4.55245 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -281,7 +281,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -291,7 +291,7 @@ l. ...}
 .\hbox(8.85197+19.60077)x28.45274
 ..\kern 0.0
 ..\hbox(8.85197+19.60077)x28.45274
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1.89684 0 0 -4.55245 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -299,7 +299,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -309,7 +309,7 @@ l. ...}
 .\hbox(19.60077+8.85197)x14.22636
 ..\kern 0.0
 ..\hbox(19.60077+8.85197)x14.22636
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.94842 0 0 4.55245 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -317,7 +317,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -327,7 +327,7 @@ l. ...}
 .\hbox(9.80038+4.42598)x28.45274
 ..\kern 0.0
 ..\hbox(9.80038+4.42598)x28.45274
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1.89684 0 0 2.27622 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -335,7 +335,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -345,7 +345,7 @@ l. ...}
 .\hbox(39.20154+17.70396)x56.9055
 ..\kern 0.0
 ..\hbox(39.20154+17.70396)x56.9055
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 3.79369 0 0 9.1049 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -353,7 +353,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -363,7 +363,7 @@ l. ...}
 .\hbox(196.00774+88.51982)x2.84544
 ..\kern 0.0
 ..\hbox(196.00774+88.51982)x2.84544
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.1897 0 0 45.52452 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -371,7 +371,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -385,7 +385,7 @@ TEST 4: Resize boxes proportionally
 .\hbox(28.45274+12.84966)x99.1263
 ..\kern 0.0
 ..\hbox(28.45274+12.84966)x99.1263
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 6.6084 0 0 6.6084 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -393,7 +393,7 @@ TEST 4: Resize boxes proportionally
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -403,7 +403,7 @@ l. ...}
 .\hbox(12.84966+28.45274)x99.1263
 ..\kern 99.1263
 ..\hbox(12.84966+28.45274)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal -6.6084 0 0 -6.6084 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -411,7 +411,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -421,7 +421,7 @@ l. ...}
 .\hbox(14.22636+6.42482)x49.56313
 ..\kern 0.0
 ..\hbox(14.22636+6.42482)x49.56313
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 3.3042 0 0 3.3042 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -429,7 +429,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -439,7 +439,7 @@ l. ...}
 .\hbox(56.9055+25.69931)x198.25266
 ..\kern 0.0
 ..\hbox(56.9055+25.69931)x198.25266
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 13.2168 0 0 13.2168 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -447,7 +447,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -457,7 +457,7 @@ l. ...}
 .\hbox(19.60077+8.85197)x68.28696
 ..\kern 0.0
 ..\hbox(19.60077+8.85197)x68.28696
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 4.55245 0 0 4.55245 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -465,7 +465,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -475,7 +475,7 @@ l. ...}
 .\hbox(8.85197+19.60077)x68.28696
 ..\kern 68.28696
 ..\hbox(8.85197+19.60077)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal -4.55245 0 0 -4.55245 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -483,7 +483,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -493,7 +493,7 @@ l. ...}
 .\hbox(9.80038+4.42598)x34.14346
 ..\kern 0.0
 ..\hbox(9.80038+4.42598)x34.14346
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 2.27622 0 0 2.27622 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -501,7 +501,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -511,7 +511,7 @@ l. ...}
 .\hbox(39.20154+17.70396)x136.57396
 ..\kern 0.0
 ..\hbox(39.20154+17.70396)x136.57396
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 9.1049 0 0 9.1049 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -519,7 +519,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -529,7 +529,7 @@ l. ...}
 .\hbox(8.16695+3.68831)x28.45274
 ..\kern 0.0
 ..\hbox(8.16695+3.68831)x28.45274
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1.89684 0 0 1.89684 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -537,7 +537,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -547,7 +547,7 @@ l. ...}
 .\hbox(3.68831+8.16695)x28.45274
 ..\kern 28.45274
 ..\hbox(3.68831+8.16695)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal -1.89684 0 0 -1.89684 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -555,7 +555,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -565,7 +565,7 @@ l. ...}
 .\hbox(4.08347+1.84415)x14.22636
 ..\kern 0.0
 ..\hbox(4.08347+1.84415)x14.22636
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.94842 0 0 0.94842 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -573,7 +573,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -583,7 +583,7 @@ l. ...}
 .\hbox(16.3339+7.37662)x56.9055
 ..\kern 0.0
 ..\hbox(16.3339+7.37662)x56.9055
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 3.79369 0 0 3.79369 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -591,7 +591,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -601,7 +601,7 @@ l. ...}
 .\hbox(28.45274+12.84966)x28.45274
 ..\kern 0.0
 ..\hbox(28.45274+12.84966)x28.45274
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1.89684 0 0 6.6084 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -609,7 +609,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -619,7 +619,7 @@ l. ...}
 .\hbox(28.45274+12.84966)x28.45274
 ..\kern 28.45274
 ..\hbox(28.45274+12.84966)x0.0
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal -1.89684 0 0 6.6084 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -627,7 +627,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -637,7 +637,7 @@ l. ...}
 .\hbox(12.84966+28.45274)x28.45274
 ..\kern 0.0
 ..\hbox(12.84966+28.45274)x28.45274
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1.89684 0 0 -6.6084 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -645,7 +645,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -655,7 +655,7 @@ l. ...}
 .\hbox(28.45274+12.84966)x14.22636
 ..\kern 0.0
 ..\hbox(28.45274+12.84966)x14.22636
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.94842 0 0 6.6084 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -663,7 +663,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -673,7 +673,7 @@ l. ...}
 .\hbox(14.22636+6.42482)x28.45274
 ..\kern 0.0
 ..\hbox(14.22636+6.42482)x28.45274
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1.89684 0 0 3.3042 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -681,7 +681,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -691,7 +691,7 @@ l. ...}
 .\hbox(56.9055+25.69931)x56.9055
 ..\kern 0.0
 ..\hbox(56.9055+25.69931)x56.9055
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 3.79369 0 0 13.2168 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -699,7 +699,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -709,7 +709,7 @@ l. ...}
 .\hbox(284.52756+128.49661)x2.84544
 ..\kern 0.0
 ..\hbox(284.52756+128.49661)x2.84544
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.1897 0 0 66.08403 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -717,7 +717,7 @@ l. ...}
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -731,7 +731,7 @@ TEST 5: Resize boxes automatically
 .\hbox(8.16696+3.68831)x28.45284
 ..\kern 0.0
 ..\hbox(8.16696+3.68831)x28.45284
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1.89684 0 0 1.89684 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -739,7 +739,7 @@ TEST 5: Resize boxes automatically
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -749,7 +749,7 @@ l. ...  }
 .\hbox(8.16696+3.68831)x28.45284
 ..\kern 0.0
 ..\hbox(8.16696+3.68831)x28.45284
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1.89684 0 0 1.89684 0 0 cm}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
@@ -757,7 +757,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 g
 .....\OT1/cmr/m/n/10 g
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
diff --git a/l3kernel/testfiles/m3coffins001.ptex.tlg b/l3kernel/testfiles/m3coffins001.ptex.tlg
index 28c4fb2..f6b36ac 100644
--- a/l3kernel/testfiles/m3coffins001.ptex.tlg
+++ b/l3kernel/testfiles/m3coffins001.ptex.tlg
@@ -561,7 +561,7 @@ TEST 6: Rotation
 ...\hbox(40.2855+0.0)x40.2855
 ....\kern 4.91046
 ....\hbox(6.94444+0.0)x0.0
-.....\special{pdf:literal q}
+.....\special{x:gsave}
 .....\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 .....\hbox(6.94444+0.0)x0.0
 ......\hbox(6.94444+0.0)x50.02786
@@ -579,7 +579,7 @@ TEST 6: Rotation
 .......\OT1/cmr/m/n/10 l
 .......\OT1/cmr/m/n/10 d
 .......\special{pdf:ecolor}
-.....\special{pdf:literal Q}
+.....\special{x:grestore}
 ! OK.
 <argument> \aaa 
 l. ...  }
@@ -607,7 +607,7 @@ l. ...  }
 ...\hbox(55.03102+0.0)x55.03104
 ....\kern 20.14276
 ....\hbox(40.2855+0.0)x0.0
-.....\special{pdf:literal q}
+.....\special{x:gsave}
 .....\special{pdf:literal 0.86603 0.5 -0.5 0.86603 0 0 cm}
 .....\hbox(40.2855+0.0)x0.0
 ......\hbox(40.2855+0.0)x40.2855
@@ -617,7 +617,7 @@ l. ...  }
 .........\hbox(40.2855+0.0)x40.2855
 ..........\kern 4.91046
 ..........\hbox(6.94444+0.0)x0.0
-...........\special{pdf:literal q}
+...........\special{x:gsave}
 ...........\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 ...........\hbox(6.94444+0.0)x0.0
 ............\hbox(6.94444+0.0)x50.02786
@@ -635,8 +635,8 @@ l. ...  }
 .............\OT1/cmr/m/n/10 l
 .............\OT1/cmr/m/n/10 d
 .............\special{pdf:ecolor}
-...........\special{pdf:literal Q}
-.....\special{pdf:literal Q}
+...........\special{x:grestore}
+.....\special{x:grestore}
 ! OK.
 <argument> \aaa 
 l. ...  }
@@ -664,7 +664,7 @@ l. ...  }
 ...\hbox(35.44058+13.89888)x49.33946
 ....\kern 0.0
 ....\hbox(50.12056+0.0)x0.0
-.....\special{pdf:literal q}
+.....\special{x:gsave}
 .....\special{pdf:literal 0.70711 -0.70711 0.70711 0.70711 0 0 cm}
 .....\hbox(50.12056+0.0)x0.0
 ......\hbox(50.12056+0.0)x19.65598
@@ -674,7 +674,7 @@ l. ...  }
 .........\hbox(55.03102+0.0)x55.03104
 ..........\kern 20.14276
 ..........\hbox(40.2855+0.0)x0.0
-...........\special{pdf:literal q}
+...........\special{x:gsave}
 ...........\special{pdf:literal 0.86603 0.5 -0.5 0.86603 0 0 cm}
 ...........\hbox(40.2855+0.0)x0.0
 ............\hbox(40.2855+0.0)x40.2855
@@ -684,7 +684,7 @@ l. ...  }
 ...............\hbox(40.2855+0.0)x40.2855
 ................\kern 4.91046
 ................\hbox(6.94444+0.0)x0.0
-.................\special{pdf:literal q}
+.................\special{x:gsave}
 .................\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 .................\hbox(6.94444+0.0)x0.0
 ..................\hbox(6.94444+0.0)x50.02786
@@ -702,9 +702,9 @@ l. ...  }
 ...................\OT1/cmr/m/n/10 l
 ...................\OT1/cmr/m/n/10 d
 ...................\special{pdf:ecolor}
-.................\special{pdf:literal Q}
-...........\special{pdf:literal Q}
-.....\special{pdf:literal Q}
+.................\special{x:grestore}
+...........\special{x:grestore}
+.....\special{x:grestore}
 ! OK.
 <argument> \aaa 
 l. ...  }
@@ -733,7 +733,7 @@ TEST 7: Scaling
 .\hbox(7.63892+0.0)x50.02786
 ..\kern 0.0
 ..\hbox(7.63892+0.0)x50.02786
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1 0 0 1.1 0 0 cm}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
@@ -752,7 +752,7 @@ TEST 7: Scaling
 .....\OT1/cmr/m/n/10 d
 .....\special{pdf:ecolor}
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \aaa 
@@ -778,14 +778,14 @@ l. ...  }
 .\hbox(3.81946+0.0)x100.05573
 ..\kern 0.0
 ..\hbox(3.81946+0.0)x100.05573
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 2 0 0 0.5 0 0 cm}
 ...\hbox(7.63892+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(7.63892+0.0)x50.02786
 .....\hbox(7.63892+0.0)x50.02786
 ......\kern 0.0
 ......\hbox(7.63892+0.0)x50.02786
-.......\special{pdf:literal q}
+.......\special{x:gsave}
 .......\special{pdf:literal 1 0 0 1.1 0 0 cm}
 .......\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ........\hbox(6.94444+0.0)x50.02786
@@ -804,10 +804,10 @@ l. ...  }
 .........\OT1/cmr/m/n/10 d
 .........\special{pdf:ecolor}
 ........\glue 0.0 plus 1.0fil minus 1.0fil
-.......\special{pdf:literal Q}
+.......\special{x:grestore}
 ......\glue 0.0 plus 1.0fil minus 1.0fil
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \aaa 
@@ -837,7 +837,7 @@ TEST 8: Resizing
 .\hbox(56.9055+0.0)x28.45274
 ..\kern 0.0
 ..\hbox(56.9055+0.0)x28.45274
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.56874 0 0 8.19439 0 0 cm}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
@@ -856,7 +856,7 @@ TEST 8: Resizing
 .....\OT1/cmr/m/n/10 d
 .....\special{pdf:ecolor}
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \aaa 
diff --git a/l3kernel/testfiles/m3coffins001.uptex.tlg b/l3kernel/testfiles/m3coffins001.uptex.tlg
index 7bc0475..4175574 100644
--- a/l3kernel/testfiles/m3coffins001.uptex.tlg
+++ b/l3kernel/testfiles/m3coffins001.uptex.tlg
@@ -565,7 +565,7 @@ TEST 6: Rotation
 ...\hbox(40.2855+0.0)x40.2855
 ....\kern 4.91046
 ....\hbox(6.94444+0.0)x0.0
-.....\special{pdf:literal q}
+.....\special{x:gsave}
 .....\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 .....\hbox(6.94444+0.0)x0.0
 ......\hbox(6.94444+0.0)x50.02786
@@ -583,7 +583,7 @@ TEST 6: Rotation
 .......\OT1/cmr/m/n/10 l
 .......\OT1/cmr/m/n/10 d
 .......\special{pdf:ecolor}
-.....\special{pdf:literal Q}
+.....\special{x:grestore}
 ! OK.
 <argument> \aaa 
 l. ...  }
@@ -611,7 +611,7 @@ l. ...  }
 ...\hbox(55.03102+0.0)x55.03104
 ....\kern 20.14276
 ....\hbox(40.2855+0.0)x0.0
-.....\special{pdf:literal q}
+.....\special{x:gsave}
 .....\special{pdf:literal 0.86603 0.5 -0.5 0.86603 0 0 cm}
 .....\hbox(40.2855+0.0)x0.0
 ......\hbox(40.2855+0.0)x40.2855
@@ -621,7 +621,7 @@ l. ...  }
 .........\hbox(40.2855+0.0)x40.2855
 ..........\kern 4.91046
 ..........\hbox(6.94444+0.0)x0.0
-...........\special{pdf:literal q}
+...........\special{x:gsave}
 ...........\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 ...........\hbox(6.94444+0.0)x0.0
 ............\hbox(6.94444+0.0)x50.02786
@@ -639,8 +639,8 @@ l. ...  }
 .............\OT1/cmr/m/n/10 l
 .............\OT1/cmr/m/n/10 d
 .............\special{pdf:ecolor}
-...........\special{pdf:literal Q}
-.....\special{pdf:literal Q}
+...........\special{x:grestore}
+.....\special{x:grestore}
 ! OK.
 <argument> \aaa 
 l. ...  }
@@ -668,7 +668,7 @@ l. ...  }
 ...\hbox(35.44058+13.89888)x49.33946
 ....\kern 0.0
 ....\hbox(50.12056+0.0)x0.0
-.....\special{pdf:literal q}
+.....\special{x:gsave}
 .....\special{pdf:literal 0.70711 -0.70711 0.70711 0.70711 0 0 cm}
 .....\hbox(50.12056+0.0)x0.0
 ......\hbox(50.12056+0.0)x19.65598
@@ -678,7 +678,7 @@ l. ...  }
 .........\hbox(55.03102+0.0)x55.03104
 ..........\kern 20.14276
 ..........\hbox(40.2855+0.0)x0.0
-...........\special{pdf:literal q}
+...........\special{x:gsave}
 ...........\special{pdf:literal 0.86603 0.5 -0.5 0.86603 0 0 cm}
 ...........\hbox(40.2855+0.0)x0.0
 ............\hbox(40.2855+0.0)x40.2855
@@ -688,7 +688,7 @@ l. ...  }
 ...............\hbox(40.2855+0.0)x40.2855
 ................\kern 4.91046
 ................\hbox(6.94444+0.0)x0.0
-.................\special{pdf:literal q}
+.................\special{x:gsave}
 .................\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 .................\hbox(6.94444+0.0)x0.0
 ..................\hbox(6.94444+0.0)x50.02786
@@ -706,9 +706,9 @@ l. ...  }
 ...................\OT1/cmr/m/n/10 l
 ...................\OT1/cmr/m/n/10 d
 ...................\special{pdf:ecolor}
-.................\special{pdf:literal Q}
-...........\special{pdf:literal Q}
-.....\special{pdf:literal Q}
+.................\special{x:grestore}
+...........\special{x:grestore}
+.....\special{x:grestore}
 ! OK.
 <argument> \aaa 
 l. ...  }
@@ -737,7 +737,7 @@ TEST 7: Scaling
 .\hbox(7.63892+0.0)x50.02786
 ..\kern 0.0
 ..\hbox(7.63892+0.0)x50.02786
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1 0 0 1.1 0 0 cm}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
@@ -756,7 +756,7 @@ TEST 7: Scaling
 .....\OT1/cmr/m/n/10 d
 .....\special{pdf:ecolor}
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \aaa 
@@ -782,14 +782,14 @@ l. ...  }
 .\hbox(3.81946+0.0)x100.05573
 ..\kern 0.0
 ..\hbox(3.81946+0.0)x100.05573
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 2 0 0 0.5 0 0 cm}
 ...\hbox(7.63892+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(7.63892+0.0)x50.02786
 .....\hbox(7.63892+0.0)x50.02786
 ......\kern 0.0
 ......\hbox(7.63892+0.0)x50.02786
-.......\special{pdf:literal q}
+.......\special{x:gsave}
 .......\special{pdf:literal 1 0 0 1.1 0 0 cm}
 .......\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ........\hbox(6.94444+0.0)x50.02786
@@ -808,10 +808,10 @@ l. ...  }
 .........\OT1/cmr/m/n/10 d
 .........\special{pdf:ecolor}
 ........\glue 0.0 plus 1.0fil minus 1.0fil
-.......\special{pdf:literal Q}
+.......\special{x:grestore}
 ......\glue 0.0 plus 1.0fil minus 1.0fil
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \aaa 
@@ -841,7 +841,7 @@ TEST 8: Resizing
 .\hbox(56.9055+0.0)x28.45274
 ..\kern 0.0
 ..\hbox(56.9055+0.0)x28.45274
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.56874 0 0 8.19439 0 0 cm}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
@@ -860,7 +860,7 @@ TEST 8: Resizing
 .....\OT1/cmr/m/n/10 d
 .....\special{pdf:ecolor}
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \aaa 
diff --git a/l3kernel/testfiles/m3coffins001.xetex.tlg b/l3kernel/testfiles/m3coffins001.xetex.tlg
index 28c4fb2..f6b36ac 100644
--- a/l3kernel/testfiles/m3coffins001.xetex.tlg
+++ b/l3kernel/testfiles/m3coffins001.xetex.tlg
@@ -561,7 +561,7 @@ TEST 6: Rotation
 ...\hbox(40.2855+0.0)x40.2855
 ....\kern 4.91046
 ....\hbox(6.94444+0.0)x0.0
-.....\special{pdf:literal q}
+.....\special{x:gsave}
 .....\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 .....\hbox(6.94444+0.0)x0.0
 ......\hbox(6.94444+0.0)x50.02786
@@ -579,7 +579,7 @@ TEST 6: Rotation
 .......\OT1/cmr/m/n/10 l
 .......\OT1/cmr/m/n/10 d
 .......\special{pdf:ecolor}
-.....\special{pdf:literal Q}
+.....\special{x:grestore}
 ! OK.
 <argument> \aaa 
 l. ...  }
@@ -607,7 +607,7 @@ l. ...  }
 ...\hbox(55.03102+0.0)x55.03104
 ....\kern 20.14276
 ....\hbox(40.2855+0.0)x0.0
-.....\special{pdf:literal q}
+.....\special{x:gsave}
 .....\special{pdf:literal 0.86603 0.5 -0.5 0.86603 0 0 cm}
 .....\hbox(40.2855+0.0)x0.0
 ......\hbox(40.2855+0.0)x40.2855
@@ -617,7 +617,7 @@ l. ...  }
 .........\hbox(40.2855+0.0)x40.2855
 ..........\kern 4.91046
 ..........\hbox(6.94444+0.0)x0.0
-...........\special{pdf:literal q}
+...........\special{x:gsave}
 ...........\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 ...........\hbox(6.94444+0.0)x0.0
 ............\hbox(6.94444+0.0)x50.02786
@@ -635,8 +635,8 @@ l. ...  }
 .............\OT1/cmr/m/n/10 l
 .............\OT1/cmr/m/n/10 d
 .............\special{pdf:ecolor}
-...........\special{pdf:literal Q}
-.....\special{pdf:literal Q}
+...........\special{x:grestore}
+.....\special{x:grestore}
 ! OK.
 <argument> \aaa 
 l. ...  }
@@ -664,7 +664,7 @@ l. ...  }
 ...\hbox(35.44058+13.89888)x49.33946
 ....\kern 0.0
 ....\hbox(50.12056+0.0)x0.0
-.....\special{pdf:literal q}
+.....\special{x:gsave}
 .....\special{pdf:literal 0.70711 -0.70711 0.70711 0.70711 0 0 cm}
 .....\hbox(50.12056+0.0)x0.0
 ......\hbox(50.12056+0.0)x19.65598
@@ -674,7 +674,7 @@ l. ...  }
 .........\hbox(55.03102+0.0)x55.03104
 ..........\kern 20.14276
 ..........\hbox(40.2855+0.0)x0.0
-...........\special{pdf:literal q}
+...........\special{x:gsave}
 ...........\special{pdf:literal 0.86603 0.5 -0.5 0.86603 0 0 cm}
 ...........\hbox(40.2855+0.0)x0.0
 ............\hbox(40.2855+0.0)x40.2855
@@ -684,7 +684,7 @@ l. ...  }
 ...............\hbox(40.2855+0.0)x40.2855
 ................\kern 4.91046
 ................\hbox(6.94444+0.0)x0.0
-.................\special{pdf:literal q}
+.................\special{x:gsave}
 .................\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 .................\hbox(6.94444+0.0)x0.0
 ..................\hbox(6.94444+0.0)x50.02786
@@ -702,9 +702,9 @@ l. ...  }
 ...................\OT1/cmr/m/n/10 l
 ...................\OT1/cmr/m/n/10 d
 ...................\special{pdf:ecolor}
-.................\special{pdf:literal Q}
-...........\special{pdf:literal Q}
-.....\special{pdf:literal Q}
+.................\special{x:grestore}
+...........\special{x:grestore}
+.....\special{x:grestore}
 ! OK.
 <argument> \aaa 
 l. ...  }
@@ -733,7 +733,7 @@ TEST 7: Scaling
 .\hbox(7.63892+0.0)x50.02786
 ..\kern 0.0
 ..\hbox(7.63892+0.0)x50.02786
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 1 0 0 1.1 0 0 cm}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
@@ -752,7 +752,7 @@ TEST 7: Scaling
 .....\OT1/cmr/m/n/10 d
 .....\special{pdf:ecolor}
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \aaa 
@@ -778,14 +778,14 @@ l. ...  }
 .\hbox(3.81946+0.0)x100.05573
 ..\kern 0.0
 ..\hbox(3.81946+0.0)x100.05573
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 2 0 0 0.5 0 0 cm}
 ...\hbox(7.63892+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(7.63892+0.0)x50.02786
 .....\hbox(7.63892+0.0)x50.02786
 ......\kern 0.0
 ......\hbox(7.63892+0.0)x50.02786
-.......\special{pdf:literal q}
+.......\special{x:gsave}
 .......\special{pdf:literal 1 0 0 1.1 0 0 cm}
 .......\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ........\hbox(6.94444+0.0)x50.02786
@@ -804,10 +804,10 @@ l. ...  }
 .........\OT1/cmr/m/n/10 d
 .........\special{pdf:ecolor}
 ........\glue 0.0 plus 1.0fil minus 1.0fil
-.......\special{pdf:literal Q}
+.......\special{x:grestore}
 ......\glue 0.0 plus 1.0fil minus 1.0fil
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \aaa 
@@ -837,7 +837,7 @@ TEST 8: Resizing
 .\hbox(56.9055+0.0)x28.45274
 ..\kern 0.0
 ..\hbox(56.9055+0.0)x28.45274
-...\special{pdf:literal q}
+...\special{x:gsave}
 ...\special{pdf:literal 0.56874 0 0 8.19439 0 0 cm}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
@@ -856,7 +856,7 @@ TEST 8: Resizing
 .....\OT1/cmr/m/n/10 d
 .....\special{pdf:ecolor}
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{pdf:literal Q}
+...\special{x:grestore}
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \aaa 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the latex3-commits mailing list