Whitespace.

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

diff --git a/src/mathed/MathData.cpp b/src/mathed/MathData.cpp
index 679331228206b211db22ffa75ee30d6c49cb0da9..0c41fb634eecd36011ddf50f846ed3ecd4021dfd 100644 (file)
--- a/src/mathed/MathData.cpp
+++ b/src/mathed/MathData.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
+ * \author André Pönitz
  * \author Stefan Schimanski
  *
  * Full author contact details are available in file CREDITS.
@@ -36,7 +36,7 @@
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
-#include <boost/assert.hpp>
+#include "support/lassert.h"
 #include <boost/next_prior.hpp>
 
 #include <cstdlib>
@@ -46,21 +46,21 @@ using namespace std;
 namespace lyx {
 
 
-MathData::MathData(const_iterator from, const_iterator to)
-       : base_type(from, to)
+MathData::MathData(Buffer * buf, const_iterator from, const_iterator to)
+       : base_type(from, to), buffer_(buf)
 {}
 
 
 MathAtom & MathData::operator[](pos_type pos)
 {
-       BOOST_ASSERT(pos < size());
+       LASSERT(pos < size(), /**/);
        return base_type::operator[](pos);
 }
 
 
 MathAtom const & MathData::operator[](pos_type pos) const
 {
-       BOOST_ASSERT(pos < size());
+       LASSERT(pos < size(), /**/);
        return base_type::operator[](pos);
 }
 
@@ -73,7 +73,7 @@ void MathData::insert(size_type pos, MathAtom const & t)
 
 void MathData::insert(size_type pos, MathData const & ar)
 {
-       BOOST_ASSERT(pos <= size());
+       LASSERT(pos <= size(), /**/);
        base_type::insert(begin() + pos, ar.begin(), ar.end());
 }
 
@@ -379,12 +379,20 @@ void MathData::drawT(TextPainter & pain, int x, int y) const
 
 void MathData::updateMacros(Cursor * cur, MacroContext const & mc)
 {
+       // If we are editing a macro, we cannot update it immediately,
+       // otherwise wrong undo steps will be recorded (bug 6208).
+       InsetMath const * inmath = cur ? cur->inset().asInsetMath() : 0;
+       MathMacro const * inmacro = inmath ? inmath->asMacro() : 0;
+       docstring const edited_name = inmacro ? inmacro->name() : docstring();
+
        // go over the array and look for macros
        for (size_t i = 0; i < size(); ++i) {
                MathMacro * macroInset = operator[](i).nucleus()->asMacro();
-               if (!macroInset)
+               if (!macroInset || macroInset->name_[0] == '^'
+                               || macroInset->name_[0] == '_'
+                               || macroInset->name() == edited_name)
                        continue;
-               
+
                // get macro
                macroInset->updateMacro(mc);
                size_t macroNumArgs = 0;
@@ -407,6 +415,9 @@ void MathData::updateMacros(Cursor * cur, MacroContext const & mc)
                        || newDisplayMode == MathMacro::DISPLAY_UNFOLDED)) {
 
                        detachMacroParameters(cur, i);
+                       // FIXME: proper anchor handling, this removes the selection
+                       if (cur)
+                               cur->clearSelection();
                }
 
                // the macro could have been copied while resizing this
@@ -459,13 +470,13 @@ void MathData::updateMacros(Cursor * cur, MacroContext const & mc)
                InsetMath * inset = operator[](i).nucleus();
                if (inset->asScriptInset())
                        inset = inset->asScriptInset()->nuc()[0].nucleus();
-               BOOST_ASSERT(inset->asMacro());
+               LASSERT(inset->asMacro(), /**/);
                inset->asMacro()->updateRepresentation();
        }
 }
 
 
-void MathData::detachMacroParameters(Cursor * cur, const size_type macroPos)
+void MathData::detachMacroParameters(DocIterator * cur, const size_type macroPos)
 {
        MathMacro * macroInset = operator[](macroPos).nucleus()->asMacro();
        
@@ -522,7 +533,7 @@ void MathData::detachMacroParameters(Cursor * cur, const size_type macroPos)
                for (size_t q = 0; q < arg.size(); ++q) {
                        if (arg[q]->getChar() == ']') {
                                // put brace
-                               brace = new InsetMathBrace();
+                               brace = new InsetMathBrace(buffer_);
                                break;
                        }
                }
@@ -583,11 +594,8 @@ void MathData::detachMacroParameters(Cursor * cur, const size_type macroPos)
                        ++(*cur)[curMacroSlice - 1].pos();
        }
        
-       if (cur) {
-               // FIXME: proper anchor handling, this removes the selection
-               cur->clearSelection();
+       if (cur)
                cur->updateInsets(&cur->bottom().inset());
-       }
 }
 
 
@@ -671,6 +679,7 @@ void MathData::collectOptionalParameters(Cursor * cur,
        size_t & pos, MathAtom & scriptToPutAround,
        const pos_type macroPos, const int thisPos, const int thisSlice)
 {
+       Buffer * buf = cur ? cur->buffer() : 0;
        // insert optional arguments?
        while (params.size() < numOptionalParams 
               && pos < size()
@@ -708,7 +717,7 @@ void MathData::collectOptionalParameters(Cursor * cur,
                }
                
                // add everything between [ and ] as optional argument
-               MathData optarg(begin() + pos + 1, begin() + right);
+               MathData optarg(buf, begin() + pos + 1, begin() + right);
                
                // a brace?
                bool brace = false;