A little cleanup of the layout files.

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

diff --git a/src/mathed/InsetMathCases.cpp b/src/mathed/InsetMathCases.cpp
index eb532484028913287550f71a2a2ef54cadbb4f2a..32aa5a5e0fa56e7f3dfb5d2b8ef7b9ce97bceb05 100644 (file)
--- a/src/mathed/InsetMathCases.cpp
+++ b/src/mathed/InsetMathCases.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -72,12 +72,14 @@ void InsetMathCases::doDispatch(Cursor & cur, FuncRequest & cmd)
        //lyxerr << "*** InsetMathCases: request: " << cmd << endl;
        switch (cmd.action) {
        case LFUN_TABULAR_FEATURE: {
-               cur.recordUndo();
                docstring const & s = cmd.argument();
-               if (s == "add-vline-left" || s == "add-vline-right") {
+               // 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;
                }
+               cur.recordUndo();
        }
        default:
                InsetMathGrid::doDispatch(cur, cmd);
@@ -98,6 +100,13 @@ bool InsetMathCases::getStatus(Cursor & cur, FuncRequest const & cmd,
                                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));
+                       return true;
+               }
        }
        default:
                return InsetMathGrid::getStatus(cur, cmd, flag);
@@ -107,12 +116,7 @@ bool InsetMathCases::getStatus(Cursor & cur, FuncRequest const & cmd,
 
 void InsetMathCases::write(WriteStream & os) const
 {
-       bool brace = os.pendingBrace();
-       if (os.latex() && os.textMode()) {
-               os << "\\ensuremath{";
-               os.textMode(false);
-               brace = true;
-       }
+       MathEnsurer ensurer(os);
        if (os.fragile())
                os << "\\protect";
        os << "\\begin{cases}\n";
@@ -120,7 +124,6 @@ void InsetMathCases::write(WriteStream & os) const
        if (os.fragile())
                os << "\\protect";
        os << "\\end{cases}";
-       os.pendingBrace(brace);
 }