X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_stackrelinset.C;h=4254f1869da8340b0732a0d905a75e3ecc4c0b9f;hb=57501b93064a6deed43e415beed45606054d86ad;hp=081c3b4c6d85c38fbfbb8fe8b63312f4d3f1b023;hpb=cbf29c8fdcce744d30fa050666d5a47e6c19840c;p=lyx.git

diff --git a/src/mathed/math_stackrelinset.C b/src/mathed/math_stackrelinset.C
index 081c3b4c6d..4254f1869d 100644
--- a/src/mathed/math_stackrelinset.C
+++ b/src/mathed/math_stackrelinset.C
@@ -1,58 +1,65 @@
-#ifdef __GNUG__
-#pragma implementation
-#endif
+/**
+ * \file math_stackrelinset.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_stackrelinset.h"
-#include "mathed/support.h"
-#include "support/LOstream.h"
+#include "math_data.h"
+#include "math_mathmlstream.h"
+
+
+using std::max;
+using std::auto_ptr;
 
 
 MathStackrelInset::MathStackrelInset()
 {}
 
 
-MathInset * MathStackrelInset::clone() const
-{   
-	return new MathStackrelInset(*this);
+auto_ptr<InsetBase> MathStackrelInset::clone() const
+{
+	return auto_ptr<InsetBase>(new MathStackrelInset(*this));
 }
 
 
-void MathStackrelInset::metrics(MathStyles st) const
+void MathStackrelInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	size_    = smallerStyleFrac(st);
-	xcell(0).metrics(size_);
-	xcell(1).metrics(st);
-	width_   = std::max(xcell(0).width(), xcell(1).width()) + 4; 
-	ascent_  = xcell(1).ascent() + xcell(0).height() + 4;
-	descent_ = xcell(1).descent();
+	cell(1).metrics(mi);
+	FracChanger dummy(mi.base);
+	cell(0).metrics(mi);
+	dim.wid = max(cell(0).width(), cell(1).width()) + 4;
+	dim.asc = cell(1).ascent() + cell(0).height() + 4;
+	dim.des = cell(1).descent();
+	metricsMarkers(dim);
+	dim_ = dim;
 }
 
 
-void MathStackrelInset::draw(Painter & pain, int x, int y) const
+void MathStackrelInset::draw(PainterInfo & pi, int x, int y) const
 {
-	xo(x);
-	yo(y);
-	int m = x + width() / 2;
-	xcell(0).draw(pain, m - xcell(0).width() / 2, y - xcell(0).height() - 4);
-	xcell(1).draw(pain, m - xcell(1).width() / 2, y);
+	int m  = x + dim_.width() / 2;
+	int yo = y - cell(1).ascent() - cell(0).descent() - 1;
+	cell(1).draw(pi, m - cell(1).width() / 2, y);
+	FracChanger dummy(pi.base);
+	cell(0).draw(pi, m - cell(0).width() / 2, yo);
+	drawMarkers(pi, x, y);
 }
 
 
-void MathStackrelInset::write(std::ostream & os, bool fragile) const
+void MathStackrelInset::write(WriteStream & os) const
 {
-	os << "\\stackrel{";
-	cell(0).write(os, fragile);
-	os << "}{";
-	cell(1).write(os, fragile);
-	os << '}';
+	os << "\\stackrel{" << cell(0) << "}{" << cell(1) << '}';
 }
 
 
-void MathStackrelInset::writeNormal(std::ostream & os) const
+void MathStackrelInset::normalize(NormalStream & os) const
 {
-	os << "[stackrel ";
-	cell(0).writeNormal(os);
-	os << " ";
-	cell(1).writeNormal(os);
-	os << "] ";
+	os << "[stackrel " << cell(0) << ' ' << cell(1) << ']';
 }