Fix drawing of empty boxes

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

diff --git a/src/mathed/MacroTable.cpp b/src/mathed/MacroTable.cpp
index 20a713a513e15e1d3af377282e4cfe63d359cfe5..d23855c511f5bd3fadd26661f81fc2d0b97a9abf 100644 (file)
--- a/src/mathed/MacroTable.cpp
+++ b/src/mathed/MacroTable.cpp
@@ -14,6 +14,7 @@
 #include "MacroTable.h"
 #include "MathMacroTemplate.h"
 #include "MathMacroArgument.h"
+#include "MathParser.h"
 #include "MathStream.h"
 #include "MathSupport.h"
 #include "InsetMathNest.h"
@@ -24,6 +25,7 @@
 #include "Text.h"
 
 #include "support/debug.h"
+#include "support/gettext.h"
 #include "support/lassert.h"
 
 #include <sstream>
@@ -40,40 +42,38 @@ namespace lyx {
 /////////////////////////////////////////////////////////////////////
 
 MacroData::MacroData(Buffer * buf)
-       : buffer_(buf), queried_(true), numargs_(0), optionals_(0), lockCount_(0),
-         redefinition_(false), type_(MacroTypeNewcommand)
+       : buffer_(buf), queried_(true), numargs_(0), sym_(0), optionals_(0),
+         lockCount_(0), redefinition_(false), type_(MacroTypeNewcommand)
 {}
 
-       
-       
+
 MacroData::MacroData(Buffer * buf, DocIterator const & pos)
-       : buffer_(buf), pos_(pos), queried_(false), numargs_(0),
+       : buffer_(buf), pos_(pos), queried_(false), numargs_(0), sym_(0),
          optionals_(0), lockCount_(0), redefinition_(false),
          type_(MacroTypeNewcommand)
 {
 }
-       
-       
+
+
 MacroData::MacroData(Buffer * buf, MathMacroTemplate const & macro)
-       : buffer_(buf), queried_(false), numargs_(0), optionals_(0), lockCount_(0),
-         redefinition_(false), type_(MacroTypeNewcommand)
+       : buffer_(buf), queried_(false), numargs_(0), sym_(0), optionals_(0),
+         lockCount_(0), redefinition_(false), type_(MacroTypeNewcommand)
 {
        queryData(macro);
 }
 
 
-void MacroData::expand(vector<MathData> const & args, MathData & to) const
+bool MacroData::expand(vector<MathData> const & args, MathData & to) const
 {
        updateData();
 
        // Hack. Any inset with a cell would do.
-       static InsetMathSqrt inset(0);
-       inset.setBuffer(const_cast<Buffer &>(*buffer_));
+       InsetMathSqrt inset(const_cast<Buffer *>(buffer_));
 
-       // FIXME UNICODE
-       asArray(display_.empty() ? definition_ : display_, inset.cell(0));
+       docstring const & definition(display_.empty() ? definition_ : display_);
+       asArray(definition, inset.cell(0), Parse::QUIET);
        //lyxerr << "MathData::expand: args: " << args << endl;
-       //lyxerr << "MathData::expand: ar: " << inset.cell(0) << endl;
+       //LYXERR0("MathData::expand: ar: " << inset.cell(0));
        for (DocIterator it = doc_iterator_begin(buffer_, &inset); it; it.forwardChar()) {
                if (!it.nextInset())
                        continue;
@@ -87,8 +87,12 @@ void MacroData::expand(vector<MathData> const & args, MathData & to) const
                        it.cell().insert(it.pos(), args[n - 1]);
                }
        }
-       //lyxerr << "MathData::expand: res: " << inset.cell(0) << endl;
+       //LYXERR0("MathData::expand: res: " << inset.cell(0));
        to = inset.cell(0);
+       // If the result is equal to the definition then we either have a
+       // recursive loop, or the definition did not contain any macro in the
+       // first place.
+       return asString(to) != definition;
 }
 
 
@@ -99,17 +103,47 @@ size_t MacroData::optionals() const
 }
 
 
-vector<docstring> const &  MacroData::defaults() const
+vector<docstring> const & MacroData::defaults() const
 {
        updateData();
        return defaults_;
 }
 
 
+string const MacroData::requires() const
+{
+       if (sym_)
+               return sym_->requires;
+       return string();
+}
+
+
+bool MacroData::hidden() const
+{
+       if (sym_)
+               return sym_->hidden;
+       return false;
+}
+
+
+docstring const MacroData::xmlname() const
+{
+       if (sym_)
+               return sym_->xmlname;
+       return docstring();
+}
+
+
+char const * MacroData::MathMLtype() const
+{
+       return sym_ ? sym_->MathMLtype() : 0;
+}
+
+
 void MacroData::unlock() const
 {
        --lockCount_;
-       LASSERT(lockCount_ >= 0, /**/);
+       LASSERT(lockCount_ >= 0, lockCount_ = 0);
 }
 
 
@@ -125,7 +159,7 @@ void MacroData::queryData(MathMacroTemplate const & macro) const
        redefinition_ = macro.redefinition();
        type_ = macro.type();
        optionals_ = macro.numOptionals();
-       
+
        macro.getDefaults(defaults_);
 }
 
@@ -135,22 +169,22 @@ void MacroData::updateData() const
        if (queried_)
                return;
 
-       LASSERT(buffer_ != 0, /**/);
-       
+       LBUFERR(buffer_);
+
        // Try to fix position DocIterator. Should not do anything in theory.
        pos_.fixIfBroken();
-       
+
        // find macro template
        Inset * inset = pos_.nextInset();
        if (inset == 0 || inset->lyxCode() != MATHMACRO_CODE) {
                lyxerr << "BUG: No macro template found by MacroData" << endl;
                return;
        }
-       
+
        // query the data from the macro template
-       queryData(static_cast<MathMacroTemplate const &>(*inset));      
+       queryData(static_cast<MathMacroTemplate const &>(*inset));
 }
-       
+
 
 int MacroData::write(odocstream & os, bool overwriteRedefinition) const
 {
@@ -162,11 +196,12 @@ int MacroData::write(odocstream & os, bool overwriteRedefinition) const
                lyxerr << "BUG: No macro template found by MacroData" << endl;
                return 0;
        }
-               
+
        // output template
        MathMacroTemplate const & tmpl =
                static_cast<MathMacroTemplate const &>(*inset);
-       WriteStream wi(os, false, true, WriteStream::wsDefault);
+       otexrowstream ots(os);
+       WriteStream wi(ots, false, true, WriteStream::wsDefault);
        return tmpl.write(wi, overwriteRedefinition);
 }
 
@@ -191,27 +226,36 @@ 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(Buffer * buf, docstring const & def, string const & requires)
+MacroTable::iterator
+MacroTable::insert(Buffer * buf, docstring const & def)
 {
        //lyxerr << "MacroTable::insert, def: " << to_utf8(def) << endl;
-       MathMacroTemplate mac(buf, def);
+       MathMacroTemplate mac(buf);
+       mac.fromString(def);
        MacroData data(buf, mac);
-       data.requires() = requires;
-       insert(mac.name(), data);
+       return insert(mac.name(), data);
 }
 
 
-void MacroTable::getMacroNames(std::set<docstring> & names) const
+void MacroTable::getMacroNames(std::set<docstring> & names, bool gethidden) const
 {
        for (const_iterator it = begin(); it != end(); ++it)
-               names.insert(it->first);
+               if (gethidden || !it->second.hidden())
+                       names.insert(it->first);
 }