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)) {
+ bool ambiguous = false;
+ while (buffer().activeLabel(label)) {
label = new_label + '-' + convert<docstring>(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"
"it will be changed to %2$s."), new_label, label));
}
+}
+
- buffer().undo().beginUndoGroup();
+void InsetLabel::updateLabel(docstring const & new_label)
+{
+ docstring label = new_label;
+ uniqueLabel(label);
setParam("name", label);
+}
- 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::updateLabelAndRefs(docstring const & new_label,
+ Cursor * cursor)
+{
+ docstring const old_label = getParam("name");
+ docstring label = new_label;
+ uniqueLabel(label);
+ if (label == old_label)
+ return;
+
+ // This handles undo groups automagically
+ UndoGroupHelper ugh(&buffer());
+ if (cursor)
+ cursor->recordUndo();
+ setParam("name", label);
+ updateReferences(old_label, label);
+}
+
+
+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) {
+ 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);
+ } else {
+ InsetCommand * ref = it->first->asInsetCommand();
+ ref->setParam("reference", new_label);
}
}
- buffer().undo().endUndoGroup();
}
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());
}
-void InsetLabel::addToToc(DocIterator const & cpit)
+void InsetLabel::addToToc(DocIterator const & cpit, bool output_active,
+ UpdateType, TocBackend & backend) 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_));
- return;
- }
- toc.push_back(TocItem(cpit, 0, screen_label_));
- 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)
- toc.push_back(TocItem(ref_pit, 1,
- it->first->asInsetMath()->asRefInset()->screenLabel()));
- else
- toc.push_back(TocItem(ref_pit, 1,
- static_cast<InsetRef *>(it->first)->screenLabel()));
+ // 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> 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,
+ p.first->asInsetMath()->asRefInset()->screenLabel(),
+ output_active));
+ else
+ toc->push_back(TocItem(ref_pit, 1,
+ static_cast<InsetRef *>(p.first)->getTOCString(),
+ 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;
+ }
+ // no "changetype":
+ // fall through
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 << '>';
{
// 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();
}
projects / lyx.git / blobdiff