X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetLabel.cpp;h=c2ef896b866f53ef6aaab7fa1f8655362b0826ed;hb=86994bf75320524ec656fd70950633c83d445a6c;hp=e35c3a76b0a2a0baaba39f7926f7381bed4f138f;hpb=1178b30c542266a42e91e46900825a0722049623;p=lyx.git diff --git a/src/insets/InsetLabel.cpp b/src/insets/InsetLabel.cpp index e35c3a76b0..c2ef896b86 100644 --- a/src/insets/InsetLabel.cpp +++ b/src/insets/InsetLabel.cpp @@ -49,58 +49,79 @@ namespace lyx { InsetLabel::InsetLabel(Buffer * buf, InsetCommandParams const & p) - : InsetCommand(buf, p, "label") + : InsetCommand(buf, p) {} void InsetLabel::initView() { - updateCommand(getParam("name")); + // This seems to be used only for inset creation. + // Therefore we do not update refs here, since this would + // erroneously change refs from existing duplicate labels + // (#8141). + updateLabel(getParam("name")); } -void InsetLabel::updateCommand(docstring const & new_label, bool updaterefs) +void InsetLabel::uniqueLabel(docstring & label) const { - docstring const old_label = getParam("name"); - docstring label = new_label; + docstring const new_label = label; int i = 1; while (buffer().insetLabel(label)) { label = new_label + '-' + convert(i); ++i; } - if (label != new_label) { // 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" "it will be changed to %2$s."), new_label, label)); } +} + + +void InsetLabel::updateLabel(docstring const & new_label) +{ + docstring label = new_label; + uniqueLabel(label); + setParam("name", label); +} + + +void InsetLabel::updateLabelAndRefs(docstring const & new_label, + Cursor * cursor) +{ + docstring const old_label = getParam("name"); + docstring label = new_label; + uniqueLabel(label); + if (label == old_label) + return; buffer().undo().beginUndoGroup(); + if (cursor) + cursor->recordUndo(); setParam("name", label); + updateReferences(old_label, label); + buffer().undo().endUndoGroup(); +} + - if (updaterefs) { - Buffer::References & refs = buffer().references(old_label); - Buffer::References::iterator it = refs.begin(); - Buffer::References::iterator end = refs.end(); - for (; it != end; ++it) { - buffer().undo().recordUndo(it->second); - if (it->first->lyxCode() == MATH_REF_CODE) { - InsetMathHull * mi = - static_cast(it->first); - mi->asRefInset()->changeTarget(label); - } else { - InsetCommand * ref = - static_cast(it->first); - ref->setParam("reference", label); - } +void InsetLabel::updateReferences(docstring const & old_label, + docstring const & new_label) +{ + Buffer::References & refs = buffer().references(old_label); + Buffer::References::iterator it = refs.begin(); + Buffer::References::iterator end = refs.end(); + for (; it != end; ++it) { + buffer().undo().recordUndo(CursorData(it->second)); + if (it->first->lyxCode() == MATH_REF_CODE) { + InsetMathRef * mi = it->first->asInsetMath()->asRefInset(); + mi->changeTarget(new_label); + } else { + InsetCommand * ref = it->first->asInsetCommand(); + ref->setParam("reference", new_label); } } - buffer().undo().endUndoGroup(); - - // We need an update of the Buffer reference cache. This is achieved by - // updateLabels(). - buffer().updateLabels(); } @@ -120,7 +141,7 @@ docstring InsetLabel::screenLabel() const } -void InsetLabel::updateLabels(ParIterator const & par, UpdateType utype) +void InsetLabel::updateBuffer(ParIterator const & par, UpdateType utype) { docstring const & label = getParam("name"); if (buffer().insetLabel(label)) { @@ -131,7 +152,7 @@ void InsetLabel::updateLabels(ParIterator const & par, UpdateType utype) buffer().setInsetLabel(label, this); screen_label_ = label; - if (utype) { + if (utype == OutputUpdate) { // save info on the active counter Counters const & cnts = buffer().masterBuffer()->params().documentClass().counters(); @@ -141,22 +162,22 @@ void InsetLabel::updateLabels(ParIterator const & par, UpdateType utype) counter_value_ = cnts.theCounter(active_counter_, lang->code()); pretty_counter_ = cnts.prettyCounter(active_counter_, lang->code()); } else { - counter_value_ = from_ascii("??"); - pretty_counter_ = from_ascii("??"); + counter_value_ = from_ascii("#"); + pretty_counter_ = from_ascii("#"); } } } -void InsetLabel::addToToc(DocIterator const & cpit) +void InsetLabel::addToToc(DocIterator const & cpit, bool output_active) const { docstring const & label = getParam("name"); Toc & toc = buffer().tocBackend().toc("label"); if (buffer().insetLabel(label) != this) { - toc.push_back(TocItem(cpit, 0, screen_label_)); + toc.push_back(TocItem(cpit, 0, screen_label_, output_active)); return; } - toc.push_back(TocItem(cpit, 0, screen_label_)); + 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(); @@ -164,11 +185,12 @@ void InsetLabel::addToToc(DocIterator const & cpit) DocIterator const ref_pit(it->second); if (it->first->lyxCode() == MATH_REF_CODE) toc.push_back(TocItem(ref_pit, 1, - static_cast(it->first)->asRefInset() - ->screenLabel())); + it->first->asInsetMath()->asRefInset()->screenLabel(), + output_active)); else toc.push_back(TocItem(ref_pit, 1, - static_cast(it->first)->screenLabel())); + static_cast(it->first)->screenLabel(), + output_active)); } } @@ -177,7 +199,7 @@ bool InsetLabel::getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus & status) const { bool enabled; - switch (cmd.action) { + switch (cmd.action()) { case LFUN_LABEL_INSERT_AS_REF: case LFUN_LABEL_COPY_AS_REF: enabled = true; @@ -193,18 +215,21 @@ bool InsetLabel::getStatus(Cursor & cur, FuncRequest const & cmd, void InsetLabel::doDispatch(Cursor & cur, FuncRequest & cmd) { - switch (cmd.action) { + switch (cmd.action()) { case LFUN_INSET_MODIFY: { InsetCommandParams p(LABEL_CODE); // FIXME UNICODE - InsetCommand::string2params("label", to_utf8(cmd.argument()), p); + InsetCommand::string2params(to_utf8(cmd.argument()), p); if (p.getCmdName().empty()) { - cur.noUpdate(); + cur.noScreenUpdate(); break; } - if (p["name"] != params()["name"]) - updateCommand(p["name"]); + if (p["name"] != params()["name"]) { + // undo is handled in updateLabelAndRefs + updateLabelAndRefs(p["name"], &cur); + } + cur.forceBufferUpdate(); break; } @@ -219,7 +244,7 @@ void InsetLabel::doDispatch(Cursor & cur, FuncRequest & cmd) case LFUN_LABEL_INSERT_AS_REF: { InsetCommandParams p(REF_CODE, "ref"); p["reference"] = getParam("name"); - string const data = InsetCommand::params2string("ref", p); + string const data = InsetCommand::params2string(p); lyx::dispatch(FuncRequest(LFUN_INSET_INSERT, data)); break; } @@ -231,7 +256,8 @@ void InsetLabel::doDispatch(Cursor & cur, FuncRequest & cmd) } -int InsetLabel::plaintext(odocstream & os, OutputParams const &) const +int InsetLabel::plaintext(odocstringstream & os, + OutputParams const &, size_t) const { docstring const str = getParam("name"); os << '<' << str << '>';