[pango/pango2: 151/301] Regenerate layout tests




commit 2b9335bb3177b2541e4579f4c7f62d9cbe4fd38e
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Jun 10 22:21:12 2022 -0400

    Regenerate layout tests

 tests/layouts/tab-crash.layout | 2021 ++++++----------------------------------
 tests/layouts/valid-10.layout  |   75 +-
 tests/layouts/valid-14.layout  |  104 +--
 tests/layouts/valid-19.layout  |   66 +-
 tests/layouts/valid-6.layout   |   34 +-
 tests/layouts/valid-8.layout   |   75 +-
 tests/layouts/valid-9.layout   |   96 +-
 7 files changed, 331 insertions(+), 2140 deletions(-)
---
diff --git a/tests/layouts/tab-crash.layout b/tests/layouts/tab-crash.layout
index bb4261415..d90c374e8 100644
--- a/tests/layouts/tab-crash.layout
+++ b/tests/layouts/tab-crash.layout
@@ -605,8 +605,8 @@
           "runs" : [
             {
               "offset" : 0,
-              "length" : 1,
-              "text" : "i",
+              "length" : 55,
+              "text" : "id=3 UNION ALL SELECT NULL, NULL, CONCAT(0x7373737373, ",
               "bidi-level" : 0,
               "gravity" : "south",
               "language" : "en-us",
@@ -625,917 +625,358 @@
                   "width" : 10240,
                   "is-cluster-start" : true,
                   "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 1,
-              "length" : 1,
-              "text" : "d",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                },
                 {
                   "glyph" : 71,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 2,
-              "length" : 1,
-              "text" : "=",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 1
+                },
                 {
                   "glyph" : 32,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 3,
-              "length" : 2,
-              "text" : "3 ",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 2
+                },
                 {
                   "glyph" : 22,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
+                  "log-cluster" : 3
                 },
                 {
                   "glyph" : 3,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 1
-                }
-              ]
-            },
-            {
-              "offset" : 5,
-              "length" : 1,
-              "text" : "U",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 4
+                },
                 {
                   "glyph" : 56,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 6,
-              "length" : 1,
-              "text" : "N",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 5
+                },
                 {
                   "glyph" : 49,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 7,
-              "length" : 1,
-              "text" : "I",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 6
+                },
                 {
                   "glyph" : 44,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 8,
-              "length" : 1,
-              "text" : "O",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 7
+                },
                 {
                   "glyph" : 50,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 9,
-              "length" : 2,
-              "text" : "N ",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 8
+                },
                 {
                   "glyph" : 49,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
+                  "log-cluster" : 9
                 },
                 {
                   "glyph" : 3,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 1
-                }
-              ]
-            },
-            {
-              "offset" : 11,
-              "length" : 1,
-              "text" : "A",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 10
+                },
                 {
                   "glyph" : 36,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 12,
-              "length" : 3,
-              "text" : "LL ",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 11
+                },
                 {
                   "glyph" : 47,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
+                  "log-cluster" : 12
                 },
                 {
                   "glyph" : 47,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 1
+                  "log-cluster" : 13
                 },
                 {
                   "glyph" : 3,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 2
-                }
-              ]
-            },
-            {
-              "offset" : 15,
-              "length" : 1,
-              "text" : "S",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 14
+                },
                 {
                   "glyph" : 54,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 16,
-              "length" : 1,
-              "text" : "E",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 15
+                },
                 {
                   "glyph" : 40,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 17,
-              "length" : 1,
-              "text" : "L",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 16
+                },
                 {
                   "glyph" : 47,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 18,
-              "length" : 1,
-              "text" : "E",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 17
+                },
                 {
                   "glyph" : 40,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 19,
-              "length" : 1,
-              "text" : "C",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 18
+                },
                 {
                   "glyph" : 38,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 20,
-              "length" : 2,
-              "text" : "T ",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 19
+                },
                 {
                   "glyph" : 55,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
+                  "log-cluster" : 20
                 },
                 {
                   "glyph" : 3,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 1
-                }
-              ]
-            },
-            {
-              "offset" : 22,
-              "length" : 1,
-              "text" : "N",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 21
+                },
                 {
                   "glyph" : 49,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 23,
-              "length" : 1,
-              "text" : "U",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 22
+                },
                 {
                   "glyph" : 56,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 24,
-              "length" : 2,
-              "text" : "LL",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 23
+                },
                 {
                   "glyph" : 47,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
+                  "log-cluster" : 24
                 },
                 {
                   "glyph" : 47,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 1
-                }
-              ]
-            },
-            {
-              "offset" : 26,
-              "length" : 2,
-              "text" : ", ",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 25
+                },
                 {
                   "glyph" : 15,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
+                  "log-cluster" : 26
                 },
                 {
                   "glyph" : 3,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 1
-                }
-              ]
-            },
-            {
-              "offset" : 28,
-              "length" : 1,
-              "text" : "N",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 27
+                },
                 {
                   "glyph" : 49,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 29,
-              "length" : 1,
-              "text" : "U",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 28
+                },
                 {
                   "glyph" : 56,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 30,
-              "length" : 2,
-              "text" : "LL",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 29
+                },
                 {
                   "glyph" : 47,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
+                  "log-cluster" : 30
                 },
                 {
                   "glyph" : 47,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 1
-                }
-              ]
-            },
-            {
-              "offset" : 32,
-              "length" : 2,
-              "text" : ", ",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 31
+                },
                 {
                   "glyph" : 15,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
+                  "log-cluster" : 32
                 },
                 {
                   "glyph" : 3,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 1
-                }
-              ]
-            },
-            {
-              "offset" : 34,
-              "length" : 1,
-              "text" : "C",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 33
+                },
                 {
                   "glyph" : 38,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 35,
-              "length" : 1,
-              "text" : "O",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 34
+                },
                 {
                   "glyph" : 50,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 36,
-              "length" : 1,
-              "text" : "N",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 35
+                },
                 {
                   "glyph" : 49,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 37,
-              "length" : 1,
-              "text" : "C",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 36
+                },
                 {
                   "glyph" : 38,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 38,
-              "length" : 1,
-              "text" : "A",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 37
+                },
                 {
                   "glyph" : 36,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 39,
-              "length" : 1,
-              "text" : "T",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 38
+                },
                 {
                   "glyph" : 55,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 40,
-              "length" : 1,
-              "text" : "(",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 39
+                },
                 {
                   "glyph" : 11,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 41,
-              "length" : 1,
-              "text" : "0",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 40
+                },
                 {
                   "glyph" : 19,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 42,
-              "length" : 1,
-              "text" : "x",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 41
+                },
                 {
                   "glyph" : 91,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 43,
-              "length" : 1,
-              "text" : "7",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 42
+                },
                 {
                   "glyph" : 26,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
+                  "log-cluster" : 43
+                },
+                {
+                  "glyph" : 22,
+                  "width" : 10240,
+                  "is-cluster-start" : true,
+                  "log-cluster" : 44
+                },
+                {
+                  "glyph" : 26,
+                  "width" : 10240,
+                  "is-cluster-start" : true,
+                  "log-cluster" : 45
+                },
+                {
+                  "glyph" : 22,
+                  "width" : 10240,
+                  "is-cluster-start" : true,
+                  "log-cluster" : 46
+                },
+                {
+                  "glyph" : 26,
+                  "width" : 10240,
+                  "is-cluster-start" : true,
+                  "log-cluster" : 47
+                },
+                {
+                  "glyph" : 22,
+                  "width" : 10240,
+                  "is-cluster-start" : true,
+                  "log-cluster" : 48
+                },
+                {
+                  "glyph" : 26,
+                  "width" : 10240,
+                  "is-cluster-start" : true,
+                  "log-cluster" : 49
+                },
+                {
+                  "glyph" : 22,
+                  "width" : 10240,
+                  "is-cluster-start" : true,
+                  "log-cluster" : 50
+                },
+                {
+                  "glyph" : 26,
+                  "width" : 10240,
+                  "is-cluster-start" : true,
+                  "log-cluster" : 51
+                },
+                {
+                  "glyph" : 22,
+                  "width" : 10240,
+                  "is-cluster-start" : true,
+                  "log-cluster" : 52
+                },
+                {
+                  "glyph" : 15,
+                  "width" : 10240,
+                  "is-cluster-start" : true,
+                  "log-cluster" : 53
+                },
+                {
+                  "glyph" : 268435455,
+                  "width" : 0,
+                  "is-cluster-start" : true,
+                  "log-cluster" : 54
                 }
               ]
-            },
+            }
+          ]
+        }
+      },
+      {
+        "position" : [
+          0,
+          34280
+        ],
+        "line" : {
+          "start-index" : 55,
+          "length" : 25,
+          "start-offset" : 55,
+          "n-chars" : 25,
+          "wrapped" : true,
+          "ellipsized" : false,
+          "hyphenated" : false,
+          "justified" : false,
+          "paragraph-start" : false,
+          "paragraph-end" : false,
+          "direction" : "ltr",
+          "runs" : [
             {
-              "offset" : 44,
-              "length" : 1,
-              "text" : "3",
+              "offset" : 55,
+              "length" : 25,
+              "text" : "0x73323173656374657374), ",
               "bidi-level" : 0,
               "gravity" : "south",
               "language" : "en-us",
@@ -1550,849 +991,154 @@
               "end-x-offset" : 0,
               "glyphs" : [
                 {
-                  "glyph" : 22,
-                  "width" : 10240,
-                  "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 45,
-              "length" : 1,
-              "text" : "7",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
-                {
-                  "glyph" : 26,
-                  "width" : 10240,
-                  "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 46,
-              "length" : 1,
-              "text" : "3",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
-                {
-                  "glyph" : 22,
-                  "width" : 10240,
-                  "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 47,
-              "length" : 1,
-              "text" : "7",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
-                {
-                  "glyph" : 26,
-                  "width" : 10240,
-                  "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 48,
-              "length" : 1,
-              "text" : "3",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
-                {
-                  "glyph" : 22,
-                  "width" : 10240,
-                  "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 49,
-              "length" : 1,
-              "text" : "7",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
-                {
-                  "glyph" : 26,
-                  "width" : 10240,
-                  "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 50,
-              "length" : 1,
-              "text" : "3",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
-                {
-                  "glyph" : 22,
-                  "width" : 10240,
-                  "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 51,
-              "length" : 1,
-              "text" : "7",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
-                {
-                  "glyph" : 26,
-                  "width" : 10240,
-                  "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 52,
-              "length" : 1,
-              "text" : "3",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
-                {
-                  "glyph" : 22,
-                  "width" : 10240,
-                  "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 53,
-              "length" : 2,
-              "text" : ", ",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
-                {
-                  "glyph" : 15,
+                  "glyph" : 19,
                   "width" : 10240,
                   "is-cluster-start" : true,
                   "log-cluster" : 0
                 },
-                {
-                  "glyph" : 268435455,
-                  "width" : 0,
-                  "is-cluster-start" : true,
-                  "log-cluster" : 1
-                }
-              ]
-            }
-          ]
-        }
-      },
-      {
-        "position" : [
-          0,
-          34280
-        ],
-        "line" : {
-          "start-index" : 55,
-          "length" : 25,
-          "start-offset" : 55,
-          "n-chars" : 25,
-          "wrapped" : true,
-          "ellipsized" : false,
-          "hyphenated" : false,
-          "justified" : false,
-          "paragraph-start" : false,
-          "paragraph-end" : false,
-          "direction" : "ltr",
-          "runs" : [
-            {
-              "offset" : 55,
-              "length" : 1,
-              "text" : "0",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
-                {
-                  "glyph" : 19,
-                  "width" : 10240,
-                  "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 56,
-              "length" : 1,
-              "text" : "x",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
                 {
                   "glyph" : 91,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 57,
-              "length" : 1,
-              "text" : "7",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
-                {
-                  "glyph" : 26,
-                  "width" : 10240,
-                  "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 58,
-              "length" : 2,
-              "text" : "33",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
-                {
-                  "glyph" : 22,
-                  "width" : 10240,
-                  "is-cluster-start" : true,
-                  "log-cluster" : 0
-                },
-                {
-                  "glyph" : 22,
-                  "width" : 10240,
-                  "is-cluster-start" : true,
                   "log-cluster" : 1
-                }
-              ]
-            },
-            {
-              "offset" : 60,
-              "length" : 1,
-              "text" : "2",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
-                {
-                  "glyph" : 21,
-                  "width" : 10240,
-                  "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 61,
-              "length" : 1,
-              "text" : "3",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
-                {
-                  "glyph" : 22,
-                  "width" : 10240,
-                  "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 62,
-              "length" : 1,
-              "text" : "1",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
-                {
-                  "glyph" : 20,
-                  "width" : 10240,
-                  "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 63,
-              "length" : 1,
-              "text" : "7",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                },
                 {
                   "glyph" : 26,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 64,
-              "length" : 1,
-              "text" : "3",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
-                {
-                  "glyph" : 22,
-                  "width" : 10240,
-                  "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 65,
-              "length" : 1,
-              "text" : "6",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 2
+                },
                 {
-                  "glyph" : 25,
-                  "width" : 10240,
-                  "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 66,
-              "length" : 1,
-              "text" : "5",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "glyph" : 22,
+                  "width" : 10240,
+                  "is-cluster-start" : true,
+                  "log-cluster" : 3
+                },
                 {
-                  "glyph" : 24,
+                  "glyph" : 22,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 67,
-              "length" : 1,
-              "text" : "6",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 4
+                },
                 {
-                  "glyph" : 25,
+                  "glyph" : 21,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 68,
-              "length" : 1,
-              "text" : "3",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 5
+                },
                 {
                   "glyph" : 22,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 69,
-              "length" : 1,
-              "text" : "7",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 6
+                },
+                {
+                  "glyph" : 20,
+                  "width" : 10240,
+                  "is-cluster-start" : true,
+                  "log-cluster" : 7
+                },
                 {
                   "glyph" : 26,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 70,
-              "length" : 1,
-              "text" : "4",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 8
+                },
                 {
-                  "glyph" : 23,
+                  "glyph" : 22,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 71,
-              "length" : 1,
-              "text" : "6",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 9
+                },
                 {
                   "glyph" : 25,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 72,
-              "length" : 1,
-              "text" : "5",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 10
+                },
                 {
                   "glyph" : 24,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 73,
-              "length" : 1,
-              "text" : "7",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 11
+                },
                 {
-                  "glyph" : 26,
+                  "glyph" : 25,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 74,
-              "length" : 1,
-              "text" : "3",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 12
+                },
                 {
                   "glyph" : 22,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 75,
-              "length" : 1,
-              "text" : "7",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 13
+                },
                 {
                   "glyph" : 26,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 76,
-              "length" : 1,
-              "text" : "4",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 14
+                },
                 {
                   "glyph" : 23,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 77,
-              "length" : 1,
-              "text" : ")",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 15
+                },
+                {
+                  "glyph" : 25,
+                  "width" : 10240,
+                  "is-cluster-start" : true,
+                  "log-cluster" : 16
+                },
+                {
+                  "glyph" : 24,
+                  "width" : 10240,
+                  "is-cluster-start" : true,
+                  "log-cluster" : 17
+                },
+                {
+                  "glyph" : 26,
+                  "width" : 10240,
+                  "is-cluster-start" : true,
+                  "log-cluster" : 18
+                },
+                {
+                  "glyph" : 22,
+                  "width" : 10240,
+                  "is-cluster-start" : true,
+                  "log-cluster" : 19
+                },
+                {
+                  "glyph" : 26,
+                  "width" : 10240,
+                  "is-cluster-start" : true,
+                  "log-cluster" : 20
+                },
+                {
+                  "glyph" : 23,
+                  "width" : 10240,
+                  "is-cluster-start" : true,
+                  "log-cluster" : 21
+                },
                 {
                   "glyph" : 12,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 78,
-              "length" : 2,
-              "text" : ", ",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 22
+                },
                 {
                   "glyph" : 15,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
+                  "log-cluster" : 23
                 },
                 {
                   "glyph" : 268435455,
                   "width" : 0,
                   "is-cluster-start" : true,
-                  "log-cluster" : 1
+                  "log-cluster" : 24
                 }
               ]
             }
@@ -2419,8 +1165,8 @@
           "runs" : [
             {
               "offset" : 80,
-              "length" : 1,
-              "text" : "N",
+              "length" : 6,
+              "text" : "NULL--",
               "bidi-level" : 0,
               "gravity" : "south",
               "language" : "en-us",
@@ -2439,93 +1185,36 @@
                   "width" : 10240,
                   "is-cluster-start" : true,
                   "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 81,
-              "length" : 1,
-              "text" : "U",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                },
                 {
                   "glyph" : 56,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 82,
-              "length" : 2,
-              "text" : "LL",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 1
+                },
                 {
                   "glyph" : 47,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
+                  "log-cluster" : 2
                 },
                 {
                   "glyph" : 47,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 1
-                }
-              ]
-            },
-            {
-              "offset" : 84,
-              "length" : 2,
-              "text" : "--",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 3
+                },
                 {
                   "glyph" : 16,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
+                  "log-cluster" : 4
                 },
                 {
                   "glyph" : 16,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 1
+                  "log-cluster" : 5
                 }
               ]
             },
@@ -2631,8 +1320,8 @@
             },
             {
               "offset" : 90,
-              "length" : 2,
-              "text" : "--",
+              "length" : 10,
+              "text" : "-->(MYSQL)",
               "bidi-level" : 0,
               "gravity" : "south",
               "language" : "en-us",
@@ -2657,206 +1346,54 @@
                   "width" : 10240,
                   "is-cluster-start" : true,
                   "log-cluster" : 1
-                }
-              ]
-            },
-            {
-              "offset" : 92,
-              "length" : 1,
-              "text" : ">",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                },
                 {
                   "glyph" : 33,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 93,
-              "length" : 1,
-              "text" : "(",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 2
+                },
                 {
                   "glyph" : 11,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 94,
-              "length" : 1,
-              "text" : "M",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 3
+                },
                 {
                   "glyph" : 48,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 95,
-              "length" : 1,
-              "text" : "Y",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 4
+                },
                 {
                   "glyph" : 60,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 96,
-              "length" : 1,
-              "text" : "S",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 5
+                },
                 {
                   "glyph" : 54,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 97,
-              "length" : 1,
-              "text" : "Q",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 6
+                },
                 {
                   "glyph" : 52,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 98,
-              "length" : 1,
-              "text" : "L",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 7
+                },
                 {
                   "glyph" : 47,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 99,
-              "length" : 1,
-              "text" : ")",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "DejaVu Sans Mono 12",
-                "checksum" : "84c5467cadd1f6f23db0d9fbb6377e0d301334d3b5f36e6d5acebd34d0857d3a"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 8
+                },
                 {
                   "glyph" : 12,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
+                  "log-cluster" : 9
                 }
               ]
             }
diff --git a/tests/layouts/valid-10.layout b/tests/layouts/valid-10.layout
index 32041025d..865dbd7c0 100644
--- a/tests/layouts/valid-10.layout
+++ b/tests/layouts/valid-10.layout
@@ -233,9 +233,9 @@
               ]
             },
             {
-              "offset" : 12,
-              "length" : 2,
-              "text" : "ם",
+              "offset" : 6,
+              "length" : 8,
+              "text" : "שלום",
               "bidi-level" : 1,
               "gravity" : "south",
               "language" : "he",
@@ -253,77 +253,20 @@
                   "glyph" : 1332,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 10,
-              "length" : 2,
-              "text" : "ו",
-              "bidi-level" : 1,
-              "gravity" : "south",
-              "language" : "he",
-              "script" : "Hebr",
-              "font" : {
-                "description" : "DejaVu Sans 11",
-                "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 6
+                },
                 {
                   "glyph" : 1324,
                   "width" : 4096,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 8,
-              "length" : 2,
-              "text" : "ל",
-              "bidi-level" : 1,
-              "gravity" : "south",
-              "language" : "he",
-              "script" : "Hebr",
-              "font" : {
-                "description" : "DejaVu Sans 11",
-                "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 4
+                },
                 {
                   "glyph" : 1331,
                   "width" : 8192,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 6,
-              "length" : 2,
-              "text" : "ש",
-              "bidi-level" : 1,
-              "gravity" : "south",
-              "language" : "he",
-              "script" : "Hebr",
-              "font" : {
-                "description" : "DejaVu Sans 11",
-                "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 2
+                },
                 {
                   "glyph" : 1344,
                   "width" : 10240,
diff --git a/tests/layouts/valid-14.layout b/tests/layouts/valid-14.layout
index b165611bb..d81f90e71 100644
--- a/tests/layouts/valid-14.layout
+++ b/tests/layouts/valid-14.layout
@@ -201,8 +201,8 @@
           "runs" : [
             {
               "offset" : 0,
-              "length" : 3,
-              "text" : "你",
+              "length" : 7,
+              "text" : "你好 ",
               "bidi-level" : 0,
               "gravity" : "south",
               "language" : "xx",
@@ -221,37 +221,18 @@
                   "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" : "DejaVu Sans 11",
-                "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                },
                 {
                   "glyph" : 268458365,
                   "width" : 11264,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
+                  "log-cluster" : 3
                 },
                 {
                   "glyph" : 3,
                   "width" : 5120,
                   "is-cluster-start" : true,
-                  "log-cluster" : 3
+                  "log-cluster" : 6
                 }
               ]
             },
@@ -311,9 +292,9 @@
               ]
             },
             {
-              "offset" : 19,
-              "length" : 2,
-              "text" : "ם",
+              "offset" : 13,
+              "length" : 8,
+              "text" : "שלום",
               "bidi-level" : 1,
               "gravity" : "south",
               "language" : "he",
@@ -331,77 +312,20 @@
                   "glyph" : 1332,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 17,
-              "length" : 2,
-              "text" : "ו",
-              "bidi-level" : 1,
-              "gravity" : "south",
-              "language" : "he",
-              "script" : "Hebr",
-              "font" : {
-                "description" : "DejaVu Sans 11",
-                "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 6
+                },
                 {
                   "glyph" : 1324,
                   "width" : 4096,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 15,
-              "length" : 2,
-              "text" : "ל",
-              "bidi-level" : 1,
-              "gravity" : "south",
-              "language" : "he",
-              "script" : "Hebr",
-              "font" : {
-                "description" : "DejaVu Sans 11",
-                "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 4
+                },
                 {
                   "glyph" : 1331,
                   "width" : 8192,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 13,
-              "length" : 2,
-              "text" : "ש",
-              "bidi-level" : 1,
-              "gravity" : "south",
-              "language" : "he",
-              "script" : "Hebr",
-              "font" : {
-                "description" : "DejaVu Sans 11",
-                "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 2
+                },
                 {
                   "glyph" : 1344,
                   "width" : 10240,
diff --git a/tests/layouts/valid-19.layout b/tests/layouts/valid-19.layout
index dd85b1e34..671f8a11f 100644
--- a/tests/layouts/valid-19.layout
+++ b/tests/layouts/valid-19.layout
@@ -159,7 +159,7 @@
     "ellipsized" : false,
     "hypenated" : false,
     "unknown-glyphs" : 0,
-    "width" : 203776,
+    "width" : 166912,
     "height" : 18430,
     "lines" : [
       {
@@ -276,34 +276,8 @@
             },
             {
               "offset" : 16,
-              "length" : 4,
-              "text" : "🇩",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Zyyy",
-              "font" : {
-                "description" : "Noto Color Emoji 11",
-                "checksum" : "054c1c2e2ca956b920262840dcad39dcf27bb88d6f70b892b2b1180de2c2ab47"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
-                {
-                  "glyph" : 8,
-                  "width" : 18432,
-                  "is-cluster-start" : true,
-                  "is-color" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 20,
-              "length" : 4,
-              "text" : "🇪",
+              "length" : 8,
+              "text" : "🇩🇪",
               "bidi-level" : 0,
               "gravity" : "south",
               "language" : "en-us",
@@ -318,7 +292,7 @@
               "end-x-offset" : 0,
               "glyphs" : [
                 {
-                  "glyph" : 9,
+                  "glyph" : 22,
                   "width" : 18432,
                   "is-cluster-start" : true,
                   "is-color" : true,
@@ -404,34 +378,8 @@
             },
             {
               "offset" : 29,
-              "length" : 3,
-              "text" : "✋",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Zyyy",
-              "font" : {
-                "description" : "Noto Color Emoji 11",
-                "checksum" : "054c1c2e2ca956b920262840dcad39dcf27bb88d6f70b892b2b1180de2c2ab47"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
-                {
-                  "glyph" : 7,
-                  "width" : 18432,
-                  "is-cluster-start" : true,
-                  "is-color" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 32,
-              "length" : 4,
-              "text" : "🏾",
+              "length" : 7,
+              "text" : "✋🏾",
               "bidi-level" : 0,
               "gravity" : "south",
               "language" : "en-us",
@@ -446,7 +394,7 @@
               "end-x-offset" : 0,
               "glyphs" : [
                 {
-                  "glyph" : 11,
+                  "glyph" : 21,
                   "width" : 18432,
                   "is-cluster-start" : true,
                   "is-color" : true,
diff --git a/tests/layouts/valid-6.layout b/tests/layouts/valid-6.layout
index 83d5ebdd7..4284b660d 100644
--- a/tests/layouts/valid-6.layout
+++ b/tests/layouts/valid-6.layout
@@ -162,7 +162,7 @@
     "ellipsized" : false,
     "hypenated" : false,
     "unknown-glyphs" : 0,
-    "width" : 160768,
+    "width" : 142336,
     "height" : 18430,
     "lines" : [
       {
@@ -210,8 +210,8 @@
             },
             {
               "offset" : 1,
-              "length" : 4,
-              "text" : "0️",
+              "length" : 7,
+              "text" : "0️⃣",
               "bidi-level" : 0,
               "gravity" : "south",
               "language" : "en-us",
@@ -226,33 +226,7 @@
               "end-x-offset" : 0,
               "glyphs" : [
                 {
-                  "glyph" : 3,
-                  "width" : 18432,
-                  "is-cluster-start" : true,
-                  "is-color" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 5,
-              "length" : 3,
-              "text" : "⃣",
-              "bidi-level" : 0,
-              "gravity" : "south",
-              "language" : "en-us",
-              "script" : "Latn",
-              "font" : {
-                "description" : "Noto Color Emoji 11",
-                "checksum" : "054c1c2e2ca956b920262840dcad39dcf27bb88d6f70b892b2b1180de2c2ab47"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
-                {
-                  "glyph" : 5,
+                  "glyph" : 19,
                   "width" : 18432,
                   "is-cluster-start" : true,
                   "is-color" : true,
diff --git a/tests/layouts/valid-8.layout b/tests/layouts/valid-8.layout
index f5a626221..094fcce59 100644
--- a/tests/layouts/valid-8.layout
+++ b/tests/layouts/valid-8.layout
@@ -233,9 +233,9 @@
               ]
             },
             {
-              "offset" : 12,
-              "length" : 2,
-              "text" : "ם",
+              "offset" : 6,
+              "length" : 8,
+              "text" : "שלום",
               "bidi-level" : 1,
               "gravity" : "south",
               "language" : "he",
@@ -253,77 +253,20 @@
                   "glyph" : 1332,
                   "width" : 10240,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 10,
-              "length" : 2,
-              "text" : "ו",
-              "bidi-level" : 1,
-              "gravity" : "south",
-              "language" : "he",
-              "script" : "Hebr",
-              "font" : {
-                "description" : "DejaVu Sans 11",
-                "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 6
+                },
                 {
                   "glyph" : 1324,
                   "width" : 4096,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 8,
-              "length" : 2,
-              "text" : "ל",
-              "bidi-level" : 1,
-              "gravity" : "south",
-              "language" : "he",
-              "script" : "Hebr",
-              "font" : {
-                "description" : "DejaVu Sans 11",
-                "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 4
+                },
                 {
                   "glyph" : 1331,
                   "width" : 8192,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 6,
-              "length" : 2,
-              "text" : "ש",
-              "bidi-level" : 1,
-              "gravity" : "south",
-              "language" : "he",
-              "script" : "Hebr",
-              "font" : {
-                "description" : "DejaVu Sans 11",
-                "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01"
-              },
-              "flags" : 0,
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 2
+                },
                 {
                   "glyph" : 1344,
                   "width" : 10240,
diff --git a/tests/layouts/valid-9.layout b/tests/layouts/valid-9.layout
index bca89f447..24020ffb6 100644
--- a/tests/layouts/valid-9.layout
+++ b/tests/layouts/valid-9.layout
@@ -272,9 +272,9 @@
           "direction" : "ltr",
           "runs" : [
             {
-              "offset" : 12,
-              "length" : 2,
-              "text" : "ם",
+              "offset" : 6,
+              "length" : 8,
+              "text" : "שלום",
               "bidi-level" : 1,
               "gravity" : "south",
               "language" : "he",
@@ -299,100 +299,22 @@
                   "glyph" : 1332,
                   "width" : 14684,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 10,
-              "length" : 2,
-              "text" : "ו",
-              "bidi-level" : 1,
-              "gravity" : "south",
-              "language" : "he",
-              "script" : "Hebr",
-              "font" : {
-                "description" : "DejaVu Sans 11",
-                "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01"
-              },
-              "flags" : 0,
-              "extra-attributes" : [
-                {
-                  "end" : 30,
-                  "type" : "letter-spacing",
-                  "value" : 8888
-                }
-              ],
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 6
+                },
                 {
                   "glyph" : 1324,
                   "width" : 12984,
                   "x-offset" : 4444,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 8,
-              "length" : 2,
-              "text" : "ל",
-              "bidi-level" : 1,
-              "gravity" : "south",
-              "language" : "he",
-              "script" : "Hebr",
-              "font" : {
-                "description" : "DejaVu Sans 11",
-                "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01"
-              },
-              "flags" : 0,
-              "extra-attributes" : [
-                {
-                  "end" : 30,
-                  "type" : "letter-spacing",
-                  "value" : 8888
-                }
-              ],
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 4
+                },
                 {
                   "glyph" : 1331,
                   "width" : 17080,
                   "x-offset" : 4444,
                   "is-cluster-start" : true,
-                  "log-cluster" : 0
-                }
-              ]
-            },
-            {
-              "offset" : 6,
-              "length" : 2,
-              "text" : "ש",
-              "bidi-level" : 1,
-              "gravity" : "south",
-              "language" : "he",
-              "script" : "Hebr",
-              "font" : {
-                "description" : "DejaVu Sans 11",
-                "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01"
-              },
-              "flags" : 0,
-              "extra-attributes" : [
-                {
-                  "end" : 30,
-                  "type" : "letter-spacing",
-                  "value" : 8888
-                }
-              ],
-              "y-offset" : 0,
-              "start-x-offset" : 0,
-              "end-x-offset" : 0,
-              "glyphs" : [
+                  "log-cluster" : 2
+                },
                 {
                   "glyph" : 1344,
                   "width" : 19128,


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