serializer: Fix a typo

Oops, we were not serializing the height at all.

Update all affected tests.

36 files changed, 36 insertions, 36 deletions

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/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,