From: Enrico Forestieri <forenr@lyx.org>
Date: Sat, 9 May 2009 21:15:36 +0000 (+0000)
Subject: Don't create nested math hulls (fixes bug #5392).
X-Git-Tag: 2.0.0~6625
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=318fad58a67b1d80b0934ecd4bd7b6fc0e72beea;p=lyx.git

Don't create nested math hulls (fixes bug #5392).


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

diff --git a/src/mathed/MathParser.cpp b/src/mathed/MathParser.cpp
index 757458cc88..36be12c2ec 100644
--- a/src/mathed/MathParser.cpp
+++ b/src/mathed/MathParser.cpp
@@ -46,6 +46,7 @@ following hack as starting point to write some macros:
 #include "InsetMathColor.h"
 #include "InsetMathComment.h"
 #include "InsetMathDelim.h"
+#include "InsetMathEnsureMath.h"
 #include "InsetMathEnv.h"
 #include "InsetMathFrac.h"
 #include "InsetMathKern.h"
@@ -804,8 +805,14 @@ bool Parser::parse1(InsetMathGrid & grid, unsigned flags,
 				} else {
 					// simple $...$  stuff
 					putback();
-					cell->push_back(MathAtom(new InsetMathHull(hullSimple)));
-					parse2(cell->back(), FLAG_SIMPLE, InsetMath::MATH_MODE, false);
+					if (mode == InsetMath::UNDECIDED_MODE) {
+						cell->push_back(MathAtom(new InsetMathHull(hullSimple)));
+						parse2(cell->back(), FLAG_SIMPLE, InsetMath::MATH_MODE, false);
+					} else {
+						// Don't create nested math hulls (bug #5392)
+						cell->push_back(MathAtom(new InsetMathEnsureMath));
+						parse(cell->back().nucleus()->cell(0), FLAG_SIMPLE, InsetMath::MATH_MODE);
+					}
 				}
 			}