-
#include "math_macrotemplate.h"
#include "math_mathmlstream.h"
#include "math_parser.h"
#include "frontends/Painter.h"
#include "debug.h"
+using std::auto_ptr;
+
MathMacroTemplate::MathMacroTemplate()
- : MathNestInset(2), numargs_(0), name_()
+ : MathNestInset(2), numargs_(0), name_(), type_("newcommand")
{}
MathMacroTemplate::MathMacroTemplate(string const & nm, int numargs,
- MathArray const & ar1, MathArray const & ar2)
- : MathNestInset(2), numargs_(numargs), name_(nm)
+ string const & type, MathArray const & ar1, MathArray const & ar2)
+ : MathNestInset(2), numargs_(numargs), name_(nm), type_(type)
{
if (numargs_ > 9)
lyxerr << "MathMacroTemplate::MathMacroTemplate: wrong # of arguments: "
}
-MathInset * MathMacroTemplate::clone() const
+auto_ptr<InsetBase> MathMacroTemplate::clone() const
{
//lyxerr << "cloning MacroTemplate!\n";
- return new MathMacroTemplate(*this);
+ return auto_ptr<InsetBase>(new MathMacroTemplate(*this));
}
}
-Dimension MathMacroTemplate::metrics(MetricsInfo & mi) const
+void MathMacroTemplate::metrics(MetricsInfo & mi, Dimension & dim) const
{
cell(0).metrics(mi);
cell(1).metrics(mi);
dim_.wid = cell(0).width() + cell(1).width() + 10;
dim_.asc = std::max(cell(0).ascent(), cell(1).ascent()) + 2;
dim_.des = std::max(cell(0).descent(), cell(1).descent()) + 2;
- return dim_;
+ dim = dim_;
}
}
-
void MathMacroTemplate::write(WriteStream & os) const
{
- if (os.latex()) {
- os << "\n\\newcommand{\\" << name_.c_str() << '}';
- if (numargs_ > 0)
- os << '[' << numargs_ << ']';
- os << '{' << cell(0) << "}\n";
+ if (type_ == "def") {
+ os << "\n\\def\\" << name_.c_str();
+ for (int i = 1; i <= numargs_; ++i)
+ os << '#' << i;
} else {
- // writing .lyx
- os << "\n\\newcommand{\\" << name_.c_str() << '}';
+ // newcommand or renewcommand
+ os << "\n\\" << type_.c_str() << "{\\" << name_.c_str() << '}';
if (numargs_ > 0)
os << '[' << numargs_ << ']';
- os << '{' << cell(0) << '}';
- // write special .tex export only if necessary
+ }
+
+ os << '{' << cell(0) << "}";
+
+ if (os.latex()) {
+ // writing .tex. done.
+ os << "\n";
+ } else {
+ // writing .lyx, write special .tex export only if necessary
if (!cell(1).empty())
os << "\n{" << cell(1) << '}';
}