X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathSubstack.cpp;h=fb29077067d087d5467bb53c69651abd43379361;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=6abb883fc932f3d3f46f3cc761dc2242b3384ded;hpb=4c7a5d00245799695ea81aa0192151eed8f9c5fb;p=lyx.git

diff --git a/src/mathed/InsetMathSubstack.cpp b/src/mathed/InsetMathSubstack.cpp
index 6abb883fc9..fb29077067 100644
--- a/src/mathed/InsetMathSubstack.cpp
+++ b/src/mathed/InsetMathSubstack.cpp
@@ -12,14 +12,15 @@
 
 #include "InsetMathSubstack.h"
 
-#include "LaTeXFeatures.h"
 #include "MathData.h"
 #include "MathStream.h"
 
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "support/gettext.h"
+#include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
 
+#include "support/gettext.h"
 #include "support/lstrings.h"
 
 #include <ostream>
@@ -44,17 +45,16 @@ Inset * InsetMathSubstack::clone() const
 
 void InsetMathSubstack::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	if (mi.base.style == LM_ST_DISPLAY) {
-		StyleChanger dummy(mi.base, LM_ST_TEXT);
-		InsetMathGrid::metrics(mi, dim);
-	} else {
-		InsetMathGrid::metrics(mi, dim);
-	}
+	Changer dummy2 = mi.base.changeEnsureMath();
+	Changer dummy = mi.base.changeArray();
+	InsetMathGrid::metrics(mi, dim);
 }
 
 
 void InsetMathSubstack::draw(PainterInfo & pi, int x, int y) const
 {
+	Changer dummy2 = pi.base.changeEnsureMath();
+	Changer dummy = pi.base.changeArray();
 	InsetMathGrid::draw(pi, x + 1, y);
 }
 
@@ -62,24 +62,28 @@ void InsetMathSubstack::draw(PainterInfo & pi, int x, int y) const
 bool InsetMathSubstack::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;
-		string const name = "substack";
+	switch (cmd.action()) {
+	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'")),
-				from_utf8(name)));
+				from_utf8("substack")));
+			flag.setEnabled(false);
+			return true;
+		}
+		// in contrary to \subarray, the columns in \substack
+		// are always centered and this cannot be changed
+		if (s == "align-left" || s == "align-right") {
+			flag.message(bformat(
+				from_utf8(N_("Can't change horizontal alignment in '%1$s'")),
+				from_utf8("substack")));
 			flag.setEnabled(false);
 			return true;
 		}
 		break;
 	}
+
 	default:
 		break;
 	}
@@ -97,8 +101,11 @@ void InsetMathSubstack::write(WriteStream & os) const
 {
 	MathEnsurer ensurer(os);
 	os << "\\substack{";
+	bool open = os.startOuterRow();
 	InsetMathGrid::write(os);
 	os << "}\n";
+	if (open)
+		os.startOuterRow();
 }
 
 
@@ -118,25 +125,40 @@ void InsetMathSubstack::maple(MapleStream & os) const
 }
 
 
+void InsetMathSubstack::mathmlize(MathStream & os) const
+{
+	int movers = 0;
+	row_type const numrows = nrows();
+	for (row_type row = 0; row < nrows(); ++row) {
+		if (row < numrows - 1) {
+			movers ++;
+			os << MTag("munder");
+		}
+		os << MTag("mrow") << cell(index(row, 0)) << ETag("mrow");
+	}
+	for (int i = 1; i <= movers; ++i)
+		os << ETag("munder");
+}
+
+
 void InsetMathSubstack::htmlize(HtmlStream & os) const
 {
 	os << MTag("span", "class='substack'");
-	for (row_type row = 0; row < nrows(); ++row) 
+	for (row_type row = 0; row < nrows(); ++row)
 		os << MTag("span") << cell(index(row, 0)) << ETag("span");
 	os << ETag("span");
 }
 
-	
+
 void InsetMathSubstack::validate(LaTeXFeatures & features) const
 {
 	if (features.runparams().isLaTeX())
 		features.require("amsmath");
 	else if (features.runparams().math_flavor == OutputParams::MathAsHTML)
-		features.addPreambleSnippet("<style type=\"text/css\">\n"
+		features.addCSSSnippet(
 			"span.substack{display: inline-block; vertical-align: middle; text-align:center; font-size: 75%;}\n"
-			"span.substack span{display: block;}\n"
-			"</style>");
-	
+			"span.substack span{display: block;}");
+
 	InsetMathGrid::validate(features);
 }