-#include <config.h>
+/**
+ * \file math_arrayinset.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+#include <config.h>
#include "math_arrayinset.h"
+#include "math_data.h"
#include "math_parser.h"
#include "math_mathmlstream.h"
-#include "metricsinfo.h"
#include "math_streamstr.h"
-#include "Lsstream.h"
#include <iterator>
+#include <sstream>
-using std::vector;
-using std::istringstream;
using std::getline;
+
+using std::string;
+using std::auto_ptr;
+using std::istringstream;
using std::istream_iterator;
+using std::vector;
MathArrayInset::MathArrayInset(string const & name, int m, int n)
: MathGridInset(1, 1), name_(name)
{
vector< vector<string> > dat;
- istringstream is(STRCONV(str));
+ istringstream is(str);
string line;
while (getline(is, line)) {
- istringstream ls(STRCONV(line));
+ istringstream ls(line);
typedef istream_iterator<string> iter;
vector<string> v = vector<string>(iter(ls), iter());
if (v.size())
}
-MathInset * MathArrayInset::clone() const
+auto_ptr<InsetBase> MathArrayInset::doClone() const
{
- return new MathArrayInset(*this);
+ return auto_ptr<InsetBase>(new MathArrayInset(*this));
}
void MathArrayInset::metrics(MetricsInfo & mi, Dimension & dim) const
{
ArrayChanger dummy(mi.base);
- MathGridInset::metrics(mi);
- metricsMarkers2();
- dim = dim_;
+ MathGridInset::metrics(mi, dim);
}
void MathArrayInset::draw(PainterInfo & pi, int x, int y) const
{
+ setPosCache(pi, x, y);
ArrayChanger dummy(pi.base);
MathGridInset::draw(pi, x + 1, y);
- drawMarkers2(pi, x, y);
}