[Libreoffice-commits] core.git: starmath/qa starmath/source

[Takeshi Abe]

 starmath/qa/cppunit/test_nodetotextvisitors.cxx |    2 +-
 starmath/source/visitors.cxx                    |    6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit d3c1a84d4c0bc24defcc497587fa6f258aa8ebdd
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Tue Jan 3 05:10:31 2017 +0900

    starmath: Reenable a test case for SmNodeToTextVisitor
    
    by fixing a regression which seems introduced at
    4f294a90877d2f91bb88c7d6cd5b74e8e546a025.
    
    Change-Id: If47f7528f5b5fd04432da134f345d69c25a1ca77
    Reviewed-on: https://gerrit.libreoffice.org/32665
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Takeshi Abe <tabe at fixedpoint.jp>

diff --git a/starmath/qa/cppunit/test_nodetotextvisitors.cxx b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
index c3c17f9..e2575c0 100644
--- a/starmath/qa/cppunit/test_nodetotextvisitors.cxx
+++ b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
@@ -228,7 +228,7 @@ void Test::SimpleOperators()
     parseandparseagain("coprod{a}", "Coproduct");
     parseandparseagain("int from {r_0} to {r_t} a", "Upper and lower bounds shown with integral (from & to)");
     ParseAndCheck("int csup {r_0} csub {r_t} a", "int csup { r _ 0 } csub { r _ t } a ", "Upper and lower bounds shown with integral (csub & csup)");
-//FIXME    ParseAndCheck("sum csup { size 8 { x - 1 } } csub { size 8 a } b ", "sum csup { size 8 { x - 1 } } csub { size 8 a } b ", "Sum with sized upper and lower bounds");
+    ParseAndCheck("sum csup { size 8 { x - 1 } } csub { size 8 a } b ", "sum csup { size 8 { x - 1 } } csub { size 8 a } b ", "Sum with sized upper and lower bounds");
     parseandparseagain("int{a}", "Integral");
     parseandparseagain("intd_{1}^{2}{x dx}", "Dynamically-sized integral");
     parseandparseagain("iint{a}", "Double integral");
diff --git a/starmath/source/visitors.cxx b/starmath/source/visitors.cxx
index 90ce467..e6d3935 100644
--- a/starmath/source/visitors.cxx
+++ b/starmath/source/visitors.cxx
@@ -2189,16 +2189,22 @@ void SmNodeToTextVisitor::Visit( SmUnHorNode* pNode )
 
 void SmNodeToTextVisitor::Visit( SmBinHorNode* pNode )
 {
+    const SmNode *pParent = pNode->GetParent();
+    bool bBraceNeeded = pParent && pParent->GetType() == NFONT;
     SmNode *pLeft  = pNode->LeftOperand(),
            *pOper  = pNode->Symbol(),
            *pRight = pNode->RightOperand();
     Separate( );
+    if (bBraceNeeded)
+        Append( "{ " );
     pLeft->Accept( this );
     Separate( );
     pOper->Accept( this );
     Separate( );
     pRight->Accept( this );
     Separate( );
+    if (bBraceNeeded)
+        Append( "} " );
 }
 
 void SmNodeToTextVisitor::Visit( SmBinVerNode* pNode )