Fix broken Apple speller interface

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

diff --git a/src/mathed/InsetMathCases.cpp b/src/mathed/InsetMathCases.cpp
index 17b4fb146968aea388ab9023853fd5f5994c6f15..082e956f1326912aeccee915942b19c4f4e6b45b 100644 (file)
--- a/src/mathed/InsetMathCases.cpp
+++ b/src/mathed/InsetMathCases.cpp
@@ -32,8 +32,8 @@ using namespace lyx::support;
 namespace lyx {
 
 
-InsetMathCases::InsetMathCases(Buffer * buf, row_type n)
-       : InsetMathGrid(buf, 2, n, 'c', from_ascii("ll"))
+InsetMathCases::InsetMathCases(Buffer * buf, row_type rows)
+       : InsetMathGrid(buf, 2, rows, 'c', from_ascii("ll"))
 {}
 
 
@@ -45,46 +45,31 @@ 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()) {
-       case LFUN_INSET_MODIFY: {
-               istringstream is(to_utf8(cmd.argument()));
-               string s;
-               is >> s;
-               if (s != "tabular")
-                       break;
-               is >> s;
+       case LFUN_TABULAR_FEATURE: {
+               string s = cmd.getArg(0);
                // 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") {
                        cur.undispatched();
-                       break;
+                       return;
                }
-               cur.recordUndo();
        }
        default:
                break;
@@ -97,25 +82,20 @@ bool InsetMathCases::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;
+       case LFUN_TABULAR_FEATURE: {
+               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")),
-                               from_utf8(s)));
+                               from_utf8(N_("Can't add vertical grid lines in '%1$s'")),
+                               from_utf8("cases")));
                        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")), from_utf8(s)));
+                                            "'%1$s'")), from_utf8("cases")));
                        return true;
                }
                break;
@@ -127,7 +107,7 @@ bool InsetMathCases::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-void InsetMathCases::write(WriteStream & os) const
+void InsetMathCases::write(TeXMathStream & os) const
 {
        MathEnsurer ensurer(os);
        if (os.fragile())
@@ -159,9 +139,12 @@ void InsetMathCases::maple(MapleStream & os) const
 }
 
 
-void InsetMathCases::mathmlize(MathStream & ms) const
+void InsetMathCases::mathmlize(MathMLStream & ms) const
 {
-       ms << "<mo form='prefix' fence='true' stretchy='true' symmetric='true'>{</mo>";
+       ms << "<" << from_ascii(ms.namespacedTag("mo"))
+          << " form='prefix' fence='true' stretchy='true' symmetric='true'>"
+          << "{"
+          << "</" << from_ascii(ms.namespacedTag("mo")) << ">";
        InsetMathGrid::mathmlize(ms);
 }
 
@@ -185,11 +168,17 @@ void InsetMathCases::validate(LaTeXFeatures & features) const
        features.require("amsmath");
        InsetMathGrid::validate(features);
        if (features.runparams().math_flavor == OutputParams::MathAsHTML)
-               // CSS based on eLyXer's
+               // CSS based on eLyXer's, with modifications suggested in bug #8755
                features.addCSSSnippet(
-                       "table.cases{display: inline-block; text-align: center;"
+                       "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;}");
+                       "table.cases td {text-align: left; border: none;}");
+}
+
+
+int InsetMathCases::displayColSpace(col_type) const
+{
+       return 20;
 }