rename commandtags.h to lfuns.h and renumber/cleanup. Rebuild the tree !

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

diff --git a/src/mathed/math_macroarg.C b/src/mathed/math_macroarg.C
index 7a512f7563f1a9ac8a10a1200f5e5505301f94f6..09b28d1a67ad26c2198e7bf042d0bc96eb1bde03 100644 (file)
--- a/src/mathed/math_macroarg.C
+++ b/src/mathed/math_macroarg.C
@@ -1,71 +1,65 @@
-#include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include "math_macro.h"
 #include "math_macroarg.h"
-#include "mathed/support.h"
-#include "Lsstream.h"
+#include "math_macro.h"
+#include "math_mathmlstream.h"
+#include "math_support.h"
 #include "debug.h"
 
 
-using namespace std;
+using std::endl;
+
 
 MathMacroArgument::MathMacroArgument(int n)
-       : MathedInset(string(), LM_OT_MACRO_ARG, LM_ST_TEXT),
-               number_(n)
+       : MathNestInset(1), number_(n), expanded_(false)
 {
        if (n < 1 || n > 9) {
                lyxerr << "MathMacroArgument::MathMacroArgument: wrong Argument id: "
                        << n << endl;
-               lyx::Assert(0);
        }
+       str_[0] = '#';
+       str_[1] = static_cast<unsigned char>('0' + n);
+       str_[2] = '\0';
 }
 
-MathedInset * MathMacroArgument::Clone()
-{
-       //return new MathMacroArgument(*this);
-       return this;
-}
 
-int MathMacroArgument::number() const
+MathInset * MathMacroArgument::clone() const
 {
-       return number_;
+       return new MathMacroArgument(*this);
 }
 
-void MathMacroArgument::substitute(MathMacro * /*m*/)
+
+void MathMacroArgument::write(WriteStream & os) const
 {
-       lyxerr << "Calling MathMacroArgument::substitute!\n";
-       //return m->arg(number_)->Clone();
+       os << str_;
 }
 
 
-void MathMacroArgument::draw(Painter & pain, int x, int y)
+void MathMacroArgument::metrics(MathMetricsInfo & mi) const
 {
-       char str[] = "#0";
-       str[1] += number_; 
-       drawStr(pain, LM_TC_TEX, size(), x, y, str);
+       if (expanded_)
+               dim_ = cell(0).metrics(mi);
+       else
+               mathed_string_dim(mi.base.font, str_, dim_);
 }
 
 
-void MathMacroArgument::Metrics()
+void MathMacroArgument::draw(MathPainterInfo & pi, int x, int y) const
 {
-       char str[] = "#0";
-       str[1] += number_; 
-       width = mathed_string_width(LM_TC_TEX, size(), str);
-       mathed_string_height(LM_TC_TEX, size(), str, ascent, descent);
+       if (expanded_)
+               cell(0).draw(pi, x, y);
+       else
+               drawStrRed(pi, x, y, str_);
 }
 
 
-void MathMacroArgument::Write(std::ostream & os, bool /*fragile*/)
+void MathMacroArgument::normalize(NormalStream & os) const
 {
-       os << '#' << number_ << ' ';
+       os << "[macroarg " << str_ << "] ";
 }
 
 
-void MathMacroArgument::WriteNormal(std::ostream & os)
+void MathMacroArgument::substitute(MathMacro const & m)
 {
-       os << "[macroarg " << number_ << "] ";
+       cell(0) = m.cell(number_ - 1);
+       expanded_ = true;
 }