Jean-Marc's fix for wrong descent

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

diff --git a/src/mathed/math_kerninset.C b/src/mathed/math_kerninset.C
index ae18d84790c7723f1368a1135b9384a94c9212b8..0b03d25fa83f0336e9fd91ab9fccd9840b1936d6 100644 (file)
--- a/src/mathed/math_kerninset.C
+++ b/src/mathed/math_kerninset.C
@@ -1,10 +1,11 @@
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#include <config.h>
+
 
 #include "math_kerninset.h"
+#include "math_extern.h"
 #include "math_mathmlstream.h"
-#include "support.h"
+#include "math_streamstr.h"
+#include "math_support.h"
 
 
 MathKernInset::MathKernInset()
@@ -27,31 +28,25 @@ MathInset * MathKernInset::clone() const
 }
 
 
-void MathKernInset::draw(Painter &, int, int) const
-{}
-
-
-void MathKernInset::metrics(MathMetricsInfo const &) const
+void MathKernInset::metrics(MathMetricsInfo & mi) const
 {
-       ascent_  = 0;
-       descent_ = 0;
-#ifdef WITH_WARNINGS
-#warning fix this once the interface to LyXLength has improved
-#endif
-       // this uses the numerical valu in pixels, even if the unit is cm or ex!
-       width_   = static_cast<int>(wid_.value());
-       //cerr << "handling kern of width " << wid_.value() << "\n";
+       dim_.w = wid_.inPixels(0, mathed_char_width(mi.base.font, 'M'));
+       dim_.a = 0;
+       dim_.d = 0;
 }
 
 
-void MathKernInset::write(MathWriteInfo & os) const
+void MathKernInset::draw(MathPainterInfo &, int, int) const
+{}
+
+
+void MathKernInset::write(WriteStream & os) const
 {
-       os << "\\kern" << wid_.asLatexString().c_str() << " ";
+       os << "\\kern" << wid_.asLatexString() << ' ';
 }
 
 
-void MathKernInset::writeNormal(NormalStream & os) const
+void MathKernInset::normalize(NormalStream & os) const
 {
-       os << "[kern " << wid_.asLatexString().c_str() << "]";
+       os << "[kern " << wid_.asLatexString() << ']';
 }
-