coretext: Make “system-ui” alias work

Alias names need to be inserted into the font map or otherwise will be
ignored and mapped to Sans (in pango_core_text_font_map_load_fontset()).

Furthermore, there is no font named ”San Francisco” on macOS, the actual
UI font is a hidden font called ”.SF NS Text” or something like that,
and there an “.AppleSystemUIFont” alias that should be used instead.

1 files changed, 15 insertions, 16 deletions

diff --git a/pango/pangocoretext-fontmap.c b/pango/pangocoretext-fontmap.c
index 240cb47a..96e13bab 100644
--- a/pango/pangocoretext-fontmap.c
+++ b/pango/pangocoretext-fontmap.c
@@ -158,7 +158,7 @@ get_real_family (const char *family_name)
       else if (g_ascii_strcasecmp (family_name, "serif") == 0)
 	return "Times";
       else if (g_ascii_strcasecmp (family_name, "system-ui") == 0)
-	return "San Francisco";
+	return ".AppleSystemUIFont";
       break;
     }
 
@@ -1485,21 +1485,20 @@ pango_core_text_font_map_init (PangoCoreTextFontMap *ctfontmap)
     }
 
   /* Insert aliases */
-  family = g_object_new (PANGO_TYPE_CORE_TEXT_FAMILY, NULL);
-  family->family_name = g_strdup ("Sans");
-  g_hash_table_insert (ctfontmap->families,
-                       g_utf8_casefold (family->family_name, -1), family);
-
-  family = g_object_new (PANGO_TYPE_CORE_TEXT_FAMILY, NULL);
-  family->family_name = g_strdup ("Serif");
-  g_hash_table_insert (ctfontmap->families,
-                       g_utf8_casefold (family->family_name, -1), family);
-
-  family = g_object_new (PANGO_TYPE_CORE_TEXT_FAMILY, NULL);
-  family->family_name = g_strdup ("Monospace");
-  family->is_monospace = TRUE;
-  g_hash_table_insert (ctfontmap->families,
-                       g_utf8_casefold (family->family_name, -1), family);
+  /* Keep in sync with get_real_family() */
+  gchar* aliases[] = {
+    "Sans", "Serif", "system-ui", "cursive", "fantasy", "Monospace"
+  };
+
+  for (int i = 0; i <  G_N_ELEMENTS(aliases); i++)
+  {
+    family = g_object_new (PANGO_TYPE_CORE_TEXT_FAMILY, NULL);
+    family->family_name = g_strdup (aliases[i]);
+    if (g_ascii_strcasecmp (family->family_name, "Monospace") == 0)
+      family->is_monospace = TRUE;
+    g_hash_table_insert (ctfontmap->families,
+                         g_utf8_casefold (family->family_name, -1), family);
+  }
 }
 
 static void