X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathSplit.cpp;h=c260e2e51eb053f159209df4c633494e1ce00e44;hb=cdc847fd304019a19425a0d5d9d42a556a937097;hp=5c425fb00297dc03ee448daa03442a777532b15a;hpb=764a2163bb6437fdd150a6a60db2573412f10d37;p=lyx.git

diff --git a/src/mathed/InsetMathSplit.cpp b/src/mathed/InsetMathSplit.cpp
index 5c425fb002..c260e2e51e 100644
--- a/src/mathed/InsetMathSplit.cpp
+++ b/src/mathed/InsetMathSplit.cpp
@@ -14,12 +14,13 @@
 
 #include "MathData.h"
 #include "MathStream.h"
-#include "MathStream.h"
+#include "MathSupport.h"
 
 #include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "support/gettext.h"
 #include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
 
 #include "support/lstrings.h"
 
@@ -50,22 +51,61 @@ Inset * InsetMathSplit::clone() const
 
 char InsetMathSplit::defaultColAlign(col_type col)
 {
-	if (name_ == "split")
+	if (name_ == "gathered")
+		return 'c';
+	if (name_ == "lgathered")
 		return 'l';
+	if (name_ == "rgathered")
+		return 'r';
+	if (name_ == "split"
+	    || name_ == "aligned"
+	    || name_ == "align"
+	    || name_ == "alignedat")
+		return colAlign(hullAlign, col);
+	return 'l';
+}
+
+
+char InsetMathSplit::displayColAlign(idx_type idx) const
+{
 	if (name_ == "gathered")
 		return 'c';
-	if (name_ == "aligned" || name_ == "align")
-		return (col & 1) ? 'l' : 'r';
+	if (name_ == "lgathered")
+		return 'l';
+	if (name_ == "rgathered")
+		return 'r';
+	if (name_ == "split"
+	    || name_ == "aligned"
+	    || name_ == "align"
+	    || name_ == "alignedat")
+		return colAlign(hullAlign, col(idx));
+	return InsetMathGrid::displayColAlign(idx);
+}
+
+
+int InsetMathSplit::displayColSpace(col_type col) const
+{
+	if (name_ == "split" || name_ == "aligned" || name_ == "align")
+		return colSpace(hullAlign, col);
 	if (name_ == "alignedat")
-		return (col & 1) ? 'l' : 'r';
-	return 'l';
+		return colSpace(hullAlignAt, col);
+	return 0;
 }
 
 
+
+void InsetMathSplit::metrics(MetricsInfo & mi, Dimension & dim) const
+{
+	Changer dummy = mi.base.changeEnsureMath();
+	InsetMathGrid::metrics(mi, dim);
+}
+
+
+
 void InsetMathSplit::draw(PainterInfo & pi, int x, int y) const
 {
+	Changer dummy = pi.base.changeEnsureMath();
 	InsetMathGrid::draw(pi, x, y);
-	setPosCache(pi, x, y);
 }
 
 
@@ -73,16 +113,16 @@ bool InsetMathSplit::getStatus(Cursor & cur, FuncRequest const & cmd,
 		FuncStatus & flag) const
 {
 	switch (cmd.action()) {
-	case LFUN_INSET_MODIFY: {
-		istringstream is(to_utf8(cmd.argument()));
-		string s;
-		is >> s;
-		if (s != "tabular")
-			break;
-		is >> s;
+	case LFUN_TABULAR_FEATURE: {
+		string s = cmd.getArg(0);
 		if (s == "add-vline-left" || s == "add-vline-right") {
 			flag.message(bformat(
-				from_utf8(N_("Can't add vertical grid lines in '%1$s'")),	name_));
+				from_utf8(N_("Can't add vertical grid lines in '%1$s'")),
+				name_));
+			flag.setEnabled(false);
+			return true;
+		}
+		if (s == "align-left" || s == "align-center" || s == "align-right") {
 			flag.setEnabled(false);
 			return true;
 		}
@@ -105,9 +145,19 @@ void InsetMathSplit::write(WriteStream & ws) const
 		suffix = from_ascii("*");
 	ws << "\\begin{" << name_ << suffix << '}';
 	bool open = ws.startOuterRow();
-	if (name_ != "split" && name_ != "align" && verticalAlignment() != 'c')
-		ws << '[' << verticalAlignment() << ']';
-	if (name_ == "alignedat")
+	bool const hasArg(name_ == "alignedat");
+	if (name_ != "split" && name_ != "align") {
+		if (verticalAlignment() != 'c')
+			ws << '[' << verticalAlignment() << ']';
+		else if (!hasArg) {
+			docstring const first(asString(cell(0)));
+			// prevent misinterpretation of the first character of
+			// the first cell as optional argument (bug 10361)
+			if (!first.empty() && first[0] == '[')
+				ws << "[]";
+		}
+	}
+	if (hasArg)
 		ws << '{' << static_cast<unsigned int>((ncols() + 1)/2) << '}';
 	InsetMathGrid::write(ws);
 	if (ws.fragile())