architectural changes to tex2lyx

[lyx.git] / src / mathed / math_arrayinset.C

diff --git a/src/mathed/math_arrayinset.C b/src/mathed/math_arrayinset.C
index 83e756a574863d9bd53de32f31d1bce4877c95aa..8c3629ccadc2bc9732c61e19b383b9483256adcf 100644 (file)
--- a/src/mathed/math_arrayinset.C
+++ b/src/mathed/math_arrayinset.C
@@ -4,7 +4,7 @@
 #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"
 
@@ -14,6 +14,7 @@ using std::vector;
 using std::istringstream;
 using std::getline;
 using std::istream_iterator;
+using std::auto_ptr;
 
 
 MathArrayInset::MathArrayInset(string const & name, int m, int n)
@@ -37,10 +38,10 @@ MathArrayInset::MathArrayInset(string const & name, string const & str)
        : 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())
@@ -57,23 +58,26 @@ MathArrayInset::MathArrayInset(string const & name, string const & str)
 }
 
 
-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);
 }
 
 
@@ -97,6 +101,12 @@ void MathArrayInset::write(WriteStream & os) const
 }
 
 
+void MathArrayInset::infoize(std::ostream & os) const
+{
+       os << "Array";
+}
+
+
 void MathArrayInset::normalize(NormalStream & os) const
 {
        os << '[' << name_ << ' ';