Merge branch 'misc-cleanups' into 'main'

serializer: Fix a typo

Closes #646

See merge request GNOME/pango!559

39 files changed, 345 insertions, 45 deletions

diff --git a/pango/pango-layout.c b/pango/pango-layout.c
index a3f8b552..3f11d5b0 100644
--- a/pango/pango-layout.c
+++ b/pango/pango-layout.c
@@ -3999,7 +3999,8 @@ process_item (PangoLayout     *layout,
               PangoLayoutLine *line,
               ParaBreakState  *state,
               gboolean         force_fit,
-              gboolean         no_break_at_end)
+              gboolean         no_break_at_end,
+              gboolean         is_last_item)
 {
   PangoItem *item = state->items->data;
   gboolean shape_set = FALSE;
@@ -4214,9 +4215,10 @@ retry_break:
               new_break_width = pango_glyph_string_get_width (glyphs) + tab_width_change (state);
 
               if (num_chars > 0 &&
+                  (item != new_item || !is_last_item) && /* We don't collapse space at the very end */
                   layout->log_attrs[state->start_offset + num_chars - 1].is_white)
                 extra_width = - state->log_widths[state->log_widths_offset + num_chars - 1];
-              else if (item == new_item &&
+              else if (item == new_item && !is_last_item &&
                        break_needs_hyphen (layout, state, num_chars))
                 extra_width = state->hyphen_width;
               else
@@ -4232,7 +4234,7 @@ retry_break:
 
               if (break_num_chars == item->num_chars ||
                   new_break_width + extra_width <= state->remaining_width ||
-                  new_break_width + extra_width <= break_width + break_extra_width)
+                  new_break_width + extra_width < break_width + break_extra_width)
                 {
                   DEBUG1 ("accept breakpoint %d: %d + %d <= %d + %d",
                           num_chars, new_break_width, extra_width, break_width, break_extra_width);
@@ -4486,18 +4488,20 @@ process_line (PangoLayout    *layout,
       int old_num_chars;
       int old_remaining_width;
       gboolean first_item_in_line;
+      gboolean last_item_in_line;
 
       old_num_chars = item->num_chars;
       old_remaining_width = state->remaining_width;
-      first_item_in_line = line->runs != NULL;
+      first_item_in_line = line->runs == NULL;
+      last_item_in_line = state->items->next == NULL;
 
-      result = process_item (layout, line, state, !have_break, FALSE);
+      result = process_item (layout, line, state, !have_break, FALSE, last_item_in_line);
 
       switch (result)
         {
         case BREAK_ALL_FIT:
           if (layout->text[item->offset] != '\t' &&
-              can_break_in (layout, state->start_offset, old_num_chars, first_item_in_line))
+              can_break_in (layout, state->start_offset, old_num_chars, !first_item_in_line))
             {
               have_break = TRUE;
               break_remaining_width = old_remaining_width;
@@ -4541,12 +4545,13 @@ process_line (PangoLayout    *layout,
 
           state->start_offset = break_start_offset;
           state->remaining_width = break_remaining_width;
+          last_item_in_line = state->items->next == NULL;
 
           /* Reshape run to break */
           item = state->items->data;
 
           old_num_chars = item->num_chars;
-          result = process_item (layout, line, state, TRUE, TRUE);
+          result = process_item (layout, line, state, TRUE, TRUE, last_item_in_line);
           g_assert (result == BREAK_SOME_FIT || result == BREAK_EMPTY_FIT);
 
           state->start_offset += old_num_chars - item->num_chars;
@@ -4557,8 +4562,7 @@ process_line (PangoLayout    *layout,
         case BREAK_LINE_SEPARATOR:
           state->items = g_list_delete_link (state->items, state->items);
           state->start_offset += old_num_chars;
-          /* A line-separate is just a forced break.  Set wrapped, so we do
-           * justification */
+          /* A line-separate is just a forced break.  Set wrapped, so we do justification */
           wrapped = TRUE;
           goto done;
 
diff --git a/pango/serializer.c b/pango/serializer.c
index 4780a633..2dab93b4 100644
--- a/pango/serializer.c
+++ b/pango/serializer.c
@@ -742,7 +742,7 @@ add_output (GtkJsonPrinter *printer,
 
   pango_layout_get_size (layout, &width, &height);
   gtk_json_printer_add_integer (printer, "width", width);
-  gtk_json_printer_add_integer (printer, "height", width);
+  gtk_json_printer_add_integer (printer, "height", height);
 
   add_log_attrs (printer, layout);
   gtk_json_printer_start_array (printer, "lines");
diff --git a/tests/layouts/aaa.layout b/tests/layouts/aaa.layout
new file mode 100644
index 00000000..829e74c8
--- /dev/null
+++ b/tests/layouts/aaa.layout
@@ -0,0 +1,295 @@
+{
+  "context" : {
+    "font" : "serif 12",
+    "base-gravity" : "south",
+    "gravity-hint" : "natural",
+    "base-dir" : "weak-ltr",
+    "round-glyph-positions" : true,
+    "transform" : [
+      1,
+      0,
+      0,
+      1,
+      0,
+      0
+    ]
+  },
+  "text" : "aaaa ",
+  "font" : "Monospace 32",
+  "wrap" : "char",
+  "width" : 0,
+  "line-spacing" : 1.2999999523162842,
+  "output" : {
+    "is-wrapped" : true,
+    "is-ellipsized" : false,
+    "unknown-glyphs" : 0,
+    "width" : 41984,
+    "height" : 318464,
+    "log-attrs" : [
+      {
+        "char-break" : true,
+        "cursor-position" : true,
+        "word-start" : true,
+        "sentence-boundary" : true,
+        "sentence-start" : true,
+        "backspace-deletes-character" : 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,
+        "sentence-end" : true,
+        "expandable-space" : true,
+        "word-boundary" : true
+      },
+      {
+        "line-break" : true,
+        "mandatory-break" : true,
+        "char-break" : true,
+        "white" : true,
+        "cursor-position" : true,
+        "sentence-boundary" : true,
+        "word-boundary" : true
+      }
+    ],
+    "lines" : [
+      {
+        "start-index" : 0,
+        "length" : 1,
+        "paragraph-start" : true,
+        "direction" : "ltr",
+        "runs" : [
+          {
+            "offset" : 0,
+            "length" : 1,
+            "text" : "a",
+            "bidi-level" : 0,
+            "gravity" : "south",
+            "language" : "en-us",
+            "script" : "latin",
+            "font" : {
+              "description" : "DejaVu Sans 32",
+              "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01",
+              "matrix" : [
+                1,
+                -0,
+                -0,
+                1,
+                0,
+                0
+              ]
+            },
+            "flags" : 4,
+            "y-offset" : 0,
+            "start-x-offset" : 0,
+            "end-x-offset" : 0,
+            "glyphs" : [
+              {
+                "glyph" : 68,
+                "width" : 26624,
+                "is-cluster-start" : true,
+                "log-cluster" : 0
+              },
+              {
+                "glyph" : 2803,
+                "width" : 15360,
+                "log-cluster" : 0
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "start-index" : 1,
+        "length" : 1,
+        "paragraph-start" : false,
+        "direction" : "ltr",
+        "runs" : [
+          {
+            "offset" : 1,
+            "length" : 1,
+            "text" : "a",
+            "bidi-level" : 0,
+            "gravity" : "south",
+            "language" : "en-us",
+            "script" : "latin",
+            "font" : {
+              "description" : "DejaVu Sans 32",
+              "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01",
+              "matrix" : [
+                1,
+                -0,
+                -0,
+                1,
+                0,
+                0
+              ]
+            },
+            "flags" : 4,
+            "y-offset" : 0,
+            "start-x-offset" : 0,
+            "end-x-offset" : 0,
+            "glyphs" : [
+              {
+                "glyph" : 68,
+                "width" : 26624,
+                "is-cluster-start" : true,
+                "log-cluster" : 0
+              },
+              {
+                "glyph" : 2803,
+                "width" : 15360,
+                "log-cluster" : 0
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "start-index" : 2,
+        "length" : 1,
+        "paragraph-start" : false,
+        "direction" : "ltr",
+        "runs" : [
+          {
+            "offset" : 2,
+            "length" : 1,
+            "text" : "a",
+            "bidi-level" : 0,
+            "gravity" : "south",
+            "language" : "en-us",
+            "script" : "latin",
+            "font" : {
+              "description" : "DejaVu Sans 32",
+              "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01",
+              "matrix" : [
+                1,
+                -0,
+                -0,
+                1,
+                0,
+                0
+              ]
+            },
+            "flags" : 4,
+            "y-offset" : 0,
+            "start-x-offset" : 0,
+            "end-x-offset" : 0,
+            "glyphs" : [
+              {
+                "glyph" : 68,
+                "width" : 26624,
+                "is-cluster-start" : true,
+                "log-cluster" : 0
+              },
+              {
+                "glyph" : 2803,
+                "width" : 15360,
+                "log-cluster" : 0
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "start-index" : 3,
+        "length" : 1,
+        "paragraph-start" : false,
+        "direction" : "ltr",
+        "runs" : [
+          {
+            "offset" : 3,
+            "length" : 1,
+            "text" : "a",
+            "bidi-level" : 0,
+            "gravity" : "south",
+            "language" : "en-us",
+            "script" : "latin",
+            "font" : {
+              "description" : "DejaVu Sans 32",
+              "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01",
+              "matrix" : [
+                1,
+                -0,
+                -0,
+                1,
+                0,
+                0
+              ]
+            },
+            "flags" : 0,
+            "y-offset" : 0,
+            "start-x-offset" : 0,
+            "end-x-offset" : 0,
+            "glyphs" : [
+              {
+                "glyph" : 68,
+                "width" : 26624,
+                "is-cluster-start" : true,
+                "log-cluster" : 0
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "start-index" : 4,
+        "length" : 1,
+        "paragraph-start" : false,
+        "direction" : "ltr",
+        "runs" : [
+          {
+            "offset" : 4,
+            "length" : 1,
+            "text" : " ",
+            "bidi-level" : 0,
+            "gravity" : "south",
+            "language" : "en-us",
+            "script" : "latin",
+            "font" : {
+              "description" : "DejaVu Sans 32",
+              "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01",
+              "matrix" : [
+                1,
+                -0,
+                -0,
+                1,
+                0,
+                0
+              ]
+            },
+            "flags" : 0,
+            "y-offset" : 0,
+            "start-x-offset" : 0,
+            "end-x-offset" : 0,
+            "glyphs" : [
+              {
+                "glyph" : 3,
+                "width" : 14336,
+                "is-cluster-start" : true,
+                "log-cluster" : 0
+              }
+            ]
+          }
+        ]
+      }
+    ]
+  }
+}
diff --git a/tests/layouts/arabic-format.layout b/tests/layouts/arabic-format.layout
index 630a0f03..83c3d5ab 100644
--- a/tests/layouts/arabic-format.layout
+++ b/tests/layouts/arabic-format.layout
@@ -22,7 +22,7 @@
     "is-ellipsized" : false,
     "unknown-glyphs" : 0,
     "width" : 56320,
-    "height" : 56320,
+    "height" : 77824,
     "log-attrs" : [
       {
         "char-break" : true,
diff --git a/tests/layouts/bratwurst.layout b/tests/layouts/bratwurst.layout
index 14979a1a..06ec8272 100644
--- a/tests/layouts/bratwurst.layout
+++ b/tests/layouts/bratwurst.layout
@@ -31,7 +31,7 @@
     "is-ellipsized" : false,
     "unknown-glyphs" : 0,
     "width" : 200704,
-    "height" : 200704,
+    "height" : 53248,
     "log-attrs" : [
       {
         "char-break" : true,
diff --git a/tests/layouts/bratwurst2.layout b/tests/layouts/bratwurst2.layout
index 311a2994..0c3be229 100644
--- a/tests/layouts/bratwurst2.layout
+++ b/tests/layouts/bratwurst2.layout
@@ -24,7 +24,7 @@
     "is-ellipsized" : false,
     "unknown-glyphs" : 0,
     "width" : 200704,
-    "height" : 200704,
+    "height" : 53248,
     "log-attrs" : [
       {
         "char-break" : true,
diff --git a/tests/layouts/bratwurst3.layout b/tests/layouts/bratwurst3.layout
index 6ce03c16..42c6a487 100644
--- a/tests/layouts/bratwurst3.layout
+++ b/tests/layouts/bratwurst3.layout
@@ -25,7 +25,7 @@
     "is-ellipsized" : false,
     "unknown-glyphs" : 0,
     "width" : 78848,
-    "height" : 78848,
+    "height" : 212992,
     "log-attrs" : [
       {
         "char-break" : true,
diff --git a/tests/layouts/bratwurst4.layout b/tests/layouts/bratwurst4.layout
index d3628c6c..34a4e1aa 100644
--- a/tests/layouts/bratwurst4.layout
+++ b/tests/layouts/bratwurst4.layout
@@ -24,7 +24,7 @@
     "is-ellipsized" : false,
     "unknown-glyphs" : 0,
     "width" : 114688,
-    "height" : 114688,
+    "height" : 106496,
     "log-attrs" : [
       {
         "char-break" : true,
diff --git a/tests/layouts/effigy.layout b/tests/layouts/effigy.layout
index 2c621083..f8a24abd 100644
--- a/tests/layouts/effigy.layout
+++ b/tests/layouts/effigy.layout
@@ -26,7 +26,7 @@
     "is-ellipsized" : false,
     "unknown-glyphs" : 0,
     "width" : 71680,
-    "height" : 71680,
+    "height" : 104448,
     "log-attrs" : [
       {
         "char-break" : true,
diff --git a/tests/layouts/kebab.layout b/tests/layouts/kebab.layout
index fbf7e37e..a0efe11d 100644
--- a/tests/layouts/kebab.layout
+++ b/tests/layouts/kebab.layout
@@ -24,7 +24,7 @@
     "is-ellipsized" : false,
     "unknown-glyphs" : 0,
     "width" : 126976,
-    "height" : 126976,
+    "height" : 106496,
     "log-attrs" : [
       {
         "char-break" : true,
diff --git a/tests/layouts/no-space.layout b/tests/layouts/no-space.layout
index 12f878f6..7b62c2e1 100644
--- a/tests/layouts/no-space.layout
+++ b/tests/layouts/no-space.layout
@@ -22,7 +22,7 @@
     "is-ellipsized" : false,
     "unknown-glyphs" : 4,
     "width" : 261120,
-    "height" : 261120,
+    "height" : 45056,
     "log-attrs" : [
       {
         "char-break" : true,
diff --git a/tests/layouts/tab-assert.layout b/tests/layouts/tab-assert.layout
index 0e3ebf25..3b8ce5e5 100644
--- a/tests/layouts/tab-assert.layout
+++ b/tests/layouts/tab-assert.layout
@@ -22,7 +22,7 @@
     "is-ellipsized" : false,
     "unknown-glyphs" : 0,
     "width" : 56320,
-    "height" : 56320,
+    "height" : 19456,
     "log-attrs" : [
       {
         "char-break" : true,
diff --git a/tests/layouts/tab-crash.layout b/tests/layouts/tab-crash.layout
index a0e83f5d..3fb0ab54 100644
--- a/tests/layouts/tab-crash.layout
+++ b/tests/layouts/tab-crash.layout
@@ -40,7 +40,7 @@
     "is-ellipsized" : false,
     "unknown-glyphs" : 0,
     "width" : 585728,
-    "height" : 585728,
+    "height" : 58368,
     "log-attrs" : [
       {
         "char-break" : true,
diff --git a/tests/layouts/tabs-nowrap.layout b/tests/layouts/tabs-nowrap.layout
index 4a1d40b5..31ff3ea2 100644
--- a/tests/layouts/tabs-nowrap.layout
+++ b/tests/layouts/tabs-nowrap.layout
@@ -28,7 +28,7 @@
     "is-ellipsized" : false,
     "unknown-glyphs" : 0,
     "width" : 239616,
-    "height" : 239616,
+    "height" : 104448,
     "log-attrs" : [
       {
         "char-break" : true,
diff --git a/tests/layouts/tabs.layout b/tests/layouts/tabs.layout
index ab70fab3..6ed604d7 100644
--- a/tests/layouts/tabs.layout
+++ b/tests/layouts/tabs.layout
@@ -52,7 +52,7 @@
     "is-ellipsized" : false,
     "unknown-glyphs" : 0,
     "width" : 460800,
-    "height" : 460800,
+    "height" : 73728,
     "log-attrs" : [
       {
         "char-break" : true,
diff --git a/tests/layouts/valid-1.layout b/tests/layouts/valid-1.layout
index 8559d572..ad5e78dc 100644
--- a/tests/layouts/valid-1.layout
+++ b/tests/layouts/valid-1.layout
@@ -38,7 +38,7 @@
     "is-ellipsized" : true,
     "unknown-glyphs" : 0,
     "width" : 225280,
-    "height" : 225280,
+    "height" : 19456,
     "log-attrs" : [
       {
         "char-break" : true,
diff --git a/tests/layouts/valid-10.layout b/tests/layouts/valid-10.layout
index df15efe0..95655633 100644
--- a/tests/layouts/valid-10.layout
+++ b/tests/layouts/valid-10.layout
@@ -26,7 +26,7 @@
     "is-ellipsized" : true,
     "unknown-glyphs" : 0,
     "width" : 102400,
-    "height" : 102400,
+    "height" : 19456,
     "log-attrs" : [
       {
         "char-break" : true,
diff --git a/tests/layouts/valid-11.layout b/tests/layouts/valid-11.layout
index 0b8bb870..f057aed2 100644
--- a/tests/layouts/valid-11.layout
+++ b/tests/layouts/valid-11.layout
@@ -60,7 +60,7 @@
     "is-ellipsized" : false,
     "unknown-glyphs" : 0,
     "width" : 109568,
-    "height" : 109568,
+    "height" : 20480,
     "log-attrs" : [
       {
         "char-break" : true,
diff --git a/tests/layouts/valid-12.layout b/tests/layouts/valid-12.layout
index 3c09f51f..f47ae17a 100644
--- a/tests/layouts/valid-12.layout
+++ b/tests/layouts/valid-12.layout
@@ -53,7 +53,7 @@
     "is-ellipsized" : false,
     "unknown-glyphs" : 1,
     "width" : 179200,
-    "height" : 179200,
+    "height" : 38912,
     "log-attrs" : [
       {
         "char-break" : true,
diff --git a/tests/layouts/valid-13.layout b/tests/layouts/valid-13.layout
index cb2ac92a..b690fa9c 100644
--- a/tests/layouts/valid-13.layout
+++ b/tests/layouts/valid-13.layout
@@ -54,7 +54,7 @@
     "is-ellipsized" : false,
     "unknown-glyphs" : 1,
     "width" : 315392,
-    "height" : 315392,
+    "height" : 19456,
     "log-attrs" : [
       {
         "char-break" : true,
diff --git a/tests/layouts/valid-14.layout b/tests/layouts/valid-14.layout
index 69d061b0..593e538e 100644
--- a/tests/layouts/valid-14.layout
+++ b/tests/layouts/valid-14.layout
@@ -25,7 +25,7 @@
     "is-ellipsized" : true,
     "unknown-glyphs" : 1,
     "width" : 161792,
-    "height" : 161792,
+    "height" : 20480,
     "log-attrs" : [
       {
         "char-break" : true,
diff --git a/tests/layouts/valid-15.layout b/tests/layouts/valid-15.layout
index aa65dc84..f65f4076 100644
--- a/tests/layouts/valid-15.layout
+++ b/tests/layouts/valid-15.layout
@@ -26,7 +26,7 @@
     "is-ellipsized" : true,
     "unknown-glyphs" : 0,
     "width" : 153600,
-    "height" : 153600,
+    "height" : 38912,
     "log-attrs" : [
       {
         "char-break" : true,
diff --git a/tests/layouts/valid-16.layout b/tests/layouts/valid-16.layout
index de5338a3..16a035af 100644
--- a/tests/layouts/valid-16.layout
+++ b/tests/layouts/valid-16.layout
@@ -27,7 +27,7 @@
     "is-ellipsized" : true,
     "unknown-glyphs" : 0,
     "width" : 153600,
-    "height" : 153600,
+    "height" : 38912,
     "log-attrs" : [
       {
         "char-break" : true,
diff --git a/tests/layouts/valid-17.layout b/tests/layouts/valid-17.layout
index cc04f0f8..edd50822 100644
--- a/tests/layouts/valid-17.layout
+++ b/tests/layouts/valid-17.layout
@@ -25,7 +25,7 @@
     "is-ellipsized" : false,
     "unknown-glyphs" : 0,
     "width" : 96976,
-    "height" : 96976,
+    "height" : 38912,
     "log-attrs" : [
       {
         "char-break" : true,
diff --git a/tests/layouts/valid-18.layout b/tests/layouts/valid-18.layout
index f0a3fd2b..849b136e 100644
--- a/tests/layouts/valid-18.layout
+++ b/tests/layouts/valid-18.layout
@@ -30,7 +30,7 @@
     "is-ellipsized" : false,
     "unknown-glyphs" : 5,
     "width" : 302080,
-    "height" : 302080,
+    "height" : 38912,
     "log-attrs" : [
       {
         "char-break" : true,
diff --git a/tests/layouts/valid-19.layout b/tests/layouts/valid-19.layout
index 7456bc7e..38b9f292 100644
--- a/tests/layouts/valid-19.layout
+++ b/tests/layouts/valid-19.layout
@@ -23,7 +23,7 @@
     "is-ellipsized" : false,
     "unknown-glyphs" : 0,
     "width" : 166912,
-    "height" : 166912,
+    "height" : 19456,
     "log-attrs" : [
       {
         "char-break" : true,
diff --git a/tests/layouts/valid-2.layout b/tests/layouts/valid-2.layout
index 6d875e3c..e51c9b57 100644
--- a/tests/layouts/valid-2.layout
+++ b/tests/layouts/valid-2.layout
@@ -37,7 +37,7 @@
     "is-ellipsized" : false,
     "unknown-glyphs" : 0,
     "width" : 200704,
-    "height" : 200704,
+    "height" : 19456,
     "log-attrs" : [
       {
         "char-break" : true,
diff --git a/tests/layouts/valid-20.layout b/tests/layouts/valid-20.layout
index 950be74b..93b8a1b1 100644
--- a/tests/layouts/valid-20.layout
+++ b/tests/layouts/valid-20.layout
@@ -41,7 +41,7 @@
     "is-ellipsized" : false,
     "unknown-glyphs" : 0,
     "width" : 67584,
-    "height" : 67584,
+    "height" : 25600,
     "log-attrs" : [
       {
         "char-break" : true,
diff --git a/tests/layouts/valid-21.layout b/tests/layouts/valid-21.layout
index 7d690bdf..5901ebcd 100644
--- a/tests/layouts/valid-21.layout
+++ b/tests/layouts/valid-21.layout
@@ -29,7 +29,7 @@
     "is-ellipsized" : false,
     "unknown-glyphs" : 1,
     "width" : 45056,
-    "height" : 45056,
+    "height" : 19456,
     "log-attrs" : [
       {
         "char-break" : true,
diff --git a/tests/layouts/valid-22.layout b/tests/layouts/valid-22.layout
index 1d8f51c4..6be94c32 100644
--- a/tests/layouts/valid-22.layout
+++ b/tests/layouts/valid-22.layout
@@ -103,7 +103,7 @@
     "is-ellipsized" : false,
     "unknown-glyphs" : 0,
     "width" : 49152,
-    "height" : 49152,
+    "height" : 22658,
     "log-attrs" : [
       {
         "char-break" : true,
diff --git a/tests/layouts/valid-3.layout b/tests/layouts/valid-3.layout
index 595dd169..8ff1dd05 100644
--- a/tests/layouts/valid-3.layout
+++ b/tests/layouts/valid-3.layout
@@ -23,7 +23,7 @@
     "is-ellipsized" : false,
     "unknown-glyphs" : 0,
     "width" : 56320,
-    "height" : 56320,
+    "height" : 19456,
     "log-attrs" : [
       {
         "char-break" : true,
diff --git a/tests/layouts/valid-4.layout b/tests/layouts/valid-4.layout
index 2ba19616..b9d4f8fb 100644
--- a/tests/layouts/valid-4.layout
+++ b/tests/layouts/valid-4.layout
@@ -23,7 +23,7 @@
     "is-ellipsized" : false,
     "unknown-glyphs" : 0,
     "width" : 197632,
-    "height" : 197632,
+    "height" : 97280,
     "log-attrs" : [
       {
         "char-break" : true,
diff --git a/tests/layouts/valid-5.layout b/tests/layouts/valid-5.layout
index 0810f3f2..92e2b9ce 100644
--- a/tests/layouts/valid-5.layout
+++ b/tests/layouts/valid-5.layout
@@ -31,7 +31,7 @@
     "is-ellipsized" : false,
     "unknown-glyphs" : 0,
     "width" : 194560,
-    "height" : 194560,
+    "height" : 116736,
     "log-attrs" : [
       {
         "char-break" : true,
diff --git a/tests/layouts/valid-6.layout b/tests/layouts/valid-6.layout
index 0b81c833..c2868598 100644
--- a/tests/layouts/valid-6.layout
+++ b/tests/layouts/valid-6.layout
@@ -23,7 +23,7 @@
     "is-ellipsized" : false,
     "unknown-glyphs" : 0,
     "width" : 142336,
-    "height" : 142336,
+    "height" : 19456,
     "log-attrs" : [
       {
         "char-break" : true,
diff --git a/tests/layouts/valid-7.layout b/tests/layouts/valid-7.layout
index f0c3cba9..7324e650 100644
--- a/tests/layouts/valid-7.layout
+++ b/tests/layouts/valid-7.layout
@@ -39,7 +39,7 @@
     "is-ellipsized" : true,
     "unknown-glyphs" : 0,
     "width" : 153600,
-    "height" : 153600,
+    "height" : 19456,
     "log-attrs" : [
       {
         "char-break" : true,
diff --git a/tests/layouts/valid-8.layout b/tests/layouts/valid-8.layout
index 3b2a88ae..e5cedbba 100644
--- a/tests/layouts/valid-8.layout
+++ b/tests/layouts/valid-8.layout
@@ -26,7 +26,7 @@
     "is-ellipsized" : false,
     "unknown-glyphs" : 0,
     "width" : 132096,
-    "height" : 132096,
+    "height" : 19456,
     "log-attrs" : [
       {
         "char-break" : true,
diff --git a/tests/layouts/valid-9.layout b/tests/layouts/valid-9.layout
index 1b5b2a23..5cdf53f9 100644
--- a/tests/layouts/valid-9.layout
+++ b/tests/layouts/valid-9.layout
@@ -31,7 +31,7 @@
     "is-ellipsized" : false,
     "unknown-glyphs" : 0,
     "width" : 71392,
-    "height" : 71392,
+    "height" : 77824,
     "log-attrs" : [
       {
         "char-break" : true,
diff --git a/tests/layouts/vertical.layout b/tests/layouts/vertical.layout
index ec9b93df..e8619bfb 100644
--- a/tests/layouts/vertical.layout
+++ b/tests/layouts/vertical.layout
@@ -23,7 +23,7 @@
     "is-ellipsized" : false,
     "unknown-glyphs" : 0,
     "width" : 294912,
-    "height" : 294912,
+    "height" : 49152,
     "log-attrs" : [
       {
         "char-break" : true,
diff --git a/tests/meson.build b/tests/meson.build
index 271d9046..a4c545c3 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -123,6 +123,7 @@ installed_test_layouts_data = [
   'layouts/tab-assert.layout',
   'layouts/arabic-format.layout',
   'layouts/no-space.layout',
+  'layouts/aaa.layout',
 ]
 
 test_markups_data = [