Bug 423582 - Switch Mac (CJK) font prefs to the canonical font names. r=jdaggett, sr=roc, a1.9=beltzner
authoralqahira@ardisson.org
Tue, 08 Apr 2008 17:22:52 -0700
changeset 14090 420615df0fe7b8d98b0d4a5dde00260c38efcd3f
parent 14089 79dcacfabb5de59158bf85d5cf0b42a2130b8c4e
child 14091 041986eb98746008ff068d3519cbd886496b709e
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjdaggett, roc
bugs423582
milestone1.9pre
Bug 423582 - Switch Mac (CJK) font prefs to the canonical font names. r=jdaggett, sr=roc, a1.9=beltzner
modules/libpref/src/init/all.js
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -1510,17 +1510,20 @@ pref("intl.keyboard.per_window_layout", 
 #endif
 
 #ifdef XP_MACOSX
 // Mac specific preference defaults
 pref("browser.drag_out_of_frame_style", 1);
 pref("ui.key.saveLink.shift", false); // true = shift, false = meta
 pref("ui.click_hold_context_menus", false);
 
-// default font name (in UTF8)
+// default fonts (in UTF8 and using canonical names)
+// to determine canonical font names, use a debug build and 
+// enable NSPR logging for module fontInfoLog:5
+// canonical names immediately follow '(fontinit) family:' in the log
 
 pref("font.name.serif.ar", "Al Bayan");
 pref("font.name.sans-serif.ar", "Geeza Pro");
 pref("font.name.monospace.ar", "Geeza Pro");
 pref("font.name.cursive.ar", "DecoType Naskh");
 pref("font.name.fantasy.ar", "KufiStandardGK");
 pref("font.name-list.serif.ar", "Al Bayan");
 pref("font.name-list.sans-serif.ar", "Geeza Pro");
@@ -1545,22 +1548,22 @@ pref("font.name.monospace.he", "Arial He
 pref("font.name.cursive.he", "Corsiva Hebrew");
 pref("font.name.fantasy.he", "Corsiva Hebrew");
 pref("font.name-list.serif.he", "Raanana");
 pref("font.name-list.sans-serif.he", "Arial Hebrew");
 pref("font.name-list.monospace.he", "Arial Hebrew");
 pref("font.name-list.cursive.he", "Corsiva Hebrew");
 pref("font.name-list.fantasy.he", "Corsiva Hebrew");
 
-pref("font.name.serif.ja", "ヒラギノ明朝 Pro"); 
-pref("font.name.sans-serif.ja", "ヒラギノ角ゴ Pro"); 
-pref("font.name.monospace.ja", "Osaka−等幅"); 
-pref("font.name-list.serif.ja", "ヒラギノ明朝 Pro"); 
-pref("font.name-list.sans-serif.ja", "ヒラギノ角ゴ Pro"); 
-pref("font.name-list.monospace.ja", "Osaka−等幅"); 
+pref("font.name.serif.ja", "Hiragino Mincho Pro"); 
+pref("font.name.sans-serif.ja", "Hiragino Kaku Gothic Pro"); 
+pref("font.name.monospace.ja", "Osaka-Mono"); 
+pref("font.name-list.serif.ja", "Hiragino Mincho Pro"); 
+pref("font.name-list.sans-serif.ja", "Hiragino Kaku Gothic Pro"); 
+pref("font.name-list.monospace.ja", "Osaka-Mono"); 
 
 pref("font.name.serif.ko", "AppleMyungjo"); 
 pref("font.name.sans-serif.ko", "AppleGothic"); 
 pref("font.name.monospace.ko", "AppleGothic"); 
 pref("font.name-list.serif.ko", "AppleMyungjo"); 
 pref("font.name-list.sans-serif.ko", "AppleGothic"); 
 pref("font.name-list.monospace.ko", "AppleGothic"); 
 
@@ -1723,36 +1726,36 @@ pref("font.name.monospace.x-western", "C
 pref("font.name.cursive.x-western", "Apple Chancery");
 pref("font.name.fantasy.x-western", "Papyrus");
 pref("font.name-list.serif.x-western", "Times");
 pref("font.name-list.sans-serif.x-western", "Helvetica");
 pref("font.name-list.monospace.x-western", "Courier");
 pref("font.name-list.cursive.x-western", "Apple Chancery");
 pref("font.name-list.fantasy.x-western", "Papyrus");
 
-pref("font.name.serif.zh-CN", "华文宋体");
+pref("font.name.serif.zh-CN", "STSong");
 pref("font.name.sans-serif.zh-CN", "STHeiti");
 pref("font.name.monospace.zh-CN", "STHeiti");
-pref("font.name-list.serif.zh-CN", "华文宋体");
+pref("font.name-list.serif.zh-CN", "STSong");
 pref("font.name-list.sans-serif.zh-CN", "STHeiti");
 pref("font.name-list.monospace.zh-CN", "STHeiti");
 
 pref("font.name.serif.zh-TW", "Apple LiSung"); 
 pref("font.name.sans-serif.zh-TW", "Apple LiGothic");  
 pref("font.name.monospace.zh-TW", "Apple LiGothic");  
 pref("font.name-list.serif.zh-TW", "Apple LiSung"); 
 pref("font.name-list.sans-serif.zh-TW", "Apple LiGothic");  
 pref("font.name-list.monospace.zh-TW", "Apple LiGothic");  
 
-pref("font.name.serif.zh-HK", "儷宋 Pro");
-pref("font.name.sans-serif.zh-HK", "儷黑 Pro");
-pref("font.name.monospace.zh-HK", "儷黑 Pro");
-pref("font.name-list.serif.zh-HK", "儷宋 Pro");
-pref("font.name-list.sans-serif.zh-HK", "儷黑 Pro");
-pref("font.name-list.monospace.zh-HK", "儷黑 Pro");
+pref("font.name.serif.zh-HK", "LiSong Pro");
+pref("font.name.sans-serif.zh-HK", "LiHei Pro");
+pref("font.name.monospace.zh-HK", "LiHei Pro");
+pref("font.name-list.serif.zh-HK", "LiSong Pro");
+pref("font.name-list.sans-serif.zh-HK", "LiHei Pro");
+pref("font.name-list.monospace.zh-HK", "LiHei Pro");
 
 pref("font.default.ar", "sans-serif");
 pref("font.size.variable.ar", 16);
 pref("font.size.fixed.ar", 13);
 
 pref("font.default.el", "serif");
 pref("font.size.variable.el", 16);
 pref("font.size.fixed.el", 13);