X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathSplit.cpp;h=31314b3f842822b38bf70ebd02d0978353a81538;hb=21c92c8a129b5f3ff56de33bf2941a25967cffbb;hp=5929e273030d69c4689a9a195d0afd0788f585d3;hpb=f3b70fd2cdbbc282dff8beb1c8fb4ab3f06277fa;p=lyx.git

diff --git a/src/mathed/InsetMathSplit.cpp b/src/mathed/InsetMathSplit.cpp
index 5929e27303..31314b3f84 100644
--- a/src/mathed/InsetMathSplit.cpp
+++ b/src/mathed/InsetMathSplit.cpp
@@ -14,12 +14,14 @@
 
 #include "MathData.h"
 #include "MathStream.h"
-#include "MathStream.h"
+#include "MathSupport.h"
 
+#include "Buffer.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "support/gettext.h"
 #include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
 
 #include "support/lstrings.h"
 
@@ -48,11 +50,6 @@ Inset * InsetMathSplit::clone() const
 }
 
 
-// FIXME: InsetMathGrid should be changed to let the real column alignment be
-// given by a virtual method like displayColAlign, because the values produced
-// by defaultColAlign can be invalidated by lfuns such as add-column. I suspect
-// that for the moment the values produced by defaultColAlign are not used,
-// notably because alignment is not implemented in the LyXHTML output.
 char InsetMathSplit::defaultColAlign(col_type col)
 {
 	if (name_ == "gathered")
@@ -87,10 +84,29 @@ char InsetMathSplit::displayColAlign(idx_type idx) const
 }
 
 
+int InsetMathSplit::displayColSpace(col_type col) const
+{
+	if (name_ == "split" || name_ == "aligned" || name_ == "align")
+		return colSpace(hullAlign, col);
+	if (name_ == "alignedat")
+		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);
 }
 
 
@@ -100,6 +116,12 @@ bool InsetMathSplit::getStatus(Cursor & cur, FuncRequest const & cmd,
 	switch (cmd.action()) {
 	case LFUN_TABULAR_FEATURE: {
 		string s = cmd.getArg(0);
+		if (s == "append-column"
+		    && (name_ == "gathered" || name_ == "lgathered" || name_ == "rgathered")) {
+			// gathered does not support multiple columns
+			flag.setEnabled(false);
+			return true;
+		}
 		if (s == "add-vline-left" || s == "add-vline-right") {
 			flag.message(bformat(
 				from_utf8(N_("Can't add vertical grid lines in '%1$s'")),
@@ -130,9 +152,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())