* 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.
*/
#include "InsetMathSqrt.h"
#include "MacroTable.h"
-#include "MathMacroTemplate.h"
-#include "MathMacroArgument.h"
+#include "InsetMathMacroTemplate.h"
+#include "InsetMathMacroArgument.h"
+#include "MathParser.h"
#include "MathStream.h"
#include "MathSupport.h"
#include "InsetMathNest.h"
#include "Text.h"
#include "support/debug.h"
-
+#include "support/gettext.h"
#include "support/lassert.h"
#include <sstream>
//
/////////////////////////////////////////////////////////////////////
-MacroData::MacroData()
- : queried_(true), numargs_(0), optionals_(0), lockCount_(0),
- redefinition_(false), type_(MacroTypeNewcommand)
+MacroData::MacroData(Buffer * buf)
+ : buffer_(buf), queried_(true), numargs_(0), sym_(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), sym_(0),
optionals_(0), lockCount_(0), redefinition_(false),
type_(MacroTypeNewcommand)
{
}
-
-
-MacroData::MacroData(MathMacroTemplate const & macro)
- : queried_(false), numargs_(0), optionals_(0), lockCount_(0),
- redefinition_(false), type_(MacroTypeNewcommand)
+
+
+MacroData::MacroData(Buffer * buf, InsetMathMacroTemplate const & macro)
+ : 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();
- InsetMathSqrt inset; // Hack. Any inset with a cell would do.
- // FIXME UNICODE
- asArray(display_.empty() ? definition_ : display_, inset.cell(0));
+ // Hack. Any inset with a cell would do.
+ InsetMathSqrt inset(const_cast<Buffer *>(buffer_));
+
+ docstring const & definition(display_.empty() ? definition_ : display_);
+ asArray(definition, inset.cell(0), Parse::QUIET | Parse::MACRODEF);
//lyxerr << "MathData::expand: args: " << args << endl;
- //lyxerr << "MathData::expand: ar: " << inset.cell(0) << endl;
- for (DocIterator it = doc_iterator_begin(inset); it; it.forwardChar()) {
+ //LYXERR0("MathData::expand: ar: " << inset.cell(0));
+ 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()
- size_t n = static_cast<MathMacroArgument*>(it.nextInset())->number();
+ size_t n = static_cast<InsetMathMacroArgument*>(it.nextInset())->number();
if (n <= args.size()) {
it.cell().erase(it.pos());
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;
}
}
-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);
}
-void MacroData::queryData(MathMacroTemplate const & macro) const
+void MacroData::queryData(InsetMathMacroTemplate const & macro) const
{
if (queried_)
return;
redefinition_ = macro.redefinition();
type_ = macro.type();
optionals_ = macro.numOptionals();
-
+
macro.getDefaults(defaults_);
}
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<InsetMathMacroTemplate const &>(*inset));
}
-
-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);
- tmpl.write(wi, overwriteRedefinition);
+ InsetMathMacroTemplate const & tmpl =
+ static_cast<InsetMathMacroTemplate const &>(*inset);
+ otexrowstream ots(os);
+ WriteStream wi(ots, false, true, WriteStream::wsDefault);
+ 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(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(def);
- MacroData data(mac);
- data.requires() = requires;
- insert(mac.name(), data);
+ InsetMathMacroTemplate mac(buf);
+ mac.fromString(def);
+ MacroData data(buf, mac);
+ 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);
}
//
/////////////////////////////////////////////////////////////////////
-MacroContext::MacroContext(Buffer const & buf, DocIterator const & pos)
+MacroContext::MacroContext(Buffer const * buf, DocIterator const & pos)
: buf_(buf), pos_(pos)
{
}
MacroData const * MacroContext::get(docstring const & name) const
{
- return buf_.getMacro(name, pos_);
+ return buf_->getMacro(name, pos_);
}
} // namespace lyx
projects / lyx.git / blobdiff