anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-13 03:40:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug #8889 by always issuing \protect in fragile environments.

Browse Source 
(cherry picked from commit 3c1969574f)
This commit is contained in:
Enrico Forestieri 2014-02-22 10:30:55 -05:00 committed by Richard Heck
parent e09faf7ce6
commit 64be8c6553
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mathed/InsetMathPhantom.cpp
View File

@ -120,6 +120,8 @@ void InsetMathPhantom::draw(PainterInfo & pi, int x, int y) const
void InsetMathPhantom::write(WriteStream & os) const void InsetMathPhantom::write(WriteStream & os) const
{ {
MathEnsurer ensurer(os); MathEnsurer ensurer(os);
if (os.fragile())
os << "\\protect";
switch (kind_) { switch (kind_) {
case phantom: case phantom:
os << "\\phantom{"; os << "\\phantom{";

4
src/mathed/MathMacro.cpp
View File

@ -704,8 +704,8 @@ void MathMacro::write(WriteStream & os) const
// normal mode // normal mode
LASSERT(macro_, /**/); LASSERT(macro_, /**/);
// optional arguments make macros fragile // Always protect macros in a fragile environment
if (optionals_ > 0 && os.fragile()) if (os.fragile())
os << "\\protect"; os << "\\protect";
os << "\\" << name(); os << "\\" << name();

2
status.20x
View File

@ -65,6 +65,8 @@ What's new
- Fix bug where depth of pasted text was incorrectly set (bug 8891). - Fix bug where depth of pasted text was incorrectly set (bug 8891).
- Fix clash between \protect and \ensuremath (bug 8889).
* USER INTERFACE * USER INTERFACE