Cmake export tests: Added sublabel handling also to revertedTests

[lyx.git] / src / mathed / InsetMathSubstack.cpp

diff --git a/src/mathed/InsetMathSubstack.cpp b/src/mathed/InsetMathSubstack.cpp
index 5f7e9f644b5adf841281843abde648c4eacc631f..7810ff479e9065a92d58f6cd588d1172639358aa 100644 (file)
--- a/src/mathed/InsetMathSubstack.cpp
+++ b/src/mathed/InsetMathSubstack.cpp
@@ -62,7 +62,7 @@ void InsetMathSubstack::draw(PainterInfo & pi, int x, int y) const
 bool InsetMathSubstack::getStatus(Cursor & cur, FuncRequest const & cmd,
                FuncStatus & flag) const
 {
-       switch (cmd.action) {
+       switch (cmd.action()) {
        case LFUN_INSET_MODIFY: {
                istringstream is(to_utf8(cmd.argument()));
                string s;
@@ -78,8 +78,18 @@ bool InsetMathSubstack::getStatus(Cursor & cur, FuncRequest const & cmd,
                        flag.setEnabled(false);
                        return true;
                }
+               // in contrary to \subaray, 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(name)));
+                       flag.setEnabled(false);
+                       return true;
+               }
                break;
        }
+
        default:
                break;
        }
@@ -97,8 +107,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 +131,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);
 }