So this changes the way we handle sums and such. We just don't need to

handle them specially for MathML, and we don't need to split scripts
either.

Wouldn't it have been nice if I'd realized that before?


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32572 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2009-12-17 17:52:09 +00:00
parent 64c84ae883
commit e1ed39f8b4
2 changed files with 10 additions and 2 deletions

View File

@ -124,6 +124,10 @@ void InsetMathExInt::mathematica(MathematicaStream & os) const
void InsetMathExInt::mathmlize(MathStream & os) const
{
// At the moment, we are not extracting sums and the like for MathML.
// If we should decide to do so later, then we'll need to re-merge
// r32566 and r32568.
// So right now this only handles integrals.
InsetMathSymbol sym(symbol_);
bool const lower = !cell(2).empty();
bool const upper = !cell(3).empty();

View File

@ -118,6 +118,8 @@ MathData::iterator extractArgument(MathData & ar,
// something delimited _is_ an argument
if ((*pos)->asDelimInset()) {
// leave out delimiters if this is a function argument
// unless we are doing MathML, in which case we do want
// the delimiters
if (function && kind != MATHML) {
MathData const & arg = (*pos)->asDelimInset()->cell(0);
MathData::const_iterator cur = arg.begin();
@ -946,10 +948,12 @@ void extractLims(MathData & ar)
void extractStructure(MathData & ar, ExternalMath kind)
{
//lyxerr << "\nStructure from: " << ar << endl;
splitScripts(ar);
if (kind != MATHML)
splitScripts(ar);
extractDelims(ar);
extractIntegrals(ar, kind);
extractSums(ar);
if (kind != MATHML)
extractSums(ar);
extractNumbers(ar);
extractMatrices(ar);
extractFunctions(ar, kind);