Bug 1419277 - Set Songti TC/SC as default zh-{CN/HK/TW} font in release r=m_kato
authorTimothy Guan-tin Chien <timdream@gmail.com>
Tue, 21 Nov 2017 13:39:00 +0800
changeset 437447 fb7168d4da8c1d01d441ef355defb0fffb30c13c
parent 437446 8c69e6ae8e4a2bb693b8c9d37337b3b049ab92cf
child 437448 c5326ebf17f2735c9eda10b46b0ce1d6c1c6f7a0
push id117
push userfmarier@mozilla.com
push dateTue, 28 Nov 2017 20:17:16 +0000
reviewersm_kato
bugs1419277
milestone59.0a1
Bug 1419277 - Set Songti TC/SC as default zh-{CN/HK/TW} font in release r=m_kato MozReview-Commit-ID: 4TUNSFK0Fu9
modules/libpref/init/all.js
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -4148,39 +4148,27 @@ pref("font.name-list.cursive.x-unicode",
 pref("font.name-list.fantasy.x-unicode", "Papyrus");
 
 pref("font.name-list.serif.x-western", "Times, Times New Roman");
 pref("font.name-list.sans-serif.x-western", "Helvetica, Arial");
 pref("font.name-list.monospace.x-western", "Courier, Courier New");
 pref("font.name-list.cursive.x-western", "Apple Chancery");
 pref("font.name-list.fantasy.x-western", "Papyrus");
 
-#ifdef EARLY_BETA_OR_EARLIER
 pref("font.name-list.serif.zh-CN", "Times, Songti SC, STSong, Heiti SC");
-#else
-pref("font.name-list.serif.zh-CN", "Times, STSong, Heiti SC");
-#endif
 pref("font.name-list.sans-serif.zh-CN", "Helvetica, PingFang SC, STHeiti, Heiti SC");
 pref("font.name-list.monospace.zh-CN", "Courier, PingFang SC, STHeiti, Heiti SC");
 pref("font.name-list.cursive.zh-CN", "Kaiti SC");
 
-#ifdef EARLY_BETA_OR_EARLIER
 pref("font.name-list.serif.zh-TW", "Times, Songti TC, LiSong Pro, Heiti TC");
-#else
-pref("font.name-list.serif.zh-TW", "Times, LiSong Pro, Heiti TC");
-#endif
 pref("font.name-list.sans-serif.zh-TW", "Helvetica, PingFang TC, Heiti TC, LiHei Pro");
 pref("font.name-list.monospace.zh-TW", "Courier, PingFang TC, Heiti TC, LiHei Pro");
 pref("font.name-list.cursive.zh-TW", "Kaiti TC");
 
-#ifdef EARLY_BETA_OR_EARLIER
 pref("font.name-list.serif.zh-HK", "Times, Songti TC, LiSong Pro, Heiti TC");
-#else
-pref("font.name-list.serif.zh-HK", "Times, LiSong Pro, Heiti TC");
-#endif
 pref("font.name-list.sans-serif.zh-HK", "Helvetica, PingFang TC, Heiti TC, LiHei Pro");
 pref("font.name-list.monospace.zh-HK", "Courier, PingFang TC, Heiti TC, LiHei Pro");
 pref("font.name-list.cursive.zh-HK", "Kaiti TC");
 
 // XP_MACOSX changes to default font sizes
 pref("font.minimum-size.th", 10);
 
 // Apple's Symbol is Unicode so use it