Regenerate layout tests

18 files changed, 176 insertions, 128 deletions

diff --git a/tests/layouts/aaa.layout b/tests/layouts/aaa.layout
index f00f06c1..d4206d13 100644
--- a/tests/layouts/aaa.layout
+++ b/tests/layouts/aaa.layout
@@ -97,7 +97,7 @@
               "language" : "en-us",
               "script" : "Latn",
               "font" : {
-                "description" : "DejaVu Sans Mono 32",
+                "description" : "DejaVu Sans Mono Book 32",
                 "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
               },
               "flags" : 4,
@@ -148,7 +148,7 @@
               "language" : "en-us",
               "script" : "Latn",
               "font" : {
-                "description" : "DejaVu Sans Mono 32",
+                "description" : "DejaVu Sans Mono Book 32",
                 "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
               },
               "flags" : 4,
@@ -199,7 +199,7 @@
               "language" : "en-us",
               "script" : "Latn",
               "font" : {
-                "description" : "DejaVu Sans Mono 32",
+                "description" : "DejaVu Sans Mono Book 32",
                 "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
               },
               "flags" : 4,
@@ -250,7 +250,7 @@
               "language" : "en-us",
               "script" : "Latn",
               "font" : {
-                "description" : "DejaVu Sans Mono 32",
+                "description" : "DejaVu Sans Mono Book 32",
                 "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
               },
               "flags" : 0,
@@ -296,7 +296,7 @@
               "language" : "en-us",
               "script" : "Latn",
               "font" : {
-                "description" : "DejaVu Sans Mono 32",
+                "description" : "DejaVu Sans Mono Book 32",
                 "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
               },
               "flags" : 0,
diff --git a/tests/layouts/bratwurst.layout b/tests/layouts/bratwurst.layout
index e14f6a85..d39234c4 100644
--- a/tests/layouts/bratwurst.layout
+++ b/tests/layouts/bratwurst.layout
@@ -93,7 +93,7 @@
     "ellipsized" : false,
     "hypenated" : false,
     "unknown-glyphs" : 0,
-    "width" : 196608,
+    "width" : 200704,
     "height" : 52428,
     "lines" : [
       {
@@ -171,6 +171,9 @@
               "font" : {
                 "description" : "Cantarell Bold Italic 32",
                 "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
+                "variations" : {
+                  "wght" : 8374
+                },
                 "matrix" : [
                   1,
                   0.20000000000000001,
@@ -187,7 +190,7 @@
               "glyphs" : [
                 {
                   "glyph" : 467,
-                  "width" : 33792,
+                  "width" : 35840,
                   "is-cluster-start" : true,
                   "log-cluster" : 0
                 },
@@ -199,7 +202,7 @@
                 },
                 {
                   "glyph" : 409,
-                  "width" : 16384,
+                  "width" : 17408,
                   "is-cluster-start" : true,
                   "log-cluster" : 2
                 },
@@ -211,7 +214,7 @@
                 },
                 {
                   "glyph" : 430,
-                  "width" : 15360,
+                  "width" : 16384,
                   "is-cluster-start" : true,
                   "log-cluster" : 4
                 }
diff --git a/tests/layouts/effigy.layout b/tests/layouts/effigy.layout
index 953fe279..7a673c2e 100644
--- a/tests/layouts/effigy.layout
+++ b/tests/layouts/effigy.layout
@@ -103,7 +103,7 @@
               "language" : "en-us",
               "script" : "Latn",
               "font" : {
-                "description" : "DejaVu Sans 32",
+                "description" : "DejaVu Sans Book 32",
                 "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01"
               },
               "flags" : 4,
@@ -160,7 +160,7 @@
               "language" : "en-us",
               "script" : "Latn",
               "font" : {
-                "description" : "DejaVu Sans 32",
+                "description" : "DejaVu Sans Book 32",
                 "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01"
               },
               "flags" : 0,
diff --git a/tests/layouts/letterspacing.layout b/tests/layouts/letterspacing.layout
index 86071325..b880043d 100644
--- a/tests/layouts/letterspacing.layout
+++ b/tests/layouts/letterspacing.layout
@@ -93,7 +93,7 @@
               "language" : "en-us",
               "script" : "Latn",
               "font" : {
-                "description" : "DejaVu Sans 32",
+                "description" : "DejaVu Sans Book 32",
                 "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01"
               },
               "flags" : 0,
diff --git a/tests/layouts/no-space.layout b/tests/layouts/no-space.layout
index eb5ce823..76afc92f 100644
--- a/tests/layouts/no-space.layout
+++ b/tests/layouts/no-space.layout
@@ -100,7 +100,7 @@
               "language" : "en-us",
               "script" : "Zyyy",
               "font" : {
-                "description" : "DejaVu Sans 32",
+                "description" : "DejaVu Sans Book 32",
                 "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01"
               },
               "flags" : 0,
diff --git a/tests/layouts/tab-assert.layout b/tests/layouts/tab-assert.layout
index c0dfa160..cd8c207e 100644
--- a/tests/layouts/tab-assert.layout
+++ b/tests/layouts/tab-assert.layout
@@ -93,7 +93,7 @@
               "language" : "en-us",
               "script" : "Zyyy",
               "font" : {
-                "description" : "DejaVu Sans 12",
+                "description" : "DejaVu Sans Book 12",
                 "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01"
               },
               "flags" : 0,
@@ -118,7 +118,7 @@
               "language" : "en-us",
               "script" : "Zyyy",
               "font" : {
-                "description" : "DejaVu Sans 12",
+                "description" : "DejaVu Sans Book 12",
                 "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01"
               },
               "flags" : 0,
@@ -143,7 +143,7 @@
               "language" : "en-us",
               "script" : "Zyyy",
               "font" : {
-                "description" : "DejaVu Sans 12",
+                "description" : "DejaVu Sans Book 12",
                 "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01"
               },
               "flags" : 0,
diff --git a/tests/layouts/tab-crash.layout b/tests/layouts/tab-crash.layout
index d90c374e..5bed04e1 100644
--- a/tests/layouts/tab-crash.layout
+++ b/tests/layouts/tab-crash.layout
@@ -612,7 +612,7 @@
               "language" : "en-us",
               "script" : "Latn",
               "font" : {
-                "description" : "DejaVu Sans Mono 12",
+                "description" : "DejaVu Sans Mono Book 12",
                 "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
               },
               "flags" : 0,
@@ -982,7 +982,7 @@
               "language" : "en-us",
               "script" : "Latn",
               "font" : {
-                "description" : "DejaVu Sans Mono 12",
+                "description" : "DejaVu Sans Mono Book 12",
                 "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
               },
               "flags" : 0,
@@ -1172,7 +1172,7 @@
               "language" : "en-us",
               "script" : "Latn",
               "font" : {
-                "description" : "DejaVu Sans Mono 12",
+                "description" : "DejaVu Sans Mono Book 12",
                 "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
               },
               "flags" : 0,
@@ -1227,7 +1227,7 @@
               "language" : "en-us",
               "script" : "Latn",
               "font" : {
-                "description" : "DejaVu Sans Mono 12",
+                "description" : "DejaVu Sans Mono Book 12",
                 "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
               },
               "flags" : 0,
@@ -1252,7 +1252,7 @@
               "language" : "en-us",
               "script" : "Latn",
               "font" : {
-                "description" : "DejaVu Sans Mono 12",
+                "description" : "DejaVu Sans Mono Book 12",
                 "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
               },
               "flags" : 0,
@@ -1277,7 +1277,7 @@
               "language" : "en-us",
               "script" : "Latn",
               "font" : {
-                "description" : "DejaVu Sans Mono 12",
+                "description" : "DejaVu Sans Mono Book 12",
                 "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
               },
               "flags" : 0,
@@ -1302,7 +1302,7 @@
               "language" : "en-us",
               "script" : "Latn",
               "font" : {
-                "description" : "DejaVu Sans Mono 12",
+                "description" : "DejaVu Sans Mono Book 12",
                 "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
               },
               "flags" : 0,
@@ -1327,7 +1327,7 @@
               "language" : "en-us",
               "script" : "Latn",
               "font" : {
-                "description" : "DejaVu Sans Mono 12",
+                "description" : "DejaVu Sans Mono Book 12",
                 "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
               },
               "flags" : 0,
diff --git a/tests/layouts/tabs-nowrap.layout b/tests/layouts/tabs-nowrap.layout
index c450fc93..8adc5097 100644
--- a/tests/layouts/tabs-nowrap.layout
+++ b/tests/layouts/tabs-nowrap.layout
@@ -154,7 +154,7 @@
               "language" : "en-us",
               "script" : "Zyyy",
               "font" : {
-                "description" : "DejaVu Sans Mono 32",
+                "description" : "DejaVu Sans Mono Book 32",
                 "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
               },
               "flags" : 0,
@@ -197,7 +197,7 @@
               "language" : "en-us",
               "script" : "Zyyy",
               "font" : {
-                "description" : "DejaVu Sans Mono 32",
+                "description" : "DejaVu Sans Mono Book 32",
                 "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
               },
               "flags" : 0,
@@ -228,7 +228,7 @@
               "language" : "en-us",
               "script" : "Zyyy",
               "font" : {
-                "description" : "DejaVu Sans Mono 32",
+                "description" : "DejaVu Sans Mono Book 32",
                 "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
               },
               "flags" : 0,
@@ -280,7 +280,7 @@
               "language" : "en-us",
               "script" : "Zyyy",
               "font" : {
-                "description" : "DejaVu Sans Mono 32",
+                "description" : "DejaVu Sans Mono Book 32",
                 "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
               },
               "flags" : 0,
diff --git a/tests/layouts/valid-10.layout b/tests/layouts/valid-10.layout
index 865dbd7c..2fa0b739 100644
--- a/tests/layouts/valid-10.layout
+++ b/tests/layouts/valid-10.layout
@@ -241,7 +241,7 @@
               "language" : "he",
               "script" : "Hebr",
               "font" : {
-                "description" : "DejaVu Sans 11",
+                "description" : "DejaVu Sans Book 11",
                 "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01"
               },
               "flags" : 0,
@@ -284,8 +284,8 @@
               "language" : "he",
               "script" : "Hebr",
               "font" : {
-                "description" : "DejaVu Sans 11",
-                "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01"
+                "description" : "Cantarell 11",
+                "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2"
               },
               "flags" : 0,
               "y-offset" : 0,
@@ -293,8 +293,8 @@
               "end-x-offset" : 0,
               "glyphs" : [
                 {
-                  "glyph" : 3,
-                  "width" : 5120,
+                  "glyph" : 1109,
+                  "width" : 3072,
                   "is-cluster-start" : true,
                   "log-cluster" : 0
                 }
@@ -351,7 +351,7 @@
               "glyphs" : [
                 {
                   "glyph" : 1062,
-                  "width" : 17408,
+                  "width" : 19456,
                   "is-cluster-start" : true,
                   "log-cluster" : 0
                 }
diff --git a/tests/layouts/valid-14.layout b/tests/layouts/valid-14.layout
index d81f90e7..5582a0ad 100644
--- a/tests/layouts/valid-14.layout
+++ b/tests/layouts/valid-14.layout
@@ -179,12 +179,12 @@
     "hypenated" : false,
     "unknown-glyphs" : 2,
     "width" : 161792,
-    "height" : 18022,
+    "height" : 19652,
     "lines" : [
       {
         "position" : [
           0,
-          14426
+          15893
         ],
         "line" : {
           "start-index" : 0,
@@ -201,14 +201,14 @@
           "runs" : [
             {
               "offset" : 0,
-              "length" : 7,
-              "text" : "你好 ",
+              "length" : 3,
+              "text" : "你",
               "bidi-level" : 0,
               "gravity" : "south",
               "language" : "xx",
               "script" : "Hani",
               "font" : {
-                "description" : "DejaVu Sans 11",
+                "description" : "DejaVu Sans Book 11",
                 "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01"
               },
               "flags" : 0,
@@ -221,18 +221,37 @@
                   "width" : 11264,
                   "is-cluster-start" : true,
                   "log-cluster" : 0
-                },
+                }
+              ]
+            },
+            {
+              "offset" : 3,
+              "length" : 4,
+              "text" : "好 ",
+              "bidi-level" : 0,
+              "gravity" : "south",
+              "language" : "xx",
+              "script" : "Hani",
+              "font" : {
+                "description" : "Droid Sans Japanese 11",
+                "checksum" : "9e7449c453527829c963330ba36f4de3b20911e185a1df08a97082bb69e795d7"
+              },
+              "flags" : 0,
+              "y-offset" : 230,
+              "start-x-offset" : 0,
+              "end-x-offset" : 0,
+              "glyphs" : [
                 {
-                  "glyph" : 268458365,
-                  "width" : 11264,
+                  "glyph" : 1,
+                  "width" : 15360,
                   "is-cluster-start" : true,
-                  "log-cluster" : 3
+                  "log-cluster" : 0
                 },
                 {
-                  "glyph" : 3,
-                  "width" : 5120,
+                  "glyph" : 268435488,
+                  "width" : 3072,
                   "is-cluster-start" : true,
-                  "log-cluster" : 6
+                  "log-cluster" : 3
                 }
               ]
             },
@@ -300,7 +319,7 @@
               "language" : "he",
               "script" : "Hebr",
               "font" : {
-                "description" : "DejaVu Sans 11",
+                "description" : "DejaVu Sans Book 11",
                 "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01"
               },
               "flags" : 0,
@@ -343,17 +362,17 @@
               "language" : "he",
               "script" : "Hebr",
               "font" : {
-                "description" : "DejaVu Sans 11",
-                "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01"
+                "description" : "Cantarell 11",
+                "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2"
               },
               "flags" : 0,
-              "y-offset" : 0,
+              "y-offset" : -337,
               "start-x-offset" : 0,
               "end-x-offset" : 0,
               "glyphs" : [
                 {
-                  "glyph" : 3,
-                  "width" : 5120,
+                  "glyph" : 1109,
+                  "width" : 3072,
                   "is-cluster-start" : true,
                   "log-cluster" : 0
                 }
diff --git a/tests/layouts/valid-17.layout b/tests/layouts/valid-17.layout
index 4984b3bb..72e1c245 100644
--- a/tests/layouts/valid-17.layout
+++ b/tests/layouts/valid-17.layout
@@ -206,7 +206,7 @@
               "language" : "en-us",
               "script" : "Latn",
               "font" : {
-                "description" : "DejaVu Sans 11",
+                "description" : "DejaVu Sans Book 11",
                 "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01"
               },
               "flags" : 0,
@@ -268,7 +268,7 @@
               "language" : "en-us",
               "script" : "Latn",
               "font" : {
-                "description" : "DejaVu Sans 11",
+                "description" : "DejaVu Sans Book 11",
                 "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01"
               },
               "flags" : 0,
@@ -330,7 +330,7 @@
               "language" : "en-us",
               "script" : "Latn",
               "font" : {
-                "description" : "DejaVu Sans 11",
+                "description" : "DejaVu Sans Book 11",
                 "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01"
               },
               "flags" : 4,
diff --git a/tests/layouts/valid-19.layout b/tests/layouts/valid-19.layout
index 671f8a11..b6d95cc0 100644
--- a/tests/layouts/valid-19.layout
+++ b/tests/layouts/valid-19.layout
@@ -158,9 +158,9 @@
     "wrapped" : false,
     "ellipsized" : false,
     "hypenated" : false,
-    "unknown-glyphs" : 0,
-    "width" : 166912,
-    "height" : 18430,
+    "unknown-glyphs" : 6,
+    "width" : 174080,
+    "height" : 18305,
     "lines" : [
       {
         "position" : [
@@ -189,7 +189,7 @@
               "language" : "en-us",
               "script" : "Zyyy",
               "font" : {
-                "description" : "DejaVu Sans 11",
+                "description" : "DejaVu Sans Book 11",
                 "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01"
               },
               "flags" : 0,
@@ -226,8 +226,8 @@
               "language" : "en-us",
               "script" : "Zyyy",
               "font" : {
-                "description" : "Noto Color Emoji 11",
-                "checksum" : "054c1c2e2ca956b920262840dcad39dcf27bb88d6f70b892b2b1180de2c2ab47"
+                "description" : "DejaVu Sans Book 11",
+                "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01"
               },
               "flags" : 0,
               "y-offset" : 0,
@@ -235,10 +235,9 @@
               "end-x-offset" : 0,
               "glyphs" : [
                 {
-                  "glyph" : 13,
-                  "width" : 18432,
+                  "glyph" : 5867,
+                  "width" : 15360,
                   "is-cluster-start" : true,
-                  "is-color" : true,
                   "log-cluster" : 0
                 },
                 {
@@ -283,8 +282,8 @@
               "language" : "en-us",
               "script" : "Zyyy",
               "font" : {
-                "description" : "Noto Color Emoji 11",
-                "checksum" : "054c1c2e2ca956b920262840dcad39dcf27bb88d6f70b892b2b1180de2c2ab47"
+                "description" : "DejaVu Sans Book 11",
+                "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01"
               },
               "flags" : 0,
               "y-offset" : 0,
@@ -292,11 +291,16 @@
               "end-x-offset" : 0,
               "glyphs" : [
                 {
-                  "glyph" : 22,
-                  "width" : 18432,
+                  "glyph" : 268562921,
+                  "width" : 15360,
                   "is-cluster-start" : true,
-                  "is-color" : true,
                   "log-cluster" : 0
+                },
+                {
+                  "glyph" : 268562922,
+                  "width" : 15360,
+                  "is-cluster-start" : true,
+                  "log-cluster" : 4
                 }
               ]
             },
@@ -334,8 +338,8 @@
               "language" : "en-us",
               "script" : "Zyyy",
               "font" : {
-                "description" : "Noto Color Emoji 11",
-                "checksum" : "054c1c2e2ca956b920262840dcad39dcf27bb88d6f70b892b2b1180de2c2ab47"
+                "description" : "DejaVu Sans Book 11",
+                "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01"
               },
               "flags" : 0,
               "y-offset" : 0,
@@ -343,10 +347,9 @@
               "end-x-offset" : 0,
               "glyphs" : [
                 {
-                  "glyph" : 6,
-                  "width" : 18432,
+                  "glyph" : 268445450,
+                  "width" : 11264,
                   "is-cluster-start" : true,
-                  "is-color" : true,
                   "log-cluster" : 0
                 }
               ]
@@ -385,8 +388,8 @@
               "language" : "en-us",
               "script" : "Zyyy",
               "font" : {
-                "description" : "Noto Color Emoji 11",
-                "checksum" : "054c1c2e2ca956b920262840dcad39dcf27bb88d6f70b892b2b1180de2c2ab47"
+                "description" : "DejaVu Sans Book 11",
+                "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01"
               },
               "flags" : 0,
               "y-offset" : 0,
@@ -394,11 +397,16 @@
               "end-x-offset" : 0,
               "glyphs" : [
                 {
-                  "glyph" : 21,
-                  "width" : 18432,
+                  "glyph" : 268445451,
+                  "width" : 11264,
                   "is-cluster-start" : true,
-                  "is-color" : true,
                   "log-cluster" : 0
+                },
+                {
+                  "glyph" : 268563454,
+                  "width" : 15360,
+                  "is-cluster-start" : true,
+                  "log-cluster" : 3
                 }
               ]
             },
@@ -460,8 +468,8 @@
               "language" : "en-us",
               "script" : "Zyyy",
               "font" : {
-                "description" : "Noto Color Emoji 11",
-                "checksum" : "054c1c2e2ca956b920262840dcad39dcf27bb88d6f70b892b2b1180de2c2ab47"
+                "description" : "DejaVu Sans Book 11",
+                "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01"
               },
               "flags" : 0,
               "y-offset" : 0,
@@ -469,16 +477,33 @@
               "end-x-offset" : 0,
               "glyphs" : [
                 {
-                  "glyph" : 10,
-                  "width" : 18432,
+                  "glyph" : 268563444,
+                  "width" : 15360,
                   "is-cluster-start" : true,
-                  "is-color" : true,
                   "log-cluster" : 0
                 },
                 {
                   "glyph" : 268435455,
                   "width" : 0,
                   "is-cluster-start" : true,
+                  "log-cluster" : 4
+                },
+                {
+                  "glyph" : 268435455,
+                  "width" : 0,
+                  "is-cluster-start" : true,
+                  "log-cluster" : 8
+                },
+                {
+                  "glyph" : 268435455,
+                  "width" : 0,
+                  "is-cluster-start" : true,
+                  "log-cluster" : 12
+                },
+                {
+                  "glyph" : 268435455,
+                  "width" : 0,
+                  "is-cluster-start" : true,
                   "log-cluster" : 16
                 },
                 {
diff --git a/tests/layouts/valid-21.layout b/tests/layouts/valid-21.layout
index 5cea18dc..d1e1f74e 100644
--- a/tests/layouts/valid-21.layout
+++ b/tests/layouts/valid-21.layout
@@ -61,8 +61,8 @@
     "ellipsized" : false,
     "hypenated" : false,
     "unknown-glyphs" : 1,
-    "width" : 36864,
-    "height" : 18430,
+    "width" : 33792,
+    "height" : 18305,
     "lines" : [
       {
         "position" : [
@@ -91,8 +91,8 @@
               "language" : "en-us",
               "script" : "Zyyy",
               "font" : {
-                "description" : "Noto Color Emoji 11",
-                "checksum" : "054c1c2e2ca956b920262840dcad39dcf27bb88d6f70b892b2b1180de2c2ab47"
+                "description" : "DejaVu Sans Book 11",
+                "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01"
               },
               "flags" : 0,
               "extra-attributes" : [
@@ -106,10 +106,9 @@
               "end-x-offset" : 0,
               "glyphs" : [
                 {
-                  "glyph" : 13,
-                  "width" : 18432,
+                  "glyph" : 5867,
+                  "width" : 15360,
                   "is-cluster-start" : true,
-                  "is-color" : true,
                   "log-cluster" : 0
                 },
                 {
diff --git a/tests/layouts/valid-22.layout b/tests/layouts/valid-22.layout
index 85b7b5ba..9ed4bd43 100644
--- a/tests/layouts/valid-22.layout
+++ b/tests/layouts/valid-22.layout
@@ -238,16 +238,8 @@
               "language" : "en-us",
               "script" : "Latn",
               "font" : {
-                "description" : "Cantarell Italic 7.1494140625",
-                "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
-                "matrix" : [
-                  1,
-                  0.20000000000000001,
-                  0,
-                  1,
-                  0,
-                  0
-                ]
+                "description" : "Cantarell 7.1494140625",
+                "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2"
               },
               "flags" : 0,
               "extra-attributes" : [
diff --git a/tests/layouts/valid-3.layout b/tests/layouts/valid-3.layout
index c32ff56e..07faaeb3 100644
--- a/tests/layouts/valid-3.layout
+++ b/tests/layouts/valid-3.layout
@@ -70,8 +70,8 @@
     "ellipsized" : false,
     "hypenated" : false,
     "unknown-glyphs" : 0,
-    "width" : 56320,
-    "height" : 18430,
+    "width" : 53248,
+    "height" : 18305,
     "lines" : [
       {
         "position" : [
@@ -137,8 +137,8 @@
               "language" : "en-us",
               "script" : "Latn",
               "font" : {
-                "description" : "Noto Color Emoji 11",
-                "checksum" : "054c1c2e2ca956b920262840dcad39dcf27bb88d6f70b892b2b1180de2c2ab47"
+                "description" : "DejaVu Sans Book 11",
+                "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01"
               },
               "flags" : 0,
               "y-offset" : 0,
@@ -146,10 +146,9 @@
               "end-x-offset" : 0,
               "glyphs" : [
                 {
-                  "glyph" : 12,
-                  "width" : 18432,
+                  "glyph" : 5857,
+                  "width" : 15360,
                   "is-cluster-start" : true,
-                  "is-color" : true,
                   "log-cluster" : 0
                 },
                 {
diff --git a/tests/layouts/valid-6.layout b/tests/layouts/valid-6.layout
index 4284b660..d11f544a 100644
--- a/tests/layouts/valid-6.layout
+++ b/tests/layouts/valid-6.layout
@@ -161,9 +161,9 @@
     "wrapped" : false,
     "ellipsized" : false,
     "hypenated" : false,
-    "unknown-glyphs" : 0,
-    "width" : 142336,
-    "height" : 18430,
+    "unknown-glyphs" : 1,
+    "width" : 144384,
+    "height" : 18305,
     "lines" : [
       {
         "position" : [
@@ -217,8 +217,8 @@
               "language" : "en-us",
               "script" : "Latn",
               "font" : {
-                "description" : "Noto Color Emoji 11",
-                "checksum" : "054c1c2e2ca956b920262840dcad39dcf27bb88d6f70b892b2b1180de2c2ab47"
+                "description" : "DejaVu Sans Book 11",
+                "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01"
               },
               "flags" : 0,
               "y-offset" : 0,
@@ -227,10 +227,21 @@
               "glyphs" : [
                 {
                   "glyph" : 19,
-                  "width" : 18432,
+                  "width" : 9216,
                   "is-cluster-start" : true,
-                  "is-color" : true,
                   "log-cluster" : 0
+                },
+                {
+                  "glyph" : 268435455,
+                  "width" : 0,
+                  "is-cluster-start" : true,
+                  "log-cluster" : 1
+                },
+                {
+                  "glyph" : 268443875,
+                  "width" : 11264,
+                  "is-cluster-start" : true,
+                  "log-cluster" : 4
                 }
               ]
             },
diff --git a/tests/layouts/valid-8.layout b/tests/layouts/valid-8.layout
index 094fcce5..9534ab9b 100644
--- a/tests/layouts/valid-8.layout
+++ b/tests/layouts/valid-8.layout
@@ -156,7 +156,7 @@
     "ellipsized" : false,
     "hypenated" : false,
     "unknown-glyphs" : 0,
-    "width" : 134144,
+    "width" : 132096,
     "height" : 18305,
     "lines" : [
       {
@@ -241,7 +241,7 @@
               "language" : "he",
               "script" : "Hebr",
               "font" : {
-                "description" : "DejaVu Sans 11",
+                "description" : "DejaVu Sans Book 11",
                 "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01"
               },
               "flags" : 0,
@@ -284,8 +284,8 @@
               "language" : "he",
               "script" : "Hebr",
               "font" : {
-                "description" : "DejaVu Sans 11",
-                "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01"
+                "description" : "Cantarell 11",
+                "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2"
               },
               "flags" : 0,
               "y-offset" : 0,
@@ -293,8 +293,8 @@
               "end-x-offset" : 0,
               "glyphs" : [
                 {
-                  "glyph" : 3,
-                  "width" : 5120,
+                  "glyph" : 1109,
+                  "width" : 3072,
                   "is-cluster-start" : true,
                   "log-cluster" : 0
                 }
diff --git a/tests/layouts/valid-9.layout b/tests/layouts/valid-9.layout
index 24020ffb..bc6d2cca 100644
--- a/tests/layouts/valid-9.layout
+++ b/tests/layouts/valid-9.layout
@@ -163,7 +163,7 @@
     "hypenated" : false,
     "unknown-glyphs" : 0,
     "width" : 71392,
-    "height" : 71548,
+    "height" : 72371,
     "lines" : [
       {
         "position" : [
@@ -256,7 +256,7 @@
       {
         "position" : [
           0,
-          31962
+          32785
         ],
         "line" : {
           "start-index" : 6,
@@ -280,7 +280,7 @@
               "language" : "he",
               "script" : "Hebr",
               "font" : {
-                "description" : "DejaVu Sans 11",
+                "description" : "DejaVu Sans Book 11",
                 "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01"
               },
               "flags" : 0,
@@ -333,8 +333,8 @@
               "language" : "he",
               "script" : "Hebr",
               "font" : {
-                "description" : "DejaVu Sans 11",
-                "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01"
+                "description" : "Cantarell 11",
+                "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2"
               },
               "flags" : 0,
               "extra-attributes" : [
@@ -363,7 +363,7 @@
       {
         "position" : [
           0,
-          50267
+          51090
         ],
         "line" : {
           "start-index" : 15,
@@ -444,7 +444,7 @@
       {
         "position" : [
           0,
-          68289
+          69112
         ],
         "line" : {
           "start-index" : 24,