From: Enrico Forestieri <forenr@lyx.org>
Date: Thu, 29 Oct 2009 13:24:02 +0000 (+0000)
Subject: Better fix for bug #6270. The outer braces are swallowed only for user
X-Git-Tag: 2.0.0~5269
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=424e3da04cee0d789528716223267e814b4f5ab3;p=features.git

Better fix for bug #6270. The outer braces are swallowed only for user
defined macros, so better use a brace inset only when strictly needed.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31789 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/Cursor.cpp b/src/Cursor.cpp
index eedc70725d..6353e43cab 100644
--- a/src/Cursor.cpp
+++ b/src/Cursor.cpp
@@ -1423,8 +1423,7 @@ bool Cursor::macroModeClose()
 	InsetMathUnknown * p = activeMacro();
 	p->finalize();
 	MathData selection;
-	// enclose selection in braces (bug #6270)
-	asArray('{' + p->selection() + '}', selection);
+	asArray(p->selection(), selection);
 	docstring const s = p->name();
 	--pos();
 	cell().erase(pos());
@@ -1467,7 +1466,7 @@ bool Cursor::macroModeClose()
 
 	// finally put the macro argument behind, if needed
 	if (macroArg) {
-		if (selection.size() > 1)
+		if (selection.size() > 1 || selection[0]->asScriptInset())
 			plainInsert(MathAtom(new InsetMathBrace(selection)));
 		else
 			insert(selection);