The previous commit was actually a fix for bug #9158.

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

diff --git a/src/mathed/InsetMathSpace.cpp b/src/mathed/InsetMathSpace.cpp
index 6d873b3460d3d7148b34adefe37e35185a25068c..e6aa834ea839c4f6ff4792cb67ea728075ec3426 100644 (file)
--- a/src/mathed/InsetMathSpace.cpp
+++ b/src/mathed/InsetMathSpace.cpp
@@ -21,6 +21,7 @@
 #include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
 
 #include "insets/InsetSpace.h"
 
@@ -123,9 +124,7 @@ void InsetMathSpace::metrics(MetricsInfo & mi, Dimension & dim) const
        dim.asc = 4;
        dim.des = 0;
        if (space_info[space_].custom)
-               dim.wid = abs(length_.inPixels(
-                               mi.base.textwidth,
-                               mathed_char_width(mi.base.font, 'M')));
+               dim.wid = abs(length_.inPixels(mi.base));
        else
                dim.wid = space_info[space_].width;
 }
@@ -273,15 +272,15 @@ void InsetMathSpace::write(WriteStream & os) const
        os << space_info[space_].name.c_str();
        if (space_info[space_].custom)
                os << '{' << length_.asLatexString().c_str() << '}';
-       else if (space_info[space_].escape && space_info[space_].name != " ")
+       else if (space_info[space_].escape && space_info[space_].name.length() > 1)
                os.pendingSpace(true);
 }
 
 
 InsetSpaceParams InsetMathSpace::params() const
 {
-       LASSERT(space_info[space_].visible, /**/);
        InsetSpaceParams isp(true);
+       LASSERT(space_info[space_].visible, return isp);
        isp.kind = space_info[space_].kind;
        isp.length = GlueLength(length_);
        return isp;