diff --git a/data/fonts/fonts.xml b/data/fonts/fonts.xml
index 66b8eaec4bcfa..2db4c5d6bf2ac 100644
--- a/data/fonts/fonts.xml
+++ b/data/fonts/fonts.xml
@@ -223,7 +223,7 @@
- NotoSerif.ttf
+ NotoSerif-Regular.ttf
NotoSerif-Bold.ttf
NotoSerif-Italic.ttf
NotoSerif-BoldItalic.ttf
@@ -245,7 +245,7 @@
- CutiveMono-Regular.ttf
+ CutiveMono.ttf
@@ -255,7 +255,7 @@
- DancingScript.ttf
+ DancingScript-Regular.ttf
DancingScript-Bold.ttf
@@ -275,144 +275,144 @@
- NotoNaskhArabic.ttf
+ NotoNaskhArabic-Regular.ttf
NotoNaskhArabic-Bold.ttf
- NotoNaskhArabicUI.ttf
+ NotoNaskhArabicUI-Regular.ttf
NotoNaskhArabicUI-Bold.ttf
- NotoSansEthiopic-Regular.ttf
+ NotoSansEthiopic-VF.ttf
- NotoSansEthiopic-Regular.ttf
+ NotoSansEthiopic-VF.ttf
- NotoSansEthiopic-Regular.ttf
+ NotoSansEthiopic-VF.ttf
- NotoSansEthiopic-Regular.ttf
+ NotoSansEthiopic-VF.ttf
- NotoSerifEthiopic-Regular.ttf
+ NotoSerifEthiopic-VF.ttf
- NotoSerifEthiopic-Regular.ttf
+ NotoSerifEthiopic-VF.ttf
- NotoSerifEthiopic-Regular.ttf
+ NotoSerifEthiopic-VF.ttf
- NotoSerifEthiopic-Regular.ttf
+ NotoSerifEthiopic-VF.ttf
- NotoSansHebrew.ttf
+ NotoSansHebrew-Regular.ttf
NotoSansHebrew-Bold.ttf
NotoSerifHebrew-Regular.ttf
NotoSerifHebrew-Bold.ttf
- NotoSansThai.ttf
+ NotoSansThai-Regular.ttf
NotoSansThai-Bold.ttf
- NotoSerifThai.ttf
+ NotoSerifThai-Regular.ttf
NotoSerifThai-Bold.ttf
- NotoSansThaiUI.ttf
+ NotoSansThaiUI-Regular.ttf
NotoSansThaiUI-Bold.ttf
- NotoSansArmenian-Regular.ttf
+ NotoSansArmenian-VF.ttf
- NotoSansArmenian-Regular.ttf
+ NotoSansArmenian-VF.ttf
- NotoSansArmenian-Regular.ttf
+ NotoSansArmenian-VF.ttf
- NotoSansArmenian-Regular.ttf
+ NotoSansArmenian-VF.ttf
- NotoSerifArmenian-Regular.ttf
+ NotoSerifArmenian-VF.ttf
- NotoSerifArmenian-Regular.ttf
+ NotoSerifArmenian-VF.ttf
- NotoSerifArmenian-Regular.ttf
+ NotoSerifArmenian-VF.ttf
- NotoSerifArmenian-Regular.ttf
+ NotoSerifArmenian-VF.ttf
- NotoSansGeorgian-Regular.ttf
+ NotoSansGeorgian-VF.ttf
- NotoSansGeorgian-Regular.ttf
+ NotoSansGeorgian-VF.ttf
- NotoSansGeorgian-Regular.ttf
+ NotoSansGeorgian-VF.ttf
- NotoSansGeorgian-Regular.ttf
+ NotoSansGeorgian-VF.ttf
- NotoSerifGeorgian-Regular.ttf
+ NotoSerifGeorgian-VF.ttf
- NotoSerifGeorgian-Regular.ttf
+ NotoSerifGeorgian-VF.ttf
- NotoSerifGeorgian-Regular.ttf
+ NotoSerifGeorgian-VF.ttf
- NotoSerifGeorgian-Regular.ttf
+ NotoSerifGeorgian-VF.ttf
- NotoSansDevanagari-Regular.ttf
+ NotoSansDevanagari-VF.ttf
- NotoSansDevanagari-Regular.ttf
+ NotoSansDevanagari-VF.ttf
- NotoSansDevanagari-Regular.ttf
+ NotoSansDevanagari-VF.ttf
- NotoSansDevanagari-Regular.ttf
+ NotoSansDevanagari-VF.ttf
- NotoSerifDevanagari-Regular.ttf
+ NotoSerifDevanagari-VF.ttf
- NotoSerifDevanagari-Regular.ttf
+ NotoSerifDevanagari-VF.ttf
- NotoSerifDevanagari-Regular.ttf
+ NotoSerifDevanagari-VF.ttf
- NotoSerifDevanagari-Regular.ttf
+ NotoSerifDevanagari-VF.ttf
- NotoSansDevanagariUI-Regular.ttf
+ NotoSansDevanagariUI-VF.ttf
- NotoSansDevanagariUI-Regular.ttf
+ NotoSansDevanagariUI-VF.ttf
- NotoSansDevanagariUI-Regular.ttf
+ NotoSansDevanagariUI-VF.ttf
- NotoSansDevanagariUI-Regular.ttf
+ NotoSansDevanagariUI-VF.ttf
@@ -421,347 +421,347 @@
danda characters.
-->
- NotoSansGujarati.ttf
+ NotoSansGujarati-Regular.ttf
NotoSansGujarati-Bold.ttf
- NotoSerifGujarati-Regular.ttf
+ NotoSerifGujarati-VF.ttf
- NotoSerifGujarati-Regular.ttf
+ NotoSerifGujarati-VF.ttf
- NotoSerifGujarati-Regular.ttf
+ NotoSerifGujarati-VF.ttf
- NotoSerifGujarati-Regular.ttf
+ NotoSerifGujarati-VF.ttf
- NotoSansGujaratiUI.ttf
+ NotoSansGujaratiUI-Regular.ttf
NotoSansGujaratiUI-Bold.ttf
- NotoSansGurmukhi-Regular.ttf
+ NotoSansGurmukhi-VF.ttf
- NotoSansGurmukhi-Regular.ttf
+ NotoSansGurmukhi-VF.ttf
- NotoSansGurmukhi-Regular.ttf
+ NotoSansGurmukhi-VF.ttf
- NotoSansGurmukhi-Regular.ttf
+ NotoSansGurmukhi-VF.ttf
- NotoSerifGurmukhi-Regular.ttf
+ NotoSerifGurmukhi-VF.ttf
- NotoSerifGurmukhi-Regular.ttf
+ NotoSerifGurmukhi-VF.ttf
- NotoSerifGurmukhi-Regular.ttf
+ NotoSerifGurmukhi-VF.ttf
- NotoSerifGurmukhi-Regular.ttf
+ NotoSerifGurmukhi-VF.ttf
- NotoSansGurmukhiUI-Regular.ttf
+ NotoSansGurmukhiUI-VF.ttf
- NotoSansGurmukhiUI-Regular.ttf
+ NotoSansGurmukhiUI-VF.ttf
- NotoSansGurmukhiUI-Regular.ttf
+ NotoSansGurmukhiUI-VF.ttf
- NotoSansGurmukhiUI-Regular.ttf
+ NotoSansGurmukhiUI-VF.ttf
- NotoSansTamil-Regular.ttf
+ NotoSansTamil-VF.ttf
- NotoSansTamil-Regular.ttf
+ NotoSansTamil-VF.ttf
- NotoSansTamil-Regular.ttf
+ NotoSansTamil-VF.ttf
- NotoSansTamil-Regular.ttf
+ NotoSansTamil-VF.ttf
- NotoSerifTamil-Regular.ttf
+ NotoSerifTamil-VF.ttf
- NotoSerifTamil-Regular.ttf
+ NotoSerifTamil-VF.ttf
- NotoSerifTamil-Regular.ttf
+ NotoSerifTamil-VF.ttf
- NotoSerifTamil-Regular.ttf
+ NotoSerifTamil-VF.ttf
- NotoSansTamilUI-Regular.ttf
+ NotoSansTamilUI-VF.ttf
- NotoSansTamilUI-Regular.ttf
+ NotoSansTamilUI-VF.ttf
- NotoSansTamilUI-Regular.ttf
+ NotoSansTamilUI-VF.ttf
- NotoSansTamilUI-Regular.ttf
+ NotoSansTamilUI-VF.ttf
- NotoSansMalayalam-Regular.ttf
+ NotoSansMalayalam-VF.ttf
- NotoSansMalayalam-Regular.ttf
+ NotoSansMalayalam-VF.ttf
- NotoSansMalayalam-Regular.ttf
+ NotoSansMalayalam-VF.ttf
- NotoSansMalayalam-Regular.ttf
+ NotoSansMalayalam-VF.ttf
- NotoSerifMalayalam-Regular.ttf
+ NotoSerifMalayalam-VF.ttf
- NotoSerifMalayalam-Regular.ttf
+ NotoSerifMalayalam-VF.ttf
- NotoSerifMalayalam-Regular.ttf
+ NotoSerifMalayalam-VF.ttf
- NotoSerifMalayalam-Regular.ttf
+ NotoSerifMalayalam-VF.ttf
- NotoSansMalayalamUI-Regular.ttf
+ NotoSansMalayalamUI-VF.ttf
- NotoSansMalayalamUI-Regular.ttf
+ NotoSansMalayalamUI-VF.ttf
- NotoSansMalayalamUI-Regular.ttf
+ NotoSansMalayalamUI-VF.ttf
- NotoSansMalayalamUI-Regular.ttf
+ NotoSansMalayalamUI-VF.ttf
- NotoSansBengali-Regular.ttf
+ NotoSansBengali-VF.ttf
- NotoSansBengali-Regular.ttf
+ NotoSansBengali-VF.ttf
- NotoSansBengali-Regular.ttf
+ NotoSansBengali-VF.ttf
- NotoSansBengali-Regular.ttf
+ NotoSansBengali-VF.ttf
- NotoSerifBengali-Regular.ttf
+ NotoSerifBengali-VF.ttf
- NotoSerifBengali-Regular.ttf
+ NotoSerifBengali-VF.ttf
- NotoSerifBengali-Regular.ttf
+ NotoSerifBengali-VF.ttf
- NotoSerifBengali-Regular.ttf
+ NotoSerifBengali-VF.ttf
- NotoSansBengaliUI-Regular.ttf
+ NotoSansBengaliUI-VF.ttf
- NotoSansBengaliUI-Regular.ttf
+ NotoSansBengaliUI-VF.ttf
- NotoSansBengaliUI-Regular.ttf
+ NotoSansBengaliUI-VF.ttf
- NotoSansBengaliUI-Regular.ttf
+ NotoSansBengaliUI-VF.ttf
- NotoSansTelugu-Regular.ttf
+ NotoSansTelugu-VF.ttf
- NotoSansTelugu-Regular.ttf
+ NotoSansTelugu-VF.ttf
- NotoSansTelugu-Regular.ttf
+ NotoSansTelugu-VF.ttf
- NotoSansTelugu-Regular.ttf
+ NotoSansTelugu-VF.ttf
- NotoSerifTelugu-Regular.ttf
+ NotoSerifTelugu-VF.ttf
- NotoSerifTelugu-Regular.ttf
+ NotoSerifTelugu-VF.ttf
- NotoSerifTelugu-Regular.ttf
+ NotoSerifTelugu-VF.ttf
- NotoSerifTelugu-Regular.ttf
+ NotoSerifTelugu-VF.ttf
- NotoSansTeluguUI-Regular.ttf
+ NotoSansTeluguUI-VF.ttf
- NotoSansTeluguUI-Regular.ttf
+ NotoSansTeluguUI-VF.ttf
- NotoSansTeluguUI-Regular.ttf
+ NotoSansTeluguUI-VF.ttf
- NotoSansTeluguUI-Regular.ttf
+ NotoSansTeluguUI-VF.ttf
- NotoSansKannada-Regular.ttf
+ NotoSansKannada-VF.ttf
- NotoSansKannada-Regular.ttf
+ NotoSansKannada-VF.ttf
- NotoSansKannada-Regular.ttf
+ NotoSansKannada-VF.ttf
- NotoSansKannada-Regular.ttf
+ NotoSansKannada-VF.ttf
- NotoSerifKannada-Regular.ttf
+ NotoSerifKannada-VF.ttf
- NotoSerifKannada-Regular.ttf
+ NotoSerifKannada-VF.ttf
- NotoSerifKannada-Regular.ttf
+ NotoSerifKannada-VF.ttf
- NotoSerifKannada-Regular.ttf
+ NotoSerifKannada-VF.ttf
- NotoSansKannadaUI-Regular.ttf
+ NotoSansKannadaUI-VF.ttf
- NotoSansKannadaUI-Regular.ttf
+ NotoSansKannadaUI-VF.ttf
- NotoSansKannadaUI-Regular.ttf
+ NotoSansKannadaUI-VF.ttf
- NotoSansKannadaUI-Regular.ttf
+ NotoSansKannadaUI-VF.ttf
- NotoSansOriya.ttf
+ NotoSansOriya-Regular.ttf
NotoSansOriya-Bold.ttf
- NotoSansOriyaUI.ttf
+ NotoSansOriyaUI-Regular.ttf
NotoSansOriyaUI-Bold.ttf
- NotoSansSinhala-Regular.ttf
+ NotoSansSinhala-VF.ttf
- NotoSansSinhala-Regular.ttf
+ NotoSansSinhala-VF.ttf
- NotoSansSinhala-Regular.ttf
+ NotoSansSinhala-VF.ttf
- NotoSansSinhala-Regular.ttf
+ NotoSansSinhala-VF.ttf
- NotoSerifSinhala-Regular.ttf
+ NotoSerifSinhala-VF.ttf
- NotoSerifSinhala-Regular.ttf
+ NotoSerifSinhala-VF.ttf
- NotoSerifSinhala-Regular.ttf
+ NotoSerifSinhala-VF.ttf
- NotoSerifSinhala-Regular.ttf
+ NotoSerifSinhala-VF.ttf
- NotoSansSinhalaUI-Regular.ttf
+ NotoSansSinhalaUI-VF.ttf
- NotoSansSinhalaUI-Regular.ttf
+ NotoSansSinhalaUI-VF.ttf
- NotoSansSinhalaUI-Regular.ttf
+ NotoSansSinhalaUI-VF.ttf
- NotoSansSinhalaUI-Regular.ttf
+ NotoSansSinhalaUI-VF.ttf
- NotoSansKhmer-Regular.ttf
+ NotoSansKhmer-VF.ttf
- NotoSansKhmer-Regular.ttf
+ NotoSansKhmer-VF.ttf
- NotoSansKhmer-Regular.ttf
+ NotoSansKhmer-VF.ttf
- NotoSansKhmer-Regular.ttf
+ NotoSansKhmer-VF.ttf
- NotoSansKhmer-Regular.ttf
+ NotoSansKhmer-VF.ttf
- NotoSansKhmer-Regular.ttf
+ NotoSansKhmer-VF.ttf
- NotoSansKhmer-Regular.ttf
+ NotoSansKhmer-VF.ttf
- NotoSansKhmer-Regular.ttf
+ NotoSansKhmer-VF.ttf
- NotoSansKhmer-Regular.ttf
+ NotoSansKhmer-VF.ttf
@@ -769,17 +769,17 @@
NotoSerifKhmer-Bold.otf
- NotoSansKhmerUI.ttf
+ NotoSansKhmerUI-Regular.ttf
NotoSansKhmerUI-Bold.ttf
- NotoSansLao.ttf
+ NotoSansLao-Regular.ttf
NotoSansLao-Bold.ttf
- NotoSerifLao.ttf
+ NotoSerifLao-Regular.ttf
NotoSerifLao-Bold.ttf
- NotoSansLaoUI.ttf
+ NotoSansLaoUI-Regular.ttf
NotoSansLaoUI-Bold.ttf
@@ -795,56 +795,56 @@
NotoSansMyanmarUI-Bold.otf
- NotoSansThaana.ttf
+ NotoSansThaana-Regular.ttf
NotoSansThaana-Bold.ttf
- NotoSansCham.ttf
+ NotoSansCham-Regular.ttf
NotoSansCham-Bold.ttf
NotoSansAhom-Regular.otf
- NotoSansAdlam-Regular.ttf
+ NotoSansAdlam-VF.ttf
- NotoSansAdlam-Regular.ttf
+ NotoSansAdlam-VF.ttf
- NotoSansAdlam-Regular.ttf
+ NotoSansAdlam-VF.ttf
- NotoSansAdlam-Regular.ttf
+ NotoSansAdlam-VF.ttf
- NotoSansAvestan.ttf
+ NotoSansAvestan-Regular.ttf
- NotoSansBalinese.ttf
+ NotoSansBalinese-Regular.ttf
- NotoSansBamum.ttf
+ NotoSansBamum-Regular.ttf
- NotoSansBatak.ttf
+ NotoSansBatak-Regular.ttf
- NotoSansBrahmi.ttf
+ NotoSansBrahmi-Regular.ttf
- NotoSansBuginese.ttf
+ NotoSansBuginese-Regular.ttf
- NotoSansBuhid.ttf
+ NotoSansBuhid-Regular.ttf
- NotoSansCanadianAboriginal.ttf
+ NotoSansCanadianAboriginal-Regular.ttf
- NotoSansCarian.ttf
+ NotoSansCarian-Regular.ttf
NotoSansChakma-Regular.otf
@@ -853,164 +853,164 @@
NotoSansCherokee-Regular.ttf
- NotoSansCoptic.ttf
+ NotoSansCoptic-Regular.ttf
- NotoSansCuneiform.ttf
+ NotoSansCuneiform-Regular.ttf
- NotoSansCypriot.ttf
+ NotoSansCypriot-Regular.ttf
- NotoSansDeseret.ttf
+ NotoSansDeseret-Regular.ttf
- NotoSansEgyptianHieroglyphs.ttf
+ NotoSansEgyptianHieroglyphs-Regular.ttf
NotoSansElbasan-Regular.otf
- NotoSansGlagolitic.ttf
+ NotoSansGlagolitic-Regular.ttf
- NotoSansGothic.ttf
+ NotoSansGothic-Regular.ttf
- NotoSansHanunoo.ttf
+ NotoSansHanunoo-Regular.ttf
- NotoSansImperialAramaic.ttf
+ NotoSansImperialAramaic-Regular.ttf
- NotoSansInscriptionalPahlavi.ttf
+ NotoSansInscriptionalPahlavi-Regular.ttf
- NotoSansInscriptionalParthian.ttf
+ NotoSansInscriptionalParthian-Regular.ttf
NotoSansJavanese-Regular.otf
- NotoSansKaithi.ttf
+ NotoSansKaithi-Regular.ttf
- NotoSansKayahLi.ttf
+ NotoSansKayahLi-Regular.ttf
- NotoSansKharoshthi.ttf
+ NotoSansKharoshthi-Regular.ttf
- NotoSansLepcha.ttf
+ NotoSansLepcha-Regular.ttf
- NotoSansLimbu.ttf
+ NotoSansLimbu-Regular.ttf
- NotoSansLinearB.ttf
+ NotoSansLinearB-Regular.ttf
- NotoSansLisu.ttf
+ NotoSansLisu-Regular.ttf
- NotoSansLycian.ttf
+ NotoSansLycian-Regular.ttf
- NotoSansLydian.ttf
+ NotoSansLydian-Regular.ttf
- NotoSansMandaic.ttf
+ NotoSansMandaic-Regular.ttf
- NotoSansMeeteiMayek.ttf
+ NotoSansMeeteiMayek-Regular.ttf
- NotoSansNewTaiLue.ttf
+ NotoSansNewTaiLue-Regular.ttf
- NotoSansNKo.ttf
+ NotoSansNKo-Regular.ttf
- NotoSansOgham.ttf
+ NotoSansOgham-Regular.ttf
- NotoSansOlChiki.ttf
+ NotoSansOlChiki-Regular.ttf
- NotoSansOldItalic.ttf
+ NotoSansOldItalic-Regular.ttf
- NotoSansOldPersian.ttf
+ NotoSansOldPersian-Regular.ttf
- NotoSansOldSouthArabian.ttf
+ NotoSansOldSouthArabian-Regular.ttf
- NotoSansOldTurkic.ttf
+ NotoSansOldTurkic-Regular.ttf
NotoSansOsage-Regular.ttf
- NotoSansOsmanya.ttf
+ NotoSansOsmanya-Regular.ttf
- NotoSansPhoenician.ttf
+ NotoSansPhoenician-Regular.ttf
- NotoSansRejang.ttf
+ NotoSansRejang-Regular.ttf
- NotoSansRunic.ttf
+ NotoSansRunic-Regular.ttf
- NotoSansSamaritan.ttf
+ NotoSansSamaritan-Regular.ttf
- NotoSansSaurashtra.ttf
+ NotoSansSaurashtra-Regular.ttf
- NotoSansShavian.ttf
+ NotoSansShavian-Regular.ttf
- NotoSansSundanese.ttf
+ NotoSansSundanese-Regular.ttf
- NotoSansSylotiNagri.ttf
+ NotoSansSylotiNagri-Regular.ttf
- NotoSansSyriacEstrangela.ttf
+ NotoSansSyriacEstrangela-Regular.ttf
- NotoSansSyriacEastern.ttf
+ NotoSansSyriacEastern-Regular.ttf
- NotoSansSyriacWestern.ttf
+ NotoSansSyriacWestern-Regular.ttf
- NotoSansTagalog.ttf
+ NotoSansTagalog-Regular.ttf
- NotoSansTagbanwa.ttf
+ NotoSansTagbanwa-Regular.ttf
- NotoSansTaiTham.ttf
+ NotoSansTaiTham-Regular.ttf
- NotoSansTaiViet.ttf
+ NotoSansTaiViet-Regular.ttf
- NotoSerifTibetan-Regular.ttf
+ NotoSerifTibetan-VF.ttf
- NotoSerifTibetan-Regular.ttf
+ NotoSerifTibetan-VF.ttf
- NotoSerifTibetan-Regular.ttf
+ NotoSerifTibetan-VF.ttf
- NotoSerifTibetan-Regular.ttf
+ NotoSerifTibetan-VF.ttf
@@ -1018,29 +1018,29 @@
NotoSansTifinagh-Regular.otf
- NotoSansUgaritic.ttf
+ NotoSansUgaritic-Regular.ttf
- NotoSansVai.ttf
+ NotoSansVai-Regular.ttf
NotoSansSymbols-Regular-Subsetted.ttf
- NotoSansCJKjp-Regular.otc
- NotoSerifCJKjp-Regular.otc
+ NotoSansCJK-Regular.ttc
+ NotoSerifCJK-Regular.ttc
- NotoSansCJKjp-Regular.otc
- NotoSerifCJKjp-Regular.otc
+ NotoSansCJK-Regular.ttc
+ NotoSerifCJK-Regular.ttc
- NotoSansCJKjp-Regular.otc
- NotoSerifCJKjp-Regular.otc
+ NotoSansCJK-Regular.ttc
+ NotoSerifCJK-Regular.ttc
- NotoSansCJKjp-Regular.otc
- NotoSerifCJKjp-Regular.otc
+ NotoSansCJK-Regular.ttc
+ NotoSerifCJK-Regular.ttc
NotoColorEmoji.ttf
@@ -1053,16 +1053,16 @@
override the East Asian punctuation for Chinese.
-->
- NotoSansTaiLe.ttf
+ NotoSansTaiLe-Regular.ttf
- NotoSansYi.ttf
+ NotoSansYi-Regular.ttf
- NotoSansMongolian.ttf
+ NotoSansMongolian-Regular.ttf
- NotoSansPhagsPa.ttf
+ NotoSansPhagsPa-Regular.ttf
NotoSansAnatolianHieroglyphs-Regular.otf
@@ -1152,72 +1152,72 @@
NotoSerifDogra-Regular.ttf
- NotoSansMedefaidrin-Regular.ttf
+ NotoSansMedefaidrin-VF.ttf
- NotoSansMedefaidrin-Regular.ttf
+ NotoSansMedefaidrin-VF.ttf
- NotoSansMedefaidrin-Regular.ttf
+ NotoSansMedefaidrin-VF.ttf
- NotoSansMedefaidrin-Regular.ttf
+ NotoSansMedefaidrin-VF.ttf
- NotoSansSoyombo-Regular.ttf
+ NotoSansSoyombo-VF.ttf
- NotoSansSoyombo-Regular.ttf
+ NotoSansSoyombo-VF.ttf
- NotoSansSoyombo-Regular.ttf
+ NotoSansSoyombo-VF.ttf
- NotoSansSoyombo-Regular.ttf
+ NotoSansSoyombo-VF.ttf
- NotoSansTakri-Regular.ttf
+ NotoSansTakri-VF.ttf
- NotoSansTakri-Regular.ttf
+ NotoSansTakri-VF.ttf
- NotoSansTakri-Regular.ttf
+ NotoSansTakri-VF.ttf
- NotoSansTakri-Regular.ttf
+ NotoSansTakri-VF.ttf
- NotoSerifHmongNyiakeng-Regular.ttf
+ NotoSerifNyiakengPuachueHmong-VF.ttf
- NotoSerifHmongNyiakeng-Regular.ttf
+ NotoSerifNyiakengPuachueHmong-VF.ttf
- NotoSerifHmongNyiakeng-Regular.ttf
+ NotoSerifNyiakengPuachueHmong-VF.ttf
- NotoSerifHmongNyiakeng-Regular.ttf
+ NotoSerifNyiakengPuachueHmong-VF.ttf
- NotoSerifYezidi-Regular.ttf
+ NotoSerifYezidi-VF.ttf
- NotoSerifYezidi-Regular.ttf
+ NotoSerifYezidi-VF.ttf
- NotoSerifYezidi-Regular.ttf
+ NotoSerifYezidi-VF.ttf
- NotoSerifYezidi-Regular.ttf
+ NotoSerifYezidi-VF.ttf
diff --git a/libs/hwui/tests/unit/TypefaceTests.cpp b/libs/hwui/tests/unit/TypefaceTests.cpp
index 1a3dbe7faaf6e..ab23448ab93f4 100644
--- a/libs/hwui/tests/unit/TypefaceTests.cpp
+++ b/libs/hwui/tests/unit/TypefaceTests.cpp
@@ -33,7 +33,7 @@ namespace {
constexpr char kRobotoVariable[] = "/system/fonts/Roboto-Regular.ttf";
-constexpr char kRegularFont[] = "/system/fonts/NotoSerif.ttf";
+constexpr char kRegularFont[] = "/system/fonts/NotoSerif-Regular.ttf";
constexpr char kBoldFont[] = "/system/fonts/NotoSerif-Bold.ttf";
constexpr char kItalicFont[] = "/system/fonts/NotoSerif-Italic.ttf";
constexpr char kBoldItalicFont[] = "/system/fonts/NotoSerif-BoldItalic.ttf";
diff --git a/tools/fonts/fontchain_linter.py b/tools/fonts/fontchain_linter.py
index e775e1adb04e8..f0b759547a937 100755
--- a/tools/fonts/fontchain_linter.py
+++ b/tools/fonts/fontchain_linter.py
@@ -665,51 +665,6 @@ def check_cjk_punctuation():
assert_font_supports_none_of_chars(record.font, cjk_punctuation, name)
-def getPostScriptName(font):
- ttf = open_font(font)
- nameTable = ttf['name']
- for name in nameTable.names:
- if name.nameID == 6 and name.platformID == 3 and name.platEncID == 1 and name.langID == 0x0409:
- return str(name)
-
-
-def getSuffix(font):
- file_path, index = font
- with open(path.join(_fonts_dir, file_path), 'rb') as f:
- tag = f.read(4)
- isCollection = tag == b'ttcf'
-
- ttf = open_font(font)
- isType1 = ('CFF ' in ttf or 'CFF2' in ttf)
-
- if isType1:
- if isCollection:
- return '.otc'
- else:
- return '.otf'
- else:
- if isCollection:
- return '.ttc'
- else:
- return '.ttf'
-
-
-def check_canonical_name():
- for record in _all_fonts:
- file_name, index = record.font
-
- if index and index != 0:
- continue
-
- psName = getPostScriptName(record.font)
- assert psName, 'PostScript must be defined'
-
- suffix = getSuffix(record.font)
- canonicalName = '%s%s' % (psName, suffix)
-
- assert file_name == canonicalName, (
- '%s is not a canonical name. Must be %s' % (file_name, canonicalName))
-
def main():
global _fonts_dir
target_out = sys.argv[1]
@@ -727,8 +682,6 @@ def main():
check_cjk_punctuation()
- check_canonical_name()
-
check_emoji = sys.argv[2]
if check_emoji == 'true':
ucd_path = sys.argv[3]