-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include "math_macroarg.h"
#include "math_macro.h"
#include "math_mathmlstream.h"
#include "math_support.h"
#include "debug.h"
-
using std::endl;
+using std::auto_ptr;
MathMacroArgument::MathMacroArgument(int n)
}
-MathInset * MathMacroArgument::clone() const
+auto_ptr<InsetBase> MathMacroArgument::clone() const
{
- return new MathMacroArgument(*this);
+ return auto_ptr<InsetBase>(new MathMacroArgument(*this));
}
}
-void MathMacroArgument::metrics(MathMetricsInfo & mi) const
+void MathMacroArgument::metrics(MetricsInfo & mi, Dimension & dim) const
{
- if (expanded_) {
- xcell(0).metrics(mi);
- width_ = xcell(0).width();
- ascent_ = xcell(0).ascent();
- descent_ = xcell(0).descent();
- } else {
- mathed_string_dim(mi.base.font, str_, ascent_, descent_, width_);
- }
+ if (expanded_)
+ cell(0).metrics(mi, dim_);
+ else
+ mathed_string_dim(mi.base.font, str_, dim_);
+ dim = dim_;
}
-void MathMacroArgument::draw(MathPainterInfo & pi, int x, int y) const
+void MathMacroArgument::draw(PainterInfo & pi, int x, int y) const
{
if (expanded_)
- xcell(0).draw(pi, x, y);
+ cell(0).draw(pi, x, y);
else
drawStrRed(pi, x, y, str_);
}