nullptr

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

diff --git a/src/mathed/InsetMathSpace.cpp b/src/mathed/InsetMathSpace.cpp
index e6aa834ea839c4f6ff4792cb67ea728075ec3426..fcef36c1a1ca50eb829661e2ac099e66f8f063ed 100644 (file)
--- a/src/mathed/InsetMathSpace.cpp
+++ b/src/mathed/InsetMathSpace.cpp
@@ -75,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)
@@ -121,10 +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));
+               dim.wid = abs(mi.base.inPixels(length_));
        else
                dim.wid = space_info[space_].width;
 }
@@ -132,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)
@@ -193,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)
@@ -206,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_];
@@ -244,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;
        }
@@ -257,16 +259,18 @@ 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();
@@ -301,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:
@@ -319,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;
                        }
                }
@@ -328,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;