Merge "Revert "Rename font file with PostScript based names""

110 files changed, 297 insertions, 319 deletions

diff --git a/Android.bp b/Android.bp
index fb38725..bdf31cb 100644
--- a/Android.bp
+++ b/Android.bp
@@ -50,7 +50,7 @@ filegroup {
     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 @@ license {
 }
 
 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
index 80b7550..80b7550 100644
--- a/cjk/NotoSansCJKjp-Regular.otc
+++ b/cjk/NotoSansCJK-Regular.ttc
diff --git a/cjk/NotoSerifCJKjp-Regular.otc b/cjk/NotoSerifCJK-Regular.ttc
index 2820fc9..2820fc9 100644
--- a/cjk/NotoSerifCJKjp-Regular.otc
+++ b/cjk/NotoSerifCJK-Regular.ttc
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 @@ PRODUCT_PACKAGES := \
     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 @@ PRODUCT_PACKAGES := \
     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 @@ PRODUCT_PACKAGES := \
     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 @@ PRODUCT_PACKAGES := \
     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 @@ PRODUCT_PACKAGES := \
     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 @@ license {
 }
 
 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
index 1ba1f1d..1ba1f1d 100644
--- a/other-vf/NotoSansKhmer-Regular.ttf
+++ b/other-vf/NotoSansKhmer-VF.ttf
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 @@ license {
 }
 
 prebuilt_font {
-    name: "NotoSerif.ttf",
-    src: "NotoSerif.ttf",
+    name: "NotoSerif-Regular.ttf",
+    src: "NotoSerif-Regular.ttf",
 }
 
 prebuilt_font {
@@ -68,8 +68,8 @@ prebuilt_font {
 }
 
 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 {
 }
 
 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 {
 }
 
 prebuilt_font {
-    name: "NotoSansBatak.ttf",
-    src: "NotoSansBatak.ttf",
+    name: "NotoSansBatak-Regular.ttf",
+    src: "NotoSansBatak-Regular.ttf",
 }
 
 prebuilt_font {
@@ -143,28 +143,28 @@ prebuilt_font {
 }
 
 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 {
 }
 
 prebuilt_font {
-    name: "NotoSansCham.ttf",
-    src: "NotoSansCham.ttf",
+    name: "NotoSansCham-Regular.ttf",
+    src: "NotoSansCham-Regular.ttf",
 }
 
 prebuilt_font {
@@ -188,28 +188,28 @@ prebuilt_font {
 }
 
 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 {
 }
 
 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 {
 }
 
 prebuilt_font {
-    name: "NotoSansGujarati.ttf",
-    src: "NotoSansGujarati.ttf",
+    name: "NotoSansGujarati-Regular.ttf",
+    src: "NotoSansGujarati-Regular.ttf",
 }
 
 prebuilt_font {
@@ -253,8 +253,8 @@ prebuilt_font {
 }
 
 prebuilt_font {
-    name: "NotoSansGujaratiUI.ttf",
-    src: "NotoSansGujaratiUI.ttf",
+    name: "NotoSansGujaratiUI-Regular.ttf",
+    src: "NotoSansGujaratiUI-Regular.ttf",
 }
 
 prebuilt_font {
@@ -263,8 +263,8 @@ prebuilt_font {
 }
 
 prebuilt_font {
-    name: "NotoSansGurmukhi.ttf",
-    src: "NotoSansGurmukhi.ttf",
+    name: "NotoSansGurmukhi-Regular.ttf",
+    src: "NotoSansGurmukhi-Regular.ttf",
 }
 
 prebuilt_font {
@@ -273,13 +273,13 @@ prebuilt_font {
 }
 
 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 {
 }
 
 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 {
 }
 
 prebuilt_font {
-    name: "NotoSansKaithi.ttf",
-    src: "NotoSansKaithi.ttf",
+    name: "NotoSansKaithi-Regular.ttf",
+    src: "NotoSansKaithi-Regular.ttf",
 }
 
 prebuilt_font {
@@ -318,8 +318,8 @@ prebuilt_font {
 }
 
 prebuilt_font {
-    name: "NotoSansKannada.ttf",
-    src: "NotoSansKannada.ttf",
+    name: "NotoSansKannada-Regular.ttf",
+    src: "NotoSansKannada-Regular.ttf",
 }
 
 prebuilt_font {
@@ -328,18 +328,18 @@ prebuilt_font {
 }
 
 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 {
 }
 
 prebuilt_font {
-    name: "NotoSansKhmerUI.ttf",
-    src: "NotoSansKhmerUI.ttf",
+    name: "NotoSansKhmerUI-Regular.ttf",
+    src: "NotoSansKhmerUI-Regular.ttf",
 }
 
 prebuilt_font {
@@ -358,8 +358,8 @@ prebuilt_font {
 }
 
 prebuilt_font {
-    name: "NotoSansLao.ttf",
-    src: "NotoSansLao.ttf",
+    name: "NotoSansLao-Regular.ttf",
+    src: "NotoSansLao-Regular.ttf",
 }
 
 prebuilt_font {
@@ -368,18 +368,18 @@ prebuilt_font {
 }
 
 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 {
 }
 
 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 {
 }
 
 prebuilt_font {
-    name: "NotoSansMandaic.ttf",
-    src: "NotoSansMandaic.ttf",
+    name: "NotoSansMandaic-Regular.ttf",
+    src: "NotoSansMandaic-Regular.ttf",
 }
 
 prebuilt_font {
@@ -453,8 +453,8 @@ prebuilt_font {
 }
 
 prebuilt_font {
-    name: "NotoSansMeeteiMayek.ttf",
-    src: "NotoSansMeeteiMayek.ttf",
+    name: "NotoSansMeeteiMayek-Regular.ttf",
+    src: "NotoSansMeeteiMayek-Regular.ttf",
 }
 
 prebuilt_font {
@@ -468,8 +468,8 @@ prebuilt_font {
 }
 
 prebuilt_font {
-    name: "NotoSansMongolian.ttf",
-    src: "NotoSansMongolian.ttf",
+    name: "NotoSansMongolian-Regular.ttf",
+    src: "NotoSansMongolian-Regular.ttf",
 }
 
 prebuilt_font {
@@ -523,28 +523,28 @@ prebuilt_font {
 }
 
 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 {
 }
 
 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 {
 }
 
 prebuilt_font {
-    name: "NotoSansOriya.ttf",
-    src: "NotoSansOriya.ttf",
+    name: "NotoSansOriya-Regular.ttf",
+    src: "NotoSansOriya-Regular.ttf",
 }
 
 prebuilt_font {
@@ -588,8 +588,8 @@ prebuilt_font {
 }
 
 prebuilt_font {
-    name: "NotoSansOriyaUI.ttf",
-    src: "NotoSansOriyaUI.ttf",
+    name: "NotoSansOriyaUI-Regular.ttf",
+    src: "NotoSansOriyaUI-Regular.ttf",
 }
 
 prebuilt_font {
@@ -598,8 +598,8 @@ prebuilt_font {
 }
 
 prebuilt_font {
-    name: "NotoSansOsmanya.ttf",
-    src: "NotoSansOsmanya.ttf",
+    name: "NotoSansOsmanya-Regular.ttf",
+    src: "NotoSansOsmanya-Regular.ttf",
 }
 
 prebuilt_font {
@@ -618,33 +618,33 @@ prebuilt_font {
 }
 
 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 {
 }
 
 prebuilt_font {
-    name: "NotoSansShavian.ttf",
-    src: "NotoSansShavian.ttf",
+    name: "NotoSansShavian-Regular.ttf",
+    src: "NotoSansShavian-Regular.ttf",
 }
 
 prebuilt_font {
@@ -693,53 +693,53 @@ prebuilt_font {
 }
 
 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 {
 }
 
 prebuilt_font {
-    name: "NotoSansTelugu.ttf",
-    src: "NotoSansTelugu.ttf",
+    name: "NotoSansTelugu-Regular.ttf",
+    src: "NotoSansTelugu-Regular.ttf",
 }
 
 prebuilt_font {
@@ -788,8 +788,8 @@ prebuilt_font {
 }
 
 prebuilt_font {
-    name: "NotoSansTeluguUI.ttf",
-    src: "NotoSansTeluguUI.ttf",
+    name: "NotoSansTeluguUI-Regular.ttf",
+    src: "NotoSansTeluguUI-Regular.ttf",
 }
 
 prebuilt_font {
@@ -798,8 +798,8 @@ prebuilt_font {
 }
 
 prebuilt_font {
-    name: "NotoSansThaana.ttf",
-    src: "NotoSansThaana.ttf",
+    name: "NotoSansThaana-Regular.ttf",
+    src: "NotoSansThaana-Regular.ttf",
 }
 
 prebuilt_font {
@@ -808,28 +808,28 @@ prebuilt_font {
 }
 
 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 {
 }
 
 prebuilt_font {
-    name: "NotoNaskhArabicUI.ttf",
-    src: "NotoNaskhArabicUI.ttf",
+    name: "NotoNaskhArabicUI-Regular.ttf",
+    src: "NotoNaskhArabicUI-Regular.ttf",
 }
 
 prebuilt_font {
@@ -893,13 +893,13 @@ prebuilt_font {
 }
 
 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 {
 }
 
 prebuilt_font {
-    name: "NotoSansThai.ttf",
-    src: "NotoSansThai.ttf",
+    name: "NotoSansThai-Regular.ttf",
+    src: "NotoSansThai-Regular.ttf",
 }
 
 prebuilt_font {
@@ -928,8 +928,8 @@ prebuilt_font {
 }
 
 prebuilt_font {
-    name: "NotoSansThaiUI.ttf",
-    src: "NotoSansThaiUI.ttf",
+    name: "NotoSansThaiUI-Regular.ttf",
+    src: "NotoSansThaiUI-Regular.ttf",
 }
 
 prebuilt_font {
@@ -988,8 +988,8 @@ prebuilt_font {
 }
 
 prebuilt_font {
-    name: "NotoSerifBengali.ttf",
-    src: "NotoSerifBengali.ttf",
+    name: "NotoSerifBengali-Regular.ttf",
+    src: "NotoSerifBengali-Regular.ttf",
 }
 
 prebuilt_font {
@@ -998,8 +998,8 @@ prebuilt_font {
 }
 
 prebuilt_font {
-    name: "NotoSerifDevanagari.ttf",
-    src: "NotoSerifDevanagari.ttf",
+    name: "NotoSerifDevanagari-Regular.ttf",
+    src: "NotoSerifDevanagari-Regular.ttf",
 }
 
 prebuilt_font {
@@ -1013,8 +1013,8 @@ prebuilt_font {
 }
 
 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 {
 }
 
 prebuilt_font {
-    name: "NotoSerifGujarati.ttf",
-    src: "NotoSerifGujarati.ttf",
+    name: "NotoSerifGujarati-Regular.ttf",
+    src: "NotoSerifGujarati-Regular.ttf",
 }
 
 prebuilt_font {
@@ -1053,8 +1053,8 @@ prebuilt_font {
 }
 
 prebuilt_font {
-    name: "NotoSerifKannada.ttf",
-    src: "NotoSerifKannada.ttf",
+    name: "NotoSerifKannada-Regular.ttf",
+    src: "NotoSerifKannada-Regular.ttf",
 }
 
 prebuilt_font {
@@ -1073,8 +1073,8 @@ prebuilt_font {
 }
 
 prebuilt_font {
-    name: "NotoSerifLao.ttf",
-    src: "NotoSerifLao.ttf",
+    name: "NotoSerifLao-Regular.ttf",
+    src: "NotoSerifLao-Regular.ttf",
 }
 
 prebuilt_font {
@@ -1083,8 +1083,8 @@ prebuilt_font {
 }
 
 prebuilt_font {
-    name: "NotoSerifMalayalam.ttf",
-    src: "NotoSerifMalayalam.ttf",
+    name: "NotoSerifMalayalam-Regular.ttf",
+    src: "NotoSerifMalayalam-Regular.ttf",
 }
 
 prebuilt_font {
@@ -1123,8 +1123,8 @@ prebuilt_font {
 }
 
 prebuilt_font {
-    name: "NotoSerifTelugu.ttf",
-    src: "NotoSerifTelugu.ttf",
+    name: "NotoSerifTelugu-Regular.ttf",
+    src: "NotoSerifTelugu-Regular.ttf",
 }
 
 prebuilt_font {
@@ -1133,6 +1133,6 @@ prebuilt_font {
 }
 
 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
index a203761..a203761 100644
--- a/other/NotoKufiArabic.ttf
+++ b/other/NotoKufiArabic-Regular.ttf
diff --git a/other/NotoNaskhArabic.ttf b/other/NotoNaskhArabic-Regular.ttf
index cac2af2..cac2af2 100644
--- a/other/NotoNaskhArabic.ttf
+++ b/other/NotoNaskhArabic-Regular.ttf
diff --git a/other/NotoNaskhArabicUI.ttf b/other/NotoNaskhArabicUI-Regular.ttf
index 138b375..138b375 100644
--- a/other/NotoNaskhArabicUI.ttf
+++ b/other/NotoNaskhArabicUI-Regular.ttf
diff --git a/other/NotoNastaliqUrdu.ttf b/other/NotoNastaliqUrdu-Regular.ttf
index 5b6920a..5b6920a 100644
--- a/other/NotoNastaliqUrdu.ttf
+++ b/other/NotoNastaliqUrdu-Regular.ttf
diff --git a/other/NotoSans.ttf b/other/NotoSans-Regular.ttf
index 74e4a00..74e4a00 100644
--- a/other/NotoSans.ttf
+++ b/other/NotoSans-Regular.ttf
diff --git a/other/NotoSansAdlam-Regular.ttf b/other/NotoSansAdlam-VF.ttf
index a1c9159..a1c9159 100644
--- a/other/NotoSansAdlam-Regular.ttf
+++ b/other/NotoSansAdlam-VF.ttf
diff --git a/other/NotoSansAvestan.ttf b/other/NotoSansAvestan-Regular.ttf
index 31eeb5a..31eeb5a 100644
--- a/other/NotoSansAvestan.ttf
+++ b/other/NotoSansAvestan-Regular.ttf
diff --git a/other/NotoSansBalinese.ttf b/other/NotoSansBalinese-Regular.ttf
index a15509b..a15509b 100644
--- a/other/NotoSansBalinese.ttf
+++ b/other/NotoSansBalinese-Regular.ttf
diff --git a/other/NotoSansBamum.ttf b/other/NotoSansBamum-Regular.ttf
index f2de187..f2de187 100644
--- a/other/NotoSansBamum.ttf
+++ b/other/NotoSansBamum-Regular.ttf
diff --git a/other/NotoSansBatak.ttf b/other/NotoSansBatak-Regular.ttf
index 882ad96..882ad96 100644
--- a/other/NotoSansBatak.ttf
+++ b/other/NotoSansBatak-Regular.ttf
diff --git a/other/NotoSansBrahmi.ttf b/other/NotoSansBrahmi-Regular.ttf
index eb98a65..eb98a65 100644
--- a/other/NotoSansBrahmi.ttf
+++ b/other/NotoSansBrahmi-Regular.ttf
diff --git a/other/NotoSansBuginese.ttf b/other/NotoSansBuginese-Regular.ttf
index fd59da6..fd59da6 100644
--- a/other/NotoSansBuginese.ttf
+++ b/other/NotoSansBuginese-Regular.ttf
diff --git a/other/NotoSansBuhid.ttf b/other/NotoSansBuhid-Regular.ttf
index 756218f..756218f 100644
--- a/other/NotoSansBuhid.ttf
+++ b/other/NotoSansBuhid-Regular.ttf
diff --git a/other/NotoSansCanadianAboriginal.ttf b/other/NotoSansCanadianAboriginal-Regular.ttf
index 4961f43..4961f43 100644
--- a/other/NotoSansCanadianAboriginal.ttf
+++ b/other/NotoSansCanadianAboriginal-Regular.ttf
diff --git a/other/NotoSansCarian.ttf b/other/NotoSansCarian-Regular.ttf
index 8abada1..8abada1 100644
--- a/other/NotoSansCarian.ttf
+++ b/other/NotoSansCarian-Regular.ttf
diff --git a/other/NotoSansCham.ttf b/other/NotoSansCham-Regular.ttf
index be897d4..be897d4 100644
--- a/other/NotoSansCham.ttf
+++ b/other/NotoSansCham-Regular.ttf
diff --git a/other/NotoSansCoptic.ttf b/other/NotoSansCoptic-Regular.ttf
index d327c79..d327c79 100644
--- a/other/NotoSansCoptic.ttf
+++ b/other/NotoSansCoptic-Regular.ttf
diff --git a/other/NotoSansCuneiform.ttf b/other/NotoSansCuneiform-Regular.ttf
index 37a4e9e..37a4e9e 100644
--- a/other/NotoSansCuneiform.ttf
+++ b/other/NotoSansCuneiform-Regular.ttf
diff --git a/other/NotoSansCypriot.ttf b/other/NotoSansCypriot-Regular.ttf
index bc4083e..bc4083e 100644
--- a/other/NotoSansCypriot.ttf
+++ b/other/NotoSansCypriot-Regular.ttf
diff --git a/other/NotoSansDeseret.ttf b/other/NotoSansDeseret-Regular.ttf
index c043a54..c043a54 100644
--- a/other/NotoSansDeseret.ttf
+++ b/other/NotoSansDeseret-Regular.ttf
diff --git a/other/NotoSansEgyptianHieroglyphs.ttf b/other/NotoSansEgyptianHieroglyphs-Regular.ttf
index 62ee897..62ee897 100644
--- a/other/NotoSansEgyptianHieroglyphs.ttf
+++ b/other/NotoSansEgyptianHieroglyphs-Regular.ttf
diff --git a/other/NotoSansEthiopic.ttf b/other/NotoSansEthiopic-Regular.ttf
index 1c6194d..1c6194d 100644
--- a/other/NotoSansEthiopic.ttf
+++ b/other/NotoSansEthiopic-Regular.ttf
diff --git a/other/NotoSansGeorgian-Regular.ttf b/other/NotoSansGeorgian-VF.ttf
index 25df7f1..25df7f1 100644
--- a/other/NotoSansGeorgian-Regular.ttf
+++ b/other/NotoSansGeorgian-VF.ttf
diff --git a/other/NotoSansGlagolitic.ttf b/other/NotoSansGlagolitic-Regular.ttf
index 86237aa..86237aa 100644
--- a/other/NotoSansGlagolitic.ttf
+++ b/other/NotoSansGlagolitic-Regular.ttf
diff --git a/other/NotoSansGothic.ttf b/other/NotoSansGothic-Regular.ttf
index d653ee1..d653ee1 100644
--- a/other/NotoSansGothic.ttf
+++ b/other/NotoSansGothic-Regular.ttf
diff --git a/other/NotoSansGujarati.ttf b/other/NotoSansGujarati-Regular.ttf
index 7af1329..7af1329 100644
--- a/other/NotoSansGujarati.ttf
+++ b/other/NotoSansGujarati-Regular.ttf
diff --git a/other/NotoSansGujaratiUI.ttf b/other/NotoSansGujaratiUI-Regular.ttf
index 1bb407d..1bb407d 100644
--- a/other/NotoSansGujaratiUI.ttf
+++ b/other/NotoSansGujaratiUI-Regular.ttf
diff --git a/other/NotoSansGurmukhi.ttf b/other/NotoSansGurmukhi-Regular.ttf
index b86bbc6..b86bbc6 100644
--- a/other/NotoSansGurmukhi.ttf
+++ b/other/NotoSansGurmukhi-Regular.ttf
diff --git a/other/NotoSansGurmukhiUI.ttf b/other/NotoSansGurmukhiUI-Regular.ttf
index 6de832d..6de832d 100644
--- a/other/NotoSansGurmukhiUI.ttf
+++ b/other/NotoSansGurmukhiUI-Regular.ttf
diff --git a/other/NotoSansHanunoo.ttf b/other/NotoSansHanunoo-Regular.ttf
index 480af34..480af34 100644
--- a/other/NotoSansHanunoo.ttf
+++ b/other/NotoSansHanunoo-Regular.ttf
diff --git a/other/NotoSansHebrew.ttf b/other/NotoSansHebrew-Regular.ttf
index c161ce5..c161ce5 100644
--- a/other/NotoSansHebrew.ttf
+++ b/other/NotoSansHebrew-Regular.ttf
diff --git a/other/NotoSansImperialAramaic.ttf b/other/NotoSansImperialAramaic-Regular.ttf
index 10802e3..10802e3 100644
--- a/other/NotoSansImperialAramaic.ttf
+++ b/other/NotoSansImperialAramaic-Regular.ttf
diff --git a/other/NotoSansInscriptionalPahlavi.ttf b/other/NotoSansInscriptionalPahlavi-Regular.ttf
index 44d5296..44d5296 100644
--- a/other/NotoSansInscriptionalPahlavi.ttf
+++ b/other/NotoSansInscriptionalPahlavi-Regular.ttf
diff --git a/other/NotoSansInscriptionalParthian.ttf b/other/NotoSansInscriptionalParthian-Regular.ttf
index bca05aa..bca05aa 100644
--- a/other/NotoSansInscriptionalParthian.ttf
+++ b/other/NotoSansInscriptionalParthian-Regular.ttf
diff --git a/other/NotoSansKaithi.ttf b/other/NotoSansKaithi-Regular.ttf
index 22b8c47..22b8c47 100644
--- a/other/NotoSansKaithi.ttf
+++ b/other/NotoSansKaithi-Regular.ttf
diff --git a/other/NotoSansKannada.ttf b/other/NotoSansKannada-Regular.ttf
index be9d761..be9d761 100644
--- a/other/NotoSansKannada.ttf
+++ b/other/NotoSansKannada-Regular.ttf
diff --git a/other/NotoSansKannadaUI.ttf b/other/NotoSansKannadaUI-Regular.ttf
index bea2878..bea2878 100644
--- a/other/NotoSansKannadaUI.ttf
+++ b/other/NotoSansKannadaUI-Regular.ttf
diff --git a/other/NotoSansKayahLi.ttf b/other/NotoSansKayahLi-Regular.ttf
index 75b6b80..75b6b80 100644
--- a/other/NotoSansKayahLi.ttf
+++ b/other/NotoSansKayahLi-Regular.ttf
diff --git a/other/NotoSansKharoshthi.ttf b/other/NotoSansKharoshthi-Regular.ttf
index 1f4a9a6..1f4a9a6 100644
--- a/other/NotoSansKharoshthi.ttf
+++ b/other/NotoSansKharoshthi-Regular.ttf
diff --git a/other/NotoSansKhmerUI.ttf b/other/NotoSansKhmerUI-Regular.ttf
index 7a11a81..7a11a81 100644
--- a/other/NotoSansKhmerUI.ttf
+++ b/other/NotoSansKhmerUI-Regular.ttf
diff --git a/other/NotoSansLao.ttf b/other/NotoSansLao-Regular.ttf
index 20f1af8..20f1af8 100644
--- a/other/NotoSansLao.ttf
+++ b/other/NotoSansLao-Regular.ttf
diff --git a/other/NotoSansLaoUI.ttf b/other/NotoSansLaoUI-Regular.ttf
index 61d755d..61d755d 100644
--- a/other/NotoSansLaoUI.ttf
+++ b/other/NotoSansLaoUI-Regular.ttf
diff --git a/other/NotoSansLepcha.ttf b/other/NotoSansLepcha-Regular.ttf
index b86dc59..b86dc59 100644
--- a/other/NotoSansLepcha.ttf
+++ b/other/NotoSansLepcha-Regular.ttf
diff --git a/other/NotoSansLimbu.ttf b/other/NotoSansLimbu-Regular.ttf
index b9eca08..b9eca08 100644
--- a/other/NotoSansLimbu.ttf
+++ b/other/NotoSansLimbu-Regular.ttf
diff --git a/other/NotoSansLinearB.ttf b/other/NotoSansLinearB-Regular.ttf
index b741507..b741507 100644
--- a/other/NotoSansLinearB.ttf
+++ b/other/NotoSansLinearB-Regular.ttf
diff --git a/other/NotoSansLisu.ttf b/other/NotoSansLisu-Regular.ttf
index 12405b4..12405b4 100644
--- a/other/NotoSansLisu.ttf
+++ b/other/NotoSansLisu-Regular.ttf
diff --git a/other/NotoSansLycian.ttf b/other/NotoSansLycian-Regular.ttf
index 30310c2..30310c2 100644
--- a/other/NotoSansLycian.ttf
+++ b/other/NotoSansLycian-Regular.ttf
diff --git a/other/NotoSansLydian.ttf b/other/NotoSansLydian-Regular.ttf
index fc5bf5f..fc5bf5f 100644
--- a/other/NotoSansLydian.ttf
+++ b/other/NotoSansLydian-Regular.ttf
diff --git a/other/NotoSansMandaic.ttf b/other/NotoSansMandaic-Regular.ttf
index 1a533e1..1a533e1 100644
--- a/other/NotoSansMandaic.ttf
+++ b/other/NotoSansMandaic-Regular.ttf
diff --git a/other/NotoSansMeeteiMayek.ttf b/other/NotoSansMeeteiMayek-Regular.ttf
index 3059a6c..3059a6c 100644
--- a/other/NotoSansMeeteiMayek.ttf
+++ b/other/NotoSansMeeteiMayek-Regular.ttf
diff --git a/other/NotoSansMongolian.ttf b/other/NotoSansMongolian-Regular.ttf
index 760d7e0..760d7e0 100644
--- a/other/NotoSansMongolian.ttf
+++ b/other/NotoSansMongolian-Regular.ttf
diff --git a/other/NotoSansNKo.ttf b/other/NotoSansNKo-Regular.ttf
index 091416b..091416b 100644
--- a/other/NotoSansNKo.ttf
+++ b/other/NotoSansNKo-Regular.ttf
diff --git a/other/NotoSansNewTaiLue.ttf b/other/NotoSansNewTaiLue-Regular.ttf
index bc79a79..bc79a79 100644
--- a/other/NotoSansNewTaiLue.ttf
+++ b/other/NotoSansNewTaiLue-Regular.ttf
diff --git a/other/NotoSansOgham.ttf b/other/NotoSansOgham-Regular.ttf
index 8943189..8943189 100644
--- a/other/NotoSansOgham.ttf
+++ b/other/NotoSansOgham-Regular.ttf
diff --git a/other/NotoSansOlChiki.ttf b/other/NotoSansOlChiki-Regular.ttf
index 3326640..3326640 100644
--- a/other/NotoSansOlChiki.ttf
+++ b/other/NotoSansOlChiki-Regular.ttf
diff --git a/other/NotoSansOldItalic.ttf b/other/NotoSansOldItalic-Regular.ttf
index 4a63a5e..4a63a5e 100644
--- a/other/NotoSansOldItalic.ttf
+++ b/other/NotoSansOldItalic-Regular.ttf
diff --git a/other/NotoSansOldPersian.ttf b/other/NotoSansOldPersian-Regular.ttf
index 21166f4..21166f4 100644
--- a/other/NotoSansOldPersian.ttf
+++ b/other/NotoSansOldPersian-Regular.ttf
diff --git a/other/NotoSansOldSouthArabian.ttf b/other/NotoSansOldSouthArabian-Regular.ttf
index 5037bd9..5037bd9 100644
--- a/other/NotoSansOldSouthArabian.ttf
+++ b/other/NotoSansOldSouthArabian-Regular.ttf
diff --git a/other/NotoSansOldTurkic.ttf b/other/NotoSansOldTurkic-Regular.ttf
index 1652ad1..1652ad1 100644
--- a/other/NotoSansOldTurkic.ttf
+++ b/other/NotoSansOldTurkic-Regular.ttf
diff --git a/other/NotoSansOriya.ttf b/other/NotoSansOriya-Regular.ttf
index 92abe64..92abe64 100644
--- a/other/NotoSansOriya.ttf
+++ b/other/NotoSansOriya-Regular.ttf
diff --git a/other/NotoSansOriyaUI.ttf b/other/NotoSansOriyaUI-Regular.ttf
index 5738e1d..5738e1d 100644
--- a/other/NotoSansOriyaUI.ttf
+++ b/other/NotoSansOriyaUI-Regular.ttf
diff --git a/other/NotoSansOsmanya.ttf b/other/NotoSansOsmanya-Regular.ttf
index dd0b982..dd0b982 100644
--- a/other/NotoSansOsmanya.ttf
+++ b/other/NotoSansOsmanya-Regular.ttf
diff --git a/other/NotoSansPhagsPa.ttf b/other/NotoSansPhagsPa-Regular.ttf
index bd59e32..bd59e32 100644
--- a/other/NotoSansPhagsPa.ttf
+++ b/other/NotoSansPhagsPa-Regular.ttf
diff --git a/other/NotoSansPhoenician.ttf b/other/NotoSansPhoenician-Regular.ttf
index 345a977..345a977 100644
--- a/other/NotoSansPhoenician.ttf
+++ b/other/NotoSansPhoenician-Regular.ttf
diff --git a/other/NotoSansRejang.ttf b/other/NotoSansRejang-Regular.ttf
index 3d95fd3..3d95fd3 100644
--- a/other/NotoSansRejang.ttf
+++ b/other/NotoSansRejang-Regular.ttf
diff --git a/other/NotoSansRunic.ttf b/other/NotoSansRunic-Regular.ttf
index 64a18b1..64a18b1 100644
--- a/other/NotoSansRunic.ttf
+++ b/other/NotoSansRunic-Regular.ttf
diff --git a/other/NotoSansSamaritan.ttf b/other/NotoSansSamaritan-Regular.ttf
index 9fe427c..9fe427c 100644
--- a/other/NotoSansSamaritan.ttf
+++ b/other/NotoSansSamaritan-Regular.ttf
diff --git a/other/NotoSansSaurashtra.ttf b/other/NotoSansSaurashtra-Regular.ttf
index 6ca7590..6ca7590 100644
--- a/other/NotoSansSaurashtra.ttf
+++ b/other/NotoSansSaurashtra-Regular.ttf
diff --git a/other/NotoSansShavian.ttf b/other/NotoSansShavian-Regular.ttf
index 265c523..265c523 100644
--- a/other/NotoSansShavian.ttf
+++ b/other/NotoSansShavian-Regular.ttf
diff --git a/other/NotoSansSundanese.ttf b/other/NotoSansSundanese-Regular.ttf
index 5c19cd7..5c19cd7 100644
--- a/other/NotoSansSundanese.ttf
+++ b/other/NotoSansSundanese-Regular.ttf
diff --git a/other/NotoSansSylotiNagri.ttf b/other/NotoSansSylotiNagri-Regular.ttf
index 164c217..164c217 100644
--- a/other/NotoSansSylotiNagri.ttf
+++ b/other/NotoSansSylotiNagri-Regular.ttf
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
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
diff --git a/other/NotoSansSyriacEastern.ttf b/other/NotoSansSyriacEastern-Regular.ttf
index 25ee338..25ee338 100644
--- a/other/NotoSansSyriacEastern.ttf
+++ b/other/NotoSansSyriacEastern-Regular.ttf
diff --git a/other/NotoSansSyriacEstrangela.ttf b/other/NotoSansSyriacEstrangela-Regular.ttf
index 07a2e04..07a2e04 100644
--- a/other/NotoSansSyriacEstrangela.ttf
+++ b/other/NotoSansSyriacEstrangela-Regular.ttf
diff --git a/other/NotoSansSyriacWestern.ttf b/other/NotoSansSyriacWestern-Regular.ttf
index f0f9de1..f0f9de1 100644
--- a/other/NotoSansSyriacWestern.ttf
+++ b/other/NotoSansSyriacWestern-Regular.ttf
diff --git a/other/NotoSansTagalog.ttf b/other/NotoSansTagalog-Regular.ttf
index 0aff411..0aff411 100644
--- a/other/NotoSansTagalog.ttf
+++ b/other/NotoSansTagalog-Regular.ttf
diff --git a/other/NotoSansTagbanwa.ttf b/other/NotoSansTagbanwa-Regular.ttf
index 286cf4c..286cf4c 100644
--- a/other/NotoSansTagbanwa.ttf
+++ b/other/NotoSansTagbanwa-Regular.ttf
diff --git a/other/NotoSansTaiLe.ttf b/other/NotoSansTaiLe-Regular.ttf
index 88ea3fd..88ea3fd 100644
--- a/other/NotoSansTaiLe.ttf
+++ b/other/NotoSansTaiLe-Regular.ttf
diff --git a/other/NotoSansTaiTham.ttf b/other/NotoSansTaiTham-Regular.ttf
index faa8ddf..faa8ddf 100644
--- a/other/NotoSansTaiTham.ttf
+++ b/other/NotoSansTaiTham-Regular.ttf
diff --git a/other/NotoSansTaiViet.ttf b/other/NotoSansTaiViet-Regular.ttf
index 9208fc7..9208fc7 100644
--- a/other/NotoSansTaiViet.ttf
+++ b/other/NotoSansTaiViet-Regular.ttf
diff --git a/other/NotoSansTelugu.ttf b/other/NotoSansTelugu-Regular.ttf
index 5134cbd..5134cbd 100644
--- a/other/NotoSansTelugu.ttf
+++ b/other/NotoSansTelugu-Regular.ttf
diff --git a/other/NotoSansTeluguUI.ttf b/other/NotoSansTeluguUI-Regular.ttf
index aa5fea2..aa5fea2 100644
--- a/other/NotoSansTeluguUI.ttf
+++ b/other/NotoSansTeluguUI-Regular.ttf
diff --git a/other/NotoSansThaana.ttf b/other/NotoSansThaana-Regular.ttf
index 8fcf561..8fcf561 100644
--- a/other/NotoSansThaana.ttf
+++ b/other/NotoSansThaana-Regular.ttf
diff --git a/other/NotoSansThai.ttf b/other/NotoSansThai-Regular.ttf
index 552c356..552c356 100644
--- a/other/NotoSansThai.ttf
+++ b/other/NotoSansThai-Regular.ttf
diff --git a/other/NotoSansThaiUI.ttf b/other/NotoSansThaiUI-Regular.ttf
index 9fe222d..9fe222d 100644
--- a/other/NotoSansThaiUI.ttf
+++ b/other/NotoSansThaiUI-Regular.ttf
diff --git a/other/NotoSansTibetan.ttf b/other/NotoSansTibetan-Regular.ttf
index 65f0e93..65f0e93 100644
--- a/other/NotoSansTibetan.ttf
+++ b/other/NotoSansTibetan-Regular.ttf
diff --git a/other/NotoSansUI.ttf b/other/NotoSansUI-Regular.ttf
index 24dab50..24dab50 100644
--- a/other/NotoSansUI.ttf
+++ b/other/NotoSansUI-Regular.ttf
diff --git a/other/NotoSansUgaritic.ttf b/other/NotoSansUgaritic-Regular.ttf
index dec137d..dec137d 100644
--- a/other/NotoSansUgaritic.ttf
+++ b/other/NotoSansUgaritic-Regular.ttf
diff --git a/other/NotoSansVai.ttf b/other/NotoSansVai-Regular.ttf
index 3ec5fcc..3ec5fcc 100644
--- a/other/NotoSansVai.ttf
+++ b/other/NotoSansVai-Regular.ttf
diff --git a/other/NotoSansYi.ttf b/other/NotoSansYi-Regular.ttf
index 5bd81f9..5bd81f9 100644
--- a/other/NotoSansYi.ttf
+++ b/other/NotoSansYi-Regular.ttf
diff --git a/other/NotoSerif.ttf b/other/NotoSerif-Regular.ttf
index 9d9a347..9d9a347 100644
--- a/other/NotoSerif.ttf
+++ b/other/NotoSerif-Regular.ttf
diff --git a/other/NotoSerifBengali.ttf b/other/NotoSerifBengali-Regular.ttf
index 56670b7..56670b7 100644
--- a/other/NotoSerifBengali.ttf
+++ b/other/NotoSerifBengali-Regular.ttf
diff --git a/other/NotoSerifDevanagari.ttf b/other/NotoSerifDevanagari-Regular.ttf
index ebb66f7..ebb66f7 100644
--- a/other/NotoSerifDevanagari.ttf
+++ b/other/NotoSerifDevanagari-Regular.ttf
diff --git a/other/NotoSerifGeorgian-Regular.ttf b/other/NotoSerifGeorgian-VF.ttf
index 29b0eb8..29b0eb8 100644
--- a/other/NotoSerifGeorgian-Regular.ttf
+++ b/other/NotoSerifGeorgian-VF.ttf
diff --git a/other/NotoSerifGujarati.ttf b/other/NotoSerifGujarati-Regular.ttf
index ccec6f7..ccec6f7 100644
--- a/other/NotoSerifGujarati.ttf
+++ b/other/NotoSerifGujarati-Regular.ttf
diff --git a/other/NotoSerifKannada.ttf b/other/NotoSerifKannada-Regular.ttf
index 6f43122..6f43122 100644
--- a/other/NotoSerifKannada.ttf
+++ b/other/NotoSerifKannada-Regular.ttf
diff --git a/other/NotoSerifLao.ttf b/other/NotoSerifLao-Regular.ttf
index b8ca3d7..b8ca3d7 100644
--- a/other/NotoSerifLao.ttf
+++ b/other/NotoSerifLao-Regular.ttf
diff --git a/other/NotoSerifMalayalam.ttf b/other/NotoSerifMalayalam-Regular.ttf
index cd2e66f..cd2e66f 100644
--- a/other/NotoSerifMalayalam.ttf
+++ b/other/NotoSerifMalayalam-Regular.ttf
diff --git a/other/NotoSerifTelugu.ttf b/other/NotoSerifTelugu-Regular.ttf
index 2234780..2234780 100644
--- a/other/NotoSerifTelugu.ttf
+++ b/other/NotoSerifTelugu-Regular.ttf
diff --git a/other/NotoSerifThai.ttf b/other/NotoSerifThai-Regular.ttf
index a807b10..a807b10 100644
--- a/other/NotoSerifThai.ttf
+++ b/other/NotoSerifThai-Regular.ttf
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 @@ def get_android_emoji():
                 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 @@ def main(argv):
     # 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)