X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetLabel.cpp;h=c2ef896b866f53ef6aaab7fa1f8655362b0826ed;hb=86994bf75320524ec656fd70950633c83d445a6c;hp=3b1560f673f5d5aff6f8bbeb40e618fa7c6d3d74;hpb=f814bb14bbac854ef96d47dddd85d9b92bc71e77;p=lyx.git

diff --git a/src/insets/InsetLabel.cpp b/src/insets/InsetLabel.cpp
index 3b1560f673..c2ef896b86 100644
--- a/src/insets/InsetLabel.cpp
+++ b/src/insets/InsetLabel.cpp
@@ -55,46 +55,73 @@ InsetLabel::InsetLabel(Buffer * buf, InsetCommandParams const & 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<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 & 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();
 }
 
 
@@ -135,22 +162,22 @@ void InsetLabel::updateBuffer(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();
@@ -158,10 +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,
-				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));
 	}
 }
 
@@ -196,8 +225,10 @@ void InsetLabel::doDispatch(Cursor & cur, FuncRequest & cmd)
 			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;
 	}
@@ -225,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 << '>';