From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Mon, 9 Jan 2017 17:23:17 +0000 (+0100)
Subject: Fix display of empty box in nested macros
X-Git-Tag: 2.3.0alpha1~493^2~4
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=d221d1734a619dd1046b0588793683110c64f542;p=features.git

Fix display of empty box in nested macros

The rewrite of nesting handling at 0f15dcc6 was incomplete: the
macro nesting has to be reset to 0 when inside a macro argument at
level 1.
---

diff --git a/src/mathed/MathMacro.cpp b/src/mathed/MathMacro.cpp
index 1311bc9c2c..7670f487db 100644
--- a/src/mathed/MathMacro.cpp
+++ b/src/mathed/MathMacro.cpp
@@ -82,7 +82,8 @@ 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_;