X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetLabel.cpp;h=6f006a1288160d508d41bc0f50ed9b66dc68a33c;hb=142caff8336c54627606c09d3ce5bb7de7a8adb6;hp=edcf5ec742a78f88a8969f9d1b080d3b1c8a1ff1;hpb=caa4e94bf02b9d3131bc280390fae44683fd5e9a;p=lyx.git

diff --git a/src/insets/InsetLabel.cpp b/src/insets/InsetLabel.cpp
index edcf5ec742..6f006a1288 100644
--- a/src/insets/InsetLabel.cpp
+++ b/src/insets/InsetLabel.cpp
@@ -24,7 +24,7 @@
 #include "FuncStatus.h"
 #include "InsetIterator.h"
 #include "Language.h"
-#include "LyXFunc.h"
+#include "LyX.h"
 #include "output_xhtml.h"
 #include "ParIterator.h"
 #include "sgml.h"
@@ -32,6 +32,9 @@
 #include "TextClass.h"
 #include "TocBackend.h"
 
+#include "mathed/InsetMathHull.h"
+#include "mathed/InsetMathRef.h"
+
 #include "frontends/alert.h"
 
 #include "support/convert.h"
@@ -82,14 +85,22 @@ void InsetLabel::updateCommand(docstring const & new_label, bool updaterefs)
 		Buffer::References::iterator end = refs.end();
 		for (; it != end; ++it) {
 			buffer().undo().recordUndo(it->second);
-			it->first->setParam("reference", label);
+			if (it->first->lyxCode() == MATH_REF_CODE) {
+				InsetMathHull * mi =
+					static_cast<InsetMathHull *>(it->first);
+				mi->asRefInset()->changeTarget(label);
+			} else {
+				InsetCommand * ref =
+					static_cast<InsetCommand *>(it->first);
+				ref->setParam("reference", label);
+			}
 		}
 	}
 	buffer().undo().endUndoGroup();
 
 	// We need an update of the Buffer reference cache. This is achieved by
-	// updateLabels().
-	buffer().updateLabels();
+	// updateBuffer().
+	buffer().updateBuffer();
 }
 
 
@@ -97,7 +108,8 @@ ParamInfo const & InsetLabel::findInfo(string const & /* cmdName */)
 {
 	static ParamInfo param_info_;
 	if (param_info_.empty())
-		param_info_.add("name", ParamInfo::LATEX_REQUIRED);
+		param_info_.add("name", ParamInfo::LATEX_REQUIRED,
+				ParamInfo::HANDLING_ESCAPE);
 	return param_info_;
 }
 
@@ -108,7 +120,7 @@ docstring InsetLabel::screenLabel() const
 }
 
 
-void InsetLabel::updateLabels(ParIterator const & par, UpdateType utype)
+void InsetLabel::updateBuffer(ParIterator const & par, UpdateType utype)
 {
 	docstring const & label = getParam("name");
 	if (buffer().insetLabel(label)) {
@@ -125,10 +137,13 @@ void InsetLabel::updateLabels(ParIterator const & par, UpdateType utype)
 			buffer().masterBuffer()->params().documentClass().counters();
 		active_counter_ = cnts.currentCounter();
 		Language const * lang = par->getParLanguage(buffer().params());
-		if (lang && !active_counter_.empty())
+		if (lang && !active_counter_.empty()) {
 			counter_value_ = cnts.theCounter(active_counter_, lang->code());
-		else 
-			counter_value_ = _("(unknown)");
+			pretty_counter_ = cnts.prettyCounter(active_counter_, lang->code());
+		} else {
+			counter_value_ = from_ascii("??");
+			pretty_counter_ = from_ascii("??");
+		}
 	}
 }
 
@@ -147,7 +162,13 @@ void InsetLabel::addToToc(DocIterator const & cpit)
 	Buffer::References::const_iterator end = refs.end();
 	for (; it != end; ++it) {
 		DocIterator const ref_pit(it->second);
-		toc.push_back(TocItem(ref_pit, 1, it->first->screenLabel()));
+		if (it->first->lyxCode() == MATH_REF_CODE)
+			toc.push_back(TocItem(ref_pit, 1,
+				static_cast<InsetMathHull *>(it->first)->asRefInset()
+					->screenLabel()));
+		else
+			toc.push_back(TocItem(ref_pit, 1,
+				static_cast<InsetRef *>(it->first)->screenLabel()));
 	}
 }
 
@@ -156,7 +177,7 @@ bool InsetLabel::getStatus(Cursor & cur, FuncRequest const & cmd,
 			   FuncStatus & status) const
 {
 	bool enabled;
-	switch (cmd.action) {
+	switch (cmd.action()) {
 	case LFUN_LABEL_INSERT_AS_REF:
 	case LFUN_LABEL_COPY_AS_REF:
 		enabled = true;
@@ -172,7 +193,7 @@ bool InsetLabel::getStatus(Cursor & cur, FuncRequest const & cmd,
 
 void InsetLabel::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
-	switch (cmd.action) {
+	switch (cmd.action()) {
 
 	case LFUN_INSET_MODIFY: {
 		InsetCommandParams p(LABEL_CODE);
@@ -210,13 +231,6 @@ void InsetLabel::doDispatch(Cursor & cur, FuncRequest & cmd)
 }
 
 
-int InsetLabel::latex(odocstream & os, OutputParams const &) const
-{
-	os << escape(getCommand());
-	return 0;
-}
-
-
 int InsetLabel::plaintext(odocstream & os, OutputParams const &) const
 {
 	docstring const str = getParam("name");