several smallish changes/bugfixes/left overs from Porto

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

diff --git a/src/mathed/math_arrayinset.C b/src/mathed/math_arrayinset.C
index 4a48f11e84a9dc533b12628a5007cc3102a97bfd..d785b4cede6cb2707d87007380641cd5d78c058f 100644 (file)
--- a/src/mathed/math_arrayinset.C
+++ b/src/mathed/math_arrayinset.C
@@ -1,35 +1,49 @@
+#include <config.h>
+
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
 #include "math_arrayinset.h"
 #include "math_parser.h"
-#include "support/LOstream.h"
+#include "math_mathmlstream.h"
+#include "math_streamstr.h"
 #include "Lsstream.h"
 
+#include <iterator>
+
 using std::vector;
+using std::istringstream;
+using std::getline;
+using std::istream_iterator;
+
+
+MathArrayInset::MathArrayInset(string const & name, int m, int n)
+       : MathGridInset(m, n), name_(name)
+{}
 
 
-MathArrayInset::MathArrayInset(int m, int n)
-       : MathGridInset(m, n)
+MathArrayInset::MathArrayInset(string const & name, int m, int n,
+               char valign, string const & halign)
+       : MathGridInset(m, n, valign, halign), name_(name)
 {}
 
 
-MathArrayInset::MathArrayInset(int m, int n, char valign, string const & halign)
-       : MathGridInset(m, n, valign, halign)
+MathArrayInset::MathArrayInset(string const & name, char valign,
+               string const & halign)
+       : MathGridInset(valign, halign), name_(name)
 {}
 
 
-MathArrayInset::MathArrayInset(string const & str)
-       : MathGridInset(1, 1)
+MathArrayInset::MathArrayInset(string const & name, string const & str)
+       : MathGridInset(1, 1), name_(name)
 {
        vector< vector<string> > dat;
-       istringstream is(str);
-       while (is) {
-               string line;
-               getline(is, line);
-               istringstream ls(line);
-               typedef std::istream_iterator<string> iter;
+       istringstream is(str.c_str());
+       string line;
+       while (getline(is, line)) {
+               istringstream ls(line.c_str());
+               typedef istream_iterator<string> iter;
                vector<string> v = vector<string>(iter(ls), iter());
                if (v.size())
                        dat.push_back(v);
@@ -40,7 +54,7 @@ MathArrayInset::MathArrayInset(string const & str)
        for (col_type col = 1; col < dat[0].size(); ++col)
                addCol(0);
        for (row_type row = 0; row < dat.size(); ++row)
-               for (col_type col = 0; col < dat[row].size(); ++col)
+               for (col_type col = 0; col < dat[0].size(); ++col)
                        mathed_parse_cell(cell(index(row, col)), dat[row][col]);
 }
 
@@ -51,40 +65,44 @@ MathInset * MathArrayInset::clone() const
 }
 
 
-void MathArrayInset::write(MathWriteInfo & os) const
+void MathArrayInset::metrics(MathMetricsInfo & mi) const
 {
-       if (os.fragile)
+       MathMetricsInfo m = mi;
+       if (m.base.style == LM_ST_DISPLAY)
+               m.base.style = LM_ST_TEXT;
+       MathGridInset::metrics(m);
+}
+
+
+void MathArrayInset::write(WriteStream & os) const
+{
+       if (os.fragile())
                os << "\\protect";
-       os << "\\begin{array}";
+       os << "\\begin{" << name_ << "}";
 
-       if (v_align_ == 't' || v_align_ == 'b') 
+       if (v_align_ == 't' || v_align_ == 'b')
                os << '[' << char(v_align_) << ']';
-
-       os << '{';
-       for (col_type col = 0; col < ncols(); ++col)
-               os << colinfo_[col].align_;
-       os << "}\n";
+       os << '{' << halign() << "}\n";
 
        MathGridInset::write(os);
 
-       if (os.fragile)
+       if (os.fragile())
                os << "\\protect";
-       os << "\\end{array}\n";
+       os << "\\end{" << name_ << "}\n";
 }
 
 
-void MathArrayInset::writeNormal(std::ostream & os) const
+void MathArrayInset::normalize(NormalStream & os) const
 {
-       os << "[array ";
-       MathGridInset::writeNormal(os);
+       os << "[" << name_ << " ";
+       MathGridInset::normalize(os);
        os << "]";
 }
 
 
-void MathArrayInset::metrics(MathMetricsInfo const & st) const
+void MathArrayInset::maplize(MapleStream & os) const
 {
-       MathMetricsInfo mi = st;
-       if (mi.style == LM_ST_DISPLAY)
-               mi.style = LM_ST_TEXT;
-       MathGridInset::metrics(mi);
+       os << "array(";
+       MathGridInset::maplize(os);
+       os << ")";
 }