[latex3-commits] [l3svn] 04/04: Use 'native' approach for rotation/scaling in (x)dvipdfmx

noreply at latex-project.org noreply at latex-project.org
Tue May 9 11:17:13 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 902c6fc1eb9f889f7f71d4123b087f6ea46b0355
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Tue May 9 10:15:21 2017 +0100

    Use 'native' approach for rotation/scaling in (x)dvipdfmx
    
    The PDF cm approach fails to handle any nested material, in particular links:
    that is not really addressable at our level. The native approach does have
    some oddities (it refueses to do small scalings) but overall having working
    nesting is more important.
---
 .../xcoffins/testfiles/xcoffins003.ptex.tlg        |   30 +++---
 .../xcoffins/testfiles/xcoffins003.uptex.tlg       |   30 +++---
 .../xcoffins/testfiles/xcoffins003.xetex.tlg       |   30 +++---
 l3kernel/l3drivers.dtx                             |   73 ++++---------
 l3kernel/testfiles/d3dvips.xetex.tlg               |   60 +++++------
 l3kernel/testfiles/d3dvisvgm.xetex.tlg             |   60 +++++------
 l3kernel/testfiles/d3pdfmode.xetex.tlg             |   60 +++++------
 l3kernel/testfiles/d3xdvipdfmx.xetex.tlg           |   60 +++++------
 l3kernel/testfiles/m3box004.ptex.tlg               |  112 ++++++++++----------
 l3kernel/testfiles/m3box004.uptex.tlg              |  112 ++++++++++----------
 l3kernel/testfiles/m3box004.xetex.tlg              |  112 ++++++++++----------
 l3kernel/testfiles/m3coffins001.ptex.tlg           |   44 ++++----
 l3kernel/testfiles/m3coffins001.uptex.tlg          |   44 ++++----
 l3kernel/testfiles/m3coffins001.xetex.tlg          |   44 ++++----
 l3kernel/testfiles/m3expl001.ptex.tlg              |    3 -
 l3kernel/testfiles/m3expl001.uptex.tlg             |    3 -
 l3kernel/testfiles/m3expl001.xetex.tlg             |    3 -
 l3kernel/testfiles/m3expl003.ptex.tlg              |    3 -
 l3kernel/testfiles/m3expl003.uptex.tlg             |    3 -
 l3kernel/testfiles/m3expl003.xetex.tlg             |    3 -
 20 files changed, 422 insertions(+), 467 deletions(-)

diff --git a/l3experimental/xcoffins/testfiles/xcoffins003.ptex.tlg b/l3experimental/xcoffins/testfiles/xcoffins003.ptex.tlg
index 68530b1..a2ac18d 100644
--- a/l3experimental/xcoffins/testfiles/xcoffins003.ptex.tlg
+++ b/l3experimental/xcoffins/testfiles/xcoffins003.ptex.tlg
@@ -173,10 +173,10 @@ l. ...}
 ..\hbox(79.70663+32.17336)x111.87999
 ...\hbox(79.70663+32.17336)x111.87999
 ....\kern 35.7089
-....\hbox(50.5+45.5)x0.0
+....\hbox(50.5+45.5)x62.2222
 .....\special{x:gsave}
-.....\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
-.....\hbox(50.5+45.5)x0.0
+.....\special{x:rotate 45}
+.....\hbox(50.5+45.5)x62.2222
 ......\hbox(50.5+45.5)x62.2222
 .......\hbox(0.0+0.0)x0.0
 .......\hbox(50.5+45.5)x62.2222
@@ -348,7 +348,7 @@ l. ...}
 ....\kern 0.0
 ....\hbox(0.0+0.0)x0.0
 .....\special{x:gsave}
-.....\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
+.....\special{x:rotate 45}
 .....\hbox(0.0+0.0)x0.0
 ......\hbox(0.0+0.0)x0.0
 .......\hbox(0.0+0.0)x0.0
@@ -356,10 +356,10 @@ l. ...}
 ........\hbox(79.70663+32.17336)x111.87999
 .........\hbox(79.70663+32.17336)x111.87999
 ..........\kern 35.7089
-..........\hbox(50.5+45.5)x0.0
+..........\hbox(50.5+45.5)x62.2222
 ...........\special{x:gsave}
-...........\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
-...........\hbox(50.5+45.5)x0.0
+...........\special{x:rotate 45}
+...........\hbox(50.5+45.5)x62.2222
 ............\hbox(50.5+45.5)x62.2222
 .............\hbox(0.0+0.0)x0.0
 .............\hbox(50.5+45.5)x62.2222
@@ -539,7 +539,7 @@ TEST 2: Test 2: rotation+alignment
 .......\kern 0.0
 .......\hbox(0.0+0.0)x0.0
 ........\special{x:gsave}
-........\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
+........\special{x:rotate 45}
 ........\hbox(0.0+0.0)x0.0
 .........\hbox(0.0+0.0)x0.0
 ..........\hbox(0.0+0.0)x0.0
@@ -549,7 +549,7 @@ TEST 2: Test 2: rotation+alignment
 .............\kern 0.0
 .............\hbox(0.0+0.0)x0.0
 ..............\special{x:gsave}
-..............\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
+..............\special{x:rotate 45}
 ..............\hbox(0.0+0.0)x0.0
 ...............\hbox(0.0+0.0)x0.0
 ................\hbox(0.0+0.0)x0.0
@@ -557,10 +557,10 @@ TEST 2: Test 2: rotation+alignment
 .................\hbox(79.70663+32.17336)x111.87999
 ..................\hbox(79.70663+32.17336)x111.87999
 ...................\kern 35.7089
-...................\hbox(50.5+45.5)x0.0
+...................\hbox(50.5+45.5)x62.2222
 ....................\special{x:gsave}
-....................\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
-....................\hbox(50.5+45.5)x0.0
+....................\special{x:rotate 45}
+....................\hbox(50.5+45.5)x62.2222
 .....................\hbox(50.5+45.5)x62.2222
 ......................\hbox(0.0+0.0)x0.0
 ......................\hbox(50.5+45.5)x62.2222
@@ -748,10 +748,10 @@ TEST 2: Test 2: rotation+alignment
 .....\hbox(52.82094+3.77908)x56.60002
 ......\hbox(52.82094+3.77908)x56.60002
 .......\kern 7.31462
-.......\hbox(10.34444+5.34444)x0.0
+.......\hbox(10.34444+5.34444)x64.35565
 ........\special{x:gsave}
-........\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
-........\hbox(10.34444+5.34444)x0.0
+........\special{x:rotate 45}
+........\hbox(10.34444+5.34444)x64.35565
 .........\hbox(10.34444+5.34444)x64.35565
 ..........\hbox(10.34444+5.34444)x64.35565
 ...........\hbox(15.68887+0.0)x64.35565, shifted 5.34444
diff --git a/l3experimental/xcoffins/testfiles/xcoffins003.uptex.tlg b/l3experimental/xcoffins/testfiles/xcoffins003.uptex.tlg
index 68530b1..a2ac18d 100644
--- a/l3experimental/xcoffins/testfiles/xcoffins003.uptex.tlg
+++ b/l3experimental/xcoffins/testfiles/xcoffins003.uptex.tlg
@@ -173,10 +173,10 @@ l. ...}
 ..\hbox(79.70663+32.17336)x111.87999
 ...\hbox(79.70663+32.17336)x111.87999
 ....\kern 35.7089
-....\hbox(50.5+45.5)x0.0
+....\hbox(50.5+45.5)x62.2222
 .....\special{x:gsave}
-.....\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
-.....\hbox(50.5+45.5)x0.0
+.....\special{x:rotate 45}
+.....\hbox(50.5+45.5)x62.2222
 ......\hbox(50.5+45.5)x62.2222
 .......\hbox(0.0+0.0)x0.0
 .......\hbox(50.5+45.5)x62.2222
@@ -348,7 +348,7 @@ l. ...}
 ....\kern 0.0
 ....\hbox(0.0+0.0)x0.0
 .....\special{x:gsave}
-.....\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
+.....\special{x:rotate 45}
 .....\hbox(0.0+0.0)x0.0
 ......\hbox(0.0+0.0)x0.0
 .......\hbox(0.0+0.0)x0.0
@@ -356,10 +356,10 @@ l. ...}
 ........\hbox(79.70663+32.17336)x111.87999
 .........\hbox(79.70663+32.17336)x111.87999
 ..........\kern 35.7089
-..........\hbox(50.5+45.5)x0.0
+..........\hbox(50.5+45.5)x62.2222
 ...........\special{x:gsave}
-...........\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
-...........\hbox(50.5+45.5)x0.0
+...........\special{x:rotate 45}
+...........\hbox(50.5+45.5)x62.2222
 ............\hbox(50.5+45.5)x62.2222
 .............\hbox(0.0+0.0)x0.0
 .............\hbox(50.5+45.5)x62.2222
@@ -539,7 +539,7 @@ TEST 2: Test 2: rotation+alignment
 .......\kern 0.0
 .......\hbox(0.0+0.0)x0.0
 ........\special{x:gsave}
-........\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
+........\special{x:rotate 45}
 ........\hbox(0.0+0.0)x0.0
 .........\hbox(0.0+0.0)x0.0
 ..........\hbox(0.0+0.0)x0.0
@@ -549,7 +549,7 @@ TEST 2: Test 2: rotation+alignment
 .............\kern 0.0
 .............\hbox(0.0+0.0)x0.0
 ..............\special{x:gsave}
-..............\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
+..............\special{x:rotate 45}
 ..............\hbox(0.0+0.0)x0.0
 ...............\hbox(0.0+0.0)x0.0
 ................\hbox(0.0+0.0)x0.0
@@ -557,10 +557,10 @@ TEST 2: Test 2: rotation+alignment
 .................\hbox(79.70663+32.17336)x111.87999
 ..................\hbox(79.70663+32.17336)x111.87999
 ...................\kern 35.7089
-...................\hbox(50.5+45.5)x0.0
+...................\hbox(50.5+45.5)x62.2222
 ....................\special{x:gsave}
-....................\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
-....................\hbox(50.5+45.5)x0.0
+....................\special{x:rotate 45}
+....................\hbox(50.5+45.5)x62.2222
 .....................\hbox(50.5+45.5)x62.2222
 ......................\hbox(0.0+0.0)x0.0
 ......................\hbox(50.5+45.5)x62.2222
@@ -748,10 +748,10 @@ TEST 2: Test 2: rotation+alignment
 .....\hbox(52.82094+3.77908)x56.60002
 ......\hbox(52.82094+3.77908)x56.60002
 .......\kern 7.31462
-.......\hbox(10.34444+5.34444)x0.0
+.......\hbox(10.34444+5.34444)x64.35565
 ........\special{x:gsave}
-........\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
-........\hbox(10.34444+5.34444)x0.0
+........\special{x:rotate 45}
+........\hbox(10.34444+5.34444)x64.35565
 .........\hbox(10.34444+5.34444)x64.35565
 ..........\hbox(10.34444+5.34444)x64.35565
 ...........\hbox(15.68887+0.0)x64.35565, shifted 5.34444
diff --git a/l3experimental/xcoffins/testfiles/xcoffins003.xetex.tlg b/l3experimental/xcoffins/testfiles/xcoffins003.xetex.tlg
index 7d53de0..99d8ab3 100644
--- a/l3experimental/xcoffins/testfiles/xcoffins003.xetex.tlg
+++ b/l3experimental/xcoffins/testfiles/xcoffins003.xetex.tlg
@@ -171,10 +171,10 @@ l. ...}
 ..\hbox(79.70663+32.17336)x111.87999
 ...\hbox(79.70663+32.17336)x111.87999
 ....\kern 35.7089
-....\hbox(50.5+45.5)x0.0
+....\hbox(50.5+45.5)x62.2222
 .....\special{x:gsave}
-.....\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
-.....\hbox(50.5+45.5)x0.0
+.....\special{x:rotate 45}
+.....\hbox(50.5+45.5)x62.2222
 ......\hbox(50.5+45.5)x62.2222
 .......\hbox(50.5+45.5)x62.2222
 ........\mathon
@@ -344,7 +344,7 @@ l. ...}
 ....\kern 0.0
 ....\hbox(0.0+0.0)x0.0
 .....\special{x:gsave}
-.....\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
+.....\special{x:rotate 45}
 .....\hbox(0.0+0.0)x0.0
 ......\hbox(0.0+0.0)x0.0
 .......\hbox(0.0+0.0)x0.0
@@ -352,10 +352,10 @@ l. ...}
 ........\hbox(79.70663+32.17336)x111.87999
 .........\hbox(79.70663+32.17336)x111.87999
 ..........\kern 35.7089
-..........\hbox(50.5+45.5)x0.0
+..........\hbox(50.5+45.5)x62.2222
 ...........\special{x:gsave}
-...........\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
-...........\hbox(50.5+45.5)x0.0
+...........\special{x:rotate 45}
+...........\hbox(50.5+45.5)x62.2222
 ............\hbox(50.5+45.5)x62.2222
 .............\hbox(50.5+45.5)x62.2222
 ..............\mathon
@@ -533,7 +533,7 @@ TEST 2: Test 2: rotation+alignment
 .......\kern 0.0
 .......\hbox(0.0+0.0)x0.0
 ........\special{x:gsave}
-........\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
+........\special{x:rotate 45}
 ........\hbox(0.0+0.0)x0.0
 .........\hbox(0.0+0.0)x0.0
 ..........\hbox(0.0+0.0)x0.0
@@ -543,7 +543,7 @@ TEST 2: Test 2: rotation+alignment
 .............\kern 0.0
 .............\hbox(0.0+0.0)x0.0
 ..............\special{x:gsave}
-..............\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
+..............\special{x:rotate 45}
 ..............\hbox(0.0+0.0)x0.0
 ...............\hbox(0.0+0.0)x0.0
 ................\hbox(0.0+0.0)x0.0
@@ -551,10 +551,10 @@ TEST 2: Test 2: rotation+alignment
 .................\hbox(79.70663+32.17336)x111.87999
 ..................\hbox(79.70663+32.17336)x111.87999
 ...................\kern 35.7089
-...................\hbox(50.5+45.5)x0.0
+...................\hbox(50.5+45.5)x62.2222
 ....................\special{x:gsave}
-....................\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
-....................\hbox(50.5+45.5)x0.0
+....................\special{x:rotate 45}
+....................\hbox(50.5+45.5)x62.2222
 .....................\hbox(50.5+45.5)x62.2222
 ......................\hbox(50.5+45.5)x62.2222
 .......................\mathon
@@ -740,10 +740,10 @@ TEST 2: Test 2: rotation+alignment
 .....\hbox(52.82094+3.77908)x56.60002
 ......\hbox(52.82094+3.77908)x56.60002
 .......\kern 7.31462
-.......\hbox(10.34444+5.34444)x0.0
+.......\hbox(10.34444+5.34444)x64.35565
 ........\special{x:gsave}
-........\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
-........\hbox(10.34444+5.34444)x0.0
+........\special{x:rotate 45}
+........\hbox(10.34444+5.34444)x64.35565
 .........\hbox(10.34444+5.34444)x64.35565
 ..........\hbox(10.34444+5.34444)x64.35565
 ...........\hbox(15.68887+0.0)x64.35565, shifted 5.34444
diff --git a/l3kernel/l3drivers.dtx b/l3kernel/l3drivers.dtx
index e561f03..f8e60a7 100644
--- a/l3kernel/l3drivers.dtx
+++ b/l3kernel/l3drivers.dtx
@@ -710,7 +710,9 @@
 %
 % \begin{macro}[int]{\@@_literal:n}
 %   Equivalent to \texttt{pdf:content} but favored as the link to
-%   the \pdfTeX{} primitive approach is clearer.
+%   the \pdfTeX{} primitive approach is clearer. Some higher-level operations
+%   use |\tex_special:D| directly: see the later comments on where this is
+%   useful.
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_literal:n #1
   { \tex_special:D { pdf:literal~ #1 } }
@@ -727,26 +729,11 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}[int]{\@@_matrix:n}
-%   With \texttt{(x)dvipdfmx} the matrix has to include a translation
-%   part: that is always zero and so is built in here so that the same
-%   internal interface works for all PDF-related drivers.
-%    \begin{macrocode}
-\cs_new_protected:Npn \@@_matrix:n #1
-  { \@@_literal:n { #1 \c_space_tl 0~0~cm } }
-%    \end{macrocode}
-% \end{macro}
-%
 % \subsubsection{Box operations}
 %
 % \begin{macro}{\@@_box_use_clip:N}
-%   The general method is to save the current location, define a clipping path
-%   equivalent to the bounding box, then insert the content at the current
-%   position and in a zero width box. The \enquote{real} width is then made up
-%   using a horizontal skip before tidying up. There are other approaches that
-%   can be taken (for example using XForm objects), but the logic here shares
-%   as much code as possible and uses the same conversions (and so same
-%   rounding errors) in all cases.
+%   The code here is idential to that for \texttt{pdfmode}: unlike rotation and
+%   scaling, there is no higher-level support in the driver for clipping.
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_box_use_clip:N #1
   {
@@ -767,55 +754,41 @@
 % \end{macro}
 %
 % \begin{macro}[int]{\@@_box_use_rotate:Nn}
-% \begin{variable}{\l_@@_cos_fp, \l_@@_sin_fp}
-%   Rotations are set using an affine transformation matrix which therefore
-%   requires sine/cosine values not the angle itself. We store the rounded
-%   values to avoid rounding twice. There are also a couple of comparisons to
-%   ensure that |-0| is not written to the output, as this avoids any issues
-%   with problematic display programs.  Note that numbers are compared to~$0$
-%   after rounding.
+%   Rotating in \texttt{(x)}dvipdmfx can be implemented using either PDF or
+%   driver-specific code. The former approach however is not \enquote{aware}
+%   of the content of boxes: this means that any links embded will not be
+%   adjusted by the rotation. As such, the driver-native approach is prefered:
+%   the code therefore is similar (though not identical) to the \texttt{dvips}
+%   version (notice the rotation angle here is positive). As for
+%   \texttt{dvips}, zero rotation is written as |0| not |-0|.
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_box_use_rotate:Nn #1#2
   {
     \@@_scope_begin:
-    \box_set_wd:Nn #1 \c_zero_dim
-    \fp_set:Nn \l_@@_cos_fp { round ( cosd ( #2 ) , 5 ) }
-    \fp_compare:nNnT \l_@@_cos_fp = \c_zero_fp
-      { \fp_zero:N \l_@@_cos_fp }
-    \fp_set:Nn \l_@@_sin_fp { round ( sind ( #2 ) , 5 ) }
-    \@@_matrix:n
+    \tex_special:D
       {
-        \fp_use:N \l_@@_cos_fp \c_space_tl
-        \fp_compare:nNnTF \l_@@_sin_fp = \c_zero_fp
-          { 0~0 }
-          {
-            \fp_use:N \l_@@_sin_fp
-            \c_space_tl
-            \fp_eval:n { -\l_@@_sin_fp }
-          }
-        \c_space_tl
-        \fp_use:N \l_@@_cos_fp
+        x:rotate~
+        \fp_compare:nNnTF {#2} = \c_zero_fp
+          { 0 }
+          { \fp_eval:n { round ( #2 , 5 ) } }
       }
-   \box_use:N #1
-   \@@_scope_end:
+    \box_use:N #1
+    \@@_scope_end:
   }
-\fp_new:N \l_@@_cos_fp
-\fp_new:N \l_@@_sin_fp
 %    \end{macrocode}
-% \end{variable}
 % \end{macro}
 %
 % \begin{macro}{\@@_box_use_scale:Nnn}
-%   The same idea as for rotation but without the complexity of signs and
-%   cosines.
+%   Much the same idea for scaling: use the higher-level driver operation to allow
+%   for box content.
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_box_use_scale:Nnn #1#2#3
   {
     \@@_scope_begin:
-    \@@_matrix:n
+    \tex_special:D
       {
+        x:scale~
         \fp_eval:n { round ( #2 , 5 ) } ~
-        0~0~
         \fp_eval:n { round ( #3 , 5 ) }
       }
     \hbox_overlap_right:n { \box_use:N #1 }
diff --git a/l3kernel/testfiles/d3dvips.xetex.tlg b/l3kernel/testfiles/d3dvips.xetex.tlg
index b2f862d..c481547 100644
--- a/l3kernel/testfiles/d3dvips.xetex.tlg
+++ b/l3kernel/testfiles/d3dvips.xetex.tlg
@@ -149,10 +149,10 @@ l. ...  }
 \hbox(6.94444+0.0)x50.02786
 .\hbox(6.94444+0.0)x50.02786
 ..\kern 0.0
-..\hbox(6.94444+0.0)x0.0
+..\hbox(6.94444+0.0)x50.02786
 ...\special{x:gsave}
-...\special{pdf:literal 1 0 0 1 0 0 cm}
-...\hbox(6.94444+0.0)x0.0
+...\special{x:rotate 0}
+...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
 .....\OT1/cmr/m/n/10 e
@@ -174,10 +174,10 @@ l. ...  }
 \hbox(31.028+0.0)x46.79762
 .\hbox(31.028+0.0)x46.79762
 ..\kern 3.47223
-..\hbox(6.94444+0.0)x0.0
+..\hbox(6.94444+0.0)x50.02786
 ...\special{x:gsave}
-...\special{pdf:literal 0.86603 0.5 -0.5 0.86603 0 0 cm}
-...\hbox(6.94444+0.0)x0.0
+...\special{x:rotate 30}
+...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
 .....\OT1/cmr/m/n/10 e
@@ -199,10 +199,10 @@ l. ...  }
 \hbox(40.2855+0.0)x40.2855
 .\hbox(40.2855+0.0)x40.2855
 ..\kern 4.91046
-..\hbox(6.94444+0.0)x0.0
+..\hbox(6.94444+0.0)x50.02786
 ...\special{x:gsave}
-...\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
-...\hbox(6.94444+0.0)x0.0
+...\special{x:rotate 45}
+...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
 .....\OT1/cmr/m/n/10 e
@@ -224,10 +224,10 @@ l. ...  }
 \hbox(35.37505+4.91046)x40.2855
 .\hbox(35.37505+4.91046)x40.2855
 ..\kern 40.2855
-..\hbox(6.94444+0.0)x0.0
+..\hbox(6.94444+0.0)x50.02786
 ...\special{x:gsave}
-...\special{pdf:literal -0.70711 0.70711 -0.70711 -0.70711 0 0 cm}
-...\hbox(6.94444+0.0)x0.0
+...\special{x:rotate 135}
+...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
 .....\OT1/cmr/m/n/10 e
@@ -249,10 +249,10 @@ l. ...  }
 \hbox(0.0+40.2855)x40.2855
 .\hbox(0.0+40.2855)x40.2855
 ..\kern 35.37505
-..\hbox(6.94444+0.0)x0.0
+..\hbox(6.94444+0.0)x50.02786
 ...\special{x:gsave}
-...\special{pdf:literal -0.70711 -0.70711 0.70711 -0.70711 0 0 cm}
-...\hbox(6.94444+0.0)x0.0
+...\special{x:rotate 225}
+...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
 .....\OT1/cmr/m/n/10 e
@@ -274,10 +274,10 @@ l. ...  }
 \hbox(4.91046+35.37505)x40.2855
 .\hbox(4.91046+35.37505)x40.2855
 ..\kern 0.0
-..\hbox(6.94444+0.0)x0.0
+..\hbox(6.94444+0.0)x50.02786
 ...\special{x:gsave}
-...\special{pdf:literal 0.70711 -0.70711 0.70711 0.70711 0 0 cm}
-...\hbox(6.94444+0.0)x0.0
+...\special{x:rotate 315}
+...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
 .....\OT1/cmr/m/n/10 e
@@ -299,17 +299,17 @@ l. ...  }
 \hbox(56.9723+0.0)x56.97232
 .\hbox(56.9723+0.0)x56.97232
 ..\kern 28.48616
-..\hbox(40.2855+0.0)x0.0
+..\hbox(40.2855+0.0)x40.2855
 ...\special{x:gsave}
-...\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
-...\hbox(40.2855+0.0)x0.0
+...\special{x:rotate 45}
+...\hbox(40.2855+0.0)x40.2855
 ....\hbox(40.2855+0.0)x40.2855
 .....\hbox(40.2855+0.0)x40.2855
 ......\kern 4.91046
-......\hbox(6.94444+0.0)x0.0
+......\hbox(6.94444+0.0)x50.02786
 .......\special{x:gsave}
-.......\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
-.......\hbox(6.94444+0.0)x0.0
+.......\special{x:rotate 45}
+.......\hbox(6.94444+0.0)x50.02786
 ........\hbox(6.94444+0.0)x50.02786
 .........\OT1/cmr/m/n/10 H
 .........\OT1/cmr/m/n/10 e
@@ -355,7 +355,7 @@ l. ...  }
 ..\kern 0.0
 ..\hbox(6.94444+0.0)x50.02786
 ...\special{x:gsave}
-...\special{pdf:literal 1 0 0 1 0 0 cm}
+...\special{x:scale 1 1}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -382,7 +382,7 @@ l. ...  }
 ..\kern 0.0
 ..\hbox(6.94444+0.0)x125.06966
 ...\special{x:gsave}
-...\special{pdf:literal 2.5 0 0 1 0 0 cm}
+...\special{x:scale 2.5 1}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -409,7 +409,7 @@ l. ...  }
 ..\kern 0.0
 ..\hbox(2.31477+0.0)x50.02786
 ...\special{x:gsave}
-...\special{pdf:literal 1 0 0 0.33333 0 0 cm}
+...\special{x:scale 1 0.33333}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -436,7 +436,7 @@ l. ...  }
 ..\kern 0.0
 ..\hbox(6.94444+1.94444)x103.61133
 ...\special{x:gsave}
-...\special{pdf:literal 1 0 0 1 0 0 cm}
+...\special{x:scale 1 1}
 ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil
 ....\hbox(6.94444+1.94444)x103.61133
 .....\OT1/cmr/m/n/10 T
@@ -474,7 +474,7 @@ l. ...  }
 ..\kern 0.0
 ..\hbox(20.83333+5.83333)x310.83398
 ...\special{x:gsave}
-...\special{pdf:literal 3 0 0 3 0 0 cm}
+...\special{x:scale 3 3}
 ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil
 ....\hbox(6.94444+1.94444)x103.61133
 .....\OT1/cmr/m/n/10 T
@@ -512,7 +512,7 @@ l. ...  }
 ..\kern 310.83398
 ..\hbox(5.83333+20.83333)x0.0
 ...\special{x:gsave}
-...\special{pdf:literal -3 0 0 -3 0 0 cm}
+...\special{x:scale -3 -3}
 ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil
 ....\hbox(6.94444+1.94444)x103.61133
 .....\OT1/cmr/m/n/10 T
diff --git a/l3kernel/testfiles/d3dvisvgm.xetex.tlg b/l3kernel/testfiles/d3dvisvgm.xetex.tlg
index b2f862d..c481547 100644
--- a/l3kernel/testfiles/d3dvisvgm.xetex.tlg
+++ b/l3kernel/testfiles/d3dvisvgm.xetex.tlg
@@ -149,10 +149,10 @@ l. ...  }
 \hbox(6.94444+0.0)x50.02786
 .\hbox(6.94444+0.0)x50.02786
 ..\kern 0.0
-..\hbox(6.94444+0.0)x0.0
+..\hbox(6.94444+0.0)x50.02786
 ...\special{x:gsave}
-...\special{pdf:literal 1 0 0 1 0 0 cm}
-...\hbox(6.94444+0.0)x0.0
+...\special{x:rotate 0}
+...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
 .....\OT1/cmr/m/n/10 e
@@ -174,10 +174,10 @@ l. ...  }
 \hbox(31.028+0.0)x46.79762
 .\hbox(31.028+0.0)x46.79762
 ..\kern 3.47223
-..\hbox(6.94444+0.0)x0.0
+..\hbox(6.94444+0.0)x50.02786
 ...\special{x:gsave}
-...\special{pdf:literal 0.86603 0.5 -0.5 0.86603 0 0 cm}
-...\hbox(6.94444+0.0)x0.0
+...\special{x:rotate 30}
+...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
 .....\OT1/cmr/m/n/10 e
@@ -199,10 +199,10 @@ l. ...  }
 \hbox(40.2855+0.0)x40.2855
 .\hbox(40.2855+0.0)x40.2855
 ..\kern 4.91046
-..\hbox(6.94444+0.0)x0.0
+..\hbox(6.94444+0.0)x50.02786
 ...\special{x:gsave}
-...\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
-...\hbox(6.94444+0.0)x0.0
+...\special{x:rotate 45}
+...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
 .....\OT1/cmr/m/n/10 e
@@ -224,10 +224,10 @@ l. ...  }
 \hbox(35.37505+4.91046)x40.2855
 .\hbox(35.37505+4.91046)x40.2855
 ..\kern 40.2855
-..\hbox(6.94444+0.0)x0.0
+..\hbox(6.94444+0.0)x50.02786
 ...\special{x:gsave}
-...\special{pdf:literal -0.70711 0.70711 -0.70711 -0.70711 0 0 cm}
-...\hbox(6.94444+0.0)x0.0
+...\special{x:rotate 135}
+...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
 .....\OT1/cmr/m/n/10 e
@@ -249,10 +249,10 @@ l. ...  }
 \hbox(0.0+40.2855)x40.2855
 .\hbox(0.0+40.2855)x40.2855
 ..\kern 35.37505
-..\hbox(6.94444+0.0)x0.0
+..\hbox(6.94444+0.0)x50.02786
 ...\special{x:gsave}
-...\special{pdf:literal -0.70711 -0.70711 0.70711 -0.70711 0 0 cm}
-...\hbox(6.94444+0.0)x0.0
+...\special{x:rotate 225}
+...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
 .....\OT1/cmr/m/n/10 e
@@ -274,10 +274,10 @@ l. ...  }
 \hbox(4.91046+35.37505)x40.2855
 .\hbox(4.91046+35.37505)x40.2855
 ..\kern 0.0
-..\hbox(6.94444+0.0)x0.0
+..\hbox(6.94444+0.0)x50.02786
 ...\special{x:gsave}
-...\special{pdf:literal 0.70711 -0.70711 0.70711 0.70711 0 0 cm}
-...\hbox(6.94444+0.0)x0.0
+...\special{x:rotate 315}
+...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
 .....\OT1/cmr/m/n/10 e
@@ -299,17 +299,17 @@ l. ...  }
 \hbox(56.9723+0.0)x56.97232
 .\hbox(56.9723+0.0)x56.97232
 ..\kern 28.48616
-..\hbox(40.2855+0.0)x0.0
+..\hbox(40.2855+0.0)x40.2855
 ...\special{x:gsave}
-...\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
-...\hbox(40.2855+0.0)x0.0
+...\special{x:rotate 45}
+...\hbox(40.2855+0.0)x40.2855
 ....\hbox(40.2855+0.0)x40.2855
 .....\hbox(40.2855+0.0)x40.2855
 ......\kern 4.91046
-......\hbox(6.94444+0.0)x0.0
+......\hbox(6.94444+0.0)x50.02786
 .......\special{x:gsave}
-.......\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
-.......\hbox(6.94444+0.0)x0.0
+.......\special{x:rotate 45}
+.......\hbox(6.94444+0.0)x50.02786
 ........\hbox(6.94444+0.0)x50.02786
 .........\OT1/cmr/m/n/10 H
 .........\OT1/cmr/m/n/10 e
@@ -355,7 +355,7 @@ l. ...  }
 ..\kern 0.0
 ..\hbox(6.94444+0.0)x50.02786
 ...\special{x:gsave}
-...\special{pdf:literal 1 0 0 1 0 0 cm}
+...\special{x:scale 1 1}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -382,7 +382,7 @@ l. ...  }
 ..\kern 0.0
 ..\hbox(6.94444+0.0)x125.06966
 ...\special{x:gsave}
-...\special{pdf:literal 2.5 0 0 1 0 0 cm}
+...\special{x:scale 2.5 1}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -409,7 +409,7 @@ l. ...  }
 ..\kern 0.0
 ..\hbox(2.31477+0.0)x50.02786
 ...\special{x:gsave}
-...\special{pdf:literal 1 0 0 0.33333 0 0 cm}
+...\special{x:scale 1 0.33333}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -436,7 +436,7 @@ l. ...  }
 ..\kern 0.0
 ..\hbox(6.94444+1.94444)x103.61133
 ...\special{x:gsave}
-...\special{pdf:literal 1 0 0 1 0 0 cm}
+...\special{x:scale 1 1}
 ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil
 ....\hbox(6.94444+1.94444)x103.61133
 .....\OT1/cmr/m/n/10 T
@@ -474,7 +474,7 @@ l. ...  }
 ..\kern 0.0
 ..\hbox(20.83333+5.83333)x310.83398
 ...\special{x:gsave}
-...\special{pdf:literal 3 0 0 3 0 0 cm}
+...\special{x:scale 3 3}
 ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil
 ....\hbox(6.94444+1.94444)x103.61133
 .....\OT1/cmr/m/n/10 T
@@ -512,7 +512,7 @@ l. ...  }
 ..\kern 310.83398
 ..\hbox(5.83333+20.83333)x0.0
 ...\special{x:gsave}
-...\special{pdf:literal -3 0 0 -3 0 0 cm}
+...\special{x:scale -3 -3}
 ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil
 ....\hbox(6.94444+1.94444)x103.61133
 .....\OT1/cmr/m/n/10 T
diff --git a/l3kernel/testfiles/d3pdfmode.xetex.tlg b/l3kernel/testfiles/d3pdfmode.xetex.tlg
index b2f862d..c481547 100644
--- a/l3kernel/testfiles/d3pdfmode.xetex.tlg
+++ b/l3kernel/testfiles/d3pdfmode.xetex.tlg
@@ -149,10 +149,10 @@ l. ...  }
 \hbox(6.94444+0.0)x50.02786
 .\hbox(6.94444+0.0)x50.02786
 ..\kern 0.0
-..\hbox(6.94444+0.0)x0.0
+..\hbox(6.94444+0.0)x50.02786
 ...\special{x:gsave}
-...\special{pdf:literal 1 0 0 1 0 0 cm}
-...\hbox(6.94444+0.0)x0.0
+...\special{x:rotate 0}
+...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
 .....\OT1/cmr/m/n/10 e
@@ -174,10 +174,10 @@ l. ...  }
 \hbox(31.028+0.0)x46.79762
 .\hbox(31.028+0.0)x46.79762
 ..\kern 3.47223
-..\hbox(6.94444+0.0)x0.0
+..\hbox(6.94444+0.0)x50.02786
 ...\special{x:gsave}
-...\special{pdf:literal 0.86603 0.5 -0.5 0.86603 0 0 cm}
-...\hbox(6.94444+0.0)x0.0
+...\special{x:rotate 30}
+...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
 .....\OT1/cmr/m/n/10 e
@@ -199,10 +199,10 @@ l. ...  }
 \hbox(40.2855+0.0)x40.2855
 .\hbox(40.2855+0.0)x40.2855
 ..\kern 4.91046
-..\hbox(6.94444+0.0)x0.0
+..\hbox(6.94444+0.0)x50.02786
 ...\special{x:gsave}
-...\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
-...\hbox(6.94444+0.0)x0.0
+...\special{x:rotate 45}
+...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
 .....\OT1/cmr/m/n/10 e
@@ -224,10 +224,10 @@ l. ...  }
 \hbox(35.37505+4.91046)x40.2855
 .\hbox(35.37505+4.91046)x40.2855
 ..\kern 40.2855
-..\hbox(6.94444+0.0)x0.0
+..\hbox(6.94444+0.0)x50.02786
 ...\special{x:gsave}
-...\special{pdf:literal -0.70711 0.70711 -0.70711 -0.70711 0 0 cm}
-...\hbox(6.94444+0.0)x0.0
+...\special{x:rotate 135}
+...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
 .....\OT1/cmr/m/n/10 e
@@ -249,10 +249,10 @@ l. ...  }
 \hbox(0.0+40.2855)x40.2855
 .\hbox(0.0+40.2855)x40.2855
 ..\kern 35.37505
-..\hbox(6.94444+0.0)x0.0
+..\hbox(6.94444+0.0)x50.02786
 ...\special{x:gsave}
-...\special{pdf:literal -0.70711 -0.70711 0.70711 -0.70711 0 0 cm}
-...\hbox(6.94444+0.0)x0.0
+...\special{x:rotate 225}
+...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
 .....\OT1/cmr/m/n/10 e
@@ -274,10 +274,10 @@ l. ...  }
 \hbox(4.91046+35.37505)x40.2855
 .\hbox(4.91046+35.37505)x40.2855
 ..\kern 0.0
-..\hbox(6.94444+0.0)x0.0
+..\hbox(6.94444+0.0)x50.02786
 ...\special{x:gsave}
-...\special{pdf:literal 0.70711 -0.70711 0.70711 0.70711 0 0 cm}
-...\hbox(6.94444+0.0)x0.0
+...\special{x:rotate 315}
+...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
 .....\OT1/cmr/m/n/10 e
@@ -299,17 +299,17 @@ l. ...  }
 \hbox(56.9723+0.0)x56.97232
 .\hbox(56.9723+0.0)x56.97232
 ..\kern 28.48616
-..\hbox(40.2855+0.0)x0.0
+..\hbox(40.2855+0.0)x40.2855
 ...\special{x:gsave}
-...\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
-...\hbox(40.2855+0.0)x0.0
+...\special{x:rotate 45}
+...\hbox(40.2855+0.0)x40.2855
 ....\hbox(40.2855+0.0)x40.2855
 .....\hbox(40.2855+0.0)x40.2855
 ......\kern 4.91046
-......\hbox(6.94444+0.0)x0.0
+......\hbox(6.94444+0.0)x50.02786
 .......\special{x:gsave}
-.......\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
-.......\hbox(6.94444+0.0)x0.0
+.......\special{x:rotate 45}
+.......\hbox(6.94444+0.0)x50.02786
 ........\hbox(6.94444+0.0)x50.02786
 .........\OT1/cmr/m/n/10 H
 .........\OT1/cmr/m/n/10 e
@@ -355,7 +355,7 @@ l. ...  }
 ..\kern 0.0
 ..\hbox(6.94444+0.0)x50.02786
 ...\special{x:gsave}
-...\special{pdf:literal 1 0 0 1 0 0 cm}
+...\special{x:scale 1 1}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -382,7 +382,7 @@ l. ...  }
 ..\kern 0.0
 ..\hbox(6.94444+0.0)x125.06966
 ...\special{x:gsave}
-...\special{pdf:literal 2.5 0 0 1 0 0 cm}
+...\special{x:scale 2.5 1}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -409,7 +409,7 @@ l. ...  }
 ..\kern 0.0
 ..\hbox(2.31477+0.0)x50.02786
 ...\special{x:gsave}
-...\special{pdf:literal 1 0 0 0.33333 0 0 cm}
+...\special{x:scale 1 0.33333}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -436,7 +436,7 @@ l. ...  }
 ..\kern 0.0
 ..\hbox(6.94444+1.94444)x103.61133
 ...\special{x:gsave}
-...\special{pdf:literal 1 0 0 1 0 0 cm}
+...\special{x:scale 1 1}
 ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil
 ....\hbox(6.94444+1.94444)x103.61133
 .....\OT1/cmr/m/n/10 T
@@ -474,7 +474,7 @@ l. ...  }
 ..\kern 0.0
 ..\hbox(20.83333+5.83333)x310.83398
 ...\special{x:gsave}
-...\special{pdf:literal 3 0 0 3 0 0 cm}
+...\special{x:scale 3 3}
 ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil
 ....\hbox(6.94444+1.94444)x103.61133
 .....\OT1/cmr/m/n/10 T
@@ -512,7 +512,7 @@ l. ...  }
 ..\kern 310.83398
 ..\hbox(5.83333+20.83333)x0.0
 ...\special{x:gsave}
-...\special{pdf:literal -3 0 0 -3 0 0 cm}
+...\special{x:scale -3 -3}
 ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil
 ....\hbox(6.94444+1.94444)x103.61133
 .....\OT1/cmr/m/n/10 T
diff --git a/l3kernel/testfiles/d3xdvipdfmx.xetex.tlg b/l3kernel/testfiles/d3xdvipdfmx.xetex.tlg
index b2f862d..c481547 100644
--- a/l3kernel/testfiles/d3xdvipdfmx.xetex.tlg
+++ b/l3kernel/testfiles/d3xdvipdfmx.xetex.tlg
@@ -149,10 +149,10 @@ l. ...  }
 \hbox(6.94444+0.0)x50.02786
 .\hbox(6.94444+0.0)x50.02786
 ..\kern 0.0
-..\hbox(6.94444+0.0)x0.0
+..\hbox(6.94444+0.0)x50.02786
 ...\special{x:gsave}
-...\special{pdf:literal 1 0 0 1 0 0 cm}
-...\hbox(6.94444+0.0)x0.0
+...\special{x:rotate 0}
+...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
 .....\OT1/cmr/m/n/10 e
@@ -174,10 +174,10 @@ l. ...  }
 \hbox(31.028+0.0)x46.79762
 .\hbox(31.028+0.0)x46.79762
 ..\kern 3.47223
-..\hbox(6.94444+0.0)x0.0
+..\hbox(6.94444+0.0)x50.02786
 ...\special{x:gsave}
-...\special{pdf:literal 0.86603 0.5 -0.5 0.86603 0 0 cm}
-...\hbox(6.94444+0.0)x0.0
+...\special{x:rotate 30}
+...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
 .....\OT1/cmr/m/n/10 e
@@ -199,10 +199,10 @@ l. ...  }
 \hbox(40.2855+0.0)x40.2855
 .\hbox(40.2855+0.0)x40.2855
 ..\kern 4.91046
-..\hbox(6.94444+0.0)x0.0
+..\hbox(6.94444+0.0)x50.02786
 ...\special{x:gsave}
-...\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
-...\hbox(6.94444+0.0)x0.0
+...\special{x:rotate 45}
+...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
 .....\OT1/cmr/m/n/10 e
@@ -224,10 +224,10 @@ l. ...  }
 \hbox(35.37505+4.91046)x40.2855
 .\hbox(35.37505+4.91046)x40.2855
 ..\kern 40.2855
-..\hbox(6.94444+0.0)x0.0
+..\hbox(6.94444+0.0)x50.02786
 ...\special{x:gsave}
-...\special{pdf:literal -0.70711 0.70711 -0.70711 -0.70711 0 0 cm}
-...\hbox(6.94444+0.0)x0.0
+...\special{x:rotate 135}
+...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
 .....\OT1/cmr/m/n/10 e
@@ -249,10 +249,10 @@ l. ...  }
 \hbox(0.0+40.2855)x40.2855
 .\hbox(0.0+40.2855)x40.2855
 ..\kern 35.37505
-..\hbox(6.94444+0.0)x0.0
+..\hbox(6.94444+0.0)x50.02786
 ...\special{x:gsave}
-...\special{pdf:literal -0.70711 -0.70711 0.70711 -0.70711 0 0 cm}
-...\hbox(6.94444+0.0)x0.0
+...\special{x:rotate 225}
+...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
 .....\OT1/cmr/m/n/10 e
@@ -274,10 +274,10 @@ l. ...  }
 \hbox(4.91046+35.37505)x40.2855
 .\hbox(4.91046+35.37505)x40.2855
 ..\kern 0.0
-..\hbox(6.94444+0.0)x0.0
+..\hbox(6.94444+0.0)x50.02786
 ...\special{x:gsave}
-...\special{pdf:literal 0.70711 -0.70711 0.70711 0.70711 0 0 cm}
-...\hbox(6.94444+0.0)x0.0
+...\special{x:rotate 315}
+...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
 .....\OT1/cmr/m/n/10 e
@@ -299,17 +299,17 @@ l. ...  }
 \hbox(56.9723+0.0)x56.97232
 .\hbox(56.9723+0.0)x56.97232
 ..\kern 28.48616
-..\hbox(40.2855+0.0)x0.0
+..\hbox(40.2855+0.0)x40.2855
 ...\special{x:gsave}
-...\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
-...\hbox(40.2855+0.0)x0.0
+...\special{x:rotate 45}
+...\hbox(40.2855+0.0)x40.2855
 ....\hbox(40.2855+0.0)x40.2855
 .....\hbox(40.2855+0.0)x40.2855
 ......\kern 4.91046
-......\hbox(6.94444+0.0)x0.0
+......\hbox(6.94444+0.0)x50.02786
 .......\special{x:gsave}
-.......\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
-.......\hbox(6.94444+0.0)x0.0
+.......\special{x:rotate 45}
+.......\hbox(6.94444+0.0)x50.02786
 ........\hbox(6.94444+0.0)x50.02786
 .........\OT1/cmr/m/n/10 H
 .........\OT1/cmr/m/n/10 e
@@ -355,7 +355,7 @@ l. ...  }
 ..\kern 0.0
 ..\hbox(6.94444+0.0)x50.02786
 ...\special{x:gsave}
-...\special{pdf:literal 1 0 0 1 0 0 cm}
+...\special{x:scale 1 1}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -382,7 +382,7 @@ l. ...  }
 ..\kern 0.0
 ..\hbox(6.94444+0.0)x125.06966
 ...\special{x:gsave}
-...\special{pdf:literal 2.5 0 0 1 0 0 cm}
+...\special{x:scale 2.5 1}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -409,7 +409,7 @@ l. ...  }
 ..\kern 0.0
 ..\hbox(2.31477+0.0)x50.02786
 ...\special{x:gsave}
-...\special{pdf:literal 1 0 0 0.33333 0 0 cm}
+...\special{x:scale 1 0.33333}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -436,7 +436,7 @@ l. ...  }
 ..\kern 0.0
 ..\hbox(6.94444+1.94444)x103.61133
 ...\special{x:gsave}
-...\special{pdf:literal 1 0 0 1 0 0 cm}
+...\special{x:scale 1 1}
 ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil
 ....\hbox(6.94444+1.94444)x103.61133
 .....\OT1/cmr/m/n/10 T
@@ -474,7 +474,7 @@ l. ...  }
 ..\kern 0.0
 ..\hbox(20.83333+5.83333)x310.83398
 ...\special{x:gsave}
-...\special{pdf:literal 3 0 0 3 0 0 cm}
+...\special{x:scale 3 3}
 ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil
 ....\hbox(6.94444+1.94444)x103.61133
 .....\OT1/cmr/m/n/10 T
@@ -512,7 +512,7 @@ l. ...  }
 ..\kern 310.83398
 ..\hbox(5.83333+20.83333)x0.0
 ...\special{x:gsave}
-...\special{pdf:literal -3 0 0 -3 0 0 cm}
+...\special{x:scale -3 -3}
 ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil
 ....\hbox(6.94444+1.94444)x103.61133
 .....\OT1/cmr/m/n/10 T
diff --git a/l3kernel/testfiles/m3box004.ptex.tlg b/l3kernel/testfiles/m3box004.ptex.tlg
index a14282b..9aa5487 100644
--- a/l3kernel/testfiles/m3box004.ptex.tlg
+++ b/l3kernel/testfiles/m3box004.ptex.tlg
@@ -8,10 +8,10 @@ TEST 1: Rotate boxes
 \hbox(4.30554+0.0)x15.00005
 .\hbox(4.30554+0.0)x15.00005
 ..\kern 0.0
-..\hbox(4.30554+0.0)x0.0
+..\hbox(4.30554+0.0)x15.00005
 ...\special{x:gsave}
-...\special{pdf:literal 1 0 0 1 0 0 cm}
-...\hbox(4.30554+0.0)x0.0
+...\special{x:rotate 0}
+...\hbox(4.30554+0.0)x15.00005
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
@@ -24,10 +24,10 @@ l. ...}
 \hbox(13.65111+0.0)x13.65111
 .\hbox(13.65111+0.0)x13.65111
 ..\kern 3.04448
-..\hbox(4.30554+0.0)x0.0
+..\hbox(4.30554+0.0)x15.00005
 ...\special{x:gsave}
-...\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
-...\hbox(4.30554+0.0)x0.0
+...\special{x:rotate 45}
+...\hbox(4.30554+0.0)x15.00005
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
@@ -40,10 +40,10 @@ l. ...}
 \hbox(15.00005+0.0)x4.30554
 .\hbox(15.00005+0.0)x4.30554
 ..\kern 4.30554
-..\hbox(4.30554+0.0)x0.0
+..\hbox(4.30554+0.0)x15.00005
 ...\special{x:gsave}
-...\special{pdf:literal 0 1 -1 0 0 0 cm}
-...\hbox(4.30554+0.0)x0.0
+...\special{x:rotate 90}
+...\hbox(4.30554+0.0)x15.00005
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
@@ -56,10 +56,10 @@ l. ...}
 \hbox(10.60663+3.04448)x13.65111
 .\hbox(10.60663+3.04448)x13.65111
 ..\kern 13.65111
-..\hbox(4.30554+0.0)x0.0
+..\hbox(4.30554+0.0)x15.00005
 ...\special{x:gsave}
-...\special{pdf:literal -0.70711 0.70711 -0.70711 -0.70711 0 0 cm}
-...\hbox(4.30554+0.0)x0.0
+...\special{x:rotate 135}
+...\hbox(4.30554+0.0)x15.00005
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
@@ -72,10 +72,10 @@ l. ...}
 \hbox(0.0+4.30554)x15.00005
 .\hbox(0.0+4.30554)x15.00005
 ..\kern 15.00005
-..\hbox(4.30554+0.0)x0.0
+..\hbox(4.30554+0.0)x15.00005
 ...\special{x:gsave}
-...\special{pdf:literal -1 0 0 -1 0 0 cm}
-...\hbox(4.30554+0.0)x0.0
+...\special{x:rotate 180}
+...\hbox(4.30554+0.0)x15.00005
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
@@ -88,10 +88,10 @@ l. ...}
 \hbox(0.0+13.65111)x13.65111
 .\hbox(0.0+13.65111)x13.65111
 ..\kern 10.60663
-..\hbox(4.30554+0.0)x0.0
+..\hbox(4.30554+0.0)x15.00005
 ...\special{x:gsave}
-...\special{pdf:literal -0.70711 -0.70711 0.70711 -0.70711 0 0 cm}
-...\hbox(4.30554+0.0)x0.0
+...\special{x:rotate 225}
+...\hbox(4.30554+0.0)x15.00005
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
@@ -104,10 +104,10 @@ l. ...}
 \hbox(3.04448+10.60663)x13.65111
 .\hbox(3.04448+10.60663)x13.65111
 ..\kern 0.0
-..\hbox(4.30554+0.0)x0.0
+..\hbox(4.30554+0.0)x15.00005
 ...\special{x:gsave}
-...\special{pdf:literal 0.70711 -0.70711 0.70711 0.70711 0 0 cm}
-...\hbox(4.30554+0.0)x0.0
+...\special{x:rotate 315}
+...\hbox(4.30554+0.0)x15.00005
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
@@ -126,7 +126,7 @@ TEST 2: Scale boxes
 ..\kern 0.0
 ..\hbox(4.30554+0.0)x15.00005
 ...\special{x:gsave}
-...\special{pdf:literal 1 0 0 1 0 0 cm}
+...\special{x:scale 1 1}
 ...\hbox(4.30554+0.0)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
@@ -144,7 +144,7 @@ l. ...}
 ..\kern 15.00005
 ..\hbox(4.30554+0.0)x0.0
 ...\special{x:gsave}
-...\special{pdf:literal -1 0 0 1 0 0 cm}
+...\special{x:scale -1 1}
 ...\hbox(4.30554+0.0)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
@@ -162,7 +162,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(0.0+4.30554)x15.00005
 ...\special{x:gsave}
-...\special{pdf:literal 1 0 0 -1 0 0 cm}
+...\special{x:scale 1 -1}
 ...\hbox(4.30554+0.0)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
@@ -180,7 +180,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(4.30554+0.0)x7.50002
 ...\special{x:gsave}
-...\special{pdf:literal 0.5 0 0 1 0 0 cm}
+...\special{x:scale 0.5 1}
 ...\hbox(4.30554+0.0)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
@@ -198,7 +198,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(2.15277+0.0)x15.00005
 ...\special{x:gsave}
-...\special{pdf:literal 1 0 0 0.5 0 0 cm}
+...\special{x:scale 1 0.5}
 ...\hbox(4.30554+0.0)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
@@ -216,7 +216,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(8.61108+0.0)x30.00009
 ...\special{x:gsave}
-...\special{pdf:literal 2 0 0 2 0 0 cm}
+...\special{x:scale 2 2}
 ...\hbox(4.30554+0.0)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
@@ -234,7 +234,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(43.05542+0.0)x1.50009
 ...\special{x:gsave}
-...\special{pdf:literal 0.1 0 0 10 0 0 cm}
+...\special{x:scale 0.1 10}
 ...\hbox(4.30554+0.0)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
@@ -256,7 +256,7 @@ TEST 3: Resize boxes
 ..\kern 0.0
 ..\hbox(19.60077+8.85197)x28.45274
 ...\special{x:gsave}
-...\special{pdf:literal 1.89684 0 0 4.55245 0 0 cm}
+...\special{x:scale 1.89684 4.55245}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -274,7 +274,7 @@ l. ...}
 ..\kern 28.45274
 ..\hbox(19.60077+8.85197)x0.0
 ...\special{x:gsave}
-...\special{pdf:literal -1.89684 0 0 4.55245 0 0 cm}
+...\special{x:scale -1.89684 4.55245}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -292,7 +292,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(8.85197+19.60077)x28.45274
 ...\special{x:gsave}
-...\special{pdf:literal 1.89684 0 0 -4.55245 0 0 cm}
+...\special{x:scale 1.89684 -4.55245}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -310,7 +310,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(19.60077+8.85197)x14.22636
 ...\special{x:gsave}
-...\special{pdf:literal 0.94842 0 0 4.55245 0 0 cm}
+...\special{x:scale 0.94842 4.55245}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -328,7 +328,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(9.80038+4.42598)x28.45274
 ...\special{x:gsave}
-...\special{pdf:literal 1.89684 0 0 2.27622 0 0 cm}
+...\special{x:scale 1.89684 2.27622}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -346,7 +346,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(39.20154+17.70396)x56.9055
 ...\special{x:gsave}
-...\special{pdf:literal 3.79369 0 0 9.1049 0 0 cm}
+...\special{x:scale 3.79369 9.1049}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -364,7 +364,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(196.00774+88.51982)x2.84544
 ...\special{x:gsave}
-...\special{pdf:literal 0.1897 0 0 45.52452 0 0 cm}
+...\special{x:scale 0.1897 45.52452}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -386,7 +386,7 @@ TEST 4: Resize boxes proportionally
 ..\kern 0.0
 ..\hbox(28.45274+12.84966)x99.1263
 ...\special{x:gsave}
-...\special{pdf:literal 6.6084 0 0 6.6084 0 0 cm}
+...\special{x:scale 6.6084 6.6084}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -404,7 +404,7 @@ l. ...}
 ..\kern 99.1263
 ..\hbox(12.84966+28.45274)x0.0
 ...\special{x:gsave}
-...\special{pdf:literal -6.6084 0 0 -6.6084 0 0 cm}
+...\special{x:scale -6.6084 -6.6084}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -422,7 +422,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(14.22636+6.42482)x49.56313
 ...\special{x:gsave}
-...\special{pdf:literal 3.3042 0 0 3.3042 0 0 cm}
+...\special{x:scale 3.3042 3.3042}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -440,7 +440,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(56.9055+25.69931)x198.25266
 ...\special{x:gsave}
-...\special{pdf:literal 13.2168 0 0 13.2168 0 0 cm}
+...\special{x:scale 13.2168 13.2168}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -458,7 +458,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(19.60077+8.85197)x68.28696
 ...\special{x:gsave}
-...\special{pdf:literal 4.55245 0 0 4.55245 0 0 cm}
+...\special{x:scale 4.55245 4.55245}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -476,7 +476,7 @@ l. ...}
 ..\kern 68.28696
 ..\hbox(8.85197+19.60077)x0.0
 ...\special{x:gsave}
-...\special{pdf:literal -4.55245 0 0 -4.55245 0 0 cm}
+...\special{x:scale -4.55245 -4.55245}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -494,7 +494,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(9.80038+4.42598)x34.14346
 ...\special{x:gsave}
-...\special{pdf:literal 2.27622 0 0 2.27622 0 0 cm}
+...\special{x:scale 2.27622 2.27622}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -512,7 +512,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(39.20154+17.70396)x136.57396
 ...\special{x:gsave}
-...\special{pdf:literal 9.1049 0 0 9.1049 0 0 cm}
+...\special{x:scale 9.1049 9.1049}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -530,7 +530,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(8.16695+3.68831)x28.45274
 ...\special{x:gsave}
-...\special{pdf:literal 1.89684 0 0 1.89684 0 0 cm}
+...\special{x:scale 1.89684 1.89684}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -548,7 +548,7 @@ l. ...}
 ..\kern 28.45274
 ..\hbox(3.68831+8.16695)x0.0
 ...\special{x:gsave}
-...\special{pdf:literal -1.89684 0 0 -1.89684 0 0 cm}
+...\special{x:scale -1.89684 -1.89684}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -566,7 +566,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(4.08347+1.84415)x14.22636
 ...\special{x:gsave}
-...\special{pdf:literal 0.94842 0 0 0.94842 0 0 cm}
+...\special{x:scale 0.94842 0.94842}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -584,7 +584,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(16.3339+7.37662)x56.9055
 ...\special{x:gsave}
-...\special{pdf:literal 3.79369 0 0 3.79369 0 0 cm}
+...\special{x:scale 3.79369 3.79369}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -602,7 +602,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(28.45274+12.84966)x28.45274
 ...\special{x:gsave}
-...\special{pdf:literal 1.89684 0 0 6.6084 0 0 cm}
+...\special{x:scale 1.89684 6.6084}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -620,7 +620,7 @@ l. ...}
 ..\kern 28.45274
 ..\hbox(28.45274+12.84966)x0.0
 ...\special{x:gsave}
-...\special{pdf:literal -1.89684 0 0 6.6084 0 0 cm}
+...\special{x:scale -1.89684 6.6084}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -638,7 +638,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(12.84966+28.45274)x28.45274
 ...\special{x:gsave}
-...\special{pdf:literal 1.89684 0 0 -6.6084 0 0 cm}
+...\special{x:scale 1.89684 -6.6084}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -656,7 +656,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(28.45274+12.84966)x14.22636
 ...\special{x:gsave}
-...\special{pdf:literal 0.94842 0 0 6.6084 0 0 cm}
+...\special{x:scale 0.94842 6.6084}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -674,7 +674,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(14.22636+6.42482)x28.45274
 ...\special{x:gsave}
-...\special{pdf:literal 1.89684 0 0 3.3042 0 0 cm}
+...\special{x:scale 1.89684 3.3042}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -692,7 +692,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(56.9055+25.69931)x56.9055
 ...\special{x:gsave}
-...\special{pdf:literal 3.79369 0 0 13.2168 0 0 cm}
+...\special{x:scale 3.79369 13.2168}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -710,7 +710,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(284.52756+128.49661)x2.84544
 ...\special{x:gsave}
-...\special{pdf:literal 0.1897 0 0 66.08403 0 0 cm}
+...\special{x:scale 0.1897 66.08403}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -732,7 +732,7 @@ TEST 5: Resize boxes automatically
 ..\kern 0.0
 ..\hbox(8.16696+3.68831)x28.45284
 ...\special{x:gsave}
-...\special{pdf:literal 1.89684 0 0 1.89684 0 0 cm}
+...\special{x:scale 1.89684 1.89684}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -750,7 +750,7 @@ l. ...  }
 ..\kern 0.0
 ..\hbox(8.16696+3.68831)x28.45284
 ...\special{x:gsave}
-...\special{pdf:literal 1.89684 0 0 1.89684 0 0 cm}
+...\special{x:scale 1.89684 1.89684}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
diff --git a/l3kernel/testfiles/m3box004.uptex.tlg b/l3kernel/testfiles/m3box004.uptex.tlg
index a14282b..9aa5487 100644
--- a/l3kernel/testfiles/m3box004.uptex.tlg
+++ b/l3kernel/testfiles/m3box004.uptex.tlg
@@ -8,10 +8,10 @@ TEST 1: Rotate boxes
 \hbox(4.30554+0.0)x15.00005
 .\hbox(4.30554+0.0)x15.00005
 ..\kern 0.0
-..\hbox(4.30554+0.0)x0.0
+..\hbox(4.30554+0.0)x15.00005
 ...\special{x:gsave}
-...\special{pdf:literal 1 0 0 1 0 0 cm}
-...\hbox(4.30554+0.0)x0.0
+...\special{x:rotate 0}
+...\hbox(4.30554+0.0)x15.00005
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
@@ -24,10 +24,10 @@ l. ...}
 \hbox(13.65111+0.0)x13.65111
 .\hbox(13.65111+0.0)x13.65111
 ..\kern 3.04448
-..\hbox(4.30554+0.0)x0.0
+..\hbox(4.30554+0.0)x15.00005
 ...\special{x:gsave}
-...\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
-...\hbox(4.30554+0.0)x0.0
+...\special{x:rotate 45}
+...\hbox(4.30554+0.0)x15.00005
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
@@ -40,10 +40,10 @@ l. ...}
 \hbox(15.00005+0.0)x4.30554
 .\hbox(15.00005+0.0)x4.30554
 ..\kern 4.30554
-..\hbox(4.30554+0.0)x0.0
+..\hbox(4.30554+0.0)x15.00005
 ...\special{x:gsave}
-...\special{pdf:literal 0 1 -1 0 0 0 cm}
-...\hbox(4.30554+0.0)x0.0
+...\special{x:rotate 90}
+...\hbox(4.30554+0.0)x15.00005
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
@@ -56,10 +56,10 @@ l. ...}
 \hbox(10.60663+3.04448)x13.65111
 .\hbox(10.60663+3.04448)x13.65111
 ..\kern 13.65111
-..\hbox(4.30554+0.0)x0.0
+..\hbox(4.30554+0.0)x15.00005
 ...\special{x:gsave}
-...\special{pdf:literal -0.70711 0.70711 -0.70711 -0.70711 0 0 cm}
-...\hbox(4.30554+0.0)x0.0
+...\special{x:rotate 135}
+...\hbox(4.30554+0.0)x15.00005
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
@@ -72,10 +72,10 @@ l. ...}
 \hbox(0.0+4.30554)x15.00005
 .\hbox(0.0+4.30554)x15.00005
 ..\kern 15.00005
-..\hbox(4.30554+0.0)x0.0
+..\hbox(4.30554+0.0)x15.00005
 ...\special{x:gsave}
-...\special{pdf:literal -1 0 0 -1 0 0 cm}
-...\hbox(4.30554+0.0)x0.0
+...\special{x:rotate 180}
+...\hbox(4.30554+0.0)x15.00005
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
@@ -88,10 +88,10 @@ l. ...}
 \hbox(0.0+13.65111)x13.65111
 .\hbox(0.0+13.65111)x13.65111
 ..\kern 10.60663
-..\hbox(4.30554+0.0)x0.0
+..\hbox(4.30554+0.0)x15.00005
 ...\special{x:gsave}
-...\special{pdf:literal -0.70711 -0.70711 0.70711 -0.70711 0 0 cm}
-...\hbox(4.30554+0.0)x0.0
+...\special{x:rotate 225}
+...\hbox(4.30554+0.0)x15.00005
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
@@ -104,10 +104,10 @@ l. ...}
 \hbox(3.04448+10.60663)x13.65111
 .\hbox(3.04448+10.60663)x13.65111
 ..\kern 0.0
-..\hbox(4.30554+0.0)x0.0
+..\hbox(4.30554+0.0)x15.00005
 ...\special{x:gsave}
-...\special{pdf:literal 0.70711 -0.70711 0.70711 0.70711 0 0 cm}
-...\hbox(4.30554+0.0)x0.0
+...\special{x:rotate 315}
+...\hbox(4.30554+0.0)x15.00005
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
@@ -126,7 +126,7 @@ TEST 2: Scale boxes
 ..\kern 0.0
 ..\hbox(4.30554+0.0)x15.00005
 ...\special{x:gsave}
-...\special{pdf:literal 1 0 0 1 0 0 cm}
+...\special{x:scale 1 1}
 ...\hbox(4.30554+0.0)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
@@ -144,7 +144,7 @@ l. ...}
 ..\kern 15.00005
 ..\hbox(4.30554+0.0)x0.0
 ...\special{x:gsave}
-...\special{pdf:literal -1 0 0 1 0 0 cm}
+...\special{x:scale -1 1}
 ...\hbox(4.30554+0.0)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
@@ -162,7 +162,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(0.0+4.30554)x15.00005
 ...\special{x:gsave}
-...\special{pdf:literal 1 0 0 -1 0 0 cm}
+...\special{x:scale 1 -1}
 ...\hbox(4.30554+0.0)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
@@ -180,7 +180,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(4.30554+0.0)x7.50002
 ...\special{x:gsave}
-...\special{pdf:literal 0.5 0 0 1 0 0 cm}
+...\special{x:scale 0.5 1}
 ...\hbox(4.30554+0.0)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
@@ -198,7 +198,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(2.15277+0.0)x15.00005
 ...\special{x:gsave}
-...\special{pdf:literal 1 0 0 0.5 0 0 cm}
+...\special{x:scale 1 0.5}
 ...\hbox(4.30554+0.0)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
@@ -216,7 +216,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(8.61108+0.0)x30.00009
 ...\special{x:gsave}
-...\special{pdf:literal 2 0 0 2 0 0 cm}
+...\special{x:scale 2 2}
 ...\hbox(4.30554+0.0)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
@@ -234,7 +234,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(43.05542+0.0)x1.50009
 ...\special{x:gsave}
-...\special{pdf:literal 0.1 0 0 10 0 0 cm}
+...\special{x:scale 0.1 10}
 ...\hbox(4.30554+0.0)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
@@ -256,7 +256,7 @@ TEST 3: Resize boxes
 ..\kern 0.0
 ..\hbox(19.60077+8.85197)x28.45274
 ...\special{x:gsave}
-...\special{pdf:literal 1.89684 0 0 4.55245 0 0 cm}
+...\special{x:scale 1.89684 4.55245}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -274,7 +274,7 @@ l. ...}
 ..\kern 28.45274
 ..\hbox(19.60077+8.85197)x0.0
 ...\special{x:gsave}
-...\special{pdf:literal -1.89684 0 0 4.55245 0 0 cm}
+...\special{x:scale -1.89684 4.55245}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -292,7 +292,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(8.85197+19.60077)x28.45274
 ...\special{x:gsave}
-...\special{pdf:literal 1.89684 0 0 -4.55245 0 0 cm}
+...\special{x:scale 1.89684 -4.55245}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -310,7 +310,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(19.60077+8.85197)x14.22636
 ...\special{x:gsave}
-...\special{pdf:literal 0.94842 0 0 4.55245 0 0 cm}
+...\special{x:scale 0.94842 4.55245}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -328,7 +328,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(9.80038+4.42598)x28.45274
 ...\special{x:gsave}
-...\special{pdf:literal 1.89684 0 0 2.27622 0 0 cm}
+...\special{x:scale 1.89684 2.27622}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -346,7 +346,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(39.20154+17.70396)x56.9055
 ...\special{x:gsave}
-...\special{pdf:literal 3.79369 0 0 9.1049 0 0 cm}
+...\special{x:scale 3.79369 9.1049}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -364,7 +364,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(196.00774+88.51982)x2.84544
 ...\special{x:gsave}
-...\special{pdf:literal 0.1897 0 0 45.52452 0 0 cm}
+...\special{x:scale 0.1897 45.52452}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -386,7 +386,7 @@ TEST 4: Resize boxes proportionally
 ..\kern 0.0
 ..\hbox(28.45274+12.84966)x99.1263
 ...\special{x:gsave}
-...\special{pdf:literal 6.6084 0 0 6.6084 0 0 cm}
+...\special{x:scale 6.6084 6.6084}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -404,7 +404,7 @@ l. ...}
 ..\kern 99.1263
 ..\hbox(12.84966+28.45274)x0.0
 ...\special{x:gsave}
-...\special{pdf:literal -6.6084 0 0 -6.6084 0 0 cm}
+...\special{x:scale -6.6084 -6.6084}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -422,7 +422,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(14.22636+6.42482)x49.56313
 ...\special{x:gsave}
-...\special{pdf:literal 3.3042 0 0 3.3042 0 0 cm}
+...\special{x:scale 3.3042 3.3042}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -440,7 +440,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(56.9055+25.69931)x198.25266
 ...\special{x:gsave}
-...\special{pdf:literal 13.2168 0 0 13.2168 0 0 cm}
+...\special{x:scale 13.2168 13.2168}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -458,7 +458,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(19.60077+8.85197)x68.28696
 ...\special{x:gsave}
-...\special{pdf:literal 4.55245 0 0 4.55245 0 0 cm}
+...\special{x:scale 4.55245 4.55245}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -476,7 +476,7 @@ l. ...}
 ..\kern 68.28696
 ..\hbox(8.85197+19.60077)x0.0
 ...\special{x:gsave}
-...\special{pdf:literal -4.55245 0 0 -4.55245 0 0 cm}
+...\special{x:scale -4.55245 -4.55245}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -494,7 +494,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(9.80038+4.42598)x34.14346
 ...\special{x:gsave}
-...\special{pdf:literal 2.27622 0 0 2.27622 0 0 cm}
+...\special{x:scale 2.27622 2.27622}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -512,7 +512,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(39.20154+17.70396)x136.57396
 ...\special{x:gsave}
-...\special{pdf:literal 9.1049 0 0 9.1049 0 0 cm}
+...\special{x:scale 9.1049 9.1049}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -530,7 +530,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(8.16695+3.68831)x28.45274
 ...\special{x:gsave}
-...\special{pdf:literal 1.89684 0 0 1.89684 0 0 cm}
+...\special{x:scale 1.89684 1.89684}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -548,7 +548,7 @@ l. ...}
 ..\kern 28.45274
 ..\hbox(3.68831+8.16695)x0.0
 ...\special{x:gsave}
-...\special{pdf:literal -1.89684 0 0 -1.89684 0 0 cm}
+...\special{x:scale -1.89684 -1.89684}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -566,7 +566,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(4.08347+1.84415)x14.22636
 ...\special{x:gsave}
-...\special{pdf:literal 0.94842 0 0 0.94842 0 0 cm}
+...\special{x:scale 0.94842 0.94842}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -584,7 +584,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(16.3339+7.37662)x56.9055
 ...\special{x:gsave}
-...\special{pdf:literal 3.79369 0 0 3.79369 0 0 cm}
+...\special{x:scale 3.79369 3.79369}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -602,7 +602,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(28.45274+12.84966)x28.45274
 ...\special{x:gsave}
-...\special{pdf:literal 1.89684 0 0 6.6084 0 0 cm}
+...\special{x:scale 1.89684 6.6084}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -620,7 +620,7 @@ l. ...}
 ..\kern 28.45274
 ..\hbox(28.45274+12.84966)x0.0
 ...\special{x:gsave}
-...\special{pdf:literal -1.89684 0 0 6.6084 0 0 cm}
+...\special{x:scale -1.89684 6.6084}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -638,7 +638,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(12.84966+28.45274)x28.45274
 ...\special{x:gsave}
-...\special{pdf:literal 1.89684 0 0 -6.6084 0 0 cm}
+...\special{x:scale 1.89684 -6.6084}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -656,7 +656,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(28.45274+12.84966)x14.22636
 ...\special{x:gsave}
-...\special{pdf:literal 0.94842 0 0 6.6084 0 0 cm}
+...\special{x:scale 0.94842 6.6084}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -674,7 +674,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(14.22636+6.42482)x28.45274
 ...\special{x:gsave}
-...\special{pdf:literal 1.89684 0 0 3.3042 0 0 cm}
+...\special{x:scale 1.89684 3.3042}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -692,7 +692,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(56.9055+25.69931)x56.9055
 ...\special{x:gsave}
-...\special{pdf:literal 3.79369 0 0 13.2168 0 0 cm}
+...\special{x:scale 3.79369 13.2168}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -710,7 +710,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(284.52756+128.49661)x2.84544
 ...\special{x:gsave}
-...\special{pdf:literal 0.1897 0 0 66.08403 0 0 cm}
+...\special{x:scale 0.1897 66.08403}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -732,7 +732,7 @@ TEST 5: Resize boxes automatically
 ..\kern 0.0
 ..\hbox(8.16696+3.68831)x28.45284
 ...\special{x:gsave}
-...\special{pdf:literal 1.89684 0 0 1.89684 0 0 cm}
+...\special{x:scale 1.89684 1.89684}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -750,7 +750,7 @@ l. ...  }
 ..\kern 0.0
 ..\hbox(8.16696+3.68831)x28.45284
 ...\special{x:gsave}
-...\special{pdf:literal 1.89684 0 0 1.89684 0 0 cm}
+...\special{x:scale 1.89684 1.89684}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
diff --git a/l3kernel/testfiles/m3box004.xetex.tlg b/l3kernel/testfiles/m3box004.xetex.tlg
index a14282b..9aa5487 100644
--- a/l3kernel/testfiles/m3box004.xetex.tlg
+++ b/l3kernel/testfiles/m3box004.xetex.tlg
@@ -8,10 +8,10 @@ TEST 1: Rotate boxes
 \hbox(4.30554+0.0)x15.00005
 .\hbox(4.30554+0.0)x15.00005
 ..\kern 0.0
-..\hbox(4.30554+0.0)x0.0
+..\hbox(4.30554+0.0)x15.00005
 ...\special{x:gsave}
-...\special{pdf:literal 1 0 0 1 0 0 cm}
-...\hbox(4.30554+0.0)x0.0
+...\special{x:rotate 0}
+...\hbox(4.30554+0.0)x15.00005
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
@@ -24,10 +24,10 @@ l. ...}
 \hbox(13.65111+0.0)x13.65111
 .\hbox(13.65111+0.0)x13.65111
 ..\kern 3.04448
-..\hbox(4.30554+0.0)x0.0
+..\hbox(4.30554+0.0)x15.00005
 ...\special{x:gsave}
-...\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
-...\hbox(4.30554+0.0)x0.0
+...\special{x:rotate 45}
+...\hbox(4.30554+0.0)x15.00005
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
@@ -40,10 +40,10 @@ l. ...}
 \hbox(15.00005+0.0)x4.30554
 .\hbox(15.00005+0.0)x4.30554
 ..\kern 4.30554
-..\hbox(4.30554+0.0)x0.0
+..\hbox(4.30554+0.0)x15.00005
 ...\special{x:gsave}
-...\special{pdf:literal 0 1 -1 0 0 0 cm}
-...\hbox(4.30554+0.0)x0.0
+...\special{x:rotate 90}
+...\hbox(4.30554+0.0)x15.00005
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
@@ -56,10 +56,10 @@ l. ...}
 \hbox(10.60663+3.04448)x13.65111
 .\hbox(10.60663+3.04448)x13.65111
 ..\kern 13.65111
-..\hbox(4.30554+0.0)x0.0
+..\hbox(4.30554+0.0)x15.00005
 ...\special{x:gsave}
-...\special{pdf:literal -0.70711 0.70711 -0.70711 -0.70711 0 0 cm}
-...\hbox(4.30554+0.0)x0.0
+...\special{x:rotate 135}
+...\hbox(4.30554+0.0)x15.00005
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
@@ -72,10 +72,10 @@ l. ...}
 \hbox(0.0+4.30554)x15.00005
 .\hbox(0.0+4.30554)x15.00005
 ..\kern 15.00005
-..\hbox(4.30554+0.0)x0.0
+..\hbox(4.30554+0.0)x15.00005
 ...\special{x:gsave}
-...\special{pdf:literal -1 0 0 -1 0 0 cm}
-...\hbox(4.30554+0.0)x0.0
+...\special{x:rotate 180}
+...\hbox(4.30554+0.0)x15.00005
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
@@ -88,10 +88,10 @@ l. ...}
 \hbox(0.0+13.65111)x13.65111
 .\hbox(0.0+13.65111)x13.65111
 ..\kern 10.60663
-..\hbox(4.30554+0.0)x0.0
+..\hbox(4.30554+0.0)x15.00005
 ...\special{x:gsave}
-...\special{pdf:literal -0.70711 -0.70711 0.70711 -0.70711 0 0 cm}
-...\hbox(4.30554+0.0)x0.0
+...\special{x:rotate 225}
+...\hbox(4.30554+0.0)x15.00005
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
@@ -104,10 +104,10 @@ l. ...}
 \hbox(3.04448+10.60663)x13.65111
 .\hbox(3.04448+10.60663)x13.65111
 ..\kern 0.0
-..\hbox(4.30554+0.0)x0.0
+..\hbox(4.30554+0.0)x15.00005
 ...\special{x:gsave}
-...\special{pdf:literal 0.70711 -0.70711 0.70711 0.70711 0 0 cm}
-...\hbox(4.30554+0.0)x0.0
+...\special{x:rotate 315}
+...\hbox(4.30554+0.0)x15.00005
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
 .....\OT1/cmr/m/n/10 a
@@ -126,7 +126,7 @@ TEST 2: Scale boxes
 ..\kern 0.0
 ..\hbox(4.30554+0.0)x15.00005
 ...\special{x:gsave}
-...\special{pdf:literal 1 0 0 1 0 0 cm}
+...\special{x:scale 1 1}
 ...\hbox(4.30554+0.0)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
@@ -144,7 +144,7 @@ l. ...}
 ..\kern 15.00005
 ..\hbox(4.30554+0.0)x0.0
 ...\special{x:gsave}
-...\special{pdf:literal -1 0 0 1 0 0 cm}
+...\special{x:scale -1 1}
 ...\hbox(4.30554+0.0)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
@@ -162,7 +162,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(0.0+4.30554)x15.00005
 ...\special{x:gsave}
-...\special{pdf:literal 1 0 0 -1 0 0 cm}
+...\special{x:scale 1 -1}
 ...\hbox(4.30554+0.0)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
@@ -180,7 +180,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(4.30554+0.0)x7.50002
 ...\special{x:gsave}
-...\special{pdf:literal 0.5 0 0 1 0 0 cm}
+...\special{x:scale 0.5 1}
 ...\hbox(4.30554+0.0)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
@@ -198,7 +198,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(2.15277+0.0)x15.00005
 ...\special{x:gsave}
-...\special{pdf:literal 1 0 0 0.5 0 0 cm}
+...\special{x:scale 1 0.5}
 ...\hbox(4.30554+0.0)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
@@ -216,7 +216,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(8.61108+0.0)x30.00009
 ...\special{x:gsave}
-...\special{pdf:literal 2 0 0 2 0 0 cm}
+...\special{x:scale 2 2}
 ...\hbox(4.30554+0.0)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
@@ -234,7 +234,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(43.05542+0.0)x1.50009
 ...\special{x:gsave}
-...\special{pdf:literal 0.1 0 0 10 0 0 cm}
+...\special{x:scale 0.1 10}
 ...\hbox(4.30554+0.0)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+0.0)x15.00005
 .....\OT1/cmr/m/n/10 a
@@ -256,7 +256,7 @@ TEST 3: Resize boxes
 ..\kern 0.0
 ..\hbox(19.60077+8.85197)x28.45274
 ...\special{x:gsave}
-...\special{pdf:literal 1.89684 0 0 4.55245 0 0 cm}
+...\special{x:scale 1.89684 4.55245}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -274,7 +274,7 @@ l. ...}
 ..\kern 28.45274
 ..\hbox(19.60077+8.85197)x0.0
 ...\special{x:gsave}
-...\special{pdf:literal -1.89684 0 0 4.55245 0 0 cm}
+...\special{x:scale -1.89684 4.55245}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -292,7 +292,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(8.85197+19.60077)x28.45274
 ...\special{x:gsave}
-...\special{pdf:literal 1.89684 0 0 -4.55245 0 0 cm}
+...\special{x:scale 1.89684 -4.55245}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -310,7 +310,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(19.60077+8.85197)x14.22636
 ...\special{x:gsave}
-...\special{pdf:literal 0.94842 0 0 4.55245 0 0 cm}
+...\special{x:scale 0.94842 4.55245}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -328,7 +328,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(9.80038+4.42598)x28.45274
 ...\special{x:gsave}
-...\special{pdf:literal 1.89684 0 0 2.27622 0 0 cm}
+...\special{x:scale 1.89684 2.27622}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -346,7 +346,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(39.20154+17.70396)x56.9055
 ...\special{x:gsave}
-...\special{pdf:literal 3.79369 0 0 9.1049 0 0 cm}
+...\special{x:scale 3.79369 9.1049}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -364,7 +364,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(196.00774+88.51982)x2.84544
 ...\special{x:gsave}
-...\special{pdf:literal 0.1897 0 0 45.52452 0 0 cm}
+...\special{x:scale 0.1897 45.52452}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -386,7 +386,7 @@ TEST 4: Resize boxes proportionally
 ..\kern 0.0
 ..\hbox(28.45274+12.84966)x99.1263
 ...\special{x:gsave}
-...\special{pdf:literal 6.6084 0 0 6.6084 0 0 cm}
+...\special{x:scale 6.6084 6.6084}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -404,7 +404,7 @@ l. ...}
 ..\kern 99.1263
 ..\hbox(12.84966+28.45274)x0.0
 ...\special{x:gsave}
-...\special{pdf:literal -6.6084 0 0 -6.6084 0 0 cm}
+...\special{x:scale -6.6084 -6.6084}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -422,7 +422,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(14.22636+6.42482)x49.56313
 ...\special{x:gsave}
-...\special{pdf:literal 3.3042 0 0 3.3042 0 0 cm}
+...\special{x:scale 3.3042 3.3042}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -440,7 +440,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(56.9055+25.69931)x198.25266
 ...\special{x:gsave}
-...\special{pdf:literal 13.2168 0 0 13.2168 0 0 cm}
+...\special{x:scale 13.2168 13.2168}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -458,7 +458,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(19.60077+8.85197)x68.28696
 ...\special{x:gsave}
-...\special{pdf:literal 4.55245 0 0 4.55245 0 0 cm}
+...\special{x:scale 4.55245 4.55245}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -476,7 +476,7 @@ l. ...}
 ..\kern 68.28696
 ..\hbox(8.85197+19.60077)x0.0
 ...\special{x:gsave}
-...\special{pdf:literal -4.55245 0 0 -4.55245 0 0 cm}
+...\special{x:scale -4.55245 -4.55245}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -494,7 +494,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(9.80038+4.42598)x34.14346
 ...\special{x:gsave}
-...\special{pdf:literal 2.27622 0 0 2.27622 0 0 cm}
+...\special{x:scale 2.27622 2.27622}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -512,7 +512,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(39.20154+17.70396)x136.57396
 ...\special{x:gsave}
-...\special{pdf:literal 9.1049 0 0 9.1049 0 0 cm}
+...\special{x:scale 9.1049 9.1049}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -530,7 +530,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(8.16695+3.68831)x28.45274
 ...\special{x:gsave}
-...\special{pdf:literal 1.89684 0 0 1.89684 0 0 cm}
+...\special{x:scale 1.89684 1.89684}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -548,7 +548,7 @@ l. ...}
 ..\kern 28.45274
 ..\hbox(3.68831+8.16695)x0.0
 ...\special{x:gsave}
-...\special{pdf:literal -1.89684 0 0 -1.89684 0 0 cm}
+...\special{x:scale -1.89684 -1.89684}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -566,7 +566,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(4.08347+1.84415)x14.22636
 ...\special{x:gsave}
-...\special{pdf:literal 0.94842 0 0 0.94842 0 0 cm}
+...\special{x:scale 0.94842 0.94842}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -584,7 +584,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(16.3339+7.37662)x56.9055
 ...\special{x:gsave}
-...\special{pdf:literal 3.79369 0 0 3.79369 0 0 cm}
+...\special{x:scale 3.79369 3.79369}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -602,7 +602,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(28.45274+12.84966)x28.45274
 ...\special{x:gsave}
-...\special{pdf:literal 1.89684 0 0 6.6084 0 0 cm}
+...\special{x:scale 1.89684 6.6084}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -620,7 +620,7 @@ l. ...}
 ..\kern 28.45274
 ..\hbox(28.45274+12.84966)x0.0
 ...\special{x:gsave}
-...\special{pdf:literal -1.89684 0 0 6.6084 0 0 cm}
+...\special{x:scale -1.89684 6.6084}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -638,7 +638,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(12.84966+28.45274)x28.45274
 ...\special{x:gsave}
-...\special{pdf:literal 1.89684 0 0 -6.6084 0 0 cm}
+...\special{x:scale 1.89684 -6.6084}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -656,7 +656,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(28.45274+12.84966)x14.22636
 ...\special{x:gsave}
-...\special{pdf:literal 0.94842 0 0 6.6084 0 0 cm}
+...\special{x:scale 0.94842 6.6084}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -674,7 +674,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(14.22636+6.42482)x28.45274
 ...\special{x:gsave}
-...\special{pdf:literal 1.89684 0 0 3.3042 0 0 cm}
+...\special{x:scale 1.89684 3.3042}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -692,7 +692,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(56.9055+25.69931)x56.9055
 ...\special{x:gsave}
-...\special{pdf:literal 3.79369 0 0 13.2168 0 0 cm}
+...\special{x:scale 3.79369 13.2168}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -710,7 +710,7 @@ l. ...}
 ..\kern 0.0
 ..\hbox(284.52756+128.49661)x2.84544
 ...\special{x:gsave}
-...\special{pdf:literal 0.1897 0 0 66.08403 0 0 cm}
+...\special{x:scale 0.1897 66.08403}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -732,7 +732,7 @@ TEST 5: Resize boxes automatically
 ..\kern 0.0
 ..\hbox(8.16696+3.68831)x28.45284
 ...\special{x:gsave}
-...\special{pdf:literal 1.89684 0 0 1.89684 0 0 cm}
+...\special{x:scale 1.89684 1.89684}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
@@ -750,7 +750,7 @@ l. ...  }
 ..\kern 0.0
 ..\hbox(8.16696+3.68831)x28.45284
 ...\special{x:gsave}
-...\special{pdf:literal 1.89684 0 0 1.89684 0 0 cm}
+...\special{x:scale 1.89684 1.89684}
 ...\hbox(4.30554+1.94444)x0.0, glue set - 15.00005fil
 ....\hbox(4.30554+1.94444)x15.00005
 .....\OT1/cmr/m/n/10 g
diff --git a/l3kernel/testfiles/m3coffins001.ptex.tlg b/l3kernel/testfiles/m3coffins001.ptex.tlg
index f6b36ac..42667ee 100644
--- a/l3kernel/testfiles/m3coffins001.ptex.tlg
+++ b/l3kernel/testfiles/m3coffins001.ptex.tlg
@@ -560,10 +560,10 @@ TEST 6: Rotation
 ..\hbox(40.2855+0.0)x40.2855
 ...\hbox(40.2855+0.0)x40.2855
 ....\kern 4.91046
-....\hbox(6.94444+0.0)x0.0
+....\hbox(6.94444+0.0)x50.02786
 .....\special{x:gsave}
-.....\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
-.....\hbox(6.94444+0.0)x0.0
+.....\special{x:rotate 45}
+.....\hbox(6.94444+0.0)x50.02786
 ......\hbox(6.94444+0.0)x50.02786
 .......\special{pdf:bcolor [0]}
 .......\OT1/cmr/m/n/10 H
@@ -606,20 +606,20 @@ l. ...  }
 ..\hbox(55.03102+0.0)x55.03104, shifted 2.45523
 ...\hbox(55.03102+0.0)x55.03104
 ....\kern 20.14276
-....\hbox(40.2855+0.0)x0.0
+....\hbox(40.2855+0.0)x40.2855
 .....\special{x:gsave}
-.....\special{pdf:literal 0.86603 0.5 -0.5 0.86603 0 0 cm}
-.....\hbox(40.2855+0.0)x0.0
+.....\special{x:rotate 30}
+.....\hbox(40.2855+0.0)x40.2855
 ......\hbox(40.2855+0.0)x40.2855
 .......\hbox(40.2855+0.0)x40.2855
 ........\kern 0.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
+..........\hbox(6.94444+0.0)x50.02786
 ...........\special{x:gsave}
-...........\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
-...........\hbox(6.94444+0.0)x0.0
+...........\special{x:rotate 45}
+...........\hbox(6.94444+0.0)x50.02786
 ............\hbox(6.94444+0.0)x50.02786
 .............\special{pdf:bcolor [0]}
 .............\OT1/cmr/m/n/10 H
@@ -663,30 +663,30 @@ l. ...  }
 ..\hbox(35.44058+13.89888)x49.33946, shifted -4.74313
 ...\hbox(35.44058+13.89888)x49.33946
 ....\kern 0.0
-....\hbox(50.12056+0.0)x0.0
+....\hbox(50.12056+0.0)x19.65598
 .....\special{x:gsave}
-.....\special{pdf:literal 0.70711 -0.70711 0.70711 0.70711 0 0 cm}
-.....\hbox(50.12056+0.0)x0.0
+.....\special{x:rotate -45}
+.....\hbox(50.12056+0.0)x19.65598
 ......\hbox(50.12056+0.0)x19.65598
 .......\hbox(50.12056+0.0)x19.65598
 ........\kern -17.68753
 ........\hbox(55.03102+0.0)x55.03104, shifted 2.45523
 .........\hbox(55.03102+0.0)x55.03104
 ..........\kern 20.14276
-..........\hbox(40.2855+0.0)x0.0
+..........\hbox(40.2855+0.0)x40.2855
 ...........\special{x:gsave}
-...........\special{pdf:literal 0.86603 0.5 -0.5 0.86603 0 0 cm}
-...........\hbox(40.2855+0.0)x0.0
+...........\special{x:rotate 30}
+...........\hbox(40.2855+0.0)x40.2855
 ............\hbox(40.2855+0.0)x40.2855
 .............\hbox(40.2855+0.0)x40.2855
 ..............\kern 0.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
+................\hbox(6.94444+0.0)x50.02786
 .................\special{x:gsave}
-.................\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
-.................\hbox(6.94444+0.0)x0.0
+.................\special{x:rotate 45}
+.................\hbox(6.94444+0.0)x50.02786
 ..................\hbox(6.94444+0.0)x50.02786
 ...................\special{pdf:bcolor [0]}
 ...................\OT1/cmr/m/n/10 H
@@ -734,7 +734,7 @@ TEST 7: Scaling
 ..\kern 0.0
 ..\hbox(7.63892+0.0)x50.02786
 ...\special{x:gsave}
-...\special{pdf:literal 1 0 0 1.1 0 0 cm}
+...\special{x:scale 1 1.1}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
 .....\special{pdf:bcolor [0]}
@@ -779,14 +779,14 @@ l. ...  }
 ..\kern 0.0
 ..\hbox(3.81946+0.0)x100.05573
 ...\special{x:gsave}
-...\special{pdf:literal 2 0 0 0.5 0 0 cm}
+...\special{x:scale 2 0.5}
 ...\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{x:gsave}
-.......\special{pdf:literal 1 0 0 1.1 0 0 cm}
+.......\special{x:scale 1 1.1}
 .......\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ........\hbox(6.94444+0.0)x50.02786
 .........\special{pdf:bcolor [0]}
@@ -838,7 +838,7 @@ TEST 8: Resizing
 ..\kern 0.0
 ..\hbox(56.9055+0.0)x28.45274
 ...\special{x:gsave}
-...\special{pdf:literal 0.56874 0 0 8.19439 0 0 cm}
+...\special{x:scale 0.56874 8.19439}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
 .....\special{pdf:bcolor [0]}
diff --git a/l3kernel/testfiles/m3coffins001.uptex.tlg b/l3kernel/testfiles/m3coffins001.uptex.tlg
index 4175574..2a8489a 100644
--- a/l3kernel/testfiles/m3coffins001.uptex.tlg
+++ b/l3kernel/testfiles/m3coffins001.uptex.tlg
@@ -564,10 +564,10 @@ TEST 6: Rotation
 ..\hbox(40.2855+0.0)x40.2855
 ...\hbox(40.2855+0.0)x40.2855
 ....\kern 4.91046
-....\hbox(6.94444+0.0)x0.0
+....\hbox(6.94444+0.0)x50.02786
 .....\special{x:gsave}
-.....\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
-.....\hbox(6.94444+0.0)x0.0
+.....\special{x:rotate 45}
+.....\hbox(6.94444+0.0)x50.02786
 ......\hbox(6.94444+0.0)x50.02786
 .......\special{pdf:bcolor [0]}
 .......\OT1/cmr/m/n/10 H
@@ -610,20 +610,20 @@ l. ...  }
 ..\hbox(55.03102+0.0)x55.03104, shifted 2.45523
 ...\hbox(55.03102+0.0)x55.03104
 ....\kern 20.14276
-....\hbox(40.2855+0.0)x0.0
+....\hbox(40.2855+0.0)x40.2855
 .....\special{x:gsave}
-.....\special{pdf:literal 0.86603 0.5 -0.5 0.86603 0 0 cm}
-.....\hbox(40.2855+0.0)x0.0
+.....\special{x:rotate 30}
+.....\hbox(40.2855+0.0)x40.2855
 ......\hbox(40.2855+0.0)x40.2855
 .......\hbox(40.2855+0.0)x40.2855
 ........\kern 0.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
+..........\hbox(6.94444+0.0)x50.02786
 ...........\special{x:gsave}
-...........\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
-...........\hbox(6.94444+0.0)x0.0
+...........\special{x:rotate 45}
+...........\hbox(6.94444+0.0)x50.02786
 ............\hbox(6.94444+0.0)x50.02786
 .............\special{pdf:bcolor [0]}
 .............\OT1/cmr/m/n/10 H
@@ -667,30 +667,30 @@ l. ...  }
 ..\hbox(35.44058+13.89888)x49.33946, shifted -4.74313
 ...\hbox(35.44058+13.89888)x49.33946
 ....\kern 0.0
-....\hbox(50.12056+0.0)x0.0
+....\hbox(50.12056+0.0)x19.65598
 .....\special{x:gsave}
-.....\special{pdf:literal 0.70711 -0.70711 0.70711 0.70711 0 0 cm}
-.....\hbox(50.12056+0.0)x0.0
+.....\special{x:rotate -45}
+.....\hbox(50.12056+0.0)x19.65598
 ......\hbox(50.12056+0.0)x19.65598
 .......\hbox(50.12056+0.0)x19.65598
 ........\kern -17.68753
 ........\hbox(55.03102+0.0)x55.03104, shifted 2.45523
 .........\hbox(55.03102+0.0)x55.03104
 ..........\kern 20.14276
-..........\hbox(40.2855+0.0)x0.0
+..........\hbox(40.2855+0.0)x40.2855
 ...........\special{x:gsave}
-...........\special{pdf:literal 0.86603 0.5 -0.5 0.86603 0 0 cm}
-...........\hbox(40.2855+0.0)x0.0
+...........\special{x:rotate 30}
+...........\hbox(40.2855+0.0)x40.2855
 ............\hbox(40.2855+0.0)x40.2855
 .............\hbox(40.2855+0.0)x40.2855
 ..............\kern 0.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
+................\hbox(6.94444+0.0)x50.02786
 .................\special{x:gsave}
-.................\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
-.................\hbox(6.94444+0.0)x0.0
+.................\special{x:rotate 45}
+.................\hbox(6.94444+0.0)x50.02786
 ..................\hbox(6.94444+0.0)x50.02786
 ...................\special{pdf:bcolor [0]}
 ...................\OT1/cmr/m/n/10 H
@@ -738,7 +738,7 @@ TEST 7: Scaling
 ..\kern 0.0
 ..\hbox(7.63892+0.0)x50.02786
 ...\special{x:gsave}
-...\special{pdf:literal 1 0 0 1.1 0 0 cm}
+...\special{x:scale 1 1.1}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
 .....\special{pdf:bcolor [0]}
@@ -783,14 +783,14 @@ l. ...  }
 ..\kern 0.0
 ..\hbox(3.81946+0.0)x100.05573
 ...\special{x:gsave}
-...\special{pdf:literal 2 0 0 0.5 0 0 cm}
+...\special{x:scale 2 0.5}
 ...\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{x:gsave}
-.......\special{pdf:literal 1 0 0 1.1 0 0 cm}
+.......\special{x:scale 1 1.1}
 .......\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ........\hbox(6.94444+0.0)x50.02786
 .........\special{pdf:bcolor [0]}
@@ -842,7 +842,7 @@ TEST 8: Resizing
 ..\kern 0.0
 ..\hbox(56.9055+0.0)x28.45274
 ...\special{x:gsave}
-...\special{pdf:literal 0.56874 0 0 8.19439 0 0 cm}
+...\special{x:scale 0.56874 8.19439}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
 .....\special{pdf:bcolor [0]}
diff --git a/l3kernel/testfiles/m3coffins001.xetex.tlg b/l3kernel/testfiles/m3coffins001.xetex.tlg
index f6b36ac..42667ee 100644
--- a/l3kernel/testfiles/m3coffins001.xetex.tlg
+++ b/l3kernel/testfiles/m3coffins001.xetex.tlg
@@ -560,10 +560,10 @@ TEST 6: Rotation
 ..\hbox(40.2855+0.0)x40.2855
 ...\hbox(40.2855+0.0)x40.2855
 ....\kern 4.91046
-....\hbox(6.94444+0.0)x0.0
+....\hbox(6.94444+0.0)x50.02786
 .....\special{x:gsave}
-.....\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
-.....\hbox(6.94444+0.0)x0.0
+.....\special{x:rotate 45}
+.....\hbox(6.94444+0.0)x50.02786
 ......\hbox(6.94444+0.0)x50.02786
 .......\special{pdf:bcolor [0]}
 .......\OT1/cmr/m/n/10 H
@@ -606,20 +606,20 @@ l. ...  }
 ..\hbox(55.03102+0.0)x55.03104, shifted 2.45523
 ...\hbox(55.03102+0.0)x55.03104
 ....\kern 20.14276
-....\hbox(40.2855+0.0)x0.0
+....\hbox(40.2855+0.0)x40.2855
 .....\special{x:gsave}
-.....\special{pdf:literal 0.86603 0.5 -0.5 0.86603 0 0 cm}
-.....\hbox(40.2855+0.0)x0.0
+.....\special{x:rotate 30}
+.....\hbox(40.2855+0.0)x40.2855
 ......\hbox(40.2855+0.0)x40.2855
 .......\hbox(40.2855+0.0)x40.2855
 ........\kern 0.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
+..........\hbox(6.94444+0.0)x50.02786
 ...........\special{x:gsave}
-...........\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
-...........\hbox(6.94444+0.0)x0.0
+...........\special{x:rotate 45}
+...........\hbox(6.94444+0.0)x50.02786
 ............\hbox(6.94444+0.0)x50.02786
 .............\special{pdf:bcolor [0]}
 .............\OT1/cmr/m/n/10 H
@@ -663,30 +663,30 @@ l. ...  }
 ..\hbox(35.44058+13.89888)x49.33946, shifted -4.74313
 ...\hbox(35.44058+13.89888)x49.33946
 ....\kern 0.0
-....\hbox(50.12056+0.0)x0.0
+....\hbox(50.12056+0.0)x19.65598
 .....\special{x:gsave}
-.....\special{pdf:literal 0.70711 -0.70711 0.70711 0.70711 0 0 cm}
-.....\hbox(50.12056+0.0)x0.0
+.....\special{x:rotate -45}
+.....\hbox(50.12056+0.0)x19.65598
 ......\hbox(50.12056+0.0)x19.65598
 .......\hbox(50.12056+0.0)x19.65598
 ........\kern -17.68753
 ........\hbox(55.03102+0.0)x55.03104, shifted 2.45523
 .........\hbox(55.03102+0.0)x55.03104
 ..........\kern 20.14276
-..........\hbox(40.2855+0.0)x0.0
+..........\hbox(40.2855+0.0)x40.2855
 ...........\special{x:gsave}
-...........\special{pdf:literal 0.86603 0.5 -0.5 0.86603 0 0 cm}
-...........\hbox(40.2855+0.0)x0.0
+...........\special{x:rotate 30}
+...........\hbox(40.2855+0.0)x40.2855
 ............\hbox(40.2855+0.0)x40.2855
 .............\hbox(40.2855+0.0)x40.2855
 ..............\kern 0.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
+................\hbox(6.94444+0.0)x50.02786
 .................\special{x:gsave}
-.................\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
-.................\hbox(6.94444+0.0)x0.0
+.................\special{x:rotate 45}
+.................\hbox(6.94444+0.0)x50.02786
 ..................\hbox(6.94444+0.0)x50.02786
 ...................\special{pdf:bcolor [0]}
 ...................\OT1/cmr/m/n/10 H
@@ -734,7 +734,7 @@ TEST 7: Scaling
 ..\kern 0.0
 ..\hbox(7.63892+0.0)x50.02786
 ...\special{x:gsave}
-...\special{pdf:literal 1 0 0 1.1 0 0 cm}
+...\special{x:scale 1 1.1}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
 .....\special{pdf:bcolor [0]}
@@ -779,14 +779,14 @@ l. ...  }
 ..\kern 0.0
 ..\hbox(3.81946+0.0)x100.05573
 ...\special{x:gsave}
-...\special{pdf:literal 2 0 0 0.5 0 0 cm}
+...\special{x:scale 2 0.5}
 ...\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{x:gsave}
-.......\special{pdf:literal 1 0 0 1.1 0 0 cm}
+.......\special{x:scale 1 1.1}
 .......\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ........\hbox(6.94444+0.0)x50.02786
 .........\special{pdf:bcolor [0]}
@@ -838,7 +838,7 @@ TEST 8: Resizing
 ..\kern 0.0
 ..\hbox(56.9055+0.0)x28.45274
 ...\special{x:gsave}
-...\special{pdf:literal 0.56874 0 0 8.19439 0 0 cm}
+...\special{x:scale 0.56874 8.19439}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
 .....\special{pdf:bcolor [0]}
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 3836112..8794273 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -5012,11 +5012,8 @@ Defining \c__expl_def_ext_tl on line ...
 Defining \__driver_literal:n on line ...
 Defining \__driver_scope_begin: on line ...
 Defining \__driver_scope_end: on line ...
-Defining \__driver_matrix:n on line ...
 Defining \__driver_box_use_clip:N on line ...
 Defining \__driver_box_use_rotate:Nn on line ...
-Defining \l__driver_cos_fp on line ...
-Defining \l__driver_sin_fp on line ...
 Defining \__driver_box_use_scale:Nnn on line ...
 Defining \l__driver_current_color_tl on line ...
 Defining \__driver_color_ensure_current: on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 89563b5..87a3743 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -5213,11 +5213,8 @@ Defining \c__expl_def_ext_tl on line ...
 Defining \__driver_literal:n on line ...
 Defining \__driver_scope_begin: on line ...
 Defining \__driver_scope_end: on line ...
-Defining \__driver_matrix:n on line ...
 Defining \__driver_box_use_clip:N on line ...
 Defining \__driver_box_use_rotate:Nn on line ...
-Defining \l__driver_cos_fp on line ...
-Defining \l__driver_sin_fp on line ...
 Defining \__driver_box_use_scale:Nnn on line ...
 Defining \l__driver_current_color_tl on line ...
 Defining \__driver_color_ensure_current: on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 718449f..b47169b 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -5022,11 +5022,8 @@ Defining \c__expl_def_ext_tl on line ...
 Defining \__driver_literal:n on line ...
 Defining \__driver_scope_begin: on line ...
 Defining \__driver_scope_end: on line ...
-Defining \__driver_matrix:n on line ...
 Defining \__driver_box_use_clip:N on line ...
 Defining \__driver_box_use_rotate:Nn on line ...
-Defining \l__driver_cos_fp on line ...
-Defining \l__driver_sin_fp on line ...
 Defining \__driver_box_use_scale:Nnn on line ...
 Defining \l__driver_current_color_tl on line ...
 Defining \__driver_color_ensure_current: on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 702d607..1e2b13b 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -5013,11 +5013,8 @@ Defining \c__expl_def_ext_tl on line ...
 Defining \__driver_literal:n on line ...
 Defining \__driver_scope_begin: on line ...
 Defining \__driver_scope_end: on line ...
-Defining \__driver_matrix:n on line ...
 Defining \__driver_box_use_clip:N on line ...
 Defining \__driver_box_use_rotate:Nn on line ...
-Defining \l__driver_cos_fp on line ...
-Defining \l__driver_sin_fp on line ...
 Defining \__driver_box_use_scale:Nnn on line ...
 Defining \l__driver_current_color_tl on line ...
 Defining \__driver_color_ensure_current: on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 58f5125..fb904a0 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -5214,11 +5214,8 @@ Defining \c__expl_def_ext_tl on line ...
 Defining \__driver_literal:n on line ...
 Defining \__driver_scope_begin: on line ...
 Defining \__driver_scope_end: on line ...
-Defining \__driver_matrix:n on line ...
 Defining \__driver_box_use_clip:N on line ...
 Defining \__driver_box_use_rotate:Nn on line ...
-Defining \l__driver_cos_fp on line ...
-Defining \l__driver_sin_fp on line ...
 Defining \__driver_box_use_scale:Nnn on line ...
 Defining \l__driver_current_color_tl on line ...
 Defining \__driver_color_ensure_current: on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 7566730..181e2e8 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -5023,11 +5023,8 @@ Defining \c__expl_def_ext_tl on line ...
 Defining \__driver_literal:n on line ...
 Defining \__driver_scope_begin: on line ...
 Defining \__driver_scope_end: on line ...
-Defining \__driver_matrix:n on line ...
 Defining \__driver_box_use_clip:N on line ...
 Defining \__driver_box_use_rotate:Nn on line ...
-Defining \l__driver_cos_fp on line ...
-Defining \l__driver_sin_fp on line ...
 Defining \__driver_box_use_scale:Nnn on line ...
 Defining \l__driver_current_color_tl on line ...
 Defining \__driver_color_ensure_current: on line ...

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


More information about the latex3-commits mailing list