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 58d43134c9c7eb511c4f1e3f0212ce0bcb5fb822..09b28d1a67ad26c2198e7bf042d0bc96eb1bde03 100644 (file)
--- a/src/mathed/math_macroarg.C
+++ b/src/mathed/math_macroarg.C
@@ -1,69 +1,65 @@
-#include <config.h>
-
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #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 std::endl;
 
 
 MathMacroArgument::MathMacroArgument(int n)
-       : MathParInset(LM_ST_TEXT, "", LM_OT_MACRO_ARG),
-         expnd_mode_(false), number_(n)
-{}
+       : MathNestInset(1), number_(n), expanded_(false)
+{
+       if (n < 1 || n > 9) {
+               lyxerr << "MathMacroArgument::MathMacroArgument: wrong Argument id: "
+                       << n << endl;
+       }
+       str_[0] = '#';
+       str_[1] = static_cast<unsigned char>('0' + n);
+       str_[2] = '\0';
+}
 
 
-MathedInset * MathMacroArgument::Clone()
+MathInset * MathMacroArgument::clone() const
 {
-       return this;
+       return new MathMacroArgument(*this);
 }
 
 
-void MathMacroArgument::setExpand(bool e)
+void MathMacroArgument::write(WriteStream & os) const
 {
-       expnd_mode_ = e;
+       os << str_;
 }
 
 
-bool MathMacroArgument::getExpand() const
+void MathMacroArgument::metrics(MathMetricsInfo & mi) const
 {
-       return expnd_mode_;
+       if (expanded_)
+               dim_ = cell(0).metrics(mi);
+       else
+               mathed_string_dim(mi.base.font, str_, dim_);
 }
 
 
-void MathMacroArgument::draw(Painter & pain, int x, int baseline)
+void MathMacroArgument::draw(MathPainterInfo & pi, int x, int y) const
 {
-       if (expnd_mode_) {
-               MathParInset::draw(pain, x, baseline);
-       } else {
-               std::ostringstream ost;
-               ost << '#' << number_;
-               drawStr(pain, LM_TC_TEX, size(), x, baseline, ost.str().c_str());
-       }
+       if (expanded_)
+               cell(0).draw(pi, x, y);
+       else
+               drawStrRed(pi, x, y, str_);
 }
 
-void MathMacroArgument::Metrics()
+
+void MathMacroArgument::normalize(NormalStream & os) const
 {
-       if (expnd_mode_) {
-               MathParInset::Metrics();
-       } else {
-               std::ostringstream ost;
-               ost << '#' << number_;
-               width = mathed_string_width(LM_TC_TEX, size(),
-                                           ost.str().c_str());
-               mathed_string_height(LM_TC_TEX, size(), ost.str().c_str(),
-                                    ascent, descent);
-       }
+       os << "[macroarg " << str_ << "] ";
 }
 
 
-void MathMacroArgument::Write(std::ostream & os, bool fragile)
+void MathMacroArgument::substitute(MathMacro const & m)
 {
-       if (expnd_mode_) {
-               MathParInset::Write(os, fragile);
-       } else {
-               os << '#' << number_ << ' ';
-       }
+       cell(0) = m.cell(number_ - 1);
+       expanded_ = true;
 }