starmath/source/mathmlimport.cxx | 6 ------ starmath/source/visitors.cxx | 36 ++++++++++++++++++++++++------------ 2 files changed, 24 insertions(+), 18 deletions(-)
New commits: commit 80de3c0fe6b191f6d528ae1142737e2561b12ccd Author: Ivan Timofeev <[email protected]> Date: Tue Jul 17 23:38:37 2012 +0400 fdo#38887: SmNodeToTextVisitor: use from and to instead of csub and csup Change-Id: Ief3ba731fe303b0fdc58ac70c564636e2dc5acac diff --git a/starmath/source/visitors.cxx b/starmath/source/visitors.cxx index 1269b59..2722e4e 100644 --- a/starmath/source/visitors.cxx +++ b/starmath/source/visitors.cxx @@ -2222,15 +2222,21 @@ void SmNodeToTextVisitor::Visit( SmOperNode* pNode ) LineToText( pChild ); Append( "} " ); } - if( ( pChild = pSubSup->GetSubSup( CSUP ) ) ) { + if( ( pChild = pSubSup->GetSubSup( CSUB ) ) ) { Separate( ); - Append( "csup { " ); + if (pSubSup->IsUseLimits()) + Append( "from { " ); + else + Append( "csub { " ); LineToText( pChild ); Append( "} " ); } - if( ( pChild = pSubSup->GetSubSup( CSUB ) ) ) { + if( ( pChild = pSubSup->GetSubSup( CSUP ) ) ) { Separate( ); - Append( "csub { " ); + if (pSubSup->IsUseLimits()) + Append( "to { " ); + else + Append( "csup { " ); LineToText( pChild ); Append( "} " ); } @@ -2406,14 +2412,20 @@ void SmNodeToTextVisitor::Visit( SmSubSupNode* pNode ) Append( "_ " ); LineToText( pChild ); } - if( ( pChild = pNode->GetSubSup( CSUP ) ) ) { + if( ( pChild = pNode->GetSubSup( CSUB ) ) ) { Separate( ); - Append( "csup " ); + if (pNode->IsUseLimits()) + Append( "from " ); + else + Append( "csub " ); LineToText( pChild ); } - if( ( pChild = pNode->GetSubSup( CSUB ) ) ) { + if( ( pChild = pNode->GetSubSup( CSUP ) ) ) { Separate( ); - Append( "csub " ); + if (pNode->IsUseLimits()) + Append( "to " ); + else + Append( "csup " ); LineToText( pChild ); } } commit 44a3a345ac2b9901122a9eac70538ef04417bbd4 Author: Ivan Timofeev <[email protected]> Date: Tue Jul 17 21:39:07 2012 +0400 fdo#38887: SmNodeToTextVisitor: use ^ and _ instead of rsup and rsub Change-Id: I0f13eed1843412f97b84c28fa6405378227be934 diff --git a/starmath/source/visitors.cxx b/starmath/source/visitors.cxx index f342b3d..1269b59 100644 --- a/starmath/source/visitors.cxx +++ b/starmath/source/visitors.cxx @@ -2212,13 +2212,13 @@ void SmNodeToTextVisitor::Visit( SmOperNode* pNode ) } if( ( pChild = pSubSup->GetSubSup( RSUP ) ) ) { Separate( ); - Append( "rsup { " ); + Append( "^ { " ); LineToText( pChild ); Append( "} " ); } if( ( pChild = pSubSup->GetSubSup( RSUB ) ) ) { Separate( ); - Append( "rsub { " ); + Append( "_ { " ); LineToText( pChild ); Append( "} " ); } @@ -2398,12 +2398,12 @@ void SmNodeToTextVisitor::Visit( SmSubSupNode* pNode ) } if( ( pChild = pNode->GetSubSup( RSUP ) ) ) { Separate( ); - Append( "rsup " ); + Append( "^ " ); LineToText( pChild ); } if( ( pChild = pNode->GetSubSup( RSUB ) ) ) { Separate( ); - Append( "rsub " ); + Append( "_ " ); LineToText( pChild ); } if( ( pChild = pNode->GetSubSup( CSUP ) ) ) { commit e3b220a5ae82543ce7322ce7ab516dd3f5bdf8b0 Author: Ivan Timofeev <[email protected]> Date: Tue Jul 17 17:49:12 2012 +0400 mathmlimport: do not remove first and last braces they are not always matching: {a + c} over {b + d} Change-Id: Ie14d65966dc7014b6582f72a998546e0a256e94c diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx index 9b0ad7f..0d38ec5 100644 --- a/starmath/source/mathmlimport.cxx +++ b/starmath/source/mathmlimport.cxx @@ -574,12 +574,6 @@ void SmXMLImport::endDocument(void) aText = pDocShell->GetText(); pTree->CreateTextFromNode(aText); aText = comphelper::string::stripEnd(aText, ' '); - if ((aText.GetChar(0) == '{') && - (aText.GetChar(aText.Len()-1) == '}')) - { - aText.Erase(0,1); - aText.Erase(aText.Len()-1,1); - } } pDocShell->SetText( String() ); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
