X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetHyperlink.cpp;h=bfa478d2f17b82edf3f0bacbc693a76b798d1f54;hb=48b1e8a0aca2f3f3faa8f1f800568e47792ba9a0;hp=afa49d4e35b36d8573385cb1fddfbcf7dfceb853;hpb=75bfed55079cab6b73fbea6ce4ae3f10d1af3b91;p=lyx.git

diff --git a/src/insets/InsetHyperlink.cpp b/src/insets/InsetHyperlink.cpp
index afa49d4e35..bfa478d2f1 100644
--- a/src/insets/InsetHyperlink.cpp
+++ b/src/insets/InsetHyperlink.cpp
@@ -10,9 +10,11 @@
  */
 
 #include <config.h>
-
 #include "InsetHyperlink.h"
 
+#include <QtGui/QDesktopServices>
+#include <QUrl>
+
 #include "Buffer.h"
 #include "DispatchResult.h"
 #include "Encoding.h"
@@ -21,8 +23,9 @@
 #include "FuncStatus.h"
 #include "LaTeXFeatures.h"
 #include "OutputParams.h"
+#include "output_docbook.h"
 #include "output_xhtml.h"
-#include "sgml.h"
+#include "xml.h"
 #include "texstream.h"
 
 #include "support/docstream.h"
@@ -30,6 +33,7 @@
 #include "support/filetools.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
+#include "support/qstring_helpers.h"
 
 #include "frontends/alert.h"
 
@@ -60,23 +64,33 @@ ParamInfo const & InsetHyperlink::findInfo(string const & /* cmdName */)
 
 docstring InsetHyperlink::screenLabel() const
 {
+	// TODO: replace with unicode hyperlink character = U+1F517
 	docstring const temp = _("Hyperlink: ");
 
 	docstring url;
 
 	url += getParam("name");
-	if (url.empty())
+	if (url.empty()) {
 		url += getParam("target");
 
-	// elide if long
-	if (url.length() > 30) {
-		docstring end = url.substr(url.length() - 17, url.length());
-		support::truncateWithEllipsis(url, 13);
-		url += end;
+		// elide if long and no name was provided
+		if (url.length() > 30) {
+			docstring end = url.substr(url.length() - 17, url.length());
+			support::truncateWithEllipsis(url, 13);
+			url += end;
+		}
+	} else {
+		// elide if long (approx number of chars in line of article class)
+		if (url.length() > 80) {
+			docstring end = url.substr(url.length() - 67, url.length());
+			support::truncateWithEllipsis(url, 13);
+			url += end;
+		}
 	}
 	return temp + url;
 }
 
+
 void InsetHyperlink::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
 	switch (cmd.action()) {
@@ -96,9 +110,13 @@ bool InsetHyperlink::getStatus(Cursor & cur, FuncRequest const & cmd,
 		FuncStatus & flag) const
 {
 	switch (cmd.action()) {
-	case LFUN_INSET_EDIT:
-		flag.setEnabled(getParam("type").empty() || getParam("type") == "file:");
+	case LFUN_INSET_EDIT: {
+		QUrl url(toqstr(getParam("target")),QUrl::StrictMode);
+		bool url_valid = getParam("type").empty() && url.isValid();
+
+		flag.setEnabled(url_valid || getParam("type") == "file:");
 		return true;
+		}
 
 	default:
 		return InsetCommand::getStatus(cur, cmd, flag);
@@ -108,7 +126,12 @@ bool InsetHyperlink::getStatus(Cursor & cur, FuncRequest const & cmd,
 
 void InsetHyperlink::viewTarget() const
 {
-	if (getParam("type") == "file:") {
+	if (getParam("type").empty()) { //==Web
+		QUrl url(toqstr(getParam("target")),QUrl::StrictMode);
+		if (!QDesktopServices::openUrl(url))
+			LYXERR0("Unable to open URL!");
+
+	} else if (getParam("type") == "file:") {
 		FileName url = makeAbsPath(to_utf8(getParam("target")), buffer().filePath());
 		string const format = theFormats().getFormatFromFile(url);
 		theFormats().view(buffer(), url, format);
@@ -125,15 +148,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,6 +170,7 @@ 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;
@@ -200,25 +226,22 @@ int InsetHyperlink::plaintext(odocstringstream & os,
 }
 
 
-int InsetHyperlink::docbook(odocstream & os, OutputParams const &) const
+void InsetHyperlink::docbook(XMLStream & xs, OutputParams const &) const
 {
-	os << "<ulink url=\""
-	   << subst(getParam("target"), from_ascii("&"), from_ascii("&amp;"))
-	   << "\">"
-	   << sgml::escapeString(getParam("name"))
-	   << "</ulink>";
-	return 0;
+	xs << xml::StartTag("link", "xlink:href=\"" + subst(getParam("target"), from_ascii("&"), from_ascii("&amp;")) + "\"");
+	xs << xml::escapeString(getParam("name"));
+	xs << xml::EndTag("link");
 }
 
 
-docstring InsetHyperlink::xhtml(XHTMLStream & xs, OutputParams const &) const
+docstring InsetHyperlink::xhtml(XMLStream & xs, OutputParams const &) const
 {
 	docstring const & target =
-		html::htmlize(getParam("target"), XHTMLStream::ESCAPE_AND);
+		xml::escapeString(getParam("target"), XMLStream::ESCAPE_AND);
 	docstring const & name   = getParam("name");
-	xs << html::StartTag("a", to_utf8("href=\"" + target + "\""));
+	xs << xml::StartTag("a", to_utf8("href=\"" + target + "\""));
 	xs << (name.empty() ? target : name);
-	xs << html::EndTag("a");
+	xs << xml::EndTag("a");
 	return docstring();
 }