X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathArray.cpp;h=eeea831d05e5c2d7f2279a88c6aa7a3553ba9c00;hb=5fdc577badb1cb133d6a0dc7d831bb1f82576adb;hp=31b5f4f9b3dc3f9e53dcbee0f66019b34536fbf2;hpb=70c8d87745ba7d6def7fbcb29ec00c56ac7abf80;p=lyx.git

diff --git a/src/mathed/InsetMathArray.cpp b/src/mathed/InsetMathArray.cpp
index 31b5f4f9b3..eeea831d05 100644
--- a/src/mathed/InsetMathArray.cpp
+++ b/src/mathed/InsetMathArray.cpp
@@ -3,53 +3,46 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
-#include "LaTeXFeatures.h"
 #include "InsetMathArray.h"
+
+#include "LaTeXFeatures.h"
 #include "MathData.h"
 #include "MathParser.h"
 #include "MathStream.h"
+#include "MetricsInfo.h"
 
 #include "support/lstrings.h"
 
 #include <iterator>
 #include <sstream>
 
+using namespace std;
 
 namespace lyx {
 
-using std::getline;
-using std::istringstream;
-using std::istream_iterator;
-using std::vector;
-using std::string;
-
-
-InsetMathArray::InsetMathArray(docstring const & name, int m, int n)
-	: InsetMathGrid(m, n), name_(name)
-{}
-
 
-InsetMathArray::InsetMathArray(docstring const & name, int m, int n,
-		char valign, docstring const & halign)
-	: InsetMathGrid(m, n, valign, halign), name_(name)
+InsetMathArray::InsetMathArray(Buffer * buf, docstring const & name, int m,
+		int n)
+	: InsetMathGrid(buf, m, n), name_(name)
 {}
 
 
-InsetMathArray::InsetMathArray(docstring const & name, char valign,
-		docstring const & halign)
-	: InsetMathGrid(valign, halign), name_(name)
+InsetMathArray::InsetMathArray(Buffer * buf, docstring const & name, int m,
+		int n, char valign, docstring const & halign)
+	: InsetMathGrid(buf, m, n, valign, halign), name_(name)
 {}
 
 
-InsetMathArray::InsetMathArray(docstring const & name, docstring const & str)
-	: InsetMathGrid(1, 1), name_(name)
+InsetMathArray::InsetMathArray(Buffer * buf, docstring const & name,
+		docstring const & str)
+	: InsetMathGrid(buf, 1, 1), name_(name)
 {
 	vector< vector<string> > dat;
 	istringstream is(to_utf8(str));
@@ -58,17 +51,18 @@ InsetMathArray::InsetMathArray(docstring const & name, docstring const & str)
 		istringstream ls(line);
 		typedef istream_iterator<string> iter;
 		vector<string> v = vector<string>(iter(ls), iter());
-		if (v.size())
+		if (!v.empty())
 			dat.push_back(v);
 	}
 
 	for (row_type row = 1; row < dat.size(); ++row)
-		appendRow(0);
+		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)), from_utf8(dat[row][col]));
+			mathed_parse_cell(cell(index(row, col)),
+					  from_utf8(dat[row][col]), Parse::NORMAL);
 }
 
 
@@ -80,43 +74,41 @@ Inset * InsetMathArray::clone() const
 
 void InsetMathArray::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	ArrayChanger dummy(mi.base);
+	Changer dummy2 = mi.base.changeEnsureMath();
+	Changer dummy = mi.base.changeArray();
 	InsetMathGrid::metrics(mi, dim);
-	dim.wid += 6;
-}
-
-
-Dimension const InsetMathArray::dimension(BufferView const & bv) const
-{
-	Dimension dim = InsetMathGrid::dimension(bv);
-	dim.wid += 6;
-	return dim;
 }
 
 
 void InsetMathArray::draw(PainterInfo & pi, int x, int y) const
 {
-	setPosCache(pi, x, y);
-	ArrayChanger dummy(pi.base);
-	InsetMathGrid::drawWithMargin(pi, x, y, 4, 2);
+	Changer dummy2 = pi.base.changeEnsureMath();
+	Changer dummy = pi.base.changeArray();
+	InsetMathGrid::draw(pi, x, y);
 }
 
 
 void InsetMathArray::write(WriteStream & os) const
 {
+	MathEnsurer ensurer(os);
+
 	if (os.fragile())
 		os << "\\protect";
 	os << "\\begin{" << name_ << '}';
+	bool open = os.startOuterRow();
 
-	if (v_align_ == 't' || v_align_ == 'b')
-		os << '[' << char(v_align_) << ']';
-	os << '{' << halign() << "}\n";
+	char const v = verticalAlignment();
+	if (v == 't' || v == 'b')
+		os << '[' << v << ']';
+	os << '{' << horizontalAlignments() << "}\n";
 
 	InsetMathGrid::write(os);
 
 	if (os.fragile())
 		os << "\\protect";
 	os << "\\end{" << name_ << '}';
+	if (open)
+		os.startOuterRow();
 	// adding a \n here is bad if the array is the last item
 	// in an \eqnarray...
 }