Skip to content

Commit dd23fc1

Browse files
TB14 linux aliases
1 parent d9571d1 commit dd23fc1

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

js/fonts.js

+8-9
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,7 @@ let fntMaster = {
130130
blocklist: {
131131
android: [],
132132
linux: [
133-
'Arial','Courier New','Times New Roman', // aliases
134-
'Courier','Noto Color Emoji','Noto Emoji','Noto Mono','Noto Sans','Noto Serif', // notos
133+
'Noto Color Emoji','Noto Emoji','Noto Mono','Noto Sans','Noto Serif', // notos
135134
'Cantarell','DejaVu Sans','DejaVu Serif','Droid Sans','STIX', // fedora
136135
'Dingbats','FreeMono','Ubuntu', // ubuntu
137136
'Liberation Mono','Liberation Sans','Liberation Serif', // popular
@@ -510,12 +509,12 @@ function set_fntList() {
510509
} else if (isTB) {
511510
// TB #42494
512511
// ToDo: when min Smart is 128, just hardcode into allowlist
513-
if ('mac' == isOS) {
514-
if (isVer > 115) {
515-
fntMaster.allowlist.mac.push('Arial Black','Arial Narrow')
516-
} else {
517-
fntMaster.blocklist.mac.push('Arial Black','Arial Narrow')
518-
}
512+
if (isVer > 115) {
513+
fntMaster.allowlist.mac.push('Arial Black','Arial Narrow')
514+
fntMaster.allowlist.linux.push('Arial','Courier','Courier New','Helvetica','Times','Times New Roman')
515+
} else {
516+
fntMaster.blocklist.mac.push('Arial Black','Arial Narrow')
517+
fntMaster.blocklist.linux.push('Arial','Courier','Courier New','Helvetica','Times','Times New Roman') // aliases
519518
}
520519

521520
// desktop TB
@@ -586,7 +585,7 @@ function set_fntList() {
586585
if ('android' == isOS) {
587586
fntBtn = fntBtnAll
588587
} else if (isTB) {
589-
if ('linux' == isOS) {
588+
if ('linux' == isOS && isVer < 128) {
590589
fntBtn = fntBtnBundled +' + '+ fntBtnUnexpected +' = '+ fntBtnAll
591590
} else {
592591
fntBtn = fntBtnSystem +' + '+ fntBtnBundled +' = '+ fntBtnBase +' + '+ fntBtnUnexpected +' = '+ fntBtnAll

0 commit comments

Comments
 (0)