mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#66081 - reduce the number of nested <mrow>'s in MathML

Browse Source 
Change-Id: I768db4719119e53961c9cfa6a864daad7f1f7873
Reviewed-on: https://gerrit.libreoffice.org/4520
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
This commit is contained in:
Frédéric Wang
2013-06-25 22:33:13 +02:00
committed by Fridrich Strba
parent 16a0d06f90
commit 4f294a9087
2 changed files with 43 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
starmath/source/mathmlexport.cxx
View File

@@ -734,7 +734,37 @@ void SmXMLExport::ExportLine(const SmNode *pNode, int nLevel)
void SmXMLExport::ExportBinaryHorizontal(const SmNode *pNode, int nLevel)
{
ExportExpression(pNode, nLevel);
sal_uLong nGroup = pNode->GetToken().nGroup;
SvXMLElementExport* pRow = new SvXMLElementExport(*this,
XML_NAMESPACE_MATH, XML_MROW, sal_True, sal_True);
// Unfold the binary tree structure as long as the nodes are SmBinHorNode
// with the same nGroup. This will reduce the number of nested <mrow>
// elements e.g. we only need three <mrow> levels to export
//
// "a*b*c*d+e*f*g*h+i*j*k*l = a*b*c*d+e*f*g*h+i*j*k*l =
// a*b*c*d+e*f*g*h+i*j*k*l = a*b*c*d+e*f*g*h+i*j*k*l"
//
// See https://www.libreoffice.org/bugzilla/show_bug.cgi?id=66081
::std::stack< const SmNode* > s;
s.push(pNode);
while (!s.empty())
{
const SmNode *node = s.top();
s.pop();
if (node->GetType() != NBINHOR || node->GetToken().nGroup != nGroup)
{
ExportNodes(node, nLevel+1);
continue;
}
const SmBinHorNode* binNode = static_cast<const SmBinHorNode*>(node);
s.push(binNode->RightOperand());
s.push(binNode->Symbol());
s.push(binNode->LeftOperand());
}
delete pRow;
}
void SmXMLExport::ExportUnaryHorizontal(const SmNode *pNode, int nLevel)

16
starmath/source/parse.cxx
View File

@@ -1108,10 +1108,18 @@ void SmParser::Expression()
RelationArray[n - 1] = lcl_popOrZero(m_aNodeStack);
}
SmExpressionNode *pSNode = new SmExpressionNode(m_aCurToken);
pSNode->SetSubNodes(RelationArray);
pSNode->SetUseExtraSpaces(bUseExtraSpaces);
m_aNodeStack.push(pSNode);
if (n > 1)
{
SmExpressionNode *pSNode = new SmExpressionNode(m_aCurToken);
pSNode->SetSubNodes(RelationArray);
pSNode->SetUseExtraSpaces(bUseExtraSpaces);
m_aNodeStack.push(pSNode);
}
else
{
// This expression has only one node so just push this node.
m_aNodeStack.push(RelationArray[0]);
}
}