X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetHyperlink.cpp;h=8b3433c944b0b105afb84800cc1245b470df561e;hb=860accd01fb8115ec7c6ad80b054f1046e19c62f;hp=85aaf4348265c395250b67734bdb63ae381a22ae;hpb=9e9c96035cd48e30f658c96a8448c99c868772b3;p=lyx.git

diff --git a/src/insets/InsetHyperlink.cpp b/src/insets/InsetHyperlink.cpp
index 85aaf43482..8b3433c944 100644
--- a/src/insets/InsetHyperlink.cpp
+++ b/src/insets/InsetHyperlink.cpp
@@ -15,12 +15,14 @@
 
 #include "Buffer.h"
 #include "DispatchResult.h"
+#include "Encoding.h"
 #include "Format.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "LaTeXFeatures.h"
 #include "OutputParams.h"
 #include "output_xhtml.h"
+#include "texstream.h"
 
 #include "support/docstream.h"
 #include "support/FileName.h"
@@ -28,6 +30,8 @@
 #include "support/gettext.h"
 #include "support/lstrings.h"
 
+#include "frontends/alert.h"
+
 using namespace std;
 using namespace lyx::support;
 
@@ -53,7 +57,7 @@ ParamInfo const & InsetHyperlink::findInfo(string const & /* cmdName */)
 
 docstring InsetHyperlink::screenLabel() const
 {
-	docstring const temp = from_ascii("Hyperlink: ");
+	docstring const temp = _("Hyperlink: ");
 
 	docstring url;
 
@@ -63,8 +67,9 @@ docstring InsetHyperlink::screenLabel() const
 
 	// elide if long
 	if (url.length() > 30) {
-		url = url.substr(0, 10) + "..."
-			+ url.substr(url.length() - 17, url.length());
+		docstring end = url.substr(url.length() - 17, url.length());
+		support::truncateWithEllipsis(url, 13);
+		url += end;
 	}
 	return temp + url;
 }
@@ -108,8 +113,8 @@ void InsetHyperlink::viewTarget() const
 }
 
 
-int InsetHyperlink::latex(odocstream & os,
-			  OutputParams const & runparams) const
+void InsetHyperlink::latex(otexstream & os,
+			   OutputParams const & runparams) const
 {
 	docstring url = getParam("target");
 	docstring name = getParam("name");
@@ -185,7 +190,17 @@ int InsetHyperlink::latex(odocstream & os,
 			(pos = name.find('~', i)) != string::npos;
 			i = pos + 1)
 			name.replace(pos, 1, sim);
-
+		pair<docstring, docstring> name_latexed =
+			runparams.encoding->latexString(name, runparams.dryrun);
+		name = name_latexed.first;
+		if (!name_latexed.second.empty() && !runparams.silent) {
+			// issue a warning about omitted characters
+			// FIXME: should be passed to the error dialog
+			frontend::Alert::warning(_("Uncodable characters"),
+				bformat(_("The following characters that are used in the href inset are not\n"
+					  "representable in the current encoding and therefore have been omitted:\n%1$s."),
+					name_latexed.second));
+		}
 	}  // end if (!name.empty())
 	
 	if (runparams.moving_arg)
@@ -193,12 +208,11 @@ int InsetHyperlink::latex(odocstream & os,
 
 	// output the ready \href command
 	os << "\\href{" << getParam("type") << url << "}{" << name << '}';
-
-	return 0;
 }
 
 
-int InsetHyperlink::plaintext(odocstream & os, OutputParams const &) const
+int InsetHyperlink::plaintext(odocstringstream & os,
+        OutputParams const &, size_t) const
 {
 	odocstringstream oss;
 
@@ -227,7 +241,8 @@ int InsetHyperlink::docbook(odocstream & os, OutputParams const &) const
 
 docstring InsetHyperlink::xhtml(XHTMLStream & xs, OutputParams const &) const
 {
-	docstring const & target = getParam("target");
+	docstring const & target = 
+		html::htmlize(getParam("target"), XHTMLStream::ESCAPE_AND);
 	docstring const & name   = getParam("name");
 	xs << html::StartTag("a", to_utf8("href=\"" + target + "\""));
 	xs << (name.empty() ? target : name);
@@ -238,11 +253,13 @@ docstring InsetHyperlink::xhtml(XHTMLStream & xs, OutputParams const &) const
 
 void InsetHyperlink::toString(odocstream & os) const
 {
-	plaintext(os, OutputParams(0));
+	odocstringstream ods;
+	plaintext(ods, OutputParams(0), INT_MAX);
+	os << ods.str();
 }
 
 
-void InsetHyperlink::forToc(docstring & os, size_t) const
+void InsetHyperlink::forOutliner(docstring & os, size_t const, bool const) const
 {
 	docstring const & n = getParam("name");
 	if (!n.empty()) {
@@ -272,9 +289,9 @@ void InsetHyperlink::validate(LaTeXFeatures & features) const
 }
 
 
-docstring InsetHyperlink::contextMenuName() const
+string InsetHyperlink::contextMenuName() const
 {
-	return from_ascii("context-hyperlink");
+	return "context-hyperlink";
 }