зеркало из https://github.com/mozilla/gecko-dev.git
Add Tibetan to font selection UI. Bug 441110, r=emk
This commit is contained in:
Simon Montagu
Родитель
9f5ba67cdf
Коммит
d6b0caacfa
|
|
@ -115,6 +115,7 @@
|
|||
<menuitem value="x-tamil" label="&font.langGroup.tamil;"/>
|
||||
<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;"/>
|
||||
|
|
|
|||
|
|
@ -51,6 +51,7 @@
|
|||
<!ENTITY font.langGroup.telugu "Telugu">
|
||||
<!ENTITY font.langGroup.kannada "Kannada">
|
||||
<!ENTITY font.langGroup.sinhala "Sinhala">
|
||||
<!ENTITY font.langGroup.tibetan "Tibetan">
|
||||
<!-- Minimum font size -->
|
||||
<!ENTITY minSize.label "Minimum font size:">
|
||||
<!ENTITY minSize.accesskey "o">
|
||||
|
|
|
|||
|
|
@ -98,14 +98,15 @@ enum eFontPrefLang {
|
|||
eFontPrefLang_Telugu = 26,
|
||||
eFontPrefLang_Kannada = 27,
|
||||
eFontPrefLang_Sinhala = 28,
|
||||
eFontPrefLang_Tibetan = 29,
|
||||
|
||||
eFontPrefLang_LangCount = 29, // except Others and UserDefined.
|
||||
eFontPrefLang_LangCount = 30, // except Others and UserDefined.
|
||||
|
||||
eFontPrefLang_Others = 29, // x-unicode
|
||||
eFontPrefLang_UserDefined = 30,
|
||||
eFontPrefLang_Others = 30, // x-unicode
|
||||
eFontPrefLang_UserDefined = 31,
|
||||
|
||||
eFontPrefLang_CJKSet = 31, // special code for CJK set
|
||||
eFontPrefLang_AllCount = 32
|
||||
eFontPrefLang_CJKSet = 32, // special code for CJK set
|
||||
eFontPrefLang_AllCount = 33
|
||||
};
|
||||
|
||||
enum eCMSMode {
|
||||
|
|
|
|||
|
|
@ -86,6 +86,7 @@ GFX_ATOM(x_orya, "x-orya")
|
|||
GFX_ATOM(x_telu, "x-telu")
|
||||
GFX_ATOM(x_knda, "x-knda")
|
||||
GFX_ATOM(x_sinh, "x-sinh")
|
||||
GFX_ATOM(x_tibt, "x-tibt")
|
||||
|
||||
// used in gfxGDIFontList.h
|
||||
GFX_ATOM(ko_xxx, "ko-xxx")
|
||||
|
|
|
|||
|
|
@ -352,6 +352,7 @@ const MozLangGroupData MozLangGroups[] = {
|
|||
{ "x-orya", "or" },
|
||||
{ "x-sinh", "si" },
|
||||
{ "x-telu", "te" },
|
||||
{ "x-tibt", "bo" },
|
||||
{ "x-unicode", 0 },
|
||||
{ "x-user-def", 0 }
|
||||
};
|
||||
|
|
|
|||
|
|
@ -160,6 +160,7 @@ static const char *gPrefLangNames[] = {
|
|||
"x-telu",
|
||||
"x-knda",
|
||||
"x-sinh",
|
||||
"x-tibt",
|
||||
"x-unicode",
|
||||
"x-user-def"
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1015,7 +1015,7 @@ static const struct ScriptPropertyEntry gScriptToText[] =
|
|||
{ "LANG_MARATHI", "x-devanagari" }, // mar
|
||||
{ "LANG_SANSKRIT", "x-devanagari" }, // san
|
||||
{ "LANG_MONGOLIAN", "mon" },
|
||||
{ "TIBETAN", "tib" }, // tib/bod
|
||||
{ "TIBETAN", "x-tibt" }, // tib/bod
|
||||
{ nsnull, nsnull },
|
||||
{ "KHMER", "x-khmr" }, // khm
|
||||
{ "LAO", "lao" },
|
||||
|
|
|
|||
|
|
@ -69,7 +69,8 @@ static nsIAtom **gUnicodeRangeToLangGroupAtomTable[] =
|
|||
&gfxAtoms::x_orya,
|
||||
&gfxAtoms::x_telu,
|
||||
&gfxAtoms::x_knda,
|
||||
&gfxAtoms::x_sinh
|
||||
&gfxAtoms::x_sinh,
|
||||
&gfxAtoms::x_tibt
|
||||
};
|
||||
|
||||
/**********************************************************************
|
||||
|
|
|
|||
|
|
@ -72,25 +72,25 @@ const PRUint8 kRangeOriya = 22;
|
|||
const PRUint8 kRangeTelugu = 23;
|
||||
const PRUint8 kRangeKannada = 24;
|
||||
const PRUint8 kRangeSinhala = 25;
|
||||
const PRUint8 kRangeTibetan = 26;
|
||||
|
||||
const PRUint8 kRangeSpecificItemNum = 26;
|
||||
const PRUint8 kRangeSpecificItemNum = 27;
|
||||
|
||||
//range/rangeSet grow to this place 26-29
|
||||
//range/rangeSet grow to this place 27-30
|
||||
|
||||
const PRUint8 kRangeSetStart = 30; // range set definition starts from here
|
||||
const PRUint8 kRangeSetLatin = 30;
|
||||
const PRUint8 kRangeSetCJK = 31;
|
||||
const PRUint8 kRangeSetEnd = 31; // range set definition ends here
|
||||
const PRUint8 kRangeSetStart = 31; // range set definition starts from here
|
||||
const PRUint8 kRangeSetLatin = 31;
|
||||
const PRUint8 kRangeSetCJK = 32;
|
||||
const PRUint8 kRangeSetEnd = 32; // range set definition ends here
|
||||
|
||||
// less frequently used range definition
|
||||
const PRUint8 kRangeSurrogate = 32;
|
||||
const PRUint8 kRangePrivate = 33;
|
||||
const PRUint8 kRangeMisc = 34;
|
||||
const PRUint8 kRangeUnassigned = 35;
|
||||
const PRUint8 kRangeSyriac = 36;
|
||||
const PRUint8 kRangeThaana = 37;
|
||||
const PRUint8 kRangeLao = 38;
|
||||
const PRUint8 kRangeTibetan = 39;
|
||||
const PRUint8 kRangeSurrogate = 33;
|
||||
const PRUint8 kRangePrivate = 34;
|
||||
const PRUint8 kRangeMisc = 35;
|
||||
const PRUint8 kRangeUnassigned = 36;
|
||||
const PRUint8 kRangeSyriac = 37;
|
||||
const PRUint8 kRangeThaana = 38;
|
||||
const PRUint8 kRangeLao = 39;
|
||||
const PRUint8 kRangeMyanmar = 40;
|
||||
const PRUint8 kRangeCherokee = 41;
|
||||
const PRUint8 kRangeOghamRunic = 42;
|
||||
|
|
|
|||
|
|
@ -62,6 +62,7 @@ ay=x-western
|
|||
be=x-cyrillic
|
||||
bg=x-cyrillic
|
||||
bn=x-beng
|
||||
bo=x-tibt
|
||||
br=x-western
|
||||
bs=x-central-euro
|
||||
ca=x-western
|
||||
|
|
@ -77,7 +78,7 @@ cy=x-western
|
|||
da=x-western
|
||||
de=x-western
|
||||
#dv=Thaanna
|
||||
#dz=Tibetan
|
||||
dz=x-tibt
|
||||
#ee=x-western(?) (Ewe uses characters outside Latin-1 as well)
|
||||
el=el
|
||||
en=x-western
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ bh.accept = false
|
|||
bi.accept = false
|
||||
bm.accept = false
|
||||
bn.accept = true
|
||||
bo.accept = false
|
||||
bo.accept = true
|
||||
br.accept = true
|
||||
bs.accept = true
|
||||
ca.accept = true
|
||||
|
|
@ -54,7 +54,7 @@ de-de.accept = true
|
|||
de-li.accept = true
|
||||
de-lu.accept = true
|
||||
dv.accept = false
|
||||
dz.accept = false
|
||||
dz.accept = true
|
||||
ee.accept = false
|
||||
el.accept = true
|
||||
en.accept = true
|
||||
|
|
|
|||
|
|
@ -1258,6 +1258,7 @@ pref("font.minimum-size.x-orya", 0);
|
|||
pref("font.minimum-size.x-sinh", 0);
|
||||
pref("font.minimum-size.x-tamil", 0);
|
||||
pref("font.minimum-size.x-telu", 0);
|
||||
pref("font.minimum-size.x-tibt", 0);
|
||||
pref("font.minimum-size.th", 0);
|
||||
pref("font.minimum-size.tr", 0);
|
||||
pref("font.minimum-size.x-cans", 0);
|
||||
|
|
@ -1461,6 +1462,13 @@ pref("font.name-list.serif.x-sinh", "Iskoola Pota, AksharUnicode");
|
|||
pref("font.name-list.sans-serif.x-sinh", "Iskoola Pota, AksharUnicode");
|
||||
pref("font.name-list.monospace.x-sinh", "Iskoola Pota, AksharUnicode");
|
||||
|
||||
pref("font.name.serif.x-tibt", "Tibetan Machine Uni");
|
||||
pref("font.name.sans-serif.x-tibt", "Tibetan Machine Uni");
|
||||
pref("font.name.monospace.x-tibt", "Tibetan Machine Uni");
|
||||
pref("font.name-list.serif.x-tibt", "Tibetan Machine Uni, Jomolhari, Microsoft Himalaya");
|
||||
pref("font.name-list.sans-serif.x-tibt", "Tibetan Machine Uni, Jomolhari, Microsoft Himalaya");
|
||||
pref("font.name-list.monospace.x-tibt", "Tibetan Machine Uni, Jomolhari, Microsoft Himalaya");
|
||||
|
||||
pref("font.default.ar", "sans-serif");
|
||||
pref("font.size.variable.ar", 16);
|
||||
pref("font.size.fixed.ar", 13);
|
||||
|
|
@ -1562,6 +1570,10 @@ pref("font.default.x-sinh", "serif");
|
|||
pref("font.size.variable.x-sinh", 16);
|
||||
pref("font.size.fixed.x-sinh", 13);
|
||||
|
||||
pref("font.default.x-tibt", "serif");
|
||||
pref("font.size.variable.x-tibt", 16);
|
||||
pref("font.size.fixed.x-tibt", 13);
|
||||
|
||||
pref("font.default.x-unicode", "serif");
|
||||
pref("font.size.variable.x-unicode", 16);
|
||||
pref("font.size.fixed.x-unicode", 13);
|
||||
|
|
@ -1880,6 +1892,14 @@ pref("font.name-list.serif.x-tamil", "InaiMathi");
|
|||
pref("font.name-list.sans-serif.x-tamil", "InaiMathi");
|
||||
pref("font.name-list.monospace.x-tamil", "InaiMathi");
|
||||
|
||||
// Kailasa ships with mac os x >= 10.5
|
||||
pref("font.name.serif.x-tibt", "Kailasa");
|
||||
pref("font.name.sans-serif.x-tibt", "Kailasa");
|
||||
pref("font.name.monospace.x-tibt", "Kailasa");
|
||||
pref("font.name-list.serif.x-tibt", "Kailasa");
|
||||
pref("font.name-list.sans-serif.x-tibt", "Kailasa");
|
||||
pref("font.name-list.monospace.x-tibt", "Kailasa");
|
||||
|
||||
pref("font.name.serif.x-unicode", "Times");
|
||||
pref("font.name.sans-serif.x-unicode", "Helvetica");
|
||||
pref("font.name.monospace.x-unicode", "Courier");
|
||||
|
|
@ -2024,6 +2044,10 @@ pref("font.default.x-sinh", "serif");
|
|||
pref("font.size.variable.x-sinh", 16);
|
||||
pref("font.size.fixed.x-sinh", 13);
|
||||
|
||||
pref("font.default.x-tibt", "serif");
|
||||
pref("font.size.variable.x-tibt", 16);
|
||||
pref("font.size.fixed.x-tibt", 13);
|
||||
|
||||
pref("font.default.x-unicode", "serif");
|
||||
pref("font.size.variable.x-unicode", 16);
|
||||
pref("font.size.fixed.x-unicode", 13);
|
||||
|
|
@ -2636,6 +2660,10 @@ pref("font.default.x-sinh", "serif");
|
|||
pref("font.size.variable.x-sinh", 16);
|
||||
pref("font.size.fixed.x-sinh", 13);
|
||||
|
||||
pref("font.default.x-tibt", "serif");
|
||||
pref("font.size.variable.x-tibt", 16);
|
||||
pref("font.size.fixed.x-tibt", 13);
|
||||
|
||||
/* PostScript print module prefs */
|
||||
// pref("print.postscript.enabled", true);
|
||||
pref("print.postscript.paper_size", "letter");
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче