[pango/pango2-cleanups] Update tests for script removal



commit 3b035f2e05c134d2f12e9cade6bfdf846c1738b3
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Feb 17 14:44:16 2022 -0600

    Update tests for script removal
    
    Removing PangoScript changed the names we get for
    scripts here.

 tests/layouts/aaa.layout           | 10 +++----
 tests/layouts/arabic-format.layout |  2 +-
 tests/layouts/bratwurst.layout     |  4 +--
 tests/layouts/bratwurst2.layout    |  2 +-
 tests/layouts/bratwurst3.layout    |  8 ++---
 tests/layouts/bratwurst4.layout    |  4 +--
 tests/layouts/effigy.layout        |  4 +--
 tests/layouts/kebab.layout         |  4 +--
 tests/layouts/letterspacing.layout |  2 +-
 tests/layouts/no-space.layout      |  2 +-
 tests/layouts/tab-assert.layout    |  6 ++--
 tests/layouts/tab-crash.layout     | 16 +++++-----
 tests/layouts/tabs-nowrap.layout   |  8 ++---
 tests/layouts/tabs.layout          | 60 +++++++++++++++++++-------------------
 tests/layouts/valid-1.layout       |  6 ++--
 tests/layouts/valid-10.layout      | 10 +++----
 tests/layouts/valid-11.layout      | 10 +++----
 tests/layouts/valid-12.layout      | 30 +++++++++----------
 tests/layouts/valid-13.layout      | 30 +++++++++----------
 tests/layouts/valid-14.layout      | 12 ++++----
 tests/layouts/valid-15.layout      |  6 ++--
 tests/layouts/valid-16.layout      |  6 ++--
 tests/layouts/valid-17.layout      | 14 ++++-----
 tests/layouts/valid-18.layout      |  6 ++--
 tests/layouts/valid-19.layout      | 22 +++++++-------
 tests/layouts/valid-2.layout       | 10 +++----
 tests/layouts/valid-20.layout      |  8 ++---
 tests/layouts/valid-21.layout      |  4 +--
 tests/layouts/valid-22.layout      | 16 +++++-----
 tests/layouts/valid-3.layout       |  6 ++--
 tests/layouts/valid-4.layout       | 10 +++----
 tests/layouts/valid-5.layout       | 12 ++++----
 tests/layouts/valid-6.layout       |  6 ++--
 tests/layouts/valid-7.layout       |  8 ++---
 tests/layouts/valid-8.layout       |  8 ++---
 tests/layouts/valid-9.layout       | 10 +++----
 tests/layouts/vertical.layout      | 34 ++++++++++-----------
 37 files changed, 208 insertions(+), 208 deletions(-)
---
diff --git a/tests/layouts/aaa.layout b/tests/layouts/aaa.layout
index 829e74c8..45ab2df2 100644
--- a/tests/layouts/aaa.layout
+++ b/tests/layouts/aaa.layout
@@ -83,7 +83,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "DejaVu Sans 32",
               "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01",
@@ -129,7 +129,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "DejaVu Sans 32",
               "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01",
@@ -175,7 +175,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "DejaVu Sans 32",
               "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01",
@@ -221,7 +221,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "DejaVu Sans 32",
               "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01",
@@ -262,7 +262,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "DejaVu Sans 32",
               "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01",
diff --git a/tests/layouts/arabic-format.layout b/tests/layouts/arabic-format.layout
index 83c3d5ab..568b5466 100644
--- a/tests/layouts/arabic-format.layout
+++ b/tests/layouts/arabic-format.layout
@@ -56,7 +56,7 @@
             "bidi-level" : 2,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "common",
+            "script" : "Zyyy",
             "font" : {
               "description" : "Amiri 32",
               "checksum" : "d5e6374130d6df09e66f80f0bbcb7262112584ebadb861f0a412a21cc742a5dd",
diff --git a/tests/layouts/bratwurst.layout b/tests/layouts/bratwurst.layout
index 06ec8272..cb3be43d 100644
--- a/tests/layouts/bratwurst.layout
+++ b/tests/layouts/bratwurst.layout
@@ -108,7 +108,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell Bold 32",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -162,7 +162,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell Bold 32",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
diff --git a/tests/layouts/bratwurst2.layout b/tests/layouts/bratwurst2.layout
index 0c3be229..45ca8015 100644
--- a/tests/layouts/bratwurst2.layout
+++ b/tests/layouts/bratwurst2.layout
@@ -101,7 +101,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell Bold 32",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
diff --git a/tests/layouts/bratwurst3.layout b/tests/layouts/bratwurst3.layout
index 42c6a487..ce95ece7 100644
--- a/tests/layouts/bratwurst3.layout
+++ b/tests/layouts/bratwurst3.layout
@@ -102,7 +102,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell Bold 32",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -157,7 +157,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell Bold 32",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -212,7 +212,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell Bold 32",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -267,7 +267,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell Bold 32",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
diff --git a/tests/layouts/bratwurst4.layout b/tests/layouts/bratwurst4.layout
index 34a4e1aa..102e3975 100644
--- a/tests/layouts/bratwurst4.layout
+++ b/tests/layouts/bratwurst4.layout
@@ -107,7 +107,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell Bold 32",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -180,7 +180,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell Bold 32",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
diff --git a/tests/layouts/effigy.layout b/tests/layouts/effigy.layout
index f8a24abd..0bc73956 100644
--- a/tests/layouts/effigy.layout
+++ b/tests/layouts/effigy.layout
@@ -88,7 +88,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "DejaVu Sans 32",
               "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01",
@@ -140,7 +140,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "DejaVu Sans 32",
               "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01",
diff --git a/tests/layouts/kebab.layout b/tests/layouts/kebab.layout
index a0efe11d..c5253fd9 100644
--- a/tests/layouts/kebab.layout
+++ b/tests/layouts/kebab.layout
@@ -116,7 +116,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell Bold 32",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -190,7 +190,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell Bold 32",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
diff --git a/tests/layouts/letterspacing.layout b/tests/layouts/letterspacing.layout
index f1eb5fa5..87822cce 100644
--- a/tests/layouts/letterspacing.layout
+++ b/tests/layouts/letterspacing.layout
@@ -78,7 +78,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "DejaVu Sans 32",
               "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01",
diff --git a/tests/layouts/no-space.layout b/tests/layouts/no-space.layout
index b9bef178..b31b26bb 100644
--- a/tests/layouts/no-space.layout
+++ b/tests/layouts/no-space.layout
@@ -85,7 +85,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "common",
+            "script" : "Zyyy",
             "font" : {
               "description" : "Font Awesome 5 Free Solid Heavy 32",
               "checksum" : "8fe6cd51391fa6f8c2008609ddd489bb81a6d7674f3a1c8b7fa07efd026a6397",
diff --git a/tests/layouts/tab-assert.layout b/tests/layouts/tab-assert.layout
index 3b8ce5e5..2660e5ea 100644
--- a/tests/layouts/tab-assert.layout
+++ b/tests/layouts/tab-assert.layout
@@ -78,7 +78,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "common",
+            "script" : "Zyyy",
             "font" : {
               "description" : "DejaVu Sans 12",
               "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01",
@@ -111,7 +111,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "common",
+            "script" : "Zyyy",
             "font" : {
               "description" : "DejaVu Sans 12",
               "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01",
@@ -144,7 +144,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "common",
+            "script" : "Zyyy",
             "font" : {
               "description" : "DejaVu Sans 12",
               "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01",
diff --git a/tests/layouts/tab-crash.layout b/tests/layouts/tab-crash.layout
index 3fb0ab54..c37f788e 100644
--- a/tests/layouts/tab-crash.layout
+++ b/tests/layouts/tab-crash.layout
@@ -597,7 +597,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "DejaVu Sans 12",
               "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01",
@@ -962,7 +962,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "DejaVu Sans 12",
               "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01",
@@ -1175,7 +1175,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "DejaVu Sans 12",
               "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01",
@@ -1208,7 +1208,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "DejaVu Sans 12",
               "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01",
@@ -1241,7 +1241,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "DejaVu Sans 12",
               "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01",
@@ -1274,7 +1274,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "DejaVu Sans 12",
               "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01",
@@ -1307,7 +1307,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "DejaVu Sans 12",
               "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01",
@@ -1354,7 +1354,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "DejaVu Sans 12",
               "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01",
diff --git a/tests/layouts/tabs-nowrap.layout b/tests/layouts/tabs-nowrap.layout
index 31ff3ea2..8986aee3 100644
--- a/tests/layouts/tabs-nowrap.layout
+++ b/tests/layouts/tabs-nowrap.layout
@@ -139,7 +139,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "common",
+            "script" : "Zyyy",
             "font" : {
               "description" : "DejaVu Sans Mono 32",
               "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a",
@@ -190,7 +190,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "common",
+            "script" : "Zyyy",
             "font" : {
               "description" : "DejaVu Sans Mono 32",
               "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a",
@@ -229,7 +229,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "common",
+            "script" : "Zyyy",
             "font" : {
               "description" : "DejaVu Sans Mono 32",
               "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a",
@@ -276,7 +276,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "common",
+            "script" : "Zyyy",
             "font" : {
               "description" : "DejaVu Sans Mono 32",
               "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a",
diff --git a/tests/layouts/tabs.layout b/tests/layouts/tabs.layout
index 6ed604d7..ff2a4cf1 100644
--- a/tests/layouts/tabs.layout
+++ b/tests/layouts/tabs.layout
@@ -518,7 +518,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 14 @wght=400",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -554,7 +554,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 14 @wght=400",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -602,7 +602,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 14 @wght=400",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -638,7 +638,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 14 @wght=400",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -698,7 +698,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 14 @wght=400",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -734,7 +734,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 14 @wght=400",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -776,7 +776,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 14 @wght=400",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -812,7 +812,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 14 @wght=400",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -866,7 +866,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 14 @wght=400",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -902,7 +902,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 14 @wght=400",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -952,7 +952,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 14 @wght=400",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -988,7 +988,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 14 @wght=400",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -1042,7 +1042,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 14 @wght=400",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -1078,7 +1078,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 14 @wght=400",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -1138,7 +1138,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 14 @wght=400",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -1174,7 +1174,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 14 @wght=400",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -1222,7 +1222,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 14 @wght=400",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -1258,7 +1258,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 14 @wght=400",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -1306,7 +1306,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 14 @wght=400",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -1342,7 +1342,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 14 @wght=400",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -1398,7 +1398,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 14 @wght=400",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -1434,7 +1434,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 14 @wght=400",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -1494,7 +1494,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 14 @wght=400",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -1530,7 +1530,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 14 @wght=400",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -1578,7 +1578,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 14 @wght=400",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -1614,7 +1614,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 14 @wght=400",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -1668,7 +1668,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 14 @wght=400",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -1704,7 +1704,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 14 @wght=400",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -1746,7 +1746,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 14 @wght=400",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -1782,7 +1782,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 14 @wght=400",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
diff --git a/tests/layouts/valid-1.layout b/tests/layouts/valid-1.layout
index ad5e78dc..9f7a448d 100644
--- a/tests/layouts/valid-1.layout
+++ b/tests/layouts/valid-1.layout
@@ -350,7 +350,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -512,7 +512,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -622,7 +622,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "common",
+            "script" : "Zyyy",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
diff --git a/tests/layouts/valid-10.layout b/tests/layouts/valid-10.layout
index 95655633..6363bdab 100644
--- a/tests/layouts/valid-10.layout
+++ b/tests/layouts/valid-10.layout
@@ -172,7 +172,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -238,7 +238,7 @@
             "bidi-level" : 1,
             "gravity" : "south",
             "language" : "he",
-            "script" : "hebrew",
+            "script" : "Hebr",
             "font" : {
               "description" : "DejaVu Sans 11",
               "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01",
@@ -289,7 +289,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "he",
-            "script" : "hebrew",
+            "script" : "Hebr",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -325,7 +325,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "el",
-            "script" : "greek",
+            "script" : "Grek",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -361,7 +361,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "common",
+            "script" : "Zyyy",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
diff --git a/tests/layouts/valid-11.layout b/tests/layouts/valid-11.layout
index f057aed2..2f3165c7 100644
--- a/tests/layouts/valid-11.layout
+++ b/tests/layouts/valid-11.layout
@@ -182,7 +182,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -260,7 +260,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -296,7 +296,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -358,7 +358,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -394,7 +394,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
diff --git a/tests/layouts/valid-12.layout b/tests/layouts/valid-12.layout
index f47ae17a..c29e9202 100644
--- a/tests/layouts/valid-12.layout
+++ b/tests/layouts/valid-12.layout
@@ -199,7 +199,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -235,7 +235,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -271,7 +271,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -307,7 +307,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -343,7 +343,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -379,7 +379,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -415,7 +415,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -451,7 +451,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -495,7 +495,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -531,7 +531,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -567,7 +567,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -603,7 +603,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -639,7 +639,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -675,7 +675,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -711,7 +711,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
diff --git a/tests/layouts/valid-13.layout b/tests/layouts/valid-13.layout
index b690fa9c..ba1855aa 100644
--- a/tests/layouts/valid-13.layout
+++ b/tests/layouts/valid-13.layout
@@ -200,7 +200,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -242,7 +242,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -284,7 +284,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -326,7 +326,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -368,7 +368,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -410,7 +410,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -452,7 +452,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -494,7 +494,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -536,7 +536,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -578,7 +578,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -620,7 +620,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -662,7 +662,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -704,7 +704,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -746,7 +746,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -788,7 +788,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
diff --git a/tests/layouts/valid-14.layout b/tests/layouts/valid-14.layout
index 427cb5ee..654e38d4 100644
--- a/tests/layouts/valid-14.layout
+++ b/tests/layouts/valid-14.layout
@@ -194,7 +194,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "common",
+            "script" : "Zyyy",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -247,7 +247,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "xx",
-            "script" : "han",
+            "script" : "Hani",
             "font" : {
               "description" : "Droid Sans Japanese 11",
               "checksum" : "9e7449c453527829c963330ba36f4de3b20911e185a1df08a97082bb69e795d7",
@@ -280,7 +280,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -346,7 +346,7 @@
             "bidi-level" : 1,
             "gravity" : "south",
             "language" : "he",
-            "script" : "hebrew",
+            "script" : "Hebr",
             "font" : {
               "description" : "DejaVu Sans 11",
               "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01",
@@ -397,7 +397,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "he",
-            "script" : "hebrew",
+            "script" : "Hebr",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -433,7 +433,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "el",
-            "script" : "greek",
+            "script" : "Grek",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
diff --git a/tests/layouts/valid-15.layout b/tests/layouts/valid-15.layout
index f65f4076..0119b3f4 100644
--- a/tests/layouts/valid-15.layout
+++ b/tests/layouts/valid-15.layout
@@ -646,7 +646,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -834,7 +834,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -984,7 +984,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "common",
+            "script" : "Zyyy",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
diff --git a/tests/layouts/valid-16.layout b/tests/layouts/valid-16.layout
index 16a035af..a072c2d5 100644
--- a/tests/layouts/valid-16.layout
+++ b/tests/layouts/valid-16.layout
@@ -647,7 +647,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -835,7 +835,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -985,7 +985,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "common",
+            "script" : "Zyyy",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
diff --git a/tests/layouts/valid-17.layout b/tests/layouts/valid-17.layout
index edd50822..c0d7c37a 100644
--- a/tests/layouts/valid-17.layout
+++ b/tests/layouts/valid-17.layout
@@ -149,7 +149,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -206,7 +206,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "DejaVu Sans 11",
               "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01",
@@ -240,7 +240,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -291,7 +291,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "DejaVu Sans 11",
               "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01",
@@ -325,7 +325,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -376,7 +376,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "DejaVu Sans 11",
               "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01",
@@ -418,7 +418,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
diff --git a/tests/layouts/valid-18.layout b/tests/layouts/valid-18.layout
index 849b136e..9779c127 100644
--- a/tests/layouts/valid-18.layout
+++ b/tests/layouts/valid-18.layout
@@ -337,7 +337,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -470,7 +470,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -521,7 +521,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
diff --git a/tests/layouts/valid-19.layout b/tests/layouts/valid-19.layout
index 38b9f292..1c3dc8e5 100644
--- a/tests/layouts/valid-19.layout
+++ b/tests/layouts/valid-19.layout
@@ -174,7 +174,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "common",
+            "script" : "Zyyy",
             "font" : {
               "description" : "DejaVu Sans 11",
               "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01",
@@ -219,7 +219,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "common",
+            "script" : "Zyyy",
             "font" : {
               "description" : "Noto Color Emoji 11",
               "checksum" : "054c1c2e2ca956b920262840dcad39dcf27bb88d6f70b892b2b1180de2c2ab47",
@@ -259,7 +259,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "common",
+            "script" : "Zyyy",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -295,7 +295,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "common",
+            "script" : "Zyyy",
             "font" : {
               "description" : "Noto Color Emoji 11",
               "checksum" : "054c1c2e2ca956b920262840dcad39dcf27bb88d6f70b892b2b1180de2c2ab47",
@@ -329,7 +329,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "common",
+            "script" : "Zyyy",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -365,7 +365,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "common",
+            "script" : "Zyyy",
             "font" : {
               "description" : "Noto Color Emoji 11",
               "checksum" : "054c1c2e2ca956b920262840dcad39dcf27bb88d6f70b892b2b1180de2c2ab47",
@@ -399,7 +399,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "common",
+            "script" : "Zyyy",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -435,7 +435,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "common",
+            "script" : "Zyyy",
             "font" : {
               "description" : "Noto Color Emoji 11",
               "checksum" : "054c1c2e2ca956b920262840dcad39dcf27bb88d6f70b892b2b1180de2c2ab47",
@@ -469,7 +469,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "common",
+            "script" : "Zyyy",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -529,7 +529,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "common",
+            "script" : "Zyyy",
             "font" : {
               "description" : "Noto Color Emoji 11",
               "checksum" : "054c1c2e2ca956b920262840dcad39dcf27bb88d6f70b892b2b1180de2c2ab47",
@@ -575,7 +575,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "common",
+            "script" : "Zyyy",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
diff --git a/tests/layouts/valid-2.layout b/tests/layouts/valid-2.layout
index e51c9b57..611f88ba 100644
--- a/tests/layouts/valid-2.layout
+++ b/tests/layouts/valid-2.layout
@@ -254,7 +254,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -338,7 +338,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -392,7 +392,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -464,7 +464,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -532,7 +532,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
diff --git a/tests/layouts/valid-20.layout b/tests/layouts/valid-20.layout
index 93b8a1b1..53d9a7b5 100644
--- a/tests/layouts/valid-20.layout
+++ b/tests/layouts/valid-20.layout
@@ -103,7 +103,7 @@
             "bidi-level" : 0,
             "gravity" : "east",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell Rotated-Left 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -140,7 +140,7 @@
                 "glyph" : 244,
                 "width" : 15360,
                 "x-offset" : 14764,
-                "y-offset" : 3844,
+                "y-offset" : 3845,
                 "is-cluster-start" : true,
                 "log-cluster" : 0
               },
@@ -156,7 +156,7 @@
                 "glyph" : 273,
                 "width" : 15360,
                 "x-offset" : 14764,
-                "y-offset" : 3506,
+                "y-offset" : 3507,
                 "is-cluster-start" : true,
                 "log-cluster" : 2
               }
@@ -169,7 +169,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
diff --git a/tests/layouts/valid-21.layout b/tests/layouts/valid-21.layout
index 5901ebcd..d11b474d 100644
--- a/tests/layouts/valid-21.layout
+++ b/tests/layouts/valid-21.layout
@@ -76,7 +76,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "common",
+            "script" : "Zyyy",
             "font" : {
               "description" : "Noto Color Emoji 11",
               "checksum" : "054c1c2e2ca956b920262840dcad39dcf27bb88d6f70b892b2b1180de2c2ab47",
@@ -122,7 +122,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "common",
+            "script" : "Zyyy",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
diff --git a/tests/layouts/valid-22.layout b/tests/layouts/valid-22.layout
index 6be94c32..483f54e1 100644
--- a/tests/layouts/valid-22.layout
+++ b/tests/layouts/valid-22.layout
@@ -198,7 +198,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -234,7 +234,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 7.1484375",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -284,7 +284,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -338,7 +338,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 7.1484375",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -388,7 +388,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 4.646484375",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -450,7 +450,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 3.0205078125",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -524,7 +524,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 1.962890625",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -610,7 +610,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 1.2763671875",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
diff --git a/tests/layouts/valid-3.layout b/tests/layouts/valid-3.layout
index 8ff1dd05..67650586 100644
--- a/tests/layouts/valid-3.layout
+++ b/tests/layouts/valid-3.layout
@@ -85,7 +85,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -133,7 +133,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Noto Color Emoji 11",
               "checksum" : "054c1c2e2ca956b920262840dcad39dcf27bb88d6f70b892b2b1180de2c2ab47",
@@ -173,7 +173,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
diff --git a/tests/layouts/valid-4.layout b/tests/layouts/valid-4.layout
index b9d4f8fb..95b57a9d 100644
--- a/tests/layouts/valid-4.layout
+++ b/tests/layouts/valid-4.layout
@@ -890,7 +890,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -1113,7 +1113,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -1337,7 +1337,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -1554,7 +1554,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -1784,7 +1784,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
diff --git a/tests/layouts/valid-5.layout b/tests/layouts/valid-5.layout
index 92e2b9ce..57ebaea0 100644
--- a/tests/layouts/valid-5.layout
+++ b/tests/layouts/valid-5.layout
@@ -790,7 +790,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -962,7 +962,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -1146,7 +1146,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -1372,7 +1372,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -1514,7 +1514,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -1702,7 +1702,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
diff --git a/tests/layouts/valid-6.layout b/tests/layouts/valid-6.layout
index c2868598..72dc71c4 100644
--- a/tests/layouts/valid-6.layout
+++ b/tests/layouts/valid-6.layout
@@ -177,7 +177,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -213,7 +213,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Noto Color Emoji 11",
               "checksum" : "054c1c2e2ca956b920262840dcad39dcf27bb88d6f70b892b2b1180de2c2ab47",
@@ -247,7 +247,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
diff --git a/tests/layouts/valid-7.layout b/tests/layouts/valid-7.layout
index 7324e650..9c433d51 100644
--- a/tests/layouts/valid-7.layout
+++ b/tests/layouts/valid-7.layout
@@ -351,7 +351,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -453,7 +453,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "common",
+            "script" : "Zyyy",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -496,7 +496,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -558,7 +558,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
diff --git a/tests/layouts/valid-8.layout b/tests/layouts/valid-8.layout
index e5cedbba..72dd0b27 100644
--- a/tests/layouts/valid-8.layout
+++ b/tests/layouts/valid-8.layout
@@ -172,7 +172,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -238,7 +238,7 @@
             "bidi-level" : 1,
             "gravity" : "south",
             "language" : "he",
-            "script" : "hebrew",
+            "script" : "Hebr",
             "font" : {
               "description" : "DejaVu Sans 11",
               "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01",
@@ -289,7 +289,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "he",
-            "script" : "hebrew",
+            "script" : "Hebr",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -325,7 +325,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "el",
-            "script" : "greek",
+            "script" : "Grek",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
diff --git a/tests/layouts/valid-9.layout b/tests/layouts/valid-9.layout
index 5cdf53f9..9a46f5a4 100644
--- a/tests/layouts/valid-9.layout
+++ b/tests/layouts/valid-9.layout
@@ -177,7 +177,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -263,7 +263,7 @@
             "bidi-level" : 1,
             "gravity" : "south",
             "language" : "he",
-            "script" : "hebrew",
+            "script" : "Hebr",
             "font" : {
               "description" : "DejaVu Sans 11",
               "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01",
@@ -324,7 +324,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "he",
-            "script" : "hebrew",
+            "script" : "Hebr",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -376,7 +376,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "el",
-            "script" : "greek",
+            "script" : "Grek",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
@@ -455,7 +455,7 @@
             "bidi-level" : 0,
             "gravity" : "south",
             "language" : "el",
-            "script" : "greek",
+            "script" : "Grek",
             "font" : {
               "description" : "Cantarell 11",
               "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2",
diff --git a/tests/layouts/vertical.layout b/tests/layouts/vertical.layout
index e8619bfb..b4980d54 100644
--- a/tests/layouts/vertical.layout
+++ b/tests/layouts/vertical.layout
@@ -107,7 +107,7 @@
             "bidi-level" : 0,
             "gravity" : "east",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Noto Sans CJK JP Rotated-Left 24",
               "checksum" : "3b50ae56f1fb5637c82d785945531f718f40b78a26bea3d137e58808bd774399",
@@ -128,7 +128,7 @@
               {
                 "glyph" : 1,
                 "width" : 32768,
-                "x-offset" : 28835,
+                "x-offset" : 28836,
                 "y-offset" : 9945,
                 "is-cluster-start" : true,
                 "log-cluster" : 0
@@ -136,7 +136,7 @@
               {
                 "glyph" : 2,
                 "width" : 32768,
-                "x-offset" : 28835,
+                "x-offset" : 28836,
                 "y-offset" : 10764,
                 "is-cluster-start" : true,
                 "log-cluster" : 1
@@ -144,8 +144,8 @@
               {
                 "glyph" : 3,
                 "width" : 32768,
-                "x-offset" : 28835,
-                "y-offset" : 10452,
+                "x-offset" : 28836,
+                "y-offset" : 10453,
                 "is-cluster-start" : true,
                 "log-cluster" : 2
               }
@@ -158,7 +158,7 @@
             "bidi-level" : 0,
             "gravity" : "east",
             "language" : "xx",
-            "script" : "han",
+            "script" : "Hani",
             "font" : {
               "description" : "Noto Sans CJK JP Rotated-Left 24",
               "checksum" : "3b50ae56f1fb5637c82d785945531f718f40b78a26bea3d137e58808bd774399",
@@ -179,24 +179,24 @@
               {
                 "glyph" : 4,
                 "width" : 32768,
-                "x-offset" : 28835,
-                "y-offset" : 16383,
+                "x-offset" : 28836,
+                "y-offset" : 16384,
                 "is-cluster-start" : true,
                 "log-cluster" : 0
               },
               {
                 "glyph" : 5,
                 "width" : 32768,
-                "x-offset" : 28835,
-                "y-offset" : 16383,
+                "x-offset" : 28836,
+                "y-offset" : 16384,
                 "is-cluster-start" : true,
                 "log-cluster" : 3
               },
               {
                 "glyph" : 7,
                 "width" : 32768,
-                "x-offset" : 28835,
-                "y-offset" : 16383,
+                "x-offset" : 28836,
+                "y-offset" : 16384,
                 "is-cluster-start" : true,
                 "log-cluster" : 6
               }
@@ -209,7 +209,7 @@
             "bidi-level" : 0,
             "gravity" : "east",
             "language" : "en-us",
-            "script" : "latin",
+            "script" : "Latn",
             "font" : {
               "description" : "Noto Sans CJK JP Rotated-Left 24",
               "checksum" : "3b50ae56f1fb5637c82d785945531f718f40b78a26bea3d137e58808bd774399",
@@ -230,7 +230,7 @@
               {
                 "glyph" : 1,
                 "width" : 32768,
-                "x-offset" : 28835,
+                "x-offset" : 28836,
                 "y-offset" : 9945,
                 "is-cluster-start" : true,
                 "log-cluster" : 0
@@ -238,7 +238,7 @@
               {
                 "glyph" : 2,
                 "width" : 32768,
-                "x-offset" : 28835,
+                "x-offset" : 28836,
                 "y-offset" : 10764,
                 "is-cluster-start" : true,
                 "log-cluster" : 1
@@ -246,8 +246,8 @@
               {
                 "glyph" : 3,
                 "width" : 32768,
-                "x-offset" : 28835,
-                "y-offset" : 10452,
+                "x-offset" : 28836,
+                "y-offset" : 10453,
                 "is-cluster-start" : true,
                 "log-cluster" : 2
               }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]