X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetLabel.cpp;h=e143f83e29b066f54e5a77b826450589908aec85;hb=eb294eadb5e7f22880da399ae082f74567bbfc4e;hp=ec50d4feb601efdf349878f990b4bf6da7084de4;hpb=3883b85f49054c109cb8a9a293721a5e41edb68d;p=lyx.git

diff --git a/src/insets/InsetLabel.cpp b/src/insets/InsetLabel.cpp
index ec50d4feb6..e143f83e29 100644
--- a/src/insets/InsetLabel.cpp
+++ b/src/insets/InsetLabel.cpp
@@ -14,15 +14,12 @@
 
 #include "InsetRef.h"
 
-#include "buffer_funcs.h"
 #include "Buffer.h"
 #include "BufferParams.h"
-#include "BufferView.h"
+#include "Cursor.h"
 #include "CutAndPaste.h"
-#include "DispatchResult.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "InsetIterator.h"
 #include "Language.h"
 #include "LyX.h"
 #include "ParIterator.h"
@@ -32,7 +29,6 @@
 #include "TextClass.h"
 #include "TocBackend.h"
 
-#include "mathed/InsetMathHull.h"
 #include "mathed/InsetMathRef.h"
 
 #include "frontends/alert.h"
@@ -40,7 +36,6 @@
 #include "support/convert.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
-#include "support/lyxalgo.h"
 
 using namespace std;
 using namespace lyx::support;
@@ -104,7 +99,8 @@ void InsetLabel::updateLabelAndRefs(docstring const & new_label,
 	UndoGroupHelper ugh(&buffer());
 	if (cursor)
 		cursor->recordUndo();
-	if (buffer().masterParams().track_changes) {
+	bool const changes = buffer().masterParams().track_changes;
+	if (changes) {
 		// With change tracking, we insert a new label and
 		// delete the old one
 		InsetCommandParams p(LABEL_CODE, "label");
@@ -114,15 +110,15 @@ void InsetLabel::updateLabelAndRefs(docstring const & new_label,
 		lyx::dispatch(FuncRequest(LFUN_CHAR_DELETE_FORWARD));
 	} else
 		setParam("name", label);
-	updateReferences(old_label, label);
+	updateReferences(old_label, label, changes);
 }
 
 
 void InsetLabel::updateReferences(docstring const & old_label,
-		docstring const & new_label)
+		docstring const & new_label, bool const changes)
 {
-	UndoGroupHelper ugh;
-	if (buffer().masterParams().track_changes) {
+	UndoGroupHelper ugh(nullptr);
+	if (changes) {
 		// With change tracking, we insert a new ref and
 		// delete the old one
 		lyx::dispatch(FuncRequest(LFUN_MASTER_BUFFER_FORALL,
@@ -160,19 +156,19 @@ docstring InsetLabel::screenLabel() const
 }
 
 
-void InsetLabel::updateBuffer(ParIterator const & par, UpdateType utype, bool const /*deleted*/)
+void InsetLabel::updateBuffer(ParIterator const & it, UpdateType utype, bool const /*deleted*/)
 {
 	docstring const & label = getParam("name");
 
 	// Check if this one is active (i.e., neither deleted with change-tracking
 	// nor in an inset that does not produce output, such as notes or inactive branches)
-	Paragraph const & para = par.paragraph();
-	bool active = !para.isDeleted(par.pos()) && para.inInset().producesOutput();
+	Paragraph const & para = it.paragraph();
+	bool active = !para.isDeleted(it.pos()) && para.inInset().producesOutput();
 	// If not, check whether we are in a deleted/non-outputting 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())
+		for (size_type sl = 0 ; sl < it.depth() ; ++sl) {
+			Paragraph const & outer_par = it[sl].paragraph();
+			if (outer_par.isDeleted(it[sl].pos())
 			    || !outer_par.inInset().producesOutput()) {
 				active = false;
 				break;
@@ -193,7 +189,7 @@ void InsetLabel::updateBuffer(ParIterator const & par, UpdateType utype, bool co
 		Counters const & cnts =
 			buffer().masterBuffer()->params().documentClass().counters();
 		active_counter_ = cnts.currentCounter();
-		Language const * lang = par->getParLanguage(buffer().params());
+		Language const * lang = it->getParLanguage(buffer().params());
 		if (lang && !active_counter_.empty()) {
 			counter_value_ = cnts.theCounter(active_counter_, lang->code());
 			pretty_counter_ = cnts.prettyCounter(active_counter_, lang->code());
@@ -334,7 +330,10 @@ void InsetLabel::latex(otexstream & os, OutputParams const & runparams_in) const
 	if (runparams_in.postpone_fragile_stuff)
 		runparams_in.post_macro += command;
 	else {
-		if (runparams.moving_arg)
+		// protect label in moving argument (#9404),
+		// but not in subfloat caption (#11950)
+		if (runparams.moving_arg
+		    && runparams.inFloat != OutputParams::SUBFLOAT)
 			os << "\\protect";
 		os << command;
 	}
@@ -353,8 +352,11 @@ int InsetLabel::plaintext(odocstringstream & os,
 void InsetLabel::docbook(XMLStream & xs, OutputParams const & runparams) const
 {
 	// Output an anchor only if it has not been processed before.
-	if (runparams.docbook_anchors_to_ignore.find(getParam("name")) == runparams.docbook_anchors_to_ignore.end()) {
-		docstring attr = from_utf8("xml:id=\"") + xml::cleanID(getParam("name")) + from_utf8("\"");
+	docstring id = getParam("name");
+	docstring cleaned_id = xml::cleanID(id);
+	if (runparams.docbook_anchors_to_ignore.find(id) == runparams.docbook_anchors_to_ignore.end() &&
+	        runparams.docbook_anchors_to_ignore.find(cleaned_id) == runparams.docbook_anchors_to_ignore.end()) {
+		docstring attr = from_utf8("xml:id=\"") + cleaned_id + from_utf8("\"");
 		xs << xml::CompTag("anchor", to_utf8(attr));
 	}
 }