-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#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;
+using std::auto_ptr;
MathMacroArgument::MathMacroArgument(int n)
{
if (n < 1 || n > 9) {
lyxerr << "MathMacroArgument::MathMacroArgument: wrong Argument id: "
- << n << std::endl;
+ << n << endl;
}
str_[0] = '#';
- str_[1] = '0' + n;
+ str_[1] = static_cast<unsigned char>('0' + n);
str_[2] = '\0';
}
-MathInset * MathMacroArgument::clone() const
+auto_ptr<InsetBase> MathMacroArgument::clone() const
{
- return new MathMacroArgument(*this);
+ return auto_ptr<InsetBase>(new MathMacroArgument(*this));
}
-void MathMacroArgument::write(std::ostream & os, bool /*fragile*/) const
+void MathMacroArgument::write(WriteStream & os) const
{
- os << '#' << number_;
+ os << str_;
}
-void MathMacroArgument::metrics(MathStyles st) const
+void MathMacroArgument::metrics(MetricsInfo & mi, Dimension & dim) const
{
- if (expanded_) {
- xcell(0).metrics(st);
- width_ = xcell(0).width();
- ascent_ = xcell(0).ascent();
- descent_ = xcell(0).descent();
- } else
- mathed_string_dim(LM_TC_TEX, size(), str_, width_, ascent_, descent_);
+ if (expanded_)
+ cell(0).metrics(mi, dim_);
+ else
+ mathed_string_dim(mi.base.font, str_, dim_);
+ dim = dim_;
}
-void MathMacroArgument::draw(Painter & pain, int x, int y) const
+void MathMacroArgument::draw(PainterInfo & pi, int x, int y) const
{
if (expanded_)
- xcell(0).draw(pain, x, y);
+ cell(0).draw(pi, x, y);
else
- drawStr(pain, LM_TC_TEX, size(), x, y, str_);
+ drawStrRed(pi, x, y, str_);
}
-void MathMacroArgument::writeNormal(std::ostream & os) const
+void MathMacroArgument::normalize(NormalStream & os) const
{
- os << "[macroarg " << number_ << "] ";
+ os << "[macroarg " << str_ << "] ";
}
cell(0) = m.cell(number_ - 1);
expanded_ = true;
}
-