X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetLabel.cpp;h=7bff3d7c6e82ba722223127cf44e9a1083709cfc;hb=55a3dd7b346d29a52ba305a4558e9e380ef50f47;hp=d98aa703474ccb0e73d15893f9471ee3f0cb765a;hpb=c5b9664476770aad788572fd4a16ec89ca4382ab;p=lyx.git

diff --git a/src/insets/InsetLabel.cpp b/src/insets/InsetLabel.cpp
index d98aa70347..7bff3d7c6e 100644
--- a/src/insets/InsetLabel.cpp
+++ b/src/insets/InsetLabel.cpp
@@ -49,52 +49,77 @@ namespace lyx {
 
 
 InsetLabel::InsetLabel(Buffer * buf, InsetCommandParams const & p)
-	: InsetCommand(buf, p, "label")
+	: InsetCommand(buf, p)
 {}
 
 
 void InsetLabel::initView()
 {
-	updateCommand(getParam("name"));
+	// FIXME: This seems to be used only for inset creation so
+	// we probably just need to call updateLabel() here.
+	updateLabelAndRefs(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(it->second);
+		if (it->first->lyxCode() == MATH_REF_CODE) {
+			InsetMathHull * mi = it->first->asInsetMath()->asHullInset();
+			mi->asRefInset()->changeTarget(new_label);
+		} else {
+			InsetCommand * ref = it->first->asInsetCommand();
+			ref->setParam("reference", new_label);
 		}
 	}
-	buffer().undo().endUndoGroup();
 }
 
 
@@ -125,7 +150,7 @@ void InsetLabel::updateBuffer(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();
@@ -135,14 +160,14 @@ 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) const
 {
 	docstring const & label = getParam("name");
 	Toc & toc = buffer().tocBackend().toc("label");
@@ -158,8 +183,7 @@ 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()->asHullInset()->asRefInset()
-					->screenLabel()));
+				it->first->asInsetMath()->asRefInset()->screenLabel()));
 		else
 			toc.push_back(TocItem(ref_pit, 1,
 				static_cast<InsetRef *>(it->first)->screenLabel()));
@@ -197,8 +221,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;
 	}