Update test-layout

Use the new output serialization in test-layout
to store both the input and output in the same
file.

1 files changed, 447 insertions, 3 deletions

diff --git a/tests/layouts/valid-14.layout b/tests/layouts/valid-14.layout
index 116cc94f..255f51da 100644
--- a/tests/layouts/valid-14.layout
+++ b/tests/layouts/valid-14.layout
@@ -1,8 +1,452 @@
 {
+  "context" : {
+    "font" : "serif 12",
+    "language" : "en-us",
+    "base-gravity" : "south",
+    "gravity-hint" : "natural",
+    "base-dir" : "weak-ltr",
+    "round-glyph-positions" : true,
+    "transform" : [
+      1.0,
+      0.0,
+      0.0,
+      1.0,
+      0.0,
+      0.0
+    ]
+  },
   "text" : "你好 Hello שלום Γειά σας\n",
-  "attributes" : [],
   "font" : "Cantarell 11",
   "ellipsize" : "start",
   "width" : 161792,
-  "line-spacing" : 1.5
-}
+  "line-spacing" : 1.5,
+  "output" : {
+    "is-wrapped" : false,
+    "is-ellipsized" : true,
+    "width" : 161792,
+    "height" : 48128,
+    "log-attrs" : [
+      {
+        "char-break" : true,
+        "cursor-position" : true,
+        "word-start" : true,
+        "sentence-boundary" : true,
+        "sentence-start" : true,
+        "backspace-deletes-character" : true,
+        "word-boundary" : true
+      },
+      {
+        "line-break" : true,
+        "char-break" : true,
+        "cursor-position" : true,
+        "backspace-deletes-character" : true,
+        "word-boundary" : true
+      },
+      {
+        "char-break" : true,
+        "white" : true,
+        "cursor-position" : true,
+        "word-end" : true,
+        "backspace-deletes-character" : true,
+        "expandable-space" : true,
+        "word-boundary" : true
+      },
+      {
+        "line-break" : true,
+        "char-break" : true,
+        "cursor-position" : true,
+        "word-start" : true,
+        "word-boundary" : true
+      },
+      {
+        "char-break" : true,
+        "cursor-position" : true,
+        "break-inserts-hyphen" : true
+      },
+      {
+        "char-break" : true,
+        "cursor-position" : true,
+        "break-inserts-hyphen" : true
+      },
+      {
+        "char-break" : true,
+        "cursor-position" : true,
+        "break-inserts-hyphen" : true
+      },
+      {
+        "char-break" : true,
+        "cursor-position" : true,
+        "break-inserts-hyphen" : true
+      },
+      {
+        "char-break" : true,
+        "white" : true,
+        "cursor-position" : true,
+        "word-end" : true,
+        "expandable-space" : true,
+        "word-boundary" : true
+      },
+      {
+        "line-break" : true,
+        "char-break" : true,
+        "cursor-position" : true,
+        "word-start" : true,
+        "word-boundary" : true
+      },
+      {
+        "char-break" : true,
+        "cursor-position" : true,
+        "backspace-deletes-character" : true,
+        "break-inserts-hyphen" : true
+      },
+      {
+        "char-break" : true,
+        "cursor-position" : true,
+        "backspace-deletes-character" : true,
+        "break-inserts-hyphen" : true
+      },
+      {
+        "char-break" : true,
+        "cursor-position" : true,
+        "backspace-deletes-character" : true,
+        "break-inserts-hyphen" : true
+      },
+      {
+        "char-break" : true,
+        "white" : true,
+        "cursor-position" : true,
+        "word-end" : true,
+        "backspace-deletes-character" : true,
+        "expandable-space" : true,
+        "word-boundary" : true
+      },
+      {
+        "line-break" : true,
+        "char-break" : true,
+        "cursor-position" : true,
+        "word-start" : true,
+        "word-boundary" : true
+      },
+      {
+        "char-break" : true,
+        "cursor-position" : true,
+        "break-inserts-hyphen" : true
+      },
+      {
+        "char-break" : true,
+        "cursor-position" : true,
+        "break-inserts-hyphen" : true
+      },
+      {
+        "char-break" : true,
+        "cursor-position" : true,
+        "break-inserts-hyphen" : true
+      },
+      {
+        "char-break" : true,
+        "white" : true,
+        "cursor-position" : true,
+        "word-end" : true,
+        "expandable-space" : true,
+        "word-boundary" : true
+      },
+      {
+        "line-break" : true,
+        "char-break" : true,
+        "cursor-position" : true,
+        "word-start" : true,
+        "word-boundary" : true
+      },
+      {
+        "char-break" : true,
+        "cursor-position" : true,
+        "break-inserts-hyphen" : true
+      },
+      {
+        "char-break" : true,
+        "cursor-position" : true,
+        "break-inserts-hyphen" : true
+      },
+      {
+        "char-break" : true,
+        "white" : true,
+        "cursor-position" : true,
+        "word-end" : true,
+        "sentence-end" : true,
+        "word-boundary" : true
+      },
+      {
+        "line-break" : true,
+        "mandatory-break" : true,
+        "char-break" : true,
+        "white" : true,
+        "cursor-position" : true,
+        "sentence-boundary" : true,
+        "backspace-deletes-character" : true,
+        "word-boundary" : true
+      }
+    ],
+    "lines" : [
+      {
+        "start-index" : 0,
+        "length" : 37,
+        "paragraph-start" : true,
+        "direction" : "ltr",
+        "runs" : [
+          {
+            "offset" : 0,
+            "length" : 3,
+            "text" : "你",
+            "bidi-level" : 0,
+            "gravity" : "south",
+            "language" : "en-us",
+            "script" : "common",
+            "font" : "Cantarell 11",
+            "flags" : 2,
+            "extra-attributes" : [
+              {
+                "end" : 2147483647,
+                "type" : "fallback",
+                "value" : true
+              }
+            ],
+            "y-offset" : 0,
+            "start-x-offset" : 0,
+            "end-x-offset" : 0,
+            "glyphs" : [
+              {
+                "glyph" : 1058,
+                "width" : 4096,
+                "is-cluster-start" : true,
+                "log-cluster" : 0
+              },
+              {
+                "glyph" : 1058,
+                "width" : 4096,
+                "log-cluster" : 0
+              },
+              {
+                "glyph" : 1058,
+                "width" : 4096,
+                "log-cluster" : 0
+              }
+            ]
+          },
+          {
+            "offset" : 3,
+            "length" : 4,
+            "text" : "好 ",
+            "bidi-level" : 0,
+            "gravity" : "south",
+            "language" : "xx",
+            "script" : "han",
+            "font" : "Droid Sans 11",
+            "flags" : 0,
+            "y-offset" : 0,
+            "start-x-offset" : 0,
+            "end-x-offset" : 0,
+            "glyphs" : [
+              {
+                "glyph" : 1300,
+                "width" : 15360,
+                "is-cluster-start" : true,
+                "log-cluster" : 0
+              },
+              {
+                "glyph" : 268435488,
+                "width" : 0,
+                "is-cluster-start" : true,
+                "log-cluster" : 3
+              }
+            ]
+          },
+          {
+            "offset" : 7,
+            "length" : 6,
+            "text" : "Hello ",
+            "bidi-level" : 0,
+            "gravity" : "south",
+            "language" : "en-us",
+            "script" : "latin",
+            "font" : "Cantarell 11",
+            "flags" : 0,
+            "y-offset" : 0,
+            "start-x-offset" : 0,
+            "end-x-offset" : 0,
+            "glyphs" : [
+              {
+                "glyph" : 76,
+                "width" : 11264,
+                "is-cluster-start" : true,
+                "log-cluster" : 0
+              },
+              {
+                "glyph" : 287,
+                "width" : 8192,
+                "is-cluster-start" : true,
+                "log-cluster" : 1
+              },
+              {
+                "glyph" : 349,
+                "width" : 4096,
+                "is-cluster-start" : true,
+                "log-cluster" : 2
+              },
+              {
+                "glyph" : 349,
+                "width" : 4096,
+                "is-cluster-start" : true,
+                "log-cluster" : 3
+              },
+              {
+                "glyph" : 370,
+                "width" : 8192,
+                "is-cluster-start" : true,
+                "log-cluster" : 4
+              },
+              {
+                "glyph" : 1109,
+                "width" : 3072,
+                "is-cluster-start" : true,
+                "log-cluster" : 5
+              }
+            ]
+          },
+          {
+            "offset" : 13,
+            "length" : 8,
+            "text" : "שלום",
+            "bidi-level" : 1,
+            "gravity" : "south",
+            "language" : "he",
+            "script" : "hebrew",
+            "font" : "DejaVu Sans 11",
+            "flags" : 0,
+            "y-offset" : 0,
+            "start-x-offset" : 0,
+            "end-x-offset" : 0,
+            "glyphs" : [
+              {
+                "glyph" : 1332,
+                "width" : 10240,
+                "is-cluster-start" : true,
+                "log-cluster" : 6
+              },
+              {
+                "glyph" : 1324,
+                "width" : 4096,
+                "is-cluster-start" : true,
+                "log-cluster" : 4
+              },
+              {
+                "glyph" : 1331,
+                "width" : 8192,
+                "is-cluster-start" : true,
+                "log-cluster" : 2
+              },
+              {
+                "glyph" : 1344,
+                "width" : 10240,
+                "is-cluster-start" : true,
+                "log-cluster" : 0
+              }
+            ]
+          },
+          {
+            "offset" : 21,
+            "length" : 1,
+            "text" : " ",
+            "bidi-level" : 0,
+            "gravity" : "south",
+            "language" : "he",
+            "script" : "hebrew",
+            "font" : "DejaVu Sans 11",
+            "flags" : 0,
+            "y-offset" : 0,
+            "start-x-offset" : 0,
+            "end-x-offset" : 0,
+            "glyphs" : [
+              {
+                "glyph" : 3,
+                "width" : 5120,
+                "is-cluster-start" : true,
+                "log-cluster" : 0
+              }
+            ]
+          },
+          {
+            "offset" : 22,
+            "length" : 15,
+            "text" : "Γειά σας",
+            "bidi-level" : 0,
+            "gravity" : "south",
+            "language" : "el",
+            "script" : "greek",
+            "font" : "Cantarell 11",
+            "flags" : 0,
+            "y-offset" : 0,
+            "start-x-offset" : 0,
+            "end-x-offset" : 0,
+            "glyphs" : [
+              {
+                "glyph" : 677,
+                "width" : 8192,
+                "is-cluster-start" : true,
+                "log-cluster" : 0
+              },
+              {
+                "glyph" : 808,
+                "width" : 7168,
+                "is-cluster-start" : true,
+                "log-cluster" : 2
+              },
+              {
+                "glyph" : 812,
+                "width" : 4096,
+                "is-cluster-start" : true,
+                "log-cluster" : 4
+              },
+              {
+                "glyph" : 837,
+                "width" : 9216,
+                "is-cluster-start" : true,
+                "log-cluster" : 6
+              },
+              {
+                "glyph" : 1109,
+                "width" : 3072,
+                "is-cluster-start" : true,
+                "log-cluster" : 8
+              },
+              {
+                "glyph" : 822,
+                "width" : 9216,
+                "is-cluster-start" : true,
+                "log-cluster" : 9
+              },
+              {
+                "glyph" : 804,
+                "width" : 9216,
+                "is-cluster-start" : true,
+                "log-cluster" : 11
+              },
+              {
+                "glyph" : 821,
+                "width" : 7168,
+                "is-cluster-start" : true,
+                "log-cluster" : 13
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "start-index" : 38,
+        "length" : 0,
+        "paragraph-start" : true,
+        "direction" : "ltr",
+        "runs" : []
+      }
+    ]
+  }
+}
\ No newline at end of file