From 77302c6bf5c41aba7a4ab5e1ce135f1c50182465 Mon Sep 17 00:00:00 2001 From: "kipp%netscape.com" Date: Fri, 2 Jul 1999 22:27:03 +0000 Subject: [PATCH] Support old-upper/lower-alpha/roman style constants git-svn-id: svn://10.0.0.236/trunk@38170 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsBulletFrame.cpp | 110 ++++++++++-------- .../layout/html/base/src/nsBulletFrame.cpp | 110 ++++++++++-------- 2 files changed, 122 insertions(+), 98 deletions(-) diff --git a/mozilla/layout/generic/nsBulletFrame.cpp b/mozilla/layout/generic/nsBulletFrame.cpp index 3dfbc6410ef..2c7412c8e81 100644 --- a/mozilla/layout/generic/nsBulletFrame.cpp +++ b/mozilla/layout/generic/nsBulletFrame.cpp @@ -168,6 +168,10 @@ nsBulletFrame::Paint(nsIPresContext& aCX, case NS_STYLE_LIST_STYLE_UPPER_ROMAN: case NS_STYLE_LIST_STYLE_LOWER_ALPHA: case NS_STYLE_LIST_STYLE_UPPER_ALPHA: + case NS_STYLE_LIST_STYLE_OLD_LOWER_ROMAN: + case NS_STYLE_LIST_STYLE_OLD_UPPER_ROMAN: + case NS_STYLE_LIST_STYLE_OLD_LOWER_ALPHA: + case NS_STYLE_LIST_STYLE_OLD_UPPER_ALPHA: case NS_STYLE_LIST_STYLE_LOWER_GREEK: case NS_STYLE_LIST_STYLE_HEBREW: case NS_STYLE_LIST_STYLE_ARMENIAN: @@ -667,17 +671,21 @@ nsBulletFrame::GetListItemText(nsIPresContext& aCX, break; case NS_STYLE_LIST_STYLE_LOWER_ROMAN: + case NS_STYLE_LIST_STYLE_OLD_LOWER_ROMAN: RomanToText(mOrdinal, result, gLowerRomanCharsA, gLowerRomanCharsB); break; case NS_STYLE_LIST_STYLE_UPPER_ROMAN: + case NS_STYLE_LIST_STYLE_OLD_UPPER_ROMAN: RomanToText(mOrdinal, result, gUpperRomanCharsA, gUpperRomanCharsB); break; case NS_STYLE_LIST_STYLE_LOWER_ALPHA: + case NS_STYLE_LIST_STYLE_OLD_LOWER_ALPHA: CharListToText(mOrdinal, result, gLowerAlphaChars, ALPHA_SIZE); break; case NS_STYLE_LIST_STYLE_UPPER_ALPHA: + case NS_STYLE_LIST_STYLE_OLD_UPPER_ALPHA: CharListToText(mOrdinal, result, gUpperAlphaChars, ALPHA_SIZE); break; @@ -783,57 +791,61 @@ nsBulletFrame::GetDesiredSize(nsIPresContext* aCX, nsAutoString text; switch (myList->mListStyleType) { - case NS_STYLE_LIST_STYLE_NONE: - aMetrics.width = 0; - aMetrics.height = 0; - aMetrics.ascent = 0; - aMetrics.descent = 0; - break; + case NS_STYLE_LIST_STYLE_NONE: + aMetrics.width = 0; + aMetrics.height = 0; + aMetrics.ascent = 0; + aMetrics.descent = 0; + break; - case NS_STYLE_LIST_STYLE_DISC: - case NS_STYLE_LIST_STYLE_CIRCLE: - case NS_STYLE_LIST_STYLE_BASIC: - case NS_STYLE_LIST_STYLE_SQUARE: - aCX->GetTwipsToPixels(&t2p); - fm->GetMaxAscent(ascent); - bulletSize = NSTwipsToIntPixels( - (nscoord)NSToIntRound(0.8f * (float(ascent) / 2.0f)), t2p); - if (bulletSize < 1) { - bulletSize = MIN_BULLET_SIZE; - } - aCX->GetPixelsToTwips(&p2t); - bulletSize = NSIntPixelsToTwips(bulletSize, p2t); - mPadding.bottom = ascent / 8; - aMetrics.width = mPadding.right + bulletSize; - aMetrics.height = mPadding.bottom + bulletSize; - aMetrics.ascent = mPadding.bottom + bulletSize; - aMetrics.descent = 0; - break; + case NS_STYLE_LIST_STYLE_DISC: + case NS_STYLE_LIST_STYLE_CIRCLE: + case NS_STYLE_LIST_STYLE_BASIC: + case NS_STYLE_LIST_STYLE_SQUARE: + aCX->GetTwipsToPixels(&t2p); + fm->GetMaxAscent(ascent); + bulletSize = NSTwipsToIntPixels( + (nscoord)NSToIntRound(0.8f * (float(ascent) / 2.0f)), t2p); + if (bulletSize < 1) { + bulletSize = MIN_BULLET_SIZE; + } + aCX->GetPixelsToTwips(&p2t); + bulletSize = NSIntPixelsToTwips(bulletSize, p2t); + mPadding.bottom = ascent / 8; + aMetrics.width = mPadding.right + bulletSize; + aMetrics.height = mPadding.bottom + bulletSize; + aMetrics.ascent = mPadding.bottom + bulletSize; + aMetrics.descent = 0; + break; - default: - case NS_STYLE_LIST_STYLE_DECIMAL_LEADING_ZERO: - case NS_STYLE_LIST_STYLE_DECIMAL: - case NS_STYLE_LIST_STYLE_LOWER_ROMAN: - case NS_STYLE_LIST_STYLE_UPPER_ROMAN: - case NS_STYLE_LIST_STYLE_LOWER_ALPHA: - case NS_STYLE_LIST_STYLE_UPPER_ALPHA: - case NS_STYLE_LIST_STYLE_KATAKANA: - case NS_STYLE_LIST_STYLE_HIRAGANA: - case NS_STYLE_LIST_STYLE_KATAKANA_IROHA: - case NS_STYLE_LIST_STYLE_HIRAGANA_IROHA: - case NS_STYLE_LIST_STYLE_LOWER_GREEK: - case NS_STYLE_LIST_STYLE_HEBREW: - case NS_STYLE_LIST_STYLE_ARMENIAN: - case NS_STYLE_LIST_STYLE_GEORGIAN: - case NS_STYLE_LIST_STYLE_CJK_IDEOGRAPHIC: - GetListItemText(*aCX, *myList, text); - fm->GetHeight(aMetrics.height); - aReflowState.rendContext->SetFont(fm); - aReflowState.rendContext->GetWidth(text, aMetrics.width); - aMetrics.width += mPadding.right; - fm->GetMaxAscent(aMetrics.ascent); - fm->GetMaxDescent(aMetrics.descent); - break; + default: + case NS_STYLE_LIST_STYLE_DECIMAL_LEADING_ZERO: + case NS_STYLE_LIST_STYLE_DECIMAL: + case NS_STYLE_LIST_STYLE_LOWER_ROMAN: + case NS_STYLE_LIST_STYLE_UPPER_ROMAN: + case NS_STYLE_LIST_STYLE_LOWER_ALPHA: + case NS_STYLE_LIST_STYLE_UPPER_ALPHA: + case NS_STYLE_LIST_STYLE_OLD_LOWER_ROMAN: + case NS_STYLE_LIST_STYLE_OLD_UPPER_ROMAN: + case NS_STYLE_LIST_STYLE_OLD_LOWER_ALPHA: + case NS_STYLE_LIST_STYLE_OLD_UPPER_ALPHA: + case NS_STYLE_LIST_STYLE_KATAKANA: + case NS_STYLE_LIST_STYLE_HIRAGANA: + case NS_STYLE_LIST_STYLE_KATAKANA_IROHA: + case NS_STYLE_LIST_STYLE_HIRAGANA_IROHA: + case NS_STYLE_LIST_STYLE_LOWER_GREEK: + case NS_STYLE_LIST_STYLE_HEBREW: + case NS_STYLE_LIST_STYLE_ARMENIAN: + case NS_STYLE_LIST_STYLE_GEORGIAN: + case NS_STYLE_LIST_STYLE_CJK_IDEOGRAPHIC: + GetListItemText(*aCX, *myList, text); + fm->GetHeight(aMetrics.height); + aReflowState.rendContext->SetFont(fm); + aReflowState.rendContext->GetWidth(text, aMetrics.width); + aMetrics.width += mPadding.right; + fm->GetMaxAscent(aMetrics.ascent); + fm->GetMaxDescent(aMetrics.descent); + break; } } diff --git a/mozilla/layout/html/base/src/nsBulletFrame.cpp b/mozilla/layout/html/base/src/nsBulletFrame.cpp index 3dfbc6410ef..2c7412c8e81 100644 --- a/mozilla/layout/html/base/src/nsBulletFrame.cpp +++ b/mozilla/layout/html/base/src/nsBulletFrame.cpp @@ -168,6 +168,10 @@ nsBulletFrame::Paint(nsIPresContext& aCX, case NS_STYLE_LIST_STYLE_UPPER_ROMAN: case NS_STYLE_LIST_STYLE_LOWER_ALPHA: case NS_STYLE_LIST_STYLE_UPPER_ALPHA: + case NS_STYLE_LIST_STYLE_OLD_LOWER_ROMAN: + case NS_STYLE_LIST_STYLE_OLD_UPPER_ROMAN: + case NS_STYLE_LIST_STYLE_OLD_LOWER_ALPHA: + case NS_STYLE_LIST_STYLE_OLD_UPPER_ALPHA: case NS_STYLE_LIST_STYLE_LOWER_GREEK: case NS_STYLE_LIST_STYLE_HEBREW: case NS_STYLE_LIST_STYLE_ARMENIAN: @@ -667,17 +671,21 @@ nsBulletFrame::GetListItemText(nsIPresContext& aCX, break; case NS_STYLE_LIST_STYLE_LOWER_ROMAN: + case NS_STYLE_LIST_STYLE_OLD_LOWER_ROMAN: RomanToText(mOrdinal, result, gLowerRomanCharsA, gLowerRomanCharsB); break; case NS_STYLE_LIST_STYLE_UPPER_ROMAN: + case NS_STYLE_LIST_STYLE_OLD_UPPER_ROMAN: RomanToText(mOrdinal, result, gUpperRomanCharsA, gUpperRomanCharsB); break; case NS_STYLE_LIST_STYLE_LOWER_ALPHA: + case NS_STYLE_LIST_STYLE_OLD_LOWER_ALPHA: CharListToText(mOrdinal, result, gLowerAlphaChars, ALPHA_SIZE); break; case NS_STYLE_LIST_STYLE_UPPER_ALPHA: + case NS_STYLE_LIST_STYLE_OLD_UPPER_ALPHA: CharListToText(mOrdinal, result, gUpperAlphaChars, ALPHA_SIZE); break; @@ -783,57 +791,61 @@ nsBulletFrame::GetDesiredSize(nsIPresContext* aCX, nsAutoString text; switch (myList->mListStyleType) { - case NS_STYLE_LIST_STYLE_NONE: - aMetrics.width = 0; - aMetrics.height = 0; - aMetrics.ascent = 0; - aMetrics.descent = 0; - break; + case NS_STYLE_LIST_STYLE_NONE: + aMetrics.width = 0; + aMetrics.height = 0; + aMetrics.ascent = 0; + aMetrics.descent = 0; + break; - case NS_STYLE_LIST_STYLE_DISC: - case NS_STYLE_LIST_STYLE_CIRCLE: - case NS_STYLE_LIST_STYLE_BASIC: - case NS_STYLE_LIST_STYLE_SQUARE: - aCX->GetTwipsToPixels(&t2p); - fm->GetMaxAscent(ascent); - bulletSize = NSTwipsToIntPixels( - (nscoord)NSToIntRound(0.8f * (float(ascent) / 2.0f)), t2p); - if (bulletSize < 1) { - bulletSize = MIN_BULLET_SIZE; - } - aCX->GetPixelsToTwips(&p2t); - bulletSize = NSIntPixelsToTwips(bulletSize, p2t); - mPadding.bottom = ascent / 8; - aMetrics.width = mPadding.right + bulletSize; - aMetrics.height = mPadding.bottom + bulletSize; - aMetrics.ascent = mPadding.bottom + bulletSize; - aMetrics.descent = 0; - break; + case NS_STYLE_LIST_STYLE_DISC: + case NS_STYLE_LIST_STYLE_CIRCLE: + case NS_STYLE_LIST_STYLE_BASIC: + case NS_STYLE_LIST_STYLE_SQUARE: + aCX->GetTwipsToPixels(&t2p); + fm->GetMaxAscent(ascent); + bulletSize = NSTwipsToIntPixels( + (nscoord)NSToIntRound(0.8f * (float(ascent) / 2.0f)), t2p); + if (bulletSize < 1) { + bulletSize = MIN_BULLET_SIZE; + } + aCX->GetPixelsToTwips(&p2t); + bulletSize = NSIntPixelsToTwips(bulletSize, p2t); + mPadding.bottom = ascent / 8; + aMetrics.width = mPadding.right + bulletSize; + aMetrics.height = mPadding.bottom + bulletSize; + aMetrics.ascent = mPadding.bottom + bulletSize; + aMetrics.descent = 0; + break; - default: - case NS_STYLE_LIST_STYLE_DECIMAL_LEADING_ZERO: - case NS_STYLE_LIST_STYLE_DECIMAL: - case NS_STYLE_LIST_STYLE_LOWER_ROMAN: - case NS_STYLE_LIST_STYLE_UPPER_ROMAN: - case NS_STYLE_LIST_STYLE_LOWER_ALPHA: - case NS_STYLE_LIST_STYLE_UPPER_ALPHA: - case NS_STYLE_LIST_STYLE_KATAKANA: - case NS_STYLE_LIST_STYLE_HIRAGANA: - case NS_STYLE_LIST_STYLE_KATAKANA_IROHA: - case NS_STYLE_LIST_STYLE_HIRAGANA_IROHA: - case NS_STYLE_LIST_STYLE_LOWER_GREEK: - case NS_STYLE_LIST_STYLE_HEBREW: - case NS_STYLE_LIST_STYLE_ARMENIAN: - case NS_STYLE_LIST_STYLE_GEORGIAN: - case NS_STYLE_LIST_STYLE_CJK_IDEOGRAPHIC: - GetListItemText(*aCX, *myList, text); - fm->GetHeight(aMetrics.height); - aReflowState.rendContext->SetFont(fm); - aReflowState.rendContext->GetWidth(text, aMetrics.width); - aMetrics.width += mPadding.right; - fm->GetMaxAscent(aMetrics.ascent); - fm->GetMaxDescent(aMetrics.descent); - break; + default: + case NS_STYLE_LIST_STYLE_DECIMAL_LEADING_ZERO: + case NS_STYLE_LIST_STYLE_DECIMAL: + case NS_STYLE_LIST_STYLE_LOWER_ROMAN: + case NS_STYLE_LIST_STYLE_UPPER_ROMAN: + case NS_STYLE_LIST_STYLE_LOWER_ALPHA: + case NS_STYLE_LIST_STYLE_UPPER_ALPHA: + case NS_STYLE_LIST_STYLE_OLD_LOWER_ROMAN: + case NS_STYLE_LIST_STYLE_OLD_UPPER_ROMAN: + case NS_STYLE_LIST_STYLE_OLD_LOWER_ALPHA: + case NS_STYLE_LIST_STYLE_OLD_UPPER_ALPHA: + case NS_STYLE_LIST_STYLE_KATAKANA: + case NS_STYLE_LIST_STYLE_HIRAGANA: + case NS_STYLE_LIST_STYLE_KATAKANA_IROHA: + case NS_STYLE_LIST_STYLE_HIRAGANA_IROHA: + case NS_STYLE_LIST_STYLE_LOWER_GREEK: + case NS_STYLE_LIST_STYLE_HEBREW: + case NS_STYLE_LIST_STYLE_ARMENIAN: + case NS_STYLE_LIST_STYLE_GEORGIAN: + case NS_STYLE_LIST_STYLE_CJK_IDEOGRAPHIC: + GetListItemText(*aCX, *myList, text); + fm->GetHeight(aMetrics.height); + aReflowState.rendContext->SetFont(fm); + aReflowState.rendContext->GetWidth(text, aMetrics.width); + aMetrics.width += mPadding.right; + fm->GetMaxAscent(aMetrics.ascent); + fm->GetMaxDescent(aMetrics.descent); + break; } }