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 ccbbee508ab36edcf32ee95f3d2dd0c3d0c00d06..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.
  */
@@ -11,24 +11,25 @@
 #include <config.h>
 
 #include "InsetMathCases.h"
+
+#include "Cursor.h"
+#include "FuncRequest.h"
+#include "FuncStatus.h"
+#include "support/gettext.h"
+#include "LaTeXFeatures.h"
 #include "MathData.h"
 #include "MathStream.h"
 #include "MathSupport.h"
-#include "FuncStatus.h"
-#include "LaTeXFeatures.h"
-#include "support/std_ostream.h"
-#include "Cursor.h"
-#include "FuncRequest.h"
-#include "gettext.h"
+#include "MetricsInfo.h"
 
 #include "support/lstrings.h"
 
+#include <ostream>
 
-namespace lyx {
-
-using support::bformat;
+using namespace std;
+using namespace lyx::support;
 
-using std::endl;
+namespace lyx {
 
 
 InsetMathCases::InsetMathCases(row_type n)
@@ -71,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);
@@ -91,12 +94,19 @@ bool InsetMathCases::getStatus(Cursor & cur, FuncRequest const & cmd,
        case LFUN_TABULAR_FEATURE: {
                docstring const & s = cmd.argument();
                if (s == "add-vline-left" || s == "add-vline-right") {
-                       flag.enabled(false);
+                       flag.setEnabled(false);
                        flag.message(bformat(
                                from_utf8(N_("No vertical grid lines in 'cases': feature %1$s")),
                                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);
@@ -106,6 +116,7 @@ bool InsetMathCases::getStatus(Cursor & cur, FuncRequest const & cmd,
 
 void InsetMathCases::write(WriteStream & os) const
 {
+       MathEnsurer ensurer(os);
        if (os.fragile())
                os << "\\protect";
        os << "\\begin{cases}\n";