Fix to bug 2362: Deleting superscript also deletes subscript.

[lyx.git] / src / mathed / math_substackinset.C

diff --git a/src/mathed/math_substackinset.C b/src/mathed/math_substackinset.C
index 81099479df78eb1bc363a9ea3e57fbf26722f1dd..1dd634d337b1ee41bb313db701acff16f31275a2 100644 (file)
--- a/src/mathed/math_substackinset.C
+++ b/src/mathed/math_substackinset.C
@@ -1,9 +1,31 @@
+/**
+ * \file math_substackinset.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
 #include <config.h>
 
+#include "LaTeXFeatures.h"
 #include "math_substackinset.h"
+#include "math_data.h"
 #include "math_mathmlstream.h"
-#include "math_streamstr.h"
-#include "support/LOstream.h"
+#include "support/std_ostream.h"
+
+#include "funcrequest.h"
+#include "FuncStatus.h"
+#include "gettext.h"
+
+#include "support/lstrings.h"
+
+
+using lyx::support::bformat;
+using std::string;
+using std::auto_ptr;
 
 
 MathSubstackInset::MathSubstackInset()
@@ -11,28 +33,48 @@ MathSubstackInset::MathSubstackInset()
 {}
 
 
-MathInset * MathSubstackInset::clone() const
+auto_ptr<InsetBase> MathSubstackInset::doClone() const
 {
-       return new MathSubstackInset(*this);
+       return auto_ptr<InsetBase>(new MathSubstackInset(*this));
 }
 
 
-void MathSubstackInset::metrics(MetricsInfo & mi) const
+void MathSubstackInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        if (mi.base.style == LM_ST_DISPLAY) {
                StyleChanger dummy(mi.base, LM_ST_TEXT);
-               MathGridInset::metrics(mi);
+               MathGridInset::metrics(mi, dim);
        } else {
-               MathGridInset::metrics(mi);
+               MathGridInset::metrics(mi, dim);
        }
-       metricsMarkers2();
+       dim_ = dim;
 }
 
 
 void MathSubstackInset::draw(PainterInfo & pi, int x, int y) const
 {
        MathGridInset::draw(pi, x + 1, y);
-       drawMarkers2(pi, x, y);
+}
+
+
+bool MathSubstackInset::getStatus(LCursor & cur, FuncRequest const & cmd,
+               FuncStatus & flag) const
+{
+       switch (cmd.action) {
+       case LFUN_TABULAR_FEATURE: {
+               string const name("substack");
+               string const s = cmd.argument;
+               if (s == "add-vline-left" || s == "add-vline-right") {
+                       flag.message(bformat(
+                       N_("Can't add vertical grid lines in '%1$s'"), name));
+                       flag.enabled(false);
+                       return true;
+               }
+               return MathGridInset::getStatus(cur, cmd, flag);
+       }
+       default:
+               return MathGridInset::getStatus(cur, cmd, flag);
+       }
 }
 
 
@@ -64,3 +106,10 @@ void MathSubstackInset::maple(MapleStream & os) const
        MathGridInset::maple(os);
        os << ')';
 }
+
+
+void MathSubstackInset::validate(LaTeXFeatures & features) const
+{
+       features.require("amsmath");
+       MathGridInset::validate(features);
+}