@@ -130,8 +130,7 @@ let fntMaster = {
130
130
blocklist : {
131
131
android : [ ] ,
132
132
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
135
134
'Cantarell' , 'DejaVu Sans' , 'DejaVu Serif' , 'Droid Sans' , 'STIX' , // fedora
136
135
'Dingbats' , 'FreeMono' , 'Ubuntu' , // ubuntu
137
136
'Liberation Mono' , 'Liberation Sans' , 'Liberation Serif' , // popular
@@ -510,12 +509,12 @@ function set_fntList() {
510
509
} else if ( isTB ) {
511
510
// TB #42494
512
511
// 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
519
518
}
520
519
521
520
// desktop TB
@@ -586,7 +585,7 @@ function set_fntList() {
586
585
if ( 'android' == isOS ) {
587
586
fntBtn = fntBtnAll
588
587
} else if ( isTB ) {
589
- if ( 'linux' == isOS ) {
588
+ if ( 'linux' == isOS && isVer < 128 ) {
590
589
fntBtn = fntBtnBundled + ' + ' + fntBtnUnexpected + ' = ' + fntBtnAll
591
590
} else {
592
591
fntBtn = fntBtnSystem + ' + ' + fntBtnBundled + ' = ' + fntBtnBase + ' + ' + fntBtnUnexpected + ' = ' + fntBtnAll
0 commit comments