Andreas' patch to prevent crash on click on previewd inset

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

diff --git a/src/mathed/math_arrayinset.C b/src/mathed/math_arrayinset.C
index 9a8b6adf904ce0f767a64fc91570ae4fd5da9afd..be837bad25d22a580d2d71978c7cb812eefd2f78 100644 (file)
--- a/src/mathed/math_arrayinset.C
+++ b/src/mathed/math_arrayinset.C
@@ -1,43 +1,147 @@
-#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.
+ */
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#include <config.h>
 
+#include "LaTeXFeatures.h"
 #include "math_arrayinset.h"
-#include "support/LOstream.h"
-#include "Painter.h"
+#include "math_data.h"
+#include "math_parser.h"
+#include "math_mathmlstream.h"
+#include "math_streamstr.h"
+
+#include "support/lstrings.h"
+
+#include <iterator>
+#include <sstream>
+
+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(m, n), name_(name)
+{}
+
+
+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)
-       : MathGridInset(m, n, "array", LM_OT_MATRIX)
+MathArrayInset::MathArrayInset(string const & name, char valign,
+               string const & halign)
+       : MathGridInset(valign, halign), name_(name)
 {}
 
 
-MathInset * MathArrayInset::clone() const
+MathArrayInset::MathArrayInset(string const & name, string const & str)
+       : MathGridInset(1, 1), name_(name)
 {
-       return new MathArrayInset(*this);
+       vector< vector<string> > dat;
+       istringstream is(str);
+       string line;
+       while (getline(is, line)) {
+               istringstream ls(line);
+               typedef istream_iterator<string> iter;
+               vector<string> v = vector<string>(iter(ls), iter());
+               if (v.size())
+                       dat.push_back(v);
+       }
+
+       for (row_type row = 1; row < dat.size(); ++row)
+               addRow(0);
+       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[0].size(); ++col)
+                       mathed_parse_cell(cell(index(row, col)), dat[row][col]);
+}
+
+
+auto_ptr<InsetBase> MathArrayInset::doClone() const
+{
+       return auto_ptr<InsetBase>(new MathArrayInset(*this));
 }
 
 
-void MathArrayInset::Write(std::ostream & os, bool fragile) const
+void MathArrayInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       if (fragile)
+       ArrayChanger dummy(mi.base);
+       MathGridInset::metrics(mi, dim);
+       dim.wid += 6;
+       dim_ = dim;
+}
+
+
+void MathArrayInset::draw(PainterInfo & pi, int x, int y) const
+{
+       setPosCache(pi, x, y);
+       ArrayChanger dummy(pi.base);
+       MathGridInset::drawWithMargin(pi, x, y, 4, 2);
+}
+
+
+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 << '{' << halign() << "}\n";
 
-       os << '{';
-       for (int col = 0; col < ncols(); ++col)
-               os << colinfo_[col].h_align_;
-       os << "}\n";
+       MathGridInset::write(os);
 
-       MathGridInset::Write(os, fragile);
-
-       if (fragile)
+       if (os.fragile())
                os << "\\protect";
-       os << "\\end{array}\n";
+       os << "\\end{" << name_ << '}';
+       // adding a \n here is bad if the array is the last item
+       // in an \eqnarray...
+}
+
+
+void MathArrayInset::infoize(std::ostream & os) const
+{
+       string name = name_;
+       name[0] = lyx::support::uppercase(name[0]);
+       os << name << ' ';
+}
+
+
+void MathArrayInset::normalize(NormalStream & os) const
+{
+       os << '[' << name_ << ' ';
+       MathGridInset::normalize(os);
+       os << ']';
+}
+
+
+void MathArrayInset::maple(MapleStream & os) const
+{
+       os << "array(";
+       MathGridInset::maple(os);
+       os << ')';
+}
+
+
+void MathArrayInset::validate(LaTeXFeatures & features) const
+{
+       if (name_ == "subarray")
+               features.require("amsmath");
+       MathGridInset::validate(features);
 }