X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetHyperlink.cpp;h=54f1f2c765338b9b4c5b97d45e11a73a83da7f0e;hb=dc8c4f3eab6e01f3767de765423fda5e4d6c5124;hp=29ce2ddca75585bc141c6eb11fa8c8bfcef0e9a1;hpb=455ac11cfc239621c2603f56257a24abece4373a;p=lyx.git

diff --git a/src/insets/InsetHyperlink.cpp b/src/insets/InsetHyperlink.cpp
index 29ce2ddca7..54f1f2c765 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;
 
@@ -53,7 +56,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 +66,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;
 }
@@ -100,10 +104,7 @@ bool InsetHyperlink::getStatus(Cursor & cur, FuncRequest const & cmd,
 
 void InsetHyperlink::viewTarget() const
 {
-	if (getParam("type").empty()) 
-		formats.viewURL(getParam("target"));
-
-	else if (getParam("type") == "file:") {
+	if (getParam("type") == "file:") {
 		FileName url = makeAbsPath(to_utf8(getParam("target")), buffer().filePath());
 		string const format = formats.getFormatFromFile(url);
 		formats.view(buffer(), url, format);
@@ -111,8 +112,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");
@@ -188,7 +189,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)
@@ -196,12 +207,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;
 
@@ -230,7 +240,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,9 +250,22 @@ docstring InsetHyperlink::xhtml(XHTMLStream & xs, OutputParams const &) const
 }
 
 
-void InsetHyperlink::tocString(odocstream & os) const
+void InsetHyperlink::toString(odocstream & os) const
 {
-	plaintext(os, OutputParams(0));
+	odocstringstream ods;
+	plaintext(ods, OutputParams(0), INT_MAX);
+	os << ods.str();
+}
+
+
+void InsetHyperlink::forOutliner(docstring & os, size_t const, bool const) const
+{
+	docstring const & n = getParam("name");
+	if (!n.empty()) {
+		os += n;
+		return;
+	}
+	os += getParam("target");
 }
 
 
@@ -264,9 +288,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";
 }