diff options
| -rw-r--r-- | data/fonts/fonts.xml | 498 | ||||
| -rw-r--r-- | libs/hwui/tests/unit/TypefaceTests.cpp | 2 | ||||
| -rwxr-xr-x | tools/fonts/fontchain_linter.py | 47 |
3 files changed, 250 insertions, 297 deletions
diff --git a/data/fonts/fonts.xml b/data/fonts/fonts.xml index 66b8eaec4bcf..2db4c5d6bf2a 100644 --- a/data/fonts/fonts.xml +++ b/data/fonts/fonts.xml @@ -223,7 +223,7 @@ <alias name="sans-serif-condensed-medium" to="sans-serif-condensed" weight="500" /> <family name="serif"> - <font weight="400" style="normal">NotoSerif.ttf</font> + <font weight="400" style="normal">NotoSerif-Regular.ttf</font> <font weight="700" style="normal">NotoSerif-Bold.ttf</font> <font weight="400" style="italic">NotoSerif-Italic.ttf</font> <font weight="700" style="italic">NotoSerif-BoldItalic.ttf</font> @@ -245,7 +245,7 @@ <alias name="monaco" to="monospace" /> <family name="serif-monospace"> - <font weight="400" style="normal">CutiveMono-Regular.ttf</font> + <font weight="400" style="normal">CutiveMono.ttf</font> </family> <alias name="courier" to="serif-monospace" /> <alias name="courier new" to="serif-monospace" /> @@ -255,7 +255,7 @@ </family> <family name="cursive"> - <font weight="400" style="normal">DancingScript.ttf</font> + <font weight="400" style="normal">DancingScript-Regular.ttf</font> <font weight="700" style="normal">DancingScript-Bold.ttf</font> </family> @@ -275,144 +275,144 @@ <!-- fallback fonts --> <family lang="und-Arab" variant="elegant"> - <font weight="400" style="normal">NotoNaskhArabic.ttf</font> + <font weight="400" style="normal">NotoNaskhArabic-Regular.ttf</font> <font weight="700" style="normal">NotoNaskhArabic-Bold.ttf</font> </family> <family lang="und-Arab" variant="compact"> - <font weight="400" style="normal">NotoNaskhArabicUI.ttf</font> + <font weight="400" style="normal">NotoNaskhArabicUI-Regular.ttf</font> <font weight="700" style="normal">NotoNaskhArabicUI-Bold.ttf</font> </family> <family lang="und-Ethi"> - <font weight="400" style="normal">NotoSansEthiopic-Regular.ttf + <font weight="400" style="normal">NotoSansEthiopic-VF.ttf <axis tag="wght" stylevalue="400"/> </font> - <font weight="500" style="normal">NotoSansEthiopic-Regular.ttf + <font weight="500" style="normal">NotoSansEthiopic-VF.ttf <axis tag="wght" stylevalue="500"/> </font> - <font weight="600" style="normal">NotoSansEthiopic-Regular.ttf + <font weight="600" style="normal">NotoSansEthiopic-VF.ttf <axis tag="wght" stylevalue="600"/> </font> - <font weight="700" style="normal">NotoSansEthiopic-Regular.ttf + <font weight="700" style="normal">NotoSansEthiopic-VF.ttf <axis tag="wght" stylevalue="700"/> </font> - <font weight="400" style="normal" fallbackFor="serif">NotoSerifEthiopic-Regular.ttf + <font weight="400" style="normal" fallbackFor="serif">NotoSerifEthiopic-VF.ttf <axis tag="wght" stylevalue="400"/> </font> - <font weight="500" style="normal" fallbackFor="serif">NotoSerifEthiopic-Regular.ttf + <font weight="500" style="normal" fallbackFor="serif">NotoSerifEthiopic-VF.ttf <axis tag="wght" stylevalue="500"/> </font> - <font weight="600" style="normal" fallbackFor="serif">NotoSerifEthiopic-Regular.ttf + <font weight="600" style="normal" fallbackFor="serif">NotoSerifEthiopic-VF.ttf <axis tag="wght" stylevalue="600"/> </font> - <font weight="700" style="normal" fallbackFor="serif">NotoSerifEthiopic-Regular.ttf + <font weight="700" style="normal" fallbackFor="serif">NotoSerifEthiopic-VF.ttf <axis tag="wght" stylevalue="700"/> </font> </family> <family lang="und-Hebr"> - <font weight="400" style="normal">NotoSansHebrew.ttf</font> + <font weight="400" style="normal">NotoSansHebrew-Regular.ttf</font> <font weight="700" style="normal">NotoSansHebrew-Bold.ttf</font> <font weight="400" style="normal" fallbackFor="serif">NotoSerifHebrew-Regular.ttf</font> <font weight="700" style="normal" fallbackFor="serif">NotoSerifHebrew-Bold.ttf</font> </family> <family lang="und-Thai" variant="elegant"> - <font weight="400" style="normal">NotoSansThai.ttf</font> + <font weight="400" style="normal">NotoSansThai-Regular.ttf</font> <font weight="700" style="normal">NotoSansThai-Bold.ttf</font> - <font weight="400" style="normal" fallbackFor="serif">NotoSerifThai.ttf</font> + <font weight="400" style="normal" fallbackFor="serif">NotoSerifThai-Regular.ttf</font> <font weight="700" style="normal" fallbackFor="serif">NotoSerifThai-Bold.ttf</font> </family> <family lang="und-Thai" variant="compact"> - <font weight="400" style="normal">NotoSansThaiUI.ttf</font> + <font weight="400" style="normal">NotoSansThaiUI-Regular.ttf</font> <font weight="700" style="normal">NotoSansThaiUI-Bold.ttf</font> </family> <family lang="und-Armn"> - <font weight="400" style="normal">NotoSansArmenian-Regular.ttf + <font weight="400" style="normal">NotoSansArmenian-VF.ttf <axis tag="wght" stylevalue="400"/> </font> - <font weight="500" style="normal">NotoSansArmenian-Regular.ttf + <font weight="500" style="normal">NotoSansArmenian-VF.ttf <axis tag="wght" stylevalue="500"/> </font> - <font weight="600" style="normal">NotoSansArmenian-Regular.ttf + <font weight="600" style="normal">NotoSansArmenian-VF.ttf <axis tag="wght" stylevalue="600"/> </font> - <font weight="700" style="normal">NotoSansArmenian-Regular.ttf + <font weight="700" style="normal">NotoSansArmenian-VF.ttf <axis tag="wght" stylevalue="700"/> </font> - <font weight="400" style="normal" fallbackFor="serif">NotoSerifArmenian-Regular.ttf + <font weight="400" style="normal" fallbackFor="serif">NotoSerifArmenian-VF.ttf <axis tag="wght" stylevalue="400"/> </font> - <font weight="500" style="normal" fallbackFor="serif">NotoSerifArmenian-Regular.ttf + <font weight="500" style="normal" fallbackFor="serif">NotoSerifArmenian-VF.ttf <axis tag="wght" stylevalue="500"/> </font> - <font weight="600" style="normal" fallbackFor="serif">NotoSerifArmenian-Regular.ttf + <font weight="600" style="normal" fallbackFor="serif">NotoSerifArmenian-VF.ttf <axis tag="wght" stylevalue="600"/> </font> - <font weight="700" style="normal" fallbackFor="serif">NotoSerifArmenian-Regular.ttf + <font weight="700" style="normal" fallbackFor="serif">NotoSerifArmenian-VF.ttf <axis tag="wght" stylevalue="700"/> </font> </family> <family lang="und-Geor,und-Geok"> - <font weight="400" style="normal">NotoSansGeorgian-Regular.ttf + <font weight="400" style="normal">NotoSansGeorgian-VF.ttf <axis tag="wght" stylevalue="400"/> </font> - <font weight="500" style="normal">NotoSansGeorgian-Regular.ttf + <font weight="500" style="normal">NotoSansGeorgian-VF.ttf <axis tag="wght" stylevalue="500"/> </font> - <font weight="600" style="normal">NotoSansGeorgian-Regular.ttf + <font weight="600" style="normal">NotoSansGeorgian-VF.ttf <axis tag="wght" stylevalue="600"/> </font> - <font weight="700" style="normal">NotoSansGeorgian-Regular.ttf + <font weight="700" style="normal">NotoSansGeorgian-VF.ttf <axis tag="wght" stylevalue="700"/> </font> - <font weight="400" style="normal" fallbackFor="serif">NotoSerifGeorgian-Regular.ttf + <font weight="400" style="normal" fallbackFor="serif">NotoSerifGeorgian-VF.ttf <axis tag="wght" stylevalue="400"/> </font> - <font weight="500" style="normal" fallbackFor="serif">NotoSerifGeorgian-Regular.ttf + <font weight="500" style="normal" fallbackFor="serif">NotoSerifGeorgian-VF.ttf <axis tag="wght" stylevalue="500"/> </font> - <font weight="600" style="normal" fallbackFor="serif">NotoSerifGeorgian-Regular.ttf + <font weight="600" style="normal" fallbackFor="serif">NotoSerifGeorgian-VF.ttf <axis tag="wght" stylevalue="600"/> </font> - <font weight="700" style="normal" fallbackFor="serif">NotoSerifGeorgian-Regular.ttf + <font weight="700" style="normal" fallbackFor="serif">NotoSerifGeorgian-VF.ttf <axis tag="wght" stylevalue="700"/> </font> </family> <family lang="und-Deva" variant="elegant"> - <font weight="400" style="normal">NotoSansDevanagari-Regular.ttf + <font weight="400" style="normal">NotoSansDevanagari-VF.ttf <axis tag="wght" stylevalue="400"/> </font> - <font weight="500" style="normal">NotoSansDevanagari-Regular.ttf + <font weight="500" style="normal">NotoSansDevanagari-VF.ttf <axis tag="wght" stylevalue="500"/> </font> - <font weight="600" style="normal">NotoSansDevanagari-Regular.ttf + <font weight="600" style="normal">NotoSansDevanagari-VF.ttf <axis tag="wght" stylevalue="600"/> </font> - <font weight="700" style="normal">NotoSansDevanagari-Regular.ttf + <font weight="700" style="normal">NotoSansDevanagari-VF.ttf <axis tag="wght" stylevalue="700"/> </font> - <font weight="400" style="normal" fallbackFor="serif">NotoSerifDevanagari-Regular.ttf + <font weight="400" style="normal" fallbackFor="serif">NotoSerifDevanagari-VF.ttf <axis tag="wght" stylevalue="400"/> </font> - <font weight="500" style="normal" fallbackFor="serif">NotoSerifDevanagari-Regular.ttf + <font weight="500" style="normal" fallbackFor="serif">NotoSerifDevanagari-VF.ttf <axis tag="wght" stylevalue="500"/> </font> - <font weight="600" style="normal" fallbackFor="serif">NotoSerifDevanagari-Regular.ttf + <font weight="600" style="normal" fallbackFor="serif">NotoSerifDevanagari-VF.ttf <axis tag="wght" stylevalue="600"/> </font> - <font weight="700" style="normal" fallbackFor="serif">NotoSerifDevanagari-Regular.ttf + <font weight="700" style="normal" fallbackFor="serif">NotoSerifDevanagari-VF.ttf <axis tag="wght" stylevalue="700"/> </font> </family> <family lang="und-Deva" variant="compact"> - <font weight="400" style="normal">NotoSansDevanagariUI-Regular.ttf + <font weight="400" style="normal">NotoSansDevanagariUI-VF.ttf <axis tag="wght" stylevalue="400"/> </font> - <font weight="500" style="normal">NotoSansDevanagariUI-Regular.ttf + <font weight="500" style="normal">NotoSansDevanagariUI-VF.ttf <axis tag="wght" stylevalue="500"/> </font> - <font weight="600" style="normal">NotoSansDevanagariUI-Regular.ttf + <font weight="600" style="normal">NotoSansDevanagariUI-VF.ttf <axis tag="wght" stylevalue="600"/> </font> - <font weight="700" style="normal">NotoSansDevanagariUI-Regular.ttf + <font weight="700" style="normal">NotoSansDevanagariUI-VF.ttf <axis tag="wght" stylevalue="700"/> </font> </family> @@ -421,347 +421,347 @@ danda characters. --> <family lang="und-Gujr" variant="elegant"> - <font weight="400" style="normal">NotoSansGujarati.ttf</font> + <font weight="400" style="normal">NotoSansGujarati-Regular.ttf</font> <font weight="700" style="normal">NotoSansGujarati-Bold.ttf</font> - <font weight="400" style="normal" fallbackFor="serif">NotoSerifGujarati-Regular.ttf + <font weight="400" style="normal" fallbackFor="serif">NotoSerifGujarati-VF.ttf <axis tag="wght" stylevalue="400"/> </font> - <font weight="500" style="normal" fallbackFor="serif">NotoSerifGujarati-Regular.ttf + <font weight="500" style="normal" fallbackFor="serif">NotoSerifGujarati-VF.ttf <axis tag="wght" stylevalue="500"/> </font> - <font weight="600" style="normal" fallbackFor="serif">NotoSerifGujarati-Regular.ttf + <font weight="600" style="normal" fallbackFor="serif">NotoSerifGujarati-VF.ttf <axis tag="wght" stylevalue="600"/> </font> - <font weight="700" style="normal" fallbackFor="serif">NotoSerifGujarati-Regular.ttf + <font weight="700" style="normal" fallbackFor="serif">NotoSerifGujarati-VF.ttf <axis tag="wght" stylevalue="700"/> </font> </family> <family lang="und-Gujr" variant="compact"> - <font weight="400" style="normal">NotoSansGujaratiUI.ttf</font> + <font weight="400" style="normal">NotoSansGujaratiUI-Regular.ttf</font> <font weight="700" style="normal">NotoSansGujaratiUI-Bold.ttf</font> </family> <family lang="und-Guru" variant="elegant"> - <font weight="400" style="normal">NotoSansGurmukhi-Regular.ttf + <font weight="400" style="normal">NotoSansGurmukhi-VF.ttf <axis tag="wght" stylevalue="400"/> </font> - <font weight="500" style="normal">NotoSansGurmukhi-Regular.ttf + <font weight="500" style="normal">NotoSansGurmukhi-VF.ttf <axis tag="wght" stylevalue="500"/> </font> - <font weight="600" style="normal">NotoSansGurmukhi-Regular.ttf + <font weight="600" style="normal">NotoSansGurmukhi-VF.ttf <axis tag="wght" stylevalue="600"/> </font> - <font weight="700" style="normal">NotoSansGurmukhi-Regular.ttf + <font weight="700" style="normal">NotoSansGurmukhi-VF.ttf <axis tag="wght" stylevalue="700"/> </font> - <font weight="400" style="normal" fallbackFor="serif">NotoSerifGurmukhi-Regular.ttf + <font weight="400" style="normal" fallbackFor="serif">NotoSerifGurmukhi-VF.ttf <axis tag="wght" stylevalue="400"/> </font> - <font weight="500" style="normal" fallbackFor="serif">NotoSerifGurmukhi-Regular.ttf + <font weight="500" style="normal" fallbackFor="serif">NotoSerifGurmukhi-VF.ttf <axis tag="wght" stylevalue="500"/> </font> - <font weight="600" style="normal" fallbackFor="serif">NotoSerifGurmukhi-Regular.ttf + <font weight="600" style="normal" fallbackFor="serif">NotoSerifGurmukhi-VF.ttf <axis tag="wght" stylevalue="600"/> </font> - <font weight="700" style="normal" fallbackFor="serif">NotoSerifGurmukhi-Regular.ttf + <font weight="700" style="normal" fallbackFor="serif">NotoSerifGurmukhi-VF.ttf <axis tag="wght" stylevalue="700"/> </font> </family> <family lang="und-Guru" variant="compact"> - <font weight="400" style="normal">NotoSansGurmukhiUI-Regular.ttf + <font weight="400" style="normal">NotoSansGurmukhiUI-VF.ttf <axis tag="wght" stylevalue="400"/> </font> - <font weight="500" style="normal">NotoSansGurmukhiUI-Regular.ttf + <font weight="500" style="normal">NotoSansGurmukhiUI-VF.ttf <axis tag="wght" stylevalue="500"/> </font> - <font weight="600" style="normal">NotoSansGurmukhiUI-Regular.ttf + <font weight="600" style="normal">NotoSansGurmukhiUI-VF.ttf <axis tag="wght" stylevalue="600"/> </font> - <font weight="700" style="normal">NotoSansGurmukhiUI-Regular.ttf + <font weight="700" style="normal">NotoSansGurmukhiUI-VF.ttf <axis tag="wght" stylevalue="700"/> </font> </family> <family lang="und-Taml" variant="elegant"> - <font weight="400" style="normal">NotoSansTamil-Regular.ttf + <font weight="400" style="normal">NotoSansTamil-VF.ttf <axis tag="wght" stylevalue="400"/> </font> - <font weight="500" style="normal">NotoSansTamil-Regular.ttf + <font weight="500" style="normal">NotoSansTamil-VF.ttf <axis tag="wght" stylevalue="500"/> </font> - <font weight="600" style="normal">NotoSansTamil-Regular.ttf + <font weight="600" style="normal">NotoSansTamil-VF.ttf <axis tag="wght" stylevalue="600"/> </font> - <font weight="700" style="normal">NotoSansTamil-Regular.ttf + <font weight="700" style="normal">NotoSansTamil-VF.ttf <axis tag="wght" stylevalue="700"/> </font> - <font weight="400" style="normal" fallbackFor="serif">NotoSerifTamil-Regular.ttf + <font weight="400" style="normal" fallbackFor="serif">NotoSerifTamil-VF.ttf <axis tag="wght" stylevalue="400"/> </font> - <font weight="500" style="normal" fallbackFor="serif">NotoSerifTamil-Regular.ttf + <font weight="500" style="normal" fallbackFor="serif">NotoSerifTamil-VF.ttf <axis tag="wght" stylevalue="500"/> </font> - <font weight="600" style="normal" fallbackFor="serif">NotoSerifTamil-Regular.ttf + <font weight="600" style="normal" fallbackFor="serif">NotoSerifTamil-VF.ttf <axis tag="wght" stylevalue="600"/> </font> - <font weight="700" style="normal" fallbackFor="serif">NotoSerifTamil-Regular.ttf + <font weight="700" style="normal" fallbackFor="serif">NotoSerifTamil-VF.ttf <axis tag="wght" stylevalue="700"/> </font> </family> <family lang="und-Taml" variant="compact"> - <font weight="400" style="normal">NotoSansTamilUI-Regular.ttf + <font weight="400" style="normal">NotoSansTamilUI-VF.ttf <axis tag="wght" stylevalue="400"/> </font> - <font weight="500" style="normal">NotoSansTamilUI-Regular.ttf + <font weight="500" style="normal">NotoSansTamilUI-VF.ttf <axis tag="wght" stylevalue="500"/> </font> - <font weight="600" style="normal">NotoSansTamilUI-Regular.ttf + <font weight="600" style="normal">NotoSansTamilUI-VF.ttf <axis tag="wght" stylevalue="600"/> </font> - <font weight="700" style="normal">NotoSansTamilUI-Regular.ttf + <font weight="700" style="normal">NotoSansTamilUI-VF.ttf <axis tag="wght" stylevalue="700"/> </font> </family> <family lang="und-Mlym" variant="elegant"> - <font weight="400" style="normal">NotoSansMalayalam-Regular.ttf + <font weight="400" style="normal">NotoSansMalayalam-VF.ttf <axis tag="wght" stylevalue="400"/> </font> - <font weight="500" style="normal">NotoSansMalayalam-Regular.ttf + <font weight="500" style="normal">NotoSansMalayalam-VF.ttf <axis tag="wght" stylevalue="500"/> </font> - <font weight="600" style="normal">NotoSansMalayalam-Regular.ttf + <font weight="600" style="normal">NotoSansMalayalam-VF.ttf <axis tag="wght" stylevalue="600"/> </font> - <font weight="700" style="normal">NotoSansMalayalam-Regular.ttf + <font weight="700" style="normal">NotoSansMalayalam-VF.ttf <axis tag="wght" stylevalue="700"/> </font> - <font weight="400" style="normal" fallbackFor="serif">NotoSerifMalayalam-Regular.ttf + <font weight="400" style="normal" fallbackFor="serif">NotoSerifMalayalam-VF.ttf <axis tag="wght" stylevalue="400"/> </font> - <font weight="500" style="normal" fallbackFor="serif">NotoSerifMalayalam-Regular.ttf + <font weight="500" style="normal" fallbackFor="serif">NotoSerifMalayalam-VF.ttf <axis tag="wght" stylevalue="500"/> </font> - <font weight="600" style="normal" fallbackFor="serif">NotoSerifMalayalam-Regular.ttf + <font weight="600" style="normal" fallbackFor="serif">NotoSerifMalayalam-VF.ttf <axis tag="wght" stylevalue="600"/> </font> - <font weight="700" style="normal" fallbackFor="serif">NotoSerifMalayalam-Regular.ttf + <font weight="700" style="normal" fallbackFor="serif">NotoSerifMalayalam-VF.ttf <axis tag="wght" stylevalue="700"/> </font> </family> <family lang="und-Mlym" variant="compact"> - <font weight="400" style="normal">NotoSansMalayalamUI-Regular.ttf + <font weight="400" style="normal">NotoSansMalayalamUI-VF.ttf <axis tag="wght" stylevalue="400"/> </font> - <font weight="500" style="normal">NotoSansMalayalamUI-Regular.ttf + <font weight="500" style="normal">NotoSansMalayalamUI-VF.ttf <axis tag="wght" stylevalue="500"/> </font> - <font weight="600" style="normal">NotoSansMalayalamUI-Regular.ttf + <font weight="600" style="normal">NotoSansMalayalamUI-VF.ttf <axis tag="wght" stylevalue="600"/> </font> - <font weight="700" style="normal">NotoSansMalayalamUI-Regular.ttf + <font weight="700" style="normal">NotoSansMalayalamUI-VF.ttf <axis tag="wght" stylevalue="700"/> </font> </family> <family lang="und-Beng" variant="elegant"> - <font weight="400" style="normal">NotoSansBengali-Regular.ttf + <font weight="400" style="normal">NotoSansBengali-VF.ttf <axis tag="wght" stylevalue="400"/> </font> - <font weight="500" style="normal">NotoSansBengali-Regular.ttf + <font weight="500" style="normal">NotoSansBengali-VF.ttf <axis tag="wght" stylevalue="500"/> </font> - <font weight="600" style="normal">NotoSansBengali-Regular.ttf + <font weight="600" style="normal">NotoSansBengali-VF.ttf <axis tag="wght" stylevalue="600"/> </font> - <font weight="700" style="normal">NotoSansBengali-Regular.ttf + <font weight="700" style="normal">NotoSansBengali-VF.ttf <axis tag="wght" stylevalue="700"/> </font> - <font weight="400" style="normal" fallbackFor="serif">NotoSerifBengali-Regular.ttf + <font weight="400" style="normal" fallbackFor="serif">NotoSerifBengali-VF.ttf <axis tag="wght" stylevalue="400"/> </font> - <font weight="500" style="normal" fallbackFor="serif">NotoSerifBengali-Regular.ttf + <font weight="500" style="normal" fallbackFor="serif">NotoSerifBengali-VF.ttf <axis tag="wght" stylevalue="500"/> </font> - <font weight="600" style="normal" fallbackFor="serif">NotoSerifBengali-Regular.ttf + <font weight="600" style="normal" fallbackFor="serif">NotoSerifBengali-VF.ttf <axis tag="wght" stylevalue="600"/> </font> - <font weight="700" style="normal" fallbackFor="serif">NotoSerifBengali-Regular.ttf + <font weight="700" style="normal" fallbackFor="serif">NotoSerifBengali-VF.ttf <axis tag="wght" stylevalue="700"/> </font> </family> <family lang="und-Beng" variant="compact"> - <font weight="400" style="normal">NotoSansBengaliUI-Regular.ttf + <font weight="400" style="normal">NotoSansBengaliUI-VF.ttf <axis tag="wght" stylevalue="400"/> </font> - <font weight="500" style="normal">NotoSansBengaliUI-Regular.ttf + <font weight="500" style="normal">NotoSansBengaliUI-VF.ttf <axis tag="wght" stylevalue="500"/> </font> - <font weight="600" style="normal">NotoSansBengaliUI-Regular.ttf + <font weight="600" style="normal">NotoSansBengaliUI-VF.ttf <axis tag="wght" stylevalue="600"/> </font> - <font weight="700" style="normal">NotoSansBengaliUI-Regular.ttf + <font weight="700" style="normal">NotoSansBengaliUI-VF.ttf <axis tag="wght" stylevalue="700"/> </font> </family> <family lang="und-Telu" variant="elegant"> - <font weight="400" style="normal">NotoSansTelugu-Regular.ttf + <font weight="400" style="normal">NotoSansTelugu-VF.ttf <axis tag="wght" stylevalue="400"/> </font> - <font weight="500" style="normal">NotoSansTelugu-Regular.ttf + <font weight="500" style="normal">NotoSansTelugu-VF.ttf <axis tag="wght" stylevalue="500"/> </font> - <font weight="600" style="normal">NotoSansTelugu-Regular.ttf + <font weight="600" style="normal">NotoSansTelugu-VF.ttf <axis tag="wght" stylevalue="600"/> </font> - <font weight="700" style="normal">NotoSansTelugu-Regular.ttf + <font weight="700" style="normal">NotoSansTelugu-VF.ttf <axis tag="wght" stylevalue="700"/> </font> - <font weight="400" style="normal" fallbackFor="serif">NotoSerifTelugu-Regular.ttf + <font weight="400" style="normal" fallbackFor="serif">NotoSerifTelugu-VF.ttf <axis tag="wght" stylevalue="400"/> </font> - <font weight="500" style="normal" fallbackFor="serif">NotoSerifTelugu-Regular.ttf + <font weight="500" style="normal" fallbackFor="serif">NotoSerifTelugu-VF.ttf <axis tag="wght" stylevalue="500"/> </font> - <font weight="600" style="normal" fallbackFor="serif">NotoSerifTelugu-Regular.ttf + <font weight="600" style="normal" fallbackFor="serif">NotoSerifTelugu-VF.ttf <axis tag="wght" stylevalue="600"/> </font> - <font weight="700" style="normal" fallbackFor="serif">NotoSerifTelugu-Regular.ttf + <font weight="700" style="normal" fallbackFor="serif">NotoSerifTelugu-VF.ttf <axis tag="wght" stylevalue="700"/> </font> </family> <family lang="und-Telu" variant="compact"> - <font weight="400" style="normal">NotoSansTeluguUI-Regular.ttf + <font weight="400" style="normal">NotoSansTeluguUI-VF.ttf <axis tag="wght" stylevalue="400"/> </font> - <font weight="500" style="normal">NotoSansTeluguUI-Regular.ttf + <font weight="500" style="normal">NotoSansTeluguUI-VF.ttf <axis tag="wght" stylevalue="500"/> </font> - <font weight="600" style="normal">NotoSansTeluguUI-Regular.ttf + <font weight="600" style="normal">NotoSansTeluguUI-VF.ttf <axis tag="wght" stylevalue="600"/> </font> - <font weight="700" style="normal">NotoSansTeluguUI-Regular.ttf + <font weight="700" style="normal">NotoSansTeluguUI-VF.ttf <axis tag="wght" stylevalue="700"/> </font> </family> <family lang="und-Knda" variant="elegant"> - <font weight="400" style="normal">NotoSansKannada-Regular.ttf + <font weight="400" style="normal">NotoSansKannada-VF.ttf <axis tag="wght" stylevalue="400"/> </font> - <font weight="500" style="normal">NotoSansKannada-Regular.ttf + <font weight="500" style="normal">NotoSansKannada-VF.ttf <axis tag="wght" stylevalue="500"/> </font> - <font weight="600" style="normal">NotoSansKannada-Regular.ttf + <font weight="600" style="normal">NotoSansKannada-VF.ttf <axis tag="wght" stylevalue="600"/> </font> - <font weight="700" style="normal">NotoSansKannada-Regular.ttf + <font weight="700" style="normal">NotoSansKannada-VF.ttf <axis tag="wght" stylevalue="700"/> </font> - <font weight="400" style="normal" fallbackFor="serif">NotoSerifKannada-Regular.ttf + <font weight="400" style="normal" fallbackFor="serif">NotoSerifKannada-VF.ttf <axis tag="wght" stylevalue="400"/> </font> - <font weight="500" style="normal" fallbackFor="serif">NotoSerifKannada-Regular.ttf + <font weight="500" style="normal" fallbackFor="serif">NotoSerifKannada-VF.ttf <axis tag="wght" stylevalue="500"/> </font> - <font weight="600" style="normal" fallbackFor="serif">NotoSerifKannada-Regular.ttf + <font weight="600" style="normal" fallbackFor="serif">NotoSerifKannada-VF.ttf <axis tag="wght" stylevalue="600"/> </font> - <font weight="700" style="normal" fallbackFor="serif">NotoSerifKannada-Regular.ttf + <font weight="700" style="normal" fallbackFor="serif">NotoSerifKannada-VF.ttf <axis tag="wght" stylevalue="700"/> </font> </family> <family lang="und-Knda" variant="compact"> - <font weight="400" style="normal">NotoSansKannadaUI-Regular.ttf + <font weight="400" style="normal">NotoSansKannadaUI-VF.ttf <axis tag="wght" stylevalue="400"/> </font> - <font weight="500" style="normal">NotoSansKannadaUI-Regular.ttf + <font weight="500" style="normal">NotoSansKannadaUI-VF.ttf <axis tag="wght" stylevalue="500"/> </font> - <font weight="600" style="normal">NotoSansKannadaUI-Regular.ttf + <font weight="600" style="normal">NotoSansKannadaUI-VF.ttf <axis tag="wght" stylevalue="600"/> </font> - <font weight="700" style="normal">NotoSansKannadaUI-Regular.ttf + <font weight="700" style="normal">NotoSansKannadaUI-VF.ttf <axis tag="wght" stylevalue="700"/> </font> </family> <family lang="und-Orya" variant="elegant"> - <font weight="400" style="normal">NotoSansOriya.ttf</font> + <font weight="400" style="normal">NotoSansOriya-Regular.ttf</font> <font weight="700" style="normal">NotoSansOriya-Bold.ttf</font> </family> <family lang="und-Orya" variant="compact"> - <font weight="400" style="normal">NotoSansOriyaUI.ttf</font> + <font weight="400" style="normal">NotoSansOriyaUI-Regular.ttf</font> <font weight="700" style="normal">NotoSansOriyaUI-Bold.ttf</font> </family> <family lang="und-Sinh" variant="elegant"> - <font weight="400" style="normal">NotoSansSinhala-Regular.ttf + <font weight="400" style="normal">NotoSansSinhala-VF.ttf <axis tag="wght" stylevalue="400"/> </font> - <font weight="500" style="normal">NotoSansSinhala-Regular.ttf + <font weight="500" style="normal">NotoSansSinhala-VF.ttf <axis tag="wght" stylevalue="500"/> </font> - <font weight="600" style="normal">NotoSansSinhala-Regular.ttf + <font weight="600" style="normal">NotoSansSinhala-VF.ttf <axis tag="wght" stylevalue="600"/> </font> - <font weight="700" style="normal">NotoSansSinhala-Regular.ttf + <font weight="700" style="normal">NotoSansSinhala-VF.ttf <axis tag="wght" stylevalue="700"/> </font> - <font weight="400" style="normal" fallbackFor="serif">NotoSerifSinhala-Regular.ttf + <font weight="400" style="normal" fallbackFor="serif">NotoSerifSinhala-VF.ttf <axis tag="wght" stylevalue="400"/> </font> - <font weight="500" style="normal" fallbackFor="serif">NotoSerifSinhala-Regular.ttf + <font weight="500" style="normal" fallbackFor="serif">NotoSerifSinhala-VF.ttf <axis tag="wght" stylevalue="500"/> </font> - <font weight="600" style="normal" fallbackFor="serif">NotoSerifSinhala-Regular.ttf + <font weight="600" style="normal" fallbackFor="serif">NotoSerifSinhala-VF.ttf <axis tag="wght" stylevalue="600"/> </font> - <font weight="700" style="normal" fallbackFor="serif">NotoSerifSinhala-Regular.ttf + <font weight="700" style="normal" fallbackFor="serif">NotoSerifSinhala-VF.ttf <axis tag="wght" stylevalue="700"/> </font> </family> <family lang="und-Sinh" variant="compact"> - <font weight="400" style="normal">NotoSansSinhalaUI-Regular.ttf + <font weight="400" style="normal">NotoSansSinhalaUI-VF.ttf <axis tag="wght" stylevalue="400"/> </font> - <font weight="500" style="normal">NotoSansSinhalaUI-Regular.ttf + <font weight="500" style="normal">NotoSansSinhalaUI-VF.ttf <axis tag="wght" stylevalue="500"/> </font> - <font weight="600" style="normal">NotoSansSinhalaUI-Regular.ttf + <font weight="600" style="normal">NotoSansSinhalaUI-VF.ttf <axis tag="wght" stylevalue="600"/> </font> - <font weight="700" style="normal">NotoSansSinhalaUI-Regular.ttf + <font weight="700" style="normal">NotoSansSinhalaUI-VF.ttf <axis tag="wght" stylevalue="700"/> </font> </family> <family lang="und-Khmr" variant="elegant"> - <font weight="100" style="normal">NotoSansKhmer-Regular.ttf + <font weight="100" style="normal">NotoSansKhmer-VF.ttf <axis tag="wdth" stylevalue="100.0"/> <axis tag="wght" stylevalue="26.0"/> </font> - <font weight="200" style="normal">NotoSansKhmer-Regular.ttf + <font weight="200" style="normal">NotoSansKhmer-VF.ttf <axis tag="wdth" stylevalue="100.0"/> <axis tag="wght" stylevalue="39.0"/> </font> - <font weight="300" style="normal">NotoSansKhmer-Regular.ttf + <font weight="300" style="normal">NotoSansKhmer-VF.ttf <axis tag="wdth" stylevalue="100.0"/> <axis tag="wght" stylevalue="58.0"/> </font> - <font weight="400" style="normal">NotoSansKhmer-Regular.ttf + <font weight="400" style="normal">NotoSansKhmer-VF.ttf <axis tag="wdth" stylevalue="100.0"/> <axis tag="wght" stylevalue="90.0"/> </font> - <font weight="500" style="normal">NotoSansKhmer-Regular.ttf + <font weight="500" style="normal">NotoSansKhmer-VF.ttf <axis tag="wdth" stylevalue="100.0"/> <axis tag="wght" stylevalue="108.0"/> </font> - <font weight="600" style="normal">NotoSansKhmer-Regular.ttf + <font weight="600" style="normal">NotoSansKhmer-VF.ttf <axis tag="wdth" stylevalue="100.0"/> <axis tag="wght" stylevalue="128.0"/> </font> - <font weight="700" style="normal">NotoSansKhmer-Regular.ttf + <font weight="700" style="normal">NotoSansKhmer-VF.ttf <axis tag="wdth" stylevalue="100.0"/> <axis tag="wght" stylevalue="151.0"/> </font> - <font weight="800" style="normal">NotoSansKhmer-Regular.ttf + <font weight="800" style="normal">NotoSansKhmer-VF.ttf <axis tag="wdth" stylevalue="100.0"/> <axis tag="wght" stylevalue="169.0"/> </font> - <font weight="900" style="normal">NotoSansKhmer-Regular.ttf + <font weight="900" style="normal">NotoSansKhmer-VF.ttf <axis tag="wdth" stylevalue="100.0"/> <axis tag="wght" stylevalue="190.0"/> </font> @@ -769,17 +769,17 @@ <font weight="700" style="normal" fallbackFor="serif">NotoSerifKhmer-Bold.otf</font> </family> <family lang="und-Khmr" variant="compact"> - <font weight="400" style="normal">NotoSansKhmerUI.ttf</font> + <font weight="400" style="normal">NotoSansKhmerUI-Regular.ttf</font> <font weight="700" style="normal">NotoSansKhmerUI-Bold.ttf</font> </family> <family lang="und-Laoo" variant="elegant"> - <font weight="400" style="normal">NotoSansLao.ttf</font> + <font weight="400" style="normal">NotoSansLao-Regular.ttf</font> <font weight="700" style="normal">NotoSansLao-Bold.ttf</font> - <font weight="400" style="normal" fallbackFor="serif">NotoSerifLao.ttf</font> + <font weight="400" style="normal" fallbackFor="serif">NotoSerifLao-Regular.ttf</font> <font weight="700" style="normal" fallbackFor="serif">NotoSerifLao-Bold.ttf</font> </family> <family lang="und-Laoo" variant="compact"> - <font weight="400" style="normal">NotoSansLaoUI.ttf</font> + <font weight="400" style="normal">NotoSansLaoUI-Regular.ttf</font> <font weight="700" style="normal">NotoSansLaoUI-Bold.ttf</font> </family> <family lang="und-Mymr" variant="elegant"> @@ -795,56 +795,56 @@ <font weight="700" style="normal">NotoSansMyanmarUI-Bold.otf</font> </family> <family lang="und-Thaa"> - <font weight="400" style="normal">NotoSansThaana.ttf</font> + <font weight="400" style="normal">NotoSansThaana-Regular.ttf</font> <font weight="700" style="normal">NotoSansThaana-Bold.ttf</font> </family> <family lang="und-Cham"> - <font weight="400" style="normal">NotoSansCham.ttf</font> + <font weight="400" style="normal">NotoSansCham-Regular.ttf</font> <font weight="700" style="normal">NotoSansCham-Bold.ttf</font> </family> <family lang="und-Ahom"> <font weight="400" style="normal">NotoSansAhom-Regular.otf</font> </family> <family lang="und-Adlm"> - <font weight="400" style="normal">NotoSansAdlam-Regular.ttf + <font weight="400" style="normal">NotoSansAdlam-VF.ttf <axis tag="wght" stylevalue="400"/> </font> - <font weight="500" style="normal">NotoSansAdlam-Regular.ttf + <font weight="500" style="normal">NotoSansAdlam-VF.ttf <axis tag="wght" stylevalue="500"/> </font> - <font weight="600" style="normal">NotoSansAdlam-Regular.ttf + <font weight="600" style="normal">NotoSansAdlam-VF.ttf <axis tag="wght" stylevalue="600"/> </font> - <font weight="700" style="normal">NotoSansAdlam-Regular.ttf + <font weight="700" style="normal">NotoSansAdlam-VF.ttf <axis tag="wght" stylevalue="700"/> </font> </family> <family lang="und-Avst"> - <font weight="400" style="normal">NotoSansAvestan.ttf</font> + <font weight="400" style="normal">NotoSansAvestan-Regular.ttf</font> </family> <family lang="und-Bali"> - <font weight="400" style="normal">NotoSansBalinese.ttf</font> + <font weight="400" style="normal">NotoSansBalinese-Regular.ttf</font> </family> <family lang="und-Bamu"> - <font weight="400" style="normal">NotoSansBamum.ttf</font> + <font weight="400" style="normal">NotoSansBamum-Regular.ttf</font> </family> <family lang="und-Batk"> - <font weight="400" style="normal">NotoSansBatak.ttf</font> + <font weight="400" style="normal">NotoSansBatak-Regular.ttf</font> </family> <family lang="und-Brah"> - <font weight="400" style="normal">NotoSansBrahmi.ttf</font> + <font weight="400" style="normal">NotoSansBrahmi-Regular.ttf</font> </family> <family lang="und-Bugi"> - <font weight="400" style="normal">NotoSansBuginese.ttf</font> + <font weight="400" style="normal">NotoSansBuginese-Regular.ttf</font> </family> <family lang="und-Buhd"> - <font weight="400" style="normal">NotoSansBuhid.ttf</font> + <font weight="400" style="normal">NotoSansBuhid-Regular.ttf</font> </family> <family lang="und-Cans"> - <font weight="400" style="normal">NotoSansCanadianAboriginal.ttf</font> + <font weight="400" style="normal">NotoSansCanadianAboriginal-Regular.ttf</font> </family> <family lang="und-Cari"> - <font weight="400" style="normal">NotoSansCarian.ttf</font> + <font weight="400" style="normal">NotoSansCarian-Regular.ttf</font> </family> <family lang="und-Cakm"> <font weight="400" style="normal">NotoSansChakma-Regular.otf</font> @@ -853,164 +853,164 @@ <font weight="400" style="normal">NotoSansCherokee-Regular.ttf</font> </family> <family lang="und-Copt"> - <font weight="400" style="normal">NotoSansCoptic.ttf</font> + <font weight="400" style="normal">NotoSansCoptic-Regular.ttf</font> </family> <family lang="und-Xsux"> - <font weight="400" style="normal">NotoSansCuneiform.ttf</font> + <font weight="400" style="normal">NotoSansCuneiform-Regular.ttf</font> </family> <family lang="und-Cprt"> - <font weight="400" style="normal">NotoSansCypriot.ttf</font> + <font weight="400" style="normal">NotoSansCypriot-Regular.ttf</font> </family> <family lang="und-Dsrt"> - <font weight="400" style="normal">NotoSansDeseret.ttf</font> + <font weight="400" style="normal">NotoSansDeseret-Regular.ttf</font> </family> <family lang="und-Egyp"> - <font weight="400" style="normal">NotoSansEgyptianHieroglyphs.ttf</font> + <font weight="400" style="normal">NotoSansEgyptianHieroglyphs-Regular.ttf</font> </family> <family lang="und-Elba"> <font weight="400" style="normal">NotoSansElbasan-Regular.otf</font> </family> <family lang="und-Glag"> - <font weight="400" style="normal">NotoSansGlagolitic.ttf</font> + <font weight="400" style="normal">NotoSansGlagolitic-Regular.ttf</font> </family> <family lang="und-Goth"> - <font weight="400" style="normal">NotoSansGothic.ttf</font> + <font weight="400" style="normal">NotoSansGothic-Regular.ttf</font> </family> <family lang="und-Hano"> - <font weight="400" style="normal">NotoSansHanunoo.ttf</font> + <font weight="400" style="normal">NotoSansHanunoo-Regular.ttf</font> </family> <family lang="und-Armi"> - <font weight="400" style="normal">NotoSansImperialAramaic.ttf</font> + <font weight="400" style="normal">NotoSansImperialAramaic-Regular.ttf</font> </family> <family lang="und-Phli"> - <font weight="400" style="normal">NotoSansInscriptionalPahlavi.ttf</font> + <font weight="400" style="normal">NotoSansInscriptionalPahlavi-Regular.ttf</font> </family> <family lang="und-Prti"> - <font weight="400" style="normal">NotoSansInscriptionalParthian.ttf</font> + <font weight="400" style="normal">NotoSansInscriptionalParthian-Regular.ttf</font> </family> <family lang="und-Java"> <font weight="400" style="normal">NotoSansJavanese-Regular.otf</font> </family> <family lang="und-Kthi"> - <font weight="400" style="normal">NotoSansKaithi.ttf</font> + <font weight="400" style="normal">NotoSansKaithi-Regular.ttf</font> </family> <family lang="und-Kali"> - <font weight="400" style="normal">NotoSansKayahLi.ttf</font> + <font weight="400" style="normal">NotoSansKayahLi-Regular.ttf</font> </family> <family lang="und-Khar"> - <font weight="400" style="normal">NotoSansKharoshthi.ttf</font> + <font weight="400" style="normal">NotoSansKharoshthi-Regular.ttf</font> </family> <family lang="und-Lepc"> - <font weight="400" style="normal">NotoSansLepcha.ttf</font> + <font weight="400" style="normal">NotoSansLepcha-Regular.ttf</font> </family> <family lang="und-Limb"> - <font weight="400" style="normal">NotoSansLimbu.ttf</font> + <font weight="400" style="normal">NotoSansLimbu-Regular.ttf</font> </family> <family lang="und-Linb"> - <font weight="400" style="normal">NotoSansLinearB.ttf</font> + <font weight="400" style="normal">NotoSansLinearB-Regular.ttf</font> </family> <family lang="und-Lisu"> - <font weight="400" style="normal">NotoSansLisu.ttf</font> + <font weight="400" style="normal">NotoSansLisu-Regular.ttf</font> </family> <family lang="und-Lyci"> - <font weight="400" style="normal">NotoSansLycian.ttf</font> + <font weight="400" style="normal">NotoSansLycian-Regular.ttf</font> </family> <family lang="und-Lydi"> - <font weight="400" style="normal">NotoSansLydian.ttf</font> + <font weight="400" style="normal">NotoSansLydian-Regular.ttf</font> </family> <family lang="und-Mand"> - <font weight="400" style="normal">NotoSansMandaic.ttf</font> + <font weight="400" style="normal">NotoSansMandaic-Regular.ttf</font> </family> <family lang="und-Mtei"> - <font weight="400" style="normal">NotoSansMeeteiMayek.ttf</font> + <font weight="400" style="normal">NotoSansMeeteiMayek-Regular.ttf</font> </family> <family lang="und-Talu"> - <font weight="400" style="normal">NotoSansNewTaiLue.ttf</font> + <font weight="400" style="normal">NotoSansNewTaiLue-Regular.ttf</font> </family> <family lang="und-Nkoo"> - <font weight="400" style="normal">NotoSansNKo.ttf</font> + <font weight="400" style="normal">NotoSansNKo-Regular.ttf</font> </family> <family lang="und-Ogam"> - <font weight="400" style="normal">NotoSansOgham.ttf</font> + <font weight="400" style="normal">NotoSansOgham-Regular.ttf</font> </family> <family lang="und-Olck"> - <font weight="400" style="normal">NotoSansOlChiki.ttf</font> + <font weight="400" style="normal">NotoSansOlChiki-Regular.ttf</font> </family> <family lang="und-Ital"> - <font weight="400" style="normal">NotoSansOldItalic.ttf</font> + <font weight="400" style="normal">NotoSansOldItalic-Regular.ttf</font> </family> <family lang="und-Xpeo"> - <font weight="400" style="normal">NotoSansOldPersian.ttf</font> + <font weight="400" style="normal">NotoSansOldPersian-Regular.ttf</font> </family> <family lang="und-Sarb"> - <font weight="400" style="normal">NotoSansOldSouthArabian.ttf</font> + <font weight="400" style="normal">NotoSansOldSouthArabian-Regular.ttf</font> </family> <family lang="und-Orkh"> - <font weight="400" style="normal">NotoSansOldTurkic.ttf</font> + <font weight="400" style="normal">NotoSansOldTurkic-Regular.ttf</font> </family> <family lang="und-Osge"> <font weight="400" style="normal">NotoSansOsage-Regular.ttf</font> </family> <family lang="und-Osma"> - <font weight="400" style="normal">NotoSansOsmanya.ttf</font> + <font weight="400" style="normal">NotoSansOsmanya-Regular.ttf</font> </family> <family lang="und-Phnx"> - <font weight="400" style="normal">NotoSansPhoenician.ttf</font> + <font weight="400" style="normal">NotoSansPhoenician-Regular.ttf</font> </family> <family lang="und-Rjng"> - <font weight="400" style="normal">NotoSansRejang.ttf</font> + <font weight="400" style="normal">NotoSansRejang-Regular.ttf</font> </family> <family lang="und-Runr"> - <font weight="400" style="normal">NotoSansRunic.ttf</font> + <font weight="400" style="normal">NotoSansRunic-Regular.ttf</font> </family> <family lang="und-Samr"> - <font weight="400" style="normal">NotoSansSamaritan.ttf</font> + <font weight="400" style="normal">NotoSansSamaritan-Regular.ttf</font> </family> <family lang="und-Saur"> - <font weight="400" style="normal">NotoSansSaurashtra.ttf</font> + <font weight="400" style="normal">NotoSansSaurashtra-Regular.ttf</font> </family> <family lang="und-Shaw"> - <font weight="400" style="normal">NotoSansShavian.ttf</font> + <font weight="400" style="normal">NotoSansShavian-Regular.ttf</font> </family> <family lang="und-Sund"> - <font weight="400" style="normal">NotoSansSundanese.ttf</font> + <font weight="400" style="normal">NotoSansSundanese-Regular.ttf</font> </family> <family lang="und-Sylo"> - <font weight="400" style="normal">NotoSansSylotiNagri.ttf</font> + <font weight="400" style="normal">NotoSansSylotiNagri-Regular.ttf</font> </family> <!-- Esrangela should precede Eastern and Western Syriac, since it's our default form. --> <family lang="und-Syre"> - <font weight="400" style="normal">NotoSansSyriacEstrangela.ttf</font> + <font weight="400" style="normal">NotoSansSyriacEstrangela-Regular.ttf</font> </family> <family lang="und-Syrn"> - <font weight="400" style="normal">NotoSansSyriacEastern.ttf</font> + <font weight="400" style="normal">NotoSansSyriacEastern-Regular.ttf</font> </family> <family lang="und-Syrj"> - <font weight="400" style="normal">NotoSansSyriacWestern.ttf</font> + <font weight="400" style="normal">NotoSansSyriacWestern-Regular.ttf</font> </family> <family lang="und-Tglg"> - <font weight="400" style="normal">NotoSansTagalog.ttf</font> + <font weight="400" style="normal">NotoSansTagalog-Regular.ttf</font> </family> <family lang="und-Tagb"> - <font weight="400" style="normal">NotoSansTagbanwa.ttf</font> + <font weight="400" style="normal">NotoSansTagbanwa-Regular.ttf</font> </family> <family lang="und-Lana"> - <font weight="400" style="normal">NotoSansTaiTham.ttf</font> + <font weight="400" style="normal">NotoSansTaiTham-Regular.ttf</font> </family> <family lang="und-Tavt"> - <font weight="400" style="normal">NotoSansTaiViet.ttf</font> + <font weight="400" style="normal">NotoSansTaiViet-Regular.ttf</font> </family> <family lang="und-Tibt"> - <font weight="400" style="normal">NotoSerifTibetan-Regular.ttf + <font weight="400" style="normal">NotoSerifTibetan-VF.ttf <axis tag="wght" stylevalue="400"/> </font> - <font weight="500" style="normal">NotoSerifTibetan-Regular.ttf + <font weight="500" style="normal">NotoSerifTibetan-VF.ttf <axis tag="wght" stylevalue="500"/> </font> - <font weight="600" style="normal">NotoSerifTibetan-Regular.ttf + <font weight="600" style="normal">NotoSerifTibetan-VF.ttf <axis tag="wght" stylevalue="600"/> </font> - <font weight="700" style="normal">NotoSerifTibetan-Regular.ttf + <font weight="700" style="normal">NotoSerifTibetan-VF.ttf <axis tag="wght" stylevalue="700"/> </font> </family> @@ -1018,29 +1018,29 @@ <font weight="400" style="normal">NotoSansTifinagh-Regular.otf</font> </family> <family lang="und-Ugar"> - <font weight="400" style="normal">NotoSansUgaritic.ttf</font> + <font weight="400" style="normal">NotoSansUgaritic-Regular.ttf</font> </family> <family lang="und-Vaii"> - <font weight="400" style="normal">NotoSansVai.ttf</font> + <font weight="400" style="normal">NotoSansVai-Regular.ttf</font> </family> <family> <font weight="400" style="normal">NotoSansSymbols-Regular-Subsetted.ttf</font> </family> <family lang="zh-Hans"> - <font weight="400" style="normal" index="2">NotoSansCJKjp-Regular.otc</font> - <font weight="400" style="normal" index="2" fallbackFor="serif">NotoSerifCJKjp-Regular.otc</font> + <font weight="400" style="normal" index="2">NotoSansCJK-Regular.ttc</font> + <font weight="400" style="normal" index="2" fallbackFor="serif">NotoSerifCJK-Regular.ttc</font> </family> <family lang="zh-Hant,zh-Bopo"> - <font weight="400" style="normal" index="3">NotoSansCJKjp-Regular.otc</font> - <font weight="400" style="normal" index="3" fallbackFor="serif">NotoSerifCJKjp-Regular.otc</font> + <font weight="400" style="normal" index="3">NotoSansCJK-Regular.ttc</font> + <font weight="400" style="normal" index="3" fallbackFor="serif">NotoSerifCJK-Regular.ttc</font> </family> <family lang="ja"> - <font weight="400" style="normal" index="0">NotoSansCJKjp-Regular.otc</font> - <font weight="400" style="normal" index="0" fallbackFor="serif">NotoSerifCJKjp-Regular.otc</font> + <font weight="400" style="normal" index="0">NotoSansCJK-Regular.ttc</font> + <font weight="400" style="normal" index="0" fallbackFor="serif">NotoSerifCJK-Regular.ttc</font> </family> <family lang="ko"> - <font weight="400" style="normal" index="1">NotoSansCJKjp-Regular.otc</font> - <font weight="400" style="normal" index="1" fallbackFor="serif">NotoSerifCJKjp-Regular.otc</font> + <font weight="400" style="normal" index="1">NotoSansCJK-Regular.ttc</font> + <font weight="400" style="normal" index="1" fallbackFor="serif">NotoSerifCJK-Regular.ttc</font> </family> <family lang="und-Zsye"> <font weight="400" style="normal">NotoColorEmoji.ttf</font> @@ -1053,16 +1053,16 @@ override the East Asian punctuation for Chinese. --> <family lang="und-Tale"> - <font weight="400" style="normal">NotoSansTaiLe.ttf</font> + <font weight="400" style="normal">NotoSansTaiLe-Regular.ttf</font> </family> <family lang="und-Yiii"> - <font weight="400" style="normal">NotoSansYi.ttf</font> + <font weight="400" style="normal">NotoSansYi-Regular.ttf</font> </family> <family lang="und-Mong"> - <font weight="400" style="normal">NotoSansMongolian.ttf</font> + <font weight="400" style="normal">NotoSansMongolian-Regular.ttf</font> </family> <family lang="und-Phag"> - <font weight="400" style="normal">NotoSansPhagsPa.ttf</font> + <font weight="400" style="normal">NotoSansPhagsPa-Regular.ttf</font> </family> <family lang="und-Hluw"> <font weight="400" style="normal">NotoSansAnatolianHieroglyphs-Regular.otf</font> @@ -1152,72 +1152,72 @@ <font weight="400" style="normal">NotoSerifDogra-Regular.ttf</font> </family> <family lang="und-Medf"> - <font weight="400" style="normal">NotoSansMedefaidrin-Regular.ttf + <font weight="400" style="normal">NotoSansMedefaidrin-VF.ttf <axis tag="wght" stylevalue="400"/> </font> - <font weight="500" style="normal">NotoSansMedefaidrin-Regular.ttf + <font weight="500" style="normal">NotoSansMedefaidrin-VF.ttf <axis tag="wght" stylevalue="500"/> </font> - <font weight="600" style="normal">NotoSansMedefaidrin-Regular.ttf + <font weight="600" style="normal">NotoSansMedefaidrin-VF.ttf <axis tag="wght" stylevalue="600"/> </font> - <font weight="700" style="normal">NotoSansMedefaidrin-Regular.ttf + <font weight="700" style="normal">NotoSansMedefaidrin-VF.ttf <axis tag="wght" stylevalue="700"/> </font> </family> <family lang="und-Soyo"> - <font weight="400" style="normal">NotoSansSoyombo-Regular.ttf + <font weight="400" style="normal">NotoSansSoyombo-VF.ttf <axis tag="wght" stylevalue="400"/> </font> - <font weight="500" style="normal">NotoSansSoyombo-Regular.ttf + <font weight="500" style="normal">NotoSansSoyombo-VF.ttf <axis tag="wght" stylevalue="500"/> </font> - <font weight="600" style="normal">NotoSansSoyombo-Regular.ttf + <font weight="600" style="normal">NotoSansSoyombo-VF.ttf <axis tag="wght" stylevalue="600"/> </font> - <font weight="700" style="normal">NotoSansSoyombo-Regular.ttf + <font weight="700" style="normal">NotoSansSoyombo-VF.ttf <axis tag="wght" stylevalue="700"/> </font> </family> <family lang="und-Takr"> - <font weight="400" style="normal">NotoSansTakri-Regular.ttf + <font weight="400" style="normal">NotoSansTakri-VF.ttf <axis tag="wght" stylevalue="400"/> </font> - <font weight="500" style="normal">NotoSansTakri-Regular.ttf + <font weight="500" style="normal">NotoSansTakri-VF.ttf <axis tag="wght" stylevalue="500"/> </font> - <font weight="600" style="normal">NotoSansTakri-Regular.ttf + <font weight="600" style="normal">NotoSansTakri-VF.ttf <axis tag="wght" stylevalue="600"/> </font> - <font weight="700" style="normal">NotoSansTakri-Regular.ttf + <font weight="700" style="normal">NotoSansTakri-VF.ttf <axis tag="wght" stylevalue="700"/> </font> </family> <family lang="und-Hmnp"> - <font weight="400" style="normal">NotoSerifHmongNyiakeng-Regular.ttf + <font weight="400" style="normal">NotoSerifNyiakengPuachueHmong-VF.ttf <axis tag="wght" stylevalue="400"/> </font> - <font weight="500" style="normal">NotoSerifHmongNyiakeng-Regular.ttf + <font weight="500" style="normal">NotoSerifNyiakengPuachueHmong-VF.ttf <axis tag="wght" stylevalue="500"/> </font> - <font weight="600" style="normal">NotoSerifHmongNyiakeng-Regular.ttf + <font weight="600" style="normal">NotoSerifNyiakengPuachueHmong-VF.ttf <axis tag="wght" stylevalue="600"/> </font> - <font weight="700" style="normal">NotoSerifHmongNyiakeng-Regular.ttf + <font weight="700" style="normal">NotoSerifNyiakengPuachueHmong-VF.ttf <axis tag="wght" stylevalue="700"/> </font> </family> <family lang="und-Yezi"> - <font weight="400" style="normal">NotoSerifYezidi-Regular.ttf + <font weight="400" style="normal">NotoSerifYezidi-VF.ttf <axis tag="wght" stylevalue="400"/> </font> - <font weight="500" style="normal">NotoSerifYezidi-Regular.ttf + <font weight="500" style="normal">NotoSerifYezidi-VF.ttf <axis tag="wght" stylevalue="500"/> </font> - <font weight="600" style="normal">NotoSerifYezidi-Regular.ttf + <font weight="600" style="normal">NotoSerifYezidi-VF.ttf <axis tag="wght" stylevalue="600"/> </font> - <font weight="700" style="normal">NotoSerifYezidi-Regular.ttf + <font weight="700" style="normal">NotoSerifYezidi-VF.ttf <axis tag="wght" stylevalue="700"/> </font> </family> diff --git a/libs/hwui/tests/unit/TypefaceTests.cpp b/libs/hwui/tests/unit/TypefaceTests.cpp index 1a3dbe7faaf6..ab23448ab93f 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 e775e1adb04e..f0b759547a93 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] |