mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 827713 - Changes to mmultiscripts to support merging of script elements. r=karlt

This commit is contained in:
James Kitchener 2013-08-19 09:09:34 -04:00
Родитель 3ca04863ac
Коммит 0326b18d57
4 изменённых файлов: 339 добавлений и 194 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
layout/mathml/nsMathMLContainerFrame.cpp
Просмотреть файл

@ -1544,6 +1544,14 @@ nsMathMLContainerFrame::ReportChildCountError()
return ReportErrorToConsole("ChildCountIncorrect", &arg, 1);
}
nsresult
nsMathMLContainerFrame::ReportInvalidChildError(nsIAtom* aChildTag)
{
const PRUnichar* argv[] =
{ aChildTag->GetUTF16String(), mContent->Tag()->GetUTF16String() };
return ReportErrorToConsole("InvalidChild", argv, 2);
}
//==========================
nsIFrame*

8
layout/mathml/nsMathMLContainerFrame.h
Просмотреть файл

@ -258,6 +258,14 @@ public:
nsresult
ReportChildCountError();
/*
* Helper to call ReportErrorToConsole when certain tags have
* invalid child tags
* @param aChildTag The tag which is forbidden in this context
*/
nsresult
ReportInvalidChildError(nsIAtom* aChildTag);
/*
* Helper to call ReportToConsole when an error occurs.
* @param aParams see nsContentUtils::ReportToConsole

499
layout/mathml/nsMathMLmmultiscriptsFrame.cpp
Просмотреть файл

@ -16,6 +16,9 @@
//
// <mmultiscripts> -- attach prescripts and tensor indices to a base - implementation
// <msub> -- attach a subscript to a base - implementation
// <msubsup> -- attach a subscript-superscript pair to a base - implementation
// <msup> -- attach a superscript to a base - implementation
//
nsIFrame*
@ -38,7 +41,7 @@ nsMathMLmmultiscriptsFrame::TransmitAutomaticData()
GetEmbellishDataFrom(mPresentationData.baseFrame, mEmbellishData);
// The REC says:
// The <mmultiscripts> element increments scriptlevel by 1, and sets
// The script element increments scriptlevel by 1, and sets
// displaystyle to "false", within each of its arguments except base
UpdatePresentationDataFromChildAt(1, -1,
~NS_MATHML_DISPLAYSTYLE, NS_MATHML_DISPLAYSTYLE);
@ -46,24 +49,26 @@ nsMathMLmmultiscriptsFrame::TransmitAutomaticData()
// The TeXbook (Ch 17. p.141) says the superscript inherits the compression
// while the subscript is compressed. So here we collect subscripts and set
// the compression flag in them.
if (mContent->Tag() == nsGkAtoms::msup_)
return NS_OK;
int32_t count = 0;
bool isSubScript = false;
bool isSubScript = true;
nsAutoTArray<nsIFrame*, 8> subScriptFrames;
nsIFrame* childFrame = mFrames.FirstChild();
while (childFrame) {
if (childFrame->GetContent()->Tag() == nsGkAtoms::mprescripts_) {
// mprescripts frame
}
else if (0 == count) {
} else if (0 == count) {
// base frame
}
else {
} else {
// super/subscript block
if (isSubScript) {
// subscript
subScriptFrames.AppendElement(childFrame);
}
else {
} else {
// superscript
}
isSubScript = !isSubScript;
@ -80,11 +85,14 @@ nsMathMLmmultiscriptsFrame::TransmitAutomaticData()
return NS_OK;
}
void
nsMathMLmmultiscriptsFrame::ProcessAttributes()
/* virtual */ nsresult
nsMathMLmmultiscriptsFrame::Place(nsRenderingContext& aRenderingContext,
bool aPlaceOrigin,
nsHTMLReflowMetrics& aDesiredSize)
{
mSubScriptShift = 0;
mSupScriptShift = 0;
nscoord subScriptShift = 0;
nscoord supScriptShift = 0;
nsIAtom* tag = mContent->Tag();
// subscriptshift
//
@ -98,11 +106,13 @@ nsMathMLmmultiscriptsFrame::ProcessAttributes()
// As a minimum, negative values can be ignored.
//
nsAutoString value;
GetAttribute(mContent, mPresentationData.mstyle,
nsGkAtoms::subscriptshift_, value);
if (!value.IsEmpty()) {
ParseNumericValue(value, &mSubScriptShift, 0, PresContext(),
mStyleContext);
if (tag != nsGkAtoms::msup_) {
GetAttribute(mContent, mPresentationData.mstyle,
nsGkAtoms::subscriptshift_, value);
if (!value.IsEmpty()) {
ParseNumericValue(value, &subScriptShift, 0, PresContext(),
mStyleContext);
}
}
// superscriptshift
//
@ -115,21 +125,49 @@ nsMathMLmmultiscriptsFrame::ProcessAttributes()
// We use 0 as the default value so unitless values can be ignored.
// As a minimum, negative values can be ignored.
//
GetAttribute(mContent, mPresentationData.mstyle,
nsGkAtoms::superscriptshift_, value);
if (!value.IsEmpty()) {
ParseNumericValue(value, &mSupScriptShift, 0, PresContext(),
mStyleContext);
if (tag != nsGkAtoms::msub_) {
GetAttribute(mContent, mPresentationData.mstyle,
nsGkAtoms::superscriptshift_, value);
if (!value.IsEmpty()) {
ParseNumericValue(value, &supScriptShift, 0, PresContext(),
mStyleContext);
}
}
// scriptspace from TeX for extra spacing after sup/subscript
// (0.5pt in plain TeX)
nscoord scriptSpace = nsPresContext::CSSPointsToAppUnits(0.5f);
return PlaceMultiScript(PresContext(), aRenderingContext, aPlaceOrigin,
aDesiredSize, this, subScriptShift, supScriptShift,
scriptSpace);
}
/* virtual */ nsresult
nsMathMLmmultiscriptsFrame::Place(nsRenderingContext& aRenderingContext,
bool aPlaceOrigin,
nsHTMLReflowMetrics& aDesiredSize)
// exported routine that both munderover and mmultiscripts share.
// munderover uses this when movablelimits is set.
nsresult
nsMathMLmmultiscriptsFrame::PlaceMultiScript(nsPresContext* aPresContext,
nsRenderingContext& aRenderingContext,
bool aPlaceOrigin,
nsHTMLReflowMetrics& aDesiredSize,
nsMathMLContainerFrame* aFrame,
nscoord aUserSubScriptShift,
nscoord aUserSupScriptShift,
nscoord aScriptSpace)
{
////////////////////////////////////
// Get the children's desired sizes
nsIAtom* tag = aFrame->GetContent()->Tag();
// This function deals with both munderover etc. as well as msubsup etc.
// As the former behaves identically to the later, we treat it as such
// to avoid additional checks later.
if (tag == nsGkAtoms::mover_)
tag = nsGkAtoms::msup_;
else if (tag == nsGkAtoms::munder_)
tag = nsGkAtoms::msub_;
else if (tag == nsGkAtoms::munderover_)
tag = nsGkAtoms::msubsup_;
nsBoundingMetrics bmFrame;
nsHTMLReflowMetrics frameSize;
nscoord minShiftFromXHeight, subDrop, supDrop;
@ -138,12 +176,21 @@ nsMathMLmmultiscriptsFrame::Place(nsRenderingContext& aRenderingContext,
// depend only on the current font
////////////////////////////////////////
ProcessAttributes();
nsIFrame* baseFrame = aFrame->GetFirstPrincipalChild();
if (!baseFrame) {
if (tag == nsGkAtoms::mmultiscripts_)
aFrame->ReportErrorToConsole("NoBase");
else
aFrame->ReportChildCountError();
return aFrame->ReflowError(aRenderingContext, aDesiredSize);
}
// get x-height (an ex)
const nsStyleFont* font = StyleFont();
const nsStyleFont* font = aFrame->StyleFont();
nsRefPtr<nsFontMetrics> fm;
nsLayoutUtils::GetFontMetricsForFrame(this, getter_AddRefs(fm));
nsLayoutUtils::GetFontMetricsForFrame(baseFrame, getter_AddRefs(fm));
aRenderingContext.SetFont(fm);
nscoord xHeight = fm->XHeight();
@ -151,10 +198,9 @@ nsMathMLmmultiscriptsFrame::Place(nsRenderingContext& aRenderingContext,
nscoord ruleSize;
GetRuleThickness (aRenderingContext, fm, ruleSize);
// scriptspace from TeX for extra spacing after sup/subscript (0.5pt in plain TeX)
// forced to be at least 1 pixel here
// force the scriptSpace to be at least 1 pixel
nscoord onePixel = nsPresContext::CSSPixelsToAppUnits(1);
nscoord scriptSpace = std::max(nsPresContext::CSSPointsToAppUnits(0.5f), onePixel);
aScriptSpace = std::max(onePixel, aScriptSpace);
/////////////////////////////////////
// first the shift for the subscript
@ -167,14 +213,16 @@ nsMathMLmmultiscriptsFrame::Place(nsRenderingContext& aRenderingContext,
// Get subScriptShift{1,2} default from font
GetSubScriptShifts (fm, subScriptShift1, subScriptShift2);
if (0 < mSubScriptShift) {
// the user has set the subscriptshift attribute
float scaler = ((float) subScriptShift2) / subScriptShift1;
subScriptShift1 = std::max(subScriptShift1, mSubScriptShift);
subScriptShift2 = NSToCoordRound(scaler * subScriptShift1);
nscoord subScriptShift;
if (tag == nsGkAtoms::msub_) {
subScriptShift = subScriptShift1;
} else {
subScriptShift = std::max(subScriptShift1, subScriptShift2);
}
if (0 < aUserSubScriptShift) {
// the user has set the subscriptshift attribute
subScriptShift = std::max(subScriptShift, aUserSubScriptShift);
}
// the font dependent shift
nscoord subScriptShift = std::max(subScriptShift1,subScriptShift2);
/////////////////////////////////////
// next the shift for the superscript
@ -188,146 +236,199 @@ nsMathMLmmultiscriptsFrame::Place(nsRenderingContext& aRenderingContext,
nscoord supScriptShift1, supScriptShift2, supScriptShift3;
// Set supScriptShift{1,2,3} default from font
GetSupScriptShifts (fm, supScriptShift1, supScriptShift2, supScriptShift3);
if (0 < mSupScriptShift) {
// the user has set the superscriptshift attribute
float scaler2 = ((float) supScriptShift2) / supScriptShift1;
float scaler3 = ((float) supScriptShift3) / supScriptShift1;
supScriptShift1 = std::max(supScriptShift1, mSupScriptShift);
supScriptShift2 = NSToCoordRound(scaler2 * supScriptShift1);
supScriptShift3 = NSToCoordRound(scaler3 * supScriptShift1);
}
// get sup script shift depending on current script level and display style
// Rule 18c, App. G, TeXbook
nsPresentationData presentationData;
aFrame->GetPresentationData(presentationData);
nscoord supScriptShift;
if ( font->mScriptLevel == 0 &&
NS_MATHML_IS_DISPLAYSTYLE(mPresentationData.flags) &&
!NS_MATHML_IS_COMPRESSED(mPresentationData.flags)) {
NS_MATHML_IS_DISPLAYSTYLE(presentationData.flags) &&
!NS_MATHML_IS_COMPRESSED(presentationData.flags)) {
// Style D in TeXbook
supScriptShift = supScriptShift1;
}
else if (NS_MATHML_IS_COMPRESSED(mPresentationData.flags)) {
} else if (NS_MATHML_IS_COMPRESSED(presentationData.flags)) {
// Style C' in TeXbook = D',T',S',SS'
supScriptShift = supScriptShift3;
}
else {
} else {
// everything else = T,S,SS
supScriptShift = supScriptShift2;
}
if (0 < aUserSupScriptShift) {
// the user has set the supscriptshift attribute
supScriptShift = std::max(supScriptShift, aUserSupScriptShift);
}
////////////////////////////////////
// Get the children's sizes
////////////////////////////////////
nscoord width = 0, prescriptsWidth = 0, rightBearing = 0;
nsIFrame* mprescriptsFrame = nullptr; // frame of <mprescripts/>, if there.
bool isSubScript = false;
nscoord minSubScriptShift = 0, minSupScriptShift = 0;
nscoord trySubScriptShift = subScriptShift;
nscoord trySupScriptShift = supScriptShift;
nscoord maxSubScriptShift = subScriptShift;
nscoord maxSupScriptShift = supScriptShift;
int32_t count = 0;
nsHTMLReflowMetrics baseSize;
nsHTMLReflowMetrics subScriptSize;
nsHTMLReflowMetrics supScriptSize;
nsIFrame* baseFrame = nullptr;
baseFrame = nullptr;
nsIFrame* subScriptFrame = nullptr;
nsIFrame* supScriptFrame = nullptr;
nsIFrame* prescriptsFrame = nullptr; // frame of <mprescripts/>, if there.
bool firstPrescriptsPair = false;
nsBoundingMetrics bmBase, bmSubScript, bmSupScript;
nscoord italicCorrection = 0;
mBoundingMetrics.width = 0;
mBoundingMetrics.ascent = mBoundingMetrics.descent = -0x7FFFFFFF;
nsBoundingMetrics boundingMetrics;
boundingMetrics.width = 0;
boundingMetrics.ascent = boundingMetrics.descent = -0x7FFFFFFF;
nscoord ascent = -0x7FFFFFFF, descent = -0x7FFFFFFF;
aDesiredSize.width = aDesiredSize.height = 0;
nsIFrame* childFrame = mFrames.FirstChild();
int32_t count = 0;
bool foundNoneTag = false;
// Boolean to determine whether the current child is a subscript.
// Note that only msup starts with a superscript.
bool isSubScript = (tag != nsGkAtoms::msup_);
nsIFrame* childFrame = aFrame->GetFirstPrincipalChild();
while (childFrame) {
if (childFrame->GetContent()->Tag() == nsGkAtoms::mprescripts_) {
if (mprescriptsFrame) {
nsIAtom* childTag = childFrame->GetContent()->Tag();
if (childTag == nsGkAtoms::mprescripts_) {
if (tag != nsGkAtoms::mmultiscripts_) {
if (aPlaceOrigin) {
aFrame->ReportInvalidChildError(childTag);
}
return aFrame->ReflowError(aRenderingContext, aDesiredSize);
}
if (prescriptsFrame) {
// duplicate <mprescripts/> found
// report an error, encourage people to get their markups in order
if (aPlaceOrigin) {
ReportErrorToConsole("DuplicateMprescripts");
aFrame->ReportErrorToConsole("DuplicateMprescripts");
}
return ReflowError(aRenderingContext, aDesiredSize);
return aFrame->ReflowError(aRenderingContext, aDesiredSize);
}
mprescriptsFrame = childFrame;
if (!isSubScript) {
if (aPlaceOrigin) {
aFrame->ReportErrorToConsole("SubSupMismatch");
}
return aFrame->ReflowError(aRenderingContext, aDesiredSize);
}
prescriptsFrame = childFrame;
firstPrescriptsPair = true;
}
else {
if (0 == count) {
// base
baseFrame = childFrame;
GetReflowAndBoundingMetricsFor(baseFrame, baseSize, bmBase);
GetItalicCorrection(bmBase, italicCorrection);
// for the superscript, we always add "a little to spare"
italicCorrection += onePixel;
} else if (0 == count) {
// base
// we update mBoundingMetrics.{ascent,descent} with that
// of the baseFrame only after processing all the sup/sub pairs
// XXX need italic correction only *if* there are postscripts ?
mBoundingMetrics.width = bmBase.width + italicCorrection;
mBoundingMetrics.rightBearing = bmBase.rightBearing;
mBoundingMetrics.leftBearing = bmBase.leftBearing; // until overwritten
}
else {
// super/subscript block
if (isSubScript) {
// subscript
subScriptFrame = childFrame;
GetReflowAndBoundingMetricsFor(subScriptFrame, subScriptSize, bmSubScript);
// get the subdrop from the subscript font
GetSubDropFromChild (subScriptFrame, subDrop);
// parameter v, Rule 18a, App. G, TeXbook
minSubScriptShift = bmBase.descent + subDrop;
trySubScriptShift = std::max(minSubScriptShift,subScriptShift);
mBoundingMetrics.descent =
std::max(mBoundingMetrics.descent,bmSubScript.descent);
descent = std::max(descent,subScriptSize.height - subScriptSize.ascent);
width = bmSubScript.width + scriptSpace;
rightBearing = bmSubScript.rightBearing;
if (childTag == nsGkAtoms::none) {
if (tag == nsGkAtoms::mmultiscripts_) {
if (aPlaceOrigin) {
aFrame->ReportErrorToConsole("NoBase");
}
return aFrame->ReflowError(aRenderingContext, aDesiredSize);
} else {
//A different error message is triggered later for the other tags
foundNoneTag = true;
}
else {
// supscript
supScriptFrame = childFrame;
GetReflowAndBoundingMetricsFor(supScriptFrame, supScriptSize, bmSupScript);
// get the supdrop from the supscript font
GetSupDropFromChild (supScriptFrame, supDrop);
// parameter u, Rule 18a, App. G, TeXbook
minSupScriptShift = bmBase.ascent - supDrop;
// get min supscript shift limit from x-height
// = d(x) + 1/4 * sigma_5, Rule 18c, App. G, TeXbook
minShiftFromXHeight = NSToCoordRound
((bmSupScript.descent + (1.0f/4.0f) * xHeight));
trySupScriptShift =
std::max(minSupScriptShift,std::max(minShiftFromXHeight,supScriptShift));
mBoundingMetrics.ascent =
std::max(mBoundingMetrics.ascent,bmSupScript.ascent);
ascent = std::max(ascent,supScriptSize.ascent);
width = std::max(width, bmSupScript.width + scriptSpace);
rightBearing = std::max(rightBearing, bmSupScript.rightBearing);
}
baseFrame = childFrame;
GetReflowAndBoundingMetricsFor(baseFrame, baseSize, bmBase);
if (!mprescriptsFrame) { // we are still looping over base & postscripts
mBoundingMetrics.rightBearing = mBoundingMetrics.width + rightBearing;
mBoundingMetrics.width += width;
}
else {
prescriptsWidth += width;
if (firstPrescriptsPair) {
firstPrescriptsPair = false;
mBoundingMetrics.leftBearing =
std::min(bmSubScript.leftBearing, bmSupScript.leftBearing);
}
}
width = rightBearing = 0;
if (tag != nsGkAtoms::msub_) {
// Apply italics correction if there is the potential for a
// postsupscript.
GetItalicCorrection(bmBase, italicCorrection);
// If italics correction is applied, we always add "a little to spare"
// (see TeXbook Ch.11, p.64), as we estimate the italic creation
// ourselves and it isn't the same as TeX.
italicCorrection += onePixel;
}
// negotiate between the various shifts so that
// there is enough gap between the sup and subscripts
// Rule 18e, App. G, TeXbook
// we update boundingMetrics.{ascent,descent} with that
// of the baseFrame only after processing all the sup/sub pairs
// XXX need italic correction only *if* there are postscripts ?
boundingMetrics.width = bmBase.width + italicCorrection;
boundingMetrics.rightBearing = bmBase.rightBearing;
boundingMetrics.leftBearing = bmBase.leftBearing; // until overwritten
} else {
// super/subscript block
if ( childTag == nsGkAtoms::none) {
foundNoneTag = true;
}
if (isSubScript) {
// subscript
subScriptFrame = childFrame;
GetReflowAndBoundingMetricsFor(subScriptFrame, subScriptSize, bmSubScript);
// get the subdrop from the subscript font
GetSubDropFromChild (subScriptFrame, subDrop);
// parameter v, Rule 18a, App. G, TeXbook
minSubScriptShift = bmBase.descent + subDrop;
trySubScriptShift = std::max(minSubScriptShift,subScriptShift);
boundingMetrics.descent =
std::max(boundingMetrics.descent,bmSubScript.descent);
descent = std::max(descent,subScriptSize.height - subScriptSize.ascent);
if (bmSubScript.width)
width = bmSubScript.width + aScriptSpace;
rightBearing = bmSubScript.rightBearing;
if (tag == nsGkAtoms::msub_) {
boundingMetrics.rightBearing = boundingMetrics.width + rightBearing;
boundingMetrics.width += width;
// get min subscript shift limit from x-height
// = h(x) - 4/5 * sigma_5, Rule 18b, App. G, TeXbook
nscoord minShiftFromXHeight = (nscoord)
(bmSubScript.ascent - (4.0f/5.0f) * xHeight);
maxSubScriptShift = std::max(trySubScriptShift,minShiftFromXHeight);
maxSubScriptShift = std::max(maxSubScriptShift, trySubScriptShift);
trySubScriptShift = subScriptShift;
}
} else {
// supscript
supScriptFrame = childFrame;
GetReflowAndBoundingMetricsFor(supScriptFrame, supScriptSize, bmSupScript);
// get the supdrop from the supscript font
GetSupDropFromChild (supScriptFrame, supDrop);
// parameter u, Rule 18a, App. G, TeXbook
minSupScriptShift = bmBase.ascent - supDrop;
// get min supscript shift limit from x-height
// = d(x) + 1/4 * sigma_5, Rule 18c, App. G, TeXbook
minShiftFromXHeight = NSToCoordRound
((bmSupScript.descent + (1.0f/4.0f) * xHeight));
trySupScriptShift =
std::max(minSupScriptShift,std::max(minShiftFromXHeight,supScriptShift));
boundingMetrics.ascent =
std::max(boundingMetrics.ascent,bmSupScript.ascent);
ascent = std::max(ascent,supScriptSize.ascent);
if (bmSupScript.width)
width = std::max(width, bmSupScript.width + aScriptSpace);
rightBearing = std::max(rightBearing, bmSupScript.rightBearing);
if (!prescriptsFrame) { // we are still looping over base & postscripts
boundingMetrics.rightBearing = boundingMetrics.width + rightBearing;
boundingMetrics.width += width;
} else {
prescriptsWidth += width;
if (firstPrescriptsPair) {
firstPrescriptsPair = false;
boundingMetrics.leftBearing =
std::min(bmSubScript.leftBearing, bmSupScript.leftBearing);
}
}
width = rightBearing = 0;
// negotiate between the various shifts so that
// there is enough gap between the sup and subscripts
// Rule 18e, App. G, TeXbook
if (tag == nsGkAtoms::mmultiscripts_ ||
tag == nsGkAtoms::msubsup_) {
nscoord gap =
(trySupScriptShift - bmSupScript.descent) -
(bmSubScript.ascent - trySubScriptShift);
@ -340,17 +441,17 @@ nsMathMLmmultiscriptsFrame::Place(nsRenderingContext& aRenderingContext,
// will be > (4/5) * x-height above baseline
gap = NSToCoordRound ((4.0f/5.0f) * xHeight -
(trySupScriptShift - bmSupScript.descent));
if (gap > 0.0f) {
if (gap > 0) {
trySupScriptShift += gap;
trySubScriptShift -= gap;
}
maxSubScriptShift = std::max(maxSubScriptShift, trySubScriptShift);
maxSupScriptShift = std::max(maxSupScriptShift, trySupScriptShift);
trySubScriptShift = subScriptShift;
trySupScriptShift = supScriptShift;
}
maxSubScriptShift = std::max(maxSubScriptShift, trySubScriptShift);
maxSupScriptShift = std::max(maxSupScriptShift, trySupScriptShift);
trySubScriptShift = subScriptShift;
trySupScriptShift = supScriptShift;
}
isSubScript = !isSubScript;
@ -358,39 +459,49 @@ nsMathMLmmultiscriptsFrame::Place(nsRenderingContext& aRenderingContext,
count++;
childFrame = childFrame->GetNextSibling();
}
// note: width=0 if all sup-sub pairs match correctly
if ((0 != width) || !baseFrame) {
//NoBase error may also have been reported above
if ((count != 2 && (tag == nsGkAtoms::msup_ || tag == nsGkAtoms::msub_)) ||
(count != 3 && tag == nsGkAtoms::msubsup_) || !baseFrame ||
(foundNoneTag && tag != nsGkAtoms::mmultiscripts_) ||
(!isSubScript && tag == nsGkAtoms::mmultiscripts_)) {
// report an error, encourage people to get their markups in order
if (aPlaceOrigin) {
if (!baseFrame) {
ReportErrorToConsole("NoBase");
if ((count != 2 && (tag == nsGkAtoms::msup_ ||
tag == nsGkAtoms::msub_)) ||
(count != 3 && tag == nsGkAtoms::msubsup_ )) {
aFrame->ReportChildCountError();
} else if (foundNoneTag && tag != nsGkAtoms::mmultiscripts_) {
aFrame->ReportInvalidChildError(nsGkAtoms::none);
} else if (!baseFrame) {
aFrame->ReportErrorToConsole("NoBase");
} else {
ReportErrorToConsole("SubSupMismatch");
aFrame->ReportErrorToConsole("SubSupMismatch");
}
}
return ReflowError(aRenderingContext, aDesiredSize);
return aFrame->ReflowError(aRenderingContext, aDesiredSize);
}
// we left out the width of prescripts, so ...
mBoundingMetrics.rightBearing += prescriptsWidth;
mBoundingMetrics.width += prescriptsWidth;
boundingMetrics.rightBearing += prescriptsWidth;
boundingMetrics.width += prescriptsWidth;
// we left out the base during our bounding box updates, so ...
mBoundingMetrics.ascent =
std::max(mBoundingMetrics.ascent+maxSupScriptShift,bmBase.ascent);
mBoundingMetrics.descent =
std::max(mBoundingMetrics.descent+maxSubScriptShift,bmBase.descent);
boundingMetrics.ascent =
std::max(boundingMetrics.ascent+maxSupScriptShift,bmBase.ascent);
boundingMetrics.descent =
std::max(boundingMetrics.descent+maxSubScriptShift,bmBase.descent);
aFrame->SetBoundingMetrics(boundingMetrics);
// get the reflow metrics ...
aDesiredSize.ascent =
std::max(ascent+maxSupScriptShift,baseSize.ascent);
aDesiredSize.height = aDesiredSize.ascent +
std::max(descent+maxSubScriptShift,baseSize.height - baseSize.ascent);
aDesiredSize.width = mBoundingMetrics.width;
aDesiredSize.mBoundingMetrics = mBoundingMetrics;
aDesiredSize.width = boundingMetrics.width;
aDesiredSize.mBoundingMetrics = boundingMetrics;
mReference.x = 0;
mReference.y = aDesiredSize.ascent;
aFrame->SetReference(nsPoint(0, aDesiredSize.ascent));
//////////////////
// Place Children
@ -402,61 +513,71 @@ nsMathMLmmultiscriptsFrame::Place(nsRenderingContext& aRenderingContext,
if (aPlaceOrigin) {
nscoord dx = 0, dy = 0;
count = 0;
childFrame = mprescriptsFrame;
// With msub and msup there is only one element and
// subscriptFrame/supScriptFrame have already been set above where
// relevant. In these cases we skip to the reflow part.
if (tag == nsGkAtoms::msub_ || tag == nsGkAtoms::msup_)
count = 1;
else
count = 0;
childFrame = prescriptsFrame;
do {
if (!childFrame) { // end of prescripts,
// place the base ...
childFrame = baseFrame;
dy = aDesiredSize.ascent - baseSize.ascent;
FinishReflowChild (baseFrame, PresContext(), nullptr, baseSize,
MirrorIfRTL(aDesiredSize.width,
baseSize.width,
dx),
FinishReflowChild (baseFrame, aPresContext, nullptr, baseSize,
aFrame->MirrorIfRTL(aDesiredSize.width,
baseSize.width,
dx),
dy, 0);
dx += bmBase.width + italicCorrection;
}
else if (mprescriptsFrame != childFrame) {
} else if (prescriptsFrame != childFrame) {
// process each sup/sub pair
if (0 == count) {
subScriptFrame = childFrame;
count = 1;
}
else if (1 == count) {
supScriptFrame = childFrame;
} else if (1 == count) {
if (tag != nsGkAtoms::msub_)
supScriptFrame = childFrame;
count = 0;
// get the ascent/descent of sup/subscripts stored in their rects
// rect.x = descent, rect.y = ascent
GetReflowAndBoundingMetricsFor(subScriptFrame, subScriptSize, bmSubScript);
GetReflowAndBoundingMetricsFor(supScriptFrame, supScriptSize, bmSupScript);
if (subScriptFrame)
GetReflowAndBoundingMetricsFor(subScriptFrame, subScriptSize, bmSubScript);
if (supScriptFrame)
GetReflowAndBoundingMetricsFor(supScriptFrame, supScriptSize, bmSupScript);
// center w.r.t. largest width
width = std::max(subScriptSize.width, supScriptSize.width);
dy = aDesiredSize.ascent - subScriptSize.ascent +
maxSubScriptShift;
FinishReflowChild (subScriptFrame, PresContext(), nullptr,
subScriptSize,
MirrorIfRTL(aDesiredSize.width,
subScriptSize.width,
dx + (width-subScriptSize.width)/2),
dy, 0);
if (subScriptFrame) {
dy = aDesiredSize.ascent - subScriptSize.ascent +
maxSubScriptShift;
FinishReflowChild (subScriptFrame, aPresContext, nullptr,
subScriptSize,
aFrame->MirrorIfRTL(aDesiredSize.width,
subScriptSize.width,
dx + (width-subScriptSize.width)/2),
dy, 0);
}
dy = aDesiredSize.ascent - supScriptSize.ascent -
maxSupScriptShift;
FinishReflowChild (supScriptFrame, PresContext(), nullptr,
supScriptSize,
MirrorIfRTL(aDesiredSize.width,
supScriptSize.width,
dx + (width-supScriptSize.width)/2),
dy, 0);
dx += width + scriptSpace;
if (supScriptFrame) {
dy = aDesiredSize.ascent - supScriptSize.ascent -
maxSupScriptShift;
FinishReflowChild (supScriptFrame, aPresContext, nullptr,
supScriptSize,
aFrame->MirrorIfRTL(aDesiredSize.width,
supScriptSize.width,
dx + (width-supScriptSize.width)/2),
dy, 0);
}
dx += width + aScriptSpace;
}
}
childFrame = childFrame->GetNextSibling();
} while (mprescriptsFrame != childFrame);
} while (prescriptsFrame != childFrame);
}
return NS_OK;

18
layout/mathml/nsMathMLmmultiscriptsFrame.h
Просмотреть файл

@ -12,6 +12,9 @@
//
// <mmultiscripts> -- attach prescripts and tensor indices to a base
// <msub> -- attach a subscript to a base
// <msubsup> -- attach a subscript-superscript pair to a base
// <msup> -- attach a superscript to a base
//
class nsMathMLmmultiscriptsFrame : public nsMathMLContainerFrame {
@ -28,16 +31,21 @@ public:
bool aPlaceOrigin,
nsHTMLReflowMetrics& aDesiredSize) MOZ_OVERRIDE;
static nsresult
PlaceMultiScript(nsPresContext* aPresContext,
nsRenderingContext& aRenderingContext,
bool aPlaceOrigin,
nsHTMLReflowMetrics& aDesiredSize,
nsMathMLContainerFrame* aForFrame,
nscoord aUserSubScriptShift,
nscoord aUserSupScriptShift,
nscoord aScriptSpace);
protected:
nsMathMLmmultiscriptsFrame(nsStyleContext* aContext) : nsMathMLContainerFrame(aContext) {}
virtual ~nsMathMLmmultiscriptsFrame();
private:
nscoord mSubScriptShift;
nscoord mSupScriptShift;
void
ProcessAttributes();
};
#endif /* nsMathMLmmultiscriptsFrame_h___ */