X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FMathMacro.cpp;h=6a5c904df7161855c8c9286df8e7e95142355870;hb=02e82157ec583c3900e359de86be79fac6512387;hp=0a47aa2e9fd4731b43225e0fa82b99471155ec8c;hpb=190d312e354da3bafffe5976967cc29f2cbf490a;p=lyx.git

diff --git a/src/mathed/MathMacro.cpp b/src/mathed/MathMacro.cpp
index 0a47aa2e9f..6a5c904df7 100644
--- a/src/mathed/MathMacro.cpp
+++ b/src/mathed/MathMacro.cpp
@@ -96,7 +96,8 @@ public:
 		// if there was no contents, and the contents is editable,
 		// then we insert a box instead.
 		if (!has_contents && mathMacro_->nesting() == 1) {
-			MathRow::Element e(MathRow::BOX);
+			// mathclass is ord because it should be spaced as a normal atom
+			MathRow::Element e(MathRow::BOX, MC_ORD);
 			e.color = Color_mathline;
 			mrow.push_back(e);
 			has_contents = true;
@@ -115,6 +116,16 @@ public:
 		// This should never be invoked, since ArgumentProxy insets are linearized
 		LATTEST(false);
 	}
+	///
+	int kerning(BufferView const * bv) const
+	{
+		return displayCell(bv).kerning(bv);
+	}
+	///
+	void draw(PainterInfo &, int, int) const {
+		// This should never be invoked, since ArgumentProxy insets are linearized
+		LATTEST(false);
+	}
 	// write(), normalize(), infoize() and infoize2() are not needed since
 	// MathMacro uses the definition and not the expanded cells.
 	///
@@ -129,18 +140,6 @@ public:
 	void htmlize(HtmlStream & ms) const { ms << mathMacro_->cell(idx_); }
 	///
 	void octave(OctaveStream & os) const { os << mathMacro_->cell(idx_); }
-	///
-	void draw(PainterInfo &, int, int) const {
-		// This should never be invoked, since ArgumentProxy insets are linearized
-		LATTEST(false);
-	}
-	///
-	size_t idx() const { return idx_; }
-	///
-	int kerning(BufferView const * bv) const
-	{
-		return displayCell(bv).kerning(bv);
-	}
 
 private:
 	///
@@ -310,6 +309,7 @@ bool MathMacro::addToMathRow(MathRow & mrow, MetricsInfo & mi) const
 	// if there was no contents and the array is editable, then we
 	// insert a grey box instead.
 	if (!has_contents && mi.base.macro_nesting == 1) {
+		// mathclass is unknown because it is irrelevant for spacing
 		MathRow::Element e(MathRow::BOX);
 		e.color = Color_mathmacroblend;
 		mrow.push_back(e);
@@ -624,7 +624,6 @@ void MathMacro::draw(PainterInfo & pi, int x, int y) const
 {
 	Dimension const dim = dimension(*pi.base.bv);
 
-	setPosCache(pi, x, y);
 	int expx = x;
 	int expy = y;