X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetLabel.cpp;h=4a1cc453ff8eb120608144161c62b1ae56a3171a;hb=96dea61f22c04529e726cab36acf0240d41fa778;hp=9171cd1e362a96fd08d21be87b05cefa6b9e76db;hpb=d5a5fbb8ee87d4a8ae1c55f9ba72819251bb6fb7;p=lyx.git diff --git a/src/insets/InsetLabel.cpp b/src/insets/InsetLabel.cpp index 9171cd1e36..4a1cc453ff 100644 --- a/src/insets/InsetLabel.cpp +++ b/src/insets/InsetLabel.cpp @@ -67,11 +67,13 @@ void InsetLabel::uniqueLabel(docstring & label) const { docstring const new_label = label; int i = 1; - while (buffer().insetLabel(label)) { + bool ambiguous = false; + while (buffer().activeLabel(label)) { label = new_label + '-' + convert(i); ++i; + ambiguous = true; } - if (label != new_label) { + if (ambiguous) { // Warn the user that the label has been changed to something else. frontend::Alert::warning(_("Label names must be unique!"), bformat(_("The label %1$s already exists,\n" @@ -97,23 +99,25 @@ void InsetLabel::updateLabelAndRefs(docstring const & new_label, if (label == old_label) return; - buffer().undo().beginUndoGroup(); + // This handles undo groups automagically + UndoGroupHelper ugh(&buffer()); if (cursor) cursor->recordUndo(); setParam("name", label); updateReferences(old_label, label); - buffer().undo().endUndoGroup(); } void InsetLabel::updateReferences(docstring const & old_label, docstring const & new_label) { + UndoGroupHelper ugh; Buffer::References const & refs = buffer().references(old_label); Buffer::References::const_iterator it = refs.begin(); Buffer::References::const_iterator end = refs.end(); for (; it != end; ++it) { - buffer().undo().recordUndo(CursorData(it->second)); + ugh.resetBuffer(it->second.buffer()); + it->second.buffer()->undo().recordUndo(CursorData(it->second)); if (it->first->lyxCode() == MATH_REF_CODE) { InsetMathRef * mi = it->first->asInsetMath()->asRefInset(); mi->changeTarget(new_label); @@ -144,17 +148,32 @@ docstring InsetLabel::screenLabel() const void InsetLabel::updateBuffer(ParIterator const & par, UpdateType utype) { docstring const & label = getParam("name"); - if (buffer().insetLabel(label)) { - // Problem: We already have an InsetLabel with the same name! + + // Check if this one is deleted (ct) + Paragraph const & para = par.paragraph(); + bool active = !para.isDeleted(par.pos()); + // If not, check whether we are in a deleted 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())) { + active = false; + break; + } + } + } + + if (buffer().activeLabel(label) && active) { + // Problem: We already have an active InsetLabel with the same name! screen_label_ = _("DUPLICATE: ") + label; return; } - buffer().setInsetLabel(label, this); + buffer().setInsetLabel(label, this, active); screen_label_ = label; if (utype == OutputUpdate) { // save info on the active counter - Counters const & cnts = + Counters const & cnts = buffer().masterBuffer()->params().documentClass().counters(); active_counter_ = cnts.currentCounter(); Language const * lang = par->getParLanguage(buffer().params()); @@ -170,26 +189,28 @@ void InsetLabel::updateBuffer(ParIterator const & par, UpdateType utype) void InsetLabel::addToToc(DocIterator const & cpit, bool output_active, - UpdateType) const + UpdateType, TocBackend & backend) const { docstring const & label = getParam("name"); - shared_ptr toc = buffer().tocBackend().toc("label"); - if (buffer().insetLabel(label) != this) { - toc->push_back(TocItem(cpit, 0, screen_label_, output_active)); - } else { - toc->push_back(TocItem(cpit, 0, screen_label_, output_active)); - Buffer::References const & refs = buffer().references(label); - Buffer::References::const_iterator it = refs.begin(); - Buffer::References::const_iterator end = refs.end(); - for (; it != end; ++it) { - DocIterator const ref_pit(it->second); - if (it->first->lyxCode() == MATH_REF_CODE) + // inactive labels get a cross mark + if (buffer().insetLabel(label, true) != this) + output_active = false; + + // We put both active and inactive labels to the outliner + shared_ptr toc = backend.toc("label"); + toc->push_back(TocItem(cpit, 0, screen_label_, output_active)); + // The refs get assigned only to the active label. If no active one exists, + // assign the (BROKEN) refs to the first inactive one. + if (buffer().insetLabel(label, true) == this || !buffer().activeLabel(label)) { + for (auto const & p : buffer().references(label)) { + DocIterator const ref_pit(p.second); + if (p.first->lyxCode() == MATH_REF_CODE) toc->push_back(TocItem(ref_pit, 1, - it->first->asInsetMath()->asRefInset()->screenLabel(), + p.first->asInsetMath()->asRefInset()->screenLabel(), output_active)); else toc->push_back(TocItem(ref_pit, 1, - static_cast(it->first)->getTOCString(), + static_cast(p.first)->getTOCString(), output_active)); } } @@ -212,6 +233,8 @@ bool InsetLabel::getStatus(Cursor & cur, FuncRequest const & cmd, enabled = false; break; } + // no "changetype": + // fall through default: return InsetCommand::getStatus(cur, cmd, status); } @@ -292,11 +315,11 @@ docstring InsetLabel::xhtml(XHTMLStream & xs, OutputParams const &) const { // FIXME XHTML // Unfortunately, the name attribute has been deprecated, so we have to use - // id here to get the document to validate as XHTML 1.1. This will cause a + // id here to get the document to validate as XHTML 1.1. This will cause a // problem with some browsers, though, I'm sure. (Guess which!) So we will - // have to figure out what to do about this later. - string const attr = "id=\"" + html::cleanAttr(to_utf8(getParam("name"))) + "\""; - xs << html::CompTag("a", attr); + // have to figure out what to do about this later. + docstring const attr = "id=\"" + html::cleanAttr(getParam("name")) + '"'; + xs << html::CompTag("a", to_utf8(attr)); return docstring(); }