Add \makeat switches to babel settings if necessary.

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

diff --git a/src/mathed/MathData.cpp b/src/mathed/MathData.cpp
index fe80eeef5ae5625729a4a2da71d0c0bd7ec3fa69..12fb6c190754cd969a81d5cf5a02ceacecbefcdd 100644 (file)
--- a/src/mathed/MathData.cpp
+++ b/src/mathed/MathData.cpp
@@ -252,7 +252,7 @@ void MathData::metrics(MetricsInfo & mi, Dimension & dim) const
        }
 
        Cursor & cur = mi.base.bv->cursor();
-       const_cast<MathData*>(this)->updateMacros(&cur, mi.macrocontext);
+       const_cast<MathData*>(this)->updateMacros(&cur, mi.macrocontext, InternalUpdate);
 
        DocIterator const & inlineCompletionPos = mi.base.bv->inlineCompletionPos();
        MathData const * inlineCompletionData = 0;
@@ -280,7 +280,9 @@ void MathData::metrics(MetricsInfo & mi, Dimension & dim) const
                if (completion.length() == 0)
                        continue;
                
-               dim.wid += mathed_string_width(mi.base.font, completion);
+               FontInfo font = mi.base.font;
+               augmentFont(font, from_ascii("mathnormal"));
+               dim.wid += mathed_string_width(font, completion);
        }
        // Cache the dimension.
        mi.base.bv->coordCache().arrays().add(this, dim);
@@ -328,6 +330,7 @@ void MathData::draw(PainterInfo & pi, int x, int y) const
                if (completion.length() == 0)
                        continue;
                FontInfo f = pi.base.font;
+               augmentFont(f, from_ascii("mathnormal"));
                
                // draw the unique and the non-unique completion part
                // Note: this is not time-critical as it is
@@ -387,7 +390,8 @@ void MathData::updateBuffer(ParIterator const & it, UpdateType utype)
 }
 
 
-void MathData::updateMacros(Cursor * cur, MacroContext const & mc)
+void MathData::updateMacros(Cursor * cur, MacroContext const & mc,
+               UpdateType utype)
 {
        // If we are editing a macro, we cannot update it immediately,
        // otherwise wrong undo steps will be recorded (bug 6208).
@@ -401,7 +405,9 @@ void MathData::updateMacros(Cursor * cur, MacroContext const & mc)
                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
@@ -482,7 +488,7 @@ void MathData::updateMacros(Cursor * cur, MacroContext const & mc)
                if (inset->asScriptInset())
                        inset = inset->asScriptInset()->nuc()[0].nucleus();
                LASSERT(inset->asMacro(), /**/);
-               inset->asMacro()->updateRepresentation();
+               inset->asMacro()->updateRepresentation(cur, mc, utype);
        }
 }
 
@@ -622,7 +628,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 +636,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 +644,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 +682,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)