X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetRef.cpp;h=8cb8c58027f22d8877a8040fcf1d7b98f912f4ba;hb=e8c932ff842ced0b26c205ed6983102b6e7e50c2;hp=db8ca6ec603904ee1480ace6a2acdefdfa46edac;hpb=bb344452c8eafaba4f0e7a51f8e4d99176570d9b;p=lyx.git

diff --git a/src/insets/InsetRef.cpp b/src/insets/InsetRef.cpp
index db8ca6ec60..8cb8c58027 100644
--- a/src/insets/InsetRef.cpp
+++ b/src/insets/InsetRef.cpp
@@ -23,6 +23,7 @@
 #include "output_xhtml.h"
 #include "ParIterator.h"
 #include "sgml.h"
+#include "texstream.h"
 #include "TocBackend.h"
 
 #include "support/debug.h"
@@ -244,8 +245,8 @@ docstring InsetRef::xhtml(XHTMLStream & xs, OutputParams const & op) const
 	// FIXME What we'd really like to do is to be able to output some
 	// appropriate sort of text here. But to do that, we need to associate
 	// some sort of counter with the label, and we don't have that yet.
-	string const attr = "href=\"#" + html::cleanAttr(to_utf8(ref)) + "\"";
-	xs << html::StartTag("a", attr);
+	docstring const attr = "href=\"#" + html::cleanAttr(ref) + '"';
+	xs << html::StartTag("a", to_utf8(attr));
 	xs << display_string;
 	xs << html::EndTag("a");
 	return docstring();
@@ -289,7 +290,7 @@ void InsetRef::updateBuffer(ParIterator const & it, UpdateType)
 	}
 	
 	unsigned int const maxLabelChars = 24;
-	if (screen_label_.size() > maxLabelChars) {
+	if (label.size() > maxLabelChars) {
 		tooltip_ = label;
 		support::truncateWithEllipsis(label, maxLabelChars);
 	} else
@@ -322,14 +323,14 @@ void InsetRef::validate(LaTeXFeatures & features) const
 		docstring const data = getEscapedLabel(features.runparams());
 		docstring label;
 		docstring prefix;
-		string const fcmd = to_utf8(getFormattedCmd(data, label, prefix));
+		docstring const fcmd = getFormattedCmd(data, label, prefix);
 		if (buffer().params().use_refstyle) {
 			features.require("refstyle");
 			if (prefix == "cha")
-				features.addPreambleSnippet("\\let\\charef=\\chapref");
+				features.addPreambleSnippet(from_ascii("\\let\\charef=\\chapref"));
 			else if (!prefix.empty()) {
-				string lcmd = "\\AtBeginDocument{\\providecommand" + 
-						fcmd + "[1]{\\ref{" + to_utf8(prefix) + ":#1}}}";
+				docstring lcmd = "\\AtBeginDocument{\\providecommand" +
+						fcmd + "[1]{\\ref{" + prefix + ":#1}}}";
 				features.addPreambleSnippet(lcmd);
 			}
 		} else {
@@ -337,7 +338,7 @@ void InsetRef::validate(LaTeXFeatures & features) const
 			// prettyref uses "cha" for chapters, so we provide a kind of
 			// translation.
 			if (prefix == "chap")
-				features.addPreambleSnippet("\\let\\pr@chap=\\pr@cha");
+				features.addPreambleSnippet(from_ascii("\\let\\pr@chap=\\pr@cha"));
 		}
 	} else if (cmd == "eqref" && !buffer().params().use_refstyle)
 		// with refstyle, we simply output "(\ref{label})"
@@ -354,7 +355,7 @@ InsetRef::type_info const InsetRef::types[] = {
 	{ "vpageref",  N_("Textual Page Number"),   N_("TextPage: ")},
 	{ "vref",      N_("Standard+Textual Page"), N_("Ref+Text: ")},
 	{ "formatted", N_("Formatted"),             N_("Format: ")},
-	{ "nameref",   N_("Reference to Name"),     N_("NameRef:")},
+	{ "nameref",   N_("Reference to Name"),     N_("NameRef: ")},
 	{ "", "", "" }
 };