From e1c9b4bac6b16781cc8b4767f6c84a8de5caecbc Mon Sep 17 00:00:00 2001
From: "karlt+%karlt.net"
 <karlt+%karlt.net@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 29 Jan 2008 10:00:57 +0000
Subject: [PATCH] Include Western fonts explicitly in Unix CJK preferred fonts.
 b=401988 (but resolves the issue in bug 339513) r=pavlov

git-svn-id: svn://10.0.0.236/trunk@244329 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/modules/libpref/src/init/all.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/mozilla/modules/libpref/src/init/all.js b/mozilla/modules/libpref/src/init/all.js
index fdf83a7f7c3..266d7517851 100644
--- a/mozilla/modules/libpref/src/init/all.js
+++ b/mozilla/modules/libpref/src/init/all.js
@@ -2155,6 +2155,10 @@ pref("font.name.monospace.he", "monospace");
 pref("font.name.serif.ja", "serif");
 pref("font.name.sans-serif.ja", "sans-serif");
 pref("font.name.monospace.ja", "monospace");
+// Include Latin fonts explicitly for bug 339513
+pref("font.name-list.sans-serif.ja", "Bitstream Vera Sans, DejaVu Sans, Verdana");
+pref("font.name-list.serif.ja", "Bitstream Vera Serif, DejaVu Serif, Times New Roman");
+pref("font.name-list.monospace.ja", "Bitstream Vera Sans Mono, DejaVu Sans Mono, Andale Mono");
 
 pref("font.name.serif.ko", "serif");
 pref("font.name.sans-serif.ko", "sans-serif");
@@ -2193,12 +2197,18 @@ pref("font.name.monospace.x-western", "monospace");
 pref("font.name.serif.zh-CN", "serif");
 pref("font.name.sans-serif.zh-CN", "sans-serif");
 pref("font.name.monospace.zh-CN", "monospace");
+pref("font.name-list.sans-serif.zh-CN", "Bitstream Vera Sans, DejaVu Sans, Verdana");
+pref("font.name-list.serif.zh-CN", "Bitstream Vera Serif, DejaVu Serif, Times New Roman");
+pref("font.name-list.monospace.zh-CN", "Bitstream Vera Sans Mono, DejaVu Sans Mono, Andale Mono");
 
 // ming_uni.ttf (HKSCS-2001) 
 // http://www.info.gov.hk/digital21/eng/hkscs/download/uime.exe
 pref("font.name.serif.zh-HK", "serif");
 pref("font.name.sans-serif.zh-HK", "sans-serif");
 pref("font.name.monospace.zh-HK", "monospace");
+pref("font.name-list.sans-serif.zh-HK", "Bitstream Vera Sans, DejaVu Sans, Verdana");
+pref("font.name-list.serif.zh-HK", "Bitstream Vera Serif, DejaVu Serif, Times New Roman");
+pref("font.name-list.monospace.zh-HK", "Bitstream Vera Sans Mono, DejaVu Sans Mono, Andale Mono");
 
 // zh-TW