From 61b116923efc74347b2c29f5a044b0ebff347147 Mon Sep 17 00:00:00 2001 From: Joseph Wright Date: Wed, 7 Mar 2018 21:23:47 +0000 Subject: [PATCH] Minor change to dvips set up --- l3kernel/l3drivers.dtx | 12 +-- l3kernel/testfiles/d3dvips.luatex.tlg | 104 ++++++++++++++++------- l3kernel/testfiles/d3dvips.tlg | 90 ++++++++++++++++---- l3kernel/testfiles/d3pdfmode.ptex.tlg | 90 ++++++++++++++++---- l3kernel/testfiles/d3pdfmode.uptex.tlg | 90 ++++++++++++++++---- l3kernel/testfiles/d3xdvipdfmx.ptex.tlg | 90 ++++++++++++++++---- l3kernel/testfiles/d3xdvipdfmx.uptex.tlg | 90 ++++++++++++++++---- 7 files changed, 436 insertions(+), 130 deletions(-) diff --git a/l3kernel/l3drivers.dtx b/l3kernel/l3drivers.dtx index 9ced081f11..b15f759af2 100644 --- a/l3kernel/l3drivers.dtx +++ b/l3kernel/l3drivers.dtx @@ -723,14 +723,10 @@ % \begin{macrocode} \cs_new_protected:Npn \@@_literal:n #1 { - \tex_special:D - { - ps: - currentpoint~ - currentpoint~translate~ - #1 ~ - neg~exch~neg~exch~translate - } + \tex_special:D { ps:currentpoint } + \tex_special:D { ps:currentpoint~translate } + \tex_special:D { ps: #1 } + \tex_special:D { ps:neg~exch~neg~exch~translate} } % \end{macrocode} % \end{macro} diff --git a/l3kernel/testfiles/d3dvips.luatex.tlg b/l3kernel/testfiles/d3dvips.luatex.tlg index cb6b9b3eb2..7ed4f1d240 100644 --- a/l3kernel/testfiles/d3dvips.luatex.tlg +++ b/l3kernel/testfiles/d3dvips.luatex.tlg @@ -7,8 +7,11 @@ TEST 1: Clip box > \box...= \hbox(6.94444+1.0)x86.45851, direction TLT .\special{ps:gsave} -.\special{ps:currentpoint currentpoint translate matrix currentmatrix Resolutio +.\special{ps:currentpoint} +.\special{ps:currentpoint translate} +.\special{ps:matrix currentmatrix Resolution 72 div VResolution 72 div scale DV \ETC.} +.\special{ps:neg exch neg exch translate} .\hbox(6.94444+1.0)x0.0, glue set - 86.45851fil, direction TLT ..\hbox(6.94444+1.0)x86.45851, direction TLT ...\OT1/cmr/m/n/10 G @@ -40,8 +43,11 @@ l. ... } > \box...= \hbox(6.94444+0.0)x86.45851, direction TLT .\special{ps:gsave} -.\special{ps:currentpoint currentpoint translate matrix currentmatrix Resolutio +.\special{ps:currentpoint} +.\special{ps:currentpoint translate} +.\special{ps:matrix currentmatrix Resolution 72 div VResolution 72 div scale DV \ETC.} +.\special{ps:neg exch neg exch translate} .\hbox(6.94444+0.0)x0.0, glue set - 86.45851fil, direction TLT ..\hbox(6.94444+0.0)x86.45851, direction TLT ...\OT1/cmr/m/n/10 G @@ -73,8 +79,11 @@ l. ... } > \box...= \hbox(6.94444+1.0)x86.45851, direction TLT .\special{ps:gsave} -.\special{ps:currentpoint currentpoint translate matrix currentmatrix Resolutio +.\special{ps:currentpoint} +.\special{ps:currentpoint translate} +.\special{ps:matrix currentmatrix Resolution 72 div VResolution 72 div scale DV \ETC.} +.\special{ps:neg exch neg exch translate} .\hbox(6.94444+1.0)x0.0, glue set - 86.45851fil, direction TLT ..\hbox(6.94444+1.0)x86.45851, direction TLT ...\OT1/cmr/m/n/10 G @@ -106,8 +115,11 @@ l. ... } > \box...= \hbox(6.94444+1.94444)x20.0, direction TLT .\special{ps:gsave} -.\special{ps:currentpoint currentpoint translate matrix currentmatrix Resolutio +.\special{ps:currentpoint} +.\special{ps:currentpoint translate} +.\special{ps:matrix currentmatrix Resolution 72 div VResolution 72 div scale DV \ETC.} +.\special{ps:neg exch neg exch translate} .\hbox(6.94444+1.94444)x0.0, glue set - 20.0fil, direction TLT ..\hbox(6.94444+1.94444)x20.0, direction TLT ...\OT1/cmr/m/n/10 G @@ -163,8 +175,10 @@ l. ... } ..\kern 0.0 ..\hbox(6.94444+0.0)x50.02786, direction TLT ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate 0 rotate neg exch neg exch t -ra\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:0 rotate} +...\special{ps:neg exch neg exch translate} ...\hbox(6.94444+0.0)x50.02786, direction TLT ....\hbox(6.94444+0.0)x50.02786, direction TLT .....\OT1/cmr/m/n/10 H @@ -189,8 +203,10 @@ l. ... } ..\kern 3.47223 ..\hbox(6.94444+0.0)x50.02786, direction TLT ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate -30 rotate neg exch neg exch - t\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:-30 rotate} +...\special{ps:neg exch neg exch translate} ...\hbox(6.94444+0.0)x50.02786, direction TLT ....\hbox(6.94444+0.0)x50.02786, direction TLT .....\OT1/cmr/m/n/10 H @@ -215,8 +231,10 @@ l. ... } ..\kern 4.91046 ..\hbox(6.94444+0.0)x50.02786, direction TLT ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch - t\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:-45 rotate} +...\special{ps:neg exch neg exch translate} ...\hbox(6.94444+0.0)x50.02786, direction TLT ....\hbox(6.94444+0.0)x50.02786, direction TLT .....\OT1/cmr/m/n/10 H @@ -241,8 +259,10 @@ l. ... } ..\kern 40.2855 ..\hbox(6.94444+0.0)x50.02786, direction TLT ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate -135 rotate neg exch neg exc -h \ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:-135 rotate} +...\special{ps:neg exch neg exch translate} ...\hbox(6.94444+0.0)x50.02786, direction TLT ....\hbox(6.94444+0.0)x50.02786, direction TLT .....\OT1/cmr/m/n/10 H @@ -267,8 +287,10 @@ l. ... } ..\kern 35.37505 ..\hbox(6.94444+0.0)x50.02786, direction TLT ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate -225 rotate neg exch neg exc -h \ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:-225 rotate} +...\special{ps:neg exch neg exch translate} ...\hbox(6.94444+0.0)x50.02786, direction TLT ....\hbox(6.94444+0.0)x50.02786, direction TLT .....\OT1/cmr/m/n/10 H @@ -293,8 +315,10 @@ l. ... } ..\kern 0.0 ..\hbox(6.94444+0.0)x50.02786, direction TLT ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate -315 rotate neg exch neg exc -h \ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:-315 rotate} +...\special{ps:neg exch neg exch translate} ...\hbox(6.94444+0.0)x50.02786, direction TLT ....\hbox(6.94444+0.0)x50.02786, direction TLT .....\OT1/cmr/m/n/10 H @@ -319,16 +343,20 @@ l. ... } ..\kern 28.48616 ..\hbox(40.2855+0.0)x40.2855, direction TLT ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch - t\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:-45 rotate} +...\special{ps:neg exch neg exch translate} ...\hbox(40.2855+0.0)x40.2855, direction TLT ....\hbox(40.2855+0.0)x40.2855, direction TLT .....\hbox(40.2855+0.0)x40.2855, direction TLT ......\kern 4.91046 ......\hbox(6.94444+0.0)x50.02786, direction TLT .......\special{ps:gsave} -.......\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg -exch t\ETC.} +.......\special{ps:currentpoint} +.......\special{ps:currentpoint translate} +.......\special{ps:-45 rotate} +.......\special{ps:neg exch neg exch translate} .......\hbox(6.94444+0.0)x50.02786, direction TLT ........\hbox(6.94444+0.0)x50.02786, direction TLT .........\OT1/cmr/m/n/10 H @@ -375,8 +403,10 @@ l. ... } ..\kern 0.0 ..\hbox(6.94444+0.0)x50.02786, direction TLT ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate 1 1 scale neg exch neg exch -tr\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:1 1 scale} +...\special{ps:neg exch neg exch translate} ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil, direction TLT ....\hbox(6.94444+0.0)x50.02786, direction TLT .....\OT1/cmr/m/n/10 H @@ -403,8 +433,10 @@ l. ... } ..\kern 0.0 ..\hbox(6.94444+0.0)x125.06966, direction TLT ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate 2.5 1 scale neg exch neg exc -h \ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:2.5 1 scale} +...\special{ps:neg exch neg exch translate} ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil, direction TLT ....\hbox(6.94444+0.0)x50.02786, direction TLT .....\OT1/cmr/m/n/10 H @@ -431,8 +463,10 @@ l. ... } ..\kern 0.0 ..\hbox(2.31477+0.0)x50.02786, direction TLT ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate 1 0.33333 scale neg exch neg - e\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:1 0.33333 scale} +...\special{ps:neg exch neg exch translate} ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil, direction TLT ....\hbox(6.94444+0.0)x50.02786, direction TLT .....\OT1/cmr/m/n/10 H @@ -459,8 +493,10 @@ l. ... } ..\kern 0.0 ..\hbox(6.94444+1.94444)x103.61133, direction TLT ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate 1 1 scale neg exch neg exch -tr\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:1 1 scale} +...\special{ps:neg exch neg exch translate} ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil, direction TLT ....\hbox(6.94444+1.94444)x103.61133, direction TLT .....\OT1/cmr/m/n/10 T @@ -500,8 +536,10 @@ l. ... } ..\kern 0.0 ..\hbox(20.83333+5.83333)x310.83398, direction TLT ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate 3 3 scale neg exch neg exch -tr\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:3 3 scale} +...\special{ps:neg exch neg exch translate} ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil, direction TLT ....\hbox(6.94444+1.94444)x103.61133, direction TLT .....\OT1/cmr/m/n/10 T @@ -541,8 +579,10 @@ l. ... } ..\kern 310.83398 ..\hbox(5.83333+20.83333)x0.0, direction TLT ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate -3 -3 scale neg exch neg exc -h \ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:-3 -3 scale} +...\special{ps:neg exch neg exch translate} ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil, direction TLT ....\hbox(6.94444+1.94444)x103.61133, direction TLT .....\OT1/cmr/m/n/10 T diff --git a/l3kernel/testfiles/d3dvips.tlg b/l3kernel/testfiles/d3dvips.tlg index 0a8133943e..eeda648798 100644 --- a/l3kernel/testfiles/d3dvips.tlg +++ b/l3kernel/testfiles/d3dvips.tlg @@ -7,7 +7,10 @@ TEST 1: Clip box > \box...= \hbox(6.94444+1.0)x86.45851 .\special{ps:gsave} -.\special{ps:currentpoint currentpoint translate matrix currentmatrix Resolutio\ETC.} +.\special{ps:currentpoint} +.\special{ps:currentpoint translate} +.\special{ps:matrix currentmatrix Resolution 72 div VResolution 72 div scale DV\ETC.} +.\special{ps:neg exch neg exch translate} .\hbox(6.94444+1.0)x0.0, glue set - 86.45851fil ..\hbox(6.94444+1.0)x86.45851 ...\OT1/cmr/m/n/10 G @@ -37,7 +40,10 @@ l. ... } > \box...= \hbox(6.94444+0.0)x86.45851 .\special{ps:gsave} -.\special{ps:currentpoint currentpoint translate matrix currentmatrix Resolutio\ETC.} +.\special{ps:currentpoint} +.\special{ps:currentpoint translate} +.\special{ps:matrix currentmatrix Resolution 72 div VResolution 72 div scale DV\ETC.} +.\special{ps:neg exch neg exch translate} .\hbox(6.94444+0.0)x0.0, glue set - 86.45851fil ..\hbox(6.94444+0.0)x86.45851 ...\OT1/cmr/m/n/10 G @@ -67,7 +73,10 @@ l. ... } > \box...= \hbox(6.94444+1.0)x86.45851 .\special{ps:gsave} -.\special{ps:currentpoint currentpoint translate matrix currentmatrix Resolutio\ETC.} +.\special{ps:currentpoint} +.\special{ps:currentpoint translate} +.\special{ps:matrix currentmatrix Resolution 72 div VResolution 72 div scale DV\ETC.} +.\special{ps:neg exch neg exch translate} .\hbox(6.94444+1.0)x0.0, glue set - 86.45851fil ..\hbox(6.94444+1.0)x86.45851 ...\OT1/cmr/m/n/10 G @@ -97,7 +106,10 @@ l. ... } > \box...= \hbox(6.94444+1.94444)x20.0 .\special{ps:gsave} -.\special{ps:currentpoint currentpoint translate matrix currentmatrix Resolutio\ETC.} +.\special{ps:currentpoint} +.\special{ps:currentpoint translate} +.\special{ps:matrix currentmatrix Resolution 72 div VResolution 72 div scale DV\ETC.} +.\special{ps:neg exch neg exch translate} .\hbox(6.94444+1.94444)x0.0, glue set - 20.0fil ..\hbox(6.94444+1.94444)x20.0 ...\OT1/cmr/m/n/10 G @@ -151,7 +163,10 @@ l. ... } ..\kern 0.0 ..\hbox(6.94444+0.0)x50.02786 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate 0 rotate neg exch neg exch tra\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:0 rotate} +...\special{ps:neg exch neg exch translate} ...\hbox(6.94444+0.0)x50.02786 ....\hbox(6.94444+0.0)x50.02786 .....\OT1/cmr/m/n/10 H @@ -176,7 +191,10 @@ l. ... } ..\kern 3.47223 ..\hbox(6.94444+0.0)x50.02786 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate -30 rotate neg exch neg exch t\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:-30 rotate} +...\special{ps:neg exch neg exch translate} ...\hbox(6.94444+0.0)x50.02786 ....\hbox(6.94444+0.0)x50.02786 .....\OT1/cmr/m/n/10 H @@ -201,7 +219,10 @@ l. ... } ..\kern 4.91046 ..\hbox(6.94444+0.0)x50.02786 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch t\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:-45 rotate} +...\special{ps:neg exch neg exch translate} ...\hbox(6.94444+0.0)x50.02786 ....\hbox(6.94444+0.0)x50.02786 .....\OT1/cmr/m/n/10 H @@ -226,7 +247,10 @@ l. ... } ..\kern 40.2855 ..\hbox(6.94444+0.0)x50.02786 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate -135 rotate neg exch neg exch \ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:-135 rotate} +...\special{ps:neg exch neg exch translate} ...\hbox(6.94444+0.0)x50.02786 ....\hbox(6.94444+0.0)x50.02786 .....\OT1/cmr/m/n/10 H @@ -251,7 +275,10 @@ l. ... } ..\kern 35.37505 ..\hbox(6.94444+0.0)x50.02786 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate -225 rotate neg exch neg exch \ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:-225 rotate} +...\special{ps:neg exch neg exch translate} ...\hbox(6.94444+0.0)x50.02786 ....\hbox(6.94444+0.0)x50.02786 .....\OT1/cmr/m/n/10 H @@ -276,7 +303,10 @@ l. ... } ..\kern 0.0 ..\hbox(6.94444+0.0)x50.02786 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate -315 rotate neg exch neg exch \ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:-315 rotate} +...\special{ps:neg exch neg exch translate} ...\hbox(6.94444+0.0)x50.02786 ....\hbox(6.94444+0.0)x50.02786 .....\OT1/cmr/m/n/10 H @@ -301,14 +331,20 @@ l. ... } ..\kern 28.48616 ..\hbox(40.2855+0.0)x40.2855 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch t\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:-45 rotate} +...\special{ps:neg exch neg exch translate} ...\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)x50.02786 .......\special{ps:gsave} -.......\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch t\ETC.} +.......\special{ps:currentpoint} +.......\special{ps:currentpoint translate} +.......\special{ps:-45 rotate} +.......\special{ps:neg exch neg exch translate} .......\hbox(6.94444+0.0)x50.02786 ........\hbox(6.94444+0.0)x50.02786 .........\OT1/cmr/m/n/10 H @@ -355,7 +391,10 @@ l. ... } ..\kern 0.0 ..\hbox(6.94444+0.0)x50.02786 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate 1 1 scale neg exch neg exch tr\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:1 1 scale} +...\special{ps:neg exch neg exch translate} ...\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 +421,10 @@ l. ... } ..\kern 0.0 ..\hbox(6.94444+0.0)x125.06966 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate 2.5 1 scale neg exch neg exch \ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:2.5 1 scale} +...\special{ps:neg exch neg exch translate} ...\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 +451,10 @@ l. ... } ..\kern 0.0 ..\hbox(2.31477+0.0)x50.02786 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate 1 0.33333 scale neg exch neg e\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:1 0.33333 scale} +...\special{ps:neg exch neg exch translate} ...\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 +481,10 @@ l. ... } ..\kern 0.0 ..\hbox(6.94444+1.94444)x103.61133 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate 1 1 scale neg exch neg exch tr\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:1 1 scale} +...\special{ps:neg exch neg exch translate} ...\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 +522,10 @@ l. ... } ..\kern 0.0 ..\hbox(20.83333+5.83333)x310.83398 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate 3 3 scale neg exch neg exch tr\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:3 3 scale} +...\special{ps:neg exch neg exch translate} ...\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 +563,10 @@ l. ... } ..\kern 310.83398 ..\hbox(5.83333+20.83333)x0.0 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate -3 -3 scale neg exch neg exch \ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:-3 -3 scale} +...\special{ps:neg exch neg exch translate} ...\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.ptex.tlg b/l3kernel/testfiles/d3pdfmode.ptex.tlg index 0a8133943e..eeda648798 100644 --- a/l3kernel/testfiles/d3pdfmode.ptex.tlg +++ b/l3kernel/testfiles/d3pdfmode.ptex.tlg @@ -7,7 +7,10 @@ TEST 1: Clip box > \box...= \hbox(6.94444+1.0)x86.45851 .\special{ps:gsave} -.\special{ps:currentpoint currentpoint translate matrix currentmatrix Resolutio\ETC.} +.\special{ps:currentpoint} +.\special{ps:currentpoint translate} +.\special{ps:matrix currentmatrix Resolution 72 div VResolution 72 div scale DV\ETC.} +.\special{ps:neg exch neg exch translate} .\hbox(6.94444+1.0)x0.0, glue set - 86.45851fil ..\hbox(6.94444+1.0)x86.45851 ...\OT1/cmr/m/n/10 G @@ -37,7 +40,10 @@ l. ... } > \box...= \hbox(6.94444+0.0)x86.45851 .\special{ps:gsave} -.\special{ps:currentpoint currentpoint translate matrix currentmatrix Resolutio\ETC.} +.\special{ps:currentpoint} +.\special{ps:currentpoint translate} +.\special{ps:matrix currentmatrix Resolution 72 div VResolution 72 div scale DV\ETC.} +.\special{ps:neg exch neg exch translate} .\hbox(6.94444+0.0)x0.0, glue set - 86.45851fil ..\hbox(6.94444+0.0)x86.45851 ...\OT1/cmr/m/n/10 G @@ -67,7 +73,10 @@ l. ... } > \box...= \hbox(6.94444+1.0)x86.45851 .\special{ps:gsave} -.\special{ps:currentpoint currentpoint translate matrix currentmatrix Resolutio\ETC.} +.\special{ps:currentpoint} +.\special{ps:currentpoint translate} +.\special{ps:matrix currentmatrix Resolution 72 div VResolution 72 div scale DV\ETC.} +.\special{ps:neg exch neg exch translate} .\hbox(6.94444+1.0)x0.0, glue set - 86.45851fil ..\hbox(6.94444+1.0)x86.45851 ...\OT1/cmr/m/n/10 G @@ -97,7 +106,10 @@ l. ... } > \box...= \hbox(6.94444+1.94444)x20.0 .\special{ps:gsave} -.\special{ps:currentpoint currentpoint translate matrix currentmatrix Resolutio\ETC.} +.\special{ps:currentpoint} +.\special{ps:currentpoint translate} +.\special{ps:matrix currentmatrix Resolution 72 div VResolution 72 div scale DV\ETC.} +.\special{ps:neg exch neg exch translate} .\hbox(6.94444+1.94444)x0.0, glue set - 20.0fil ..\hbox(6.94444+1.94444)x20.0 ...\OT1/cmr/m/n/10 G @@ -151,7 +163,10 @@ l. ... } ..\kern 0.0 ..\hbox(6.94444+0.0)x50.02786 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate 0 rotate neg exch neg exch tra\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:0 rotate} +...\special{ps:neg exch neg exch translate} ...\hbox(6.94444+0.0)x50.02786 ....\hbox(6.94444+0.0)x50.02786 .....\OT1/cmr/m/n/10 H @@ -176,7 +191,10 @@ l. ... } ..\kern 3.47223 ..\hbox(6.94444+0.0)x50.02786 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate -30 rotate neg exch neg exch t\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:-30 rotate} +...\special{ps:neg exch neg exch translate} ...\hbox(6.94444+0.0)x50.02786 ....\hbox(6.94444+0.0)x50.02786 .....\OT1/cmr/m/n/10 H @@ -201,7 +219,10 @@ l. ... } ..\kern 4.91046 ..\hbox(6.94444+0.0)x50.02786 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch t\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:-45 rotate} +...\special{ps:neg exch neg exch translate} ...\hbox(6.94444+0.0)x50.02786 ....\hbox(6.94444+0.0)x50.02786 .....\OT1/cmr/m/n/10 H @@ -226,7 +247,10 @@ l. ... } ..\kern 40.2855 ..\hbox(6.94444+0.0)x50.02786 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate -135 rotate neg exch neg exch \ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:-135 rotate} +...\special{ps:neg exch neg exch translate} ...\hbox(6.94444+0.0)x50.02786 ....\hbox(6.94444+0.0)x50.02786 .....\OT1/cmr/m/n/10 H @@ -251,7 +275,10 @@ l. ... } ..\kern 35.37505 ..\hbox(6.94444+0.0)x50.02786 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate -225 rotate neg exch neg exch \ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:-225 rotate} +...\special{ps:neg exch neg exch translate} ...\hbox(6.94444+0.0)x50.02786 ....\hbox(6.94444+0.0)x50.02786 .....\OT1/cmr/m/n/10 H @@ -276,7 +303,10 @@ l. ... } ..\kern 0.0 ..\hbox(6.94444+0.0)x50.02786 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate -315 rotate neg exch neg exch \ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:-315 rotate} +...\special{ps:neg exch neg exch translate} ...\hbox(6.94444+0.0)x50.02786 ....\hbox(6.94444+0.0)x50.02786 .....\OT1/cmr/m/n/10 H @@ -301,14 +331,20 @@ l. ... } ..\kern 28.48616 ..\hbox(40.2855+0.0)x40.2855 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch t\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:-45 rotate} +...\special{ps:neg exch neg exch translate} ...\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)x50.02786 .......\special{ps:gsave} -.......\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch t\ETC.} +.......\special{ps:currentpoint} +.......\special{ps:currentpoint translate} +.......\special{ps:-45 rotate} +.......\special{ps:neg exch neg exch translate} .......\hbox(6.94444+0.0)x50.02786 ........\hbox(6.94444+0.0)x50.02786 .........\OT1/cmr/m/n/10 H @@ -355,7 +391,10 @@ l. ... } ..\kern 0.0 ..\hbox(6.94444+0.0)x50.02786 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate 1 1 scale neg exch neg exch tr\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:1 1 scale} +...\special{ps:neg exch neg exch translate} ...\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 +421,10 @@ l. ... } ..\kern 0.0 ..\hbox(6.94444+0.0)x125.06966 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate 2.5 1 scale neg exch neg exch \ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:2.5 1 scale} +...\special{ps:neg exch neg exch translate} ...\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 +451,10 @@ l. ... } ..\kern 0.0 ..\hbox(2.31477+0.0)x50.02786 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate 1 0.33333 scale neg exch neg e\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:1 0.33333 scale} +...\special{ps:neg exch neg exch translate} ...\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 +481,10 @@ l. ... } ..\kern 0.0 ..\hbox(6.94444+1.94444)x103.61133 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate 1 1 scale neg exch neg exch tr\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:1 1 scale} +...\special{ps:neg exch neg exch translate} ...\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 +522,10 @@ l. ... } ..\kern 0.0 ..\hbox(20.83333+5.83333)x310.83398 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate 3 3 scale neg exch neg exch tr\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:3 3 scale} +...\special{ps:neg exch neg exch translate} ...\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 +563,10 @@ l. ... } ..\kern 310.83398 ..\hbox(5.83333+20.83333)x0.0 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate -3 -3 scale neg exch neg exch \ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:-3 -3 scale} +...\special{ps:neg exch neg exch translate} ...\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.uptex.tlg b/l3kernel/testfiles/d3pdfmode.uptex.tlg index 0a8133943e..eeda648798 100644 --- a/l3kernel/testfiles/d3pdfmode.uptex.tlg +++ b/l3kernel/testfiles/d3pdfmode.uptex.tlg @@ -7,7 +7,10 @@ TEST 1: Clip box > \box...= \hbox(6.94444+1.0)x86.45851 .\special{ps:gsave} -.\special{ps:currentpoint currentpoint translate matrix currentmatrix Resolutio\ETC.} +.\special{ps:currentpoint} +.\special{ps:currentpoint translate} +.\special{ps:matrix currentmatrix Resolution 72 div VResolution 72 div scale DV\ETC.} +.\special{ps:neg exch neg exch translate} .\hbox(6.94444+1.0)x0.0, glue set - 86.45851fil ..\hbox(6.94444+1.0)x86.45851 ...\OT1/cmr/m/n/10 G @@ -37,7 +40,10 @@ l. ... } > \box...= \hbox(6.94444+0.0)x86.45851 .\special{ps:gsave} -.\special{ps:currentpoint currentpoint translate matrix currentmatrix Resolutio\ETC.} +.\special{ps:currentpoint} +.\special{ps:currentpoint translate} +.\special{ps:matrix currentmatrix Resolution 72 div VResolution 72 div scale DV\ETC.} +.\special{ps:neg exch neg exch translate} .\hbox(6.94444+0.0)x0.0, glue set - 86.45851fil ..\hbox(6.94444+0.0)x86.45851 ...\OT1/cmr/m/n/10 G @@ -67,7 +73,10 @@ l. ... } > \box...= \hbox(6.94444+1.0)x86.45851 .\special{ps:gsave} -.\special{ps:currentpoint currentpoint translate matrix currentmatrix Resolutio\ETC.} +.\special{ps:currentpoint} +.\special{ps:currentpoint translate} +.\special{ps:matrix currentmatrix Resolution 72 div VResolution 72 div scale DV\ETC.} +.\special{ps:neg exch neg exch translate} .\hbox(6.94444+1.0)x0.0, glue set - 86.45851fil ..\hbox(6.94444+1.0)x86.45851 ...\OT1/cmr/m/n/10 G @@ -97,7 +106,10 @@ l. ... } > \box...= \hbox(6.94444+1.94444)x20.0 .\special{ps:gsave} -.\special{ps:currentpoint currentpoint translate matrix currentmatrix Resolutio\ETC.} +.\special{ps:currentpoint} +.\special{ps:currentpoint translate} +.\special{ps:matrix currentmatrix Resolution 72 div VResolution 72 div scale DV\ETC.} +.\special{ps:neg exch neg exch translate} .\hbox(6.94444+1.94444)x0.0, glue set - 20.0fil ..\hbox(6.94444+1.94444)x20.0 ...\OT1/cmr/m/n/10 G @@ -151,7 +163,10 @@ l. ... } ..\kern 0.0 ..\hbox(6.94444+0.0)x50.02786 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate 0 rotate neg exch neg exch tra\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:0 rotate} +...\special{ps:neg exch neg exch translate} ...\hbox(6.94444+0.0)x50.02786 ....\hbox(6.94444+0.0)x50.02786 .....\OT1/cmr/m/n/10 H @@ -176,7 +191,10 @@ l. ... } ..\kern 3.47223 ..\hbox(6.94444+0.0)x50.02786 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate -30 rotate neg exch neg exch t\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:-30 rotate} +...\special{ps:neg exch neg exch translate} ...\hbox(6.94444+0.0)x50.02786 ....\hbox(6.94444+0.0)x50.02786 .....\OT1/cmr/m/n/10 H @@ -201,7 +219,10 @@ l. ... } ..\kern 4.91046 ..\hbox(6.94444+0.0)x50.02786 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch t\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:-45 rotate} +...\special{ps:neg exch neg exch translate} ...\hbox(6.94444+0.0)x50.02786 ....\hbox(6.94444+0.0)x50.02786 .....\OT1/cmr/m/n/10 H @@ -226,7 +247,10 @@ l. ... } ..\kern 40.2855 ..\hbox(6.94444+0.0)x50.02786 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate -135 rotate neg exch neg exch \ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:-135 rotate} +...\special{ps:neg exch neg exch translate} ...\hbox(6.94444+0.0)x50.02786 ....\hbox(6.94444+0.0)x50.02786 .....\OT1/cmr/m/n/10 H @@ -251,7 +275,10 @@ l. ... } ..\kern 35.37505 ..\hbox(6.94444+0.0)x50.02786 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate -225 rotate neg exch neg exch \ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:-225 rotate} +...\special{ps:neg exch neg exch translate} ...\hbox(6.94444+0.0)x50.02786 ....\hbox(6.94444+0.0)x50.02786 .....\OT1/cmr/m/n/10 H @@ -276,7 +303,10 @@ l. ... } ..\kern 0.0 ..\hbox(6.94444+0.0)x50.02786 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate -315 rotate neg exch neg exch \ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:-315 rotate} +...\special{ps:neg exch neg exch translate} ...\hbox(6.94444+0.0)x50.02786 ....\hbox(6.94444+0.0)x50.02786 .....\OT1/cmr/m/n/10 H @@ -301,14 +331,20 @@ l. ... } ..\kern 28.48616 ..\hbox(40.2855+0.0)x40.2855 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch t\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:-45 rotate} +...\special{ps:neg exch neg exch translate} ...\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)x50.02786 .......\special{ps:gsave} -.......\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch t\ETC.} +.......\special{ps:currentpoint} +.......\special{ps:currentpoint translate} +.......\special{ps:-45 rotate} +.......\special{ps:neg exch neg exch translate} .......\hbox(6.94444+0.0)x50.02786 ........\hbox(6.94444+0.0)x50.02786 .........\OT1/cmr/m/n/10 H @@ -355,7 +391,10 @@ l. ... } ..\kern 0.0 ..\hbox(6.94444+0.0)x50.02786 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate 1 1 scale neg exch neg exch tr\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:1 1 scale} +...\special{ps:neg exch neg exch translate} ...\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 +421,10 @@ l. ... } ..\kern 0.0 ..\hbox(6.94444+0.0)x125.06966 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate 2.5 1 scale neg exch neg exch \ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:2.5 1 scale} +...\special{ps:neg exch neg exch translate} ...\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 +451,10 @@ l. ... } ..\kern 0.0 ..\hbox(2.31477+0.0)x50.02786 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate 1 0.33333 scale neg exch neg e\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:1 0.33333 scale} +...\special{ps:neg exch neg exch translate} ...\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 +481,10 @@ l. ... } ..\kern 0.0 ..\hbox(6.94444+1.94444)x103.61133 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate 1 1 scale neg exch neg exch tr\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:1 1 scale} +...\special{ps:neg exch neg exch translate} ...\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 +522,10 @@ l. ... } ..\kern 0.0 ..\hbox(20.83333+5.83333)x310.83398 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate 3 3 scale neg exch neg exch tr\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:3 3 scale} +...\special{ps:neg exch neg exch translate} ...\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 +563,10 @@ l. ... } ..\kern 310.83398 ..\hbox(5.83333+20.83333)x0.0 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate -3 -3 scale neg exch neg exch \ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:-3 -3 scale} +...\special{ps:neg exch neg exch translate} ...\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.ptex.tlg b/l3kernel/testfiles/d3xdvipdfmx.ptex.tlg index 0a8133943e..eeda648798 100644 --- a/l3kernel/testfiles/d3xdvipdfmx.ptex.tlg +++ b/l3kernel/testfiles/d3xdvipdfmx.ptex.tlg @@ -7,7 +7,10 @@ TEST 1: Clip box > \box...= \hbox(6.94444+1.0)x86.45851 .\special{ps:gsave} -.\special{ps:currentpoint currentpoint translate matrix currentmatrix Resolutio\ETC.} +.\special{ps:currentpoint} +.\special{ps:currentpoint translate} +.\special{ps:matrix currentmatrix Resolution 72 div VResolution 72 div scale DV\ETC.} +.\special{ps:neg exch neg exch translate} .\hbox(6.94444+1.0)x0.0, glue set - 86.45851fil ..\hbox(6.94444+1.0)x86.45851 ...\OT1/cmr/m/n/10 G @@ -37,7 +40,10 @@ l. ... } > \box...= \hbox(6.94444+0.0)x86.45851 .\special{ps:gsave} -.\special{ps:currentpoint currentpoint translate matrix currentmatrix Resolutio\ETC.} +.\special{ps:currentpoint} +.\special{ps:currentpoint translate} +.\special{ps:matrix currentmatrix Resolution 72 div VResolution 72 div scale DV\ETC.} +.\special{ps:neg exch neg exch translate} .\hbox(6.94444+0.0)x0.0, glue set - 86.45851fil ..\hbox(6.94444+0.0)x86.45851 ...\OT1/cmr/m/n/10 G @@ -67,7 +73,10 @@ l. ... } > \box...= \hbox(6.94444+1.0)x86.45851 .\special{ps:gsave} -.\special{ps:currentpoint currentpoint translate matrix currentmatrix Resolutio\ETC.} +.\special{ps:currentpoint} +.\special{ps:currentpoint translate} +.\special{ps:matrix currentmatrix Resolution 72 div VResolution 72 div scale DV\ETC.} +.\special{ps:neg exch neg exch translate} .\hbox(6.94444+1.0)x0.0, glue set - 86.45851fil ..\hbox(6.94444+1.0)x86.45851 ...\OT1/cmr/m/n/10 G @@ -97,7 +106,10 @@ l. ... } > \box...= \hbox(6.94444+1.94444)x20.0 .\special{ps:gsave} -.\special{ps:currentpoint currentpoint translate matrix currentmatrix Resolutio\ETC.} +.\special{ps:currentpoint} +.\special{ps:currentpoint translate} +.\special{ps:matrix currentmatrix Resolution 72 div VResolution 72 div scale DV\ETC.} +.\special{ps:neg exch neg exch translate} .\hbox(6.94444+1.94444)x0.0, glue set - 20.0fil ..\hbox(6.94444+1.94444)x20.0 ...\OT1/cmr/m/n/10 G @@ -151,7 +163,10 @@ l. ... } ..\kern 0.0 ..\hbox(6.94444+0.0)x50.02786 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate 0 rotate neg exch neg exch tra\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:0 rotate} +...\special{ps:neg exch neg exch translate} ...\hbox(6.94444+0.0)x50.02786 ....\hbox(6.94444+0.0)x50.02786 .....\OT1/cmr/m/n/10 H @@ -176,7 +191,10 @@ l. ... } ..\kern 3.47223 ..\hbox(6.94444+0.0)x50.02786 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate -30 rotate neg exch neg exch t\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:-30 rotate} +...\special{ps:neg exch neg exch translate} ...\hbox(6.94444+0.0)x50.02786 ....\hbox(6.94444+0.0)x50.02786 .....\OT1/cmr/m/n/10 H @@ -201,7 +219,10 @@ l. ... } ..\kern 4.91046 ..\hbox(6.94444+0.0)x50.02786 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch t\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:-45 rotate} +...\special{ps:neg exch neg exch translate} ...\hbox(6.94444+0.0)x50.02786 ....\hbox(6.94444+0.0)x50.02786 .....\OT1/cmr/m/n/10 H @@ -226,7 +247,10 @@ l. ... } ..\kern 40.2855 ..\hbox(6.94444+0.0)x50.02786 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate -135 rotate neg exch neg exch \ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:-135 rotate} +...\special{ps:neg exch neg exch translate} ...\hbox(6.94444+0.0)x50.02786 ....\hbox(6.94444+0.0)x50.02786 .....\OT1/cmr/m/n/10 H @@ -251,7 +275,10 @@ l. ... } ..\kern 35.37505 ..\hbox(6.94444+0.0)x50.02786 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate -225 rotate neg exch neg exch \ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:-225 rotate} +...\special{ps:neg exch neg exch translate} ...\hbox(6.94444+0.0)x50.02786 ....\hbox(6.94444+0.0)x50.02786 .....\OT1/cmr/m/n/10 H @@ -276,7 +303,10 @@ l. ... } ..\kern 0.0 ..\hbox(6.94444+0.0)x50.02786 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate -315 rotate neg exch neg exch \ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:-315 rotate} +...\special{ps:neg exch neg exch translate} ...\hbox(6.94444+0.0)x50.02786 ....\hbox(6.94444+0.0)x50.02786 .....\OT1/cmr/m/n/10 H @@ -301,14 +331,20 @@ l. ... } ..\kern 28.48616 ..\hbox(40.2855+0.0)x40.2855 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch t\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:-45 rotate} +...\special{ps:neg exch neg exch translate} ...\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)x50.02786 .......\special{ps:gsave} -.......\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch t\ETC.} +.......\special{ps:currentpoint} +.......\special{ps:currentpoint translate} +.......\special{ps:-45 rotate} +.......\special{ps:neg exch neg exch translate} .......\hbox(6.94444+0.0)x50.02786 ........\hbox(6.94444+0.0)x50.02786 .........\OT1/cmr/m/n/10 H @@ -355,7 +391,10 @@ l. ... } ..\kern 0.0 ..\hbox(6.94444+0.0)x50.02786 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate 1 1 scale neg exch neg exch tr\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:1 1 scale} +...\special{ps:neg exch neg exch translate} ...\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 +421,10 @@ l. ... } ..\kern 0.0 ..\hbox(6.94444+0.0)x125.06966 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate 2.5 1 scale neg exch neg exch \ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:2.5 1 scale} +...\special{ps:neg exch neg exch translate} ...\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 +451,10 @@ l. ... } ..\kern 0.0 ..\hbox(2.31477+0.0)x50.02786 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate 1 0.33333 scale neg exch neg e\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:1 0.33333 scale} +...\special{ps:neg exch neg exch translate} ...\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 +481,10 @@ l. ... } ..\kern 0.0 ..\hbox(6.94444+1.94444)x103.61133 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate 1 1 scale neg exch neg exch tr\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:1 1 scale} +...\special{ps:neg exch neg exch translate} ...\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 +522,10 @@ l. ... } ..\kern 0.0 ..\hbox(20.83333+5.83333)x310.83398 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate 3 3 scale neg exch neg exch tr\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:3 3 scale} +...\special{ps:neg exch neg exch translate} ...\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 +563,10 @@ l. ... } ..\kern 310.83398 ..\hbox(5.83333+20.83333)x0.0 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate -3 -3 scale neg exch neg exch \ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:-3 -3 scale} +...\special{ps:neg exch neg exch translate} ...\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.uptex.tlg b/l3kernel/testfiles/d3xdvipdfmx.uptex.tlg index 0a8133943e..eeda648798 100644 --- a/l3kernel/testfiles/d3xdvipdfmx.uptex.tlg +++ b/l3kernel/testfiles/d3xdvipdfmx.uptex.tlg @@ -7,7 +7,10 @@ TEST 1: Clip box > \box...= \hbox(6.94444+1.0)x86.45851 .\special{ps:gsave} -.\special{ps:currentpoint currentpoint translate matrix currentmatrix Resolutio\ETC.} +.\special{ps:currentpoint} +.\special{ps:currentpoint translate} +.\special{ps:matrix currentmatrix Resolution 72 div VResolution 72 div scale DV\ETC.} +.\special{ps:neg exch neg exch translate} .\hbox(6.94444+1.0)x0.0, glue set - 86.45851fil ..\hbox(6.94444+1.0)x86.45851 ...\OT1/cmr/m/n/10 G @@ -37,7 +40,10 @@ l. ... } > \box...= \hbox(6.94444+0.0)x86.45851 .\special{ps:gsave} -.\special{ps:currentpoint currentpoint translate matrix currentmatrix Resolutio\ETC.} +.\special{ps:currentpoint} +.\special{ps:currentpoint translate} +.\special{ps:matrix currentmatrix Resolution 72 div VResolution 72 div scale DV\ETC.} +.\special{ps:neg exch neg exch translate} .\hbox(6.94444+0.0)x0.0, glue set - 86.45851fil ..\hbox(6.94444+0.0)x86.45851 ...\OT1/cmr/m/n/10 G @@ -67,7 +73,10 @@ l. ... } > \box...= \hbox(6.94444+1.0)x86.45851 .\special{ps:gsave} -.\special{ps:currentpoint currentpoint translate matrix currentmatrix Resolutio\ETC.} +.\special{ps:currentpoint} +.\special{ps:currentpoint translate} +.\special{ps:matrix currentmatrix Resolution 72 div VResolution 72 div scale DV\ETC.} +.\special{ps:neg exch neg exch translate} .\hbox(6.94444+1.0)x0.0, glue set - 86.45851fil ..\hbox(6.94444+1.0)x86.45851 ...\OT1/cmr/m/n/10 G @@ -97,7 +106,10 @@ l. ... } > \box...= \hbox(6.94444+1.94444)x20.0 .\special{ps:gsave} -.\special{ps:currentpoint currentpoint translate matrix currentmatrix Resolutio\ETC.} +.\special{ps:currentpoint} +.\special{ps:currentpoint translate} +.\special{ps:matrix currentmatrix Resolution 72 div VResolution 72 div scale DV\ETC.} +.\special{ps:neg exch neg exch translate} .\hbox(6.94444+1.94444)x0.0, glue set - 20.0fil ..\hbox(6.94444+1.94444)x20.0 ...\OT1/cmr/m/n/10 G @@ -151,7 +163,10 @@ l. ... } ..\kern 0.0 ..\hbox(6.94444+0.0)x50.02786 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate 0 rotate neg exch neg exch tra\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:0 rotate} +...\special{ps:neg exch neg exch translate} ...\hbox(6.94444+0.0)x50.02786 ....\hbox(6.94444+0.0)x50.02786 .....\OT1/cmr/m/n/10 H @@ -176,7 +191,10 @@ l. ... } ..\kern 3.47223 ..\hbox(6.94444+0.0)x50.02786 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate -30 rotate neg exch neg exch t\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:-30 rotate} +...\special{ps:neg exch neg exch translate} ...\hbox(6.94444+0.0)x50.02786 ....\hbox(6.94444+0.0)x50.02786 .....\OT1/cmr/m/n/10 H @@ -201,7 +219,10 @@ l. ... } ..\kern 4.91046 ..\hbox(6.94444+0.0)x50.02786 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch t\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:-45 rotate} +...\special{ps:neg exch neg exch translate} ...\hbox(6.94444+0.0)x50.02786 ....\hbox(6.94444+0.0)x50.02786 .....\OT1/cmr/m/n/10 H @@ -226,7 +247,10 @@ l. ... } ..\kern 40.2855 ..\hbox(6.94444+0.0)x50.02786 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate -135 rotate neg exch neg exch \ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:-135 rotate} +...\special{ps:neg exch neg exch translate} ...\hbox(6.94444+0.0)x50.02786 ....\hbox(6.94444+0.0)x50.02786 .....\OT1/cmr/m/n/10 H @@ -251,7 +275,10 @@ l. ... } ..\kern 35.37505 ..\hbox(6.94444+0.0)x50.02786 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate -225 rotate neg exch neg exch \ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:-225 rotate} +...\special{ps:neg exch neg exch translate} ...\hbox(6.94444+0.0)x50.02786 ....\hbox(6.94444+0.0)x50.02786 .....\OT1/cmr/m/n/10 H @@ -276,7 +303,10 @@ l. ... } ..\kern 0.0 ..\hbox(6.94444+0.0)x50.02786 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate -315 rotate neg exch neg exch \ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:-315 rotate} +...\special{ps:neg exch neg exch translate} ...\hbox(6.94444+0.0)x50.02786 ....\hbox(6.94444+0.0)x50.02786 .....\OT1/cmr/m/n/10 H @@ -301,14 +331,20 @@ l. ... } ..\kern 28.48616 ..\hbox(40.2855+0.0)x40.2855 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch t\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:-45 rotate} +...\special{ps:neg exch neg exch translate} ...\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)x50.02786 .......\special{ps:gsave} -.......\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch t\ETC.} +.......\special{ps:currentpoint} +.......\special{ps:currentpoint translate} +.......\special{ps:-45 rotate} +.......\special{ps:neg exch neg exch translate} .......\hbox(6.94444+0.0)x50.02786 ........\hbox(6.94444+0.0)x50.02786 .........\OT1/cmr/m/n/10 H @@ -355,7 +391,10 @@ l. ... } ..\kern 0.0 ..\hbox(6.94444+0.0)x50.02786 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate 1 1 scale neg exch neg exch tr\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:1 1 scale} +...\special{ps:neg exch neg exch translate} ...\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 +421,10 @@ l. ... } ..\kern 0.0 ..\hbox(6.94444+0.0)x125.06966 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate 2.5 1 scale neg exch neg exch \ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:2.5 1 scale} +...\special{ps:neg exch neg exch translate} ...\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 +451,10 @@ l. ... } ..\kern 0.0 ..\hbox(2.31477+0.0)x50.02786 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate 1 0.33333 scale neg exch neg e\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:1 0.33333 scale} +...\special{ps:neg exch neg exch translate} ...\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 +481,10 @@ l. ... } ..\kern 0.0 ..\hbox(6.94444+1.94444)x103.61133 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate 1 1 scale neg exch neg exch tr\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:1 1 scale} +...\special{ps:neg exch neg exch translate} ...\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 +522,10 @@ l. ... } ..\kern 0.0 ..\hbox(20.83333+5.83333)x310.83398 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate 3 3 scale neg exch neg exch tr\ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:3 3 scale} +...\special{ps:neg exch neg exch translate} ...\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 +563,10 @@ l. ... } ..\kern 310.83398 ..\hbox(5.83333+20.83333)x0.0 ...\special{ps:gsave} -...\special{ps:currentpoint currentpoint translate -3 -3 scale neg exch neg exch \ETC.} +...\special{ps:currentpoint} +...\special{ps:currentpoint translate} +...\special{ps:-3 -3 scale} +...\special{ps:neg exch neg exch translate} ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil ....\hbox(6.94444+1.94444)x103.61133 .....\OT1/cmr/m/n/10 T