Fix to bug 2362: Deleting superscript also deletes subscript.

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

diff --git a/src/mathed/math_kerninset.C b/src/mathed/math_kerninset.C
index 91701166a83f46a908325c49cb31792cfe636182..d5e533997710a111ed9dff1465734ab6bdb9b59c 100644 (file)
--- a/src/mathed/math_kerninset.C
+++ b/src/mathed/math_kerninset.C
@@ -1,51 +1,71 @@
-#include <config.h>
+/**
+ * \file math_kerninset.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_kerninset.h"
-#include "math_extern.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
 #include "math_support.h"
-#include "font.h"
+#include "dimension.h"
+
+using std::string;
+using std::auto_ptr;
 
 
 MathKernInset::MathKernInset()
-       : MathNestInset(1)
 {}
 
 
-MathInset * MathKernInset::clone() const
+MathKernInset::MathKernInset(LyXLength const & w)
+       : wid_(w)
+{}
+
+
+MathKernInset::MathKernInset(string const & s)
+       : wid_(s)
+{}
+
+
+auto_ptr<InsetBase> MathKernInset::doClone() const
+{
+       return auto_ptr<InsetBase>(new MathKernInset(*this));
+}
+
+
+void MathKernInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       return new MathKernInset(*this);
+       wid_pix_ = wid_.inPixels(0, mathed_char_width(mi.base.font, 'M'));
+       dim.wid = wid_pix_;
+       dim.asc = 0;
+       dim.des = 0;
 }
 
 
-void MathKernInset::metrics(MathMetricsInfo const & mi) const
+int MathKernInset::width() const
 {
-       LyXFont font;
-       whichFont(font, LM_TC_TEXTRM, mi);
-       double t;
-       extractNumber(cell(0), t);
-       width_   = int(t * lyxfont::width('m', font));
-       ascent_  = 0;
-       descent_ = 0;
+       return wid_pix_;
 }
 
 
-void MathKernInset::draw(Painter &, int, int) const
+void MathKernInset::draw(PainterInfo &, int, int) const
 {}
 
 
 void MathKernInset::write(WriteStream & os) const
 {
-       os << "\\lyxkern" << cell(0) << "em ";
+       os << "\\kern" << wid_.asLatexString() << ' ';
 }
 
 
 void MathKernInset::normalize(NormalStream & os) const
 {
-       os << "[lyxkern " << cell(0) << "em]";
+       os << "[kern " << wid_.asLatexString() << ']';
 }