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 60affcd5c4054b4d31bf1233ae662655ca1c09f1..c217cd1b57c8bbc49056521b9d840bca2b91c24a 100644 (file)
--- a/src/mathed/math_macrotemplate.C
+++ b/src/mathed/math_macrotemplate.C
@@ -8,18 +8,23 @@
 
 
 MathMacroTemplate::MathMacroTemplate()
-       : MathNestInset(1), numargs_(0)
+       : MathNestInset(1), numargs_(0), name_()
 {}
 
 
 MathMacroTemplate::MathMacroTemplate(string const & nm, int numargs)
-       : MathNestInset(1, nm), numargs_(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);
 }
 
@@ -36,20 +41,22 @@ 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) const
+void MathMacroTemplate::metrics(MathMetricsInfo const & st) const
 {
        xcell(0).metrics(st);
        size_    = st;