X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetHyperlink.cpp;h=37692af97a634c65244245908861036357a14206;hb=5801ee2f9a0f6536c6753567b191302960b3bf4f;hp=eec468ba8d0f42e4261cc0b7599fdee9cc2e20d8;hpb=2bbf8e5f2d4ffd691258f94ba46baebf5aa3204c;p=lyx.git

diff --git a/src/insets/InsetHyperlink.cpp b/src/insets/InsetHyperlink.cpp
index eec468ba8d..37692af97a 100644
--- a/src/insets/InsetHyperlink.cpp
+++ b/src/insets/InsetHyperlink.cpp
@@ -15,6 +15,7 @@
 
 #include "Buffer.h"
 #include "DispatchResult.h"
+#include "Encoding.h"
 #include "Format.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
@@ -28,6 +29,8 @@
 #include "support/gettext.h"
 #include "support/lstrings.h"
 
+#include "frontends/alert.h"
+
 using namespace std;
 using namespace lyx::support;
 
@@ -100,19 +103,16 @@ bool InsetHyperlink::getStatus(Cursor & cur, FuncRequest const & cmd,
 
 void InsetHyperlink::viewTarget() const
 {
-	if (getParam("type").empty()) 
-		formats.viewURL(to_ascii(getParam("target")));
-
-	else if (getParam("type") == "file:") {
+	if (getParam("type") == "file:") {
 		FileName url = makeAbsPath(to_utf8(getParam("target")), buffer().filePath());
-		string format = formats.getFormatFromFile(url);
+		string const format = formats.getFormatFromFile(url);
 		formats.view(buffer(), url, format);
 	}
 }
 
 
-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");
@@ -188,7 +188,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()) {
+			// 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)
@@ -196,8 +206,6 @@ int InsetHyperlink::latex(odocstream & os,
 
 	// output the ready \href command
 	os << "\\href{" << getParam("type") << url << "}{" << name << '}';
-
-	return 0;
 }
 
 
@@ -230,7 +238,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);
@@ -239,12 +248,23 @@ docstring InsetHyperlink::xhtml(XHTMLStream & xs, OutputParams const &) const
 }
 
 
-void InsetHyperlink::tocString(odocstream & os) const
+void InsetHyperlink::toString(odocstream & os) const
 {
 	plaintext(os, OutputParams(0));
 }
 
 
+void InsetHyperlink::forToc(docstring & os, size_t) const
+{
+	docstring const & n = getParam("name");
+	if (!n.empty()) {
+		os += n;
+		return;
+	}
+	os += getParam("target");
+}
+
+
 docstring InsetHyperlink::toolTip(BufferView const & /*bv*/, int /*x*/, int /*y*/) const
 {
 	docstring url = getParam("target");
@@ -264,9 +284,9 @@ void InsetHyperlink::validate(LaTeXFeatures & features) const
 }
 
 
-docstring InsetHyperlink::contextMenu(BufferView const &, int, int) const
+string InsetHyperlink::contextMenuName() const
 {
-	return from_ascii("context-hyperlink");
+	return "context-hyperlink";
 }