зеркало из https://github.com/mozilla/gecko-dev.git
b=503138; choose different default sans-serif font for Windows CE; r=jdaggett
This commit is contained in:
Родитель
cab646a652
Коммит
b30edd4221
|
@ -1212,23 +1212,32 @@ pref("font.minimum-size.x-unicode", 0);
|
|||
pref("font.minimum-size.x-user-def", 0);
|
||||
|
||||
#ifdef XP_WIN
|
||||
|
||||
// On Windows CE, Arial sometimes isn't available;
|
||||
// so we'll use Tahoma instead
|
||||
#ifdef WINCE
|
||||
#define WINDOWS_SANS_SERIF_FONT "Tahoma"
|
||||
#else
|
||||
#define WINDOWS_SANS_SERIF_FONT "Arial"
|
||||
#endif
|
||||
|
||||
pref("font.name.serif.ar", "Times New Roman");
|
||||
pref("font.name.sans-serif.ar", "Arial");
|
||||
#expand pref("font.name.sans-serif.ar", __WINDOWS_SANS_SERIF_FONT__);
|
||||
pref("font.name.monospace.ar", "Courier New");
|
||||
pref("font.name.cursive.ar", "Comic Sans MS");
|
||||
|
||||
pref("font.name.serif.el", "Times New Roman");
|
||||
pref("font.name.sans-serif.el", "Arial");
|
||||
#expand pref("font.name.sans-serif.el", __WINDOWS_SANS_SERIF_FONT__);
|
||||
pref("font.name.monospace.el", "Courier New");
|
||||
pref("font.name.cursive.el", "Comic Sans MS");
|
||||
|
||||
pref("font.name.serif.he", "Narkisim");
|
||||
pref("font.name.sans-serif.he", "Arial");
|
||||
#expand pref("font.name.sans-serif.he", __WINDOWS_SANS_SERIF_FONT__);
|
||||
pref("font.name.monospace.he", "Fixed Miriam Transparent");
|
||||
pref("font.name.cursive.he", "Guttman Yad");
|
||||
pref("font.name-list.serif.he", "Narkisim, David");
|
||||
pref("font.name-list.monospace.he", "Fixed Miriam Transparent, Miriam Fixed, Rod, Courier New");
|
||||
pref("font.name-list.cursive.he", "Guttman Yad, Ktav, Arial");
|
||||
#expand pref("font.name-list.cursive.he", "Guttman Yad, Ktav, " __WINDOWS_SANS_SERIF_FONT__);
|
||||
|
||||
pref("font.name.serif.ja", "MS P明朝"); // "MS PMincho"
|
||||
pref("font.name.sans-serif.ja", "MS Pゴシック"); // "MS PGothic"
|
||||
|
@ -1253,32 +1262,32 @@ pref("font.name.monospace.th", "Tahoma");
|
|||
pref("font.name.cursive.th", "Tahoma");
|
||||
|
||||
pref("font.name.serif.tr", "Times New Roman");
|
||||
pref("font.name.sans-serif.tr", "Arial");
|
||||
#expand pref("font.name.sans-serif.tr", __WINDOWS_SANS_SERIF_FONT__);
|
||||
pref("font.name.monospace.tr", "Courier New");
|
||||
pref("font.name.cursive.tr", "Comic Sans MS");
|
||||
|
||||
pref("font.name.serif.x-baltic", "Times New Roman");
|
||||
pref("font.name.sans-serif.x-baltic", "Arial");
|
||||
#expand pref("font.name.sans-serif.x-baltic", __WINDOWS_SANS_SERIF_FONT__);
|
||||
pref("font.name.monospace.x-baltic", "Courier New");
|
||||
pref("font.name.cursive.x-baltic", "Comic Sans MS");
|
||||
|
||||
pref("font.name.serif.x-central-euro", "Times New Roman");
|
||||
pref("font.name.sans-serif.x-central-euro", "Arial");
|
||||
#expand pref("font.name.sans-serif.x-central-euro", __WINDOWS_SANS_SERIF_FONT__);
|
||||
pref("font.name.monospace.x-central-euro", "Courier New");
|
||||
pref("font.name.cursive.x-central-euro", "Comic Sans MS");
|
||||
|
||||
pref("font.name.serif.x-cyrillic", "Times New Roman");
|
||||
pref("font.name.sans-serif.x-cyrillic", "Arial");
|
||||
#expand pref("font.name.sans-serif.x-cyrillic", __WINDOWS_SANS_SERIF_FONT__);
|
||||
pref("font.name.monospace.x-cyrillic", "Courier New");
|
||||
pref("font.name.cursive.x-cyrillic", "Comic Sans MS");
|
||||
|
||||
pref("font.name.serif.x-unicode", "Times New Roman");
|
||||
pref("font.name.sans-serif.x-unicode", "Arial");
|
||||
#expand pref("font.name.sans-serif.x-unicode", __WINDOWS_SANS_SERIF_FONT__);
|
||||
pref("font.name.monospace.x-unicode", "Courier New");
|
||||
pref("font.name.cursive.x-unicode", "Comic Sans MS");
|
||||
|
||||
pref("font.name.serif.x-western", "Times New Roman");
|
||||
pref("font.name.sans-serif.x-western", "Arial");
|
||||
#expand pref("font.name.sans-serif.x-western", __WINDOWS_SANS_SERIF_FONT__);
|
||||
pref("font.name.monospace.x-western", "Courier New");
|
||||
pref("font.name.cursive.x-western", "Comic Sans MS");
|
||||
|
||||
|
@ -1292,7 +1301,7 @@ pref("font.name-list.monospace.zh-CN", "MS Song, SimSun");
|
|||
// Per Taiwanese users' demand. They don't want to use TC fonts for
|
||||
// rendering Latin letters. (bug 88579)
|
||||
pref("font.name.serif.zh-TW", "Times New Roman");
|
||||
pref("font.name.sans-serif.zh-TW", "Arial");
|
||||
#expand pref("font.name.sans-serif.zh-TW", __WINDOWS_SANS_SERIF_FONT__);
|
||||
pref("font.name.monospace.zh-TW", "細明體"); // MingLiU
|
||||
pref("font.name-list.serif.zh-TW", "PMingLiu, MingLiU");
|
||||
pref("font.name-list.sans-serif.zh-TW", "PMingLiU, MingLiU");
|
||||
|
@ -1301,7 +1310,7 @@ pref("font.name-list.monospace.zh-TW", "MingLiU");
|
|||
// hkscsm3u.ttf (HKSCS-2001) : http://www.microsoft.com/hk/hkscs
|
||||
// Hong Kong users have the same demand about glyphs for Latin letters (bug 88579)
|
||||
pref("font.name.serif.zh-HK", "Times New Roman");
|
||||
pref("font.name.sans-serif.zh-HK", "Arial");
|
||||
#expand pref("font.name.sans-serif.zh-HK", __WINDOWS_SANS_SERIF_FONT__);
|
||||
pref("font.name.monospace.zh-HK", "細明體_HKSCS");
|
||||
pref("font.name-list.serif.zh-HK", "MingLiu_HKSCS, Ming(for ISO10646), MingLiU");
|
||||
pref("font.name-list.sans-serif.zh-HK", "MingLiU_HKSCS, Ming(for ISO10646), MingLiU");
|
||||
|
|
Загрузка…
Ссылка в новой задаче