wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 213517 part 2 - Remove the x-user-def language group. r=jfkthame.

Browse Source
This commit is contained in:
Henri Sivonen 2014-01-02 09:18:20 +02:00
parent f0fad33dd2
commit 2fabf9a684
10 changed files with 6 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,7 +84,6 @@
<menuitem value="x-cans" label="&font.langGroup.canadian;"/>
<menuitem value="x-western" label="&font.langGroup.latin1;"/>
<menuitem value="x-unicode" label="&font.langGroup.unicode;"/>
<menuitem value="x-user-def" label="&font.langGroup.user-def;"/>
</menupopup>
</menulist>
</caption>

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

@ -36,7 +36,6 @@
<!ENTITY font.langGroup.el "Greek">
<!ENTITY font.langGroup.turkish "Turkish">
<!ENTITY font.langGroup.unicode "Other Languages">
<!ENTITY font.langGroup.user-def "User Defined">
<!ENTITY font.langGroup.thai "Thai">
<!ENTITY font.langGroup.hebrew "Hebrew">
<!ENTITY font.langGroup.arabic "Arabic">

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

@ -1996,9 +1996,6 @@ GK_ATOM(ko_xxx, "ko-xxx")
GK_ATOM(x_central_euro, "x-central-euro")
GK_ATOM(x_symbol, "x-symbol")
// referenced in all.js
GK_ATOM(x_user_def, "x-user-def")
// additional languages that have special case transformations
GK_ATOM(az, "az")
GK_ATOM(ba, "ba")

1
gfx/thebes/gfxFontconfigUtils.cpp
View File

@ -394,7 +394,6 @@ const MozLangGroupData MozLangGroups[] = {
{ nsGkAtoms::x_telu, "te" },
{ nsGkAtoms::x_tibt, "bo" },
{ nsGkAtoms::Unicode, 0 },
{ nsGkAtoms::x_user_def, 0 }
};
static bool

8
gfx/thebes/gfxOS2Fonts.cpp
View File

@ -507,15 +507,11 @@ gfxOS2FontGroup::gfxOS2FontGroup(const nsAString& aFamilies,
nsTArray<nsString> familyArray;
ForEachFont(FontCallback, &familyArray);
// To be able to easily search for glyphs in other fonts, append a few good
// replacement candidates to the list. The best ones are the Unicode fonts that
// are set up, and if the user was so clever to set up the User Defined fonts,
// then these are probable candidates, too.
// To be able to easily search for glyphs in other fonts, append the
// Unicode fonts as replacement candidates to the list.
nsString fontString;
gfxPlatform::GetPlatform()->GetPrefFonts(nsGkAtoms::Unicode, fontString, false);
ForEachFont(fontString, nsGkAtoms::Unicode, FontCallback, &familyArray);
gfxPlatform::GetPlatform()->GetPrefFonts(nsGkAtoms::x_user_def, fontString, false);
ForEachFont(fontString, nsGkAtoms::x_user_def, FontCallback, &familyArray);
// Should append some default font if there are no available fonts.
// Let's use Helv which should be available on any OS/2 system; if

1
gfx/thebes/gfxPlatform.cpp
View File

@ -272,7 +272,6 @@ static const char *gPrefLangNames[] = {
"x-sinh",
"x-tibt",
"x-unicode",
"x-user-def"
};
gfxPlatform::gfxPlatform()

7
gfx/thebes/gfxPlatform.h
View File

@ -91,13 +91,12 @@ enum eFontPrefLang {
eFontPrefLang_Sinhala = 28,
eFontPrefLang_Tibetan = 29,
eFontPrefLang_LangCount = 30, // except Others and UserDefined.
eFontPrefLang_LangCount = 30, // except Others.
eFontPrefLang_Others = 30, // x-unicode
eFontPrefLang_UserDefined = 31,
eFontPrefLang_CJKSet = 32, // special code for CJK set
eFontPrefLang_AllCount = 33
eFontPrefLang_CJKSet = 31, // special code for CJK set
eFontPrefLang_AllCount = 32
};
enum eCMSMode {

1
intl/locale/src/langGroups.properties
View File

@ -223,7 +223,6 @@ x-baltic=x-baltic
x-tamil=x-tamil
x-devanagari=x-devanagari
x-unicode=x-unicode
x-user-def=x-user-def
x-armn=x-armn
x-geor=x-geor
# These self-mappings are not necessary unless somebody use them to specify

2
intl/uconv/src/charsetData.properties
View File

@ -156,7 +156,7 @@ macintosh.LangGroup = x-western
x-mac-turkish.LangGroup = tr
x-mac-ukrainian.LangGroup = x-cyrillic
x-mac-romanian.LangGroup = x-central-euro
x-user-defined.LangGroup = x-user-def
x-user-defined.LangGroup = x-unicode
ks_c_5601-1987.LangGroup = ko
x-johab.LangGroup = ko
x-mac-hebrew.LangGroup = he

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

@ -2005,7 +2005,6 @@ pref("font.minimum-size.tr", 0);
pref("font.minimum-size.x-cans", 0);
pref("font.minimum-size.x-western", 0);
pref("font.minimum-size.x-unicode", 0);
pref("font.minimum-size.x-user-def", 0);
/*
* A value greater than zero enables font size inflation for
@ -3332,10 +3331,6 @@ pref("font.name.serif.x-unicode", "Charis SIL Compact");
pref("font.name.sans-serif.x-unicode", "Fira Sans OT");
pref("font.name.monospace.x-unicode", "Fira Mono OT");
pref("font.name.serif.x-user-def", "Charis SIL Compact");
pref("font.name.sans-serif.x-user-def", "Fira Sans OT");
pref("font.name.monospace.x-user-def", "Fira Mono OT");
pref("font.name.serif.x-western", "Charis SIL Compact");
pref("font.name.sans-serif.x-western", "Fira Sans OT");
pref("font.name.monospace.x-western", "Fira Mono OT");
@ -3417,12 +3412,6 @@ pref("font.name.monospace.x-unicode", "Droid Sans Mono");
pref("font.name-list.serif.x-unicode", "Droid Serif");
pref("font.name-list.sans-serif.x-unicode", "Clear Sans, Roboto, Droid Sans");
pref("font.name.serif.x-user-def", "Charis SIL Compact");
pref("font.name.sans-serif.x-user-def", "Clear Sans");
pref("font.name.monospace.x-user-def", "Droid Sans Mono");
pref("font.name-list.serif.x-user-def", "Droid Serif");
pref("font.name-list.sans-serif.x-user-def", "Clear Sans, Roboto, Droid Sans");
pref("font.name.serif.x-western", "Charis SIL Compact");
pref("font.name.sans-serif.x-western", "Clear Sans");
pref("font.name.monospace.x-western", "Droid Sans Mono");
@ -3499,10 +3488,6 @@ pref("font.default.x-unicode", "sans-serif");
pref("font.size.variable.x-unicode", 16);
pref("font.size.fixed.x-unicode", 12);
pref("font.default.x-user-def", "sans-serif");
pref("font.size.variable.x-user-def", 16);
pref("font.size.fixed.x-user-def", 12);
pref("font.default.x-western", "sans-serif");
pref("font.size.variable.x-western", 16);
pref("font.size.fixed.x-western", 12);
@ -3695,10 +3680,6 @@ pref("font.name.serif.x-unicode", "serif");
pref("font.name.sans-serif.x-unicode", "sans-serif");
pref("font.name.monospace.x-unicode", "monospace");
pref("font.name.serif.x-user-def", "serif");
pref("font.name.sans-serif.x-user-def", "sans-serif");
pref("font.name.monospace.x-user-def", "monospace");
pref("font.name.serif.x-western", "serif");
pref("font.name.sans-serif.x-western", "sans-serif");
pref("font.name.monospace.x-western", "monospace");
@ -3760,10 +3741,6 @@ pref("font.default.x-unicode", "serif");
pref("font.size.variable.x-unicode", 16);
pref("font.size.fixed.x-unicode", 12);
pref("font.default.x-user-def", "serif");
pref("font.size.variable.x-user-def", 16);
pref("font.size.fixed.x-user-def", 12);
pref("font.default.x-western", "serif");
pref("font.size.variable.x-western", 16);
pref("font.size.fixed.x-western", 12);