X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetHyperlink.cpp;h=a500f7bd5913b35d7ea54c226e56826af4eeab9e;hb=58cf1c5345104cb3071bf6788f65e4fae07ac749;hp=8405c48440b2ee57764f0ba9b53708d3be9252f1;hpb=e15a8f3551f86a2ffa835c344256f2b4703fefb2;p=lyx.git

diff --git a/src/insets/InsetHyperlink.cpp b/src/insets/InsetHyperlink.cpp
index 8405c48440..a500f7bd59 100644
--- a/src/insets/InsetHyperlink.cpp
+++ b/src/insets/InsetHyperlink.cpp
@@ -77,6 +77,7 @@ docstring InsetHyperlink::screenLabel() const
 	return temp + url;
 }
 
+
 void InsetHyperlink::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
 	switch (cmd.action()) {
@@ -110,8 +111,8 @@ void InsetHyperlink::viewTarget() const
 {
 	if (getParam("type") == "file:") {
 		FileName url = makeAbsPath(to_utf8(getParam("target")), buffer().filePath());
-		string const format = formats.getFormatFromFile(url);
-		formats.view(buffer(), url, format);
+		string const format = theFormats().getFormatFromFile(url);
+		theFormats().view(buffer(), url, format);
 	}
 }
 
@@ -125,15 +126,17 @@ void InsetHyperlink::latex(otexstream & os,
 
 	// For the case there is no name given, the target is set as name.
 	// Do this before !url.empty() and !name.empty() to handle characters
-	// like the "%" correctly.
+	// such as % correctly.
 	if (name.empty())
 		name = url;
 
 	if (!url.empty()) {
-		// Replace the "\" character by its ASCII code according to the
-		// URL specifications because "\" is not allowed in URLs and by
-		// \href. Only do this when the following character is not also
-		// a "\", because "\\" is valid code
+		// Use URI/URL-style percent-encoded string (hexadecimal).
+		// We exclude some characters that must not be transformed
+		// in hrefs: % # / : ? = & ! * ' ( ) ; @ + $ , [ ]
+		// or that we need to treat manually: \.
+		url = to_percent_encoding(url, from_ascii("%#\\/:?=&!*'();@+$,[]"));
+		// We handle \ manually since \\ is valid
 		for (size_t i = 0, pos;
 			(pos = url.find('\\', i)) != string::npos;
 			i = pos + 2) {
@@ -145,12 +148,13 @@ void InsetHyperlink::latex(otexstream & os,
 		// field because otherwise LaTeX will fail when the hyperlink is
 		// within an argument of another command, e.g. in a \footnote. It
 		// is important that they are escaped as "\#" and not as "\#{}".
+		// FIXME this is not necessary in outside of commands.
 		for (int k = 0; k < 2; k++)
 			for (size_t i = 0, pos;
 				(pos = url.find(chars_url[k], i)) != string::npos;
 				i = pos + 2)
 				url.replace(pos, 1, from_ascii("\\") + chars_url[k]);
-		
+
 		// add "http://" when the type is web (type = empty)
 		// and no "://" or "run:" is given
 		docstring type = getParam("type");
@@ -162,7 +166,7 @@ void InsetHyperlink::latex(otexstream & os,
 	} // end if (!url.empty())
 
 	if (!name.empty()) {
-		name = params().prepareCommand(runparams, getParam("name"),
+		name = params().prepareCommand(runparams, name,
 					ParamInfo::HANDLING_LATEXIFY);
 		// replace the tilde by the \sim character as suggested in the
 		// LaTeX FAQ for URLs
@@ -174,7 +178,7 @@ void InsetHyperlink::latex(otexstream & os,
 				name.replace(pos, 1, sim);
 		}
 	}
-	
+
 	if (runparams.moving_arg)
 		os << "\\protect";
 
@@ -213,7 +217,7 @@ int InsetHyperlink::docbook(odocstream & os, OutputParams const &) const
 
 docstring InsetHyperlink::xhtml(XHTMLStream & xs, OutputParams const &) const
 {
-	docstring const & target = 
+	docstring const & target =
 		html::htmlize(getParam("target"), XHTMLStream::ESCAPE_AND);
 	docstring const & name   = getParam("name");
 	xs << html::StartTag("a", to_utf8("href=\"" + target + "\""));