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 440d8944aba38ad2449892a1a73069146e04407f..e339c27ac3a2c668cb0441cfd3447eb3abc82809 100644 (file)
--- a/src/mathed/math_fontoldinset.C
+++ b/src/mathed/math_fontoldinset.C
@@ -1,18 +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.
+ */
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#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)
@@ -22,37 +27,38 @@ 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(MathMetricsInfo & mi) const
+void MathFontOldInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       MathFontSetChanger dummy(mi.base, key_->name.c_str());
-       dim_ = xcell(0).metrics(mi);
-       metricsMarkers();
+       FontSetChanger dummy(mi.base, key_->name.c_str());
+       cell(0).metrics(mi, dim);
+       metricsMarkers(dim);
+       dim_ = dim;
 }
 
 
-void MathFontOldInset::draw(MathPainterInfo & pi, int x, int y) const
+void MathFontOldInset::draw(PainterInfo & pi, int x, int y) const
 {
-       MathFontSetChanger dummy(pi.base, key_->name.c_str());
-       xcell(0).draw(pi, x + 1, y);
+       FontSetChanger dummy(pi.base, key_->name.c_str());
+       cell(0).draw(pi, x + 1, y);
        drawMarkers(pi, x, y);
 }
 
 
-void MathFontOldInset::metricsT(TextMetricsInfo const & mi) const
+void MathFontOldInset::metricsT(TextMetricsInfo const & mi, Dimension & dim) const
 {
-       dim_ = xcell(0).metricsT(mi);
+       cell(0).metricsT(mi, dim);
 }
 
 
 void MathFontOldInset::drawT(TextPainter & pain, int x, int y) const
 {
-       xcell(0).drawT(pain, x, y);
+       cell(0).drawT(pain, x, y);
 }
 
 
@@ -64,7 +70,7 @@ void MathFontOldInset::write(WriteStream & os) const
 
 void MathFontOldInset::normalize(NormalStream & os) const
 {
-       os << "[font " << key_->name << " " << cell(0) << "]";
+       os << "[font " << key_->name << ' ' << cell(0) << ']';
 }