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

diff --git a/src/mathed/MathMacro.cpp b/src/mathed/MathMacro.cpp
index f6791bbf76..6a5c904df7 100644
--- a/src/mathed/MathMacro.cpp
+++ b/src/mathed/MathMacro.cpp
@@ -38,6 +38,7 @@
 #include "support/gettext.h"
 #include "support/lassert.h"
 #include "support/lstrings.h"
+#include "support/RefChanger.h"
 #include "support/textutils.h"
 
 #include <ostream>
@@ -67,42 +68,42 @@ public:
 	MathMacro const * owner() { return mathMacro_; }
 	///
 	InsetCode lyxCode() const { return ARGUMENT_PROXY_CODE; }
+	/// The math data to use for display
+	MathData const & displayCell(BufferView const * bv) const
+	{
+		// handle default macro arguments
+		bool use_def_arg = !mathMacro_->editMetrics(bv)
+			&& mathMacro_->cell(idx_).empty();
+		return use_def_arg ? def_ : mathMacro_->cell(idx_);
+	}
 	///
 	bool addToMathRow(MathRow & mrow, MetricsInfo & mi) const
 	{
 		// macro arguments are in macros
-		LATTEST(mi.base.macro_nesting > 0);
-		if (mi.base.macro_nesting == 1)
-			mi.base.macro_nesting = 0;
+		LATTEST(mathMacro_->nesting() > 0);
+		/// The macro nesting can change display of insets. Change it locally.
+		Changer chg = make_change(mi.base.macro_nesting, mathMacro_->nesting());
 
-		MathRow::Element e_beg(MathRow::BEG_ARG, mi);
+		MathRow::Element e_beg(MathRow::BEG_ARG);
 		e_beg.macro = mathMacro_;
 		e_beg.ar = &mathMacro_->cell(idx_);
 		mrow.push_back(e_beg);
 
 		mathMacro_->macro()->unlock();
-		bool has_contents;
-		// handle default macro arguments
-		if (!mathMacro_->editMetrics(mi.base.bv)
-			&& mathMacro_->cell(idx_).empty())
-			has_contents = def_.addToMathRow(mrow, mi);
-		else
-			has_contents = mathMacro_->cell(idx_).addToMathRow(mrow, mi);
+		bool has_contents = displayCell(mi.base.bv).addToMathRow(mrow, mi);
 		mathMacro_->macro()->lock();
 
 		// if there was no contents, and the contents is editable,
 		// then we insert a box instead.
-		if (!has_contents && mi.base.macro_nesting == 0) {
-			MathRow::Element e(MathRow::BOX, mi);
+		if (!has_contents && mathMacro_->nesting() == 1) {
+			// 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;
 		}
 
-		if (mi.base.macro_nesting == 0)
-			mi.base.macro_nesting = 1;
-
-		MathRow::Element e_end(MathRow::END_ARG, mi);
+		MathRow::Element e_end(MathRow::END_ARG);
 		e_end.macro = mathMacro_;
 		e_end.ar = &mathMacro_->cell(idx_);
 
@@ -111,22 +112,19 @@ public:
 		return has_contents;
 	}
 	///
-	void metrics(MetricsInfo & mi, Dimension & dim) const {
-		// macro arguments are in macros
-		LATTEST(mi.base.macro_nesting > 0);
-		if (mi.base.macro_nesting == 1)
-			mi.base.macro_nesting = 0;
-
-		mathMacro_->macro()->unlock();
-		mathMacro_->cell(idx_).metrics(mi, dim);
-
-		if (!mathMacro_->editMetrics(mi.base.bv)
-		    && mathMacro_->cell(idx_).empty())
-			def_.metrics(mi, dim);
-
-		mathMacro_->macro()->lock();
-		if (mi.base.macro_nesting == 0)
-			mi.base.macro_nesting = 1;
+	void metrics(MetricsInfo &, Dimension &) const {
+		// 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.
@@ -142,44 +140,6 @@ public:
 	void htmlize(HtmlStream & ms) const { ms << mathMacro_->cell(idx_); }
 	///
 	void octave(OctaveStream & os) const { os << mathMacro_->cell(idx_); }
-	///
-	void draw(PainterInfo & pi, int x, int y) const {
-		LATTEST(pi.base.macro_nesting > 0);
-		if (pi.base.macro_nesting == 1)
-			pi.base.macro_nesting = 0;
-
-		if (mathMacro_->editMetrics(pi.base.bv)) {
-			// The only way a ArgumentProxy can appear is in a cell of the
-			// MathMacro. Moreover the cells are only drawn in the DISPLAY_FOLDED
-			// mode and then, if the macro is edited the monochrome
-			// mode is entered by the MathMacro before calling the cells' draw
-			// method. Then eventually this code is reached and the proxy leaves
-			// monochrome mode temporarely. Hence, if it is not in monochrome
-			// here (and the assert triggers in pain.leaveMonochromeMode())
-			// it's a bug.
-			pi.pain.leaveMonochromeMode();
-			mathMacro_->cell(idx_).draw(pi, x, y);
-			pi.pain.enterMonochromeMode(Color_mathbg, Color_mathmacroblend);
-		} else if (mathMacro_->cell(idx_).empty()) {
-			mathMacro_->cell(idx_).setXY(*pi.base.bv, x, y);
-			def_.draw(pi, x, y);
-		} else
-			mathMacro_->cell(idx_).draw(pi, x, y);
-
-		if (pi.base.macro_nesting == 0)
-			pi.base.macro_nesting = 1;
-	}
-	///
-	size_t idx() const { return idx_; }
-	///
-	int kerning(BufferView const * bv) const
-	{
-		if (mathMacro_->editMetrics(bv)
-		    || !mathMacro_->cell(idx_).empty())
-			return mathMacro_->cell(idx_).kerning(bv);
-		else
-			return def_.kerning(bv);
-	}
 
 private:
 	///
@@ -244,6 +204,8 @@ public:
 	bool isUpdating_;
 	/// maximal number of arguments the macro is greedy for
 	size_t appetite_;
+	/// Level of nesting in macros (including this one)
+	int nesting_;
 };
 
 
@@ -329,16 +291,17 @@ bool MathMacro::addToMathRow(MathRow & mrow, MetricsInfo & mi) const
 	// This is the same as what is done in metrics().
 	d->editing_[mi.base.bv] = editMode(mi.base.bv);
 
+	/// The macro nesting can change display of insets. Change it locally.
+	Changer chg = make_change(mi.base.macro_nesting, d->nesting_);
+
 	if (displayMode() != MathMacro::DISPLAY_NORMAL
 	    || d->editing_[mi.base.bv])
 		return InsetMath::addToMathRow(mrow, mi);
 
-	MathRow::Element e_beg(MathRow::BEG_MACRO, mi);
+	MathRow::Element e_beg(MathRow::BEG_MACRO);
 	e_beg.macro = this;
 	mrow.push_back(e_beg);
 
-	++mi.base.macro_nesting;
-
 	d->macro_->lock();
 	bool has_contents = d->expanded_.addToMathRow(mrow, mi);
 	d->macro_->unlock();
@@ -346,15 +309,14 @@ 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) {
-		MathRow::Element e(MathRow::BOX, mi);
+		// mathclass is unknown because it is irrelevant for spacing
+		MathRow::Element e(MathRow::BOX);
 		e.color = Color_mathmacroblend;
 		mrow.push_back(e);
 		has_contents = true;
 	}
 
-	--mi.base.macro_nesting;
-
-	MathRow::Element e_end(MathRow::END_MACRO, mi);
+	MathRow::Element e_end(MathRow::END_MACRO);
 	e_end.macro = this;
 	mrow.push_back(e_end);
 
@@ -407,6 +369,12 @@ docstring MathMacro::macroName() const
 }
 
 
+int MathMacro::nesting() const
+{
+	return d->nesting_;
+}
+
+
 void MathMacro::cursorPos(BufferView const & bv,
 		CursorSlice const & sl, bool boundary, int & x,	int & y) const
 {
@@ -454,8 +422,8 @@ bool MathMacro::editMetrics(BufferView const * bv) const
 
 void MathMacro::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	// the macro contents is not editable (except the arguments)
-	++mi.base.macro_nesting;
+	/// The macro nesting can change display of insets. Change it locally.
+	Changer chg = make_change(mi.base.macro_nesting, d->nesting_);
 
 	// set edit mode for which we will have calculated metrics. But only
 	d->editing_[mi.base.bv] = editMode(mi.base.bv);
@@ -551,9 +519,6 @@ void MathMacro::metrics(MetricsInfo & mi, Dimension & dim) const
 			dim.des += 2;
 		}
 	}
-
-	// restore macro nesting
-	--mi.base.macro_nesting;
 }
 
 
@@ -600,7 +565,7 @@ private:
 
 
 void MathMacro::updateRepresentation(Cursor * cur, MacroContext const & mc,
-		UpdateType utype)
+	UpdateType utype, int nesting)
 {
 	// block recursive calls (bug 8999)
 	if (d->isUpdating_)
@@ -612,6 +577,9 @@ void MathMacro::updateRepresentation(Cursor * cur, MacroContext const & mc,
 	if (d->macro_ == 0)
 		return;
 
+	// remember nesting level of this macro
+	d->nesting_ = nesting;
+
 	// update requires
 	d->requires_ = d->macro_->requires();
 
@@ -643,7 +611,7 @@ void MathMacro::updateRepresentation(Cursor * cur, MacroContext const & mc,
 	// protected by UpdateLocker.
 	if (d->macro_->expand(values, d->expanded_)) {
 		if (utype == OutputUpdate && !d->expanded_.empty())
-			d->expanded_.updateMacros(cur, mc, utype);
+			d->expanded_.updateMacros(cur, mc, utype, nesting);
 	}
 	// get definition for list edit mode
 	docstring const & display = d->macro_->display();
@@ -656,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;
 
@@ -722,9 +689,6 @@ void MathMacro::draw(PainterInfo & pi, int x, int y) const
 				  dim.height() - 2, Color_mathmacroframe);
 		drawMarkers2(pi, expx, expy);
 	} else {
-		// the macro contents is not editable (except the arguments)
-		++pi.base.macro_nesting;
-
 		bool drawBox = lyxrc.macro_edit_style == LyXRC::MACRO_EDIT_INLINE_BOX;
 		Changer dummy = (currentMode() == TEXT_MODE)
 			? pi.base.font.changeShape(UP_SHAPE)
@@ -759,8 +723,6 @@ void MathMacro::draw(PainterInfo & pi, int x, int y) const
 		} else
 			d->expanded_.draw(pi, expx, expy);
 
-		--pi.base.macro_nesting;
-
 		if (!drawBox)
 			drawMarkers(pi, x, y);