anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 05:16:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Correctly distinguish LyX macros from those defined in ERT

Browse Source 
At this time the MacroData of a macro is still uninitialized,
so the macro() method always returns null.
This commit is contained in:
Enrico Forestieri 2016-09-16 00:43:04 +02:00
parent 364e8d6692
commit a26e75cd8a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Cursor.cpp
View File

@ -1426,8 +1426,9 @@ bool Cursor::macroModeClose()
InsetMathNest * const in = inset().asInsetMath()->asNestInset();
if (in && in->interpretString(*this, s))
return true;
MathAtom atom = buffer()->getMacro(name, *this, false) ?
MathAtom(new MathMacro(buffer(), name)) : createInsetMath(name, buffer());
bool const ert_macro = !buffer()->getMacro(name, *this, false);
MathAtom atom = ert_macro ? createInsetMath(name, buffer())
: MathAtom(new MathMacro(buffer(), name));
// try to put argument into macro, if we just inserted a macro
bool macroArg = false;
@ -1454,7 +1455,6 @@ bool Cursor::macroModeClose()
bool keep_mathmode = it != words.end() && (it->second.inset == "font"
|| it->second.inset == "oldfont"
|| it->second.inset == "mbox");
bool ert_macro = atomAsMacro && !atomAsMacro->macro();
if (in && in->currentMode() == Inset::TEXT_MODE
&& atom.nucleus()->currentMode() == Inset::MATH_MODE