#include "math_tabularinset.h"
#include "math_parser.h"
#include "math_mathmlstream.h"
-#include "math_metricsinfo.h"
+#include "metricsinfo.h"
#include "math_streamstr.h"
#include "Lsstream.h"
using std::istringstream;
using std::getline;
using std::istream_iterator;
+using std::auto_ptr;
MathTabularInset::MathTabularInset(string const & name, int m, int n)
{}
-MathInset * MathTabularInset::clone() const
+auto_ptr<InsetBase> MathTabularInset::clone() const
{
- return new MathTabularInset(*this);
+ return auto_ptr<InsetBase>(new MathTabularInset(*this));
}
-void MathTabularInset::metrics(MathMetricsInfo & mi) const
+void MathTabularInset::metrics(MetricsInfo & mi, Dimension & /*dim*/) const
{
- MathFontSetChanger dummy(mi.base, "textnormal");
- MathGridInset::metrics(mi);
+ FontSetChanger dummy(mi.base, "textnormal");
+ return MathGridInset::metrics(mi);
}
-void MathTabularInset::draw(MathPainterInfo & pi, int x, int y) const
+void MathTabularInset::draw(PainterInfo & pi, int x, int y) const
{
- MathFontSetChanger dummy(pi.base, "textnormal");
+ FontSetChanger dummy(pi.base, "textnormal");
MathGridInset::draw(pi, x, y);
}