X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathSpace.cpp;h=fcef36c1a1ca50eb829661e2ac099e66f8f063ed;hb=d9082639080b9de993742bd352f92e5183058cf5;hp=6d873b3460d3d7148b34adefe37e35185a25068c;hpb=7287a259c5436b8f3f384c0d0bd7641a2f2601e9;p=lyx.git

diff --git a/src/mathed/InsetMathSpace.cpp b/src/mathed/InsetMathSpace.cpp
index 6d873b3460..fcef36c1a1 100644
--- 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"
 
@@ -74,7 +75,7 @@ SpaceInfo space_info[] = {
 int const nSpace = sizeof(space_info)/sizeof(SpaceInfo);
 int const defaultSpace = 4;
 
-} // anon namespace
+} // namespace
 
 InsetMathSpace::InsetMathSpace()
 	: space_(defaultSpace)
@@ -120,12 +121,11 @@ Inset * InsetMathSpace::clone() const
 
 void InsetMathSpace::metrics(MetricsInfo & mi, Dimension & dim) const
 {
+	Changer dummy = mi.base.changeEnsureMath();
 	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(mi.base.inPixels(length_));
 	else
 		dim.wid = space_info[space_].width;
 }
@@ -133,6 +133,7 @@ void InsetMathSpace::metrics(MetricsInfo & mi, Dimension & dim) const
 
 void InsetMathSpace::draw(PainterInfo & pi, int x, int y) const
 {
+	Changer dummy = pi.base.changeEnsureMath();
 	// Sadly, HP-UX CC can't handle that kind of initialization.
 	// XPoint p[4] = {{++x, y-3}, {x, y}, {x+width-2, y}, {x+width-2, y-3}};
 	if (!space_info[space_].visible)
@@ -194,7 +195,7 @@ void InsetMathSpace::octave(OctaveStream & os) const
 }
 
 
-void InsetMathSpace::mathmlize(MathStream & ms) const
+void InsetMathSpace::mathmlize(MathMLStream & ms) const
 {
 	SpaceInfo const & si = space_info[space_];
 	if (si.negative || !si.visible)
@@ -207,14 +208,14 @@ void InsetMathSpace::mathmlize(MathStream & ms) const
 		ss << si.width;
 		l = ss.str() + "px";
 	}
-	
-	ms << "<mspace";
+
+	ms << "<" << from_ascii(ms.namespacedTag("mspace"));
 	if (!l.empty())
 		ms << " width=\"" << from_ascii(l) << "\"";
 	ms << " />";
 }
 
-	
+
 void InsetMathSpace::htmlize(HtmlStream & ms) const
 {
 	SpaceInfo const & si = space_info[space_];
@@ -245,7 +246,7 @@ void InsetMathSpace::htmlize(HtmlStream & ms) const
 	case InsetSpaceParams::CUSTOM:
 	case InsetSpaceParams::CUSTOM_PROTECTED: {
 		string l = length_.asHTMLString();
-		ms << MTag("span", "width='" + l + "'") 
+		ms << MTag("span", "width='" + l + "'")
 		   << from_ascii("&nbsp;") << ETag("span");
 		break;
 	}
@@ -258,30 +259,32 @@ void InsetMathSpace::htmlize(HtmlStream & ms) const
 	}
 }
 
-	
+
 void InsetMathSpace::normalize(NormalStream & os) const
 {
 	os << "[space " << int(space_) << "] ";
 }
 
 
-void InsetMathSpace::write(WriteStream & os) const
+void InsetMathSpace::write(TeXMathStream & os) const
 {
-	// no MathEnsurer - all kinds work in text and math mode
+	// All kinds work in text and math mode, so simply suspend
+	// writing a possibly pending mode closing brace.
+	MathEnsurer ensurer(os, false);
 	if (space_info[space_].escape)
 		os << '\\';
 	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;
@@ -302,8 +305,6 @@ bool InsetMathSpace::getStatus(Cursor & cur, FuncRequest const & cmd,
 	case LFUN_INSET_MODIFY:
 	case LFUN_INSET_DIALOG_UPDATE:
 	case LFUN_MOUSE_RELEASE:
-	case LFUN_MOUSE_PRESS:
-	case LFUN_MOUSE_MOTION:
 		status.setEnabled(true);
 		return true;
 	default:
@@ -320,8 +321,10 @@ void InsetMathSpace::doDispatch(Cursor & cur, FuncRequest & cmd)
 		if (cmd.getArg(0) == "mathspace") {
 			MathData ar;
 			if (createInsetMath_fromDialogStr(cmd.argument(), ar)) {
+				Buffer * buf = buffer_;
 				cur.recordUndo();
 				*this = *ar[0].nucleus()->asSpaceInset();
+				buffer_ = buf;
 				break;
 			}
 		}
@@ -329,18 +332,13 @@ void InsetMathSpace::doDispatch(Cursor & cur, FuncRequest & cmd)
 		break;
 
 	case LFUN_MOUSE_RELEASE:
-		if (cmd.button() == mouse_button::button1) {
+		if (cmd.button() == mouse_button::button1 && !cur.selection()) {
 			showInsetDialog(&cur.bv());
 			break;
 		}
 		cur.undispatched();
 		break;
 
-	case LFUN_MOUSE_PRESS:
-	case LFUN_MOUSE_MOTION:
-		// eat other mouse commands
-		break;
-
 	default:
 		InsetMath::doDispatch(cur, cmd);
 		break;