diff --git a/data/fonts/fonts.xml b/data/fonts/fonts.xml
index d2b47c6336c4c..4c214b529b39a 100644
--- a/data/fonts/fonts.xml
+++ b/data/fonts/fonts.xml
@@ -60,7 +60,7 @@
- NotoSerif.ttf
+ NotoSerif-Regular.ttf
NotoSerif-Bold.ttf
NotoSerif-Italic.ttf
NotoSerif-BoldItalic.ttf
@@ -112,33 +112,33 @@
- NotoNaskhArabic.ttf
+ NotoNaskhArabic-Regular.ttf
NotoNaskhArabic-Bold.ttf
- NotoNaskhArabicUI.ttf
+ NotoNaskhArabicUI-Regular.ttf
NotoNaskhArabicUI-Bold.ttf
- NotoSansEthiopic.ttf
+ NotoSansEthiopic-Regular.ttf
NotoSansEthiopic-Bold.ttf
NotoSerifEthiopic-Regular.otf
NotoSerifEthiopic-Bold.otf
- 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
@@ -149,28 +149,28 @@
NotoSerifArmenian-Bold.otf
- 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
@@ -178,7 +178,7 @@
NotoSansDevanagari-Regular.otf
NotoSansDevanagari-Medium.otf
NotoSansDevanagari-Bold.otf
- NotoSerifDevanagari.ttf
+ NotoSerifDevanagari-Regular.ttf
NotoSerifDevanagari-Bold.ttf
@@ -191,23 +191,23 @@
danda characters.
-->
- NotoSansGujarati.ttf
+ NotoSansGujarati-Regular.ttf
NotoSansGujarati-Bold.ttf
- NotoSerifGujarati.ttf
+ NotoSerifGujarati-Regular.ttf
NotoSerifGujarati-Bold.ttf
- NotoSansGujaratiUI.ttf
+ NotoSansGujaratiUI-Regular.ttf
NotoSansGujaratiUI-Bold.ttf
- NotoSansGurmukhi.ttf
+ NotoSansGurmukhi-Regular.ttf
NotoSansGurmukhi-Bold.ttf
NotoSerifGurmukhi-Regular.otf
NotoSerifGurmukhi-Bold.otf
- NotoSansGurmukhiUI.ttf
+ NotoSansGurmukhiUI-Regular.ttf
NotoSansGurmukhiUI-Bold.ttf
@@ -226,7 +226,7 @@
NotoSansMalayalam-Regular.otf
NotoSansMalayalam-Medium.otf
NotoSansMalayalam-Bold.otf
- NotoSerifMalayalam.ttf
+ NotoSerifMalayalam-Regular.ttf
NotoSerifMalayalam-Bold.ttf
@@ -238,7 +238,7 @@
NotoSansBengali-Regular.otf
NotoSansBengali-Medium.otf
NotoSansBengali-Bold.otf
- NotoSerifBengali.ttf
+ NotoSerifBengali-Regular.ttf
NotoSerifBengali-Bold.ttf
@@ -247,31 +247,31 @@
NotoSansBengaliUI-Bold.otf
- NotoSansTelugu.ttf
+ NotoSansTelugu-Regular.ttf
NotoSansTelugu-Bold.ttf
- NotoSerifTelugu.ttf
+ NotoSerifTelugu-Regular.ttf
NotoSerifTelugu-Bold.ttf
- NotoSansTeluguUI.ttf
+ NotoSansTeluguUI-Regular.ttf
NotoSansTeluguUI-Bold.ttf
- NotoSansKannada.ttf
+ NotoSansKannada-Regular.ttf
NotoSansKannada-Bold.ttf
- NotoSerifKannada.ttf
+ NotoSerifKannada-Regular.ttf
NotoSerifKannada-Bold.ttf
- NotoSansKannadaUI.ttf
+ NotoSansKannadaUI-Regular.ttf
NotoSansKannadaUI-Bold.ttf
- NotoSansOriya.ttf
+ NotoSansOriya-Regular.ttf
NotoSansOriya-Bold.ttf
- NotoSansOriyaUI.ttf
+ NotoSansOriyaUI-Regular.ttf
NotoSansOriyaUI-Bold.ttf
@@ -288,39 +288,39 @@
NotoSansSinhalaUI-Bold.otf
- 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
@@ -328,17 +328,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
@@ -354,56 +354,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
@@ -412,184 +412,184 @@
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.ttf
- 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
- NotoSansTibetan.ttf
+ NotoSansTibetan-Regular.ttf
NotoSansTibetan-Bold.ttf
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
@@ -602,16 +602,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
diff --git a/tools/fonts/fontchain_linter.py b/tools/fonts/fontchain_linter.py
index 7de7065026188..a4a315b7e3711 100755
--- a/tools/fonts/fontchain_linter.py
+++ b/tools/fonts/fontchain_linter.py
@@ -11,12 +11,6 @@ from fontTools import ttLib
EMOJI_VS = 0xFE0F
-#TODO(179952916): Rename CutiveMono and DancingScript
-CANONICAL_NAME_EXCEPTION_LIST = [
- 'CutiveMono.ttf',
- 'DancingScript-Regular.ttf',
-]
-
LANG_TO_SCRIPT = {
'as': 'Beng',
'be': 'Cyrl',
@@ -664,53 +658,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 file_name in CANONICAL_NAME_EXCEPTION_LIST:
- continue
-
- 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]
@@ -728,8 +675,6 @@ def main():
check_cjk_punctuation()
- check_canonical_name()
-
check_emoji = sys.argv[2]
if check_emoji == 'true':
ucd_path = sys.argv[3]