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 756022 patch 3: merge tr with x-western, r=jfkthame

Browse Source
This commit is contained in:
Simon Montagu 2014-08-05 10:49:16 +03:00
parent 53a4b70e1c
commit 81b3155ed0
10 changed files with 52 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,7 +70,6 @@
<menuitem value="x-telu" label="&font.langGroup.telugu;"/>
<menuitem value="th" label="&font.langGroup.thai;"/>
<menuitem value="x-tibt" label="&font.langGroup.tibetan;"/>
<menuitem value="tr" label="&font.langGroup.turkish;"/>
<menuitem value="x-cans" label="&font.langGroup.canadian;"/>
<menuitem value="x-western" label="&font.langGroup.latin1;"/>
<menuitem value="x-unicode" label="&font.langGroup.unicode;"/>

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

@ -29,7 +29,6 @@
<!ENTITY font.langGroup.korean "Korean">
<!ENTITY font.langGroup.cyrillic "Cyrillic">
<!ENTITY font.langGroup.el "Greek">
<!ENTITY font.langGroup.turkish "Turkish">
<!ENTITY font.langGroup.unicode "Other Languages">
<!ENTITY font.langGroup.thai "Thai">
<!ENTITY font.langGroup.hebrew "Hebrew">

2
dom/encoding/encodingsgroups.properties
View File

@ -33,7 +33,7 @@ windows-1250=x-western
windows-1251=x-cyrillic
windows-1252=x-western
windows-1253=el
windows-1254=tr
windows-1254=x-western
windows-1255=he
windows-1256=ar
windows-1257=x-western

2
gfx/thebes/gfxGDIFontList.h
View File

@ -205,8 +205,6 @@ public:
bit = CHINESEBIG5_CHARSET;
} else if (aLangGroup == nsGkAtoms::el_) {
bit = GREEK_CHARSET;
} else if (aLangGroup == nsGkAtoms::tr) {
bit = TURKISH_CHARSET;
} else if (aLangGroup == nsGkAtoms::he) {
bit = HEBREW_CHARSET;
} else if (aLangGroup == nsGkAtoms::ar) {

2
gfx/thebes/gfxPlatform.cpp
View File

@ -235,7 +235,6 @@ static const char *gPrefLangNames[] = {
"ko",
"x-cyrillic",
"el",
"tr",
"th",
"he",
"ar",
@ -1239,7 +1238,6 @@ gfxPlatform::GetFontPrefLangFor(uint8_t aUnicodeRange)
case kRangeSetLatin: return eFontPrefLang_Western;
case kRangeCyrillic: return eFontPrefLang_Cyrillic;
case kRangeGreek: return eFontPrefLang_Greek;
case kRangeTurkish: return eFontPrefLang_Turkish;
case kRangeHebrew: return eFontPrefLang_Hebrew;
case kRangeArabic: return eFontPrefLang_Arabic;
case kRangeThai: return eFontPrefLang_Thai;

43
gfx/thebes/gfxPlatform.h
View File

@ -81,30 +81,29 @@ enum eFontPrefLang {
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_Thai = 8,
eFontPrefLang_Hebrew = 9,
eFontPrefLang_Arabic = 10,
eFontPrefLang_Devanagari = 11,
eFontPrefLang_Tamil = 12,
eFontPrefLang_Armenian = 13,
eFontPrefLang_Bengali = 14,
eFontPrefLang_Canadian = 15,
eFontPrefLang_Ethiopic = 16,
eFontPrefLang_Georgian = 17,
eFontPrefLang_Gujarati = 18,
eFontPrefLang_Gurmukhi = 19,
eFontPrefLang_Khmer = 20,
eFontPrefLang_Malayalam = 21,
eFontPrefLang_Oriya = 22,
eFontPrefLang_Telugu = 23,
eFontPrefLang_Kannada = 24,
eFontPrefLang_Sinhala = 25,
eFontPrefLang_Tibetan = 26,
eFontPrefLang_Others = 28, // x-unicode
eFontPrefLang_Others = 27, // x-unicode
eFontPrefLang_CJKSet = 29 // special code for CJK set
eFontPrefLang_CJKSet = 28 // special code for CJK set
};
enum eCMSMode {

5
gfx/thebes/nsUnicodeRange.cpp
View File

@ -14,7 +14,6 @@ static nsIAtom **gUnicodeRangeToLangGroupAtomTable[] =
{
&nsGkAtoms::x_cyrillic,
&nsGkAtoms::el_,
&nsGkAtoms::tr,
&nsGkAtoms::he,
&nsGkAtoms::ar,
&nsGkAtoms::th,
@ -42,8 +41,8 @@ static nsIAtom **gUnicodeRangeToLangGroupAtomTable[] =
/**********************************************************************
* Unicode subranges as defined in unicode 3.0
* x-western, tr -> latin
* 0000 - 036f
* x-western -> latin
* 0000 - 036f
* 1e00 - 1eff
* 2000 - 206f (general punctuation)
* 20a0 - 20cf (currency symbols)

51
gfx/thebes/nsUnicodeRange.h
View File

@ -16,34 +16,33 @@ class nsIAtom;
// frequently used range definitions
const uint8_t kRangeCyrillic = 0;
const uint8_t kRangeGreek = 1;
const uint8_t kRangeTurkish = 2;
const uint8_t kRangeHebrew = 3;
const uint8_t kRangeArabic = 4;
const uint8_t kRangeThai = 5;
const uint8_t kRangeKorean = 6;
const uint8_t kRangeJapanese = 7;
const uint8_t kRangeSChinese = 8;
const uint8_t kRangeTChinese = 9;
const uint8_t kRangeDevanagari = 10;
const uint8_t kRangeTamil = 11;
const uint8_t kRangeArmenian = 12;
const uint8_t kRangeBengali = 13;
const uint8_t kRangeCanadian = 14;
const uint8_t kRangeEthiopic = 15;
const uint8_t kRangeGeorgian = 16;
const uint8_t kRangeGujarati = 17;
const uint8_t kRangeGurmukhi = 18;
const uint8_t kRangeKhmer = 19;
const uint8_t kRangeMalayalam = 20;
const uint8_t kRangeOriya = 21;
const uint8_t kRangeTelugu = 22;
const uint8_t kRangeKannada = 23;
const uint8_t kRangeSinhala = 24;
const uint8_t kRangeTibetan = 25;
const uint8_t kRangeHebrew = 2;
const uint8_t kRangeArabic = 3;
const uint8_t kRangeThai = 4;
const uint8_t kRangeKorean = 5;
const uint8_t kRangeJapanese = 6;
const uint8_t kRangeSChinese = 7;
const uint8_t kRangeTChinese = 8;
const uint8_t kRangeDevanagari = 9;
const uint8_t kRangeTamil = 10;
const uint8_t kRangeArmenian = 11;
const uint8_t kRangeBengali = 12;
const uint8_t kRangeCanadian = 13;
const uint8_t kRangeEthiopic = 14;
const uint8_t kRangeGeorgian = 15;
const uint8_t kRangeGujarati = 16;
const uint8_t kRangeGurmukhi = 17;
const uint8_t kRangeKhmer = 18;
const uint8_t kRangeMalayalam = 19;
const uint8_t kRangeOriya = 20;
const uint8_t kRangeTelugu = 21;
const uint8_t kRangeKannada = 22;
const uint8_t kRangeSinhala = 23;
const uint8_t kRangeTibetan = 24;
const uint8_t kRangeSpecificItemNum = 26;
const uint8_t kRangeSpecificItemNum = 25;
//range/rangeSet grow to this place 26-29
//range/rangeSet grow to this place 25-29
const uint8_t kRangeSetStart = 30; // range set definition starts from here
const uint8_t kRangeSetLatin = 30;

7
intl/locale/langGroups.properties
View File

@ -171,14 +171,14 @@ th=th
ti=x-ethi
tig=x-ethi
tk=x-cyrillic
#tk=tr # (The country declared in 1992 to gradually move to Latin script)
#tk=x-western # (The country declared in 1992 to gradually move to Latin script)
tl=x-western
tlh=x-western
tn=x-western
to=x-western
tr=tr
tr=x-western
ts=x-western
tt=tr
tt=x-western
uk=x-cyrillic
ur=ar
ve=x-western
@ -209,7 +209,6 @@ zu=x-western
x-western=x-western
x-cyrillic=x-cyrillic
# el
# tr
# he
# ar
# th

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

@ -2235,11 +2235,6 @@ pref("font.minimum-size.th", 0);
pref("font.size.variable.th", 16);
pref("font.size.fixed.th", 13);
pref("font.default.tr", "serif");
pref("font.minimum-size.tr", 0);
pref("font.size.variable.tr", 16);
pref("font.size.fixed.tr", 13);
pref("font.default.x-cyrillic", "serif");
pref("font.minimum-size.x-cyrillic", 0);
pref("font.size.variable.x-cyrillic", 16);
@ -2521,11 +2516,6 @@ pref("font.name.sans-serif.th", "Tahoma");
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");
pref("font.name.monospace.tr", "Courier New");
pref("font.name.cursive.tr", "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");
@ -2882,17 +2872,6 @@ pref("font.name-list.serif.th", "Thonburi");
pref("font.name-list.sans-serif.th", "Thonburi");
pref("font.name-list.monospace.th", "Ayuthaya");
pref("font.name.serif.tr", "Times");
pref("font.name.sans-serif.tr", "Helvetica");
pref("font.name.monospace.tr", "Courier");
pref("font.name.cursive.tr", "Apple Chancery");
pref("font.name.fantasy.tr", "Papyrus");
pref("font.name-list.serif.tr", "Times");
pref("font.name-list.sans-serif.tr", "Helvetica");
pref("font.name-list.monospace.tr", "Courier");
pref("font.name-list.cursive.tr", "Apple Chancery");
pref("font.name-list.fantasy.tr", "Papyrus");
pref("font.name.serif.x-armn", "Mshtakan");
pref("font.name.sans-serif.x-armn", "Mshtakan");
pref("font.name.monospace.x-armn", "Mshtakan");
@ -3223,10 +3202,6 @@ pref("font.name.sans-serif.th", "Fira Sans");
pref("font.name.monospace.th", "Fira Mono");
pref("font.name-list.sans-serif.th", "Fira Sans, Noto Sans Thai, Droid Sans Thai");
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-cyrillic", "Charis SIL Compact");
pref("font.name.sans-serif.x-cyrillic", "Fira Sans");
pref("font.name.monospace.x-cyrillic", "Fira Mono");
@ -3287,12 +3262,6 @@ pref("font.name.monospace.th", "Droid Sans Mono");
pref("font.name-list.serif.th", "Droid Serif");
pref("font.name-list.sans-serif.th", "Droid Sans Thai, Clear Sans, Droid Sans");
pref("font.name.serif.tr", "Charis SIL Compact");
pref("font.name.sans-serif.tr", "Clear Sans");
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-cyrillic", "Charis SIL Compact");
pref("font.name.sans-serif.x-cyrillic", "Clear Sans");
pref("font.name.monospace.x-cyrillic", "Droid Sans Mono");
@ -3345,9 +3314,6 @@ pref("font.size.fixed.he", 12);
pref("font.minimum-size.th", 13);
pref("font.default.tr", "sans-serif");
pref("font.size.fixed.tr", 12);
pref("font.default.x-cyrillic", "sans-serif");
pref("font.size.fixed.x-cyrillic", 12);
@ -3456,11 +3422,6 @@ pref("font.name.sans-serif.th", "sans-serif");
pref("font.minimum-size.th", 13);
pref("font.name.monospace.th", "monospace");
pref("font.name.serif.tr", "serif");
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-cyrillic", "serif");
pref("font.name.sans-serif.x-cyrillic", "sans-serif");
pref("font.name.monospace.x-cyrillic", "monospace");