[latex3-commits] [git/LaTeX3-latex3-latex3] split-pdfmode: Test file adjustments (1b67e5862)

Joseph Wright joseph.wright at morningstar2.co.uk
Thu Aug 13 19:05:58 CEST 2020


Repository : https://github.com/latex3/latex3
On branch  : split-pdfmode
Link       : https://github.com/latex3/latex3/commit/1b67e5862d0ee4b09dc096f592bff1b2830252e6

>---------------------------------------------------------------

commit 1b67e5862d0ee4b09dc096f592bff1b2830252e6
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Thu Aug 13 18:05:58 2020 +0100

    Test file adjustments


>---------------------------------------------------------------

1b67e5862d0ee4b09dc096f592bff1b2830252e6
 l3backend/l3backend-basics.dtx                     |   2 +-
 .../{d3dvips.luatex.tlg => d3pdfmode.luatex.tlg}   | 267 ++++++--------------
 .../{d3dvips.luatex.tlg => d3xdvipdfmx.luatex.tlg} | 275 +++++++--------------
 l3kernel/testfiles/m3expl001.luatex.tlg            |   2 +-
 l3kernel/testfiles/m3expl002.luatex.tlg            |   2 +-
 l3kernel/testfiles/m3expl003.luatex.tlg            |   2 +-
 l3kernel/testfiles/m3expl004.luatex.tlg            |   2 +-
 l3kernel/testfiles/m3expl006.luatex.tlg            |   2 +-
 .../{m3expl007.tlg => m3expl007.luatex.tlg}        |   4 +-
 9 files changed, 172 insertions(+), 386 deletions(-)

diff --git a/l3backend/l3backend-basics.dtx b/l3backend/l3backend-basics.dtx
index 4bbcf7f29..f74628818 100644
--- a/l3backend/l3backend-basics.dtx
+++ b/l3backend/l3backend-basics.dtx
@@ -83,7 +83,7 @@
 %</dvisvgm>
 %<*pdfmode>
 %<*luatex>
-  {l3backend-pdfmode-lautex.def}{2020-08-07}{}
+  {l3backend-pdfmode-luatex.def}{2020-08-07}{}
 %</luatex>
 %<*pdftex>
   {l3backend-pdfmode-pdftex.def}{2020-08-07}{}
diff --git a/l3kernel/testfiles/d3dvips.luatex.tlg b/l3kernel/testfiles/d3pdfmode.luatex.tlg
similarity index 70%
copy from l3kernel/testfiles/d3dvips.luatex.tlg
copy to l3kernel/testfiles/d3pdfmode.luatex.tlg
index 15180f187..db4c1c1fa 100644
--- a/l3kernel/testfiles/d3dvips.luatex.tlg
+++ b/l3kernel/testfiles/d3pdfmode.luatex.tlg
@@ -4,33 +4,21 @@ Don't change this file in any respect.
 Package: expl3 ....-..-.. L3 programming layer (loader) 
 (l3debug.def
 File: l3debug.def ....-..-.. L3 Debugging support
-) (l3backend-dvips.def
-File: l3backend-dvips.def ....-..-.. L3 backend support: dvips
+) (l3backend-pdfmode.def
+File: l3backend-pdfmode.def ....-..-.. L3 backend support: PDF mode
+(l3backend-pdfmode-luatex.def
+File: l3backend-pdfmode-luatex.def ....-..-.. L3 backend support: PDF mode
+\l__kernel_color_stack_int=\count...
 \l__pdf_internal_box=\box...
-\g__pdf_backend_object_int=\count...
-\l__pdf_backend_content_box=\box...
-\l__pdf_backend_model_box=\box...
-\g__pdf_backend_annotation_int=\count...
-\g__pdf_backend_link_int=\count...
-\g__pdf_backend_link_sf_int=\count...
-))
+)))
 Author: Joseph Wright
 ============================================================
 TEST 1: Clip box
 ============================================================
 > \box...=
 \hbox(6.94444+1.0)x86.45851, direction TLT
-.\special{ps:gsave}
-.\special{ps::[begin]}
-.\special{ps::currentpoint}
-.\special{ps::currentpoint translate}
-.\special{ps::matrix currentmatrix}
-.\special{ps::Resolution 72 div VResolution 72 div scale}
-.\special{ps::DVImag dup scale}
-.\special{ps::0 0.99626 86.1355 -7.91476 rectclip}
-.\special{ps::setmatrix}
-.\special{ps::neg exch neg exch translate}
-.\special{ps::[end]}
+.\pdfsave
+.\pdfliteral origin{0 -0.99626 86.1355 7.91476 re W n}
 .\hbox(6.94444+1.0)x0.0, glue set - 86.45851fil, direction TLT
 ..\hbox(6.94444+1.0)x86.45851, direction TLT
 ...\OT1/cmr/m/n/10 G
@@ -54,24 +42,15 @@ 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{ps:grestore}
+.\pdfrestore
 .\glue 86.45851
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
 > \box...=
 \hbox(6.94444+0.0)x86.45851, direction TLT
-.\special{ps:gsave}
-.\special{ps::[begin]}
-.\special{ps::currentpoint}
-.\special{ps::currentpoint translate}
-.\special{ps::matrix currentmatrix}
-.\special{ps::Resolution 72 div VResolution 72 div scale}
-.\special{ps::DVImag dup scale}
-.\special{ps::0 0 86.1355 -6.9185 rectclip}
-.\special{ps::setmatrix}
-.\special{ps::neg exch neg exch translate}
-.\special{ps::[end]}
+.\pdfsave
+.\pdfliteral origin{0 0 86.1355 6.9185 re W n}
 .\hbox(6.94444+0.0)x0.0, glue set - 86.45851fil, direction TLT
 ..\hbox(6.94444+0.0)x86.45851, direction TLT
 ...\OT1/cmr/m/n/10 G
@@ -95,24 +74,15 @@ l. ...  }
 ...\OT1/cmr/m/n/10 w
 ...\OT1/cmr/m/n/10 n
 ..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{ps:grestore}
+.\pdfrestore
 .\glue 86.45851
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
 > \box...=
 \hbox(6.94444+1.0)x86.45851, direction TLT
-.\special{ps:gsave}
-.\special{ps::[begin]}
-.\special{ps::currentpoint}
-.\special{ps::currentpoint translate}
-.\special{ps::matrix currentmatrix}
-.\special{ps::Resolution 72 div VResolution 72 div scale}
-.\special{ps::DVImag dup scale}
-.\special{ps::0 0.99626 86.1355 -7.91476 rectclip}
-.\special{ps::setmatrix}
-.\special{ps::neg exch neg exch translate}
-.\special{ps::[end]}
+.\pdfsave
+.\pdfliteral origin{0 -0.99626 86.1355 7.91476 re W n}
 .\hbox(6.94444+1.0)x0.0, glue set - 86.45851fil, direction TLT
 ..\hbox(6.94444+1.0)x86.45851, direction TLT
 ...\OT1/cmr/m/n/10 G
@@ -136,24 +106,15 @@ l. ...  }
 ...\OT1/cmr/m/n/10 w
 ...\OT1/cmr/m/n/10 n
 ..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{ps:grestore}
+.\pdfrestore
 .\glue 86.45851
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
 > \box...=
 \hbox(6.94444+1.94444)x20.0, direction TLT
-.\special{ps:gsave}
-.\special{ps::[begin]}
-.\special{ps::currentpoint}
-.\special{ps::currentpoint translate}
-.\special{ps::matrix currentmatrix}
-.\special{ps::Resolution 72 div VResolution 72 div scale}
-.\special{ps::DVImag dup scale}
-.\special{ps::0 1.93718 19.92528 -8.85568 rectclip}
-.\special{ps::setmatrix}
-.\special{ps::neg exch neg exch translate}
-.\special{ps::[end]}
+.\pdfsave
+.\pdfliteral origin{0 -1.93718 19.92528 8.85568 re W n}
 .\hbox(6.94444+1.94444)x0.0, glue set - 20.0fil, direction TLT
 ..\hbox(6.94444+1.94444)x20.0, direction TLT
 ...\OT1/cmr/m/n/10 G
@@ -177,7 +138,7 @@ l. ...  }
 ...\OT1/cmr/m/n/10 w
 ...\OT1/cmr/m/n/10 n
 ..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{ps:grestore}
+.\pdfrestore
 .\glue 20.0
 ! OK.
 <argument> \l_tmpa_box 
@@ -207,15 +168,10 @@ l. ...  }
 \hbox(6.94444+0.0)x50.02786, direction TLT
 .\hbox(6.94444+0.0)x50.02786, direction TLT
 ..\kern0.0
-..\hbox(6.94444+0.0)x50.02786, direction TLT
-...\special{ps:gsave}
-...\special{ps::[begin]}
-...\special{ps::currentpoint}
-...\special{ps::currentpoint translate}
-...\special{ps::0 rotate}
-...\special{ps::neg exch neg exch translate}
-...\special{ps::[end]}
-...\hbox(6.94444+0.0)x50.02786, direction TLT
+..\hbox(6.94444+0.0)x0.0, direction TLT
+...\pdfsave
+...\pdfsetmatrix{1 0 0 1}
+...\hbox(6.94444+0.0)x0.0, direction TLT
 ....\hbox(6.94444+0.0)x50.02786, direction TLT
 .....\OT1/cmr/m/n/10 H
 .....\OT1/cmr/m/n/10 e
@@ -229,7 +185,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 r
 .....\OT1/cmr/m/n/10 l
 .....\OT1/cmr/m/n/10 d
-...\special{ps:grestore}
+...\pdfrestore
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
@@ -237,15 +193,10 @@ l. ...  }
 \hbox(31.028+0.0)x46.79762, direction TLT
 .\hbox(31.028+0.0)x46.79762, direction TLT
 ..\kern3.47223
-..\hbox(6.94444+0.0)x50.02786, direction TLT
-...\special{ps:gsave}
-...\special{ps::[begin]}
-...\special{ps::currentpoint}
-...\special{ps::currentpoint translate}
-...\special{ps::-30 rotate}
-...\special{ps::neg exch neg exch translate}
-...\special{ps::[end]}
-...\hbox(6.94444+0.0)x50.02786, direction TLT
+..\hbox(6.94444+0.0)x0.0, direction TLT
+...\pdfsave
+...\pdfsetmatrix{0.86603 0.5 -0.5 0.86603}
+...\hbox(6.94444+0.0)x0.0, direction TLT
 ....\hbox(6.94444+0.0)x50.02786, direction TLT
 .....\OT1/cmr/m/n/10 H
 .....\OT1/cmr/m/n/10 e
@@ -259,7 +210,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 r
 .....\OT1/cmr/m/n/10 l
 .....\OT1/cmr/m/n/10 d
-...\special{ps:grestore}
+...\pdfrestore
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
@@ -267,15 +218,10 @@ l. ...  }
 \hbox(40.2855+0.0)x40.2855, direction TLT
 .\hbox(40.2855+0.0)x40.2855, direction TLT
 ..\kern4.91046
-..\hbox(6.94444+0.0)x50.02786, direction TLT
-...\special{ps:gsave}
-...\special{ps::[begin]}
-...\special{ps::currentpoint}
-...\special{ps::currentpoint translate}
-...\special{ps::-45 rotate}
-...\special{ps::neg exch neg exch translate}
-...\special{ps::[end]}
-...\hbox(6.94444+0.0)x50.02786, direction TLT
+..\hbox(6.94444+0.0)x0.0, direction TLT
+...\pdfsave
+...\pdfsetmatrix{0.70711 0.70711 -0.70711 0.70711}
+...\hbox(6.94444+0.0)x0.0, direction TLT
 ....\hbox(6.94444+0.0)x50.02786, direction TLT
 .....\OT1/cmr/m/n/10 H
 .....\OT1/cmr/m/n/10 e
@@ -289,7 +235,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 r
 .....\OT1/cmr/m/n/10 l
 .....\OT1/cmr/m/n/10 d
-...\special{ps:grestore}
+...\pdfrestore
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
@@ -297,15 +243,10 @@ l. ...  }
 \hbox(35.37505+4.91046)x40.2855, direction TLT
 .\hbox(35.37505+4.91046)x40.2855, direction TLT
 ..\kern40.2855
-..\hbox(6.94444+0.0)x50.02786, direction TLT
-...\special{ps:gsave}
-...\special{ps::[begin]}
-...\special{ps::currentpoint}
-...\special{ps::currentpoint translate}
-...\special{ps::-135 rotate}
-...\special{ps::neg exch neg exch translate}
-...\special{ps::[end]}
-...\hbox(6.94444+0.0)x50.02786, direction TLT
+..\hbox(6.94444+0.0)x0.0, direction TLT
+...\pdfsave
+...\pdfsetmatrix{-0.70711 0.70711 -0.70711 -0.70711}
+...\hbox(6.94444+0.0)x0.0, direction TLT
 ....\hbox(6.94444+0.0)x50.02786, direction TLT
 .....\OT1/cmr/m/n/10 H
 .....\OT1/cmr/m/n/10 e
@@ -319,7 +260,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 r
 .....\OT1/cmr/m/n/10 l
 .....\OT1/cmr/m/n/10 d
-...\special{ps:grestore}
+...\pdfrestore
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
@@ -327,15 +268,10 @@ l. ...  }
 \hbox(0.0+40.2855)x40.2855, direction TLT
 .\hbox(0.0+40.2855)x40.2855, direction TLT
 ..\kern35.37505
-..\hbox(6.94444+0.0)x50.02786, direction TLT
-...\special{ps:gsave}
-...\special{ps::[begin]}
-...\special{ps::currentpoint}
-...\special{ps::currentpoint translate}
-...\special{ps::-225 rotate}
-...\special{ps::neg exch neg exch translate}
-...\special{ps::[end]}
-...\hbox(6.94444+0.0)x50.02786, direction TLT
+..\hbox(6.94444+0.0)x0.0, direction TLT
+...\pdfsave
+...\pdfsetmatrix{-0.70711 -0.70711 0.70711 -0.70711}
+...\hbox(6.94444+0.0)x0.0, direction TLT
 ....\hbox(6.94444+0.0)x50.02786, direction TLT
 .....\OT1/cmr/m/n/10 H
 .....\OT1/cmr/m/n/10 e
@@ -349,7 +285,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 r
 .....\OT1/cmr/m/n/10 l
 .....\OT1/cmr/m/n/10 d
-...\special{ps:grestore}
+...\pdfrestore
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
@@ -357,15 +293,10 @@ l. ...  }
 \hbox(4.91046+35.37505)x40.2855, direction TLT
 .\hbox(4.91046+35.37505)x40.2855, direction TLT
 ..\kern0.0
-..\hbox(6.94444+0.0)x50.02786, direction TLT
-...\special{ps:gsave}
-...\special{ps::[begin]}
-...\special{ps::currentpoint}
-...\special{ps::currentpoint translate}
-...\special{ps::-315 rotate}
-...\special{ps::neg exch neg exch translate}
-...\special{ps::[end]}
-...\hbox(6.94444+0.0)x50.02786, direction TLT
+..\hbox(6.94444+0.0)x0.0, direction TLT
+...\pdfsave
+...\pdfsetmatrix{0.70711 -0.70711 0.70711 0.70711}
+...\hbox(6.94444+0.0)x0.0, direction TLT
 ....\hbox(6.94444+0.0)x50.02786, direction TLT
 .....\OT1/cmr/m/n/10 H
 .....\OT1/cmr/m/n/10 e
@@ -379,7 +310,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 r
 .....\OT1/cmr/m/n/10 l
 .....\OT1/cmr/m/n/10 d
-...\special{ps:grestore}
+...\pdfrestore
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
@@ -387,27 +318,17 @@ l. ...  }
 \hbox(56.9723+0.0)x56.97232, direction TLT
 .\hbox(56.9723+0.0)x56.97232, direction TLT
 ..\kern28.48616
-..\hbox(40.2855+0.0)x40.2855, direction TLT
-...\special{ps:gsave}
-...\special{ps::[begin]}
-...\special{ps::currentpoint}
-...\special{ps::currentpoint translate}
-...\special{ps::-45 rotate}
-...\special{ps::neg exch neg exch translate}
-...\special{ps::[end]}
-...\hbox(40.2855+0.0)x40.2855, direction TLT
+..\hbox(40.2855+0.0)x0.0, direction TLT
+...\pdfsave
+...\pdfsetmatrix{0.70711 0.70711 -0.70711 0.70711}
+...\hbox(40.2855+0.0)x0.0, direction TLT
 ....\hbox(40.2855+0.0)x40.2855, direction TLT
 .....\hbox(40.2855+0.0)x40.2855, direction TLT
 ......\kern4.91046
-......\hbox(6.94444+0.0)x50.02786, direction TLT
-.......\special{ps:gsave}
-.......\special{ps::[begin]}
-.......\special{ps::currentpoint}
-.......\special{ps::currentpoint translate}
-.......\special{ps::-45 rotate}
-.......\special{ps::neg exch neg exch translate}
-.......\special{ps::[end]}
-.......\hbox(6.94444+0.0)x50.02786, direction TLT
+......\hbox(6.94444+0.0)x0.0, direction TLT
+.......\pdfsave
+.......\pdfsetmatrix{0.70711 0.70711 -0.70711 0.70711}
+.......\hbox(6.94444+0.0)x0.0, direction TLT
 ........\hbox(6.94444+0.0)x50.02786, direction TLT
 .........\OT1/cmr/m/n/10 H
 .........\OT1/cmr/m/n/10 e
@@ -421,8 +342,8 @@ l. ...  }
 .........\OT1/cmr/m/n/10 r
 .........\OT1/cmr/m/n/10 l
 .........\OT1/cmr/m/n/10 d
-.......\special{ps:grestore}
-...\special{ps:grestore}
+.......\pdfrestore
+...\pdfrestore
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
@@ -452,13 +373,8 @@ l. ...  }
 .\hbox(6.94444+0.0)x50.02786, direction TLT
 ..\kern0.0
 ..\hbox(6.94444+0.0)x50.02786, direction TLT
-...\special{ps:gsave}
-...\special{ps::[begin]}
-...\special{ps::currentpoint}
-...\special{ps::currentpoint translate}
-...\special{ps::1 1 scale}
-...\special{ps::neg exch neg exch translate}
-...\special{ps::[end]}
+...\pdfsave
+...\pdfsetmatrix{1 0 0 1}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil, direction TLT
 ....\hbox(6.94444+0.0)x50.02786, direction TLT
 .....\OT1/cmr/m/n/10 H
@@ -474,7 +390,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 l
 .....\OT1/cmr/m/n/10 d
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{ps:grestore}
+...\pdfrestore
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -484,13 +400,8 @@ l. ...  }
 .\hbox(6.94444+0.0)x125.06966, direction TLT
 ..\kern0.0
 ..\hbox(6.94444+0.0)x125.06966, direction TLT
-...\special{ps:gsave}
-...\special{ps::[begin]}
-...\special{ps::currentpoint}
-...\special{ps::currentpoint translate}
-...\special{ps::2.5 1 scale}
-...\special{ps::neg exch neg exch translate}
-...\special{ps::[end]}
+...\pdfsave
+...\pdfsetmatrix{2.5 0 0 1}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil, direction TLT
 ....\hbox(6.94444+0.0)x50.02786, direction TLT
 .....\OT1/cmr/m/n/10 H
@@ -506,7 +417,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 l
 .....\OT1/cmr/m/n/10 d
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{ps:grestore}
+...\pdfrestore
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -516,13 +427,8 @@ l. ...  }
 .\hbox(2.31477+0.0)x50.02786, direction TLT
 ..\kern0.0
 ..\hbox(2.31477+0.0)x50.02786, direction TLT
-...\special{ps:gsave}
-...\special{ps::[begin]}
-...\special{ps::currentpoint}
-...\special{ps::currentpoint translate}
-...\special{ps::1 0.33333 scale}
-...\special{ps::neg exch neg exch translate}
-...\special{ps::[end]}
+...\pdfsave
+...\pdfsetmatrix{1 0 0 0.33333}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil, direction TLT
 ....\hbox(6.94444+0.0)x50.02786, direction TLT
 .....\OT1/cmr/m/n/10 H
@@ -538,7 +444,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 l
 .....\OT1/cmr/m/n/10 d
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{ps:grestore}
+...\pdfrestore
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -548,13 +454,8 @@ l. ...  }
 .\hbox(6.94444+1.94444)x103.61133, direction TLT
 ..\kern0.0
 ..\hbox(6.94444+1.94444)x103.61133, direction TLT
-...\special{ps:gsave}
-...\special{ps::[begin]}
-...\special{ps::currentpoint}
-...\special{ps::currentpoint translate}
-...\special{ps::1 1 scale}
-...\special{ps::neg exch neg exch translate}
-...\special{ps::[end]}
+...\pdfsave
+...\pdfsetmatrix{1 0 0 1}
 ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil, direction TLT
 ....\hbox(6.94444+1.94444)x103.61133, direction TLT
 .....\OT1/cmr/m/n/10 T
@@ -583,7 +484,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 w
 .....\OT1/cmr/m/n/10 n
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{ps:grestore}
+...\pdfrestore
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -593,13 +494,8 @@ l. ...  }
 .\hbox(20.83333+5.83333)x310.83398, direction TLT
 ..\kern0.0
 ..\hbox(20.83333+5.83333)x310.83398, direction TLT
-...\special{ps:gsave}
-...\special{ps::[begin]}
-...\special{ps::currentpoint}
-...\special{ps::currentpoint translate}
-...\special{ps::3 3 scale}
-...\special{ps::neg exch neg exch translate}
-...\special{ps::[end]}
+...\pdfsave
+...\pdfsetmatrix{3 0 0 3}
 ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil, direction TLT
 ....\hbox(6.94444+1.94444)x103.61133, direction TLT
 .....\OT1/cmr/m/n/10 T
@@ -628,7 +524,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 w
 .....\OT1/cmr/m/n/10 n
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{ps:grestore}
+...\pdfrestore
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -638,13 +534,8 @@ l. ...  }
 .\hbox(5.83333+20.83333)x310.83398, direction TLT
 ..\kern310.83398
 ..\hbox(5.83333+20.83333)x0.0, direction TLT
-...\special{ps:gsave}
-...\special{ps::[begin]}
-...\special{ps::currentpoint}
-...\special{ps::currentpoint translate}
-...\special{ps::-3 -3 scale}
-...\special{ps::neg exch neg exch translate}
-...\special{ps::[end]}
+...\pdfsave
+...\pdfsetmatrix{-3 0 0 -3}
 ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil, direction TLT
 ....\hbox(6.94444+1.94444)x103.61133, direction TLT
 .....\OT1/cmr/m/n/10 T
@@ -673,7 +564,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 w
 .....\OT1/cmr/m/n/10 n
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{ps:grestore}
+...\pdfrestore
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -684,9 +575,7 @@ TEST 4: Color
 ============================================================
 > \box...=
 \hbox(6.94444+0.0)x50.02786, direction TLT
-.\special{color push gray 0}
-.\special{ps:SDict begin /color.sc { } def end}
-.\special{ps:SDict begin /color.fc { } def end}
+.\pdfcolorstack 0 push {0 g 0 G}
 .\OT1/cmr/m/n/10 H
 .\OT1/cmr/m/n/10 e
 .\OT1/cmr/m/n/10 l
@@ -699,7 +588,7 @@ TEST 4: Color
 .\OT1/cmr/m/n/10 r
 .\OT1/cmr/m/n/10 l
 .\OT1/cmr/m/n/10 d
-.\special{color pop}
+.\pdfcolorstack 0 pop
 ! OK.
 <argument> \l_tmpa_coffin 
 l. ...  }
diff --git a/l3kernel/testfiles/d3dvips.luatex.tlg b/l3kernel/testfiles/d3xdvipdfmx.luatex.tlg
similarity index 70%
copy from l3kernel/testfiles/d3dvips.luatex.tlg
copy to l3kernel/testfiles/d3xdvipdfmx.luatex.tlg
index 15180f187..531796213 100644
--- a/l3kernel/testfiles/d3dvips.luatex.tlg
+++ b/l3kernel/testfiles/d3xdvipdfmx.luatex.tlg
@@ -4,33 +4,29 @@ Don't change this file in any respect.
 Package: expl3 ....-..-.. L3 programming layer (loader) 
 (l3debug.def
 File: l3debug.def ....-..-.. L3 Debugging support
-) (l3backend-dvips.def
-File: l3backend-dvips.def ....-..-.. L3 backend support: dvips
+)
+! LaTeX3 Error: Backend request inconsistent with engine: using 'pdfmode'
+(LaTeX3)        backend.
+For immediate help type H <return>.
+ ...                                              
+l. ...\keys_set:nV { sys } \l__expl_options_clist
+You have requested backend 'xdvipdfmx', but this is not suitable for use with
+the active engine. LaTeX3 will use the 'pdfmode' backend instead.
+(l3backend-pdfmode.def
+File: l3backend-pdfmode.def ....-..-.. L3 backend support: PDF mode
+(l3backend-pdfmode-luatex.def
+File: l3backend-pdfmode-luatex.def ....-..-.. L3 backend support: PDF mode
+\l__kernel_color_stack_int=\count...
 \l__pdf_internal_box=\box...
-\g__pdf_backend_object_int=\count...
-\l__pdf_backend_content_box=\box...
-\l__pdf_backend_model_box=\box...
-\g__pdf_backend_annotation_int=\count...
-\g__pdf_backend_link_int=\count...
-\g__pdf_backend_link_sf_int=\count...
-))
+)))
 Author: Joseph Wright
 ============================================================
 TEST 1: Clip box
 ============================================================
 > \box...=
 \hbox(6.94444+1.0)x86.45851, direction TLT
-.\special{ps:gsave}
-.\special{ps::[begin]}
-.\special{ps::currentpoint}
-.\special{ps::currentpoint translate}
-.\special{ps::matrix currentmatrix}
-.\special{ps::Resolution 72 div VResolution 72 div scale}
-.\special{ps::DVImag dup scale}
-.\special{ps::0 0.99626 86.1355 -7.91476 rectclip}
-.\special{ps::setmatrix}
-.\special{ps::neg exch neg exch translate}
-.\special{ps::[end]}
+.\pdfsave
+.\pdfliteral origin{0 -0.99626 86.1355 7.91476 re W n}
 .\hbox(6.94444+1.0)x0.0, glue set - 86.45851fil, direction TLT
 ..\hbox(6.94444+1.0)x86.45851, direction TLT
 ...\OT1/cmr/m/n/10 G
@@ -54,24 +50,15 @@ 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{ps:grestore}
+.\pdfrestore
 .\glue 86.45851
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
 > \box...=
 \hbox(6.94444+0.0)x86.45851, direction TLT
-.\special{ps:gsave}
-.\special{ps::[begin]}
-.\special{ps::currentpoint}
-.\special{ps::currentpoint translate}
-.\special{ps::matrix currentmatrix}
-.\special{ps::Resolution 72 div VResolution 72 div scale}
-.\special{ps::DVImag dup scale}
-.\special{ps::0 0 86.1355 -6.9185 rectclip}
-.\special{ps::setmatrix}
-.\special{ps::neg exch neg exch translate}
-.\special{ps::[end]}
+.\pdfsave
+.\pdfliteral origin{0 0 86.1355 6.9185 re W n}
 .\hbox(6.94444+0.0)x0.0, glue set - 86.45851fil, direction TLT
 ..\hbox(6.94444+0.0)x86.45851, direction TLT
 ...\OT1/cmr/m/n/10 G
@@ -95,24 +82,15 @@ l. ...  }
 ...\OT1/cmr/m/n/10 w
 ...\OT1/cmr/m/n/10 n
 ..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{ps:grestore}
+.\pdfrestore
 .\glue 86.45851
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
 > \box...=
 \hbox(6.94444+1.0)x86.45851, direction TLT
-.\special{ps:gsave}
-.\special{ps::[begin]}
-.\special{ps::currentpoint}
-.\special{ps::currentpoint translate}
-.\special{ps::matrix currentmatrix}
-.\special{ps::Resolution 72 div VResolution 72 div scale}
-.\special{ps::DVImag dup scale}
-.\special{ps::0 0.99626 86.1355 -7.91476 rectclip}
-.\special{ps::setmatrix}
-.\special{ps::neg exch neg exch translate}
-.\special{ps::[end]}
+.\pdfsave
+.\pdfliteral origin{0 -0.99626 86.1355 7.91476 re W n}
 .\hbox(6.94444+1.0)x0.0, glue set - 86.45851fil, direction TLT
 ..\hbox(6.94444+1.0)x86.45851, direction TLT
 ...\OT1/cmr/m/n/10 G
@@ -136,24 +114,15 @@ l. ...  }
 ...\OT1/cmr/m/n/10 w
 ...\OT1/cmr/m/n/10 n
 ..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{ps:grestore}
+.\pdfrestore
 .\glue 86.45851
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
 > \box...=
 \hbox(6.94444+1.94444)x20.0, direction TLT
-.\special{ps:gsave}
-.\special{ps::[begin]}
-.\special{ps::currentpoint}
-.\special{ps::currentpoint translate}
-.\special{ps::matrix currentmatrix}
-.\special{ps::Resolution 72 div VResolution 72 div scale}
-.\special{ps::DVImag dup scale}
-.\special{ps::0 1.93718 19.92528 -8.85568 rectclip}
-.\special{ps::setmatrix}
-.\special{ps::neg exch neg exch translate}
-.\special{ps::[end]}
+.\pdfsave
+.\pdfliteral origin{0 -1.93718 19.92528 8.85568 re W n}
 .\hbox(6.94444+1.94444)x0.0, glue set - 20.0fil, direction TLT
 ..\hbox(6.94444+1.94444)x20.0, direction TLT
 ...\OT1/cmr/m/n/10 G
@@ -177,7 +146,7 @@ l. ...  }
 ...\OT1/cmr/m/n/10 w
 ...\OT1/cmr/m/n/10 n
 ..\glue 0.0 plus 1.0fil minus 1.0fil
-.\special{ps:grestore}
+.\pdfrestore
 .\glue 20.0
 ! OK.
 <argument> \l_tmpa_box 
@@ -207,15 +176,10 @@ l. ...  }
 \hbox(6.94444+0.0)x50.02786, direction TLT
 .\hbox(6.94444+0.0)x50.02786, direction TLT
 ..\kern0.0
-..\hbox(6.94444+0.0)x50.02786, direction TLT
-...\special{ps:gsave}
-...\special{ps::[begin]}
-...\special{ps::currentpoint}
-...\special{ps::currentpoint translate}
-...\special{ps::0 rotate}
-...\special{ps::neg exch neg exch translate}
-...\special{ps::[end]}
-...\hbox(6.94444+0.0)x50.02786, direction TLT
+..\hbox(6.94444+0.0)x0.0, direction TLT
+...\pdfsave
+...\pdfsetmatrix{1 0 0 1}
+...\hbox(6.94444+0.0)x0.0, direction TLT
 ....\hbox(6.94444+0.0)x50.02786, direction TLT
 .....\OT1/cmr/m/n/10 H
 .....\OT1/cmr/m/n/10 e
@@ -229,7 +193,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 r
 .....\OT1/cmr/m/n/10 l
 .....\OT1/cmr/m/n/10 d
-...\special{ps:grestore}
+...\pdfrestore
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
@@ -237,15 +201,10 @@ l. ...  }
 \hbox(31.028+0.0)x46.79762, direction TLT
 .\hbox(31.028+0.0)x46.79762, direction TLT
 ..\kern3.47223
-..\hbox(6.94444+0.0)x50.02786, direction TLT
-...\special{ps:gsave}
-...\special{ps::[begin]}
-...\special{ps::currentpoint}
-...\special{ps::currentpoint translate}
-...\special{ps::-30 rotate}
-...\special{ps::neg exch neg exch translate}
-...\special{ps::[end]}
-...\hbox(6.94444+0.0)x50.02786, direction TLT
+..\hbox(6.94444+0.0)x0.0, direction TLT
+...\pdfsave
+...\pdfsetmatrix{0.86603 0.5 -0.5 0.86603}
+...\hbox(6.94444+0.0)x0.0, direction TLT
 ....\hbox(6.94444+0.0)x50.02786, direction TLT
 .....\OT1/cmr/m/n/10 H
 .....\OT1/cmr/m/n/10 e
@@ -259,7 +218,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 r
 .....\OT1/cmr/m/n/10 l
 .....\OT1/cmr/m/n/10 d
-...\special{ps:grestore}
+...\pdfrestore
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
@@ -267,15 +226,10 @@ l. ...  }
 \hbox(40.2855+0.0)x40.2855, direction TLT
 .\hbox(40.2855+0.0)x40.2855, direction TLT
 ..\kern4.91046
-..\hbox(6.94444+0.0)x50.02786, direction TLT
-...\special{ps:gsave}
-...\special{ps::[begin]}
-...\special{ps::currentpoint}
-...\special{ps::currentpoint translate}
-...\special{ps::-45 rotate}
-...\special{ps::neg exch neg exch translate}
-...\special{ps::[end]}
-...\hbox(6.94444+0.0)x50.02786, direction TLT
+..\hbox(6.94444+0.0)x0.0, direction TLT
+...\pdfsave
+...\pdfsetmatrix{0.70711 0.70711 -0.70711 0.70711}
+...\hbox(6.94444+0.0)x0.0, direction TLT
 ....\hbox(6.94444+0.0)x50.02786, direction TLT
 .....\OT1/cmr/m/n/10 H
 .....\OT1/cmr/m/n/10 e
@@ -289,7 +243,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 r
 .....\OT1/cmr/m/n/10 l
 .....\OT1/cmr/m/n/10 d
-...\special{ps:grestore}
+...\pdfrestore
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
@@ -297,15 +251,10 @@ l. ...  }
 \hbox(35.37505+4.91046)x40.2855, direction TLT
 .\hbox(35.37505+4.91046)x40.2855, direction TLT
 ..\kern40.2855
-..\hbox(6.94444+0.0)x50.02786, direction TLT
-...\special{ps:gsave}
-...\special{ps::[begin]}
-...\special{ps::currentpoint}
-...\special{ps::currentpoint translate}
-...\special{ps::-135 rotate}
-...\special{ps::neg exch neg exch translate}
-...\special{ps::[end]}
-...\hbox(6.94444+0.0)x50.02786, direction TLT
+..\hbox(6.94444+0.0)x0.0, direction TLT
+...\pdfsave
+...\pdfsetmatrix{-0.70711 0.70711 -0.70711 -0.70711}
+...\hbox(6.94444+0.0)x0.0, direction TLT
 ....\hbox(6.94444+0.0)x50.02786, direction TLT
 .....\OT1/cmr/m/n/10 H
 .....\OT1/cmr/m/n/10 e
@@ -319,7 +268,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 r
 .....\OT1/cmr/m/n/10 l
 .....\OT1/cmr/m/n/10 d
-...\special{ps:grestore}
+...\pdfrestore
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
@@ -327,15 +276,10 @@ l. ...  }
 \hbox(0.0+40.2855)x40.2855, direction TLT
 .\hbox(0.0+40.2855)x40.2855, direction TLT
 ..\kern35.37505
-..\hbox(6.94444+0.0)x50.02786, direction TLT
-...\special{ps:gsave}
-...\special{ps::[begin]}
-...\special{ps::currentpoint}
-...\special{ps::currentpoint translate}
-...\special{ps::-225 rotate}
-...\special{ps::neg exch neg exch translate}
-...\special{ps::[end]}
-...\hbox(6.94444+0.0)x50.02786, direction TLT
+..\hbox(6.94444+0.0)x0.0, direction TLT
+...\pdfsave
+...\pdfsetmatrix{-0.70711 -0.70711 0.70711 -0.70711}
+...\hbox(6.94444+0.0)x0.0, direction TLT
 ....\hbox(6.94444+0.0)x50.02786, direction TLT
 .....\OT1/cmr/m/n/10 H
 .....\OT1/cmr/m/n/10 e
@@ -349,7 +293,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 r
 .....\OT1/cmr/m/n/10 l
 .....\OT1/cmr/m/n/10 d
-...\special{ps:grestore}
+...\pdfrestore
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
@@ -357,15 +301,10 @@ l. ...  }
 \hbox(4.91046+35.37505)x40.2855, direction TLT
 .\hbox(4.91046+35.37505)x40.2855, direction TLT
 ..\kern0.0
-..\hbox(6.94444+0.0)x50.02786, direction TLT
-...\special{ps:gsave}
-...\special{ps::[begin]}
-...\special{ps::currentpoint}
-...\special{ps::currentpoint translate}
-...\special{ps::-315 rotate}
-...\special{ps::neg exch neg exch translate}
-...\special{ps::[end]}
-...\hbox(6.94444+0.0)x50.02786, direction TLT
+..\hbox(6.94444+0.0)x0.0, direction TLT
+...\pdfsave
+...\pdfsetmatrix{0.70711 -0.70711 0.70711 0.70711}
+...\hbox(6.94444+0.0)x0.0, direction TLT
 ....\hbox(6.94444+0.0)x50.02786, direction TLT
 .....\OT1/cmr/m/n/10 H
 .....\OT1/cmr/m/n/10 e
@@ -379,7 +318,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 r
 .....\OT1/cmr/m/n/10 l
 .....\OT1/cmr/m/n/10 d
-...\special{ps:grestore}
+...\pdfrestore
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
@@ -387,27 +326,17 @@ l. ...  }
 \hbox(56.9723+0.0)x56.97232, direction TLT
 .\hbox(56.9723+0.0)x56.97232, direction TLT
 ..\kern28.48616
-..\hbox(40.2855+0.0)x40.2855, direction TLT
-...\special{ps:gsave}
-...\special{ps::[begin]}
-...\special{ps::currentpoint}
-...\special{ps::currentpoint translate}
-...\special{ps::-45 rotate}
-...\special{ps::neg exch neg exch translate}
-...\special{ps::[end]}
-...\hbox(40.2855+0.0)x40.2855, direction TLT
+..\hbox(40.2855+0.0)x0.0, direction TLT
+...\pdfsave
+...\pdfsetmatrix{0.70711 0.70711 -0.70711 0.70711}
+...\hbox(40.2855+0.0)x0.0, direction TLT
 ....\hbox(40.2855+0.0)x40.2855, direction TLT
 .....\hbox(40.2855+0.0)x40.2855, direction TLT
 ......\kern4.91046
-......\hbox(6.94444+0.0)x50.02786, direction TLT
-.......\special{ps:gsave}
-.......\special{ps::[begin]}
-.......\special{ps::currentpoint}
-.......\special{ps::currentpoint translate}
-.......\special{ps::-45 rotate}
-.......\special{ps::neg exch neg exch translate}
-.......\special{ps::[end]}
-.......\hbox(6.94444+0.0)x50.02786, direction TLT
+......\hbox(6.94444+0.0)x0.0, direction TLT
+.......\pdfsave
+.......\pdfsetmatrix{0.70711 0.70711 -0.70711 0.70711}
+.......\hbox(6.94444+0.0)x0.0, direction TLT
 ........\hbox(6.94444+0.0)x50.02786, direction TLT
 .........\OT1/cmr/m/n/10 H
 .........\OT1/cmr/m/n/10 e
@@ -421,8 +350,8 @@ l. ...  }
 .........\OT1/cmr/m/n/10 r
 .........\OT1/cmr/m/n/10 l
 .........\OT1/cmr/m/n/10 d
-.......\special{ps:grestore}
-...\special{ps:grestore}
+.......\pdfrestore
+...\pdfrestore
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
@@ -452,13 +381,8 @@ l. ...  }
 .\hbox(6.94444+0.0)x50.02786, direction TLT
 ..\kern0.0
 ..\hbox(6.94444+0.0)x50.02786, direction TLT
-...\special{ps:gsave}
-...\special{ps::[begin]}
-...\special{ps::currentpoint}
-...\special{ps::currentpoint translate}
-...\special{ps::1 1 scale}
-...\special{ps::neg exch neg exch translate}
-...\special{ps::[end]}
+...\pdfsave
+...\pdfsetmatrix{1 0 0 1}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil, direction TLT
 ....\hbox(6.94444+0.0)x50.02786, direction TLT
 .....\OT1/cmr/m/n/10 H
@@ -474,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{ps:grestore}
+...\pdfrestore
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -484,13 +408,8 @@ l. ...  }
 .\hbox(6.94444+0.0)x125.06966, direction TLT
 ..\kern0.0
 ..\hbox(6.94444+0.0)x125.06966, direction TLT
-...\special{ps:gsave}
-...\special{ps::[begin]}
-...\special{ps::currentpoint}
-...\special{ps::currentpoint translate}
-...\special{ps::2.5 1 scale}
-...\special{ps::neg exch neg exch translate}
-...\special{ps::[end]}
+...\pdfsave
+...\pdfsetmatrix{2.5 0 0 1}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil, direction TLT
 ....\hbox(6.94444+0.0)x50.02786, direction TLT
 .....\OT1/cmr/m/n/10 H
@@ -506,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{ps:grestore}
+...\pdfrestore
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -516,13 +435,8 @@ l. ...  }
 .\hbox(2.31477+0.0)x50.02786, direction TLT
 ..\kern0.0
 ..\hbox(2.31477+0.0)x50.02786, direction TLT
-...\special{ps:gsave}
-...\special{ps::[begin]}
-...\special{ps::currentpoint}
-...\special{ps::currentpoint translate}
-...\special{ps::1 0.33333 scale}
-...\special{ps::neg exch neg exch translate}
-...\special{ps::[end]}
+...\pdfsave
+...\pdfsetmatrix{1 0 0 0.33333}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil, direction TLT
 ....\hbox(6.94444+0.0)x50.02786, direction TLT
 .....\OT1/cmr/m/n/10 H
@@ -538,7 +452,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 l
 .....\OT1/cmr/m/n/10 d
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{ps:grestore}
+...\pdfrestore
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -548,13 +462,8 @@ l. ...  }
 .\hbox(6.94444+1.94444)x103.61133, direction TLT
 ..\kern0.0
 ..\hbox(6.94444+1.94444)x103.61133, direction TLT
-...\special{ps:gsave}
-...\special{ps::[begin]}
-...\special{ps::currentpoint}
-...\special{ps::currentpoint translate}
-...\special{ps::1 1 scale}
-...\special{ps::neg exch neg exch translate}
-...\special{ps::[end]}
+...\pdfsave
+...\pdfsetmatrix{1 0 0 1}
 ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil, direction TLT
 ....\hbox(6.94444+1.94444)x103.61133, direction TLT
 .....\OT1/cmr/m/n/10 T
@@ -583,7 +492,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 w
 .....\OT1/cmr/m/n/10 n
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{ps:grestore}
+...\pdfrestore
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -593,13 +502,8 @@ l. ...  }
 .\hbox(20.83333+5.83333)x310.83398, direction TLT
 ..\kern0.0
 ..\hbox(20.83333+5.83333)x310.83398, direction TLT
-...\special{ps:gsave}
-...\special{ps::[begin]}
-...\special{ps::currentpoint}
-...\special{ps::currentpoint translate}
-...\special{ps::3 3 scale}
-...\special{ps::neg exch neg exch translate}
-...\special{ps::[end]}
+...\pdfsave
+...\pdfsetmatrix{3 0 0 3}
 ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil, direction TLT
 ....\hbox(6.94444+1.94444)x103.61133, direction TLT
 .....\OT1/cmr/m/n/10 T
@@ -628,7 +532,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 w
 .....\OT1/cmr/m/n/10 n
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{ps:grestore}
+...\pdfrestore
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -638,13 +542,8 @@ l. ...  }
 .\hbox(5.83333+20.83333)x310.83398, direction TLT
 ..\kern310.83398
 ..\hbox(5.83333+20.83333)x0.0, direction TLT
-...\special{ps:gsave}
-...\special{ps::[begin]}
-...\special{ps::currentpoint}
-...\special{ps::currentpoint translate}
-...\special{ps::-3 -3 scale}
-...\special{ps::neg exch neg exch translate}
-...\special{ps::[end]}
+...\pdfsave
+...\pdfsetmatrix{-3 0 0 -3}
 ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil, direction TLT
 ....\hbox(6.94444+1.94444)x103.61133, direction TLT
 .....\OT1/cmr/m/n/10 T
@@ -673,7 +572,7 @@ l. ...  }
 .....\OT1/cmr/m/n/10 w
 .....\OT1/cmr/m/n/10 n
 ....\glue 0.0 plus 1.0fil minus 1.0fil
-...\special{ps:grestore}
+...\pdfrestore
 ..\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
 <argument> \l_tmpa_box 
@@ -684,9 +583,7 @@ TEST 4: Color
 ============================================================
 > \box...=
 \hbox(6.94444+0.0)x50.02786, direction TLT
-.\special{color push gray 0}
-.\special{ps:SDict begin /color.sc { } def end}
-.\special{ps:SDict begin /color.fc { } def end}
+.\pdfcolorstack 0 push {0 g 0 G}
 .\OT1/cmr/m/n/10 H
 .\OT1/cmr/m/n/10 e
 .\OT1/cmr/m/n/10 l
@@ -699,7 +596,7 @@ TEST 4: Color
 .\OT1/cmr/m/n/10 r
 .\OT1/cmr/m/n/10 l
 .\OT1/cmr/m/n/10 d
-.\special{color pop}
+.\pdfcolorstack 0 pop
 ! OK.
 <argument> \l_tmpa_coffin 
 l. ...  }
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index c6617c9c3..5d3dfd455 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -21,7 +21,7 @@ Defining \__kernel_backend_literal:e on line ...
 Defining \__kernel_backend_literal:n on line ...
 Defining \__kernel_backend_literal:x on line ...
 (l3backend-pdfmode-luatex.def
-File: l3backend-pdfmode-lautex.def ....-..-.. L3 backend support: PDF mode
+File: l3backend-pdfmode-luatex.def ....-..-.. L3 backend support: PDF mode
 Defining \__kernel_backend_literal_pdf:n on line ...
 Defining \__kernel_backend_literal_pdf:x on line ...
 Defining \__kernel_backend_literal_page:n on line ...
diff --git a/l3kernel/testfiles/m3expl002.luatex.tlg b/l3kernel/testfiles/m3expl002.luatex.tlg
index 9bb9d4bf5..1b29f002b 100644
--- a/l3kernel/testfiles/m3expl002.luatex.tlg
+++ b/l3kernel/testfiles/m3expl002.luatex.tlg
@@ -7,7 +7,7 @@ File: l3debug.def ....-..-.. L3 Debugging support
 ) (l3backend-pdfmode.def
 File: l3backend-pdfmode.def ....-..-.. L3 backend support: PDF mode
 (l3backend-pdfmode-luatex.def
-File: l3backend-pdfmode-lautex.def ....-..-.. L3 backend support: PDF mode
+File: l3backend-pdfmode-luatex.def ....-..-.. L3 backend support: PDF mode
 \l__kernel_color_stack_int=\count...
 \l__pdf_internal_box=\box...
 )))
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index c6617c9c3..5d3dfd455 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -21,7 +21,7 @@ Defining \__kernel_backend_literal:e on line ...
 Defining \__kernel_backend_literal:n on line ...
 Defining \__kernel_backend_literal:x on line ...
 (l3backend-pdfmode-luatex.def
-File: l3backend-pdfmode-lautex.def ....-..-.. L3 backend support: PDF mode
+File: l3backend-pdfmode-luatex.def ....-..-.. L3 backend support: PDF mode
 Defining \__kernel_backend_literal_pdf:n on line ...
 Defining \__kernel_backend_literal_pdf:x on line ...
 Defining \__kernel_backend_literal_page:n on line ...
diff --git a/l3kernel/testfiles/m3expl004.luatex.tlg b/l3kernel/testfiles/m3expl004.luatex.tlg
index 4fd28f231..b3fff65bd 100644
--- a/l3kernel/testfiles/m3expl004.luatex.tlg
+++ b/l3kernel/testfiles/m3expl004.luatex.tlg
@@ -5,7 +5,7 @@ Package: expl3 ....-..-.. L3 programming layer (loader)
 (l3backend-pdfmode.def
 File: l3backend-pdfmode.def ....-..-.. L3 backend support: PDF mode
 (l3backend-pdfmode-luatex.def
-File: l3backend-pdfmode-lautex.def ....-..-.. L3 backend support: PDF mode
+File: l3backend-pdfmode-luatex.def ....-..-.. L3 backend support: PDF mode
 \l__kernel_color_stack_int=\count...
 \l__pdf_internal_box=\box...
 )))
diff --git a/l3kernel/testfiles/m3expl006.luatex.tlg b/l3kernel/testfiles/m3expl006.luatex.tlg
index 1462861f2..4457e07b8 100644
--- a/l3kernel/testfiles/m3expl006.luatex.tlg
+++ b/l3kernel/testfiles/m3expl006.luatex.tlg
@@ -6,7 +6,7 @@ Package: expl3 ....-..-.. L3 programming layer (loader)
 (l3backend-pdfmode.def
 File: l3backend-pdfmode.def ....-..-.. L3 backend support: PDF mode
 (l3backend-pdfmode-luatex.def
-File: l3backend-pdfmode-lautex.def ....-..-.. L3 backend support: PDF mode
+File: l3backend-pdfmode-luatex.def ....-..-.. L3 backend support: PDF mode
 \l__kernel_color_stack_int=\count...
 \l__pdf_internal_box=\box...
 )))
diff --git a/l3kernel/testfiles/m3expl007.tlg b/l3kernel/testfiles/m3expl007.luatex.tlg
similarity index 84%
copy from l3kernel/testfiles/m3expl007.tlg
copy to l3kernel/testfiles/m3expl007.luatex.tlg
index b6d9a65b4..24e8158fa 100644
--- a/l3kernel/testfiles/m3expl007.tlg
+++ b/l3kernel/testfiles/m3expl007.luatex.tlg
@@ -5,8 +5,8 @@ Author: Phelype Oleinik
 Package: expl3 ....-..-.. L3 programming layer (loader) 
 (l3backend-pdfmode.def
 File: l3backend-pdfmode.def ....-..-.. L3 backend support: PDF mode
-(l3backend-pdfmode-pdftex.def
-File: l3backend-pdfmode-pdftex.def ....-..-.. L3 backend support: PDF mode
+(l3backend-pdfmode-luatex.def
+File: l3backend-pdfmode-luatex.def ....-..-.. L3 backend support: PDF mode
 \l__kernel_color_stack_int=\count...
 \l__pdf_internal_box=\box...
 )))





More information about the latex3-commits mailing list.