From 99d6b3fc3c5eb96b836a5ce934e6628c4217d623 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 26 Nov 2021 23:03:16 -0500 Subject: tests: Fix font setup for Emoji We need to copy the scale hack for bitmaps. --- tests/fonts/fonts.conf | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++ tests/test-layout.c | 11 ++++----- 2 files changed, 70 insertions(+), 6 deletions(-) create mode 100644 tests/fonts/fonts.conf (limited to 'tests') diff --git a/tests/fonts/fonts.conf b/tests/fonts/fonts.conf new file mode 100644 index 00000000..5ff7022b --- /dev/null +++ b/tests/fonts/fonts.conf @@ -0,0 +1,65 @@ + + + + /tmp/cache + + + + false + + + + pixelsize + pixelsize + + + + + + + false + + + 1.0 + + + + matrix + + pixelsizefixupfactor 0 + 0 pixelsizefixupfactor + + + + + + size + pixelsizefixupfactor + + + + + + Noto Color Emoji + emoji + + + + + und-zsye + + + emoji + + + emoji + + + + + emoji + + Noto Color Emoji + + + diff --git a/tests/test-layout.c b/tests/test-layout.c index 62aba460..3ea3063d 100644 --- a/tests/test-layout.c +++ b/tests/test-layout.c @@ -109,22 +109,22 @@ install_fonts (const char *dir) { FcConfig *config; PangoFontMap *map; + char *path; + gsize len; char *conf; map = g_object_new (PANGO_TYPE_CAIRO_FC_FONT_MAP, NULL); config = FcConfigCreate (); - conf = g_strdup_printf ("\n" - "\n" - "\n" - " %s/cache\n" - "", dir); + path = g_test_build_filename (G_TEST_DIST, "fonts/fonts.conf", NULL); + g_file_get_contents (path, &conf, &len, NULL); if (!FcConfigParseAndLoadFromMemory (config, (const FcChar8 *) conf, TRUE)) g_error ("Failed to parse fontconfig configuration"); g_free (conf); + g_free (path); FcConfigAppFontAddDir (config, (const FcChar8 *) dir); pango_fc_font_map_set_config (PANGO_FC_FONT_MAP (map), config); @@ -150,7 +150,6 @@ main (int argc, char *argv[]) }; setlocale (LC_ALL, ""); - option_context = g_option_context_new (""); g_option_context_add_main_entries (option_context, entries, NULL); g_option_context_set_ignore_unknown_options (option_context, TRUE); -- cgit v1.2.1