#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
#include "math_arrayinset.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;
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(MathMetricsInfo & mi) const
+void MathArrayInset::metrics(MetricsInfo & mi, Dimension & dim) const
{
- MathArrayChanger dummy(mi.base);
+ ArrayChanger dummy(mi.base);
MathGridInset::metrics(mi);
+ metricsMarkers2();
+ dim = dim_;
}
-void MathArrayInset::draw(MathPainterInfo & pi, int x, int y) const
+void MathArrayInset::draw(PainterInfo & pi, int x, int y) const
{
- MathArrayChanger dummy(pi.base);
- MathGridInset::draw(pi, x, y);
+ ArrayChanger dummy(pi.base);
+ MathGridInset::draw(pi, x + 1, y);
+ drawMarkers2(pi, x, y);
}
}
+void MathArrayInset::infoize(std::ostream & os) const
+{
+ os << "Array";
+}
+
+
void MathArrayInset::normalize(NormalStream & os) const
{
os << '[' << name_ << ' ';
}
-void MathArrayInset::maplize(MapleStream & os) const
+void MathArrayInset::maple(MapleStream & os) const
{
os << "array(";
- MathGridInset::maplize(os);
+ MathGridInset::maple(os);
os << ')';
}