X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathSplit.cpp;h=c260e2e51eb053f159209df4c633494e1ce00e44;hb=f5fe3c17be0a66b32085585962877dfc2dae9140;hp=3f7478321e5766054cb05a1bd5d290b0cc427c4a;hpb=ff4460603e3888948b46f0ab5bfa69a862d538ad;p=lyx.git

diff --git a/src/mathed/InsetMathSplit.cpp b/src/mathed/InsetMathSplit.cpp
index 3f7478321e..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"
 
@@ -32,9 +33,12 @@ namespace lyx {
 using support::bformat;
 
 
+// FIXME: handle numbers in gui, currently they are only read and written
+
 InsetMathSplit::InsetMathSplit(Buffer * buf, docstring const & name,
-	char valign)
-	: InsetMathGrid(buf, 1, 1, valign, docstring()), name_(name)
+	char valign, bool numbered)
+	: InsetMathGrid(buf, 1, 1, valign, docstring()), name_(name),
+	  numbered_(numbered)
 {
 }
 
@@ -47,42 +51,87 @@ 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")
-		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);
 }
 
 
 bool InsetMathSplit::getStatus(Cursor & cur, FuncRequest const & cmd,
 		FuncStatus & flag) const
 {
-	switch (cmd.action) {
+	switch (cmd.action()) {
 	case LFUN_TABULAR_FEATURE: {
-		docstring const & s = cmd.argument();
+		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;
 		}
-		return InsetMathGrid::getStatus(cur, cmd, flag);
+		if (s == "align-left" || s == "align-center" || s == "align-right") {
+			flag.setEnabled(false);
+			return true;
+		}
+		break;
 	}
 	default:
-		return InsetMathGrid::getStatus(cur, cmd, flag);
+		break;
 	}
+	return InsetMathGrid::getStatus(cur, cmd, flag);
 }
 
 
@@ -91,15 +140,31 @@ void InsetMathSplit::write(WriteStream & ws) const
 	MathEnsurer ensurer(ws);
 	if (ws.fragile())
 		ws << "\\protect";
-	ws << "\\begin{" << name_ << '}';
-	if (name_ != "split" && verticalAlignment() != 'c')
-		ws << '[' << verticalAlignment() << ']';
-	if (name_ == "alignedat")
+	docstring suffix;
+	if (!numbered_ && name_ == "align")
+		suffix = from_ascii("*");
+	ws << "\\begin{" << name_ << suffix << '}';
+	bool open = ws.startOuterRow();
+	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())
 		ws << "\\protect";
-	ws << "\\end{" << name_ << "}\n";
+	ws << "\\end{" << name_ << suffix << "}\n";
+	if (open)
+		ws.startOuterRow();
 }
 
 
@@ -107,15 +172,47 @@ void InsetMathSplit::infoize(odocstream & os) const
 {
 	docstring name = name_;
 	name[0] = support::uppercase(name[0]);
-	os << name << ' ';
+	if (name_ == "align" && !numbered_)
+		os << name << "* ";
+	else
+		os << name << ' ';
+}
+
+
+void InsetMathSplit::mathmlize(MathStream & ms) const
+{
+	// split, gathered, aligned, alignedat
+	// At the moment, those seem to display just fine without any
+	// special treatment.
+	// FIXME
+	// lgathered and rgathered could use the proper alignment, but
+	// it's not clear how to do that without copying a lot of code.
+	// One idea would be to wrap the table in an <mrow>, and set the
+	// alignment there via CSS.
+	// FIXME how to handle numbered and unnumbered align?
+	InsetMathGrid::mathmlize(ms);
+}
+
+
+void InsetMathSplit::htmlize(HtmlStream & ms) const
+{
+	// split, gathered, aligned, alignedat
+	// At the moment, those seem to display just fine without any
+	// special treatment.
+	// FIXME
+	// lgathered and rgathered could use the proper alignment.
+	// FIXME how to handle numbered and unnumbered align?
+	InsetMathGrid::htmlize(ms);
 }
 
 
 void InsetMathSplit::validate(LaTeXFeatures & features) const
 {
 	if (name_ == "split" || name_ == "gathered" || name_ == "aligned" ||
-	    name_ == "alignedat")
+	    name_ == "alignedat" || name_ == "align")
 		features.require("amsmath");
+	else if (name_ == "lgathered" || name_ == "rgathered")
+		features.require("mathtools");
 	InsetMathGrid::validate(features);
 }