X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FMathMacro.cpp;h=c3bbcabbf229e2fb47a9a60a7964aa2a873b2d84;hb=ad79ac406f9c8fc85880cfeb5416b0299ee9a617;hp=1311bc9c2ce49d405f093622c72c0ded4cbdd94e;hpb=ca6bc682e450fd6807a41d6897175e69a0382106;p=lyx.git

diff --git a/src/mathed/MathMacro.cpp b/src/mathed/MathMacro.cpp
index 1311bc9c2c..c3bbcabbf2 100644
--- a/src/mathed/MathMacro.cpp
+++ b/src/mathed/MathMacro.cpp
@@ -67,6 +67,8 @@ public:
 	///
 	MathMacro const * owner() { return mathMacro_; }
 	///
+	marker_type marker() const { return NO_MARKER; }
+	///
 	InsetCode lyxCode() const { return ARGUMENT_PROXY_CODE; }
 	/// The math data to use for display
 	MathData const & displayCell(BufferView const * bv) const
@@ -82,10 +84,11 @@ public:
 		// macro arguments are in macros
 		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());
+		Changer chg = make_change(mi.base.macro_nesting,
+		                          mathMacro_->nesting() == 1 ? 0 : mathMacro_->nesting());
 
-		MathRow::Element e_beg(MathRow::BEG_ARG);
-		e_beg.macro = mathMacro_;
+		MathRow::Element e_beg(mi, MathRow::BEGIN);
+		e_beg.inset = this;
 		e_beg.ar = &mathMacro_->cell(idx_);
 		mrow.push_back(e_beg);
 
@@ -97,35 +100,58 @@ public:
 		// then we insert a box instead.
 		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);
+			MathRow::Element e(mi, MathRow::BOX, MC_ORD);
 			e.color = Color_mathline;
 			mrow.push_back(e);
 			has_contents = true;
 		}
 
-		MathRow::Element e_end(MathRow::END_ARG);
-		e_end.macro = mathMacro_;
+		MathRow::Element e_end(mi, MathRow::END);
+		e_end.inset = this;
 		e_end.ar = &mathMacro_->cell(idx_);
-
 		mrow.push_back(e_end);
 
 		return has_contents;
 	}
 	///
-	void metrics(MetricsInfo &, Dimension &) const {
-		// This should never be invoked, since ArgumentProxy insets are linearized
-		LATTEST(false);
+	void beforeMetrics() const
+	{
+		mathMacro_->macro()->unlock();
 	}
 	///
-	int kerning(BufferView const * bv) const
+	void afterMetrics() const
 	{
-		return displayCell(bv).kerning(bv);
+		mathMacro_->macro()->lock();
+	}
+	///
+	void beforeDraw(PainterInfo const & pi) const
+	{
+		// if the macro is being edited, then the painter is in
+		// monochrome mode.
+		if (mathMacro_->editMetrics(pi.base.bv))
+			pi.pain.leaveMonochromeMode();
+	}
+	///
+	void afterDraw(PainterInfo const & pi) const
+	{
+		if (mathMacro_->editMetrics(pi.base.bv))
+			pi.pain.enterMonochromeMode(Color_mathbg, Color_mathmacroblend);
+	}
+	///
+	void metrics(MetricsInfo &, Dimension &) const {
+		// This should never be invoked, since ArgumentProxy insets are linearized
+		LATTEST(false);
 	}
 	///
 	void draw(PainterInfo &, int, int) const {
 		// This should never be invoked, since ArgumentProxy insets are linearized
 		LATTEST(false);
 	}
+	///
+	int kerning(BufferView const * bv) const
+	{
+		return displayCell(bv).kerning(bv);
+	}
 	// write(), normalize(), infoize() and infoize2() are not needed since
 	// MathMacro uses the definition and not the expanded cells.
 	///
@@ -300,15 +326,20 @@ 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_);
-
+	// For now we do not linearize in the following cases (can be improved)
+	// - display mode different from normal
+	// - editing with parameter list
+	// - editing with box around macro
 	if (displayMode() != MathMacro::DISPLAY_NORMAL
-	    || d->editing_[mi.base.bv])
+		|| (d->editing_[mi.base.bv] && lyxrc.macro_edit_style != LyXRC::MACRO_EDIT_INLINE))
 		return InsetMath::addToMathRow(mrow, mi);
 
-	MathRow::Element e_beg(MathRow::BEG_MACRO);
-	e_beg.macro = this;
+	/// The macro nesting can change display of insets. Change it locally.
+	Changer chg = make_change(mi.base.macro_nesting, d->nesting_);
+
+	MathRow::Element e_beg(mi, MathRow::BEGIN);
+	e_beg.inset = this;
+	e_beg.marker = (d->nesting_ == 1 && nargs()) ? marker() : NO_MARKER;
 	mrow.push_back(e_beg);
 
 	d->macro_->lock();
@@ -319,19 +350,44 @@ bool MathMacro::addToMathRow(MathRow & mrow, MetricsInfo & mi) const
 	// 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);
+		MathRow::Element e(mi, MathRow::BOX);
 		e.color = Color_mathmacroblend;
 		mrow.push_back(e);
 		has_contents = true;
 	}
 
-	MathRow::Element e_end(MathRow::END_MACRO);
-	e_end.macro = this;
+	MathRow::Element e_end(mi, MathRow::END);
+	e_end.inset = this;
 	mrow.push_back(e_end);
 
 	return has_contents;
 }
 
+void MathMacro::beforeMetrics() const
+{
+	d->macro_->lock();
+}
+
+
+void MathMacro::afterMetrics() const
+{
+	d->macro_->unlock();
+}
+
+
+void MathMacro::beforeDraw(PainterInfo const & pi) const
+{
+	if (d->editing_[pi.base.bv])
+		pi.pain.enterMonochromeMode(Color_mathbg, Color_mathmacroblend);
+}
+
+
+void MathMacro::afterDraw(PainterInfo const & pi) const
+{
+	if (d->editing_[pi.base.bv])
+		pi.pain.leaveMonochromeMode();
+}
+
 
 Inset * MathMacro::clone() const
 {
@@ -429,6 +485,27 @@ bool MathMacro::editMetrics(BufferView const * bv) const
 }
 
 
+Inset::marker_type MathMacro::marker() const
+{
+	switch (d->displayMode_) {
+	case DISPLAY_INIT:
+	case DISPLAY_INTERACTIVE_INIT:
+		return NO_MARKER;
+	case DISPLAY_UNFOLDED:
+		return MARKER;
+	default:
+		switch (lyxrc.macro_edit_style) {
+		case LyXRC::MACRO_EDIT_LIST:
+			return MARKER2;
+		case LyXRC::MACRO_EDIT_INLINE_BOX:
+			return NO_MARKER;
+		default:
+			return MARKER;
+		}
+	}
+}
+
+
 void MathMacro::metrics(MetricsInfo & mi, Dimension & dim) const
 {
 	/// The macro nesting can change display of insets. Change it locally.
@@ -449,7 +526,6 @@ void MathMacro::metrics(MetricsInfo & mi, Dimension & dim) const
 		dim.wid += bsdim.width() + 1;
 		dim.asc = max(bsdim.ascent(), dim.ascent());
 		dim.des = max(bsdim.descent(), dim.descent());
-		metricsMarkers(mi, dim);
 	} else if (lyxrc.macro_edit_style == LyXRC::MACRO_EDIT_LIST
 		   && d->editing_[mi.base.bv]) {
 		// Macro will be edited in a old-style list mode here:
@@ -489,7 +565,6 @@ void MathMacro::metrics(MetricsInfo & mi, Dimension & dim) const
 		dim.asc += 1;
 		dim.des += 1;
 		dim.wid += 2;
-		metricsMarkers2(mi, dim);
 	} else {
 		LBUFERR(d->macro_);
 
@@ -640,16 +715,15 @@ void MathMacro::draw(PainterInfo & pi, int x, int y) const
 		pi.pain.text(x, y, from_ascii("\\"), pi.base.font);
 		x += mathed_string_width(pi.base.font, from_ascii("\\")) + 1;
 		cell(0).draw(pi, x, y);
-		drawMarkers(pi, expx, expy);
 	} else if (lyxrc.macro_edit_style == LyXRC::MACRO_EDIT_LIST
-		   && d->editing_[pi.base.bv]) {
+	           && d->editing_[pi.base.bv]) {
 		// Macro will be edited in a old-style list mode here:
 
 		CoordCache const & coords = pi.base.bv->coordCache();
 		FontInfo const & labelFont = sane_font;
 
-		// markers and box needs two pixels
-		x += 2;
+		// box needs one pixel
+		x += 1;
 
 		// get maximal font height
 		Dimension fontDim;
@@ -673,7 +747,7 @@ void MathMacro::draw(PainterInfo & pi, int x, int y) const
 		for (idx_type i = 0; i < nargs(); ++i) {
 			// position of label
 			Dimension const & cdim = coords.getArrays().dim(&cell(i));
-			x = expx + 2;
+			x = expx + 1;
 			y += max(fontDim.asc, cdim.asc) + 1;
 
 			// draw label
@@ -690,17 +764,17 @@ void MathMacro::draw(PainterInfo & pi, int x, int y) const
 			y += max(fontDim.des, cdim.des);
 		}
 
-		pi.pain.rectangle(expx + 1, expy - dim.asc + 1, dim.wid - 3,
+		pi.pain.rectangle(expx, expy - dim.asc + 1, dim.wid - 1,
 				  dim.height() - 2, Color_mathmacroframe);
-		drawMarkers2(pi, expx, expy);
 	} else {
-		bool drawBox = lyxrc.macro_edit_style == LyXRC::MACRO_EDIT_INLINE_BOX;
+		bool drawBox = lyxrc.macro_edit_style == LyXRC::MACRO_EDIT_INLINE_BOX
+			&& d->editing_[pi.base.bv];
 
 		// warm up cells
 		for (size_t i = 0; i < nargs(); ++i)
 			cell(i).setXY(*pi.base.bv, x, y);
 
-		if (drawBox && d->editing_[pi.base.bv]) {
+		if (drawBox) {
 			// draw header and rectangle around
 			FontInfo font = pi.base.font;
 			augmentFont(font, "lyxtex");
@@ -714,20 +788,13 @@ void MathMacro::draw(PainterInfo & pi, int x, int y) const
 			expx += (dim.wid - d->expanded_.dimension(*pi.base.bv).width()) / 2;
 		}
 
-		if (d->editing_[pi.base.bv]) {
-			pi.pain.enterMonochromeMode(Color_mathbg, Color_mathmacroblend);
-			d->expanded_.draw(pi, expx, expy);
-			pi.pain.leaveMonochromeMode();
-
-			if (drawBox)
-				pi.pain.rectangle(x, y - dim.asc, dim.wid,
-						  dim.height(), Color_mathmacroframe);
-		} else
-			d->expanded_.draw(pi, expx, expy);
-
-		if (!drawBox)
-			drawMarkers(pi, x, y);
+		beforeDraw(pi);
+		d->expanded_.draw(pi, expx, expy);
+		afterDraw(pi);
 
+		if (drawBox)
+			pi.pain.rectangle(x, y - dim.asc, dim.wid,
+			                  dim.height(), Color_mathmacroframe);
 	}
 
 	// edit mode changed?