Add two Korean list styles (-moz-hangul and -moz-hangul-consonant) and rename existing list-style-type values that are our extensions to use -moz- prefix. Patch from Jungshik Shin <jshin@pantheon.yale.edu>. r=dbaron sr=attinasi b=63574

This commit is contained in:
dbaron%fas.harvard.edu 2001-07-04 02:05:59 +00:00
parent 2b5922e9c7
commit 5c00ae3d05
8 changed files with 356 additions and 290 deletions

@ -94,7 +94,7 @@ CSS_KEY(alias, alias)
CSS_KEY(all, all)
CSS_KEY(always, always)
CSS_KEY(appworkspace, appworkspace)
CSS_KEY(arabic-indic, arabic_indic)
CSS_KEY(-moz-arabic-indic, _moz_arabic_indic)
CSS_KEY(armenian, armenian)
CSS_KEY(auto, auto)
CSS_KEY(avoid, avoid)
@ -102,7 +102,7 @@ CSS_KEY(background, background)
CSS_KEY(baseline, baseline)
CSS_KEY(behind, behind)
CSS_KEY(below, below)
CSS_KEY(bengali, bengali)
CSS_KEY(-moz-bengali, _moz_bengali)
CSS_KEY(bidi-override, bidi_override)
CSS_KEY(blink, blink)
CSS_KEY(block, block)
@ -126,8 +126,8 @@ CSS_KEY(center-left, center_left)
CSS_KEY(center-right, center_right)
CSS_KEY(ch, ch)
CSS_KEY(circle, circle)
CSS_KEY(cjk-earthly-branch, cjk_earthly_branch)
CSS_KEY(cjk-heavenly-stem, cjk_heavenly_stem)
CSS_KEY(-moz-cjk-earthly-branch, _moz_cjk_earthly_branch)
CSS_KEY(-moz-cjk-heavenly-stem, _moz_cjk_heavenly_stem)
CSS_KEY(cjk-ideographic, cjk_ideographic)
CSS_KEY(close-quote, close_quote)
CSS_KEY(cm, cm)
@ -151,7 +151,7 @@ CSS_KEY(decimal-leading-zero, decimal_leading_zero)
CSS_KEY(default, default)
CSS_KEY(deg, deg)
CSS_KEY(desktop, desktop)
CSS_KEY(devanagari, devanagari)
CSS_KEY(-moz-devanagari, _moz_devanagari)
CSS_KEY(dialog, dialog)
CSS_KEY(digits, digits)
CSS_KEY(disabled, disabled)
@ -182,8 +182,10 @@ CSS_KEY(grabbing, grabbing)
CSS_KEY(grad, grad)
CSS_KEY(graytext, graytext)
CSS_KEY(groove, groove)
CSS_KEY(gujarati, gujarati)
CSS_KEY(gurmukhi, gurmukhi)
CSS_KEY(-moz-gujarati, _moz_gujarati)
CSS_KEY(-moz-gurmukhi, _moz_gurmukhi)
CSS_KEY(-moz-hangul, _moz_hangul)
CSS_KEY(-moz-hangul-consonant, _moz_hangul_consonant)
CSS_KEY(hebrew, hebrew)
CSS_KEY(help, help)
CSS_KEY(hidden, hidden)
@ -214,16 +216,16 @@ CSS_KEY(inset, inset)
CSS_KEY(inside, inside)
CSS_KEY(invert, invert)
CSS_KEY(italic, italic)
CSS_KEY(japanese-formal, japanese_formal)
CSS_KEY(japanese-informal, japanese_informal)
CSS_KEY(-moz-japanese-formal, _moz_japanese_formal)
CSS_KEY(-moz-japanese-informal, _moz_japanese_informal)
CSS_KEY(justify, justify)
CSS_KEY(kannada, kannada)
CSS_KEY(-moz-kannada, _moz_kannada)
CSS_KEY(katakana, katakana)
CSS_KEY(katakana-iroha, katakana_iroha)
CSS_KEY(khmer, khmer)
CSS_KEY(-moz-khmer, _moz_khmer)
CSS_KEY(khz, khz)
CSS_KEY(landscape, landscape)
CSS_KEY(lao, lao)
CSS_KEY(-moz-lao, _moz_lao)
CSS_KEY(large, large)
CSS_KEY(larger, larger)
CSS_KEY(left, left)
@ -243,7 +245,7 @@ CSS_KEY(lower-latin, lower_latin)
CSS_KEY(lower-roman, lower_roman)
CSS_KEY(lowercase, lowercase)
CSS_KEY(ltr, ltr)
CSS_KEY(malayalam, malayalam)
CSS_KEY(-moz-malayalam, _moz_malayalam)
CSS_KEY(margin-box, margin_box)
CSS_KEY(marker, marker)
CSS_KEY(medium, medium)
@ -255,7 +257,7 @@ CSS_KEY(mix, mix)
CSS_KEY(mm, mm)
CSS_KEY(move, move)
CSS_KEY(ms, ms)
CSS_KEY(myanmar, myanmar)
CSS_KEY(-moz-myanmar, _moz_myanmar)
CSS_KEY(n-resize, n_resize)
CSS_KEY(narrower, narrower)
CSS_KEY(ne-resize, ne_resize)
@ -270,14 +272,14 @@ CSS_KEY(nw-resize, nw_resize)
CSS_KEY(oblique, oblique)
CSS_KEY(once, once)
CSS_KEY(open-quote, open_quote)
CSS_KEY(oriya, oriya)
CSS_KEY(-moz-oriya, _moz_oriya)
CSS_KEY(outset, outset)
CSS_KEY(outside, outside)
CSS_KEY(overline, overline)
CSS_KEY(padding-box, padding_box)
CSS_KEY(paragraph, paragraph)
CSS_KEY(pc, pc)
CSS_KEY(persian, persian)
CSS_KEY(-moz-persian, _moz_persian)
CSS_KEY(pointer, pointer)
CSS_KEY(portrait, portrait)
CSS_KEY(pre, pre)
@ -313,8 +315,8 @@ CSS_KEY(semi-expanded, semi_expanded)
CSS_KEY(separate, separate)
CSS_KEY(show, show)
CSS_KEY(silent, silent)
CSS_KEY(simp-chinese-formal, simp_chinese_formal)
CSS_KEY(simp-chinese-informal, simp_chinese_informal)
CSS_KEY(-moz-simp-chinese-formal, _moz_simp_chinese_formal)
CSS_KEY(-moz-simp-chinese-informal, _moz_simp_chinese_informal)
CSS_KEY(slow, slow)
CSS_KEY(slower, slower)
CSS_KEY(small, small)
@ -342,12 +344,12 @@ CSS_KEY(table-footer-group, table_footer_group)
CSS_KEY(table-header-group, table_header_group)
CSS_KEY(table-row, table_row)
CSS_KEY(table-row-group, table_row_group)
CSS_KEY(tamil, tamil)
CSS_KEY(telugu, telugu)
CSS_KEY(-moz-tamil, _moz_tamil)
CSS_KEY(-moz-telugu, _moz_telugu)
CSS_KEY(text, text)
CSS_KEY(text-bottom, text_bottom)
CSS_KEY(text-top, text_top)
CSS_KEY(thai, thai)
CSS_KEY(-moz-thai, _moz_thai)
CSS_KEY(thick, thick)
CSS_KEY(thin, thin)
CSS_KEY(threeddarkshadow, threeddarkshadow)
@ -357,8 +359,8 @@ CSS_KEY(threedlightshadow, threedlightshadow)
CSS_KEY(threedshadow, threedshadow)
CSS_KEY(toggle, toggle)
CSS_KEY(top, top)
CSS_KEY(trad-chinese-formal, trad_chinese_formal)
CSS_KEY(trad-chinese-informal, trad_chinese_informal)
CSS_KEY(-moz-trad-chinese-formal, _moz_trad_chinese_formal)
CSS_KEY(-moz-trad-chinese-informal, _moz_trad_chinese_informal)
CSS_KEY(transparent, transparent)
CSS_KEY(tri-state, tri_state)
CSS_KEY(ultra-condensed, ultra_condensed)
@ -368,7 +370,7 @@ CSS_KEY(upper-alpha, upper_alpha)
CSS_KEY(upper-latin, upper_latin)
CSS_KEY(upper-roman, upper_roman)
CSS_KEY(uppercase, uppercase)
CSS_KEY(urdu, urdu)
CSS_KEY(-moz-urdu, _moz_urdu)
CSS_KEY(vertical, vertical)
CSS_KEY(visible, visible)
CSS_KEY(w-resize, w_resize)

@ -448,30 +448,32 @@ const PRInt32 nsCSSProps::kListStyleKTable[] = {
eCSSKeyword_katakana, NS_STYLE_LIST_STYLE_KATAKANA,
eCSSKeyword_hiragana_iroha, NS_STYLE_LIST_STYLE_HIRAGANA_IROHA,
eCSSKeyword_katakana_iroha, NS_STYLE_LIST_STYLE_KATAKANA_IROHA,
eCSSKeyword_cjk_heavenly_stem, NS_STYLE_LIST_STYLE_CJK_HEAVENLY_STEM,
eCSSKeyword_cjk_earthly_branch, NS_STYLE_LIST_STYLE_CJK_EARTHLY_BRANCH,
eCSSKeyword_trad_chinese_informal, NS_STYLE_LIST_STYLE_TRAD_CHINESE_INFORMAL,
eCSSKeyword_trad_chinese_formal, NS_STYLE_LIST_STYLE_TRAD_CHINESE_FORMAL,
eCSSKeyword_simp_chinese_informal, NS_STYLE_LIST_STYLE_SIMP_CHINESE_INFORMAL,
eCSSKeyword_simp_chinese_formal, NS_STYLE_LIST_STYLE_SIMP_CHINESE_FORMAL,
eCSSKeyword_japanese_informal, NS_STYLE_LIST_STYLE_JAPANESE_INFORMAL,
eCSSKeyword_japanese_formal, NS_STYLE_LIST_STYLE_JAPANESE_FORMAL,
eCSSKeyword_arabic_indic, NS_STYLE_LIST_STYLE_ARABIC_INDIC,
eCSSKeyword_persian, NS_STYLE_LIST_STYLE_PERSIAN,
eCSSKeyword_urdu, NS_STYLE_LIST_STYLE_URDU,
eCSSKeyword_devanagari, NS_STYLE_LIST_STYLE_DEVANAGARI,
eCSSKeyword_gurmukhi, NS_STYLE_LIST_STYLE_GURMUKHI,
eCSSKeyword_gujarati, NS_STYLE_LIST_STYLE_GUJARATI,
eCSSKeyword_oriya, NS_STYLE_LIST_STYLE_ORIYA,
eCSSKeyword_kannada, NS_STYLE_LIST_STYLE_KANNADA,
eCSSKeyword_malayalam, NS_STYLE_LIST_STYLE_MALAYALAM,
eCSSKeyword_bengali, NS_STYLE_LIST_STYLE_BENGALI,
eCSSKeyword_tamil, NS_STYLE_LIST_STYLE_TAMIL,
eCSSKeyword_telugu, NS_STYLE_LIST_STYLE_TELUGU,
eCSSKeyword_thai, NS_STYLE_LIST_STYLE_THAI,
eCSSKeyword_lao, NS_STYLE_LIST_STYLE_LAO,
eCSSKeyword_myanmar, NS_STYLE_LIST_STYLE_MYANMAR,
eCSSKeyword_khmer, NS_STYLE_LIST_STYLE_KHMER,
eCSSKeyword__moz_cjk_heavenly_stem, NS_STYLE_LIST_STYLE_MOZ_CJK_HEAVENLY_STEM,
eCSSKeyword__moz_cjk_earthly_branch, NS_STYLE_LIST_STYLE_MOZ_CJK_EARTHLY_BRANCH,
eCSSKeyword__moz_trad_chinese_informal, NS_STYLE_LIST_STYLE_MOZ_TRAD_CHINESE_INFORMAL,
eCSSKeyword__moz_trad_chinese_formal, NS_STYLE_LIST_STYLE_MOZ_TRAD_CHINESE_FORMAL,
eCSSKeyword__moz_simp_chinese_informal, NS_STYLE_LIST_STYLE_MOZ_SIMP_CHINESE_INFORMAL,
eCSSKeyword__moz_simp_chinese_formal, NS_STYLE_LIST_STYLE_MOZ_SIMP_CHINESE_FORMAL,
eCSSKeyword__moz_japanese_informal, NS_STYLE_LIST_STYLE_MOZ_JAPANESE_INFORMAL,
eCSSKeyword__moz_japanese_formal, NS_STYLE_LIST_STYLE_MOZ_JAPANESE_FORMAL,
eCSSKeyword__moz_arabic_indic, NS_STYLE_LIST_STYLE_MOZ_ARABIC_INDIC,
eCSSKeyword__moz_persian, NS_STYLE_LIST_STYLE_MOZ_PERSIAN,
eCSSKeyword__moz_urdu, NS_STYLE_LIST_STYLE_MOZ_URDU,
eCSSKeyword__moz_devanagari, NS_STYLE_LIST_STYLE_MOZ_DEVANAGARI,
eCSSKeyword__moz_gurmukhi, NS_STYLE_LIST_STYLE_MOZ_GURMUKHI,
eCSSKeyword__moz_gujarati, NS_STYLE_LIST_STYLE_MOZ_GUJARATI,
eCSSKeyword__moz_oriya, NS_STYLE_LIST_STYLE_MOZ_ORIYA,
eCSSKeyword__moz_kannada, NS_STYLE_LIST_STYLE_MOZ_KANNADA,
eCSSKeyword__moz_malayalam, NS_STYLE_LIST_STYLE_MOZ_MALAYALAM,
eCSSKeyword__moz_bengali, NS_STYLE_LIST_STYLE_MOZ_BENGALI,
eCSSKeyword__moz_tamil, NS_STYLE_LIST_STYLE_MOZ_TAMIL,
eCSSKeyword__moz_telugu, NS_STYLE_LIST_STYLE_MOZ_TELUGU,
eCSSKeyword__moz_thai, NS_STYLE_LIST_STYLE_MOZ_THAI,
eCSSKeyword__moz_lao, NS_STYLE_LIST_STYLE_MOZ_LAO,
eCSSKeyword__moz_myanmar, NS_STYLE_LIST_STYLE_MOZ_MYANMAR,
eCSSKeyword__moz_khmer, NS_STYLE_LIST_STYLE_MOZ_KHMER,
eCSSKeyword__moz_hangul, NS_STYLE_LIST_STYLE_MOZ_HANGUL,
eCSSKeyword__moz_hangul_consonant, NS_STYLE_LIST_STYLE_MOZ_HANGUL_CONSONANT,
-1,-1
};

@ -437,30 +437,32 @@
#define NS_STYLE_LIST_STYLE_OLD_LOWER_ALPHA 21
#define NS_STYLE_LIST_STYLE_OLD_UPPER_ALPHA 22
#define NS_STYLE_LIST_STYLE_OLD_DECIMAL 23
#define NS_STYLE_LIST_STYLE_CJK_HEAVENLY_STEM 24
#define NS_STYLE_LIST_STYLE_CJK_EARTHLY_BRANCH 25
#define NS_STYLE_LIST_STYLE_TRAD_CHINESE_INFORMAL 26
#define NS_STYLE_LIST_STYLE_TRAD_CHINESE_FORMAL 27
#define NS_STYLE_LIST_STYLE_SIMP_CHINESE_INFORMAL 28
#define NS_STYLE_LIST_STYLE_SIMP_CHINESE_FORMAL 29
#define NS_STYLE_LIST_STYLE_JAPANESE_INFORMAL 30
#define NS_STYLE_LIST_STYLE_JAPANESE_FORMAL 31
#define NS_STYLE_LIST_STYLE_ARABIC_INDIC 32
#define NS_STYLE_LIST_STYLE_PERSIAN 33
#define NS_STYLE_LIST_STYLE_URDU 34
#define NS_STYLE_LIST_STYLE_DEVANAGARI 35
#define NS_STYLE_LIST_STYLE_GURMUKHI 36
#define NS_STYLE_LIST_STYLE_GUJARATI 37
#define NS_STYLE_LIST_STYLE_ORIYA 38
#define NS_STYLE_LIST_STYLE_KANNADA 39
#define NS_STYLE_LIST_STYLE_MALAYALAM 40
#define NS_STYLE_LIST_STYLE_BENGALI 41
#define NS_STYLE_LIST_STYLE_TAMIL 42
#define NS_STYLE_LIST_STYLE_TELUGU 43
#define NS_STYLE_LIST_STYLE_THAI 44
#define NS_STYLE_LIST_STYLE_LAO 45
#define NS_STYLE_LIST_STYLE_MYANMAR 46
#define NS_STYLE_LIST_STYLE_KHMER 47
#define NS_STYLE_LIST_STYLE_MOZ_CJK_HEAVENLY_STEM 24
#define NS_STYLE_LIST_STYLE_MOZ_CJK_EARTHLY_BRANCH 25
#define NS_STYLE_LIST_STYLE_MOZ_TRAD_CHINESE_INFORMAL 26
#define NS_STYLE_LIST_STYLE_MOZ_TRAD_CHINESE_FORMAL 27
#define NS_STYLE_LIST_STYLE_MOZ_SIMP_CHINESE_INFORMAL 28
#define NS_STYLE_LIST_STYLE_MOZ_SIMP_CHINESE_FORMAL 29
#define NS_STYLE_LIST_STYLE_MOZ_JAPANESE_INFORMAL 30
#define NS_STYLE_LIST_STYLE_MOZ_JAPANESE_FORMAL 31
#define NS_STYLE_LIST_STYLE_MOZ_ARABIC_INDIC 32
#define NS_STYLE_LIST_STYLE_MOZ_PERSIAN 33
#define NS_STYLE_LIST_STYLE_MOZ_URDU 34
#define NS_STYLE_LIST_STYLE_MOZ_DEVANAGARI 35
#define NS_STYLE_LIST_STYLE_MOZ_GURMUKHI 36
#define NS_STYLE_LIST_STYLE_MOZ_GUJARATI 37
#define NS_STYLE_LIST_STYLE_MOZ_ORIYA 38
#define NS_STYLE_LIST_STYLE_MOZ_KANNADA 39
#define NS_STYLE_LIST_STYLE_MOZ_MALAYALAM 40
#define NS_STYLE_LIST_STYLE_MOZ_BENGALI 41
#define NS_STYLE_LIST_STYLE_MOZ_TAMIL 42
#define NS_STYLE_LIST_STYLE_MOZ_TELUGU 43
#define NS_STYLE_LIST_STYLE_MOZ_THAI 44
#define NS_STYLE_LIST_STYLE_MOZ_LAO 45
#define NS_STYLE_LIST_STYLE_MOZ_MYANMAR 46
#define NS_STYLE_LIST_STYLE_MOZ_KHMER 47
#define NS_STYLE_LIST_STYLE_MOZ_HANGUL 48
#define NS_STYLE_LIST_STYLE_MOZ_HANGUL_CONSONANT 49
#define NS_STYLE_LIST_STYLE_BASIC 100 // not in css
// See nsStyleList

@ -437,30 +437,32 @@
#define NS_STYLE_LIST_STYLE_OLD_LOWER_ALPHA 21
#define NS_STYLE_LIST_STYLE_OLD_UPPER_ALPHA 22
#define NS_STYLE_LIST_STYLE_OLD_DECIMAL 23
#define NS_STYLE_LIST_STYLE_CJK_HEAVENLY_STEM 24
#define NS_STYLE_LIST_STYLE_CJK_EARTHLY_BRANCH 25
#define NS_STYLE_LIST_STYLE_TRAD_CHINESE_INFORMAL 26
#define NS_STYLE_LIST_STYLE_TRAD_CHINESE_FORMAL 27
#define NS_STYLE_LIST_STYLE_SIMP_CHINESE_INFORMAL 28
#define NS_STYLE_LIST_STYLE_SIMP_CHINESE_FORMAL 29
#define NS_STYLE_LIST_STYLE_JAPANESE_INFORMAL 30
#define NS_STYLE_LIST_STYLE_JAPANESE_FORMAL 31
#define NS_STYLE_LIST_STYLE_ARABIC_INDIC 32
#define NS_STYLE_LIST_STYLE_PERSIAN 33
#define NS_STYLE_LIST_STYLE_URDU 34
#define NS_STYLE_LIST_STYLE_DEVANAGARI 35
#define NS_STYLE_LIST_STYLE_GURMUKHI 36
#define NS_STYLE_LIST_STYLE_GUJARATI 37
#define NS_STYLE_LIST_STYLE_ORIYA 38
#define NS_STYLE_LIST_STYLE_KANNADA 39
#define NS_STYLE_LIST_STYLE_MALAYALAM 40
#define NS_STYLE_LIST_STYLE_BENGALI 41
#define NS_STYLE_LIST_STYLE_TAMIL 42
#define NS_STYLE_LIST_STYLE_TELUGU 43
#define NS_STYLE_LIST_STYLE_THAI 44
#define NS_STYLE_LIST_STYLE_LAO 45
#define NS_STYLE_LIST_STYLE_MYANMAR 46
#define NS_STYLE_LIST_STYLE_KHMER 47
#define NS_STYLE_LIST_STYLE_MOZ_CJK_HEAVENLY_STEM 24
#define NS_STYLE_LIST_STYLE_MOZ_CJK_EARTHLY_BRANCH 25
#define NS_STYLE_LIST_STYLE_MOZ_TRAD_CHINESE_INFORMAL 26
#define NS_STYLE_LIST_STYLE_MOZ_TRAD_CHINESE_FORMAL 27
#define NS_STYLE_LIST_STYLE_MOZ_SIMP_CHINESE_INFORMAL 28
#define NS_STYLE_LIST_STYLE_MOZ_SIMP_CHINESE_FORMAL 29
#define NS_STYLE_LIST_STYLE_MOZ_JAPANESE_INFORMAL 30
#define NS_STYLE_LIST_STYLE_MOZ_JAPANESE_FORMAL 31
#define NS_STYLE_LIST_STYLE_MOZ_ARABIC_INDIC 32
#define NS_STYLE_LIST_STYLE_MOZ_PERSIAN 33
#define NS_STYLE_LIST_STYLE_MOZ_URDU 34
#define NS_STYLE_LIST_STYLE_MOZ_DEVANAGARI 35
#define NS_STYLE_LIST_STYLE_MOZ_GURMUKHI 36
#define NS_STYLE_LIST_STYLE_MOZ_GUJARATI 37
#define NS_STYLE_LIST_STYLE_MOZ_ORIYA 38
#define NS_STYLE_LIST_STYLE_MOZ_KANNADA 39
#define NS_STYLE_LIST_STYLE_MOZ_MALAYALAM 40
#define NS_STYLE_LIST_STYLE_MOZ_BENGALI 41
#define NS_STYLE_LIST_STYLE_MOZ_TAMIL 42
#define NS_STYLE_LIST_STYLE_MOZ_TELUGU 43
#define NS_STYLE_LIST_STYLE_MOZ_THAI 44
#define NS_STYLE_LIST_STYLE_MOZ_LAO 45
#define NS_STYLE_LIST_STYLE_MOZ_MYANMAR 46
#define NS_STYLE_LIST_STYLE_MOZ_KHMER 47
#define NS_STYLE_LIST_STYLE_MOZ_HANGUL 48
#define NS_STYLE_LIST_STYLE_MOZ_HANGUL_CONSONANT 49
#define NS_STYLE_LIST_STYLE_BASIC 100 // not in css
// See nsStyleList

@ -189,7 +189,7 @@ nsBulletFrame::Paint(nsIPresContext* aPresContext,
charType = eCharType_EuropeanNumber;
break;
case NS_STYLE_LIST_STYLE_ARABIC_INDIC:
case NS_STYLE_LIST_STYLE_MOZ_ARABIC_INDIC:
GetListItemText(aPresContext, *myList, text);
charType = eCharType_ArabicNumber;
break;
@ -230,32 +230,34 @@ nsBulletFrame::Paint(nsIPresContext* aPresContext,
case NS_STYLE_LIST_STYLE_KATAKANA:
case NS_STYLE_LIST_STYLE_HIRAGANA_IROHA:
case NS_STYLE_LIST_STYLE_KATAKANA_IROHA:
case NS_STYLE_LIST_STYLE_SIMP_CHINESE_INFORMAL:
case NS_STYLE_LIST_STYLE_SIMP_CHINESE_FORMAL:
case NS_STYLE_LIST_STYLE_TRAD_CHINESE_INFORMAL:
case NS_STYLE_LIST_STYLE_TRAD_CHINESE_FORMAL:
case NS_STYLE_LIST_STYLE_JAPANESE_INFORMAL:
case NS_STYLE_LIST_STYLE_JAPANESE_FORMAL:
case NS_STYLE_LIST_STYLE_CJK_HEAVENLY_STEM:
case NS_STYLE_LIST_STYLE_CJK_EARTHLY_BRANCH:
case NS_STYLE_LIST_STYLE_MOZ_SIMP_CHINESE_INFORMAL:
case NS_STYLE_LIST_STYLE_MOZ_SIMP_CHINESE_FORMAL:
case NS_STYLE_LIST_STYLE_MOZ_TRAD_CHINESE_INFORMAL:
case NS_STYLE_LIST_STYLE_MOZ_TRAD_CHINESE_FORMAL:
case NS_STYLE_LIST_STYLE_MOZ_JAPANESE_INFORMAL:
case NS_STYLE_LIST_STYLE_MOZ_JAPANESE_FORMAL:
case NS_STYLE_LIST_STYLE_MOZ_CJK_HEAVENLY_STEM:
case NS_STYLE_LIST_STYLE_MOZ_CJK_EARTHLY_BRANCH:
#ifndef IBMBIDI
case NS_STYLE_LIST_STYLE_ARABIC_INDIC:
case NS_STYLE_LIST_STYLE_MOZ_ARABIC_INDIC:
#endif
case NS_STYLE_LIST_STYLE_PERSIAN:
case NS_STYLE_LIST_STYLE_URDU:
case NS_STYLE_LIST_STYLE_DEVANAGARI:
case NS_STYLE_LIST_STYLE_GURMUKHI:
case NS_STYLE_LIST_STYLE_GUJARATI:
case NS_STYLE_LIST_STYLE_ORIYA:
case NS_STYLE_LIST_STYLE_KANNADA:
case NS_STYLE_LIST_STYLE_MALAYALAM:
case NS_STYLE_LIST_STYLE_BENGALI:
case NS_STYLE_LIST_STYLE_TAMIL:
case NS_STYLE_LIST_STYLE_TELUGU:
case NS_STYLE_LIST_STYLE_THAI:
case NS_STYLE_LIST_STYLE_LAO:
case NS_STYLE_LIST_STYLE_MYANMAR:
case NS_STYLE_LIST_STYLE_KHMER:
case NS_STYLE_LIST_STYLE_MOZ_PERSIAN:
case NS_STYLE_LIST_STYLE_MOZ_URDU:
case NS_STYLE_LIST_STYLE_MOZ_DEVANAGARI:
case NS_STYLE_LIST_STYLE_MOZ_GURMUKHI:
case NS_STYLE_LIST_STYLE_MOZ_GUJARATI:
case NS_STYLE_LIST_STYLE_MOZ_ORIYA:
case NS_STYLE_LIST_STYLE_MOZ_KANNADA:
case NS_STYLE_LIST_STYLE_MOZ_MALAYALAM:
case NS_STYLE_LIST_STYLE_MOZ_BENGALI:
case NS_STYLE_LIST_STYLE_MOZ_TAMIL:
case NS_STYLE_LIST_STYLE_MOZ_TELUGU:
case NS_STYLE_LIST_STYLE_MOZ_THAI:
case NS_STYLE_LIST_STYLE_MOZ_LAO:
case NS_STYLE_LIST_STYLE_MOZ_MYANMAR:
case NS_STYLE_LIST_STYLE_MOZ_KHMER:
case NS_STYLE_LIST_STYLE_MOZ_HANGUL:
case NS_STYLE_LIST_STYLE_MOZ_HANGUL_CONSONANT:
aPresContext->GetMetricsFor(myFont->mFont, getter_AddRefs(fm));
GetListItemText(aPresContext, *myList, text);
aRenderingContext.SetFont(fm);
@ -521,6 +523,21 @@ static PRUnichar gCJKEarthlyBranchChars[CJK_EARTHLY_BRANCH_CHARS_SIZE] =
0x5b50, 0x4e11, 0x5bc5, 0x536f, 0x8fb0, 0x5df3,
0x5348, 0x672a, 0x7533, 0x9149, 0x620c, 0x4ea5
};
#define HANGUL_CHARS_SIZE 14
static PRUnichar gHangulChars[HANGUL_CHARS_SIZE] =
{
0xac00, 0xb098, 0xb2e4, 0xb77c, 0xb9c8, 0xbc14,
0xc0ac, 0xc544, 0xc790, 0xcc28, 0xce74, 0xd0c0,
0xd30c, 0xd558
};
#define HANGUL_CONSONANT_CHARS_SIZE 14
static PRUnichar gHangulConsonantChars[HANGUL_CONSONANT_CHARS_SIZE] =
{
0x3131, 0x3134, 0x3137, 0x3139, 0x3141, 0x3142,
0x3145, 0x3147, 0x3148, 0x314a, 0x314b, 0x314c,
0x314d, 0x314e
};
// We know cjk-ideographic need 31 characters to display 99,999,999,999,999,999
// georgian and armenian need 6 at most
// hebrew may need more...
@ -909,27 +926,27 @@ nsBulletFrame::GetListItemText(nsIPresContext* aCX,
break;
case NS_STYLE_LIST_STYLE_CJK_IDEOGRAPHIC:
case NS_STYLE_LIST_STYLE_TRAD_CHINESE_INFORMAL:
case NS_STYLE_LIST_STYLE_MOZ_TRAD_CHINESE_INFORMAL:
CJKIdeographicToText(mOrdinal, result, gCJKIdeographicDigit1, gCJKIdeographicUnit1, gCJKIdeographic10KUnit1);
break;
case NS_STYLE_LIST_STYLE_TRAD_CHINESE_FORMAL:
case NS_STYLE_LIST_STYLE_MOZ_TRAD_CHINESE_FORMAL:
CJKIdeographicToText(mOrdinal, result, gCJKIdeographicDigit2, gCJKIdeographicUnit2, gCJKIdeographic10KUnit1);
break;
case NS_STYLE_LIST_STYLE_SIMP_CHINESE_INFORMAL:
case NS_STYLE_LIST_STYLE_MOZ_SIMP_CHINESE_INFORMAL:
CJKIdeographicToText(mOrdinal, result, gCJKIdeographicDigit1, gCJKIdeographicUnit1, gCJKIdeographic10KUnit2);
break;
case NS_STYLE_LIST_STYLE_SIMP_CHINESE_FORMAL:
case NS_STYLE_LIST_STYLE_MOZ_SIMP_CHINESE_FORMAL:
CJKIdeographicToText(mOrdinal, result, gCJKIdeographicDigit3, gCJKIdeographicUnit2, gCJKIdeographic10KUnit2);
break;
case NS_STYLE_LIST_STYLE_JAPANESE_INFORMAL:
case NS_STYLE_LIST_STYLE_MOZ_JAPANESE_INFORMAL:
CJKIdeographicToText(mOrdinal, result, gCJKIdeographicDigit1, gCJKIdeographicUnit1, gCJKIdeographic10KUnit3);
break;
case NS_STYLE_LIST_STYLE_JAPANESE_FORMAL:
case NS_STYLE_LIST_STYLE_MOZ_JAPANESE_FORMAL:
CJKIdeographicToText(mOrdinal, result, gCJKIdeographicDigit2, gCJKIdeographicUnit2, gCJKIdeographic10KUnit3);
break;
@ -945,74 +962,82 @@ nsBulletFrame::GetListItemText(nsIPresContext* aCX,
GeorgianToText(mOrdinal, result);
break;
case NS_STYLE_LIST_STYLE_ARABIC_INDIC:
case NS_STYLE_LIST_STYLE_MOZ_ARABIC_INDIC:
OtherDecimalToText(mOrdinal, 0x0660, result);
break;
case NS_STYLE_LIST_STYLE_PERSIAN:
case NS_STYLE_LIST_STYLE_URDU:
case NS_STYLE_LIST_STYLE_MOZ_PERSIAN:
case NS_STYLE_LIST_STYLE_MOZ_URDU:
OtherDecimalToText(mOrdinal, 0x06f0, result);
break;
case NS_STYLE_LIST_STYLE_DEVANAGARI:
case NS_STYLE_LIST_STYLE_MOZ_DEVANAGARI:
OtherDecimalToText(mOrdinal, 0x0966, result);
break;
case NS_STYLE_LIST_STYLE_GURMUKHI:
case NS_STYLE_LIST_STYLE_MOZ_GURMUKHI:
OtherDecimalToText(mOrdinal, 0x0a66, result);
break;
case NS_STYLE_LIST_STYLE_GUJARATI:
case NS_STYLE_LIST_STYLE_MOZ_GUJARATI:
OtherDecimalToText(mOrdinal, 0x0AE6, result);
break;
case NS_STYLE_LIST_STYLE_ORIYA:
case NS_STYLE_LIST_STYLE_MOZ_ORIYA:
OtherDecimalToText(mOrdinal, 0x0B66, result);
break;
case NS_STYLE_LIST_STYLE_KANNADA:
case NS_STYLE_LIST_STYLE_MOZ_KANNADA:
OtherDecimalToText(mOrdinal, 0x0CE6, result);
break;
case NS_STYLE_LIST_STYLE_MALAYALAM:
case NS_STYLE_LIST_STYLE_MOZ_MALAYALAM:
OtherDecimalToText(mOrdinal, 0x0D66, result);
break;
case NS_STYLE_LIST_STYLE_THAI:
case NS_STYLE_LIST_STYLE_MOZ_THAI:
OtherDecimalToText(mOrdinal, 0x0E50, result);
break;
case NS_STYLE_LIST_STYLE_LAO:
case NS_STYLE_LIST_STYLE_MOZ_LAO:
OtherDecimalToText(mOrdinal, 0x0ED0, result);
break;
case NS_STYLE_LIST_STYLE_MYANMAR:
case NS_STYLE_LIST_STYLE_MOZ_MYANMAR:
OtherDecimalToText(mOrdinal, 0x1040, result);
break;
case NS_STYLE_LIST_STYLE_KHMER:
case NS_STYLE_LIST_STYLE_MOZ_KHMER:
OtherDecimalToText(mOrdinal, 0x17E0, result);
break;
case NS_STYLE_LIST_STYLE_BENGALI:
case NS_STYLE_LIST_STYLE_MOZ_BENGALI:
OtherDecimalToText(mOrdinal, 0x09E6, result);
break;
case NS_STYLE_LIST_STYLE_TELUGU:
case NS_STYLE_LIST_STYLE_MOZ_TELUGU:
OtherDecimalToText(mOrdinal, 0x0C66, result);
break;
case NS_STYLE_LIST_STYLE_TAMIL:
case NS_STYLE_LIST_STYLE_MOZ_TAMIL:
TamilToText(mOrdinal, result);
break;
case NS_STYLE_LIST_STYLE_CJK_HEAVENLY_STEM:
case NS_STYLE_LIST_STYLE_MOZ_CJK_HEAVENLY_STEM:
CharListToText(mOrdinal, result, gCJKHeavenlyStemChars, CJK_HEAVENLY_STEM_CHARS_SIZE);
break;
case NS_STYLE_LIST_STYLE_CJK_EARTHLY_BRANCH:
case NS_STYLE_LIST_STYLE_MOZ_CJK_EARTHLY_BRANCH:
CharListToText(mOrdinal, result, gCJKEarthlyBranchChars, CJK_EARTHLY_BRANCH_CHARS_SIZE);
break;
case NS_STYLE_LIST_STYLE_MOZ_HANGUL:
CharListToText(mOrdinal, result, gHangulChars, HANGUL_CHARS_SIZE);
break;
case NS_STYLE_LIST_STYLE_MOZ_HANGUL_CONSONANT:
CharListToText(mOrdinal, result, gHangulConsonantChars, HANGUL_CONSONANT_CHARS_SIZE);
break;
}
#ifdef IBMBIDI
if (NS_STYLE_DIRECTION_RTL != vis->mDirection)
@ -1142,30 +1167,32 @@ nsBulletFrame::GetDesiredSize(nsIPresContext* aCX,
case NS_STYLE_LIST_STYLE_ARMENIAN:
case NS_STYLE_LIST_STYLE_GEORGIAN:
case NS_STYLE_LIST_STYLE_CJK_IDEOGRAPHIC:
case NS_STYLE_LIST_STYLE_SIMP_CHINESE_INFORMAL:
case NS_STYLE_LIST_STYLE_SIMP_CHINESE_FORMAL:
case NS_STYLE_LIST_STYLE_TRAD_CHINESE_INFORMAL:
case NS_STYLE_LIST_STYLE_TRAD_CHINESE_FORMAL:
case NS_STYLE_LIST_STYLE_JAPANESE_INFORMAL:
case NS_STYLE_LIST_STYLE_JAPANESE_FORMAL:
case NS_STYLE_LIST_STYLE_CJK_HEAVENLY_STEM:
case NS_STYLE_LIST_STYLE_CJK_EARTHLY_BRANCH:
case NS_STYLE_LIST_STYLE_ARABIC_INDIC:
case NS_STYLE_LIST_STYLE_PERSIAN:
case NS_STYLE_LIST_STYLE_URDU:
case NS_STYLE_LIST_STYLE_DEVANAGARI:
case NS_STYLE_LIST_STYLE_GURMUKHI:
case NS_STYLE_LIST_STYLE_GUJARATI:
case NS_STYLE_LIST_STYLE_ORIYA:
case NS_STYLE_LIST_STYLE_KANNADA:
case NS_STYLE_LIST_STYLE_MALAYALAM:
case NS_STYLE_LIST_STYLE_BENGALI:
case NS_STYLE_LIST_STYLE_TAMIL:
case NS_STYLE_LIST_STYLE_TELUGU:
case NS_STYLE_LIST_STYLE_THAI:
case NS_STYLE_LIST_STYLE_LAO:
case NS_STYLE_LIST_STYLE_MYANMAR:
case NS_STYLE_LIST_STYLE_KHMER:
case NS_STYLE_LIST_STYLE_MOZ_SIMP_CHINESE_INFORMAL:
case NS_STYLE_LIST_STYLE_MOZ_SIMP_CHINESE_FORMAL:
case NS_STYLE_LIST_STYLE_MOZ_TRAD_CHINESE_INFORMAL:
case NS_STYLE_LIST_STYLE_MOZ_TRAD_CHINESE_FORMAL:
case NS_STYLE_LIST_STYLE_MOZ_JAPANESE_INFORMAL:
case NS_STYLE_LIST_STYLE_MOZ_JAPANESE_FORMAL:
case NS_STYLE_LIST_STYLE_MOZ_CJK_HEAVENLY_STEM:
case NS_STYLE_LIST_STYLE_MOZ_CJK_EARTHLY_BRANCH:
case NS_STYLE_LIST_STYLE_MOZ_ARABIC_INDIC:
case NS_STYLE_LIST_STYLE_MOZ_PERSIAN:
case NS_STYLE_LIST_STYLE_MOZ_URDU:
case NS_STYLE_LIST_STYLE_MOZ_DEVANAGARI:
case NS_STYLE_LIST_STYLE_MOZ_GURMUKHI:
case NS_STYLE_LIST_STYLE_MOZ_GUJARATI:
case NS_STYLE_LIST_STYLE_MOZ_ORIYA:
case NS_STYLE_LIST_STYLE_MOZ_KANNADA:
case NS_STYLE_LIST_STYLE_MOZ_MALAYALAM:
case NS_STYLE_LIST_STYLE_MOZ_BENGALI:
case NS_STYLE_LIST_STYLE_MOZ_TAMIL:
case NS_STYLE_LIST_STYLE_MOZ_TELUGU:
case NS_STYLE_LIST_STYLE_MOZ_THAI:
case NS_STYLE_LIST_STYLE_MOZ_LAO:
case NS_STYLE_LIST_STYLE_MOZ_MYANMAR:
case NS_STYLE_LIST_STYLE_MOZ_KHMER:
case NS_STYLE_LIST_STYLE_MOZ_HANGUL:
case NS_STYLE_LIST_STYLE_MOZ_HANGUL_CONSONANT:
GetListItemText(aCX, *myList, text);
fm->GetHeight(aMetrics.height);
aReflowState.rendContext->SetFont(fm);

@ -189,7 +189,7 @@ nsBulletFrame::Paint(nsIPresContext* aPresContext,
charType = eCharType_EuropeanNumber;
break;
case NS_STYLE_LIST_STYLE_ARABIC_INDIC:
case NS_STYLE_LIST_STYLE_MOZ_ARABIC_INDIC:
GetListItemText(aPresContext, *myList, text);
charType = eCharType_ArabicNumber;
break;
@ -230,32 +230,34 @@ nsBulletFrame::Paint(nsIPresContext* aPresContext,
case NS_STYLE_LIST_STYLE_KATAKANA:
case NS_STYLE_LIST_STYLE_HIRAGANA_IROHA:
case NS_STYLE_LIST_STYLE_KATAKANA_IROHA:
case NS_STYLE_LIST_STYLE_SIMP_CHINESE_INFORMAL:
case NS_STYLE_LIST_STYLE_SIMP_CHINESE_FORMAL:
case NS_STYLE_LIST_STYLE_TRAD_CHINESE_INFORMAL:
case NS_STYLE_LIST_STYLE_TRAD_CHINESE_FORMAL:
case NS_STYLE_LIST_STYLE_JAPANESE_INFORMAL:
case NS_STYLE_LIST_STYLE_JAPANESE_FORMAL:
case NS_STYLE_LIST_STYLE_CJK_HEAVENLY_STEM:
case NS_STYLE_LIST_STYLE_CJK_EARTHLY_BRANCH:
case NS_STYLE_LIST_STYLE_MOZ_SIMP_CHINESE_INFORMAL:
case NS_STYLE_LIST_STYLE_MOZ_SIMP_CHINESE_FORMAL:
case NS_STYLE_LIST_STYLE_MOZ_TRAD_CHINESE_INFORMAL:
case NS_STYLE_LIST_STYLE_MOZ_TRAD_CHINESE_FORMAL:
case NS_STYLE_LIST_STYLE_MOZ_JAPANESE_INFORMAL:
case NS_STYLE_LIST_STYLE_MOZ_JAPANESE_FORMAL:
case NS_STYLE_LIST_STYLE_MOZ_CJK_HEAVENLY_STEM:
case NS_STYLE_LIST_STYLE_MOZ_CJK_EARTHLY_BRANCH:
#ifndef IBMBIDI
case NS_STYLE_LIST_STYLE_ARABIC_INDIC:
case NS_STYLE_LIST_STYLE_MOZ_ARABIC_INDIC:
#endif
case NS_STYLE_LIST_STYLE_PERSIAN:
case NS_STYLE_LIST_STYLE_URDU:
case NS_STYLE_LIST_STYLE_DEVANAGARI:
case NS_STYLE_LIST_STYLE_GURMUKHI:
case NS_STYLE_LIST_STYLE_GUJARATI:
case NS_STYLE_LIST_STYLE_ORIYA:
case NS_STYLE_LIST_STYLE_KANNADA:
case NS_STYLE_LIST_STYLE_MALAYALAM:
case NS_STYLE_LIST_STYLE_BENGALI:
case NS_STYLE_LIST_STYLE_TAMIL:
case NS_STYLE_LIST_STYLE_TELUGU:
case NS_STYLE_LIST_STYLE_THAI:
case NS_STYLE_LIST_STYLE_LAO:
case NS_STYLE_LIST_STYLE_MYANMAR:
case NS_STYLE_LIST_STYLE_KHMER:
case NS_STYLE_LIST_STYLE_MOZ_PERSIAN:
case NS_STYLE_LIST_STYLE_MOZ_URDU:
case NS_STYLE_LIST_STYLE_MOZ_DEVANAGARI:
case NS_STYLE_LIST_STYLE_MOZ_GURMUKHI:
case NS_STYLE_LIST_STYLE_MOZ_GUJARATI:
case NS_STYLE_LIST_STYLE_MOZ_ORIYA:
case NS_STYLE_LIST_STYLE_MOZ_KANNADA:
case NS_STYLE_LIST_STYLE_MOZ_MALAYALAM:
case NS_STYLE_LIST_STYLE_MOZ_BENGALI:
case NS_STYLE_LIST_STYLE_MOZ_TAMIL:
case NS_STYLE_LIST_STYLE_MOZ_TELUGU:
case NS_STYLE_LIST_STYLE_MOZ_THAI:
case NS_STYLE_LIST_STYLE_MOZ_LAO:
case NS_STYLE_LIST_STYLE_MOZ_MYANMAR:
case NS_STYLE_LIST_STYLE_MOZ_KHMER:
case NS_STYLE_LIST_STYLE_MOZ_HANGUL:
case NS_STYLE_LIST_STYLE_MOZ_HANGUL_CONSONANT:
aPresContext->GetMetricsFor(myFont->mFont, getter_AddRefs(fm));
GetListItemText(aPresContext, *myList, text);
aRenderingContext.SetFont(fm);
@ -521,6 +523,21 @@ static PRUnichar gCJKEarthlyBranchChars[CJK_EARTHLY_BRANCH_CHARS_SIZE] =
0x5b50, 0x4e11, 0x5bc5, 0x536f, 0x8fb0, 0x5df3,
0x5348, 0x672a, 0x7533, 0x9149, 0x620c, 0x4ea5
};
#define HANGUL_CHARS_SIZE 14
static PRUnichar gHangulChars[HANGUL_CHARS_SIZE] =
{
0xac00, 0xb098, 0xb2e4, 0xb77c, 0xb9c8, 0xbc14,
0xc0ac, 0xc544, 0xc790, 0xcc28, 0xce74, 0xd0c0,
0xd30c, 0xd558
};
#define HANGUL_CONSONANT_CHARS_SIZE 14
static PRUnichar gHangulConsonantChars[HANGUL_CONSONANT_CHARS_SIZE] =
{
0x3131, 0x3134, 0x3137, 0x3139, 0x3141, 0x3142,
0x3145, 0x3147, 0x3148, 0x314a, 0x314b, 0x314c,
0x314d, 0x314e
};
// We know cjk-ideographic need 31 characters to display 99,999,999,999,999,999
// georgian and armenian need 6 at most
// hebrew may need more...
@ -909,27 +926,27 @@ nsBulletFrame::GetListItemText(nsIPresContext* aCX,
break;
case NS_STYLE_LIST_STYLE_CJK_IDEOGRAPHIC:
case NS_STYLE_LIST_STYLE_TRAD_CHINESE_INFORMAL:
case NS_STYLE_LIST_STYLE_MOZ_TRAD_CHINESE_INFORMAL:
CJKIdeographicToText(mOrdinal, result, gCJKIdeographicDigit1, gCJKIdeographicUnit1, gCJKIdeographic10KUnit1);
break;
case NS_STYLE_LIST_STYLE_TRAD_CHINESE_FORMAL:
case NS_STYLE_LIST_STYLE_MOZ_TRAD_CHINESE_FORMAL:
CJKIdeographicToText(mOrdinal, result, gCJKIdeographicDigit2, gCJKIdeographicUnit2, gCJKIdeographic10KUnit1);
break;
case NS_STYLE_LIST_STYLE_SIMP_CHINESE_INFORMAL:
case NS_STYLE_LIST_STYLE_MOZ_SIMP_CHINESE_INFORMAL:
CJKIdeographicToText(mOrdinal, result, gCJKIdeographicDigit1, gCJKIdeographicUnit1, gCJKIdeographic10KUnit2);
break;
case NS_STYLE_LIST_STYLE_SIMP_CHINESE_FORMAL:
case NS_STYLE_LIST_STYLE_MOZ_SIMP_CHINESE_FORMAL:
CJKIdeographicToText(mOrdinal, result, gCJKIdeographicDigit3, gCJKIdeographicUnit2, gCJKIdeographic10KUnit2);
break;
case NS_STYLE_LIST_STYLE_JAPANESE_INFORMAL:
case NS_STYLE_LIST_STYLE_MOZ_JAPANESE_INFORMAL:
CJKIdeographicToText(mOrdinal, result, gCJKIdeographicDigit1, gCJKIdeographicUnit1, gCJKIdeographic10KUnit3);
break;
case NS_STYLE_LIST_STYLE_JAPANESE_FORMAL:
case NS_STYLE_LIST_STYLE_MOZ_JAPANESE_FORMAL:
CJKIdeographicToText(mOrdinal, result, gCJKIdeographicDigit2, gCJKIdeographicUnit2, gCJKIdeographic10KUnit3);
break;
@ -945,74 +962,82 @@ nsBulletFrame::GetListItemText(nsIPresContext* aCX,
GeorgianToText(mOrdinal, result);
break;
case NS_STYLE_LIST_STYLE_ARABIC_INDIC:
case NS_STYLE_LIST_STYLE_MOZ_ARABIC_INDIC:
OtherDecimalToText(mOrdinal, 0x0660, result);
break;
case NS_STYLE_LIST_STYLE_PERSIAN:
case NS_STYLE_LIST_STYLE_URDU:
case NS_STYLE_LIST_STYLE_MOZ_PERSIAN:
case NS_STYLE_LIST_STYLE_MOZ_URDU:
OtherDecimalToText(mOrdinal, 0x06f0, result);
break;
case NS_STYLE_LIST_STYLE_DEVANAGARI:
case NS_STYLE_LIST_STYLE_MOZ_DEVANAGARI:
OtherDecimalToText(mOrdinal, 0x0966, result);
break;
case NS_STYLE_LIST_STYLE_GURMUKHI:
case NS_STYLE_LIST_STYLE_MOZ_GURMUKHI:
OtherDecimalToText(mOrdinal, 0x0a66, result);
break;
case NS_STYLE_LIST_STYLE_GUJARATI:
case NS_STYLE_LIST_STYLE_MOZ_GUJARATI:
OtherDecimalToText(mOrdinal, 0x0AE6, result);
break;
case NS_STYLE_LIST_STYLE_ORIYA:
case NS_STYLE_LIST_STYLE_MOZ_ORIYA:
OtherDecimalToText(mOrdinal, 0x0B66, result);
break;
case NS_STYLE_LIST_STYLE_KANNADA:
case NS_STYLE_LIST_STYLE_MOZ_KANNADA:
OtherDecimalToText(mOrdinal, 0x0CE6, result);
break;
case NS_STYLE_LIST_STYLE_MALAYALAM:
case NS_STYLE_LIST_STYLE_MOZ_MALAYALAM:
OtherDecimalToText(mOrdinal, 0x0D66, result);
break;
case NS_STYLE_LIST_STYLE_THAI:
case NS_STYLE_LIST_STYLE_MOZ_THAI:
OtherDecimalToText(mOrdinal, 0x0E50, result);
break;
case NS_STYLE_LIST_STYLE_LAO:
case NS_STYLE_LIST_STYLE_MOZ_LAO:
OtherDecimalToText(mOrdinal, 0x0ED0, result);
break;
case NS_STYLE_LIST_STYLE_MYANMAR:
case NS_STYLE_LIST_STYLE_MOZ_MYANMAR:
OtherDecimalToText(mOrdinal, 0x1040, result);
break;
case NS_STYLE_LIST_STYLE_KHMER:
case NS_STYLE_LIST_STYLE_MOZ_KHMER:
OtherDecimalToText(mOrdinal, 0x17E0, result);
break;
case NS_STYLE_LIST_STYLE_BENGALI:
case NS_STYLE_LIST_STYLE_MOZ_BENGALI:
OtherDecimalToText(mOrdinal, 0x09E6, result);
break;
case NS_STYLE_LIST_STYLE_TELUGU:
case NS_STYLE_LIST_STYLE_MOZ_TELUGU:
OtherDecimalToText(mOrdinal, 0x0C66, result);
break;
case NS_STYLE_LIST_STYLE_TAMIL:
case NS_STYLE_LIST_STYLE_MOZ_TAMIL:
TamilToText(mOrdinal, result);
break;
case NS_STYLE_LIST_STYLE_CJK_HEAVENLY_STEM:
case NS_STYLE_LIST_STYLE_MOZ_CJK_HEAVENLY_STEM:
CharListToText(mOrdinal, result, gCJKHeavenlyStemChars, CJK_HEAVENLY_STEM_CHARS_SIZE);
break;
case NS_STYLE_LIST_STYLE_CJK_EARTHLY_BRANCH:
case NS_STYLE_LIST_STYLE_MOZ_CJK_EARTHLY_BRANCH:
CharListToText(mOrdinal, result, gCJKEarthlyBranchChars, CJK_EARTHLY_BRANCH_CHARS_SIZE);
break;
case NS_STYLE_LIST_STYLE_MOZ_HANGUL:
CharListToText(mOrdinal, result, gHangulChars, HANGUL_CHARS_SIZE);
break;
case NS_STYLE_LIST_STYLE_MOZ_HANGUL_CONSONANT:
CharListToText(mOrdinal, result, gHangulConsonantChars, HANGUL_CONSONANT_CHARS_SIZE);
break;
}
#ifdef IBMBIDI
if (NS_STYLE_DIRECTION_RTL != vis->mDirection)
@ -1142,30 +1167,32 @@ nsBulletFrame::GetDesiredSize(nsIPresContext* aCX,
case NS_STYLE_LIST_STYLE_ARMENIAN:
case NS_STYLE_LIST_STYLE_GEORGIAN:
case NS_STYLE_LIST_STYLE_CJK_IDEOGRAPHIC:
case NS_STYLE_LIST_STYLE_SIMP_CHINESE_INFORMAL:
case NS_STYLE_LIST_STYLE_SIMP_CHINESE_FORMAL:
case NS_STYLE_LIST_STYLE_TRAD_CHINESE_INFORMAL:
case NS_STYLE_LIST_STYLE_TRAD_CHINESE_FORMAL:
case NS_STYLE_LIST_STYLE_JAPANESE_INFORMAL:
case NS_STYLE_LIST_STYLE_JAPANESE_FORMAL:
case NS_STYLE_LIST_STYLE_CJK_HEAVENLY_STEM:
case NS_STYLE_LIST_STYLE_CJK_EARTHLY_BRANCH:
case NS_STYLE_LIST_STYLE_ARABIC_INDIC:
case NS_STYLE_LIST_STYLE_PERSIAN:
case NS_STYLE_LIST_STYLE_URDU:
case NS_STYLE_LIST_STYLE_DEVANAGARI:
case NS_STYLE_LIST_STYLE_GURMUKHI:
case NS_STYLE_LIST_STYLE_GUJARATI:
case NS_STYLE_LIST_STYLE_ORIYA:
case NS_STYLE_LIST_STYLE_KANNADA:
case NS_STYLE_LIST_STYLE_MALAYALAM:
case NS_STYLE_LIST_STYLE_BENGALI:
case NS_STYLE_LIST_STYLE_TAMIL:
case NS_STYLE_LIST_STYLE_TELUGU:
case NS_STYLE_LIST_STYLE_THAI:
case NS_STYLE_LIST_STYLE_LAO:
case NS_STYLE_LIST_STYLE_MYANMAR:
case NS_STYLE_LIST_STYLE_KHMER:
case NS_STYLE_LIST_STYLE_MOZ_SIMP_CHINESE_INFORMAL:
case NS_STYLE_LIST_STYLE_MOZ_SIMP_CHINESE_FORMAL:
case NS_STYLE_LIST_STYLE_MOZ_TRAD_CHINESE_INFORMAL:
case NS_STYLE_LIST_STYLE_MOZ_TRAD_CHINESE_FORMAL:
case NS_STYLE_LIST_STYLE_MOZ_JAPANESE_INFORMAL:
case NS_STYLE_LIST_STYLE_MOZ_JAPANESE_FORMAL:
case NS_STYLE_LIST_STYLE_MOZ_CJK_HEAVENLY_STEM:
case NS_STYLE_LIST_STYLE_MOZ_CJK_EARTHLY_BRANCH:
case NS_STYLE_LIST_STYLE_MOZ_ARABIC_INDIC:
case NS_STYLE_LIST_STYLE_MOZ_PERSIAN:
case NS_STYLE_LIST_STYLE_MOZ_URDU:
case NS_STYLE_LIST_STYLE_MOZ_DEVANAGARI:
case NS_STYLE_LIST_STYLE_MOZ_GURMUKHI:
case NS_STYLE_LIST_STYLE_MOZ_GUJARATI:
case NS_STYLE_LIST_STYLE_MOZ_ORIYA:
case NS_STYLE_LIST_STYLE_MOZ_KANNADA:
case NS_STYLE_LIST_STYLE_MOZ_MALAYALAM:
case NS_STYLE_LIST_STYLE_MOZ_BENGALI:
case NS_STYLE_LIST_STYLE_MOZ_TAMIL:
case NS_STYLE_LIST_STYLE_MOZ_TELUGU:
case NS_STYLE_LIST_STYLE_MOZ_THAI:
case NS_STYLE_LIST_STYLE_MOZ_LAO:
case NS_STYLE_LIST_STYLE_MOZ_MYANMAR:
case NS_STYLE_LIST_STYLE_MOZ_KHMER:
case NS_STYLE_LIST_STYLE_MOZ_HANGUL:
case NS_STYLE_LIST_STYLE_MOZ_HANGUL_CONSONANT:
GetListItemText(aCX, *myList, text);
fm->GetHeight(aMetrics.height);
aReflowState.rendContext->SetFont(fm);

@ -94,7 +94,7 @@ CSS_KEY(alias, alias)
CSS_KEY(all, all)
CSS_KEY(always, always)
CSS_KEY(appworkspace, appworkspace)
CSS_KEY(arabic-indic, arabic_indic)
CSS_KEY(-moz-arabic-indic, _moz_arabic_indic)
CSS_KEY(armenian, armenian)
CSS_KEY(auto, auto)
CSS_KEY(avoid, avoid)
@ -102,7 +102,7 @@ CSS_KEY(background, background)
CSS_KEY(baseline, baseline)
CSS_KEY(behind, behind)
CSS_KEY(below, below)
CSS_KEY(bengali, bengali)
CSS_KEY(-moz-bengali, _moz_bengali)
CSS_KEY(bidi-override, bidi_override)
CSS_KEY(blink, blink)
CSS_KEY(block, block)
@ -126,8 +126,8 @@ CSS_KEY(center-left, center_left)
CSS_KEY(center-right, center_right)
CSS_KEY(ch, ch)
CSS_KEY(circle, circle)
CSS_KEY(cjk-earthly-branch, cjk_earthly_branch)
CSS_KEY(cjk-heavenly-stem, cjk_heavenly_stem)
CSS_KEY(-moz-cjk-earthly-branch, _moz_cjk_earthly_branch)
CSS_KEY(-moz-cjk-heavenly-stem, _moz_cjk_heavenly_stem)
CSS_KEY(cjk-ideographic, cjk_ideographic)
CSS_KEY(close-quote, close_quote)
CSS_KEY(cm, cm)
@ -151,7 +151,7 @@ CSS_KEY(decimal-leading-zero, decimal_leading_zero)
CSS_KEY(default, default)
CSS_KEY(deg, deg)
CSS_KEY(desktop, desktop)
CSS_KEY(devanagari, devanagari)
CSS_KEY(-moz-devanagari, _moz_devanagari)
CSS_KEY(dialog, dialog)
CSS_KEY(digits, digits)
CSS_KEY(disabled, disabled)
@ -182,8 +182,10 @@ CSS_KEY(grabbing, grabbing)
CSS_KEY(grad, grad)
CSS_KEY(graytext, graytext)
CSS_KEY(groove, groove)
CSS_KEY(gujarati, gujarati)
CSS_KEY(gurmukhi, gurmukhi)
CSS_KEY(-moz-gujarati, _moz_gujarati)
CSS_KEY(-moz-gurmukhi, _moz_gurmukhi)
CSS_KEY(-moz-hangul, _moz_hangul)
CSS_KEY(-moz-hangul-consonant, _moz_hangul_consonant)
CSS_KEY(hebrew, hebrew)
CSS_KEY(help, help)
CSS_KEY(hidden, hidden)
@ -214,16 +216,16 @@ CSS_KEY(inset, inset)
CSS_KEY(inside, inside)
CSS_KEY(invert, invert)
CSS_KEY(italic, italic)
CSS_KEY(japanese-formal, japanese_formal)
CSS_KEY(japanese-informal, japanese_informal)
CSS_KEY(-moz-japanese-formal, _moz_japanese_formal)
CSS_KEY(-moz-japanese-informal, _moz_japanese_informal)
CSS_KEY(justify, justify)
CSS_KEY(kannada, kannada)
CSS_KEY(-moz-kannada, _moz_kannada)
CSS_KEY(katakana, katakana)
CSS_KEY(katakana-iroha, katakana_iroha)
CSS_KEY(khmer, khmer)
CSS_KEY(-moz-khmer, _moz_khmer)
CSS_KEY(khz, khz)
CSS_KEY(landscape, landscape)
CSS_KEY(lao, lao)
CSS_KEY(-moz-lao, _moz_lao)
CSS_KEY(large, large)
CSS_KEY(larger, larger)
CSS_KEY(left, left)
@ -243,7 +245,7 @@ CSS_KEY(lower-latin, lower_latin)
CSS_KEY(lower-roman, lower_roman)
CSS_KEY(lowercase, lowercase)
CSS_KEY(ltr, ltr)
CSS_KEY(malayalam, malayalam)
CSS_KEY(-moz-malayalam, _moz_malayalam)
CSS_KEY(margin-box, margin_box)
CSS_KEY(marker, marker)
CSS_KEY(medium, medium)
@ -255,7 +257,7 @@ CSS_KEY(mix, mix)
CSS_KEY(mm, mm)
CSS_KEY(move, move)
CSS_KEY(ms, ms)
CSS_KEY(myanmar, myanmar)
CSS_KEY(-moz-myanmar, _moz_myanmar)
CSS_KEY(n-resize, n_resize)
CSS_KEY(narrower, narrower)
CSS_KEY(ne-resize, ne_resize)
@ -270,14 +272,14 @@ CSS_KEY(nw-resize, nw_resize)
CSS_KEY(oblique, oblique)
CSS_KEY(once, once)
CSS_KEY(open-quote, open_quote)
CSS_KEY(oriya, oriya)
CSS_KEY(-moz-oriya, _moz_oriya)
CSS_KEY(outset, outset)
CSS_KEY(outside, outside)
CSS_KEY(overline, overline)
CSS_KEY(padding-box, padding_box)
CSS_KEY(paragraph, paragraph)
CSS_KEY(pc, pc)
CSS_KEY(persian, persian)
CSS_KEY(-moz-persian, _moz_persian)
CSS_KEY(pointer, pointer)
CSS_KEY(portrait, portrait)
CSS_KEY(pre, pre)
@ -313,8 +315,8 @@ CSS_KEY(semi-expanded, semi_expanded)
CSS_KEY(separate, separate)
CSS_KEY(show, show)
CSS_KEY(silent, silent)
CSS_KEY(simp-chinese-formal, simp_chinese_formal)
CSS_KEY(simp-chinese-informal, simp_chinese_informal)
CSS_KEY(-moz-simp-chinese-formal, _moz_simp_chinese_formal)
CSS_KEY(-moz-simp-chinese-informal, _moz_simp_chinese_informal)
CSS_KEY(slow, slow)
CSS_KEY(slower, slower)
CSS_KEY(small, small)
@ -342,12 +344,12 @@ CSS_KEY(table-footer-group, table_footer_group)
CSS_KEY(table-header-group, table_header_group)
CSS_KEY(table-row, table_row)
CSS_KEY(table-row-group, table_row_group)
CSS_KEY(tamil, tamil)
CSS_KEY(telugu, telugu)
CSS_KEY(-moz-tamil, _moz_tamil)
CSS_KEY(-moz-telugu, _moz_telugu)
CSS_KEY(text, text)
CSS_KEY(text-bottom, text_bottom)
CSS_KEY(text-top, text_top)
CSS_KEY(thai, thai)
CSS_KEY(-moz-thai, _moz_thai)
CSS_KEY(thick, thick)
CSS_KEY(thin, thin)
CSS_KEY(threeddarkshadow, threeddarkshadow)
@ -357,8 +359,8 @@ CSS_KEY(threedlightshadow, threedlightshadow)
CSS_KEY(threedshadow, threedshadow)
CSS_KEY(toggle, toggle)
CSS_KEY(top, top)
CSS_KEY(trad-chinese-formal, trad_chinese_formal)
CSS_KEY(trad-chinese-informal, trad_chinese_informal)
CSS_KEY(-moz-trad-chinese-formal, _moz_trad_chinese_formal)
CSS_KEY(-moz-trad-chinese-informal, _moz_trad_chinese_informal)
CSS_KEY(transparent, transparent)
CSS_KEY(tri-state, tri_state)
CSS_KEY(ultra-condensed, ultra_condensed)
@ -368,7 +370,7 @@ CSS_KEY(upper-alpha, upper_alpha)
CSS_KEY(upper-latin, upper_latin)
CSS_KEY(upper-roman, upper_roman)
CSS_KEY(uppercase, uppercase)
CSS_KEY(urdu, urdu)
CSS_KEY(-moz-urdu, _moz_urdu)
CSS_KEY(vertical, vertical)
CSS_KEY(visible, visible)
CSS_KEY(w-resize, w_resize)

@ -448,30 +448,32 @@ const PRInt32 nsCSSProps::kListStyleKTable[] = {
eCSSKeyword_katakana, NS_STYLE_LIST_STYLE_KATAKANA,
eCSSKeyword_hiragana_iroha, NS_STYLE_LIST_STYLE_HIRAGANA_IROHA,
eCSSKeyword_katakana_iroha, NS_STYLE_LIST_STYLE_KATAKANA_IROHA,
eCSSKeyword_cjk_heavenly_stem, NS_STYLE_LIST_STYLE_CJK_HEAVENLY_STEM,
eCSSKeyword_cjk_earthly_branch, NS_STYLE_LIST_STYLE_CJK_EARTHLY_BRANCH,
eCSSKeyword_trad_chinese_informal, NS_STYLE_LIST_STYLE_TRAD_CHINESE_INFORMAL,
eCSSKeyword_trad_chinese_formal, NS_STYLE_LIST_STYLE_TRAD_CHINESE_FORMAL,
eCSSKeyword_simp_chinese_informal, NS_STYLE_LIST_STYLE_SIMP_CHINESE_INFORMAL,
eCSSKeyword_simp_chinese_formal, NS_STYLE_LIST_STYLE_SIMP_CHINESE_FORMAL,
eCSSKeyword_japanese_informal, NS_STYLE_LIST_STYLE_JAPANESE_INFORMAL,
eCSSKeyword_japanese_formal, NS_STYLE_LIST_STYLE_JAPANESE_FORMAL,
eCSSKeyword_arabic_indic, NS_STYLE_LIST_STYLE_ARABIC_INDIC,
eCSSKeyword_persian, NS_STYLE_LIST_STYLE_PERSIAN,
eCSSKeyword_urdu, NS_STYLE_LIST_STYLE_URDU,
eCSSKeyword_devanagari, NS_STYLE_LIST_STYLE_DEVANAGARI,
eCSSKeyword_gurmukhi, NS_STYLE_LIST_STYLE_GURMUKHI,
eCSSKeyword_gujarati, NS_STYLE_LIST_STYLE_GUJARATI,
eCSSKeyword_oriya, NS_STYLE_LIST_STYLE_ORIYA,
eCSSKeyword_kannada, NS_STYLE_LIST_STYLE_KANNADA,
eCSSKeyword_malayalam, NS_STYLE_LIST_STYLE_MALAYALAM,
eCSSKeyword_bengali, NS_STYLE_LIST_STYLE_BENGALI,
eCSSKeyword_tamil, NS_STYLE_LIST_STYLE_TAMIL,
eCSSKeyword_telugu, NS_STYLE_LIST_STYLE_TELUGU,
eCSSKeyword_thai, NS_STYLE_LIST_STYLE_THAI,
eCSSKeyword_lao, NS_STYLE_LIST_STYLE_LAO,
eCSSKeyword_myanmar, NS_STYLE_LIST_STYLE_MYANMAR,
eCSSKeyword_khmer, NS_STYLE_LIST_STYLE_KHMER,
eCSSKeyword__moz_cjk_heavenly_stem, NS_STYLE_LIST_STYLE_MOZ_CJK_HEAVENLY_STEM,
eCSSKeyword__moz_cjk_earthly_branch, NS_STYLE_LIST_STYLE_MOZ_CJK_EARTHLY_BRANCH,
eCSSKeyword__moz_trad_chinese_informal, NS_STYLE_LIST_STYLE_MOZ_TRAD_CHINESE_INFORMAL,
eCSSKeyword__moz_trad_chinese_formal, NS_STYLE_LIST_STYLE_MOZ_TRAD_CHINESE_FORMAL,
eCSSKeyword__moz_simp_chinese_informal, NS_STYLE_LIST_STYLE_MOZ_SIMP_CHINESE_INFORMAL,
eCSSKeyword__moz_simp_chinese_formal, NS_STYLE_LIST_STYLE_MOZ_SIMP_CHINESE_FORMAL,
eCSSKeyword__moz_japanese_informal, NS_STYLE_LIST_STYLE_MOZ_JAPANESE_INFORMAL,
eCSSKeyword__moz_japanese_formal, NS_STYLE_LIST_STYLE_MOZ_JAPANESE_FORMAL,
eCSSKeyword__moz_arabic_indic, NS_STYLE_LIST_STYLE_MOZ_ARABIC_INDIC,
eCSSKeyword__moz_persian, NS_STYLE_LIST_STYLE_MOZ_PERSIAN,
eCSSKeyword__moz_urdu, NS_STYLE_LIST_STYLE_MOZ_URDU,
eCSSKeyword__moz_devanagari, NS_STYLE_LIST_STYLE_MOZ_DEVANAGARI,
eCSSKeyword__moz_gurmukhi, NS_STYLE_LIST_STYLE_MOZ_GURMUKHI,
eCSSKeyword__moz_gujarati, NS_STYLE_LIST_STYLE_MOZ_GUJARATI,
eCSSKeyword__moz_oriya, NS_STYLE_LIST_STYLE_MOZ_ORIYA,
eCSSKeyword__moz_kannada, NS_STYLE_LIST_STYLE_MOZ_KANNADA,
eCSSKeyword__moz_malayalam, NS_STYLE_LIST_STYLE_MOZ_MALAYALAM,
eCSSKeyword__moz_bengali, NS_STYLE_LIST_STYLE_MOZ_BENGALI,
eCSSKeyword__moz_tamil, NS_STYLE_LIST_STYLE_MOZ_TAMIL,
eCSSKeyword__moz_telugu, NS_STYLE_LIST_STYLE_MOZ_TELUGU,
eCSSKeyword__moz_thai, NS_STYLE_LIST_STYLE_MOZ_THAI,
eCSSKeyword__moz_lao, NS_STYLE_LIST_STYLE_MOZ_LAO,
eCSSKeyword__moz_myanmar, NS_STYLE_LIST_STYLE_MOZ_MYANMAR,
eCSSKeyword__moz_khmer, NS_STYLE_LIST_STYLE_MOZ_KHMER,
eCSSKeyword__moz_hangul, NS_STYLE_LIST_STYLE_MOZ_HANGUL,
eCSSKeyword__moz_hangul_consonant, NS_STYLE_LIST_STYLE_MOZ_HANGUL_CONSONANT,
-1,-1
};