#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include "math_boxinset.h"
#include "math_support.h"
#include "math_mathmlstream.h"
#include "math_streamstr.h"
#include "support/LOstream.h"
+using std::auto_ptr;
+
MathBoxInset::MathBoxInset(string const & name)
: MathNestInset(1), name_(name)
{}
-MathInset * MathBoxInset::clone() const
+auto_ptr<InsetBase> MathBoxInset::clone() const
{
- return new MathBoxInset(*this);
+ return auto_ptr<InsetBase>(new MathBoxInset(*this));
}
void MathBoxInset::write(WriteStream & os) const
{
- os << "\\" << name_ << "{" << cell(0) << "}";
+ os << '\\' << name_ << '{' << cell(0) << '}';
}
}
-void MathBoxInset::rebreak()
-{
- //lyxerr << "trying to rebreak...\n";
-}
-
-
-void MathBoxInset::metrics(MathMetricsInfo & mi) const
+void MathBoxInset::metrics(MetricsInfo & mi, Dimension & dim) const
{
- MathFontSetChanger dummy(mi.base, "textnormal");
- xcell(0).metrics(mi);
- ascent_ = xcell(0).ascent() + 1;
- descent_ = xcell(0).descent() + 1;
- width_ = xcell(0).width() + 2;
+ FontSetChanger dummy(mi.base, "textnormal");
+ cell(0).metrics(mi, dim_);
+ metricsMarkers();
+ dim = dim_;
}
-void MathBoxInset::draw(MathPainterInfo & pi, int x, int y) const
+void MathBoxInset::draw(PainterInfo & pi, int x, int y) const
{
- MathFontSetChanger dummy(pi.base, "textnormal");
- xcell(0).draw(pi, x, y);
- drawMarkers2(pi, x + 1, y);
+ FontSetChanger dummy(pi.base, "textnormal");
+ cell(0).draw(pi, x, y);
+ drawMarkers(pi, x, y);
}