anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-07 12:32:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Mark labels in non-outputting insets as inactive.

Browse Source 
Fixes: #11437
This commit is contained in:
Juergen Spitzmueller 2018-12-31 18:32:38 +01:00
parent e61c60fae8
commit 1db5abbfbd
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/insets/InsetLabel.cpp
View File

@ -146,14 +146,16 @@ void InsetLabel::updateBuffer(ParIterator const & par, UpdateType utype)
{
docstring const & label = getParam("name");
// Check if this one is deleted (ct)
// Check if this one is active (i.e., neither deleted with change-tracking
// nor in an inset that does not produce output, such as notes or inactive branches)
Paragraph const & para = par.paragraph();
bool active = !para.isDeleted(par.pos());
// If not, check whether we are in a deleted inset
bool active = !para.isDeleted(par.pos()) && para.inInset().producesOutput();
// If not, check whether we are in a deleted/non-outputting inset
if (active) {
for (size_type sl = 0 ; sl < par.depth() ; ++sl) {
Paragraph const & outer_par = par[sl].paragraph();
if (outer_par.isDeleted(par[sl].pos())) {
if (outer_par.isDeleted(par[sl].pos())
|| !outer_par.inInset().producesOutput()) {
active = false;
break;
}