float2string #4 (Spacing)

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

diff --git a/src/mathed/math_fontoldinset.C b/src/mathed/math_fontoldinset.C
index 11bf5f153c96a0e944f09c263cc30f7517747f35..e339c27ac3a2c668cb0441cfd3447eb3abc82809 100644 (file)
--- a/src/mathed/math_fontoldinset.C
+++ b/src/mathed/math_fontoldinset.C
@@ -1,15 +1,23 @@
-#include <config.h>
+/**
+ * \file math_fontoldinset.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_fontoldinset.h"
+#include "math_data.h"
 #include "math_mathmlstream.h"
-#include "math_streamstr.h"
-#include "math_support.h"
 #include "math_parser.h"
-#include "textpainter.h"
-#include "support/LOstream.h"
-#include "frontends/Painter.h"
+#include "math_streamstr.h"
+#include "support/std_ostream.h"
 
+using std::auto_ptr;
 
 
 MathFontOldInset::MathFontOldInset(latexkeys const * key)
@@ -19,17 +27,18 @@ MathFontOldInset::MathFontOldInset(latexkeys const * key)
 }
 
 
-MathInset * MathFontOldInset::clone() const
+auto_ptr<InsetBase> MathFontOldInset::doClone() const
 {
-       return new MathFontOldInset(*this);
+       return auto_ptr<InsetBase>(new MathFontOldInset(*this));
 }
 
 
-void MathFontOldInset::metrics(MetricsInfo & mi) const
+void MathFontOldInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        FontSetChanger dummy(mi.base, key_->name.c_str());
-       dim_ = cell(0).metrics(mi);
-       metricsMarkers();
+       cell(0).metrics(mi, dim);
+       metricsMarkers(dim);
+       dim_ = dim;
 }
 
 
@@ -41,9 +50,9 @@ void MathFontOldInset::draw(PainterInfo & pi, int x, int y) const
 }
 
 
-void MathFontOldInset::metricsT(TextMetricsInfo const & mi) const
+void MathFontOldInset::metricsT(TextMetricsInfo const & mi, Dimension & dim) const
 {
-       dim_ = cell(0).metricsT(mi);
+       cell(0).metricsT(mi, dim);
 }