#include "Text.h"
#include "support/debug.h"
+#include "support/gettext.h"
#include "support/lassert.h"
#include <sstream>
void MacroData::unlock() const
{
--lockCount_;
- LASSERT(lockCount_ >= 0, /**/);
+ LASSERT(lockCount_ >= 0, lockCount_ = 0);
}
if (queried_)
return;
- LASSERT(buffer_ != 0, /**/);
+ LBUFERR(buffer_);
// Try to fix position DocIterator. Should not do anything in theory.
pos_.fixIfBroken();
}
-void MacroData::write(odocstream & os, bool overwriteRedefinition) const
+int MacroData::write(odocstream & os, bool overwriteRedefinition) const
{
updateData();
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, WriteStream::wsDefault);
- tmpl.write(wi, overwriteRedefinition);
+ return tmpl.write(wi, overwriteRedefinition);
}
}
-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(Buffer * buf, 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(buf, def);
MacroData data(buf, mac);
data.requires() = requires;
- insert(mac.name(), data);
+ return insert(mac.name(), data);
}