make \newcommand{\bb}[1]{\mathbf{#1}} work for read/write/display.

[lyx.git] / src / mathed / math_macrotemplate.C

diff --git a/src/mathed/math_macrotemplate.C b/src/mathed/math_macrotemplate.C
index 2b7c3ffde42f1821d4dff464821d8216fa43d8e5..3fe31bc7b7477df0fb072a87e6973c080ebf6d9b 100644 (file)
--- a/src/mathed/math_macrotemplate.C
+++ b/src/mathed/math_macrotemplate.C
@@ -1,27 +1,30 @@
-#include <config.h>
-
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
 #include "math_macrotemplate.h"
+#include "math_mathmlstream.h"
 #include "Painter.h"
 #include "debug.h"
 
 
-MathMacroTemplate::MathMacroTemplate() :
-       MathInset("undefined", LM_OT_MACRO, 1), numargs_(0), users_()
+MathMacroTemplate::MathMacroTemplate()
+       : MathNestInset(1), numargs_(0), name_()
 {}
 
 
-MathMacroTemplate::MathMacroTemplate(string const & nm, int numargs) :
-       MathInset(nm, LM_OT_MACRO, 1), numargs_(numargs), users_()
-{}
+MathMacroTemplate::MathMacroTemplate(string const & nm, int numargs)
+       : MathNestInset(1), numargs_(numargs), name_(nm)
+{
+       if (numargs_ > 9)
+               lyxerr << "MathMacroTemplate::MathMacroTemplate: wrong # of arguments: "
+                       << numargs_ << std::endl;
+}
 
 
 MathInset * MathMacroTemplate::clone() const
 {
-       lyxerr << "cloning MacroTemplate!\n";
+       //lyxerr << "cloning MacroTemplate!\n";
        return new MathMacroTemplate(*this);
 }
 
@@ -38,33 +41,32 @@ void MathMacroTemplate::numargs(int numargs)
 }
 
 
-void MathMacroTemplate::Write(std::ostream & os, bool fragile) const
+string const & MathMacroTemplate::name() const
 {
-       os << "\n\\newcommand{\\" << name_ << "}";
-
-       if (numargs_ > 0)
-               os << "[" << numargs_ << "]";
-
-       os << "{";
-       cell(0).Write(os, fragile);
-       os << "}\n";
+       return name_;
 }
 
 
-void MathMacroTemplate::Metrics(MathStyles st)
+void MathMacroTemplate::metrics(MathMetricsInfo const & mi) const
 {
-       xcell(0).Metrics(st);
-       size_    = st;
+       xcell(0).metrics(mi);
        width_   = xcell(0).width() + 4;
        ascent_  = xcell(0).ascent() + 2;
        descent_ = xcell(0).descent() + 2;
 }
 
 
-void MathMacroTemplate::draw(Painter & pain, int x, int y)
+void MathMacroTemplate::draw(Painter & pain, int x, int y) const
 {
-       xo(x);
-       yo(y);
        xcell(0).draw(pain, x + 2, y + 1);
        pain.rectangle(x, y - ascent(), width(), height(), LColor::blue);
 }
+
+
+void MathMacroTemplate::write(WriteStream & os) const
+{
+       os << "\n\\newcommand{\\" << name_.c_str() << '}';
+       if (numargs_ > 0)
+               os << '[' << numargs_ << ']';
+       os << '{' << cell(0) << "}\n";
+}