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 a84c53653fddd83b988a9a86134d610ce066aa9a..be837bad25d22a580d2d71978c7cb812eefd2f78 100644 (file)
--- a/src/mathed/math_arrayinset.C
+++ b/src/mathed/math_arrayinset.C
@@ -10,19 +10,25 @@
 
 #include <config.h>
 
+#include "LaTeXFeatures.h"
 #include "math_arrayinset.h"
+#include "math_data.h"
 #include "math_parser.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
-#include "Lsstream.h"
+
+#include "support/lstrings.h"
 
 #include <iterator>
+#include <sstream>
 
-using std::vector;
-using std::istringstream;
 using std::getline;
-using std::istream_iterator;
+
+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)
@@ -46,10 +52,10 @@ MathArrayInset::MathArrayInset(string const & name, string const & str)
        : MathGridInset(1, 1), name_(name)
 {
        vector< vector<string> > dat;
-       istringstream is(STRCONV(str));
+       istringstream is(str);
        string line;
        while (getline(is, line)) {
-               istringstream ls(STRCONV(line));
+               istringstream ls(line);
                typedef istream_iterator<string> iter;
                vector<string> v = vector<string>(iter(ls), iter());
                if (v.size())
@@ -66,7 +72,7 @@ MathArrayInset::MathArrayInset(string const & name, string const & str)
 }
 
 
-auto_ptr<InsetBase> MathArrayInset::clone() const
+auto_ptr<InsetBase> MathArrayInset::doClone() const
 {
        return auto_ptr<InsetBase>(new MathArrayInset(*this));
 }
@@ -75,17 +81,17 @@ auto_ptr<InsetBase> MathArrayInset::clone() const
 void MathArrayInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        ArrayChanger dummy(mi.base);
-       MathGridInset::metrics(mi);
-       metricsMarkers2();
-       dim = dim_;
+       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::draw(pi, x + 1, y);
-       drawMarkers2(pi, x, y);
+       MathGridInset::drawWithMargin(pi, x, y, 4, 2);
 }
 
 
@@ -111,7 +117,9 @@ void MathArrayInset::write(WriteStream & os) const
 
 void MathArrayInset::infoize(std::ostream & os) const
 {
-       os << "Array";
+       string name = name_;
+       name[0] = lyx::support::uppercase(name[0]);
+       os << name << ' ';
 }
 
 
@@ -129,3 +137,11 @@ void MathArrayInset::maple(MapleStream & os) const
        MathGridInset::maple(os);
        os << ')';
 }
+
+
+void MathArrayInset::validate(LaTeXFeatures & features) const
+{
+       if (name_ == "subarray")
+               features.require("amsmath");
+       MathGridInset::validate(features);
+}