[latex3-commits] [git/LaTeX3-latex3-luaotfload] dev: Adjust tests for new color handling (f64ab52)

[Marcel Fabian Krüger]

Repository : https://github.com/latex3/luaotfload
On branch  : dev
Link       : https://github.com/latex3/luaotfload/commit/f64ab52ff7e5484e64e126fe13cdffe64f13f96b

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

commit f64ab52ff7e5484e64e126fe13cdffe64f13f96b
Author: Marcel Fabian Krüger <tex at 2krueger.de>
Date:   Fri Feb 21 21:42:45 2020 +0100

    Adjust tests for new color handling


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

f64ab52ff7e5484e64e126fe13cdffe64f13f96b
 testfiles-harf/color.tlg |  5 +++--
 testfiles/color.tlg      | 39 +++++++++++++++------------------------
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/testfiles-harf/color.tlg b/testfiles-harf/color.tlg
index 7eeafeb..c7a4d4d 100644
--- a/testfiles-harf/color.tlg
+++ b/testfiles-harf/color.tlg
@@ -46,7 +46,8 @@ Completed box being shipped out [1]
 ....\TU/Amiri(0)/m/n/10 "ب" 120BF8 +0:+0
 ....\TU/Amiri(0)/m/n/10 "ي" 120EA5 +0:+0
 ....\glue(\spaceskip) 2.92 plus 1.46 minus 0.97333
-....\pdfcolorstack 0 push {/TransGs0.502 gs 1 0 0 rg}
+....\pdfcolorstack 0 push {1 0 0 rg}
+....\pdfcolorstack 1 push {/TransGs0.502 gs}
 ....\TU/Amiri(1)/m/n/10 "ت" 120808 +0:+0
 ....\TU/Amiri(1)/m/n/10 "ل" 120914 +0:+0
 ....\TU/Amiri(1)/m/n/10 "و" 12098B +0:+0
@@ -57,7 +58,7 @@ Completed box being shipped out [1]
 ....\TU/Amiri(1)/m/n/10 "ه" 1208D2 +0:+0
 ....\glue(\spaceskip) 2.92 plus 1.46 minus 0.97333
 ....\pdfcolorstack 0 pop
-....\pdfliteral direct <lua data reference ...>
+....\pdfcolorstack 1 pop
 ....\TU/Amiri(0)/m/n/10 "ب" 120815 +0:+0
 ....\TU/Amiri(0)/m/n/10 "ل" 120914 +0:+0
 ....\TU/Amiri(0)/m/n/10 "و" 12098B +0:+0
diff --git a/testfiles/color.tlg b/testfiles/color.tlg
index 9f8a391..0a9b9a9 100644
--- a/testfiles/color.tlg
+++ b/testfiles/color.tlg
@@ -118,19 +118,17 @@ Completed box being shipped out [1]
 ....\pdfcolorstack 0 push {1 0 1 rg}
 ....\TU/STIXTwoMath(1)/m/n/10 1
 ....\glue(\medmuskip) 2.22198 plus 1.111 minus 2.22198
-....\pdfcolorstack 0 pop
-....\pdfcolorstack 0 push {/TransGs0.471 gs 0.0706 0.204 0.337 rg}
+....\pdfcolorstack 0 set {0.0706 0.204 0.337 rg}
+....\pdfcolorstack 1 push {/TransGs0.471 gs}
 ....\TU/STIXTwoMath(1)/m/n/10 +
 ....\glue(\medmuskip) 2.22198 plus 1.111 minus 2.22198
-....\pdfcolorstack 0 pop
-....\pdfliteral direct <lua data reference ...>
-....\pdfcolorstack 0 push {0 0 1 rg}
+....\pdfcolorstack 0 set {0 0 1 rg}
+....\pdfcolorstack 1 pop
 ....\TU/STIXTwoMath(1)/m/n/10 2
 ....\glue(\thickmuskip) 2.77748 plus 2.77748
 ....\TU/STIXTwoMath(1)/m/n/10 ≠
 ....\glue(\thickmuskip) 2.77748 plus 2.77748
-....\pdfcolorstack 0 pop
-....\pdfcolorstack 0 push {1 0 1 rg}
+....\pdfcolorstack 0 set {1 0 1 rg}
 ....\TU/STIXTwoMath(1)/m/n/10 3
 ....\pdfcolorstack 0 pop
 ...\penalty 0
@@ -146,8 +144,7 @@ Completed box being shipped out [1]
 ....\TU/STIXTwoText(0)/m/n/10 i
 ....\TU/STIXTwoText(0)/m/n/10 n
 ....\glue(\spaceskip) 2.35 plus 1.175 minus 0.78334
-....\pdfcolorstack 0 pop
-....\pdfcolorstack 0 push {1 0 0 rg}
+....\pdfcolorstack 0 set {1 0 0 rg}
 ....\TU/STIXTwoText(2)/m/n/10 d
 ....\TU/STIXTwoText(2)/m/n/10 i
 ....\discretionary (penalty 50)
@@ -165,8 +162,7 @@ Completed box being shipped out [1]
 ....\TU/STIXTwoText(2)/m/n/10 n
 ....\TU/STIXTwoText(2)/m/n/10 t
 ....\glue(\spaceskip) 2.35 plus 1.175 minus 0.78334
-....\pdfcolorstack 0 pop
-....\pdfcolorstack 0 push {0 0 1 rg}
+....\pdfcolorstack 0 set {0 0 1 rg}
 ....\TU/STIXTwoText(3)/m/n/10 c
 ....\TU/STIXTwoText(3)/m/n/10 o
 ....\TU/STIXTwoText(3)/m/n/10 l
@@ -175,8 +171,7 @@ Completed box being shipped out [1]
 ....\TU/STIXTwoText(3)/m/n/10 o
 ....\TU/STIXTwoText(3)/m/n/10 r
 ....\TU/STIXTwoText(3)/m/n/10 s
-....\pdfcolorstack 0 pop
-....\pdfcolorstack 0 push {0 1 0 rg}
+....\pdfcolorstack 0 set {0 1 0 rg}
 ....\TU/STIXTwoText(0)/m/n/10 .
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
@@ -228,19 +223,17 @@ Completed box being shipped out [1]
 .....\pdfcolorstack 0 push {1 0 1 rg}
 .....\TU/STIXTwoMath(1)/m/n/10 1
 .....\glue(\medmuskip) 2.22198 plus 1.111 minus 2.22198
-.....\pdfcolorstack 0 pop
-.....\pdfcolorstack 0 push {/TransGs0.471 gs 0.0706 0.204 0.337 rg}
+.....\pdfcolorstack 0 set {0.0706 0.204 0.337 rg}
+.....\pdfcolorstack 1 push {/TransGs0.471 gs}
 .....\TU/STIXTwoMath(1)/m/n/10 +
 .....\glue(\medmuskip) 2.22198 plus 1.111 minus 2.22198
-.....\pdfcolorstack 0 pop
-.....\pdfliteral direct <lua data reference ...>
-.....\pdfcolorstack 0 push {0 0 1 rg}
+.....\pdfcolorstack 0 set {0 0 1 rg}
+.....\pdfcolorstack 1 pop
 .....\TU/STIXTwoMath(1)/m/n/10 2
 .....\glue(\thickmuskip) 2.77748 plus 2.77748
 .....\TU/STIXTwoMath(1)/m/n/10 ≠
 .....\glue(\thickmuskip) 2.77748 plus 2.77748
-.....\pdfcolorstack 0 pop
-.....\pdfcolorstack 0 push {1 0 1 rg}
+.....\pdfcolorstack 0 set {1 0 1 rg}
 .....\TU/STIXTwoMath(1)/m/n/10 3
 .....\pdfcolorstack 0 pop
 ....\penalty 0
@@ -256,8 +249,7 @@ Completed box being shipped out [1]
 .....\TU/STIXTwoText(0)/m/n/10 i
 .....\TU/STIXTwoText(0)/m/n/10 n
 .....\glue(\spaceskip) 2.35 plus 1.175 minus 0.78334
-.....\pdfcolorstack 0 pop
-.....\pdfcolorstack 0 push {1 0 0 rg}
+.....\pdfcolorstack 0 set {1 0 0 rg}
 .....\TU/STIXTwoText(2)/m/n/10 d
 .....\TU/STIXTwoText(2)/m/n/10 i
 .....\discretionary (penalty 50)
@@ -275,8 +267,7 @@ Completed box being shipped out [1]
 .....\TU/STIXTwoText(2)/m/n/10 n
 .....\TU/STIXTwoText(2)/m/n/10 t
 .....\glue(\spaceskip) 2.35 plus 1.175 minus 0.78334
-.....\pdfcolorstack 0 pop
-.....\pdfcolorstack 0 push {0 0 1 rg}
+.....\pdfcolorstack 0 set {0 0 1 rg}
 .....\TU/STIXTwoText(3)/m/n/10 c
 .....\TU/STIXTwoText(3)/m/n/10 o
 .....\TU/STIXTwoText(3)/m/n/10 l