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<docstring>(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 = it->first->asInsetMath()->asHullInset();
- mi->asRefInset()->changeTarget(label);
- } else {
- InsetCommand * ref = it->first->asInsetCommand();
- ref->setParam("reference", label);
- }
+
+void InsetLabel::updateReferences(docstring const & old_label,
+ docstring const & new_label)
+{
+ 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));
+ 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();
}
}
-void InsetLabel::addToToc(DocIterator const & cpit) const
+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();
DocIterator const ref_pit(it->second);
if (it->first->lyxCode() == MATH_REF_CODE)
toc.push_back(TocItem(ref_pit, 1,
- it->first->asInsetMath()->asRefInset()->screenLabel()));
+ it->first->asInsetMath()->asRefInset()->screenLabel(),
+ output_active));
else
toc.push_back(TocItem(ref_pit, 1,
- static_cast<InsetRef *>(it->first)->screenLabel()));
+ static_cast<InsetRef *>(it->first)->screenLabel(),
+ output_active));
}
}
{
bool enabled;
switch (cmd.action()) {
- case LFUN_LABEL_INSERT_AS_REF:
- case LFUN_LABEL_COPY_AS_REF:
+ case LFUN_LABEL_INSERT_AS_REFERENCE:
+ case LFUN_LABEL_COPY_AS_REFERENCE:
enabled = true;
break;
+ case LFUN_INSET_MODIFY:
+ if (cmd.getArg(0) == "changetype") {
+ // this is handled by InsetCommand,
+ // but not by InsetLabel.
+ enabled = false;
+ break;
+ }
default:
return InsetCommand::getStatus(cur, cmd, status);
}
switch (cmd.action()) {
case LFUN_INSET_MODIFY: {
+ // the only other option here is "changetype", and we
+ // do not have different types.
+ if (cmd.getArg(0) != "label") {
+ cur.undispatched();
+ return;
+ }
InsetCommandParams p(LABEL_CODE);
// FIXME UNICODE
InsetCommand::string2params(to_utf8(cmd.argument()), p);
break;
}
if (p["name"] != params()["name"]) {
- // undo is handled in updateCommand
- updateCommand(p["name"]);
+ // undo is handled in updateLabelAndRefs
+ updateLabelAndRefs(p["name"], &cur);
}
cur.forceBufferUpdate();
break;
}
- case LFUN_LABEL_COPY_AS_REF: {
+ case LFUN_LABEL_COPY_AS_REFERENCE: {
InsetCommandParams p(REF_CODE, "ref");
p["reference"] = getParam("name");
cap::clearSelection();
break;
}
- case LFUN_LABEL_INSERT_AS_REF: {
+ case LFUN_LABEL_INSERT_AS_REFERENCE: {
InsetCommandParams p(REF_CODE, "ref");
p["reference"] = getParam("name");
string const data = InsetCommand::params2string(p);
}
-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 << '>';