X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathKern.cpp;h=d223887e3b6c2d712f0c9a4a1b577dc1e285b70c;hb=5fdc577badb1cb133d6a0dc7d831bb1f82576adb;hp=811a0da3f9e9686fdcb61276873528420ed91b21;hpb=ed858d73e57ce7aa89e38c1bc4d799362edb0227;p=lyx.git

diff --git a/src/mathed/InsetMathKern.cpp b/src/mathed/InsetMathKern.cpp
index 811a0da3f9..d223887e3b 100644
--- 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,29 @@ 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 if (wid_.unit() == Length::MU)
+		os << "\\mkern" << from_utf8(wid_.asLatexString()) << ' ';
+	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()) << ']';
+}
+
+
+void InsetMathKern::infoize2(odocstream & os) const
+{
+	os << "Kern";
+	if (!wid_.empty())
+		os << ": " << from_utf8(wid_.asLatexString());
 }