Fix regression of 5261ae6a2

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

diff --git a/src/mathed/MacroTable.cpp b/src/mathed/MacroTable.cpp
index f0c1a7c5bc805c1d0f64d8124d359ae75bffd663..60fd5683491a79ae60e6854eeda2c98f30466984 100644 (file)
--- a/src/mathed/MacroTable.cpp
+++ b/src/mathed/MacroTable.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
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -24,8 +24,7 @@
 #include "Text.h"
 
 #include "support/debug.h"
-
-#include "support/assert.h"
+#include "support/lassert.h"
 
 #include <sstream>
 
@@ -40,23 +39,23 @@ namespace lyx {
 //
 /////////////////////////////////////////////////////////////////////
 
-MacroData::MacroData()
-       : queried_(true), numargs_(0), optionals_(0), lockCount_(0),
+MacroData::MacroData(Buffer * buf)
+       : buffer_(buf), queried_(true), numargs_(0), optionals_(0), lockCount_(0),
          redefinition_(false), type_(MacroTypeNewcommand)
 {}
 
        
        
-MacroData::MacroData(Buffer const & buf, DocIterator const & pos)
-       : buffer_(&buf), pos_(pos), queried_(false), numargs_(0),
+MacroData::MacroData(Buffer * buf, DocIterator const & pos)
+       : buffer_(buf), pos_(pos), queried_(false), numargs_(0),
          optionals_(0), lockCount_(0), redefinition_(false),
          type_(MacroTypeNewcommand)
 {
 }
        
        
-MacroData::MacroData(MathMacroTemplate const & macro)
-       : queried_(false), numargs_(0), optionals_(0), lockCount_(0),
+MacroData::MacroData(Buffer * buf, MathMacroTemplate const & macro)
+       : buffer_(buf), queried_(false), numargs_(0), optionals_(0), lockCount_(0),
          redefinition_(false), type_(MacroTypeNewcommand)
 {
        queryData(macro);
@@ -67,15 +66,18 @@ void MacroData::expand(vector<MathData> const & args, MathData & to) const
 {
        updateData();
 
-       InsetMathSqrt inset; // Hack. Any inset with a cell would do.
+       // Hack. Any inset with a cell would do.
+       static InsetMathSqrt inset(0);
+       inset.setBuffer(const_cast<Buffer &>(*buffer_));
+
        // FIXME UNICODE
        asArray(display_.empty() ? definition_ : display_, inset.cell(0));
        //lyxerr << "MathData::expand: args: " << args << endl;
        //lyxerr << "MathData::expand: ar: " << inset.cell(0) << endl;
-       for (DocIterator it = doc_iterator_begin(inset); it; it.forwardChar()) {
+       for (DocIterator it = doc_iterator_begin(buffer_, &inset); it; it.forwardChar()) {
                if (!it.nextInset())
                        continue;
-               if (it.nextInset()->lyxCode() != MATHMACROARG_CODE)
+               if (it.nextInset()->lyxCode() != MATH_MACROARG_CODE)
                        continue;
                //it.cell().erase(it.pos());
                //it.cell().insert(it.pos(), it.nextInset()->asInsetMath()
@@ -150,7 +152,7 @@ void MacroData::updateData() const
 }
        
 
-void MacroData::write(odocstream & os, bool overwriteRedefinition) const
+int MacroData::write(odocstream & os, bool overwriteRedefinition) const
 {
        updateData();
 
@@ -158,14 +160,14 @@ void MacroData::write(odocstream & os, bool overwriteRedefinition) const
        Inset * inset = pos_.nextInset();
        if (inset == 0 || inset->lyxCode() != MATHMACRO_CODE) {
                lyxerr << "BUG: No macro template found by MacroData" << endl;
-               return;
+               return 0;
        }
                
        // output template
-       MathMacroTemplate const & tmpl 
-       = static_cast<MathMacroTemplate const &>(*inset);
-       WriteStream wi(os, false, true);
-       tmpl.write(wi, overwriteRedefinition);
+       MathMacroTemplate const & tmpl =
+               static_cast<MathMacroTemplate const &>(*inset);
+       WriteStream wi(os, false, true, WriteStream::wsDefault);
+       return tmpl.write(wi, overwriteRedefinition);
 }
 
 
@@ -189,20 +191,28 @@ MacroData const * MacroTable::get(docstring const & name) const
 }
 
 
-void MacroTable::insert(docstring const & name, MacroData const & data)
+MacroTable::iterator
+MacroTable::insert(docstring const & name, MacroData const & data)
 {
        //lyxerr << "MacroTable::insert: " << to_utf8(name) << endl;
-       operator[](name) = data;
+       iterator it = find(name);
+       if (it == end())
+               it = map<docstring, MacroData>::insert(
+                               make_pair(name, data)).first;
+       else
+               it->second = data;
+       return it;
 }
 
 
-void MacroTable::insert(docstring const & def, string const & requires)
+MacroTable::iterator
+MacroTable::insert(Buffer * buf, docstring const & def, string const & requires)
 {
        //lyxerr << "MacroTable::insert, def: " << to_utf8(def) << endl;
-       MathMacroTemplate mac(def);
-       MacroData data(mac);
+       MathMacroTemplate mac(buf, def);
+       MacroData data(buf, mac);
        data.requires() = requires;
-       insert(mac.name(), data);
+       return insert(mac.name(), data);
 }
 
 
@@ -231,7 +241,7 @@ void MacroTable::dump()
 //
 /////////////////////////////////////////////////////////////////////
 
-MacroContext::MacroContext(Buffer const & buf, DocIterator const & pos)
+MacroContext::MacroContext(Buffer const * buf, DocIterator const & pos)
        : buf_(buf), pos_(pos)
 {
 }
@@ -239,7 +249,7 @@ MacroContext::MacroContext(Buffer const & buf, DocIterator const & pos)
 
 MacroData const * MacroContext::get(docstring const & name) const
 {
-       return buf_.getMacro(name, pos_);
+       return buf_->getMacro(name, pos_);
 }
 
 } // namespace lyx