From 1a65f586ee20bdce56d3283bdcbdcdd08565ffb4 Mon Sep 17 00:00:00 2001 From: Enrico Forestieri Date: Wed, 20 May 2009 14:52:03 +0000 Subject: [PATCH] Fix bug #1435. Now Ctrl-m enters math mode when in text-in-math mode, instead of producing nested text boxes. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29746 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/mathed/InsetMathNest.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/mathed/InsetMathNest.cpp b/src/mathed/InsetMathNest.cpp index a55c0551ed..8c4bc3b089 100644 --- a/src/mathed/InsetMathNest.cpp +++ b/src/mathed/InsetMathNest.cpp @@ -20,6 +20,7 @@ #include "InsetMathColor.h" #include "InsetMathComment.h" #include "InsetMathDelim.h" +#include "InsetMathEnsureMath.h" #include "InsetMathHull.h" #include "InsetMathRef.h" #include "InsetMathScript.h" @@ -954,7 +955,10 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd) docstring const save_selection = grabAndEraseSelection(cur); selClearOrDel(cur); //cur.plainInsert(MathAtom(new InsetMathMBox(cur.bv()))); - cur.plainInsert(MathAtom(new InsetMathBox(from_ascii("mbox")))); + if (currentMode() == Inset::TEXT_MODE) + cur.plainInsert(MathAtom(new InsetMathEnsureMath)); + else + cur.plainInsert(MathAtom(new InsetMathBox(from_ascii("mbox")))); cur.posBackward(); cur.pushBackward(*cur.nextInset()); cur.niceInsert(save_selection); -- 2.39.2