architectural changes to tex2lyx

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

diff --git a/src/mathed/math_kerninset.C b/src/mathed/math_kerninset.C
index 3cf45812cac8d49b63bfc445b767e8c0c7980d58..ff11550a65f98c3c7b6d386741dbef7016948e11 100644 (file)
--- a/src/mathed/math_kerninset.C
+++ b/src/mathed/math_kerninset.C
@@ -1,15 +1,13 @@
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "math_kerninset.h"
 #include "math_extern.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
 #include "math_support.h"
-#include "lyxrc.h"
+
+using std::auto_ptr;
 
 
 MathKernInset::MathKernInset()
@@ -26,31 +24,31 @@ MathKernInset::MathKernInset(string const & s)
 {}
 
 
-MathInset * MathKernInset::clone() const
+auto_ptr<InsetBase> MathKernInset::clone() const
 {
-       return new MathKernInset(*this);
+       return auto_ptr<InsetBase>(new MathKernInset(*this));
 }
 
 
-void MathKernInset::metrics(MathMetricsInfo & /*mi*/) const
+void MathKernInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       width_   = wid_.inBP();
-       ascent_  = 0;
-       descent_ = 0;
+       dim.wid = wid_.inPixels(0, mathed_char_width(mi.base.font, 'M'));
+       dim.asc = 0;
+       dim.des = 0;
 }
 
 
-void MathKernInset::draw(MathPainterInfo &, int, int) const
+void MathKernInset::draw(PainterInfo &, int, int) const
 {}
 
 
 void MathKernInset::write(WriteStream & os) const
 {
-       os << "\\kern" << wid_.asLatexString() << " ";
+       os << "\\kern" << wid_.asLatexString() << ' ';
 }
 
 
 void MathKernInset::normalize(NormalStream & os) const
 {
-       os << "[kern " << wid_.asLatexString() << "]";
+       os << "[kern " << wid_.asLatexString() << ']';
 }