requires is a keyword in C++2a

[lyx.git] / src / insets / InsetHyperlink.cpp

diff --git a/src/insets/InsetHyperlink.cpp b/src/insets/InsetHyperlink.cpp
index 275276b973e6f217a1907555e5c003d59e615aea..a225a8eb0bd55fbd94fc1ddec7d53f6906006f5e 100644 (file)
--- a/src/insets/InsetHyperlink.cpp
+++ b/src/insets/InsetHyperlink.cpp
@@ -60,23 +60,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()) {
@@ -125,15 +135,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 +157,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");
@@ -174,7 +187,7 @@ void InsetHyperlink::latex(otexstream & os,
                                name.replace(pos, 1, sim);
                }
        }
-       
+
        if (runparams.moving_arg)
                os << "\\protect";
 
@@ -213,7 +226,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 + "\""));