X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetRef.cpp;h=bd6b2ecfec204952e81dd455d152a3bd4bad227a;hb=d044d6afa7192b2119784e1415e71dad644bc335;hp=9a2ddd8bd8aec618719ba9c4b7bb561d1564a2ca;hpb=3057bce3f210584118211746d8e38bec9d76a080;p=lyx.git

diff --git a/src/insets/InsetRef.cpp b/src/insets/InsetRef.cpp
index 9a2ddd8bd8..bd6b2ecfec 100644
--- a/src/insets/InsetRef.cpp
+++ b/src/insets/InsetRef.cpp
@@ -140,10 +140,10 @@ docstring InsetRef::getEscapedLabel(OutputParams const & rp) const
 
 void InsetRef::latex(otexstream & os, OutputParams const & rp) const
 {
-	string const cmd = getCmdName();
-	docstring const data = getEscapedLabel(rp);
+	string const & cmd = getCmdName();
+	docstring const & data = getEscapedLabel(rp);
 
-	if (rp.inulemcmd)
+	if (rp.inulemcmd > 0)
 		os << "\\mbox{";
 
 	if (cmd == "eqref" && buffer().params().use_refstyle) {
@@ -168,7 +168,7 @@ void InsetRef::latex(otexstream & os, OutputParams const & rp) const
 		os << p.getCommand(rp);
 	}
 
-	if (rp.inulemcmd)
+	if (rp.inulemcmd > 0)
 		os << "}";
 }
 
@@ -235,8 +235,8 @@ docstring InsetRef::xhtml(XHTMLStream & xs, OutputParams const & op) const
 			// properly in XHTML output yet (bug #8599).
 			// It might not be that hard to do. We have the InsetLabel,
 			// and we can presumably find its paragraph using the TOC.
-			// We could then output the contents of the paragraph using
-			// something?
+			// But the label might be referencing a section, yet not be
+			// in that section. So this is not trivial.
 			display_string = il->prettyCounter();
 	} else 
 			display_string = ref;
@@ -260,7 +260,7 @@ void InsetRef::toString(odocstream & os) const
 }
 
 
-void InsetRef::forToc(docstring & os, size_t) const
+void InsetRef::forOutliner(docstring & os, size_t) const
 {
 	// There's no need for details in the TOC, and a long label
 	// will just get in the way.
@@ -351,7 +351,7 @@ void InsetRef::validate(LaTeXFeatures & features) const
 }
 
 
-InsetRef::type_info InsetRef::types[] = {
+InsetRef::type_info const InsetRef::types[] = {
 	{ "ref",       N_("Standard"),              N_("Ref: ")},
 	{ "eqref",     N_("Equation"),              N_("EqRef: ")},
 	{ "pageref",   N_("Page Number"),           N_("Page: ")},
@@ -378,4 +378,9 @@ string const & InsetRef::getName(int type)
 }
 
 
+docstring InsetRef::getTOCString() const 
+{
+	return tooltip_.empty() ? screen_label_ : tooltip_;
+}
+
 } // namespace lyx