Avoid crash with cursor down in math

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

diff --git a/src/mathed/InsetMathCases.cpp b/src/mathed/InsetMathCases.cpp
index 32aa5a5e0fa56e7f3dfb5d2b8ef7b9ce97bceb05..0a5fa332b1ab241b7c8a278d0534755f1c335e65 100644 (file)
--- a/src/mathed/InsetMathCases.cpp
+++ b/src/mathed/InsetMathCases.cpp
@@ -32,8 +32,8 @@ using namespace lyx::support;
 namespace lyx {
 
 
-InsetMathCases::InsetMathCases(row_type n)
-       : InsetMathGrid(2, n, 'c', from_ascii("ll"))
+InsetMathCases::InsetMathCases(Buffer * buf, row_type n)
+       : InsetMathGrid(buf, 2, n, 'c', from_ascii("ll"))
 {}
 
 
@@ -45,72 +45,69 @@ Inset * InsetMathCases::clone() const
 
 void InsetMathCases::metrics(MetricsInfo & mi, Dimension & dim) const
 {
+       Changer dummy = mi.base.changeEnsureMath();
        InsetMathGrid::metrics(mi, dim);
-       dim.wid += 8;
-}
-
-
-Dimension const InsetMathCases::dimension(BufferView const & bv) const
-{
-       Dimension dim = InsetMathGrid::dimension(bv);
-       dim.wid += 8;
-       return dim;
 }
 
 
 void InsetMathCases::draw(PainterInfo & pi, int x, int y) const
 {
+       Changer dummy = pi.base.changeEnsureMath();
        Dimension const dim = dimension(*pi.base.bv);
        mathed_draw_deco(pi, x + 1, y - dim.ascent(), 6, dim.height(), from_ascii("{"));
-       InsetMathGrid::drawWithMargin(pi, x, y, 8, 0);
-       setPosCache(pi, x, y);
+       InsetMathGrid::draw(pi, x, y);
 }
 
 
 void InsetMathCases::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
        //lyxerr << "*** InsetMathCases: request: " << cmd << endl;
-       switch (cmd.action) {
+       switch (cmd.action()) {
        case LFUN_TABULAR_FEATURE: {
-               docstring const & s = cmd.argument();
+               string s = cmd.getArg(0);
                // vertical lines and adding/deleting columns is not allowed for \cases
+               // FIXME: "I suspect that the break after cur.undispatched() should be a
+               // return; the recordUndo seems bogus too." (lasgouttes)
                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) {
+       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.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 +116,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();
 }
 
 
@@ -143,6 +143,21 @@ void InsetMathCases::maple(MapleStream & os) const
 }
 
 
+void InsetMathCases::mathmlize(MathStream & ms) const
+{
+       ms << "<mo form='prefix' fence='true' stretchy='true' symmetric='true'>{</mo>";
+       InsetMathGrid::mathmlize(ms);
+}
+
+
+// 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 ";
@@ -153,6 +168,18 @@ void InsetMathCases::validate(LaTeXFeatures & features) const
 {
        features.require("amsmath");
        InsetMathGrid::validate(features);
+       if (features.runparams().math_flavor == OutputParams::MathAsHTML)
+               // CSS based on eLyXer's, with modifications suggested in bug #8755
+               features.addCSSSnippet(
+                       "table.cases{display: inline-block; text-align: center; border: none;"
+                       "border-left: thin solid black; vertical-align: middle; padding-left: 0.5ex;}\n"
+                       "table.cases td {text-align: left; border: none;}");
+}
+
+
+int InsetMathCases::displayColSpace(col_type) const
+{
+       return 20;
 }