Skip to content

Commit 71e57e9

Browse files
tidy android font info
1 parent 49f4935 commit 71e57e9

File tree

1 file changed

+16
-15
lines changed

1 file changed

+16
-15
lines changed

js/fonts.js

+16-15
Original file line numberDiff line numberDiff line change
@@ -35,30 +35,28 @@ let fntMaster = {
3535
// android core noto fonts
3636
'android': {
3737
'notoboth': [
38-
// sans: 5+ except tibetan 9+
38+
// sans: 5+ except CJK JP + Gujarati + Gurmukhi + Tibetan 9+
3939
// serifs: 9+ except tibetan 12+
4040
'Armenian','Bengali','CJK JP','Devanagari','Ethiopic','Georgian','Gujarati','Gurmukhi','Hebrew','Kannada',
4141
'Khmer','Lao','Malayalam','Myanmar','Sinhala','Tamil','Telugu','Thai','Tibetan',
4242
],
4343
'notosans': [
4444
// 5+
45-
'Adlam','Avestan','Balinese','Bamum','Batak','Bengali UI','Brahmi','Buginese','Buhid','Canadian Aboriginal','Carian',
46-
'Cham','Cherokee','Coptic','Cuneiform','Cypriot','Deseret','Devanagari UI','Egyptian Hieroglyphs','Glagolitic','Gothic',
47-
'Gujarati UI','Gurmukhi UI','Hanunoo','Imperial Aramaic','Inscriptional Pahlavi','Inscriptional Parthian','Javanese',
48-
'Kaithi','Kayah Li','Kharoshthi','Khmer UI','Lao UI','Lepcha','Limbu','Linear B','Lisu','Lycian','Lydian','Malayalam UI',
49-
'Mandaic','Meetei Mayek','Mongolian','Myanmar UI','NKo','New Tai Lue','Ogham','Ol Chiki','Old Italic','Old Persian',
50-
'Old South Arabian','Old Turkic','Oriya','Oriya UI','Osmanya','Phags Pa','Phoenician','Rejang','Runic','Samaritan',
51-
'Saurashtra','Shavian','Sundanese','Syloti Nagri','Symbols','Syriac Eastern','Syriac Estrangela','Syriac Western',
52-
'Tagalog','Tagbanwa','Tai Le','Tai Tham','Tai Viet','Tamil UI','Telugu UI','Thaana','Thai UI','Tifinagh','Ugaritic','Vai','Yi',
45+
'Bengali UI','Devanagari UI','Khmer UI','Lao UI','Malayalam UI','Myanmar UI','Symbols','Tamil UI','Telugu UI','Thai UI',
5346
// 9+
54-
'Ahom','Anatolian Hieroglyphs','Bassa Vah','Bhaiksuki','Chakma','Elbasan','Hatran','Linear A','Manichaean','Marchen',
55-
'Meroitic','Miao','Mro','Multani','Nabataean','Newa','Old North Arabian','Old Permic','Osage','Pahawh Hmong','Palmyrene',
56-
'Pau Cin Hau','Sharada','Sinhala UI','Sora Sompeng',
47+
'Adlam','Ahom','Anatolian Hieroglyphs','Avestan','Balinese','Bamum','Bassa Vah','Batak','Bhaiksuki','Brahmi','Buginese','Buhid',
48+
'Canadian Aboriginal','Carian','Chakma','Cham','Cherokee','Coptic','Cuneiform','Cypriot','Deseret','Egyptian Hieroglyphs',
49+
'Elbasan','Glagolitic','Gothic','Gujarati UI','Gurmukhi UI','Hanunoo','Hatran','Imperial Aramaic','Inscriptional Pahlavi',
50+
'Inscriptional Parthian','Javanese','Kaithi','Kayah Li','Kharoshthi','Lepcha','Limbu','Linear A','Linear B','Lisu','Lycian',
51+
'Lydian','Mandaic','Manichaean','Marchen','Meetei Mayek','Meroitic','Miao','Mongolian','Mro','Multani','Nabataean','Newa',
52+
'New Tai Lue','NKo','Ogham','Ol Chiki','Old Italic','Old North Arabian','Old Permic','Old Persian','Old South Arabian',
53+
'Old Turkic','Oriya','Oriya UI','Osage','Osmanya','Pahawh Hmong','Palmyrene','Pau Cin Hau','Phags Pa','Phoenician','Rejang',
54+
'Runic','Samaritan','Saurashtra','Sharada','Shavian','Sinhala UI','Sora Sompeng','Sundanese','Syloti Nagri','Syriac Eastern',
55+
'Syriac Estrangela','Syriac Western','Tagalog','Tagbanwa','Tai Le','Tai Tham','Tai Viet','Thaana','Tifinagh','Ugaritic','Vai','Yi',
5756
// 12+
5857
'Grantha','Gunjala Gondi','Hanifi Rohingya','Khojki','Masaram Gondi','Medefaidrin','Modi','Soyombo','Takri','Wancho','Warang Citi',
5958
],
6059
'notoserif': [
61-
'Italic', // 5+
6260
'Dogra','Nyiakeng Puachue Hmong','Yezidi', // 12+
6361
],
6462
},
@@ -260,8 +258,10 @@ let fntMaster = {
260258
'system': {
261259
'android': [
262260
// all
263-
'AndroidClock Regular','Dancing Script','Droid Sans Mono','Carrois Gothic SC','Coming Soon','Cutive Mono',
264-
'Noto Color Emoji','Noto Naskh Arabic','Noto Naskh Arabic UI','Roboto',
261+
'AndroidClock Regular','Carrois Gothic SC','Cutive Mono','Dancing Script','Droid Sans Mono',
262+
'Noto Color Emoji','Noto Naskh Arabic', // ignore 'Coming Soon Regular', see 'Coming Soon'
263+
// 9+
264+
'Coming Soon','Noto Naskh Arabic UI','Roboto',
265265
// 12+
266266
'Noto Color Emoji Flags','Source Sans Pro Regular',
267267
// + common + self
@@ -446,6 +446,7 @@ function set_fntList(os = isOS) {
446446
'serif'
447447
]
448448
} else if ("android" == os) {
449+
// see android list notes: Roboto is not guaranteed unless Android 9+
449450
if (!isFontSizesMore) {isPlatformFont = "Roboto"}
450451
fntString = '?-'+ tofu
451452
}

0 commit comments

Comments
 (0)