#include <config.h>
-#include "InsetMathSqrt.h"
#include "MacroTable.h"
-#include "MathMacroTemplate.h"
-#include "MathMacroArgument.h"
+
+#include "InsetMathSqrt.h"
+#include "InsetMathMacroTemplate.h"
+#include "InsetMathMacroArgument.h"
#include "MathParser.h"
#include "MathStream.h"
#include "MathSupport.h"
#include "InsetMathNest.h"
#include "Buffer.h"
-#include "DocIterator.h"
#include "InsetList.h"
#include "Text.h"
//
/////////////////////////////////////////////////////////////////////
-MacroData::MacroData(Buffer * buf)
- : buffer_(buf), queried_(true), numargs_(0), sym_(0), optionals_(0),
- lockCount_(0), redefinition_(false), type_(MacroTypeNewcommand)
+MacroData::MacroData(const Buffer * buf)
+ : buffer_(buf), queried_(true)
{}
-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(Buffer const * buf, DocIterator const & pos)
+ : buffer_(buf), pos_(pos)
+{}
-MacroData::MacroData(Buffer * buf, MathMacroTemplate const & macro)
- : buffer_(buf), queried_(false), numargs_(0), sym_(0), optionals_(0),
- lockCount_(0), redefinition_(false), type_(MacroTypeNewcommand)
+MacroData::MacroData(Buffer const * buf, InsetMathMacroTemplate const & macro)
+ : buffer_(buf)
{
queryData(macro);
}
-bool MacroData::expand(vector<MathData> const & args, MathData & to) const
+bool MacroData::expand(vector<MathData> const & from, 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_));
docstring const & definition(display_.empty() ? definition_ : display_);
- asArray(definition, inset.cell(0));
+ asArray(definition, inset.cell(0), Parse::QUIET | Parse::MACRODEF);
//lyxerr << "MathData::expand: args: " << args << endl;
//LYXERR0("MathData::expand: ar: " << inset.cell(0));
for (DocIterator it = doc_iterator_begin(buffer_, &inset); it; it.forwardChar()) {
continue;
//it.cell().erase(it.pos());
//it.cell().insert(it.pos(), it.nextInset()->asInsetMath()
- size_t n = static_cast<MathMacroArgument*>(it.nextInset())->number();
- if (n <= args.size()) {
+ size_t n = static_cast<InsetMathMacroArgument*>(it.nextInset())->number();
+ if (n <= from.size()) {
it.cell().erase(it.pos());
- it.cell().insert(it.pos(), args[n - 1]);
+ it.cell().insert(it.pos(), from[n - 1]);
}
}
//LYXERR0("MathData::expand: res: " << inset.cell(0));
}
-string const MacroData::requires() const
+string const MacroData::required() const
{
if (sym_)
- return sym_->requires;
+ return sym_->required;
return string();
}
+bool MacroData::hidden() const
+{
+ if (sym_)
+ return sym_->hidden;
+ return false;
+}
+
+
+docstring const MacroData::htmlname() const
+{
+ if (sym_)
+ return sym_->htmlname;
+ return docstring();
+}
+
+
docstring const MacroData::xmlname() const
{
if (sym_)
}
-void MacroData::queryData(MathMacroTemplate const & macro) const
+void MacroData::queryData(InsetMathMacroTemplate const & macro) const
{
if (queried_)
return;
}
// query the data from the macro template
- queryData(static_cast<MathMacroTemplate const &>(*inset));
+ queryData(static_cast<InsetMathMacroTemplate const &>(*inset));
}
}
// output template
- MathMacroTemplate const & tmpl =
- static_cast<MathMacroTemplate const &>(*inset);
- WriteStream wi(os, false, true, WriteStream::wsDefault);
+ InsetMathMacroTemplate const & tmpl =
+ static_cast<InsetMathMacroTemplate const &>(*inset);
+ otexrowstream ots(os);
+ TeXMathStream wi(ots, false, true, TeXMathStream::wsDefault);
return tmpl.write(wi, overwriteRedefinition);
}
MacroTable::iterator
-MacroTable::insert(Buffer * buf, docstring const & def)
+MacroTable::insert(Buffer * buf, docstring const & definition)
{
//lyxerr << "MacroTable::insert, def: " << to_utf8(def) << endl;
- MathMacroTemplate mac(buf, def);
+ InsetMathMacroTemplate mac(buf);
+ mac.fromString(definition);
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);
}