From 1a8118258cd57e950035115bbe7f526d26671356 Mon Sep 17 00:00:00 2001 From: "jshin%mailaps.org" Date: Sat, 30 Apr 2005 02:57:57 +0000 Subject: [PATCH] bug 237434 : add several languages/scripts to font selection menu (r=smontagu, sr=dbaron, a=asa) --- browser/components/preferences/fonts.xul | 13 ++- .../chrome/browser/preferences/fonts.dtd | 9 ++ embedding/minimo/all.js | 18 ++++ gfx/src/mac/nsUnicodeBlock.h | 2 + gfx/src/mac/nsUnicodeFontMappingMac.cpp | 5 +- gfx/src/shared/nsFontConfigUtils.cpp | 9 ++ gfx/src/windows/nsFontMetricsWin.cpp | 2 +- gfx/src/windows/nsUnicodeRange.cpp | 25 +++-- gfx/src/windows/nsUnicodeRange.h | 60 ++++++------ intl/locale/src/langGroups.properties | 41 +++++--- intl/locale/src/language.properties | 25 +++-- intl/uconv/src/charsetData.properties | 2 + mail/components/preferences/fonts.xul | 13 ++- modules/libpref/src/init/all.js | 93 +++++++++++++++++++ .../chrome/global/languageNames.properties | 1 + .../resources/content/pref-fonts.xul | 9 ++ .../resources/locale/en-US/pref-fonts.dtd | 9 ++ .../locale/en-US/languageNames.properties | 1 + 18 files changed, 269 insertions(+), 68 deletions(-) diff --git a/browser/components/preferences/fonts.xul b/browser/components/preferences/fonts.xul index 5c9fb5c92f1..551b1ee5925 100644 --- a/browser/components/preferences/fonts.xul +++ b/browser/components/preferences/fonts.xul @@ -88,13 +88,22 @@ - - + + + + + + + + + + + diff --git a/browser/locales/en-US/chrome/browser/preferences/fonts.dtd b/browser/locales/en-US/chrome/browser/preferences/fonts.dtd index 1f68c1fe205..9ab8e5b5c62 100644 --- a/browser/locales/en-US/chrome/browser/preferences/fonts.dtd +++ b/browser/locales/en-US/chrome/browser/preferences/fonts.dtd @@ -42,6 +42,15 @@ + + + + + + + + + diff --git a/embedding/minimo/all.js b/embedding/minimo/all.js index 1a05d021e74..88fab9100b4 100644 --- a/embedding/minimo/all.js +++ b/embedding/minimo/all.js @@ -64,6 +64,15 @@ pref("font.size.fixed.x-central-euro", 9); pref("font.size.fixed.x-cyrillic", 9); pref("font.size.fixed.x-devanagari", 9); pref("font.size.fixed.x-tamil", 9); +pref("font.size.fixed.x-armn", 9); +pref("font.size.fixed.x-beng", 9); +pref("font.size.fixed.x-cans", 9); +pref("font.size.fixed.x-ethi", 9); +pref("font.size.fixed.x-geor", 9); +pref("font.size.fixed.x-gujr", 9); +pref("font.size.fixed.x-guru", 9); +pref("font.size.fixed.x-khmr", 9); +pref("font.size.fixed.x-mlym", 9); pref("font.size.fixed.x-unicode", 9); pref("font.size.fixed.x-western", 9); pref("font.size.fixed.zh-CN", 9); @@ -82,6 +91,15 @@ pref("font.size.variable.x-central-euro", 8); pref("font.size.variable.x-cyrillic", 8); pref("font.size.variable.x-devanagari", 8); pref("font.size.variable.x-tamil", 8); +pref("font.size.variable.x-armn", 8); +pref("font.size.variable.x-beng", 8); +pref("font.size.variable.x-cans", 8); +pref("font.size.variable.x-ethi", 8); +pref("font.size.variable.x-geor", 8); +pref("font.size.variable.x-gujr", 8); +pref("font.size.variable.x-guru", 8); +pref("font.size.variable.x-khmr", 8); +pref("font.size.variable.x-mlym", 8); pref("font.size.variable.x-unicode", 8); pref("font.size.variable.x-western", 8); pref("font.size.variable.zh-CN", 8); diff --git a/gfx/src/mac/nsUnicodeBlock.h b/gfx/src/mac/nsUnicodeBlock.h index 61c16faefa2..999f1b7d5a5 100644 --- a/gfx/src/mac/nsUnicodeBlock.h +++ b/gfx/src/mac/nsUnicodeBlock.h @@ -69,6 +69,8 @@ typedef enum { kGeorgian, kHangul, kBopomofo, + kEthiopic, + kCanadian, kUserDefinedEncoding, kUnicodeBlockFixedScriptMax, diff --git a/gfx/src/mac/nsUnicodeFontMappingMac.cpp b/gfx/src/mac/nsUnicodeFontMappingMac.cpp index f0fb171fedf..eed6ca65375 100644 --- a/gfx/src/mac/nsUnicodeFontMappingMac.cpp +++ b/gfx/src/mac/nsUnicodeFontMappingMac.cpp @@ -586,7 +586,10 @@ static nsUnicodeBlock GetBlockU1XXX(PRUnichar aChar) case 0x0100: return kHangul; case 0x0e00: return kLatin; case 0x0f00: return kGreek; - default: return kOthers; + default: + if ((0x0200 <= aChar) && ( aChar <= 0x037c)) return kEthiopic; + else if ((0x0400 <= aChar) && ( aChar <= 0x0676)) return kCanadian; + else return kOthers; } } //-------------------------------------------------------------------------- diff --git a/gfx/src/shared/nsFontConfigUtils.cpp b/gfx/src/shared/nsFontConfigUtils.cpp index 511d46033b9..35ddbf09641 100644 --- a/gfx/src/shared/nsFontConfigUtils.cpp +++ b/gfx/src/shared/nsFontConfigUtils.cpp @@ -51,6 +51,15 @@ const MozXftLangGroup MozXftLangGroups[] = { { "x-baltic", (const FcChar8 *)"lv" }, { "x-devanagari", (const FcChar8 *)"hi" }, { "x-tamil", (const FcChar8 *)"ta" }, + { "x-armn", (const FcChar8 *)"hy" }, + { "x-beng", (const FcChar8 *)"bn" }, + { "x-cans", (const FcChar8 *)"iu" }, + { "x-ethi", (const FcChar8 *)"am" }, + { "x-geor", (const FcChar8 *)"ka" }, + { "x-gujr", (const FcChar8 *)"gu" }, + { "x-guru", (const FcChar8 *)"pa" }, + { "x-khmr", (const FcChar8 *)"km" }, + { "x-mlym", (const FcChar8 *)"ml" }, { "x-unicode", 0 }, { "x-user-def", 0 }, }; diff --git a/gfx/src/windows/nsFontMetricsWin.cpp b/gfx/src/windows/nsFontMetricsWin.cpp index ad3502de956..f8a501aecf5 100644 --- a/gfx/src/windows/nsFontMetricsWin.cpp +++ b/gfx/src/windows/nsFontMetricsWin.cpp @@ -1201,7 +1201,7 @@ static PRUint8 gBitToUnicodeRange[] = /* 74 */ kRangeMyanmar, // 1000 - 109f Myanmar /* 75 */ kRangeEthiopic, // 1200 - 12bf Ethiopic /* 76 */ kRangeCherokee, // 13a0 - 13ff Cherokee - /* 77 */ kRangeAboriginal, // 1400 - 14df Can. Aboriginal Syl. + /* 77 */ kRangeCanadian, // 1400 - 14df Can. Aboriginal Syl. /* 78 */ kRangeOghamRunic, // 1680 - 169f Ogham /* 79 */ kRangeOghamRunic, // 16a0 - 16ff Runic /* 80 */ kRangeKhmer, // 1780 - 17ff Khmer diff --git a/gfx/src/windows/nsUnicodeRange.cpp b/gfx/src/windows/nsUnicodeRange.cpp index 71f18c93ac5..09341c2269c 100644 --- a/gfx/src/windows/nsUnicodeRange.cpp +++ b/gfx/src/windows/nsUnicodeRange.cpp @@ -54,7 +54,16 @@ const char *gUnicodeRangeToLangGroupTable[] = "zh-CN", "zh-TW", "x-devanagari", - "x-tamil" + "x-tamil", + "x-armn", + "x-beng", + "x-cans", + "x-ethi", + "x-geor", + "x-gujr", + "x-guru", + "x-khmr", + "x-mlym" }; /********************************************************************** @@ -243,8 +252,8 @@ static PRUint8 gUnicodeSubrangeTable[NUM_OF_SUBTABLES][SUBTABLE_SIZE] = kRangeKorean, //u11xx kRangeEthiopic, //u12xx kRangeTertiaryTable, //u13xx - kRangeAboriginal, //u14xx - kRangeAboriginal, //u15xx + kRangeCanadian, //u14xx + kRangeCanadian, //u15xx kRangeTertiaryTable, //u16xx kRangeKhmer, //u17xx kRangeMongolian, //u18xx @@ -369,11 +378,11 @@ static PRUint8 gUnicodeTertiaryRangeTable[TERTIARY_TABLE_SIZE] = kRangeEthiopic, //u128x place holder(resolved in the 2ndary tab.) kRangeEthiopic, //u130x kRangeCherokee, //u138x - kRangeAboriginal, //u140x place holder(resolved in the 2ndary tab.) - kRangeAboriginal, //u148x place holder(resolved in the 2ndary tab.) - kRangeAboriginal, //u150x place holder(resolved in the 2ndary tab.) - kRangeAboriginal, //u158x place holder(resolved in the 2ndary tab.) - kRangeAboriginal, //u160x + kRangeCanadian, //u140x place holder(resolved in the 2ndary tab.) + kRangeCanadian, //u148x place holder(resolved in the 2ndary tab.) + kRangeCanadian, //u150x place holder(resolved in the 2ndary tab.) + kRangeCanadian, //u158x place holder(resolved in the 2ndary tab.) + kRangeCanadian, //u160x kRangeOghamRunic, //u168x this contains two scripts, Ogham & Runic }; diff --git a/gfx/src/windows/nsUnicodeRange.h b/gfx/src/windows/nsUnicodeRange.h index e1b4b424070..eda3014b9e7 100644 --- a/gfx/src/windows/nsUnicodeRange.h +++ b/gfx/src/windows/nsUnicodeRange.h @@ -57,10 +57,19 @@ const PRUint8 kRangeSChinese = 9; const PRUint8 kRangeTChinese = 10; const PRUint8 kRangeDevanagari = 11; const PRUint8 kRangeTamil = 12; +const PRUint8 kRangeArmenian = 13; +const PRUint8 kRangeBengali = 14; +const PRUint8 kRangeCanadian = 15; +const PRUint8 kRangeEthiopic = 16; +const PRUint8 kRangeGeorgian = 17; +const PRUint8 kRangeGujarati = 18; +const PRUint8 kRangeGurmukhi = 19; +const PRUint8 kRangeKhmer = 20; +const PRUint8 kRangeMalayalam = 21; -const PRUint8 kRangeSpecificItemNum = 13; +const PRUint8 kRangeSpecificItemNum = 22; -//range/rangeSet grow to this place 13-29 +//range/rangeSet grow to this place 22-29 const PRUint8 kRangeSetStart = 30; // range set definition starts from here const PRUint8 kRangeSetLatin = 30; @@ -74,34 +83,25 @@ const PRUint8 kRangeMisc = 34; const PRUint8 kRangeUnassigned = 35; const PRUint8 kRangeSyriac = 36; const PRUint8 kRangeThaana = 37; -const PRUint8 kRangeBengali = 38; -const PRUint8 kRangeGurmukhi = 39; -const PRUint8 kRangeGujarati = 40; -const PRUint8 kRangeOriya = 41; -const PRUint8 kRangeTelugu = 42; -const PRUint8 kRangeKannada = 43; -const PRUint8 kRangeMalayalam = 44; -const PRUint8 kRangeSinhala = 45; -const PRUint8 kRangeLao = 46; -const PRUint8 kRangeTibetan = 47; -const PRUint8 kRangeMyanmar = 48; -const PRUint8 kRangeGeorgian = 49; -const PRUint8 kRangeEthiopic = 50; -const PRUint8 kRangeCherokee = 51; -const PRUint8 kRangeAboriginal = 52; -const PRUint8 kRangeOghamRunic = 53; -const PRUint8 kRangeKhmer = 54; -const PRUint8 kRangeMongolian = 55; -const PRUint8 kRangeMathOperators = 56; -const PRUint8 kRangeMiscTechnical = 57; -const PRUint8 kRangeControlOpticalEnclose = 58; -const PRUint8 kRangeBoxBlockGeometrics = 59; -const PRUint8 kRangeMiscSymbols = 60; -const PRUint8 kRangeDingbats = 61; -const PRUint8 kRangeBraillePattern = 62; -const PRUint8 kRangeYi = 63; -const PRUint8 kRangeCombiningDiacriticalMarks = 64; -const PRUint8 kRangeArmenian = 65; +const PRUint8 kRangeOriya = 38; +const PRUint8 kRangeTelugu = 39; +const PRUint8 kRangeKannada = 40; +const PRUint8 kRangeSinhala = 41; +const PRUint8 kRangeLao = 42; +const PRUint8 kRangeTibetan = 43; +const PRUint8 kRangeMyanmar = 44; +const PRUint8 kRangeCherokee = 45; +const PRUint8 kRangeOghamRunic = 46; +const PRUint8 kRangeMongolian = 47; +const PRUint8 kRangeMathOperators = 48; +const PRUint8 kRangeMiscTechnical = 49; +const PRUint8 kRangeControlOpticalEnclose = 50; +const PRUint8 kRangeBoxBlockGeometrics = 51; +const PRUint8 kRangeMiscSymbols = 52; +const PRUint8 kRangeDingbats = 53; +const PRUint8 kRangeBraillePattern = 54; +const PRUint8 kRangeYi = 55; +const PRUint8 kRangeCombiningDiacriticalMarks = 56; const PRUint8 kRangeTableBase = 128; //values over 127 are reserved for internal use only const PRUint8 kRangeTertiaryTable = 145; // leave room for 16 subtable diff --git a/intl/locale/src/langGroups.properties b/intl/locale/src/langGroups.properties index b159f2658f1..41a1d2bd616 100644 --- a/intl/locale/src/langGroups.properties +++ b/intl/locale/src/langGroups.properties @@ -54,18 +54,20 @@ #ae=ar af=x-western -#am= #Ethiopic +alg=x-cans +am=x-ethi ar=ar -#as= Bengali +as=x-beng be=x-cyrillic bg=x-cyrillic +bn=x-beng br=x-western bs=x-central-euro ca=x-western ce=x-central-euro ch=x-western co=x-western -#cr=Unified Canadian aboriginal syllabary +cr=x-cans cs=x-central-euro #cu=x-cyrillic cv=x-cyrillic @@ -97,6 +99,7 @@ gd=x-western # gl : ISO-8859-13 gl=x-western #ha=x-western : Latin and Ajami scripts +gu=x-gujr he=he hi=x-devanagari ht=x-western @@ -104,16 +107,16 @@ hr=x-central-euro # XXX Latin Ext. A is also used for hsb. hsb=x-western hu=x-central-euro -#hy=Armenian +hy=x-armn ia=x-western id=x-western ie=x-western is=x-western it=x-western -#iu=Inuktitut +iu=x-cans ja=ja -#ka=Georgian -#km=Khmer +ka=x-geor +km=x-khmr ko=ko #ks=ar #ku=ar @@ -128,6 +131,7 @@ lv=x-baltic #XXX Latin Ext. A is also used for Maori. mi=x-western mk=x-cyrillic +ml=x-mlym #mo=x-central-euro / x-cyrillic mr=x-devanagari ms=x-western @@ -139,12 +143,15 @@ no=x-western # XXX : x-central-euro may be better nv=x-western oc=x-western -#oj : Unified Canadian Syllabary(Ojibwe is usually classified in the same -# writing script group as Cree.) -#om=Ethiopic +oj=x-cans +om=x-ethi #or=Oriya os=x-cyrillic -#pa=Gurumukhi (India) and Arabic (Pakistan) +#pa: Punjabi is usually written in Gurmukhi script in India and Arabic script +# in Pakistan. We make pa default to Gurmukhi based on comments in bug 248690 +pa-in=x-guru +pa-pk=ar +pa=x-guru pl=x-central-euro ps=ar pt=x-western @@ -167,6 +174,7 @@ sv=x-western sw=x-western ta=x-tamil th=th +tig=x-ethi tk=x-cyrillic #tk=tr # (The country declared in 1992 to gradually move to Latin script) tlh=x-western @@ -211,3 +219,14 @@ 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 +# lang in (X)HTML/XML documents, which they shouldn't. (see bug 256257) +#x-beng=x-beng +#x-cans=x-cans +#x-ethi=x-ethi +#x-guru=x-guru +#x-gujr=x-gujr +#x-khmr=x-khmr +#x-mlym=x-mlym diff --git a/intl/locale/src/language.properties b/intl/locale/src/language.properties index 66b554bcb3c..1618c97377c 100644 --- a/intl/locale/src/language.properties +++ b/intl/locale/src/language.properties @@ -22,7 +22,7 @@ ar-sa.accept = true ar-sy.accept = true ar-tn.accept = true ar-ye.accept = true -as.accept = false +as.accept = true ast.accept = true av.accept = false az.accept = true @@ -32,18 +32,15 @@ bg.accept = true bh.accept = false bi.accept = false bm.accept = false -bn.accept = false +bn.accept = true bo.accept = false -br.accept = false -bs.accept = true -bn.accept = false br.accept = true -bs.accept = true +bs.accept = true ca.accept = true ce.accept = true ch.accept = true co.accept = true -cr.accept = false +cr.accept = true cs.accept = true cu.accept = false cv.accept = true @@ -112,7 +109,7 @@ ga.accept = true gd.accept = true gl.accept = true gn.accept = false -gu.accept = false +gu.accept = true gv.accept = false ha.accept = false he.accept = true @@ -134,7 +131,7 @@ io.accept = false is.accept = true it.accept = true it-ch.accept = true -iu.accept = true +iu.accept = true ja.accept = true jv.accept = false ka.accept = true @@ -142,7 +139,7 @@ kg.accept = false ki.accept = false kk.accept = true kl.accept = false -km.accept = false +km.accept = true kn.accept = false ko.accept = true ko-kp.accept = true @@ -168,7 +165,7 @@ mh.accept = false mi.accept = true mk.accept = false mk-mk.accept = true -ml.accept = false +ml.accept = true mn.accept = false mo.accept = true mr.accept = true @@ -193,7 +190,9 @@ oj.accept = false om.accept = true or.accept = false os.accept = false -pa.accept = false +pa.accept = true +pa-in.accept = true +pa-pk.accept = true pi.accept = false pl.accept = true ps.accept = false @@ -222,12 +221,12 @@ su.accept = false sv.accept = true sv-fi.accept = true sw.accept = true -sx.accept = false ta.accept = true te.accept = false tg.accept = false th.accept = true ti.accept = false +tig.accept = true tk.accept = true tl.accept = false tlh.accept = true diff --git a/intl/uconv/src/charsetData.properties b/intl/uconv/src/charsetData.properties index 6c8eded76e4..2b436a40853 100644 --- a/intl/uconv/src/charsetData.properties +++ b/intl/uconv/src/charsetData.properties @@ -91,6 +91,7 @@ x-johab.notForOutgoing = true // to map XLFD registry-encoding pairs to langGroups. they can be // removed once bug 215537 is fixed. adobe-symbol-encoding.LangGroup = el +armscii-8.LangGroup = x-armn big5.LangGroup = zh-TW x-x-big5.LangGroup = zh-TW big5-hkscs.LangGroup = zh-HK @@ -100,6 +101,7 @@ gb2312.LangGroup = zh-CN gb18030.LangGroup = zh-CN gb18030.2000-0.LangGroup = zh-CN gb18030.2000-1.LangGroup = zh-CN +geostd8.LangGroup = x-geor hkscs-1.LangGroup = zh-HK hz-gb-2312.LangGroup = zh-CN ibm850.LangGroup = x-western diff --git a/mail/components/preferences/fonts.xul b/mail/components/preferences/fonts.xul index f5ffc927a11..0ee30867768 100644 --- a/mail/components/preferences/fonts.xul +++ b/mail/components/preferences/fonts.xul @@ -85,13 +85,22 @@ - - + + + + + + + + + + + diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js index 573084b3526..78626b6cef9 100644 --- a/modules/libpref/src/init/all.js +++ b/modules/libpref/src/init/all.js @@ -1003,6 +1003,63 @@ pref("font.name.monospace.x-tamil", "Latha"); pref("font.name-list.serif.x-tamil", "Latha, Code2000"); pref("font.name-list.monospace.x-tamil", "Latha, Code2000"); +# http://www.alanwood.net/unicode/fonts.html + +pref("font.name.serif.x-armn", "Sylfaen"); +pref("font.name.sans-serif.x-armn", "Arial AMU"); +pref("font.name.monospace.x-armn", "Arial AMU"); +pref("font.name-list.serif.x-armn", "Sylfaen,Arial Unicode MS, Code2000"); +pref("font.name-list.monospace.x-armn", "Arial AMU, Arial Unicode MS, Code2000"); + +pref("font.name.serif.x-beng", "Akaash"); +pref("font.name.sans-serif.x-beng", "Likhan"); +pref("font.name.monospace.x-beng", "Mitra Mono"); +pref("font.name-list.serif.x-beng", "Akaash, Ekushey Punarbhaba, Code2000, Arial Unicode MS"); +pref("font.name-list.monospace.x-beng", "Likhan, Mukti Narrow, Code 2000, Arial Unicode MS"); + +pref("font.name.serif.x-cans", "Aboriginal Serif"); +pref("font.name.sans-serif.x-cans", "Aboriginal Sans"); +pref("font.name.monospace.x-cans", "Aboriginal Sans"); +pref("font.name-list.serif.x-cans", "Aboriginal Serif, BJCree Uni"); +pref("font.name-list.monospace.x-cans", "Aboriginal Sans, OskiDakelh, Pigiarniq, Uqammaq"); + +pref("font.name.serif.x-ethi", "Visual Geez Unicode"); +pref("font.name.sans-serif.x-ethi", "GF Zemen Unicode"); +pref("font.name.cursive.x-ethi", "Visual Geez Unicode Title"); +pref("font.name.monospace.x-ethi", "Ethiopia Jiret"); +pref("font.name-list.serif.x-ethi", "Visual Geez Unicode, Visual Geez Unicode Agazian, Code2000"); +pref("font.name-list.monospace.x-ethi", "Ethiopia Jiret, Code2000"); + +pref("font.name.serif.x-geor", "Sylfaen"); +pref("font.name.sans-serif.x-geor", "BPG Classic 99U"); +pref("font.name.monospace.x-geor", "Code2000"); +pref("font.name-list.serif.x-geor", "Sylfaen, BPG Paata Khutsuri U, TITUS Cyberbit Basic"); +pref("font.name-list.monospace.x-geor", "BPG Classic 99U, Code2000, Arial Unicode MS"); + +pref("font.name.serif.x-gujr", "Shruti"); +pref("font.name.sans-serif.x-gujr", "Shruti"); +pref("font.name.monospace.x-gujr", "Code2000"); +pref("font.name-list.serif.x-gujr", "Shruti, Code2000, Arial Unicode MS"); +pref("font.name-list.monospace.x-gujr", "Code2000, Shruti, Arial Unicode MS"); + +pref("font.name.serif.x-guru", "Raavi"); +pref("font.name.sans-serif.x-guru", "Code2000"); +pref("font.name.monospace.x-guru", "Code2000"); +pref("font.name-list.serif.x-guru", "Raavi, Saab, Code2000, Arial Unicode MS"); +pref("font.name-list.monospace.x-guru", "Code2000, Raavi, Saab, Arial Unicode MS"); + +pref("font.name.serif.x-khmr", "PhnomPenh OT"); +pref("font.name.sans-serif.x-khmr", "Khmer OS"); +pref("font.name.monospace.x-khmr", "Code2000"); +pref("font.name-list.serif.x-khmr", "PhnomPenh OT,.Mondulkiri U GR 1.5, Khmer OS"); +pref("font.name-list.monospace.x-khmr", "Code2000, Khmer OS, Khmer OS System"); + +pref("font.name.serif.x-mlym", "Kartika"); +pref("font.name.sans-serif.x-mlym", "Anjali-Beta"); +pref("font.name.monospace.x-mlym", "Code2000"); +pref("font.name-list.serif.x-mlym", "Kartika, ThoolikaUnicode, Code2000, Arial Unicode MS"); +pref("font.name-list.monospace.x-mlym", "Code2000, Anjali-Beta"); + pref("font.default.ar", "sans-serif"); pref("font.size.variable.ar", 16); pref("font.size.fixed.ar", 13); @@ -1051,6 +1108,42 @@ pref("font.default.x-tamil", "serif"); pref("font.size.variable.x-tamil", 16); pref("font.size.fixed.x-tamil", 13); +pref("font.default.x-armn", "serif"); +pref("font.size.variable.x-armn", 16); +pref("font.size.fixed.x-armn", 13); + +pref("font.default.x-beng", "serif"); +pref("font.size.variable.x-beng", 16); +pref("font.size.fixed.x-beng", 13); + +pref("font.default.x-cans", "serif"); +pref("font.size.variable.x-cans", 16); +pref("font.size.fixed.x-cans", 13); + +pref("font.default.x-ethi", "serif"); +pref("font.size.variable.x-ethi", 16); +pref("font.size.fixed.x-ethi", 13); + +pref("font.default.x-geor", "serif"); +pref("font.size.variable.x-geor", 16); +pref("font.size.fixed.x-geor", 13); + +pref("font.default.x-gujr", "serif"); +pref("font.size.variable.x-gujr", 16); +pref("font.size.fixed.x-gujr", 13); + +pref("font.default.x-guru", "serif"); +pref("font.size.variable.x-guru", 16); +pref("font.size.fixed.x-guru", 13); + +pref("font.default.x-khmr", "serif"); +pref("font.size.variable.x-khmr", 16); +pref("font.size.fixed.x-khmr", 13); + +pref("font.default.x-mlym", "serif"); +pref("font.size.variable.x-mlym", 16); +pref("font.size.fixed.x-mlym", 13); + pref("font.default.x-unicode", "serif"); pref("font.size.variable.x-unicode", 16); pref("font.size.fixed.x-unicode", 13); diff --git a/toolkit/locales/en-US/chrome/global/languageNames.properties b/toolkit/locales/en-US/chrome/global/languageNames.properties index 33f5d19b666..101fcd27fb2 100644 --- a/toolkit/locales/en-US/chrome/global/languageNames.properties +++ b/toolkit/locales/en-US/chrome/global/languageNames.properties @@ -163,6 +163,7 @@ te = Telugu tg = Tajik th = Thai ti = Tigrinya +tig = Tigre tk = Turkmen tl = Tagalog tlh = Klingon diff --git a/xpfe/components/prefwindow/resources/content/pref-fonts.xul b/xpfe/components/prefwindow/resources/content/pref-fonts.xul index 9fb689ffaff..0a040c63da7 100644 --- a/xpfe/components/prefwindow/resources/content/pref-fonts.xul +++ b/xpfe/components/prefwindow/resources/content/pref-fonts.xul @@ -80,6 +80,15 @@ + + + + + + + + + diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-fonts.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-fonts.dtd index 5203cf2612e..fed0ea54e79 100644 --- a/xpfe/components/prefwindow/resources/locale/en-US/pref-fonts.dtd +++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-fonts.dtd @@ -44,6 +44,15 @@ + + + + + + + + + diff --git a/xpfe/global/resources/locale/en-US/languageNames.properties b/xpfe/global/resources/locale/en-US/languageNames.properties index 33f5d19b666..101fcd27fb2 100644 --- a/xpfe/global/resources/locale/en-US/languageNames.properties +++ b/xpfe/global/resources/locale/en-US/languageNames.properties @@ -163,6 +163,7 @@ te = Telugu tg = Tajik th = Thai ti = Tigrinya +tig = Tigre tk = Turkmen tl = Tagalog tlh = Klingon