diff --git a/browser/components/preferences/fonts.xul b/browser/components/preferences/fonts.xul
--- a/browser/components/preferences/fonts.xul
+++ b/browser/components/preferences/fonts.xul
@@ -110,16 +110,17 @@
+
diff --git a/browser/locales/en-US/chrome/browser/preferences/fonts.dtd b/browser/locales/en-US/chrome/browser/preferences/fonts.dtd
--- a/browser/locales/en-US/chrome/browser/preferences/fonts.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/fonts.dtd
@@ -46,16 +46,17 @@
+
diff --git a/gfx/thebes/public/gfxPlatform.h b/gfx/thebes/public/gfxPlatform.h
--- a/gfx/thebes/public/gfxPlatform.h
+++ b/gfx/thebes/public/gfxPlatform.h
@@ -92,24 +92,25 @@ enum eFontPrefLang {
eFontPrefLang_Gujarati = 21,
eFontPrefLang_Gurmukhi = 22,
eFontPrefLang_Khmer = 23,
eFontPrefLang_Malayalam = 24,
eFontPrefLang_Oriya = 25,
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 {
eCMSMode_Off = 0, // No color management
eCMSMode_All = 1, // Color manage everything
eCMSMode_TaggedOnly = 2, // Color manage tagged Images Only
eCMSMode_AllCount = 3
};
diff --git a/gfx/thebes/src/gfxFontconfigUtils.cpp b/gfx/thebes/src/gfxFontconfigUtils.cpp
--- a/gfx/thebes/src/gfxFontconfigUtils.cpp
+++ b/gfx/thebes/src/gfxFontconfigUtils.cpp
@@ -343,16 +343,17 @@ const MozLangGroupData MozLangGroups[] =
{ "x-gujr", "gu" },
{ "x-guru", "pa" },
{ "x-khmr", "km" },
{ "x-knda", "kn" },
{ "x-mlym", "ml" },
{ "x-orya", "or" },
{ "x-sinh", "si" },
{ "x-telu", "te" },
+ { "x=tibt", "bo" },
{ "x-unicode", 0 },
{ "x-user-def", 0 }
};
static PRBool
TryLangForGroup(const nsACString& aOSLang, nsIAtom *aLangGroup,
nsACString *aFcLang)
{
diff --git a/gfx/thebes/src/gfxPlatform.cpp b/gfx/thebes/src/gfxPlatform.cpp
--- a/gfx/thebes/src/gfxPlatform.cpp
+++ b/gfx/thebes/src/gfxPlatform.cpp
@@ -147,16 +147,17 @@ static const char *gPrefLangNames[] = {
"x-gujr",
"x-guru",
"x-khmr",
"x-mlym",
"x-orya",
"x-telu",
"x-knda",
"x-sinh",
+ "x-tibt",
"x-unicode",
"x-user-def"
};
gfxPlatform*
gfxPlatform::GetPlatform()
{
diff --git a/gfx/thebes/src/gfxWindowsFonts.cpp b/gfx/thebes/src/gfxWindowsFonts.cpp
--- a/gfx/thebes/src/gfxWindowsFonts.cpp
+++ b/gfx/thebes/src/gfxWindowsFonts.cpp
@@ -1573,17 +1573,17 @@ static const struct ScriptPropertyEntry
{ "LANG_TAMIL", "x-tamil" }, // tam
{ "LANG_TELUGU", "x-telu" }, //tel
{ "LANG_KANNADA", "x-knda" }, // kan
{ "LANG_MALAYALAM", "x-mlym" }, // mal
{ "LANG_ASSAMESE", "x-beng" }, // asm
{ "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" },
{ "MYANMAR", "bur" }, // bur/mya
{ "LANG_GALICIAN", "glg" },
{ "LANG_KONKANI", "kok" },
{ "LANG_MANIPURI", "mni" },
{ "LANG_SINDHI", "snd" },
diff --git a/gfx/thebes/src/nsUnicodeRange.cpp b/gfx/thebes/src/nsUnicodeRange.cpp
--- a/gfx/thebes/src/nsUnicodeRange.cpp
+++ b/gfx/thebes/src/nsUnicodeRange.cpp
@@ -62,17 +62,18 @@ static const char *gUnicodeRangeToLangGr
"x-geor",
"x-gujr",
"x-guru",
"x-khmr",
"x-mlym",
"x-orya",
"x-telu",
"x-knda",
- "x-sinh"
+ "x-sinh",
+ "x-tibt"
};
/**********************************************************************
* Unicode subranges as defined in unicode 3.0
* x-western, x-central-euro, tr, x-baltic -> latin
* 0000 - 036f
* 1e00 - 1eff
* 2000 - 206f (general punctuation)
diff --git a/gfx/thebes/src/nsUnicodeRange.h b/gfx/thebes/src/nsUnicodeRange.h
--- a/gfx/thebes/src/nsUnicodeRange.h
+++ b/gfx/thebes/src/nsUnicodeRange.h
@@ -65,35 +65,35 @@ const PRUint8 kRangeGujarati = 18;
const PRUint8 kRangeGujarati = 18;
const PRUint8 kRangeGurmukhi = 19;
const PRUint8 kRangeKhmer = 20;
const PRUint8 kRangeMalayalam = 21;
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;
const PRUint8 kRangeMongolian = 43;
const PRUint8 kRangeMathOperators = 44;
const PRUint8 kRangeMiscTechnical = 45;
const PRUint8 kRangeControlOpticalEnclose = 46;
const PRUint8 kRangeBoxBlockGeometrics = 47;
diff --git a/intl/locale/src/langGroups.properties b/intl/locale/src/langGroups.properties
--- a/intl/locale/src/langGroups.properties
+++ b/intl/locale/src/langGroups.properties
@@ -56,32 +56,33 @@ af=x-western
af=x-western
alg=x-cans
am=x-ethi
ar=ar
as=x-beng
be=x-cyrillic
bg=x-cyrillic
bn=x-beng
+bo=x-tibt
br=x-western
bs=x-central-euro
ca=x-western
ce=x-central-euro
ch=x-western
co=x-western
cr=x-cans
cs=x-central-euro
#cu=x-cyrillic
cv=x-cyrillic
# XXX Latin Ext. A is also used for cy.
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
# Esperanto: Latin-3
eo=x-western
es=x-western
et=x-baltic
eu=x-western
diff --git a/intl/locale/src/language.properties b/intl/locale/src/language.properties
--- a/intl/locale/src/language.properties
+++ b/intl/locale/src/language.properties
@@ -28,17 +28,17 @@ az.accept = true
az.accept = true
ba.accept = false
be.accept = true
bg.accept = true
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
ce.accept = true
ch.accept = true
co.accept = true
cr.accept = true
cs.accept = true
@@ -48,17 +48,17 @@ da.accept = true
da.accept = true
de.accept = true
de-at.accept = true
de-ch.accept = true
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
en-au.accept = true
en-bz.accept = true
en-ca.accept = true
en-gb.accept = true
en-ie.accept = true
diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -1166,16 +1166,17 @@ pref("font.minimum-size.x-knda", 0);
pref("font.minimum-size.x-knda", 0);
pref("font.minimum-size.x-khmr", 0);
pref("font.minimum-size.ko", 0);
pref("font.minimum-size.x-mlym", 0);
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);
pref("font.minimum-size.x-western", 0);
pref("font.minimum-size.x-unicode", 0);
pref("font.minimum-size.x-user-def", 0);
#ifdef XP_WIN
@@ -1368,16 +1369,23 @@ pref("font.name-list.monospace.x-knda",
pref("font.name.serif.x-sinh", "Iskoola Pota");
pref("font.name.sans-serif.x-sinh", "Iskoola Pota");
pref("font.name.monospace.x-sinh", "Iskoola Pota");
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", "Jomolhari");
+pref("font.name.sans-serif.x-tibt", "Jomolhari");
+pref("font.name.monospace.x-tibt", "Jomolhari");
+pref("font.name-list.serif.x-tibt", "Jomolhari, Tibetan Machine Uni, Microsoft Himalaya");
+pref("font.name-list.sans-serif.x-tibt", "Jomolhari, Tibetan Machine Uni, Microsoft Himalaya");
+pref("font.name-list.monospace.x-tibt", "Jomolhari, Tibetan Machine Uni, Microsoft Himalaya");
+
pref("font.default.ar", "sans-serif");
pref("font.size.variable.ar", 16);
pref("font.size.fixed.ar", 13);
pref("font.default.el", "serif");
pref("font.size.variable.el", 16);
pref("font.size.fixed.el", 13);
@@ -1468,16 +1476,20 @@ pref("font.size.fixed.x-telu", 13);
pref("font.default.x-knda", "serif");
pref("font.size.variable.x-knda", 16);
pref("font.size.fixed.x-knda", 13);
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);
pref("font.default.x-western", "serif");
pref("font.size.variable.x-western", 16);
pref("font.size.fixed.x-western", 13);
@@ -1774,16 +1786,24 @@ pref("font.name-list.monospace.x-knda",
pref("font.name.serif.x-tamil", "InaiMathi");
pref("font.name.sans-serif.x-tamil", "InaiMathi");
pref("font.name.monospace.x-tamil", "InaiMathi");
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");
pref("font.name.cursive.x-unicode", "Apple Chancery");
pref("font.name.fantasy.x-unicode", "Papyrus");
pref("font.name-list.serif.x-unicode", "Times");
pref("font.name-list.sans-serif.x-unicode", "Helvetica");
pref("font.name-list.monospace.x-unicode", "Courier");
@@ -1917,16 +1937,20 @@ pref("font.size.fixed.x-telu", 13);
pref("font.default.x-knda", "serif");
pref("font.size.variable.x-knda", 16);
pref("font.size.fixed.x-knda", 13);
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);
pref("font.default.x-western", "serif");
pref("font.size.variable.x-western", 16);
pref("font.size.fixed.x-western", 13);
@@ -2528,16 +2552,20 @@ pref("font.default.x-knda", "serif");
pref("font.default.x-knda", "serif");
pref("font.size.variable.x-knda", 16);
pref("font.size.fixed.x-knda", 13);
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");
pref("print.postscript.orientation", "portrait");
pref("print.postscript.print_command", "lpr ${MOZ_PRINTER_NAME:+-P\"$MOZ_PRINTER_NAME\"}");
// On GTK2 platform, we should use topmost window level for the default window
// level of element of XUL. GTK2 has only two window types. One is