the DocIterator stuff

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

diff --git a/src/mathed/math_macrotemplate.C b/src/mathed/math_macrotemplate.C
index 4ae1ff83de94fb9a822ef6ef291de86e82fb2bf7..7efaee6fb5267b7b914d6921c80a83a5037cb907 100644 (file)
--- a/src/mathed/math_macrotemplate.C
+++ b/src/mathed/math_macrotemplate.C
@@ -1,22 +1,36 @@
-#ifdef __GNUG__
-#pragma implementation
-#endif
+/**
+ * \file math_macrotemplate.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
+#include <config.h>
 
 #include "math_macrotemplate.h"
 #include "math_mathmlstream.h"
 #include "math_parser.h"
 #include "frontends/Painter.h"
 #include "debug.h"
+#include "LColor.h"
+
+
+using std::string;
+using std::auto_ptr;
+using std::endl;
 
 
 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: "
@@ -33,17 +47,17 @@ MathMacroTemplate::MathMacroTemplate(std::istream & is)
        MathArray ar;
        mathed_parse_cell(ar, is);
        if (ar.size() != 1 || !ar[0]->asMacroTemplate()) {
-               lyxerr << "cannot read macro from '" << ar << "'\n";
+               lyxerr << "cannot read macro from '" << ar << "'" << endl;
                return;
        }
        operator=( *(ar[0]->asMacroTemplate()) );
 }
 
 
-MathInset * MathMacroTemplate::clone() const
+auto_ptr<InsetBase> MathMacroTemplate::clone() const
 {
-       //lyxerr << "cloning MacroTemplate!\n";
-       return new MathMacroTemplate(*this);
+       //lyxerr << "cloning MacroTemplate!" << endl;
+       return auto_ptr<InsetBase>(new MathMacroTemplate(*this));
 }
 
 
@@ -65,44 +79,50 @@ string MathMacroTemplate::name() const
 }
 
 
-void MathMacroTemplate::metrics(MathMetricsInfo & mi) const
+void MathMacroTemplate::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       xcell(0).metrics(mi);
-       xcell(1).metrics(mi);
-       dim_.w = xcell(0).width() + xcell(1).width() + 10;
-       dim_.a = std::max(xcell(0).ascent(),  xcell(1).ascent())  + 2;
-       dim_.d = std::max(xcell(0).descent(), xcell(1).descent()) + 2;
+       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;
+       dim = dim_;
 }
 
 
-void MathMacroTemplate::draw(MathPainterInfo & pi, int x, int y) const
+void MathMacroTemplate::draw(PainterInfo & pi, int x, int y) const
 {
-       int const w0 = xcell(0).width();
-       int const w1 = xcell(1).width();
-       xcell(0).draw(pi, x + 2, y + 1);
-       pi.pain.rectangle(x, y - ascent() + 1, w0 + 4, height(),
-                       LColor::blue);
-       xcell(1).draw(pi, x + 8 + w0, y + 1);
-       pi.pain.rectangle(x + w0 + 6 , y - ascent() + 1, w1 + 4,
-                       height(), LColor::blue);
+       int const w0 = cell(0).width();
+       int const w1 = cell(1).width();
+       cell(0).draw(pi, x + 2, y + 1);
+       pi.pain.rectangle(x, y - dim_.ascent() + 1, w0 + 4, dim_.height(),
+                       LColor::mathline);
+       cell(1).draw(pi, x + 8 + w0, y + 1);
+       pi.pain.rectangle(x + w0 + 6 , y - dim_.ascent() + 1, w1 + 4,
+                       dim_.height(), LColor::mathline);
 }
 
 
-
 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) << '}';
        }