Revert "Rename font file with PostScript based names"
Revert submission 1606485-rename_fonts
Reason for revert: font file name requirement was removed.
Reverted Changes:
Iab8b9d65a:Update ImageGenerator to match the latest font nam...
Ifbe99d68c:Rename the font file with PostScript name based fi...
I307c21531:Rename font file with PostScript based names
Change-Id: I8b4bc04fd8b25e58eb0b10e8a7741199846708b3
Merged-In: Idbb5ee97af3a3cfc6aa9e9de26568b698e3418a4
diff --git a/Android.bp b/Android.bp
index fb38725..bdf31cb 100644
--- a/Android.bp
+++ b/Android.bp
@@ -50,7 +50,7 @@
name: "recovery_noto-fonts_dep",
export_to_make_var: "recovery_noto-fonts_dep",
srcs: [
- "cjk/*.otc",
+ "cjk/*.ttc",
"other/*.otf",
"other/*.ttf",
],
diff --git a/cjk/Android.bp b/cjk/Android.bp
index a198734..1fc3d00 100644
--- a/cjk/Android.bp
+++ b/cjk/Android.bp
@@ -47,11 +47,11 @@
}
prebuilt_font {
- name: "NotoSansCJKjp-Regular.otc",
- src: "NotoSansCJKjp-Regular.otc",
+ name: "NotoSansCJK-Regular.ttc",
+ src: "NotoSansCJK-Regular.ttc",
}
prebuilt_font {
- name: "NotoSerifCJKjp-Regular.otc",
- src: "NotoSerifCJKjp-Regular.otc",
+ name: "NotoSerifCJK-Regular.ttc",
+ src: "NotoSerifCJK-Regular.ttc",
}
diff --git a/cjk/NotoSansCJKjp-Regular.otc b/cjk/NotoSansCJK-Regular.ttc
similarity index 100%
rename from cjk/NotoSansCJKjp-Regular.otc
rename to cjk/NotoSansCJK-Regular.ttc
Binary files differ
diff --git a/cjk/NotoSerifCJKjp-Regular.otc b/cjk/NotoSerifCJK-Regular.ttc
similarity index 100%
rename from cjk/NotoSerifCJKjp-Regular.otc
rename to cjk/NotoSerifCJK-Regular.ttc
Binary files differ
diff --git a/fonts.mk b/fonts.mk
index 87ab5c7..13bfbfb 100644
--- a/fonts.mk
+++ b/fonts.mk
@@ -19,20 +19,20 @@
PRODUCT_PACKAGES := \
NotoColorEmoji.ttf \
NotoNaskhArabic-Bold.ttf \
- NotoNaskhArabic.ttf \
+ NotoNaskhArabic-Regular.ttf \
NotoNaskhArabicUI-Bold.ttf \
- NotoNaskhArabicUI.ttf \
- NotoSansAdlam-Regular.ttf \
+ NotoNaskhArabicUI-Regular.ttf \
+ NotoSansAdlam-VF.ttf \
NotoSansAhom-Regular.otf \
NotoSansAnatolianHieroglyphs-Regular.otf \
NotoSansArmenian-Bold.otf \
NotoSansArmenian-Medium.otf \
NotoSansArmenian-Regular.otf \
- NotoSansAvestan.ttf \
- NotoSansBalinese.ttf \
- NotoSansBamum.ttf \
+ NotoSansAvestan-Regular.ttf \
+ NotoSansBalinese-Regular.ttf \
+ NotoSansBamum-Regular.ttf \
NotoSansBassaVah-Regular.otf \
- NotoSansBatak.ttf \
+ NotoSansBatak-Regular.ttf \
NotoSansBengali-Bold.otf \
NotoSansBengali-Medium.otf \
NotoSansBengali-Regular.otf \
@@ -40,87 +40,87 @@
NotoSansBengaliUI-Medium.otf \
NotoSansBengaliUI-Regular.otf \
NotoSansBhaiksuki-Regular.otf \
- NotoSansBrahmi.ttf \
- NotoSansBuginese.ttf \
- NotoSansBuhid.ttf \
- NotoSansCanadianAboriginal.ttf \
- NotoSansCarian.ttf \
+ NotoSansBrahmi-Regular.ttf \
+ NotoSansBuginese-Regular.ttf \
+ NotoSansBuhid-Regular.ttf \
+ NotoSansCanadianAboriginal-Regular.ttf \
+ NotoSansCarian-Regular.ttf \
NotoSansChakma-Regular.otf \
NotoSansCham-Bold.ttf \
- NotoSansCham.ttf \
+ NotoSansCham-Regular.ttf \
NotoSansCherokee-Regular.ttf \
- NotoSansCJKjp-Regular.otc \
- NotoSansCoptic.ttf \
- NotoSansCuneiform.ttf \
- NotoSansCypriot.ttf \
- NotoSansDeseret.ttf \
+ NotoSansCJK-Regular.ttc \
+ NotoSansCoptic-Regular.ttf \
+ NotoSansCuneiform-Regular.ttf \
+ NotoSansCypriot-Regular.ttf \
+ NotoSansDeseret-Regular.ttf \
NotoSansDevanagari-Bold.otf \
NotoSansDevanagari-Medium.otf \
NotoSansDevanagari-Regular.otf \
NotoSansDevanagariUI-Bold.otf \
NotoSansDevanagariUI-Medium.otf \
NotoSansDevanagariUI-Regular.otf \
- NotoSansEgyptianHieroglyphs.ttf \
+ NotoSansEgyptianHieroglyphs-Regular.ttf \
NotoSansElbasan-Regular.otf \
NotoSansEthiopic-Bold.ttf \
- NotoSansEthiopic.ttf \
- NotoSansGeorgian-Regular.ttf \
- NotoSansGlagolitic.ttf \
- NotoSansGothic.ttf \
+ NotoSansEthiopic-Regular.ttf \
+ NotoSansGeorgian-VF.ttf \
+ NotoSansGlagolitic-Regular.ttf \
+ NotoSansGothic-Regular.ttf \
NotoSansGujarati-Bold.ttf \
- NotoSansGujarati.ttf \
+ NotoSansGujarati-Regular.ttf \
NotoSansGujaratiUI-Bold.ttf \
- NotoSansGujaratiUI.ttf \
+ NotoSansGujaratiUI-Regular.ttf \
NotoSansGunjalaGondi-Regular.otf \
NotoSansGurmukhi-Bold.ttf \
- NotoSansGurmukhi.ttf \
+ NotoSansGurmukhi-Regular.ttf \
NotoSansGurmukhiUI-Bold.ttf \
- NotoSansGurmukhiUI.ttf \
+ NotoSansGurmukhiUI-Regular.ttf \
NotoSansHanifiRohingya-Regular.otf \
- NotoSansHanunoo.ttf \
+ NotoSansHanunoo-Regular.ttf \
NotoSansHatran-Regular.otf \
NotoSansHebrew-Bold.ttf \
- NotoSansHebrew.ttf \
- NotoSansImperialAramaic.ttf \
- NotoSansInscriptionalPahlavi.ttf \
- NotoSansInscriptionalParthian.ttf \
+ NotoSansHebrew-Regular.ttf \
+ NotoSansImperialAramaic-Regular.ttf \
+ NotoSansInscriptionalPahlavi-Regular.ttf \
+ NotoSansInscriptionalParthian-Regular.ttf \
NotoSansJavanese-Regular.otf \
- NotoSansKaithi.ttf \
+ NotoSansKaithi-Regular.ttf \
NotoSansKannada-Bold.ttf \
- NotoSansKannada.ttf \
+ NotoSansKannada-Regular.ttf \
NotoSansKannadaUI-Bold.ttf \
- NotoSansKannadaUI.ttf \
- NotoSansKayahLi.ttf \
- NotoSansKharoshthi.ttf \
- NotoSansKhmer-Regular.ttf \
+ NotoSansKannadaUI-Regular.ttf \
+ NotoSansKayahLi-Regular.ttf \
+ NotoSansKharoshthi-Regular.ttf \
+ NotoSansKhmer-VF.ttf \
NotoSansKhmerUI-Bold.ttf \
- NotoSansKhmerUI.ttf \
+ NotoSansKhmerUI-Regular.ttf \
NotoSansKhojki-Regular.otf \
NotoSansLao-Bold.ttf \
- NotoSansLao.ttf \
+ NotoSansLao-Regular.ttf \
NotoSansLaoUI-Bold.ttf \
- NotoSansLaoUI.ttf \
- NotoSansLepcha.ttf \
- NotoSansLimbu.ttf \
+ NotoSansLaoUI-Regular.ttf \
+ NotoSansLepcha-Regular.ttf \
+ NotoSansLimbu-Regular.ttf \
NotoSansLinearA-Regular.otf \
- NotoSansLinearB.ttf \
- NotoSansLisu.ttf \
- NotoSansLycian.ttf \
- NotoSansLydian.ttf \
+ NotoSansLinearB-Regular.ttf \
+ NotoSansLisu-Regular.ttf \
+ NotoSansLycian-Regular.ttf \
+ NotoSansLydian-Regular.ttf \
NotoSansMalayalam-Bold.otf \
NotoSansMalayalam-Medium.otf \
NotoSansMalayalam-Regular.otf \
NotoSansMalayalamUI-Bold.otf \
NotoSansMalayalamUI-Medium.otf \
NotoSansMalayalamUI-Regular.otf \
- NotoSansMandaic.ttf \
+ NotoSansMandaic-Regular.ttf \
NotoSansManichaean-Regular.otf \
NotoSansMarchen-Regular.otf \
NotoSansMasaramGondi-Regular.otf \
- NotoSansMeeteiMayek.ttf \
+ NotoSansMeeteiMayek-Regular.ttf \
NotoSansMeroitic-Regular.otf \
NotoSansMiao-Regular.otf \
- NotoSansMongolian.ttf \
+ NotoSansMongolian-Regular.ttf \
NotoSansMro-Regular.otf \
NotoSansMultani-Regular.otf \
NotoSansMyanmar-Bold.otf \
@@ -131,33 +131,33 @@
NotoSansMyanmarUI-Regular.otf \
NotoSansNabataean-Regular.otf \
NotoSansNewa-Regular.otf \
- NotoSansNewTaiLue.ttf \
- NotoSansNKo.ttf \
- NotoSansOgham.ttf \
- NotoSansOlChiki.ttf \
- NotoSansOldItalic.ttf \
+ NotoSansNewTaiLue-Regular.ttf \
+ NotoSansNKo-Regular.ttf \
+ NotoSansOgham-Regular.ttf \
+ NotoSansOlChiki-Regular.ttf \
+ NotoSansOldItalic-Regular.ttf \
NotoSansOldNorthArabian-Regular.otf \
NotoSansOldPermic-Regular.otf \
- NotoSansOldPersian.ttf \
- NotoSansOldSouthArabian.ttf \
- NotoSansOldTurkic.ttf \
+ NotoSansOldPersian-Regular.ttf \
+ NotoSansOldSouthArabian-Regular.ttf \
+ NotoSansOldTurkic-Regular.ttf \
NotoSansOriya-Bold.ttf \
- NotoSansOriya.ttf \
+ NotoSansOriya-Regular.ttf \
NotoSansOriyaUI-Bold.ttf \
- NotoSansOriyaUI.ttf \
+ NotoSansOriyaUI-Regular.ttf \
NotoSansOsage-Regular.ttf \
- NotoSansOsmanya.ttf \
+ NotoSansOsmanya-Regular.ttf \
NotoSansPahawhHmong-Regular.otf \
NotoSansPalmyrene-Regular.otf \
NotoSansPauCinHau-Regular.otf \
- NotoSansPhagsPa.ttf \
- NotoSansPhoenician.ttf \
- NotoSansRejang.ttf \
- NotoSansRunic.ttf \
- NotoSansSamaritan.ttf \
- NotoSansSaurashtra.ttf \
+ NotoSansPhagsPa-Regular.ttf \
+ NotoSansPhoenician-Regular.ttf \
+ NotoSansRejang-Regular.ttf \
+ NotoSansRunic-Regular.ttf \
+ NotoSansSamaritan-Regular.ttf \
+ NotoSansSaurashtra-Regular.ttf \
NotoSansSharada-Regular.otf \
- NotoSansShavian.ttf \
+ NotoSansShavian-Regular.ttf \
NotoSansSinhala-Bold.otf \
NotoSansSinhala-Medium.otf \
NotoSansSinhala-Regular.otf \
@@ -165,18 +165,18 @@
NotoSansSinhalaUI-Medium.otf \
NotoSansSinhalaUI-Regular.otf \
NotoSansSoraSompeng-Regular.otf \
- NotoSansSundanese.ttf \
- NotoSansSylotiNagri.ttf \
+ NotoSansSundanese-Regular.ttf \
+ NotoSansSylotiNagri-Regular.ttf \
NotoSansSymbols-Regular-Subsetted.ttf \
NotoSansSymbols-Regular-Subsetted2.ttf \
- NotoSansSyriacEastern.ttf \
- NotoSansSyriacEstrangela.ttf \
- NotoSansSyriacWestern.ttf \
- NotoSansTagalog.ttf \
- NotoSansTagbanwa.ttf \
- NotoSansTaiLe.ttf \
- NotoSansTaiTham.ttf \
- NotoSansTaiViet.ttf \
+ NotoSansSyriacEastern-Regular.ttf \
+ NotoSansSyriacEstrangela-Regular.ttf \
+ NotoSansSyriacWestern-Regular.ttf \
+ NotoSansTagalog-Regular.ttf \
+ NotoSansTagbanwa-Regular.ttf \
+ NotoSansTaiLe-Regular.ttf \
+ NotoSansTaiTham-Regular.ttf \
+ NotoSansTaiViet-Regular.ttf \
NotoSansTamil-Bold.otf \
NotoSansTamil-Medium.otf \
NotoSansTamil-Regular.otf \
@@ -184,51 +184,51 @@
NotoSansTamilUI-Medium.otf \
NotoSansTamilUI-Regular.otf \
NotoSansTelugu-Bold.ttf \
- NotoSansTelugu.ttf \
+ NotoSansTelugu-Regular.ttf \
NotoSansTeluguUI-Bold.ttf \
- NotoSansTeluguUI.ttf \
+ NotoSansTeluguUI-Regular.ttf \
NotoSansThaana-Bold.ttf \
- NotoSansThaana.ttf \
+ NotoSansThaana-Regular.ttf \
NotoSansThai-Bold.ttf \
- NotoSansThai.ttf \
+ NotoSansThai-Regular.ttf \
NotoSansThaiUI-Bold.ttf \
- NotoSansThaiUI.ttf \
+ NotoSansThaiUI-Regular.ttf \
NotoSansTibetan-Bold.ttf \
- NotoSansTibetan.ttf \
+ NotoSansTibetan-Regular.ttf \
NotoSansTifinagh-Regular.otf \
- NotoSansUgaritic.ttf \
- NotoSansVai.ttf \
+ NotoSansUgaritic-Regular.ttf \
+ NotoSansVai-Regular.ttf \
NotoSansWancho-Regular.otf \
NotoSansWarangCiti-Regular.otf \
- NotoSansYi.ttf \
+ NotoSansYi-Regular.ttf \
NotoSerif-Bold.ttf \
NotoSerif-BoldItalic.ttf \
NotoSerif-Italic.ttf \
- NotoSerif.ttf \
+ NotoSerif-Regular.ttf \
NotoSerifArmenian-Bold.otf \
NotoSerifArmenian-Regular.otf \
NotoSerifBengali-Bold.ttf \
- NotoSerifBengali.ttf \
- NotoSerifCJKjp-Regular.otc \
+ NotoSerifBengali-Regular.ttf \
+ NotoSerifCJK-Regular.ttc \
NotoSerifDevanagari-Bold.ttf \
- NotoSerifDevanagari.ttf \
+ NotoSerifDevanagari-Regular.ttf \
NotoSerifEthiopic-Bold.otf \
NotoSerifEthiopic-Regular.otf \
- NotoSerifGeorgian-Regular.ttf \
+ NotoSerifGeorgian-VF.ttf \
NotoSerifGujarati-Bold.ttf \
- NotoSerifGujarati.ttf \
+ NotoSerifGujarati-Regular.ttf \
NotoSerifGurmukhi-Bold.otf \
NotoSerifGurmukhi-Regular.otf \
NotoSerifHebrew-Bold.ttf \
NotoSerifHebrew-Regular.ttf \
NotoSerifKannada-Bold.ttf \
- NotoSerifKannada.ttf \
+ NotoSerifKannada-Regular.ttf \
NotoSerifKhmer-Bold.otf \
NotoSerifKhmer-Regular.otf \
NotoSerifLao-Bold.ttf \
- NotoSerifLao.ttf \
+ NotoSerifLao-Regular.ttf \
NotoSerifMalayalam-Bold.ttf \
- NotoSerifMalayalam.ttf \
+ NotoSerifMalayalam-Regular.ttf \
NotoSerifMyanmar-Bold.otf \
NotoSerifMyanmar-Regular.otf \
NotoSerifSinhala-Bold.otf \
@@ -236,6 +236,6 @@
NotoSerifTamil-Bold.otf \
NotoSerifTamil-Regular.otf \
NotoSerifTelugu-Bold.ttf \
- NotoSerifTelugu.ttf \
+ NotoSerifTelugu-Regular.ttf \
NotoSerifThai-Bold.ttf \
- NotoSerifThai.ttf
+ NotoSerifThai-Regular.ttf
diff --git a/other-vf/Android.bp b/other-vf/Android.bp
index 3894b39..4cbc094 100644
--- a/other-vf/Android.bp
+++ b/other-vf/Android.bp
@@ -46,6 +46,6 @@
}
prebuilt_font {
- name: "NotoSansKhmer-Regular.ttf",
- src: "NotoSansKhmer-Regular.ttf",
+ name: "NotoSansKhmer-VF.ttf",
+ src: "NotoSansKhmer-VF.ttf",
}
diff --git a/other-vf/NotoSansKhmer-Regular.ttf b/other-vf/NotoSansKhmer-VF.ttf
similarity index 100%
rename from other-vf/NotoSansKhmer-Regular.ttf
rename to other-vf/NotoSansKhmer-VF.ttf
Binary files differ
diff --git a/other/Android.bp b/other/Android.bp
index 90018a2..76cad59 100644
--- a/other/Android.bp
+++ b/other/Android.bp
@@ -48,8 +48,8 @@
}
prebuilt_font {
- name: "NotoSerif.ttf",
- src: "NotoSerif.ttf",
+ name: "NotoSerif-Regular.ttf",
+ src: "NotoSerif-Regular.ttf",
}
prebuilt_font {
@@ -68,8 +68,8 @@
}
prebuilt_font {
- name: "NotoSansAdlam-Regular.ttf",
- src: "NotoSansAdlam-Regular.ttf",
+ name: "NotoSansAdlam-VF.ttf",
+ src: "NotoSansAdlam-VF.ttf",
}
prebuilt_font {
@@ -83,18 +83,18 @@
}
prebuilt_font {
- name: "NotoSansAvestan.ttf",
- src: "NotoSansAvestan.ttf",
+ name: "NotoSansAvestan-Regular.ttf",
+ src: "NotoSansAvestan-Regular.ttf",
}
prebuilt_font {
- name: "NotoSansBalinese.ttf",
- src: "NotoSansBalinese.ttf",
+ name: "NotoSansBalinese-Regular.ttf",
+ src: "NotoSansBalinese-Regular.ttf",
}
prebuilt_font {
- name: "NotoSansBamum.ttf",
- src: "NotoSansBamum.ttf",
+ name: "NotoSansBamum-Regular.ttf",
+ src: "NotoSansBamum-Regular.ttf",
}
prebuilt_font {
@@ -103,8 +103,8 @@
}
prebuilt_font {
- name: "NotoSansBatak.ttf",
- src: "NotoSansBatak.ttf",
+ name: "NotoSansBatak-Regular.ttf",
+ src: "NotoSansBatak-Regular.ttf",
}
prebuilt_font {
@@ -143,28 +143,28 @@
}
prebuilt_font {
- name: "NotoSansBrahmi.ttf",
- src: "NotoSansBrahmi.ttf",
+ name: "NotoSansBrahmi-Regular.ttf",
+ src: "NotoSansBrahmi-Regular.ttf",
}
prebuilt_font {
- name: "NotoSansBuginese.ttf",
- src: "NotoSansBuginese.ttf",
+ name: "NotoSansBuginese-Regular.ttf",
+ src: "NotoSansBuginese-Regular.ttf",
}
prebuilt_font {
- name: "NotoSansBuhid.ttf",
- src: "NotoSansBuhid.ttf",
+ name: "NotoSansBuhid-Regular.ttf",
+ src: "NotoSansBuhid-Regular.ttf",
}
prebuilt_font {
- name: "NotoSansCanadianAboriginal.ttf",
- src: "NotoSansCanadianAboriginal.ttf",
+ name: "NotoSansCanadianAboriginal-Regular.ttf",
+ src: "NotoSansCanadianAboriginal-Regular.ttf",
}
prebuilt_font {
- name: "NotoSansCarian.ttf",
- src: "NotoSansCarian.ttf",
+ name: "NotoSansCarian-Regular.ttf",
+ src: "NotoSansCarian-Regular.ttf",
}
prebuilt_font {
@@ -178,8 +178,8 @@
}
prebuilt_font {
- name: "NotoSansCham.ttf",
- src: "NotoSansCham.ttf",
+ name: "NotoSansCham-Regular.ttf",
+ src: "NotoSansCham-Regular.ttf",
}
prebuilt_font {
@@ -188,28 +188,28 @@
}
prebuilt_font {
- name: "NotoSansCoptic.ttf",
- src: "NotoSansCoptic.ttf",
+ name: "NotoSansCoptic-Regular.ttf",
+ src: "NotoSansCoptic-Regular.ttf",
}
prebuilt_font {
- name: "NotoSansCuneiform.ttf",
- src: "NotoSansCuneiform.ttf",
+ name: "NotoSansCuneiform-Regular.ttf",
+ src: "NotoSansCuneiform-Regular.ttf",
}
prebuilt_font {
- name: "NotoSansCypriot.ttf",
- src: "NotoSansCypriot.ttf",
+ name: "NotoSansCypriot-Regular.ttf",
+ src: "NotoSansCypriot-Regular.ttf",
}
prebuilt_font {
- name: "NotoSansDeseret.ttf",
- src: "NotoSansDeseret.ttf",
+ name: "NotoSansDeseret-Regular.ttf",
+ src: "NotoSansDeseret-Regular.ttf",
}
prebuilt_font {
- name: "NotoSansEgyptianHieroglyphs.ttf",
- src: "NotoSansEgyptianHieroglyphs.ttf",
+ name: "NotoSansEgyptianHieroglyphs-Regular.ttf",
+ src: "NotoSansEgyptianHieroglyphs-Regular.ttf",
}
prebuilt_font {
@@ -223,18 +223,18 @@
}
prebuilt_font {
- name: "NotoSansEthiopic.ttf",
- src: "NotoSansEthiopic.ttf",
+ name: "NotoSansEthiopic-Regular.ttf",
+ src: "NotoSansEthiopic-Regular.ttf",
}
prebuilt_font {
- name: "NotoSansGlagolitic.ttf",
- src: "NotoSansGlagolitic.ttf",
+ name: "NotoSansGlagolitic-Regular.ttf",
+ src: "NotoSansGlagolitic-Regular.ttf",
}
prebuilt_font {
- name: "NotoSansGothic.ttf",
- src: "NotoSansGothic.ttf",
+ name: "NotoSansGothic-Regular.ttf",
+ src: "NotoSansGothic-Regular.ttf",
}
prebuilt_font {
@@ -243,8 +243,8 @@
}
prebuilt_font {
- name: "NotoSansGujarati.ttf",
- src: "NotoSansGujarati.ttf",
+ name: "NotoSansGujarati-Regular.ttf",
+ src: "NotoSansGujarati-Regular.ttf",
}
prebuilt_font {
@@ -253,8 +253,8 @@
}
prebuilt_font {
- name: "NotoSansGujaratiUI.ttf",
- src: "NotoSansGujaratiUI.ttf",
+ name: "NotoSansGujaratiUI-Regular.ttf",
+ src: "NotoSansGujaratiUI-Regular.ttf",
}
prebuilt_font {
@@ -263,8 +263,8 @@
}
prebuilt_font {
- name: "NotoSansGurmukhi.ttf",
- src: "NotoSansGurmukhi.ttf",
+ name: "NotoSansGurmukhi-Regular.ttf",
+ src: "NotoSansGurmukhi-Regular.ttf",
}
prebuilt_font {
@@ -273,13 +273,13 @@
}
prebuilt_font {
- name: "NotoSansGurmukhiUI.ttf",
- src: "NotoSansGurmukhiUI.ttf",
+ name: "NotoSansGurmukhiUI-Regular.ttf",
+ src: "NotoSansGurmukhiUI-Regular.ttf",
}
prebuilt_font {
- name: "NotoSansHanunoo.ttf",
- src: "NotoSansHanunoo.ttf",
+ name: "NotoSansHanunoo-Regular.ttf",
+ src: "NotoSansHanunoo-Regular.ttf",
}
prebuilt_font {
@@ -288,18 +288,18 @@
}
prebuilt_font {
- name: "NotoSansImperialAramaic.ttf",
- src: "NotoSansImperialAramaic.ttf",
+ name: "NotoSansImperialAramaic-Regular.ttf",
+ src: "NotoSansImperialAramaic-Regular.ttf",
}
prebuilt_font {
- name: "NotoSansInscriptionalPahlavi.ttf",
- src: "NotoSansInscriptionalPahlavi.ttf",
+ name: "NotoSansInscriptionalPahlavi-Regular.ttf",
+ src: "NotoSansInscriptionalPahlavi-Regular.ttf",
}
prebuilt_font {
- name: "NotoSansInscriptionalParthian.ttf",
- src: "NotoSansInscriptionalParthian.ttf",
+ name: "NotoSansInscriptionalParthian-Regular.ttf",
+ src: "NotoSansInscriptionalParthian-Regular.ttf",
}
prebuilt_font {
@@ -308,8 +308,8 @@
}
prebuilt_font {
- name: "NotoSansKaithi.ttf",
- src: "NotoSansKaithi.ttf",
+ name: "NotoSansKaithi-Regular.ttf",
+ src: "NotoSansKaithi-Regular.ttf",
}
prebuilt_font {
@@ -318,8 +318,8 @@
}
prebuilt_font {
- name: "NotoSansKannada.ttf",
- src: "NotoSansKannada.ttf",
+ name: "NotoSansKannada-Regular.ttf",
+ src: "NotoSansKannada-Regular.ttf",
}
prebuilt_font {
@@ -328,18 +328,18 @@
}
prebuilt_font {
- name: "NotoSansKannadaUI.ttf",
- src: "NotoSansKannadaUI.ttf",
+ name: "NotoSansKannadaUI-Regular.ttf",
+ src: "NotoSansKannadaUI-Regular.ttf",
}
prebuilt_font {
- name: "NotoSansKayahLi.ttf",
- src: "NotoSansKayahLi.ttf",
+ name: "NotoSansKayahLi-Regular.ttf",
+ src: "NotoSansKayahLi-Regular.ttf",
}
prebuilt_font {
- name: "NotoSansKharoshthi.ttf",
- src: "NotoSansKharoshthi.ttf",
+ name: "NotoSansKharoshthi-Regular.ttf",
+ src: "NotoSansKharoshthi-Regular.ttf",
}
prebuilt_font {
@@ -348,8 +348,8 @@
}
prebuilt_font {
- name: "NotoSansKhmerUI.ttf",
- src: "NotoSansKhmerUI.ttf",
+ name: "NotoSansKhmerUI-Regular.ttf",
+ src: "NotoSansKhmerUI-Regular.ttf",
}
prebuilt_font {
@@ -358,8 +358,8 @@
}
prebuilt_font {
- name: "NotoSansLao.ttf",
- src: "NotoSansLao.ttf",
+ name: "NotoSansLao-Regular.ttf",
+ src: "NotoSansLao-Regular.ttf",
}
prebuilt_font {
@@ -368,18 +368,18 @@
}
prebuilt_font {
- name: "NotoSansLaoUI.ttf",
- src: "NotoSansLaoUI.ttf",
+ name: "NotoSansLaoUI-Regular.ttf",
+ src: "NotoSansLaoUI-Regular.ttf",
}
prebuilt_font {
- name: "NotoSansLepcha.ttf",
- src: "NotoSansLepcha.ttf",
+ name: "NotoSansLepcha-Regular.ttf",
+ src: "NotoSansLepcha-Regular.ttf",
}
prebuilt_font {
- name: "NotoSansLimbu.ttf",
- src: "NotoSansLimbu.ttf",
+ name: "NotoSansLimbu-Regular.ttf",
+ src: "NotoSansLimbu-Regular.ttf",
}
prebuilt_font {
@@ -388,23 +388,23 @@
}
prebuilt_font {
- name: "NotoSansLinearB.ttf",
- src: "NotoSansLinearB.ttf",
+ name: "NotoSansLinearB-Regular.ttf",
+ src: "NotoSansLinearB-Regular.ttf",
}
prebuilt_font {
- name: "NotoSansLisu.ttf",
- src: "NotoSansLisu.ttf",
+ name: "NotoSansLisu-Regular.ttf",
+ src: "NotoSansLisu-Regular.ttf",
}
prebuilt_font {
- name: "NotoSansLycian.ttf",
- src: "NotoSansLycian.ttf",
+ name: "NotoSansLycian-Regular.ttf",
+ src: "NotoSansLycian-Regular.ttf",
}
prebuilt_font {
- name: "NotoSansLydian.ttf",
- src: "NotoSansLydian.ttf",
+ name: "NotoSansLydian-Regular.ttf",
+ src: "NotoSansLydian-Regular.ttf",
}
prebuilt_font {
@@ -438,8 +438,8 @@
}
prebuilt_font {
- name: "NotoSansMandaic.ttf",
- src: "NotoSansMandaic.ttf",
+ name: "NotoSansMandaic-Regular.ttf",
+ src: "NotoSansMandaic-Regular.ttf",
}
prebuilt_font {
@@ -453,8 +453,8 @@
}
prebuilt_font {
- name: "NotoSansMeeteiMayek.ttf",
- src: "NotoSansMeeteiMayek.ttf",
+ name: "NotoSansMeeteiMayek-Regular.ttf",
+ src: "NotoSansMeeteiMayek-Regular.ttf",
}
prebuilt_font {
@@ -468,8 +468,8 @@
}
prebuilt_font {
- name: "NotoSansMongolian.ttf",
- src: "NotoSansMongolian.ttf",
+ name: "NotoSansMongolian-Regular.ttf",
+ src: "NotoSansMongolian-Regular.ttf",
}
prebuilt_font {
@@ -523,28 +523,28 @@
}
prebuilt_font {
- name: "NotoSansNewTaiLue.ttf",
- src: "NotoSansNewTaiLue.ttf",
+ name: "NotoSansNewTaiLue-Regular.ttf",
+ src: "NotoSansNewTaiLue-Regular.ttf",
}
prebuilt_font {
- name: "NotoSansNKo.ttf",
- src: "NotoSansNKo.ttf",
+ name: "NotoSansNKo-Regular.ttf",
+ src: "NotoSansNKo-Regular.ttf",
}
prebuilt_font {
- name: "NotoSansOgham.ttf",
- src: "NotoSansOgham.ttf",
+ name: "NotoSansOgham-Regular.ttf",
+ src: "NotoSansOgham-Regular.ttf",
}
prebuilt_font {
- name: "NotoSansOlChiki.ttf",
- src: "NotoSansOlChiki.ttf",
+ name: "NotoSansOlChiki-Regular.ttf",
+ src: "NotoSansOlChiki-Regular.ttf",
}
prebuilt_font {
- name: "NotoSansOldItalic.ttf",
- src: "NotoSansOldItalic.ttf",
+ name: "NotoSansOldItalic-Regular.ttf",
+ src: "NotoSansOldItalic-Regular.ttf",
}
prebuilt_font {
@@ -558,18 +558,18 @@
}
prebuilt_font {
- name: "NotoSansOldPersian.ttf",
- src: "NotoSansOldPersian.ttf",
+ name: "NotoSansOldPersian-Regular.ttf",
+ src: "NotoSansOldPersian-Regular.ttf",
}
prebuilt_font {
- name: "NotoSansOldSouthArabian.ttf",
- src: "NotoSansOldSouthArabian.ttf",
+ name: "NotoSansOldSouthArabian-Regular.ttf",
+ src: "NotoSansOldSouthArabian-Regular.ttf",
}
prebuilt_font {
- name: "NotoSansOldTurkic.ttf",
- src: "NotoSansOldTurkic.ttf",
+ name: "NotoSansOldTurkic-Regular.ttf",
+ src: "NotoSansOldTurkic-Regular.ttf",
}
prebuilt_font {
@@ -578,8 +578,8 @@
}
prebuilt_font {
- name: "NotoSansOriya.ttf",
- src: "NotoSansOriya.ttf",
+ name: "NotoSansOriya-Regular.ttf",
+ src: "NotoSansOriya-Regular.ttf",
}
prebuilt_font {
@@ -588,8 +588,8 @@
}
prebuilt_font {
- name: "NotoSansOriyaUI.ttf",
- src: "NotoSansOriyaUI.ttf",
+ name: "NotoSansOriyaUI-Regular.ttf",
+ src: "NotoSansOriyaUI-Regular.ttf",
}
prebuilt_font {
@@ -598,8 +598,8 @@
}
prebuilt_font {
- name: "NotoSansOsmanya.ttf",
- src: "NotoSansOsmanya.ttf",
+ name: "NotoSansOsmanya-Regular.ttf",
+ src: "NotoSansOsmanya-Regular.ttf",
}
prebuilt_font {
@@ -618,33 +618,33 @@
}
prebuilt_font {
- name: "NotoSansPhagsPa.ttf",
- src: "NotoSansPhagsPa.ttf",
+ name: "NotoSansPhagsPa-Regular.ttf",
+ src: "NotoSansPhagsPa-Regular.ttf",
}
prebuilt_font {
- name: "NotoSansPhoenician.ttf",
- src: "NotoSansPhoenician.ttf",
+ name: "NotoSansPhoenician-Regular.ttf",
+ src: "NotoSansPhoenician-Regular.ttf",
}
prebuilt_font {
- name: "NotoSansRejang.ttf",
- src: "NotoSansRejang.ttf",
+ name: "NotoSansRejang-Regular.ttf",
+ src: "NotoSansRejang-Regular.ttf",
}
prebuilt_font {
- name: "NotoSansRunic.ttf",
- src: "NotoSansRunic.ttf",
+ name: "NotoSansRunic-Regular.ttf",
+ src: "NotoSansRunic-Regular.ttf",
}
prebuilt_font {
- name: "NotoSansSamaritan.ttf",
- src: "NotoSansSamaritan.ttf",
+ name: "NotoSansSamaritan-Regular.ttf",
+ src: "NotoSansSamaritan-Regular.ttf",
}
prebuilt_font {
- name: "NotoSansSaurashtra.ttf",
- src: "NotoSansSaurashtra.ttf",
+ name: "NotoSansSaurashtra-Regular.ttf",
+ src: "NotoSansSaurashtra-Regular.ttf",
}
prebuilt_font {
@@ -653,8 +653,8 @@
}
prebuilt_font {
- name: "NotoSansShavian.ttf",
- src: "NotoSansShavian.ttf",
+ name: "NotoSansShavian-Regular.ttf",
+ src: "NotoSansShavian-Regular.ttf",
}
prebuilt_font {
@@ -693,53 +693,53 @@
}
prebuilt_font {
- name: "NotoSansSundanese.ttf",
- src: "NotoSansSundanese.ttf",
+ name: "NotoSansSundanese-Regular.ttf",
+ src: "NotoSansSundanese-Regular.ttf",
}
prebuilt_font {
- name: "NotoSansSylotiNagri.ttf",
- src: "NotoSansSylotiNagri.ttf",
+ name: "NotoSansSylotiNagri-Regular.ttf",
+ src: "NotoSansSylotiNagri-Regular.ttf",
}
prebuilt_font {
- name: "NotoSansSyriacEastern.ttf",
- src: "NotoSansSyriacEastern.ttf",
+ name: "NotoSansSyriacEastern-Regular.ttf",
+ src: "NotoSansSyriacEastern-Regular.ttf",
}
prebuilt_font {
- name: "NotoSansSyriacEstrangela.ttf",
- src: "NotoSansSyriacEstrangela.ttf",
+ name: "NotoSansSyriacEstrangela-Regular.ttf",
+ src: "NotoSansSyriacEstrangela-Regular.ttf",
}
prebuilt_font {
- name: "NotoSansSyriacWestern.ttf",
- src: "NotoSansSyriacWestern.ttf",
+ name: "NotoSansSyriacWestern-Regular.ttf",
+ src: "NotoSansSyriacWestern-Regular.ttf",
}
prebuilt_font {
- name: "NotoSansTagalog.ttf",
- src: "NotoSansTagalog.ttf",
+ name: "NotoSansTagalog-Regular.ttf",
+ src: "NotoSansTagalog-Regular.ttf",
}
prebuilt_font {
- name: "NotoSansTagbanwa.ttf",
- src: "NotoSansTagbanwa.ttf",
+ name: "NotoSansTagbanwa-Regular.ttf",
+ src: "NotoSansTagbanwa-Regular.ttf",
}
prebuilt_font {
- name: "NotoSansTaiLe.ttf",
- src: "NotoSansTaiLe.ttf",
+ name: "NotoSansTaiLe-Regular.ttf",
+ src: "NotoSansTaiLe-Regular.ttf",
}
prebuilt_font {
- name: "NotoSansTaiTham.ttf",
- src: "NotoSansTaiTham.ttf",
+ name: "NotoSansTaiTham-Regular.ttf",
+ src: "NotoSansTaiTham-Regular.ttf",
}
prebuilt_font {
- name: "NotoSansTaiViet.ttf",
- src: "NotoSansTaiViet.ttf",
+ name: "NotoSansTaiViet-Regular.ttf",
+ src: "NotoSansTaiViet-Regular.ttf",
}
prebuilt_font {
@@ -778,8 +778,8 @@
}
prebuilt_font {
- name: "NotoSansTelugu.ttf",
- src: "NotoSansTelugu.ttf",
+ name: "NotoSansTelugu-Regular.ttf",
+ src: "NotoSansTelugu-Regular.ttf",
}
prebuilt_font {
@@ -788,8 +788,8 @@
}
prebuilt_font {
- name: "NotoSansTeluguUI.ttf",
- src: "NotoSansTeluguUI.ttf",
+ name: "NotoSansTeluguUI-Regular.ttf",
+ src: "NotoSansTeluguUI-Regular.ttf",
}
prebuilt_font {
@@ -798,8 +798,8 @@
}
prebuilt_font {
- name: "NotoSansThaana.ttf",
- src: "NotoSansThaana.ttf",
+ name: "NotoSansThaana-Regular.ttf",
+ src: "NotoSansThaana-Regular.ttf",
}
prebuilt_font {
@@ -808,28 +808,28 @@
}
prebuilt_font {
- name: "NotoSansTibetan.ttf",
- src: "NotoSansTibetan.ttf",
+ name: "NotoSansTibetan-Regular.ttf",
+ src: "NotoSansTibetan-Regular.ttf",
}
prebuilt_font {
- name: "NotoSansUgaritic.ttf",
- src: "NotoSansUgaritic.ttf",
+ name: "NotoSansUgaritic-Regular.ttf",
+ src: "NotoSansUgaritic-Regular.ttf",
}
prebuilt_font {
- name: "NotoSansVai.ttf",
- src: "NotoSansVai.ttf",
+ name: "NotoSansVai-Regular.ttf",
+ src: "NotoSansVai-Regular.ttf",
}
prebuilt_font {
- name: "NotoSansYi.ttf",
- src: "NotoSansYi.ttf",
+ name: "NotoSansYi-Regular.ttf",
+ src: "NotoSansYi-Regular.ttf",
}
prebuilt_font {
- name: "NotoNaskhArabic.ttf",
- src: "NotoNaskhArabic.ttf",
+ name: "NotoNaskhArabic-Regular.ttf",
+ src: "NotoNaskhArabic-Regular.ttf",
}
prebuilt_font {
@@ -838,8 +838,8 @@
}
prebuilt_font {
- name: "NotoNaskhArabicUI.ttf",
- src: "NotoNaskhArabicUI.ttf",
+ name: "NotoNaskhArabicUI-Regular.ttf",
+ src: "NotoNaskhArabicUI-Regular.ttf",
}
prebuilt_font {
@@ -893,13 +893,13 @@
}
prebuilt_font {
- name: "NotoSansGeorgian-Regular.ttf",
- src: "NotoSansGeorgian-Regular.ttf",
+ name: "NotoSansGeorgian-VF.ttf",
+ src: "NotoSansGeorgian-VF.ttf",
}
prebuilt_font {
- name: "NotoSansHebrew.ttf",
- src: "NotoSansHebrew.ttf",
+ name: "NotoSansHebrew-Regular.ttf",
+ src: "NotoSansHebrew-Regular.ttf",
}
prebuilt_font {
@@ -918,8 +918,8 @@
}
prebuilt_font {
- name: "NotoSansThai.ttf",
- src: "NotoSansThai.ttf",
+ name: "NotoSansThai-Regular.ttf",
+ src: "NotoSansThai-Regular.ttf",
}
prebuilt_font {
@@ -928,8 +928,8 @@
}
prebuilt_font {
- name: "NotoSansThaiUI.ttf",
- src: "NotoSansThaiUI.ttf",
+ name: "NotoSansThaiUI-Regular.ttf",
+ src: "NotoSansThaiUI-Regular.ttf",
}
prebuilt_font {
@@ -988,8 +988,8 @@
}
prebuilt_font {
- name: "NotoSerifBengali.ttf",
- src: "NotoSerifBengali.ttf",
+ name: "NotoSerifBengali-Regular.ttf",
+ src: "NotoSerifBengali-Regular.ttf",
}
prebuilt_font {
@@ -998,8 +998,8 @@
}
prebuilt_font {
- name: "NotoSerifDevanagari.ttf",
- src: "NotoSerifDevanagari.ttf",
+ name: "NotoSerifDevanagari-Regular.ttf",
+ src: "NotoSerifDevanagari-Regular.ttf",
}
prebuilt_font {
@@ -1013,8 +1013,8 @@
}
prebuilt_font {
- name: "NotoSerifGeorgian-Regular.ttf",
- src: "NotoSerifGeorgian-Regular.ttf",
+ name: "NotoSerifGeorgian-VF.ttf",
+ src: "NotoSerifGeorgian-VF.ttf",
}
prebuilt_font {
@@ -1023,8 +1023,8 @@
}
prebuilt_font {
- name: "NotoSerifGujarati.ttf",
- src: "NotoSerifGujarati.ttf",
+ name: "NotoSerifGujarati-Regular.ttf",
+ src: "NotoSerifGujarati-Regular.ttf",
}
prebuilt_font {
@@ -1053,8 +1053,8 @@
}
prebuilt_font {
- name: "NotoSerifKannada.ttf",
- src: "NotoSerifKannada.ttf",
+ name: "NotoSerifKannada-Regular.ttf",
+ src: "NotoSerifKannada-Regular.ttf",
}
prebuilt_font {
@@ -1073,8 +1073,8 @@
}
prebuilt_font {
- name: "NotoSerifLao.ttf",
- src: "NotoSerifLao.ttf",
+ name: "NotoSerifLao-Regular.ttf",
+ src: "NotoSerifLao-Regular.ttf",
}
prebuilt_font {
@@ -1083,8 +1083,8 @@
}
prebuilt_font {
- name: "NotoSerifMalayalam.ttf",
- src: "NotoSerifMalayalam.ttf",
+ name: "NotoSerifMalayalam-Regular.ttf",
+ src: "NotoSerifMalayalam-Regular.ttf",
}
prebuilt_font {
@@ -1123,8 +1123,8 @@
}
prebuilt_font {
- name: "NotoSerifTelugu.ttf",
- src: "NotoSerifTelugu.ttf",
+ name: "NotoSerifTelugu-Regular.ttf",
+ src: "NotoSerifTelugu-Regular.ttf",
}
prebuilt_font {
@@ -1133,6 +1133,6 @@
}
prebuilt_font {
- name: "NotoSerifThai.ttf",
- src: "NotoSerifThai.ttf",
+ name: "NotoSerifThai-Regular.ttf",
+ src: "NotoSerifThai-Regular.ttf",
}
diff --git a/other/NotoKufiArabic.ttf b/other/NotoKufiArabic-Regular.ttf
similarity index 100%
rename from other/NotoKufiArabic.ttf
rename to other/NotoKufiArabic-Regular.ttf
Binary files differ
diff --git a/other/NotoNaskhArabic.ttf b/other/NotoNaskhArabic-Regular.ttf
similarity index 100%
rename from other/NotoNaskhArabic.ttf
rename to other/NotoNaskhArabic-Regular.ttf
Binary files differ
diff --git a/other/NotoNaskhArabicUI.ttf b/other/NotoNaskhArabicUI-Regular.ttf
similarity index 100%
rename from other/NotoNaskhArabicUI.ttf
rename to other/NotoNaskhArabicUI-Regular.ttf
Binary files differ
diff --git a/other/NotoNastaliqUrdu.ttf b/other/NotoNastaliqUrdu-Regular.ttf
similarity index 100%
rename from other/NotoNastaliqUrdu.ttf
rename to other/NotoNastaliqUrdu-Regular.ttf
Binary files differ
diff --git a/other/NotoSans.ttf b/other/NotoSans-Regular.ttf
similarity index 100%
rename from other/NotoSans.ttf
rename to other/NotoSans-Regular.ttf
Binary files differ
diff --git a/other/NotoSansAdlam-Regular.ttf b/other/NotoSansAdlam-VF.ttf
similarity index 100%
rename from other/NotoSansAdlam-Regular.ttf
rename to other/NotoSansAdlam-VF.ttf
Binary files differ
diff --git a/other/NotoSansAvestan.ttf b/other/NotoSansAvestan-Regular.ttf
similarity index 100%
rename from other/NotoSansAvestan.ttf
rename to other/NotoSansAvestan-Regular.ttf
Binary files differ
diff --git a/other/NotoSansBalinese.ttf b/other/NotoSansBalinese-Regular.ttf
similarity index 100%
rename from other/NotoSansBalinese.ttf
rename to other/NotoSansBalinese-Regular.ttf
Binary files differ
diff --git a/other/NotoSansBamum.ttf b/other/NotoSansBamum-Regular.ttf
similarity index 100%
rename from other/NotoSansBamum.ttf
rename to other/NotoSansBamum-Regular.ttf
Binary files differ
diff --git a/other/NotoSansBatak.ttf b/other/NotoSansBatak-Regular.ttf
similarity index 100%
rename from other/NotoSansBatak.ttf
rename to other/NotoSansBatak-Regular.ttf
Binary files differ
diff --git a/other/NotoSansBrahmi.ttf b/other/NotoSansBrahmi-Regular.ttf
similarity index 100%
rename from other/NotoSansBrahmi.ttf
rename to other/NotoSansBrahmi-Regular.ttf
Binary files differ
diff --git a/other/NotoSansBuginese.ttf b/other/NotoSansBuginese-Regular.ttf
similarity index 100%
rename from other/NotoSansBuginese.ttf
rename to other/NotoSansBuginese-Regular.ttf
Binary files differ
diff --git a/other/NotoSansBuhid.ttf b/other/NotoSansBuhid-Regular.ttf
similarity index 100%
rename from other/NotoSansBuhid.ttf
rename to other/NotoSansBuhid-Regular.ttf
Binary files differ
diff --git a/other/NotoSansCanadianAboriginal.ttf b/other/NotoSansCanadianAboriginal-Regular.ttf
similarity index 100%
rename from other/NotoSansCanadianAboriginal.ttf
rename to other/NotoSansCanadianAboriginal-Regular.ttf
Binary files differ
diff --git a/other/NotoSansCarian.ttf b/other/NotoSansCarian-Regular.ttf
similarity index 100%
rename from other/NotoSansCarian.ttf
rename to other/NotoSansCarian-Regular.ttf
Binary files differ
diff --git a/other/NotoSansCham.ttf b/other/NotoSansCham-Regular.ttf
similarity index 100%
rename from other/NotoSansCham.ttf
rename to other/NotoSansCham-Regular.ttf
Binary files differ
diff --git a/other/NotoSansCoptic.ttf b/other/NotoSansCoptic-Regular.ttf
similarity index 100%
rename from other/NotoSansCoptic.ttf
rename to other/NotoSansCoptic-Regular.ttf
Binary files differ
diff --git a/other/NotoSansCuneiform.ttf b/other/NotoSansCuneiform-Regular.ttf
similarity index 100%
rename from other/NotoSansCuneiform.ttf
rename to other/NotoSansCuneiform-Regular.ttf
Binary files differ
diff --git a/other/NotoSansCypriot.ttf b/other/NotoSansCypriot-Regular.ttf
similarity index 100%
rename from other/NotoSansCypriot.ttf
rename to other/NotoSansCypriot-Regular.ttf
Binary files differ
diff --git a/other/NotoSansDeseret.ttf b/other/NotoSansDeseret-Regular.ttf
similarity index 100%
rename from other/NotoSansDeseret.ttf
rename to other/NotoSansDeseret-Regular.ttf
Binary files differ
diff --git a/other/NotoSansEgyptianHieroglyphs.ttf b/other/NotoSansEgyptianHieroglyphs-Regular.ttf
similarity index 100%
rename from other/NotoSansEgyptianHieroglyphs.ttf
rename to other/NotoSansEgyptianHieroglyphs-Regular.ttf
Binary files differ
diff --git a/other/NotoSansEthiopic.ttf b/other/NotoSansEthiopic-Regular.ttf
similarity index 100%
rename from other/NotoSansEthiopic.ttf
rename to other/NotoSansEthiopic-Regular.ttf
Binary files differ
diff --git a/other/NotoSansGeorgian-Regular.ttf b/other/NotoSansGeorgian-VF.ttf
similarity index 100%
rename from other/NotoSansGeorgian-Regular.ttf
rename to other/NotoSansGeorgian-VF.ttf
Binary files differ
diff --git a/other/NotoSansGlagolitic.ttf b/other/NotoSansGlagolitic-Regular.ttf
similarity index 100%
rename from other/NotoSansGlagolitic.ttf
rename to other/NotoSansGlagolitic-Regular.ttf
Binary files differ
diff --git a/other/NotoSansGothic.ttf b/other/NotoSansGothic-Regular.ttf
similarity index 100%
rename from other/NotoSansGothic.ttf
rename to other/NotoSansGothic-Regular.ttf
Binary files differ
diff --git a/other/NotoSansGujarati.ttf b/other/NotoSansGujarati-Regular.ttf
similarity index 100%
rename from other/NotoSansGujarati.ttf
rename to other/NotoSansGujarati-Regular.ttf
Binary files differ
diff --git a/other/NotoSansGujaratiUI.ttf b/other/NotoSansGujaratiUI-Regular.ttf
similarity index 100%
rename from other/NotoSansGujaratiUI.ttf
rename to other/NotoSansGujaratiUI-Regular.ttf
Binary files differ
diff --git a/other/NotoSansGurmukhi.ttf b/other/NotoSansGurmukhi-Regular.ttf
similarity index 100%
rename from other/NotoSansGurmukhi.ttf
rename to other/NotoSansGurmukhi-Regular.ttf
Binary files differ
diff --git a/other/NotoSansGurmukhiUI.ttf b/other/NotoSansGurmukhiUI-Regular.ttf
similarity index 100%
rename from other/NotoSansGurmukhiUI.ttf
rename to other/NotoSansGurmukhiUI-Regular.ttf
Binary files differ
diff --git a/other/NotoSansHanunoo.ttf b/other/NotoSansHanunoo-Regular.ttf
similarity index 100%
rename from other/NotoSansHanunoo.ttf
rename to other/NotoSansHanunoo-Regular.ttf
Binary files differ
diff --git a/other/NotoSansHebrew.ttf b/other/NotoSansHebrew-Regular.ttf
similarity index 100%
rename from other/NotoSansHebrew.ttf
rename to other/NotoSansHebrew-Regular.ttf
Binary files differ
diff --git a/other/NotoSansImperialAramaic.ttf b/other/NotoSansImperialAramaic-Regular.ttf
similarity index 100%
rename from other/NotoSansImperialAramaic.ttf
rename to other/NotoSansImperialAramaic-Regular.ttf
Binary files differ
diff --git a/other/NotoSansInscriptionalPahlavi.ttf b/other/NotoSansInscriptionalPahlavi-Regular.ttf
similarity index 100%
rename from other/NotoSansInscriptionalPahlavi.ttf
rename to other/NotoSansInscriptionalPahlavi-Regular.ttf
Binary files differ
diff --git a/other/NotoSansInscriptionalParthian.ttf b/other/NotoSansInscriptionalParthian-Regular.ttf
similarity index 100%
rename from other/NotoSansInscriptionalParthian.ttf
rename to other/NotoSansInscriptionalParthian-Regular.ttf
Binary files differ
diff --git a/other/NotoSansKaithi.ttf b/other/NotoSansKaithi-Regular.ttf
similarity index 100%
rename from other/NotoSansKaithi.ttf
rename to other/NotoSansKaithi-Regular.ttf
Binary files differ
diff --git a/other/NotoSansKannada.ttf b/other/NotoSansKannada-Regular.ttf
similarity index 100%
rename from other/NotoSansKannada.ttf
rename to other/NotoSansKannada-Regular.ttf
Binary files differ
diff --git a/other/NotoSansKannadaUI.ttf b/other/NotoSansKannadaUI-Regular.ttf
similarity index 100%
rename from other/NotoSansKannadaUI.ttf
rename to other/NotoSansKannadaUI-Regular.ttf
Binary files differ
diff --git a/other/NotoSansKayahLi.ttf b/other/NotoSansKayahLi-Regular.ttf
similarity index 100%
rename from other/NotoSansKayahLi.ttf
rename to other/NotoSansKayahLi-Regular.ttf
Binary files differ
diff --git a/other/NotoSansKharoshthi.ttf b/other/NotoSansKharoshthi-Regular.ttf
similarity index 100%
rename from other/NotoSansKharoshthi.ttf
rename to other/NotoSansKharoshthi-Regular.ttf
Binary files differ
diff --git a/other/NotoSansKhmerUI.ttf b/other/NotoSansKhmerUI-Regular.ttf
similarity index 100%
rename from other/NotoSansKhmerUI.ttf
rename to other/NotoSansKhmerUI-Regular.ttf
Binary files differ
diff --git a/other/NotoSansLao.ttf b/other/NotoSansLao-Regular.ttf
similarity index 100%
rename from other/NotoSansLao.ttf
rename to other/NotoSansLao-Regular.ttf
Binary files differ
diff --git a/other/NotoSansLaoUI.ttf b/other/NotoSansLaoUI-Regular.ttf
similarity index 100%
rename from other/NotoSansLaoUI.ttf
rename to other/NotoSansLaoUI-Regular.ttf
Binary files differ
diff --git a/other/NotoSansLepcha.ttf b/other/NotoSansLepcha-Regular.ttf
similarity index 100%
rename from other/NotoSansLepcha.ttf
rename to other/NotoSansLepcha-Regular.ttf
Binary files differ
diff --git a/other/NotoSansLimbu.ttf b/other/NotoSansLimbu-Regular.ttf
similarity index 100%
rename from other/NotoSansLimbu.ttf
rename to other/NotoSansLimbu-Regular.ttf
Binary files differ
diff --git a/other/NotoSansLinearB.ttf b/other/NotoSansLinearB-Regular.ttf
similarity index 100%
rename from other/NotoSansLinearB.ttf
rename to other/NotoSansLinearB-Regular.ttf
Binary files differ
diff --git a/other/NotoSansLisu.ttf b/other/NotoSansLisu-Regular.ttf
similarity index 100%
rename from other/NotoSansLisu.ttf
rename to other/NotoSansLisu-Regular.ttf
Binary files differ
diff --git a/other/NotoSansLycian.ttf b/other/NotoSansLycian-Regular.ttf
similarity index 100%
rename from other/NotoSansLycian.ttf
rename to other/NotoSansLycian-Regular.ttf
Binary files differ
diff --git a/other/NotoSansLydian.ttf b/other/NotoSansLydian-Regular.ttf
similarity index 100%
rename from other/NotoSansLydian.ttf
rename to other/NotoSansLydian-Regular.ttf
Binary files differ
diff --git a/other/NotoSansMandaic.ttf b/other/NotoSansMandaic-Regular.ttf
similarity index 100%
rename from other/NotoSansMandaic.ttf
rename to other/NotoSansMandaic-Regular.ttf
Binary files differ
diff --git a/other/NotoSansMeeteiMayek.ttf b/other/NotoSansMeeteiMayek-Regular.ttf
similarity index 100%
rename from other/NotoSansMeeteiMayek.ttf
rename to other/NotoSansMeeteiMayek-Regular.ttf
Binary files differ
diff --git a/other/NotoSansMongolian.ttf b/other/NotoSansMongolian-Regular.ttf
similarity index 100%
rename from other/NotoSansMongolian.ttf
rename to other/NotoSansMongolian-Regular.ttf
Binary files differ
diff --git a/other/NotoSansNKo.ttf b/other/NotoSansNKo-Regular.ttf
similarity index 100%
rename from other/NotoSansNKo.ttf
rename to other/NotoSansNKo-Regular.ttf
Binary files differ
diff --git a/other/NotoSansNewTaiLue.ttf b/other/NotoSansNewTaiLue-Regular.ttf
similarity index 100%
rename from other/NotoSansNewTaiLue.ttf
rename to other/NotoSansNewTaiLue-Regular.ttf
Binary files differ
diff --git a/other/NotoSansOgham.ttf b/other/NotoSansOgham-Regular.ttf
similarity index 100%
rename from other/NotoSansOgham.ttf
rename to other/NotoSansOgham-Regular.ttf
Binary files differ
diff --git a/other/NotoSansOlChiki.ttf b/other/NotoSansOlChiki-Regular.ttf
similarity index 100%
rename from other/NotoSansOlChiki.ttf
rename to other/NotoSansOlChiki-Regular.ttf
Binary files differ
diff --git a/other/NotoSansOldItalic.ttf b/other/NotoSansOldItalic-Regular.ttf
similarity index 100%
rename from other/NotoSansOldItalic.ttf
rename to other/NotoSansOldItalic-Regular.ttf
Binary files differ
diff --git a/other/NotoSansOldPersian.ttf b/other/NotoSansOldPersian-Regular.ttf
similarity index 100%
rename from other/NotoSansOldPersian.ttf
rename to other/NotoSansOldPersian-Regular.ttf
Binary files differ
diff --git a/other/NotoSansOldSouthArabian.ttf b/other/NotoSansOldSouthArabian-Regular.ttf
similarity index 100%
rename from other/NotoSansOldSouthArabian.ttf
rename to other/NotoSansOldSouthArabian-Regular.ttf
Binary files differ
diff --git a/other/NotoSansOldTurkic.ttf b/other/NotoSansOldTurkic-Regular.ttf
similarity index 100%
rename from other/NotoSansOldTurkic.ttf
rename to other/NotoSansOldTurkic-Regular.ttf
Binary files differ
diff --git a/other/NotoSansOriya.ttf b/other/NotoSansOriya-Regular.ttf
similarity index 100%
rename from other/NotoSansOriya.ttf
rename to other/NotoSansOriya-Regular.ttf
Binary files differ
diff --git a/other/NotoSansOriyaUI.ttf b/other/NotoSansOriyaUI-Regular.ttf
similarity index 100%
rename from other/NotoSansOriyaUI.ttf
rename to other/NotoSansOriyaUI-Regular.ttf
Binary files differ
diff --git a/other/NotoSansOsmanya.ttf b/other/NotoSansOsmanya-Regular.ttf
similarity index 100%
rename from other/NotoSansOsmanya.ttf
rename to other/NotoSansOsmanya-Regular.ttf
Binary files differ
diff --git a/other/NotoSansPhagsPa.ttf b/other/NotoSansPhagsPa-Regular.ttf
similarity index 100%
rename from other/NotoSansPhagsPa.ttf
rename to other/NotoSansPhagsPa-Regular.ttf
Binary files differ
diff --git a/other/NotoSansPhoenician.ttf b/other/NotoSansPhoenician-Regular.ttf
similarity index 100%
rename from other/NotoSansPhoenician.ttf
rename to other/NotoSansPhoenician-Regular.ttf
Binary files differ
diff --git a/other/NotoSansRejang.ttf b/other/NotoSansRejang-Regular.ttf
similarity index 100%
rename from other/NotoSansRejang.ttf
rename to other/NotoSansRejang-Regular.ttf
Binary files differ
diff --git a/other/NotoSansRunic.ttf b/other/NotoSansRunic-Regular.ttf
similarity index 100%
rename from other/NotoSansRunic.ttf
rename to other/NotoSansRunic-Regular.ttf
Binary files differ
diff --git a/other/NotoSansSamaritan.ttf b/other/NotoSansSamaritan-Regular.ttf
similarity index 100%
rename from other/NotoSansSamaritan.ttf
rename to other/NotoSansSamaritan-Regular.ttf
Binary files differ
diff --git a/other/NotoSansSaurashtra.ttf b/other/NotoSansSaurashtra-Regular.ttf
similarity index 100%
rename from other/NotoSansSaurashtra.ttf
rename to other/NotoSansSaurashtra-Regular.ttf
Binary files differ
diff --git a/other/NotoSansShavian.ttf b/other/NotoSansShavian-Regular.ttf
similarity index 100%
rename from other/NotoSansShavian.ttf
rename to other/NotoSansShavian-Regular.ttf
Binary files differ
diff --git a/other/NotoSansSundanese.ttf b/other/NotoSansSundanese-Regular.ttf
similarity index 100%
rename from other/NotoSansSundanese.ttf
rename to other/NotoSansSundanese-Regular.ttf
Binary files differ
diff --git a/other/NotoSansSylotiNagri.ttf b/other/NotoSansSylotiNagri-Regular.ttf
similarity index 100%
rename from other/NotoSansSylotiNagri.ttf
rename to other/NotoSansSylotiNagri-Regular.ttf
Binary files differ
diff --git a/other/NotoSansSymbols-Regular-Subsetted.ttf b/other/NotoSansSymbols-Regular-Subsetted.ttf
index b98dccc..ebea59b 100644
--- a/other/NotoSansSymbols-Regular-Subsetted.ttf
+++ b/other/NotoSansSymbols-Regular-Subsetted.ttf
Binary files differ
diff --git a/other/NotoSansSymbols-Regular-Subsetted2.ttf b/other/NotoSansSymbols-Regular-Subsetted2.ttf
index 1b5d2a3..cc3e29f 100644
--- a/other/NotoSansSymbols-Regular-Subsetted2.ttf
+++ b/other/NotoSansSymbols-Regular-Subsetted2.ttf
Binary files differ
diff --git a/other/NotoSansSyriacEastern.ttf b/other/NotoSansSyriacEastern-Regular.ttf
similarity index 100%
rename from other/NotoSansSyriacEastern.ttf
rename to other/NotoSansSyriacEastern-Regular.ttf
Binary files differ
diff --git a/other/NotoSansSyriacEstrangela.ttf b/other/NotoSansSyriacEstrangela-Regular.ttf
similarity index 100%
rename from other/NotoSansSyriacEstrangela.ttf
rename to other/NotoSansSyriacEstrangela-Regular.ttf
Binary files differ
diff --git a/other/NotoSansSyriacWestern.ttf b/other/NotoSansSyriacWestern-Regular.ttf
similarity index 100%
rename from other/NotoSansSyriacWestern.ttf
rename to other/NotoSansSyriacWestern-Regular.ttf
Binary files differ
diff --git a/other/NotoSansTagalog.ttf b/other/NotoSansTagalog-Regular.ttf
similarity index 100%
rename from other/NotoSansTagalog.ttf
rename to other/NotoSansTagalog-Regular.ttf
Binary files differ
diff --git a/other/NotoSansTagbanwa.ttf b/other/NotoSansTagbanwa-Regular.ttf
similarity index 100%
rename from other/NotoSansTagbanwa.ttf
rename to other/NotoSansTagbanwa-Regular.ttf
Binary files differ
diff --git a/other/NotoSansTaiLe.ttf b/other/NotoSansTaiLe-Regular.ttf
similarity index 100%
rename from other/NotoSansTaiLe.ttf
rename to other/NotoSansTaiLe-Regular.ttf
Binary files differ
diff --git a/other/NotoSansTaiTham.ttf b/other/NotoSansTaiTham-Regular.ttf
similarity index 100%
rename from other/NotoSansTaiTham.ttf
rename to other/NotoSansTaiTham-Regular.ttf
Binary files differ
diff --git a/other/NotoSansTaiViet.ttf b/other/NotoSansTaiViet-Regular.ttf
similarity index 100%
rename from other/NotoSansTaiViet.ttf
rename to other/NotoSansTaiViet-Regular.ttf
Binary files differ
diff --git a/other/NotoSansTelugu.ttf b/other/NotoSansTelugu-Regular.ttf
similarity index 100%
rename from other/NotoSansTelugu.ttf
rename to other/NotoSansTelugu-Regular.ttf
Binary files differ
diff --git a/other/NotoSansTeluguUI.ttf b/other/NotoSansTeluguUI-Regular.ttf
similarity index 100%
rename from other/NotoSansTeluguUI.ttf
rename to other/NotoSansTeluguUI-Regular.ttf
Binary files differ
diff --git a/other/NotoSansThaana.ttf b/other/NotoSansThaana-Regular.ttf
similarity index 100%
rename from other/NotoSansThaana.ttf
rename to other/NotoSansThaana-Regular.ttf
Binary files differ
diff --git a/other/NotoSansThai.ttf b/other/NotoSansThai-Regular.ttf
similarity index 100%
rename from other/NotoSansThai.ttf
rename to other/NotoSansThai-Regular.ttf
Binary files differ
diff --git a/other/NotoSansThaiUI.ttf b/other/NotoSansThaiUI-Regular.ttf
similarity index 100%
rename from other/NotoSansThaiUI.ttf
rename to other/NotoSansThaiUI-Regular.ttf
Binary files differ
diff --git a/other/NotoSansTibetan.ttf b/other/NotoSansTibetan-Regular.ttf
similarity index 100%
rename from other/NotoSansTibetan.ttf
rename to other/NotoSansTibetan-Regular.ttf
Binary files differ
diff --git a/other/NotoSansUI.ttf b/other/NotoSansUI-Regular.ttf
similarity index 100%
rename from other/NotoSansUI.ttf
rename to other/NotoSansUI-Regular.ttf
Binary files differ
diff --git a/other/NotoSansUgaritic.ttf b/other/NotoSansUgaritic-Regular.ttf
similarity index 100%
rename from other/NotoSansUgaritic.ttf
rename to other/NotoSansUgaritic-Regular.ttf
Binary files differ
diff --git a/other/NotoSansVai.ttf b/other/NotoSansVai-Regular.ttf
similarity index 100%
rename from other/NotoSansVai.ttf
rename to other/NotoSansVai-Regular.ttf
Binary files differ
diff --git a/other/NotoSansYi.ttf b/other/NotoSansYi-Regular.ttf
similarity index 100%
rename from other/NotoSansYi.ttf
rename to other/NotoSansYi-Regular.ttf
Binary files differ
diff --git a/other/NotoSerif.ttf b/other/NotoSerif-Regular.ttf
similarity index 100%
rename from other/NotoSerif.ttf
rename to other/NotoSerif-Regular.ttf
Binary files differ
diff --git a/other/NotoSerifBengali.ttf b/other/NotoSerifBengali-Regular.ttf
similarity index 100%
rename from other/NotoSerifBengali.ttf
rename to other/NotoSerifBengali-Regular.ttf
Binary files differ
diff --git a/other/NotoSerifDevanagari.ttf b/other/NotoSerifDevanagari-Regular.ttf
similarity index 100%
rename from other/NotoSerifDevanagari.ttf
rename to other/NotoSerifDevanagari-Regular.ttf
Binary files differ
diff --git a/other/NotoSerifGeorgian-Regular.ttf b/other/NotoSerifGeorgian-VF.ttf
similarity index 100%
rename from other/NotoSerifGeorgian-Regular.ttf
rename to other/NotoSerifGeorgian-VF.ttf
Binary files differ
diff --git a/other/NotoSerifGujarati.ttf b/other/NotoSerifGujarati-Regular.ttf
similarity index 100%
rename from other/NotoSerifGujarati.ttf
rename to other/NotoSerifGujarati-Regular.ttf
Binary files differ
diff --git a/other/NotoSerifKannada.ttf b/other/NotoSerifKannada-Regular.ttf
similarity index 100%
rename from other/NotoSerifKannada.ttf
rename to other/NotoSerifKannada-Regular.ttf
Binary files differ
diff --git a/other/NotoSerifLao.ttf b/other/NotoSerifLao-Regular.ttf
similarity index 100%
rename from other/NotoSerifLao.ttf
rename to other/NotoSerifLao-Regular.ttf
Binary files differ
diff --git a/other/NotoSerifMalayalam.ttf b/other/NotoSerifMalayalam-Regular.ttf
similarity index 100%
rename from other/NotoSerifMalayalam.ttf
rename to other/NotoSerifMalayalam-Regular.ttf
Binary files differ
diff --git a/other/NotoSerifTelugu.ttf b/other/NotoSerifTelugu-Regular.ttf
similarity index 100%
rename from other/NotoSerifTelugu.ttf
rename to other/NotoSerifTelugu-Regular.ttf
Binary files differ
diff --git a/other/NotoSerifThai.ttf b/other/NotoSerifThai-Regular.ttf
similarity index 100%
rename from other/NotoSerifThai.ttf
rename to other/NotoSerifThai-Regular.ttf
Binary files differ
diff --git a/other/subset_noto_sans_symbols.py b/other/subset_noto_sans_symbols.py
index 4622c6c..1e0b395 100755
--- a/other/subset_noto_sans_symbols.py
+++ b/other/subset_noto_sans_symbols.py
@@ -19,13 +19,8 @@
__author__ = 'roozbeh@google.com (Roozbeh Pournader)'
-import contextlib
import os
import sys
-import tempfile
-
-from fontTools import ttLib
-from pathlib import PurePosixPath
from nototools import subset
from nototools import unicode_data
@@ -142,15 +137,6 @@
android_emoji.add(int(codepoint, 16))
return android_emoji
-def rename_postscript_name(source_font, target_font, new_name):
- """Rename the post script name to given one"""
- with contextlib.closing(ttLib.TTFont(source_font)) as ttf:
- nameTable = ttf['name']
- for name in nameTable.names:
- if (name.nameID == 6 and name.platformID == 3 and name.platEncID == 1
- and name.langID == 0x0409):
- name.string = new_name
- ttf.save(target_font)
def main(argv):
"""Subset the Noto Symbols font.
@@ -180,28 +166,20 @@
# mechanism to work properly.
target_coverage.remove(0x20E3)
- tmp = tempfile.NamedTemporaryFile()
source_file_name = argv[1]
target_file_name = argv[2]
subset.subset_font(
source_file_name,
- tmp.name,
+ target_file_name,
include=target_coverage)
- # Use given file name as the PostScript name.
- postScriptName = PurePosixPath(target_file_name).stem
- rename_postscript_name(tmp.name, target_file_name, postScriptName)
-
second_subset_coverage = DEFAULT_EMOJI | android_emoji
second_subset_file_name = argv[3]
subset.subset_font(
source_file_name,
- tmp.name,
+ second_subset_file_name,
include=second_subset_coverage)
- # Use given file name as the PostScript name.
- postScriptName = PurePosixPath(second_subset_file_name).stem
- rename_postscript_name(tmp.name, second_subset_file_name, postScriptName)
if __name__ == '__main__':
main(sys.argv)
