using std::istringstream;
using std::getline;
using std::istream_iterator;
+using std::auto_ptr;
MathArrayInset::MathArrayInset(string const & name, int m, int n)
: MathGridInset(1, 1), name_(name)
{
vector< vector<string> > dat;
- istringstream is(str.c_str());
+ istringstream is(STRCONV(str));
string line;
while (getline(is, line)) {
- istringstream ls(line.c_str());
+ istringstream ls(STRCONV(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::clone() const
{
- return new MathArrayInset(*this);
+ return auto_ptr<InsetBase>(new MathArrayInset(*this));
}
-void MathArrayInset::metrics(MetricsInfo & mi) const
+void MathArrayInset::metrics(MetricsInfo & mi, Dimension & dim) const
{
ArrayChanger dummy(mi.base);
MathGridInset::metrics(mi);
metricsMarkers2();
+ dim = dim_;
}
void MathArrayInset::draw(PainterInfo & pi, int x, int y) const
{
ArrayChanger dummy(pi.base);
- MathGridInset::draw(pi, x, y);
+ MathGridInset::draw(pi, x + 1, y);
drawMarkers2(pi, x, y);
}