Amend ad7e2435cfd

[lyx.git] / src / mathed / InsetMathKern.cpp

diff --git a/src/mathed/InsetMathKern.cpp b/src/mathed/InsetMathKern.cpp
index 811a0da3f9e9686fdcb61276873528420ed91b21..71723b99561f2369340dfee1f35b38c208d944e3 100644 (file)
--- a/src/mathed/InsetMathKern.cpp
+++ b/src/mathed/InsetMathKern.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -11,11 +11,14 @@
 #include <config.h>
 
 #include "InsetMathKern.h"
-#include "MathStream.h"
+
 #include "MathStream.h"
 #include "MathSupport.h"
+
 #include "Dimension.h"
+#include "MetricsInfo.h"
 
+#include "support/docstring.h"
 
 namespace lyx {
 
@@ -42,15 +45,11 @@ Inset * InsetMathKern::clone() const
 }
 
 
-bool InsetMathKern::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetMathKern::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        dim.asc = 0;
        dim.des = 0;
-       dim.wid = wid_.inPixels(0, mathed_char_width(mi.base.font, 'M'));
-       if (dim == dim_)
-               return false;
-       dim_ = dim;
-       return true;
+       dim.wid = wid_.inPixels(mi.base);
 }
 
 
@@ -60,13 +59,19 @@ void InsetMathKern::draw(PainterInfo &, int, int) const
 
 void InsetMathKern::write(WriteStream & os) const
 {
-       os << "\\kern" << from_utf8(wid_.asLatexString()) << ' ';
+       if (wid_.empty())
+               os << "\\kern" << ' ';
+       else
+               os << "\\kern" << from_utf8(wid_.asLatexString()) << ' ';
 }
 
 
 void InsetMathKern::normalize(NormalStream & os) const
 {
-       os << "[kern " << from_utf8(wid_.asLatexString()) << ']';
+       if (wid_.empty())
+               os << "[kern]";
+       else
+               os << "[kern " << from_utf8(wid_.asLatexString()) << ']';
 }