X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetLabel.cpp;h=4dd0713730e921e74f444c2462bc6b90326000ec;hb=d6a93143ec2146210d79f58cac42f9608da86100;hp=c483f9488374731b21e4bf4e36c0bd1590290011;hpb=447e0d0308fb9acf7eee65043c6fe43f7e57bb3f;p=lyx.git

diff --git a/src/insets/InsetLabel.cpp b/src/insets/InsetLabel.cpp
index c483f94883..4dd0713730 100644
--- a/src/insets/InsetLabel.cpp
+++ b/src/insets/InsetLabel.cpp
@@ -55,9 +55,11 @@ InsetLabel::InsetLabel(Buffer * buf, InsetCommandParams const & p)
 
 void InsetLabel::initView()
 {
-	// FIXME: This seems to be used only for inset creation so
-	// we probably just need to call updateLabel() here.
-	updateLabelAndRefs(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"));
 }
 
 
@@ -95,28 +97,27 @@ 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)
 {
-	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) {
-			InsetMathRef * mi = it->first->asInsetMath()->asRefInset();
+	UndoGroupHelper ugh;
+	for (auto const & p: buffer().references(old_label)) {
+		ugh.resetBuffer(p.second.buffer());
+		CursorData(p.second).recordUndo();
+		if (p.first->lyxCode() == MATH_REF_CODE) {
+			InsetMathRef * mi = p.first->asInsetMath()->asRefInset();
 			mi->changeTarget(new_label);
 		} else {
-			InsetCommand * ref = it->first->asInsetCommand();
+			InsetCommand * ref = p.first->asInsetCommand();
 			ref->setParam("reference", new_label);
 		}
 	}
@@ -152,7 +153,7 @@ void InsetLabel::updateBuffer(ParIterator const & par, UpdateType utype)
 
 	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());
@@ -167,26 +168,26 @@ void InsetLabel::updateBuffer(ParIterator const & par, UpdateType utype)
 }
 
 
-void InsetLabel::addToToc(DocIterator const & cpit) const
+void InsetLabel::addToToc(DocIterator const & cpit, bool output_active,
+						  UpdateType, TocBackend & backend) const
 {
 	docstring const & label = getParam("name");
-	Toc & toc = buffer().tocBackend().toc("label");
+	shared_ptr<Toc> toc = backend.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()));
+		toc->push_back(TocItem(cpit, 0, screen_label_, output_active));
+	} else {
+		toc->push_back(TocItem(cpit, 0, screen_label_, output_active));
+		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));
+		}
 	}
 }
 
@@ -196,10 +197,19 @@ bool InsetLabel::getStatus(Cursor & cur, FuncRequest const & cmd,
 {
 	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);
 	}
@@ -214,6 +224,12 @@ void InsetLabel::doDispatch(Cursor & cur, FuncRequest & cmd)
 	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);
@@ -229,7 +245,7 @@ void InsetLabel::doDispatch(Cursor & cur, FuncRequest & cmd)
 		break;
 	}
 
-	case LFUN_LABEL_COPY_AS_REF: {
+	case LFUN_LABEL_COPY_AS_REFERENCE: {
 		InsetCommandParams p(REF_CODE, "ref");
 		p["reference"] = getParam("name");
 		cap::clearSelection();
@@ -237,7 +253,7 @@ void InsetLabel::doDispatch(Cursor & cur, FuncRequest & cmd)
 		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);
@@ -252,7 +268,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 << '>';
@@ -273,11 +290,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();
 }