bug + spped fixes + small stuff

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

diff --git a/src/mathed/math_casesinset.C b/src/mathed/math_casesinset.C
index 78b7b11ddcc4f01bacd4ece2e21b95f309e6930d..2a57697bd5e1273e774754e1438733b2202f2fa5 100644 (file)
--- a/src/mathed/math_casesinset.C
+++ b/src/mathed/math_casesinset.C
@@ -1,11 +1,23 @@
-#include <config.h>
+/**
+ * \file math_casesinset.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 "math_casesinset.h"
-#include "math_parser.h"
+#include "math_data.h"
 #include "math_mathmlstream.h"
 #include "math_support.h"
-#include "support/LOstream.h"
+#include "LaTeXFeatures.h"
+#include "support/std_ostream.h"
+
+using std::auto_ptr;
 
 
 MathCasesInset::MathCasesInset(row_type n)
@@ -13,22 +25,23 @@ MathCasesInset::MathCasesInset(row_type n)
 {}
 
 
-MathInset * MathCasesInset::clone() const
+auto_ptr<InsetBase> MathCasesInset::clone() const
 {
-       return new MathCasesInset(*this);
+       return auto_ptr<InsetBase>(new MathCasesInset(*this));
 }
 
 
-void MathCasesInset::metrics(MathMetricsInfo & mi) const
+void MathCasesInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        MathGridInset::metrics(mi);
-       dim_.w += 8;
+       dim_.wid += 8;
+       dim = dim_;
 }
 
 
-void MathCasesInset::draw(MathPainterInfo & pain, int x, int y) const
+void MathCasesInset::draw(PainterInfo & pain, int x, int y) const
 {
-       mathed_draw_deco(pain, x + 1, y - ascent(), 6, height(), "{");
+       mathed_draw_deco(pain, x + 1, y - dim_.ascent(), 6, dim_.height(), "{");
        MathGridInset::draw(pain, x + 8, y);
 }
 
@@ -53,10 +66,10 @@ void MathCasesInset::normalize(NormalStream & os) const
 }
 
 
-void MathCasesInset::maplize(MapleStream & os) const
+void MathCasesInset::maple(MapleStream & os) const
 {
        os << "cases(";
-       MathGridInset::maplize(os);
+       MathGridInset::maple(os);
        os << ')';
 }
 
@@ -65,3 +78,10 @@ void MathCasesInset::infoize(std::ostream & os) const
 {
        os << "Cases ";
 }
+
+
+void MathCasesInset::validate(LaTeXFeatures & features) const
+{
+       features.require("amsmath");
+       MathGridInset::validate(features);
+}