Adjust testfiles

latex3 · Jul 24, 2022 · ca5dd83 · ca5dd83
1 parent 4cd0015
commit ca5dd83
Show file tree

Hide file tree

Showing 20 changed files with 94 additions and 94 deletions.
diff --git a/testfiles/aff-group.luatex.tlg b/testfiles/aff-group.luatex.tlg
@@ -6,13 +6,13 @@ TU/texgyretermes-regular.otf(0)/m/n:
   [texgyretermes-regular.otf]:mode=node;script=latn;language=dflt;+tlig;
 Adding a colour:
 TU/texgyretermes-regular.otf(1)/m/n:
-  "[texgyretermes-regular.otf]:mode=node;script=latn;language=dflt;+tlig;color=AA00AAFF ;"
+  [texgyretermes-regular.otf]:mode=node;script=latn;language=dflt;+tlig;color={AA00AA};
 Back to normalfont:
 TU/texgyretermes-regular.otf(0)/m/n:
   [texgyretermes-regular.otf]:mode=node;script=latn;language=dflt;+tlig;
 Open group and add a different colour:
 TU/texgyretermes-regular.otf(2)/m/n:
-  "[texgyretermes-regular.otf]:mode=node;script=latn;language=dflt;+tlig;color=00AAAAFF ;"
+  [texgyretermes-regular.otf]:mode=node;script=latn;language=dflt;+tlig;color={00AAAA};
 End the group:
 TU/texgyretermes-regular.otf(0)/m/n:
   [texgyretermes-regular.otf]:mode=node;script=latn;language=dflt;+tlig;
@@ -21,17 +21,17 @@ The following demonstrates strange behaviour to be wary of.
 TU/texgyrepagella-regular.otf(0)/m/n:
   [texgyrepagella-regular.otf]:mode=node;script=latn;language=dflt;+tlig;
 TU/texgyrepagella-regular.otf(0)/m/n:
-  "[texgyrepagella-regular.otf]:mode=node;script=latn;language=dflt;+tlig;color=AA00AAFF ;"
+  [texgyrepagella-regular.otf]:mode=node;script=latn;language=dflt;+tlig;color={AA00AA};
 TU/texgyrepagella-regular.otf(0)/m/n:
-  "[texgyrepagella-regular.otf]:mode=node;script=latn;language=dflt;+tlig;color=AA00AAFF ;"
+  [texgyrepagella-regular.otf]:mode=node;script=latn;language=dflt;+tlig;color={AA00AA};
 ============================================================
 And check NFSSFamily use inside a group.
 Reload another font:
 TU/texgyreheros-regular.otf(0)/m/n:
   [texgyreheros-regular.otf]:mode=node;script=latn;language=dflt;+tlig;
 Open group and add a different colour, without changing family:
 TU/texgyreheros-regular.otf(0)/m/n:
-  "[texgyreheros-regular.otf]:mode=node;script=latn;language=dflt;+tlig;color=00AAAAFF ;"
+  [texgyreheros-regular.otf]:mode=node;script=latn;language=dflt;+tlig;color={00AAAA};
 End the group:
 TU/texgyreheros-regular.otf(0)/m/n:
   [texgyreheros-regular.otf]:mode=node;script=latn;language=dflt;+tlig;

diff --git a/testfiles/aff-italic-only.luatex.tlg b/testfiles/aff-italic-only.luatex.tlg
@@ -6,9 +6,9 @@ TU/texgyrepagella(0)/m/n:
 TU/texgyrepagella(0)/m/sc:
   [texgyrepagella-regular.otf]:mode=node;script=latn;language=dflt;+tlig;+smcp;
 TU/texgyrepagella(0)/m/it:
-  "[texgyrepagella-italic.otf]:mode=node;script=latn;language=dflt;+tlig;color=AA0000FF ;"
+  [texgyrepagella-italic.otf]:mode=node;script=latn;language=dflt;+tlig;color={AA0000};
 TU/texgyrepagella(0)/m/scit:
-  "[texgyrepagella-italic.otf]:mode=node;script=latn;language=dflt;+tlig;+smcp;color=AA0000FF ;"
+  [texgyrepagella-italic.otf]:mode=node;script=latn;language=dflt;+tlig;+smcp;color={AA0000};
 TU/texgyrepagella(0)/b/n:
   [texgyrepagella-bold.otf]:mode=node;script=latn;language=dflt;+tlig;
 TU/texgyrepagella(0)/b/sc:
@@ -23,9 +23,9 @@ TU/texgyrepagella(1)/m/n:
 TU/texgyrepagella(1)/m/sc:
   [texgyrepagella-regular.otf]:mode=node;script=latn;language=dflt;+tlig;+onum;+smcp;
 TU/texgyrepagella(1)/m/it:
-  "[texgyrepagella-italic.otf]:mode=node;script=latn;language=dflt;+tlig;+onum;color=AA0000FF ;"
+  [texgyrepagella-italic.otf]:mode=node;script=latn;language=dflt;+tlig;+onum;color={AA0000};
 TU/texgyrepagella(1)/m/scit:
-  "[texgyrepagella-italic.otf]:mode=node;script=latn;language=dflt;+tlig;+onum;+smcp;color=AA0000FF ;"
+  [texgyrepagella-italic.otf]:mode=node;script=latn;language=dflt;+tlig;+onum;+smcp;color={AA0000};
 TU/texgyrepagella(1)/b/n:
   [texgyrepagella-bold.otf]:mode=node;script=latn;language=dflt;+tlig;+onum;
 TU/texgyrepagella(1)/b/sc:
@@ -40,9 +40,9 @@ TU/texgyrepagella(2)/m/n:
 TU/texgyrepagella(2)/m/sc:
   [texgyrepagella-regular.otf]:mode=node;script=latn;language=dflt;+tlig;+smcp;
 TU/texgyrepagella(2)/m/it:
-  "[texgyrepagella-italic.otf]:mode=node;script=latn;language=dflt;+tlig;+onum;color=AA0000FF ;"
+  [texgyrepagella-italic.otf]:mode=node;script=latn;language=dflt;+tlig;+onum;color={AA0000};
 TU/texgyrepagella(2)/m/scit:
-  "[texgyrepagella-italic.otf]:mode=node;script=latn;language=dflt;+tlig;+onum;+smcp;color=AA0000FF ;"
+  [texgyrepagella-italic.otf]:mode=node;script=latn;language=dflt;+tlig;+onum;+smcp;color={AA0000};
 TU/texgyrepagella(2)/b/n:
   [texgyrepagella-bold.otf]:mode=node;script=latn;language=dflt;+tlig;
 TU/texgyrepagella(2)/b/sc:

diff --git a/testfiles/aff-sc-repeated.luatex.tlg b/testfiles/aff-sc-repeated.luatex.tlg
@@ -6,9 +6,9 @@ TU/texgyrepagella(0)/m/n:
 TU/texgyrepagella(0)/m/sc:
   [texgyrepagella-regular.otf]:mode=node;script=latn;language=dflt;+tlig;+smcp;
 TU/texgyrepagella(0)/m/it:
-  "[texgyrepagella-italic.otf]:mode=node;script=latn;language=dflt;+tlig;color=AA0000FF ;"
+  [texgyrepagella-italic.otf]:mode=node;script=latn;language=dflt;+tlig;color={AA0000};
 TU/texgyrepagella(0)/m/scit:
-  "[texgyrepagella-italic.otf]:mode=node;script=latn;language=dflt;+tlig;+smcp;color=AA0000FF ;"
+  [texgyrepagella-italic.otf]:mode=node;script=latn;language=dflt;+tlig;+smcp;color={AA0000};
 TU/texgyrepagella(0)/b/n:
   [texgyrepagella-bold.otf]:mode=node;script=latn;language=dflt;+tlig;
 TU/texgyrepagella(0)/b/sc:
@@ -23,9 +23,9 @@ TU/texgyrepagella(1)/m/n:
 TU/texgyrepagella(1)/m/sc:
   [texgyrepagella-regular.otf]:mode=node;script=latn;language=dflt;+tlig;+smcp;+onum;
 TU/texgyrepagella(1)/m/it:
-  "[texgyrepagella-italic.otf]:mode=node;script=latn;language=dflt;+tlig;color=AA0000FF ;"
+  [texgyrepagella-italic.otf]:mode=node;script=latn;language=dflt;+tlig;color={AA0000};
 TU/texgyrepagella(1)/m/scit:
-  "[texgyrepagella-italic.otf]:mode=node;script=latn;language=dflt;+tlig;+smcp;+pnum;color=AA0000FF ;"
+  [texgyrepagella-italic.otf]:mode=node;script=latn;language=dflt;+tlig;+smcp;+pnum;color={AA0000};
 TU/texgyrepagella(1)/b/n:
   [texgyrepagella-bold.otf]:mode=node;script=latn;language=dflt;+tlig;
 TU/texgyrepagella(1)/b/sc:

diff --git a/testfiles/colour-basic.luatex.tlg b/testfiles/colour-basic.luatex.tlg
@@ -4,12 +4,12 @@ Loading xcolor...
 ...done
 Loading a font with hex colour:
 TU/texgyreheros-regular.otf(0)/m/n:
-  "[texgyreheros-regular.otf]:mode=node;script=latn;language=dflt;color=5500FFFF ;"
+  [texgyreheros-regular.otf]:mode=node;script=latn;language=dflt;color={5500FF};
 Loading a font by name (xcolor):
 TU/texgyreheros-regular.otf(1)/m/n:
-  "[texgyreheros-regular.otf]:mode=node;script=latn;language=dflt;color=FF0000FF ;"
+  [texgyreheros-regular.otf]:mode=node;script=latn;language=dflt;color={red};
 Defining a new xcolor colour and using it:
 TU/texgyreheros-regular.otf(2)/m/n:
-  "[texgyreheros-regular.otf]:mode=node;script=latn;language=dflt;color=4D6680FF ;"
+  [texgyreheros-regular.otf]:mode=node;script=latn;language=dflt;color={Foo};
 ***************
 Compilation 1 of test file completed with exit status 0
diff --git a/testfiles/colour-opacity.luatex.tlg b/testfiles/colour-opacity.luatex.tlg
@@ -1,10 +1,10 @@
 This is a generated file for the l3build validation system.
 Don't change this file in any respect.
 TU/texgyreheros-regular.otf(0)/m/n:
-  "[texgyreheros-regular.otf]:mode=node;script=latn;language=dflt;color=FF0000FF ;"
+  [texgyreheros-regular.otf]:mode=node;script=latn;language=dflt;color={red};
 TU/texgyreheros-regular.otf(1)/m/n:
-  [texgyreheros-regular.otf]:mode=node;script=latn;language=dflt;color=FF00007f;
+  [texgyreheros-regular.otf]:mode=node;script=latn;language=dflt;color={red,7f};
 TU/texgyreheros-regular.otf(2)/m/n:
-  [texgyreheros-regular.otf]:mode=node;script=latn;language=dflt;color=00FF007f;
+  [texgyreheros-regular.otf]:mode=node;script=latn;language=dflt;color={00FF00,7f};
 ***************
 Compilation 1 of test file completed with exit status 0
diff --git a/testfiles/fontface-spaces.luatex.tlg b/testfiles/fontface-spaces.luatex.tlg
@@ -7,6 +7,6 @@ TU/texgyretermes-regular.otf(0)/m/it:
 TU/texgyretermes-regular.otf(0)/blub/it:
   [texgyrecursor-italic.otf]:mode=node;script=latn;language=dflt;+tlig;
 TU/texgyretermes-regular.otf(0)/c/n:
-  "[texgyrebonum-italic.otf]:mode=node;script=latn;language=dflt;+tlig;color=FF0000FF ;"
+  [texgyrebonum-italic.otf]:mode=node;script=latn;language=dflt;+tlig;color={FF0000};
 ***************
 Compilation 1 of test file completed with exit status 0
diff --git a/testfiles/fontload-defaults-adding.luatex.tlg b/testfiles/fontload-defaults-adding.luatex.tlg
@@ -4,30 +4,30 @@ Don't change this file in any respect.
 All font defaults
 =================
 TU/texgyrepagella-regular.otf(0)/m/n:
-  "[texgyrepagella-regular.otf]:mode=node;script=latn;language=dflt;+smcp;+tlig;color=00AA00FF ;"
+  [texgyrepagella-regular.otf]:mode=node;script=latn;language=dflt;+smcp;+tlig;color={00AA00};
 TU/texgyreheros-regular.otf(0)/m/n:
-  "[texgyreheros-regular.otf]:mode=node;script=latn;language=dflt;+smcp;+tlig;color=00AA00FF ;"
+  [texgyreheros-regular.otf]:mode=node;script=latn;language=dflt;+smcp;+tlig;color={00AA00};
 TU/texgyrepagella-regular.otf(1)/m/n:
   [texgyrepagella-regular.otf]:mode=node;script=latn;language=dflt;+tlig;
 TU/texgyreheros-regular.otf(1)/m/n:
   [texgyreheros-regular.otf]:mode=node;script=latn;language=dflt;+tlig;
 TU/texgyrepagella-regular.otf(2)/m/n:
   [texgyrepagella-regular.otf]:mode=node;script=latn;language=dflt;+smcp;+tlig;
 TU/texgyreheros-regular.otf(0)/m/n:
-  "[texgyreheros-regular.otf]:mode=node;script=latn;language=dflt;+smcp;+tlig;color=00AA00FF ;"
+  [texgyreheros-regular.otf]:mode=node;script=latn;language=dflt;+smcp;+tlig;color={00AA00};
 =================
 Family specific
 =================
 TU/texgyrepagella-regular.otf(3)/m/n:
-  "[texgyrepagella-regular.otf]:mode=node;script=latn;language=dflt;+smcp;color=00AA00FF ;"
+  [texgyrepagella-regular.otf]:mode=node;script=latn;language=dflt;+smcp;color={00AA00};
 TU/texgyreheros-regular.otf(1)/m/n:
   [texgyreheros-regular.otf]:mode=node;script=latn;language=dflt;+tlig;
 TU/texgyrepagella-regular.otf(4)/m/n:
   [texgyrepagella-regular.otf]:mode=node;script=latn;language=dflt;
 TU/texgyreheros-regular.otf(1)/m/n:
   [texgyreheros-regular.otf]:mode=node;script=latn;language=dflt;+tlig;
 TU/texgyrepagella-regular.otf(3)/m/n:
-  "[texgyrepagella-regular.otf]:mode=node;script=latn;language=dflt;+smcp;color=00AA00FF ;"
+  [texgyrepagella-regular.otf]:mode=node;script=latn;language=dflt;+smcp;color={00AA00};
 TU/texgyreheros-regular.otf(1)/m/n:
   [texgyreheros-regular.otf]:mode=node;script=latn;language=dflt;+tlig;
 ***************

diff --git a/testfiles/fontload-defaults.luatex.tlg b/testfiles/fontload-defaults.luatex.tlg
@@ -8,9 +8,9 @@ TU/texgyreheros-regular.otf(0)/m/n:
   [texgyreheros-regular.otf]:mode=node;script=latn;language=dflt;+tlig;
 TT:
 TU/texgyrecursor-regular.otf(0)/m/n:
-  "[texgyrecursor-regular.otf]:mode=node;script=latn;language=dflt;color=FF0000FF ;"
+  [texgyrecursor-regular.otf]:mode=node;script=latn;language=dflt;color={red};
 "CODE":
 TU/texgyrecursor-regular.otf(1)/m/n:
-  "[texgyrecursor-regular.otf]:mode=node;script=latn;language=dflt;color=0000FFFF ;"
+  [texgyrecursor-regular.otf]:mode=node;script=latn;language=dflt;color={blue};
 ***************
 Compilation 1 of test file completed with exit status 0
diff --git a/testfiles/fontload-fontface-1.luatex.tlg b/testfiles/fontload-fontface-1.luatex.tlg
@@ -3,7 +3,7 @@ Don't change this file in any respect.
 TU/texgyre(0)/m/n:
   [texgyrepagella-regular.otf]:mode=node;script=latn;language=dflt;+tlig;
 TU/texgyre(0)/c/n:
-  "[texgyrebonum-regular.otf]:mode=node;script=latn;language=dflt;+tlig;color=FF0000FF ;"
+  [texgyrebonum-regular.otf]:mode=node;script=latn;language=dflt;+tlig;color={FF0000};
 TU/texgyre(0)/nc/n:
   [texgyreheros-regular.otf]:mode=node;script=latn;language=dflt;+tlig;
 ***************

diff --git a/testfiles/fontload-fontface-2-sc.luatex.tlg b/testfiles/fontload-fontface-2-sc.luatex.tlg
@@ -6,24 +6,24 @@ TU/texgyrepagella-regular.otf(0)/m/n:
 TU/texgyrepagella-regular.otf(0)/m/sc:
   [texgyrepagella-regular.otf]:mode=node;script=latn;language=dflt;+tlig;+smcp;
 TU/texgyrepagella-regular.otf(0)/col1/n:
-  "[texgyrepagella-regular.otf]:mode=node;script=latn;language=dflt;+tlig;color=FF0000FF ;"
+  [texgyrepagella-regular.otf]:mode=node;script=latn;language=dflt;+tlig;color={FF0000};
 TU/texgyrepagella-regular.otf(0)/col1/sc:
-  "[texgyrepagella-regular.otf]:mode=node;script=latn;language=dflt;+tlig;+smcp;color=FF0000FF ;"
+  [texgyrepagella-regular.otf]:mode=node;script=latn;language=dflt;+tlig;+smcp;color={FF0000};
 TU/texgyrepagella-regular.otf(0)/col2/n:
-  "[texgyrepagella-regular.otf]:mode=node;script=latn;language=dflt;+tlig;color=0000FFFF ;"
+  [texgyrepagella-regular.otf]:mode=node;script=latn;language=dflt;+tlig;color={0000FF};
 TU/texgyrepagella-regular.otf(0)/col2/sc:
-  "[texgyrepagella-regular.otf]:mode=node;script=latn;language=dflt;+tlig;+smcp;color=0000FFFF ;"
+  [texgyrepagella-regular.otf]:mode=node;script=latn;language=dflt;+tlig;+smcp;color={0000FF};
 SHAPE (sc shapes not defined; falls back to default)
 TU/texgyrepagella-regular.otf(1)/m/n:
   [texgyrepagella-regular.otf]:mode=node;script=latn;language=dflt;+tlig;
 TU/texgyrepagella-regular.otf(1)/m/sc:
   [texgyrepagella-regular.otf]:mode=node;script=latn;language=dflt;+tlig;+smcp;
 TU/texgyrepagella-regular.otf(1)/m/col1:
-  "[texgyrepagella-regular.otf]:mode=node;script=latn;language=dflt;+tlig;color=FF0000FF ;"
+  [texgyrepagella-regular.otf]:mode=node;script=latn;language=dflt;+tlig;color={FF0000};
 TU/texgyrepagella-regular.otf(1)/m/sc:
   [texgyrepagella-regular.otf]:mode=node;script=latn;language=dflt;+tlig;+smcp;
 TU/texgyrepagella-regular.otf(1)/m/col2:
-  "[texgyrepagella-regular.otf]:mode=node;script=latn;language=dflt;+tlig;color=0000FFFF ;"
+  [texgyrepagella-regular.otf]:mode=node;script=latn;language=dflt;+tlig;color={0000FF};
 TU/texgyrepagella-regular.otf(1)/m/sc:
   [texgyrepagella-regular.otf]:mode=node;script=latn;language=dflt;+tlig;+smcp;
 ***************

diff --git a/testfiles/fontload-fontface-3-sizing.luatex.tlg b/testfiles/fontload-fontface-3-sizing.luatex.tlg
@@ -2,31 +2,31 @@ This is a generated file for the l3build validation system.
 Don't change this file in any respect.
 NORMAL
 TU/SourceCodePro-Regular.otf(0)/m/n:
-  "[SourceCodePro-Medium.otf]:mode=node;script=latn;language=dflt;+tlig;color=00AA00FF ;" at 5.0pt
+  [SourceCodePro-Medium.otf]:mode=node;script=latn;language=dflt;+tlig;color={00AA00}; at 5.0pt
 TU/SourceCodePro-Regular.otf(0)/m/n:
-  "[SourceCodePro-Regular.otf]:mode=node;script=latn;language=dflt;+tlig;color=00AA00FF ;"
+  [SourceCodePro-Regular.otf]:mode=node;script=latn;language=dflt;+tlig;color={00AA00};
 TU/SourceCodePro-Regular.otf(0)/m/n:
-  "[SourceCodePro-Light.otf]:mode=node;script=latn;language=dflt;+tlig;color=00AA00FF ;" at 24.88pt
+  [SourceCodePro-Light.otf]:mode=node;script=latn;language=dflt;+tlig;color={00AA00}; at 24.88pt
 ITALIC
 TU/SourceCodePro-Regular.otf(0)/m/it:
-  "[SourceCodePro-RegularIt.otf]:mode=node;script=latn;language=dflt;+tlig;color=00AA00FF ;" at 5.0pt
+  [SourceCodePro-RegularIt.otf]:mode=node;script=latn;language=dflt;+tlig;color={00AA00}; at 5.0pt
 TU/SourceCodePro-Regular.otf(0)/m/it:
-  "[SourceCodePro-RegularIt.otf]:mode=node;script=latn;language=dflt;+tlig;color=00AA00FF ;"
+  [SourceCodePro-RegularIt.otf]:mode=node;script=latn;language=dflt;+tlig;color={00AA00};
 TU/SourceCodePro-Regular.otf(0)/m/it:
-  "[SourceCodePro-RegularIt.otf]:mode=node;script=latn;language=dflt;+tlig;color=00AA00FF ;" at 24.88pt
+  [SourceCodePro-RegularIt.otf]:mode=node;script=latn;language=dflt;+tlig;color={00AA00}; at 24.88pt
 FONTSERIES C
 TU/SourceCodePro-Regular.otf(0)/c/n:
-  "[SourceCodePro-MediumIt.otf]:mode=node;script=latn;language=dflt;+tlig;color=FF0000FF ;" at 5.0pt
+  [SourceCodePro-MediumIt.otf]:mode=node;script=latn;language=dflt;+tlig;color={FF0000}; at 5.0pt
 TU/SourceCodePro-Regular.otf(0)/c/n:
-  "[texgyrecursor-regular.otf]:mode=node;script=latn;language=dflt;+tlig;color=FF00FFFF ;"
+  [texgyrecursor-regular.otf]:mode=node;script=latn;language=dflt;+tlig;color={FF00FF};
 TU/SourceCodePro-Regular.otf(0)/c/n:
-  "[SourceCodePro-LightIt.otf]:mode=node;script=latn;language=dflt;+tlig;color=0000FFFF ;" at 24.88pt
+  [SourceCodePro-LightIt.otf]:mode=node;script=latn;language=dflt;+tlig;color={0000FF}; at 24.88pt
 FONTSERIES NC
 TU/SourceCodePro-Regular.otf(0)/nc/n:
-  "[texgyreheros-regular.otf]:mode=node;script=latn;language=dflt;+tlig;color=00AA00FF ;" at 5.0pt
+  [texgyreheros-regular.otf]:mode=node;script=latn;language=dflt;+tlig;color={00AA00}; at 5.0pt
 TU/SourceCodePro-Regular.otf(0)/nc/n:
-  "[texgyreheros-regular.otf]:mode=node;script=latn;language=dflt;+tlig;color=00AA00FF ;"
+  [texgyreheros-regular.otf]:mode=node;script=latn;language=dflt;+tlig;color={00AA00};
 TU/SourceCodePro-Regular.otf(0)/nc/n:
-  "[texgyreheros-regular.otf]:mode=node;script=latn;language=dflt;+tlig;color=00AA00FF ;" at 24.88pt
+  [texgyreheros-regular.otf]:mode=node;script=latn;language=dflt;+tlig;color={00AA00}; at 24.88pt
 ***************
 Compilation 1 of test file completed with exit status 0
diff --git a/testfiles/fontload-fontspec-file-case.luatex.tlg b/testfiles/fontload-fontspec-file-case.luatex.tlg
@@ -2,12 +2,12 @@ This is a generated file for the l3build validation system.
 Don't change this file in any respect.
 Fira Sans:
 TU/FiraSans-Regular.otf(0)/m/n:
-  "[FiraSans-Regular.otf]:mode=node;script=latn;language=dflt;+tlig;color=AABBCCFF ;"
+  [FiraSans-Regular.otf]:mode=node;script=latn;language=dflt;+tlig;color={AABBCC};
 TU/FiraSans-Regular.otf(0)/m/it:
-  "[FiraSans-Italic.otf]:mode=node;script=latn;language=dflt;+tlig;color=AABBCCFF ;"
+  [FiraSans-Italic.otf]:mode=node;script=latn;language=dflt;+tlig;color={AABBCC};
 TU/FiraSans-Regular.otf(0)/b/n:
-  "[FiraSans-Bold.otf]:mode=node;script=latn;language=dflt;+tlig;color=AABBCCFF ;"
+  [FiraSans-Bold.otf]:mode=node;script=latn;language=dflt;+tlig;color={AABBCC};
 TU/FiraSans-Regular.otf(0)/b/it:
-  "[FiraSans-BoldItalic.otf]:mode=node;script=latn;language=dflt;+tlig;color=AABBCCFF ;"
+  [FiraSans-BoldItalic.otf]:mode=node;script=latn;language=dflt;+tlig;color={AABBCC};
 ***************
 Compilation 1 of test file completed with exit status 0
diff --git a/testfiles/fontload-fontspec-file.luatex.tlg b/testfiles/fontload-fontspec-file.luatex.tlg
@@ -2,18 +2,18 @@ This is a generated file for the l3build validation system.
 Don't change this file in any respect.
 Bare bones colour red loaded from file:
 TU/texgyreschola-regular.otf(0)/m/n:
-  "[texgyreschola-regular.otf]:mode=node;script=latn;language=dflt;+tlig;color=FF0000FF ;"
+  [texgyreschola-regular.otf]:mode=node;script=latn;language=dflt;+tlig;color={FF0000};
 New font name, colour blue, loaded from file:
 TU/TeXGyreTermes(0)/m/n:
-  "[texgyretermes-regular.otf]:mode=node;script=latn;language=dflt;+tlig;color=0000FFFF ;"
+  [texgyretermes-regular.otf]:mode=node;script=latn;language=dflt;+tlig;color={0000FF};
 A more comprehensive family (note nested defn for BI shape):
 TU/MyHeros(0)/m/n:
-  "[texgyreheros-regular.otf]:mode=node;script=latn;language=dflt;+tlig;color=119944FF ;"
+  [texgyreheros-regular.otf]:mode=node;script=latn;language=dflt;+tlig;color={119944};
 TU/MyHeros(0)/b/n:
-  "[texgyreheros-bold.otf]:mode=node;script=latn;language=dflt;+tlig;color=119944FF ;"
+  [texgyreheros-bold.otf]:mode=node;script=latn;language=dflt;+tlig;color={119944};
 TU/MyHeros(0)/m/it:
-  "[texgyreheros-italic.otf]:mode=node;script=latn;language=dflt;+tlig;color=119944FF ;"
+  [texgyreheros-italic.otf]:mode=node;script=latn;language=dflt;+tlig;color={119944};
 TU/MyHeros(0)/b/it:
-  "[texgyreheros-bolditalic.otf]:mode=node;script=latn;language=dflt;+tlig;color=223355FF ;"
+  [texgyreheros-bolditalic.otf]:mode=node;script=latn;language=dflt;+tlig;color={223355};
 ***************
 Compilation 1 of test file completed with exit status 0
diff --git a/testfiles/fontload-nfssfamily-1.luatex.tlg b/testfiles/fontload-nfssfamily-1.luatex.tlg
@@ -5,12 +5,12 @@ TU/lmr/m/n:
   [lmroman10-regular]:+tlig;
 Code with particular NFSS family font:
 TU/ABC/m/n:
-  "[texgyreheros-regular.otf]:mode=node;script=latn;language=dflt;color=FF0000FF ;"
+  [texgyreheros-regular.otf]:mode=node;script=latn;language=dflt;color={FF0000};
 Back to normal font:
 TU/lmr/m/n:
   [lmroman10-regular]:+tlig;
 Loading NFSS family explicit:
 TU/ABC/m/n:
-  "[texgyreheros-regular.otf]:mode=node;script=latn;language=dflt;color=FF0000FF ;"
+  [texgyreheros-regular.otf]:mode=node;script=latn;language=dflt;color={FF0000};
 ***************
 Compilation 1 of test file completed with exit status 0
diff --git a/testfiles/fontload-nfssfamily-2.luatex.tlg b/testfiles/fontload-nfssfamily-2.luatex.tlg
@@ -12,12 +12,12 @@ TU/newfoo/m/n:
   [texgyreheros-regular.otf]:color=FFAA00
 USING FONTSPEC:
 TU/foo/m/n:
-  "[texgyrepagella-regular.otf]:mode=node;script=latn;language=dflt;color=FF0000FF ;"
+  [texgyrepagella-regular.otf]:mode=node;script=latn;language=dflt;color={FF0000};
 TU/foo/m/sc:
-  "[texgyrepagella-regular.otf]:mode=node;script=latn;language=dflt;+smcp;color=FF0000FF ;"
+  [texgyrepagella-regular.otf]:mode=node;script=latn;language=dflt;+smcp;color={FF0000};
 TU/foo/m/n:
-  "[texgyreheros-regular.otf]:mode=node;script=latn;language=dflt;color=FF00FFFF ;"
+  [texgyreheros-regular.otf]:mode=node;script=latn;language=dflt;color={FF00FF};
 TU/foo/m/sc:
-  "[texgyreheros-regular.otf]:mode=node;script=latn;language=dflt;+smcp;color=FF00FFFF ;"
+  [texgyreheros-regular.otf]:mode=node;script=latn;language=dflt;+smcp;color={FF00FF};
 ***************
 Compilation 1 of test file completed with exit status 0