fix typo that put too many include paths for most people

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

diff --git a/src/mathed/math_macroarg.C b/src/mathed/math_macroarg.C
index c64f750c77dab189abf72ca85c5f4da5a6715cdb..8033d70b84fb7bf58ab289b0078202cf49424c8f 100644 (file)
--- a/src/mathed/math_macroarg.C
+++ b/src/mathed/math_macroarg.C
@@ -5,18 +5,24 @@
 #include "math_macroarg.h"
 #include "math_macro.h"
 #include "math_defs.h"
-#include "mathed/support.h"
+#include "math_mathmlstream.h"
+#include "math_support.h"
 #include "debug.h"
 
 
+using std::endl;
 
-MathMacroArgument::MathMacroArgument(int n)
-       : number_(n)
+
+MathMacroArgument::MathMacroArgument(int n, MathTextCodes code)
+       : MathNestInset(1), number_(n), expanded_(false), code_(code)
 {
        if (n < 1 || n > 9) {
                lyxerr << "MathMacroArgument::MathMacroArgument: wrong Argument id: "
-                       << n << std::endl;
+                       << n << endl;
        }
+       str_[0] = '#';
+       str_[1] = static_cast<unsigned char>('0' + n);
+       str_[2] = '\0';
 }
 
 
@@ -26,37 +32,48 @@ MathInset * MathMacroArgument::clone() const
 }
 
 
-void MathMacroArgument::draw(Painter & pain, int x, int y)
+void MathMacroArgument::write(WriteStream & os) const
 {
-       char str[] = "#0";
-       str[1] += number_; 
-       drawStr(pain, LM_TC_TEX, size(), x, y, str);
+       if (code_ == LM_TC_MIN)
+               os << str_;
+       else
+               os << '\\' << math_font_name(code_) << '{' << str_ << '}';
 }
 
 
-void MathMacroArgument::Metrics(MathStyles st, int, int)
+void MathMacroArgument::metrics(MathMetricsInfo const & mi) const
 {
-       char str[] = "#0";
-       str[1] += number_; 
-       size_ = st;
-       mathed_string_dim(LM_TC_TEX, size(), str, ascent_, descent_, width_);
+       whichFont(font_, LM_TC_TEX, mi);
+       if (expanded_) {
+               xcell(0).metrics(mi);
+               width_   = xcell(0).width();
+               ascent_  = xcell(0).ascent();
+               descent_ = xcell(0).descent();
+       } else
+               mathed_string_dim(font_, str_, ascent_, descent_, width_);
 }
 
 
-void MathMacroArgument::Write(std::ostream & os, bool /*fragile*/) const
+void MathMacroArgument::draw(Painter & pain, int x, int y) const
 {
-       os << '#' << number_ << ' ';
+       if (expanded_)
+               xcell(0).draw(pain, x, y);
+       else
+               drawStr(pain, font_, x, y, str_);
 }
 
 
-void MathMacroArgument::WriteNormal(std::ostream & os) const
+void MathMacroArgument::normalize(NormalStream & os) const
 {
-       os << "[macroarg " << number_ << "] ";
+       os << "[macroarg " << str_ << "] ";
 }
 
 
-void MathMacroArgument::substitute(MathArray & array, MathMacro const & m) const
+void MathMacroArgument::substitute(MathMacro const & m)
 {
-       array.push_back(m.cell(number_ - 1));
+       cell(0) = m.cell(number_ - 1);
+       if (code_ != LM_TC_MIN)
+               for (MathArray::iterator it = cell(0).begin(); it != cell(0).end(); ++it)
+                       it->nucleus()->handleFont(code_);
+       expanded_ = true;
 }
-