architectural changes to tex2lyx

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

diff --git a/src/mathed/math_lefteqninset.C b/src/mathed/math_lefteqninset.C
index 4331a549580e96b85b4a5375a3bff923e4bec917..d53cefbf0e94bd134e53e756c01f2a7cb8032bcc 100644 (file)
--- a/src/mathed/math_lefteqninset.C
+++ b/src/mathed/math_lefteqninset.C
@@ -1,10 +1,8 @@
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "math_lefteqninset.h"
-#include "math_mathmlstream.h"
 #include "math_support.h"
+#include "support/LOstream.h"
+
+using std::auto_ptr;
 
 
 MathLefteqnInset::MathLefteqnInset()
@@ -12,35 +10,37 @@ MathLefteqnInset::MathLefteqnInset()
 {}
 
 
-MathInset * MathLefteqnInset::clone() const
+auto_ptr<InsetBase> MathLefteqnInset::clone() const
 {
-       return new MathLefteqnInset(*this);
+       return auto_ptr<InsetBase>(new MathLefteqnInset(*this));
 }
 
 
-void MathLefteqnInset::metrics(MathMetricsInfo & mi) const
+void MathLefteqnInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       MathNestInset::metrics(mi);
-       ascent_  = xcell(0).ascent() + 2;
-       descent_ = xcell(0).descent() + 2;
-       width_   = 4;
+       cell(0).metrics(mi);
+       dim_.asc = cell(0).ascent() + 2;
+       dim_.des = cell(0).descent() + 2;
+       dim_.wid = 4;
+       metricsMarkers();
+       dim = dim_;
 }
 
 
-void MathLefteqnInset::draw(MathPainterInfo & pain, int x, int y) const
+void MathLefteqnInset::draw(PainterInfo & pi, int x, int y) const
 {
-       xcell(0).draw(pain, x + 2, y);
-       //mathed_draw_framebox(pain, x, y, this);
+       cell(0).draw(pi, x + 2, y);
+       drawMarkers(pi, x, y);
 }
 
 
-void MathLefteqnInset::write(WriteStream & os) const
+string MathLefteqnInset::name() const
 {
-       os << "\\lefteqn{" << cell(0) << '}';
+       return "lefteqn";
 }
 
 
-void MathLefteqnInset::normalize(NormalStream & os) const
+void MathLefteqnInset::infoize(std::ostream & os) const
 {
-       os << "[lefteqn " << cell(0) << ']';
+       os << "Lefteqn ";
 }