architectural changes to tex2lyx

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

diff --git a/src/mathed/math_casesinset.C b/src/mathed/math_casesinset.C
index 08fec53a24a2198e6d49bc417c2258dc48324f12..bb30d2f29c4041af0e1ac80944ec19e58a46c46d 100644 (file)
--- a/src/mathed/math_casesinset.C
+++ b/src/mathed/math_casesinset.C
@@ -1,37 +1,38 @@
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "math_casesinset.h"
 #include "math_parser.h"
 #include "math_mathmlstream.h"
 #include "math_support.h"
+#include "LaTeXFeatures.h"
 #include "support/LOstream.h"
 
+using std::auto_ptr;
+
 
 MathCasesInset::MathCasesInset(row_type n)
        : MathGridInset(2, n, 'c', "ll")
 {}
 
 
-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);
 }
 
@@ -52,15 +53,15 @@ void MathCasesInset::normalize(NormalStream & os) const
 {
        os << "[cases ";
        MathGridInset::normalize(os);
-       os << "]";
+       os << ']';
 }
 
 
-void MathCasesInset::maplize(MapleStream & os) const
+void MathCasesInset::maple(MapleStream & os) const
 {
        os << "cases(";
-       MathGridInset::maplize(os);
-       os << ")";
+       MathGridInset::maple(os);
+       os << ')';
 }
 
 
@@ -68,3 +69,10 @@ void MathCasesInset::infoize(std::ostream & os) const
 {
        os << "Cases ";
 }
+
+
+void MathCasesInset::validate(LaTeXFeatures & features) const
+{
+       features.require("amsmath");
+       MathGridInset::validate(features);
+}