use stream-like syntax for LaTeX output

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

diff --git a/src/mathed/math_macrotemplate.C b/src/mathed/math_macrotemplate.C
index 89012bdad260c646260941b0d93a8132ed20ea2f..c217cd1b57c8bbc49056521b9d840bca2b91c24a 100644 (file)
--- a/src/mathed/math_macrotemplate.C
+++ b/src/mathed/math_macrotemplate.C
@@ -1,5 +1,3 @@
-#include <config.h>
-
 #ifdef __GNUG__
 #pragma implementation
 #endif
@@ -9,19 +7,24 @@
 #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;
+       }
+}
 
 
-MathMacroTemplate * MathMacroTemplate::Clone() const
+MathInset * MathMacroTemplate::clone() const
 {
-       lyxerr << "cloning MacroTemplate!\n";
+       //lyxerr << "cloning MacroTemplate!\n";
        return new MathMacroTemplate(*this);
 }
 
@@ -38,22 +41,24 @@ void MathMacroTemplate::numargs(int numargs)
 }
 
 
-void MathMacroTemplate::Write(std::ostream & os, bool fragile) const
+string const & MathMacroTemplate::name() const
 {
-       os << "\n\\newcommand{\\" << name_ << "}";
+       return name_;
+}
 
-       if (numargs_ > 0)
-               os << "[" << numargs_ << "]";
 
-       os << "{";
-       cell(0).Write(os, fragile);
-       os << "}\n";
+void MathMacroTemplate::write(MathWriteInfo & os) const
+{
+       os << "\n\\newcommand{\\" << name_ << '}';
+       if (numargs_ > 0)
+               os << '[' << numargs_ << ']';
+       os << '{' << cell(0) << "}\n";
 }
 
 
-void MathMacroTemplate::Metrics(MathStyles st)
+void MathMacroTemplate::metrics(MathMetricsInfo const & st) const
 {
-       xcell(0).Metrics(st);
+       xcell(0).metrics(st);
        size_    = st;
        width_   = xcell(0).width() + 4;
        ascent_  = xcell(0).ascent() + 2;
@@ -61,7 +66,7 @@ void MathMacroTemplate::Metrics(MathStyles st)
 }
 
 
-void MathMacroTemplate::draw(Painter & pain, int x, int y)
+void MathMacroTemplate::draw(Painter & pain, int x, int y) const
 {
        xo(x);
        yo(y);