Substack support for XHTML.

[lyx.git] / src / mathed / MathData.cpp

diff --git a/src/mathed/MathData.cpp b/src/mathed/MathData.cpp
index b364563d3f8eef5dbbbd2fa1df96100c0e4b63fa..8a1a58b0a0f8774a83c97d5f2d91d2da0a2feaf6 100644 (file)
--- a/src/mathed/MathData.cpp
+++ b/src/mathed/MathData.cpp
@@ -377,12 +377,12 @@ void MathData::drawT(TextPainter & pain, int x, int y) const
 }
 
 
-void MathData::updateLabels(ParIterator const & it, UpdateType utype)
+void MathData::updateBuffer(ParIterator const & it, UpdateType utype)
 {
        // pass down
        for (size_t i = 0, n = size(); i != n; ++i) {
                MathAtom & at = operator[](i);
-               at.nucleus()->updateLabels(it, utype);
+               at.nucleus()->updateBuffer(it, utype);
        }
 }
 
@@ -398,10 +398,12 @@ void MathData::updateMacros(Cursor * cur, MacroContext const & mc)
        // go over the array and look for macros
        for (size_t i = 0; i < size(); ++i) {
                MathMacro * macroInset = operator[](i).nucleus()->asMacro();
-               if (!macroInset || macroInset->name_.size() == 0
+               if (!macroInset || macroInset->name_.empty()
                                || macroInset->name_[0] == '^'
                                || macroInset->name_[0] == '_'
-                               || macroInset->name() == edited_name)
+                               || (macroInset->name() == edited_name
+                                   && macroInset->displayMode() ==
+                                               MathMacro::DISPLAY_UNFOLDED))
                        continue;
 
                // get macro
@@ -622,7 +624,7 @@ void MathData::attachMacroParameters(Cursor * cur,
        size_t p = macroPos + 1;
        vector<MathData> detachedArgs;
        MathAtom scriptToPutAround;
-       
+
        // find cursor slice again of this MathData
        int thisSlice = -1;
        if (cur)
@@ -630,7 +632,7 @@ void MathData::attachMacroParameters(Cursor * cur,
        int thisPos = -1;
        if (thisSlice != -1)
                thisPos = (*cur)[thisSlice].pos();
-       
+
        // find arguments behind the macro
        if (!interactiveInit) {
                collectOptionalParameters(cur, macroOptionals, detachedArgs, p,
@@ -638,27 +640,34 @@ void MathData::attachMacroParameters(Cursor * cur,
        }
        collectParameters(cur, macroNumArgs, detachedArgs, p,
                scriptToPutAround, macroPos, thisPos, thisSlice, appetite);
-               
+
        // attach arguments back to macro inset
        macroInset->attachArguments(detachedArgs, macroNumArgs, macroOptionals);
-       
+
        // found tail script? E.g. \foo{a}b^x
        if (scriptToPutAround.nucleus()) {
+               InsetMathScript * scriptInset =
+                       scriptToPutAround.nucleus()->asScriptInset();
+               // In the math parser we remove empty braces in the base
+               // of a script inset, but we have to restore them here.
+               if (scriptInset->nuc().empty()) {
+                       MathData ar;
+                       scriptInset->nuc().push_back(
+                                       MathAtom(new InsetMathBrace(ar)));
+               }
                // put macro into a script inset
-               scriptToPutAround.nucleus()->asScriptInset()->nuc()[0] 
-               = operator[](macroPos);
+               scriptInset->nuc()[0] = operator[](macroPos);
                operator[](macroPos) = scriptToPutAround;
 
                // go into the script inset nucleus
                if (cur && thisPos == int(macroPos))
                        cur->append(0, 0);
-               
+
                // get pointer to "deep" copied macro inset
-               InsetMathScript * scriptInset 
-               = operator[](macroPos).nucleus()->asScriptInset();
+               scriptInset = operator[](macroPos).nucleus()->asScriptInset();
                macroInset = scriptInset->nuc()[0].nucleus()->asMacro();        
        }
-       
+
        // remove them from the MathData
        erase(begin() + macroPos + 1, begin() + p);
 
@@ -669,7 +678,7 @@ void MathData::attachMacroParameters(Cursor * cur,
        // fix cursor if right of p
        if (thisPos >= int(p))
                (*cur)[thisSlice].pos() -= p - (macroPos + 1);
-       
+
        // was the macro inset just inserted interactively and was now folded
        // and the cursor is just behind?
        if ((*cur)[thisSlice].pos() == int(macroPos + 1)