Cmake export tests: Added sublabel handling also to revertedTests

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

diff --git a/src/mathed/InsetMathCases.cpp b/src/mathed/InsetMathCases.cpp
index 9b55c51ea9e3280de312e1fcd19a4e3a06402ec6..17b4fb146968aea388ab9023853fd5f5994c6f15 100644 (file)
--- a/src/mathed/InsetMathCases.cpp
+++ b/src/mathed/InsetMathCases.cpp
@@ -70,47 +70,60 @@ void InsetMathCases::draw(PainterInfo & pi, int x, int y) const
 void InsetMathCases::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
        //lyxerr << "*** InsetMathCases: request: " << cmd << endl;
-       switch (cmd.action) {
-       case LFUN_TABULAR_FEATURE: {
-               docstring const & s = cmd.argument();
+       switch (cmd.action()) {
+       case LFUN_INSET_MODIFY: {
+               istringstream is(to_utf8(cmd.argument()));
+               string s;
+               is >> s;
+               if (s != "tabular")
+                       break;
+               is >> s;
                // vertical lines and adding/deleting columns is not allowed for \cases
                if (s == "append-column" || s == "delete-column"
-                       || s == "add-vline-left" || s == "add-vline-right") {
+                   || s == "add-vline-left" || s == "add-vline-right") {
                        cur.undispatched();
                        break;
                }
                cur.recordUndo();
        }
        default:
-               InsetMathGrid::doDispatch(cur, cmd);
+               break;
        }
+       InsetMathGrid::doDispatch(cur, cmd);
 }
 
 
 bool InsetMathCases::getStatus(Cursor & cur, FuncRequest const & cmd,
                FuncStatus & flag) const
 {
-       switch (cmd.action) {
-       case LFUN_TABULAR_FEATURE: {
-               docstring const & s = cmd.argument();
+       switch (cmd.action()) {
+       case LFUN_INSET_MODIFY: {
+               istringstream is(to_utf8(cmd.argument()));
+               string s;
+               is >> s;
+               if (s != "tabular")
+                       break;
+               is >> s;
                if (s == "add-vline-left" || s == "add-vline-right") {
                        flag.setEnabled(false);
                        flag.message(bformat(
                                from_utf8(N_("No vertical grid lines in 'cases': feature %1$s")),
-                               s));
+                               from_utf8(s)));
                        return true;
                }
                if (s == "append-column" || s == "delete-column") {
                        flag.setEnabled(false);
                        flag.message(bformat(
                                from_utf8(N_("Changing number of columns not allowed in "
-                                            "'cases': feature %1$s")), s));
+                                            "'cases': feature %1$s")), from_utf8(s)));
                        return true;
                }
+               break;
        }
        default:
-               return InsetMathGrid::getStatus(cur, cmd, flag);
+               break;
        }
+       return InsetMathGrid::getStatus(cur, cmd, flag);
 }
 
 
@@ -119,11 +132,14 @@ void InsetMathCases::write(WriteStream & os) const
        MathEnsurer ensurer(os);
        if (os.fragile())
                os << "\\protect";
+       bool open = os.startOuterRow();
        os << "\\begin{cases}\n";
        InsetMathGrid::write(os);
        if (os.fragile())
                os << "\\protect";
        os << "\\end{cases}";
+       if (open)
+               os.startOuterRow();
 }
 
 
@@ -150,6 +166,14 @@ void InsetMathCases::mathmlize(MathStream & ms) const
 }
 
 
+// FIXME XHTML
+// We need a brace here, somehow.
+void InsetMathCases::htmlize(HtmlStream & ms) const
+{
+       InsetMathGrid::htmlize(ms, "class='cases'");
+}
+
+
 void InsetMathCases::infoize(odocstream & os) const
 {
        os << "Cases ";
@@ -160,6 +184,12 @@ void InsetMathCases::validate(LaTeXFeatures & features) const
 {
        features.require("amsmath");
        InsetMathGrid::validate(features);
+       if (features.runparams().math_flavor == OutputParams::MathAsHTML)
+               // CSS based on eLyXer's
+               features.addCSSSnippet(
+                       "table.cases{display: inline-block; text-align: center;"
+                       "border-left: thin solid black; vertical-align: middle; padding-left: 0.5ex;}\n"
+                       "table.cases td {text-align: left;}");
 }