Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 750622 patch 2: merge x-central-euro with x-western, r=jfkthame

Browse Source
This commit is contained in:
Simon Montagu 2014-08-05 10:49:16 +03:00
parent 98c5fbd202
commit dc74a6b3cd
11 changed files with 46 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
browser/components/preferences/fonts.xul
View File

@ -48,7 +48,6 @@
<menuitem value="ar" label="&font.langGroup.arabic;"/>
<menuitem value="x-armn" label="&font.langGroup.armenian;"/>
<menuitem value="x-beng" label="&font.langGroup.bengali;"/>
<menuitem value="x-central-euro" label="&font.langGroup.latin2;"/>
<menuitem value="zh-CN" label="&font.langGroup.simpl-chinese;"/>
<menuitem value="zh-HK" label="&font.langGroup.trad-chinese-hk;"/>
<menuitem value="zh-TW" label="&font.langGroup.trad-chinese;"/>

1
browser/locales/en-US/chrome/browser/preferences/fonts.dtd
View File

@ -22,7 +22,6 @@
<!ENTITY monospace.accesskey "M">
<!ENTITY font.langGroup.latin1 "Western">
<!ENTITY font.langGroup.latin2 "Central European">
<!ENTITY font.langGroup.japanese "Japanese">
<!ENTITY font.langGroup.trad-chinese "Traditional Chinese (Taiwan)">
<!ENTITY font.langGroup.simpl-chinese "Simplified Chinese">

1
content/base/src/nsGkAtomList.h
View File

@ -2043,7 +2043,6 @@ GK_ATOM(x_tibt, "x-tibt")
// used in gfxGDIFontList.h
GK_ATOM(ko_xxx, "ko-xxx")
GK_ATOM(x_central_euro, "x-central-euro")
GK_ATOM(x_symbol, "x-symbol")
// additional languages that have special case transformations

6
dom/encoding/encodingsgroups.properties
View File

@ -24,12 +24,12 @@ ISO-8859-10=x-western
ISO-8859-13=x-western
ISO-8859-14=x-western
ISO-8859-15=x-western
ISO-8859-16=x-central-euro
ISO-8859-2=x-central-euro
ISO-8859-16=x-western
ISO-8859-2=x-western
KOI8-R=x-cyrillic
KOI8-U=x-cyrillic
Shift_JIS=ja
windows-1250=x-central-euro
windows-1250=x-western
windows-1251=x-cyrillic
windows-1252=x-western
windows-1253=el

1
gfx/thebes/gfxFontconfigUtils.cpp
View File

@ -380,7 +380,6 @@ struct MozLangGroupData {
const MozLangGroupData MozLangGroups[] = {
{ nsGkAtoms::x_western, "en" },
{ nsGkAtoms::x_central_euro, "pl" },
{ nsGkAtoms::x_cyrillic, "ru" },
{ nsGkAtoms::x_devanagari, "hi" },
{ nsGkAtoms::x_tamil, "ta" },

2
gfx/thebes/gfxGDIFontList.h
View File

@ -215,8 +215,6 @@ public:
bit = RUSSIAN_CHARSET;
} else if (aLangGroup == nsGkAtoms::th) {
bit = THAI_CHARSET;
} else if (aLangGroup == nsGkAtoms::x_central_euro) {
bit = EASTEUROPE_CHARSET;
} else if (aLangGroup == nsGkAtoms::x_symbol) {
bit = SYMBOL_CHARSET;
}

1
gfx/thebes/gfxPlatform.cpp
View File

@ -228,7 +228,6 @@ MemoryPressureObserver::Observe(nsISupports *aSubject,
// the order *must* match the order in eFontPrefLang
static const char *gPrefLangNames[] = {
"x-western",
"x-central-euro",
"ja",
"zh-TW",
"zh-CN",

59
gfx/thebes/gfxPlatform.h
View File

@ -74,38 +74,37 @@ extern cairo_user_data_key_t kDrawTarget;
enum eFontPrefLang {
eFontPrefLang_Western = 0,
eFontPrefLang_CentEuro = 1,
eFontPrefLang_Japanese = 2,
eFontPrefLang_ChineseTW = 3,
eFontPrefLang_ChineseCN = 4,
eFontPrefLang_ChineseHK = 5,
eFontPrefLang_Korean = 6,
eFontPrefLang_Cyrillic = 7,
eFontPrefLang_Greek = 8,
eFontPrefLang_Turkish = 9,
eFontPrefLang_Thai = 10,
eFontPrefLang_Hebrew = 11,
eFontPrefLang_Arabic = 12,
eFontPrefLang_Devanagari = 13,
eFontPrefLang_Tamil = 14,
eFontPrefLang_Armenian = 15,
eFontPrefLang_Bengali = 16,
eFontPrefLang_Canadian = 17,
eFontPrefLang_Ethiopic = 18,
eFontPrefLang_Georgian = 19,
eFontPrefLang_Gujarati = 20,
eFontPrefLang_Gurmukhi = 21,
eFontPrefLang_Khmer = 22,
eFontPrefLang_Malayalam = 23,
eFontPrefLang_Oriya = 24,
eFontPrefLang_Telugu = 25,
eFontPrefLang_Kannada = 26,
eFontPrefLang_Sinhala = 27,
eFontPrefLang_Tibetan = 28,
eFontPrefLang_Japanese = 1,
eFontPrefLang_ChineseTW = 2,
eFontPrefLang_ChineseCN = 3,
eFontPrefLang_ChineseHK = 4,
eFontPrefLang_Korean = 5,
eFontPrefLang_Cyrillic = 6,
eFontPrefLang_Greek = 7,
eFontPrefLang_Turkish = 8,
eFontPrefLang_Thai = 9,
eFontPrefLang_Hebrew = 10,
eFontPrefLang_Arabic = 11,
eFontPrefLang_Devanagari = 12,
eFontPrefLang_Tamil = 13,
eFontPrefLang_Armenian = 14,
eFontPrefLang_Bengali = 15,
eFontPrefLang_Canadian = 16,
eFontPrefLang_Ethiopic = 17,
eFontPrefLang_Georgian = 18,
eFontPrefLang_Gujarati = 19,
eFontPrefLang_Gurmukhi = 20,
eFontPrefLang_Khmer = 21,
eFontPrefLang_Malayalam = 22,
eFontPrefLang_Oriya = 23,
eFontPrefLang_Telugu = 24,
eFontPrefLang_Kannada = 25,
eFontPrefLang_Sinhala = 26,
eFontPrefLang_Tibetan = 27,
eFontPrefLang_Others = 29, // x-unicode
eFontPrefLang_Others = 28, // x-unicode
eFontPrefLang_CJKSet = 30 // special code for CJK set
eFontPrefLang_CJKSet = 29 // special code for CJK set
};
enum eCMSMode {

2
gfx/thebes/nsUnicodeRange.cpp
View File

@ -42,7 +42,7 @@ static nsIAtom **gUnicodeRangeToLangGroupAtomTable[] =
/**********************************************************************
* Unicode subranges as defined in unicode 3.0
* x-western, x-central-euro, tr -> latin
* x-western, tr -> latin
* 0000 - 036f
* 1e00 - 1eff
* 2000 - 206f (general punctuation)

28
intl/locale/langGroups.properties
View File

@ -28,21 +28,21 @@ bg=x-cyrillic
bn=x-beng
bo=x-tibt
br=x-western
bs=x-central-euro
bs=x-western
ca=x-western
ce=x-central-euro
ce=x-western
ch=x-western
co=x-western
cr=x-cans
cs=x-central-euro
csb=x-central-euro
cs=x-western
csb=x-western
#cu=x-cyrillic
cv=x-cyrillic
# XXX Latin Ext. A is also used for cy.
cy=x-western
da=x-western
de=x-western
dsb=x-central-euro
dsb=x-western
#dv=Thaanna
dz=x-tibt
#ee=x-western(?) (Ewe uses characters outside Latin-1 as well)
@ -74,10 +74,10 @@ haw=x-western
he=he
hi=x-devanagari
hil=x-western
hr=x-central-euro
hsb=x-central-euro
hr=x-western
hsb=x-western
ht=x-western
hu=x-central-euro
hu=x-western
hy=x-armn
ia=x-western
id=x-western
@ -126,7 +126,6 @@ nn=x-western
no=x-western
nr=x-western
nso=x-western
# XXX : x-central-euro may be better
nv=x-western
ny=x-western
oc=x-western
@ -139,13 +138,13 @@ os=x-cyrillic
pa-in=x-guru
pa-pk=ar
pa=x-guru
pl=x-central-euro
pl=x-western
ps=ar
pt=x-western
qu=x-western
rm=x-western
rn=x-western
ro=x-central-euro
ro=x-western
ru=x-cyrillic
rw=x-western
sa=x-devanagari
@ -153,10 +152,10 @@ sc=x-western
sd=ar
# African language (but related with French)
sg=x-western
sh=x-central-euro
sh=x-western
si=x-sinh
sk=x-central-euro
sl=x-central-euro
sk=x-western
sl=x-western
sm=x-western
so=x-western
son=x-western
@ -208,7 +207,6 @@ zu=x-western
#
# mapping mozilla's internal x-* to themselves (see bug 256257)
x-western=x-western
x-central-euro=x-central-euro
x-cyrillic=x-cyrillic
# el
# tr

39
modules/libpref/src/init/all.js
View File

@ -2240,11 +2240,6 @@ pref("font.minimum-size.tr", 0);
pref("font.size.variable.tr", 16);
pref("font.size.fixed.tr", 13);
pref("font.default.x-central-euro", "serif");
pref("font.minimum-size.x-central-euro", 0);
pref("font.size.variable.x-central-euro", 16);
pref("font.size.fixed.x-central-euro", 13);
pref("font.default.x-cyrillic", "serif");
pref("font.minimum-size.x-cyrillic", 0);
pref("font.size.variable.x-cyrillic", 16);
@ -2531,11 +2526,6 @@ pref("font.name.sans-serif.tr", "Arial");
pref("font.name.monospace.tr", "Courier New");
pref("font.name.cursive.tr", "Comic Sans MS");
pref("font.name.serif.x-central-euro", "Times New Roman");
pref("font.name.sans-serif.x-central-euro", "Arial");
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");
pref("font.name.monospace.x-cyrillic", "Courier New");
@ -2925,17 +2915,6 @@ pref("font.name-list.serif.x-cans", "Euphemia UCAS");
pref("font.name-list.sans-serif.x-cans", "Euphemia UCAS");
pref("font.name-list.monospace.x-cans", "Euphemia UCAS");
pref("font.name.serif.x-central-euro", "Times");
pref("font.name.sans-serif.x-central-euro", "Helvetica");
pref("font.name.monospace.x-central-euro", "Courier");
pref("font.name.cursive.x-central-euro", "Apple Chancery");
pref("font.name.fantasy.x-central-euro", "Papyrus");
pref("font.name-list.serif.x-central-euro", "Times");
pref("font.name-list.sans-serif.x-central-euro", "Helvetica");
pref("font.name-list.monospace.x-central-euro", "Courier");
pref("font.name-list.cursive.x-central-euro", "Apple Chancery");
pref("font.name-list.fantasy.x-central-euro", "Papyrus");
pref("font.name.serif.x-cyrillic", "Times");
pref("font.name.sans-serif.x-cyrillic", "Helvetica");
pref("font.name.monospace.x-cyrillic", "Monaco");
@ -3248,10 +3227,6 @@ pref("font.name.serif.tr", "Charis SIL Compact");
pref("font.name.sans-serif.tr", "Fira Sans");
pref("font.name.monospace.tr", "Fira Mono");
pref("font.name.serif.x-central-euro", "Charis SIL Compact");
pref("font.name.sans-serif.x-central-euro", "Fira Sans");
pref("font.name.monospace.x-central-euro", "Fira Mono");
pref("font.name.serif.x-cyrillic", "Charis SIL Compact");
pref("font.name.sans-serif.x-cyrillic", "Fira Sans");
pref("font.name.monospace.x-cyrillic", "Fira Mono");
@ -3318,12 +3293,6 @@ pref("font.name.monospace.tr", "Droid Sans Mono");
pref("font.name-list.serif.tr", "Droid Serif");
pref("font.name-list.sans-serif.tr", "Clear Sans, Roboto, Droid Sans");
pref("font.name.serif.x-central-euro", "Charis SIL Compact");
pref("font.name.sans-serif.x-central-euro", "Clear Sans");
pref("font.name.monospace.x-central-euro", "Droid Sans Mono");
pref("font.name-list.serif.x-central-euro", "Droid Serif");
pref("font.name-list.sans-serif.x-central-euro", "Clear Sans, Roboto, Droid Sans");
pref("font.name.serif.x-cyrillic", "Charis SIL Compact");
pref("font.name.sans-serif.x-cyrillic", "Clear Sans");
pref("font.name.monospace.x-cyrillic", "Droid Sans Mono");
@ -3379,9 +3348,6 @@ pref("font.minimum-size.th", 13);
pref("font.default.tr", "sans-serif");
pref("font.size.fixed.tr", 12);
pref("font.default.x-central-euro", "sans-serif");
pref("font.size.fixed.x-central-euro", 12);
pref("font.default.x-cyrillic", "sans-serif");
pref("font.size.fixed.x-cyrillic", 12);
@ -3495,11 +3461,6 @@ pref("font.name.sans-serif.tr", "sans-serif");
pref("font.name.monospace.tr", "monospace");
pref("font.size.fixed.tr", 12);
pref("font.name.serif.x-central-euro", "serif");
pref("font.name.sans-serif.x-central-euro", "sans-serif");
pref("font.name.monospace.x-central-euro", "monospace");
pref("font.size.fixed.x-central-euro", 12);
pref("font.name.serif.x-cyrillic", "serif");
pref("font.name.sans-serif.x-cyrillic", "sans-serif");
pref("font.name.monospace.x-cyrillic", "monospace");