Fix math cursor positioning bug

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

diff --git a/src/mathed/math_arrayinset.C b/src/mathed/math_arrayinset.C
index e0cb5bed158abfd5db9006787a91b78d44330cee..6cbcd3a093861535da7b5fa21b47d54f4bdb7f33 100644 (file)
--- a/src/mathed/math_arrayinset.C
+++ b/src/mathed/math_arrayinset.C
@@ -1,22 +1,32 @@
-#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 "math_data.h"
 #include "math_parser.h"
 #include "math_mathmlstream.h"
-#include "math_metricsinfo.h"
 #include "math_streamstr.h"
-#include "Lsstream.h"
 
 #include <iterator>
+#include <sstream>
 
-using std::vector;
-using std::istringstream;
 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)
@@ -40,10 +50,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(str);
        string line;
        while (getline(is, line)) {
-               istringstream ls(line.c_str());
+               istringstream ls(line);
                typedef istream_iterator<string> iter;
                vector<string> v = vector<string>(iter(ls), iter());
                if (v.size())
@@ -60,18 +70,24 @@ MathArrayInset::MathArrayInset(string const & name, string const & str)
 }
 
 
-MathInset * MathArrayInset::clone() const
+auto_ptr<InsetBase> MathArrayInset::doClone() 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
 {
-       MathMetricsInfo m = mi;
-       if (m.base.style == LM_ST_DISPLAY)
-               m.base.style = LM_ST_TEXT;
-       MathGridInset::metrics(m);
+       ArrayChanger dummy(mi.base);
+       MathGridInset::metrics(mi, 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);
 }
 
 
@@ -79,7 +95,7 @@ void MathArrayInset::write(WriteStream & os) const
 {
        if (os.fragile())
                os << "\\protect";
-       os << "\\begin{" << name_ << "}";
+       os << "\\begin{" << name_ << '}';
 
        if (v_align_ == 't' || v_align_ == 'b')
                os << '[' << char(v_align_) << ']';
@@ -89,21 +105,37 @@ void MathArrayInset::write(WriteStream & os) const
 
        if (os.fragile())
                os << "\\protect";
-       os << "\\end{" << name_ << "}\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
+{
+       os << "Array";
 }
 
 
 void MathArrayInset::normalize(NormalStream & os) const
 {
-       os << "[" << name_ << " ";
+       os << '[' << name_ << ' ';
        MathGridInset::normalize(os);
-       os << "]";
+       os << ']';
 }
 
 
-void MathArrayInset::maplize(MapleStream & os) const
+void MathArrayInset::maple(MapleStream & os) const
 {
        os << "array(";
-       MathGridInset::maplize(os);
-       os << ")";
+       MathGridInset::maple(os);
+       os << ')';
+}
+
+
+void MathArrayInset::validate(LaTeXFeatures & features) const
+{
+       if (name_ == "subarray")
+               features.require("amsmath");
+       MathGridInset::validate(features);
 }