From cddd173f713335318802a98f008d44b66ac4db46 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 24 Nov 2021 17:46:55 -0500 Subject: Make test-layout use included fonts Add Cantarell, DejaVu Sans and a subset of Noto Color Emoji to git, and make test-layout use just those fonts. This should help with keeping the ci from breaking due to different system fonts. Update tests. --- tests/layouts/valid-14.layout | 126 +++++++++++++++++++++++++++++++++--------- 1 file changed, 101 insertions(+), 25 deletions(-) (limited to 'tests/layouts/valid-14.layout') diff --git a/tests/layouts/valid-14.layout b/tests/layouts/valid-14.layout index 255f51da..09894b52 100644 --- a/tests/layouts/valid-14.layout +++ b/tests/layouts/valid-14.layout @@ -23,8 +23,9 @@ "output" : { "is-wrapped" : false, "is-ellipsized" : true, + "unknown-glyphs" : 0, "width" : 161792, - "height" : 48128, + "height" : 47104, "log-attrs" : [ { "char-break" : true, @@ -195,13 +196,27 @@ "runs" : [ { "offset" : 0, - "length" : 3, - "text" : "你", + "length" : 6, + "text" : "你好", "bidi-level" : 0, "gravity" : "south", "language" : "en-us", "script" : "common", - "font" : "Cantarell 11", + "font" : { + "description" : "Cantarell 11", + "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2", + "variations" : { + "wght" : 0 + }, + "matrix" : [ + 1.0, + -0.0, + -0.0, + 1.0, + 0.0, + 0.0 + ] + }, "flags" : 2, "extra-attributes" : [ { @@ -227,36 +242,44 @@ }, { "glyph" : 1058, - "width" : 4096, + "width" : 16384, "log-cluster" : 0 } ] }, { - "offset" : 3, - "length" : 4, - "text" : "好 ", + "offset" : 6, + "length" : 1, + "text" : " ", "bidi-level" : 0, "gravity" : "south", "language" : "xx", "script" : "han", - "font" : "Droid Sans 11", + "font" : { + "description" : "Cantarell 11", + "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2", + "variations" : { + "wght" : 0 + }, + "matrix" : [ + 1.0, + -0.0, + -0.0, + 1.0, + 0.0, + 0.0 + ] + }, "flags" : 0, "y-offset" : 0, "start-x-offset" : 0, "end-x-offset" : 0, "glyphs" : [ { - "glyph" : 1300, - "width" : 15360, + "glyph" : 1109, + "width" : 3072, "is-cluster-start" : true, "log-cluster" : 0 - }, - { - "glyph" : 268435488, - "width" : 0, - "is-cluster-start" : true, - "log-cluster" : 3 } ] }, @@ -268,7 +291,21 @@ "gravity" : "south", "language" : "en-us", "script" : "latin", - "font" : "Cantarell 11", + "font" : { + "description" : "Cantarell 11", + "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2", + "variations" : { + "wght" : 0 + }, + "matrix" : [ + 1.0, + -0.0, + -0.0, + 1.0, + 0.0, + 0.0 + ] + }, "flags" : 0, "y-offset" : 0, "start-x-offset" : 0, @@ -320,7 +357,18 @@ "gravity" : "south", "language" : "he", "script" : "hebrew", - "font" : "DejaVu Sans 11", + "font" : { + "description" : "DejaVu Sans 11", + "checksum" : "69ccd07023a72ceb27a5e5c22f728627353b60a198170f5e58dd7014221abf01", + "matrix" : [ + 1.0, + -0.0, + -0.0, + 1.0, + 0.0, + 0.0 + ] + }, "flags" : 0, "y-offset" : 0, "start-x-offset" : 0, @@ -340,13 +388,13 @@ }, { "glyph" : 1331, - "width" : 8192, + "width" : 9216, "is-cluster-start" : true, "log-cluster" : 2 }, { "glyph" : 1344, - "width" : 10240, + "width" : 11264, "is-cluster-start" : true, "log-cluster" : 0 } @@ -360,15 +408,29 @@ "gravity" : "south", "language" : "he", "script" : "hebrew", - "font" : "DejaVu Sans 11", + "font" : { + "description" : "Cantarell 11", + "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2", + "variations" : { + "wght" : 0 + }, + "matrix" : [ + 1.0, + -0.0, + -0.0, + 1.0, + 0.0, + 0.0 + ] + }, "flags" : 0, "y-offset" : 0, "start-x-offset" : 0, "end-x-offset" : 0, "glyphs" : [ { - "glyph" : 3, - "width" : 5120, + "glyph" : 1109, + "width" : 3072, "is-cluster-start" : true, "log-cluster" : 0 } @@ -382,7 +444,21 @@ "gravity" : "south", "language" : "el", "script" : "greek", - "font" : "Cantarell 11", + "font" : { + "description" : "Cantarell 11", + "checksum" : "5bcb6ee14ee9d210b2e91d643de1fe456e9d1aea770983fdb05951545efebbe2", + "variations" : { + "wght" : 0 + }, + "matrix" : [ + 1.0, + -0.0, + -0.0, + 1.0, + 0.0, + 0.0 + ] + }, "flags" : 0, "y-offset" : 0, "start-x-offset" : 0, -- cgit v1.2.1