X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetHyperlink.cpp;h=a0c504cd9cb5d6ef2c9218e8b19f32c471db03f9;hb=8124e6c02ea1fd6779bb6c47ffe2bca2c8bd2d97;hp=bfa478d2f17b82edf3f0bacbc693a76b798d1f54;hpb=48b1e8a0aca2f3f3faa8f1f800568e47792ba9a0;p=lyx.git diff --git a/src/insets/InsetHyperlink.cpp b/src/insets/InsetHyperlink.cpp index bfa478d2f1..a0c504cd9c 100644 --- a/src/insets/InsetHyperlink.cpp +++ b/src/insets/InsetHyperlink.cpp @@ -12,22 +12,18 @@ #include #include "InsetHyperlink.h" -#include -#include - #include "Buffer.h" -#include "DispatchResult.h" -#include "Encoding.h" #include "Format.h" #include "FuncRequest.h" #include "FuncStatus.h" #include "LaTeXFeatures.h" -#include "OutputParams.h" +#include "LyX.h" #include "output_docbook.h" #include "output_xhtml.h" #include "xml.h" #include "texstream.h" +#include "support/debug.h" #include "support/docstream.h" #include "support/FileName.h" #include "support/filetools.h" @@ -37,6 +33,9 @@ #include "frontends/alert.h" +#include +#include + using namespace std; using namespace lyx::support; @@ -93,6 +92,12 @@ docstring InsetHyperlink::screenLabel() const void InsetHyperlink::doDispatch(Cursor & cur, FuncRequest & cmd) { + // Ctrl + click: open hyperlink + if (cmd.action() == LFUN_MOUSE_RELEASE && cmd.modifier() == ControlModifier) { + lyx::dispatch(FuncRequest(LFUN_INSET_EDIT)); + return; + } + switch (cmd.action()) { case LFUN_INSET_EDIT: @@ -111,10 +116,10 @@ bool InsetHyperlink::getStatus(Cursor & cur, FuncRequest const & cmd, { switch (cmd.action()) { case LFUN_INSET_EDIT: { + docstring const & utype = getParam("type"); QUrl url(toqstr(getParam("target")),QUrl::StrictMode); - bool url_valid = getParam("type").empty() && url.isValid(); - - flag.setEnabled(url_valid || getParam("type") == "file:"); + bool url_valid = utype.empty() && url.isValid(); + flag.setEnabled(url_valid || utype == "file:"); return true; } @@ -130,7 +135,6 @@ void InsetHyperlink::viewTarget() const 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); @@ -139,11 +143,20 @@ void InsetHyperlink::viewTarget() const } +docstring makeURL(docstring const & url, docstring const & type) { + if (type == "other" || + (!type.empty() && url.find(type) == 0)) + return url; + return type + url; +} + + void InsetHyperlink::latex(otexstream & os, OutputParams const & runparams) const { - docstring url = getParam("target"); - docstring name = getParam("name"); + docstring url = getParam("target"); + docstring name = getParam("name"); + docstring const & utype = getParam("type"); static char_type const chars_url[2] = {'%', '#'}; // For the case there is no name given, the target is set as name. @@ -178,11 +191,9 @@ void InsetHyperlink::latex(otexstream & os, 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"); + // and no "://" is given if (url.find(from_ascii("://")) == string::npos - && url.find(from_ascii("run:")) == string::npos - && type.empty()) + && utype.empty()) url = from_ascii("http://") + url; } // end if (!url.empty()) @@ -192,7 +203,7 @@ void InsetHyperlink::latex(otexstream & os, ParamInfo::HANDLING_LATEXIFY); // replace the tilde by the \sim character as suggested in the // LaTeX FAQ for URLs - if (getParam("literal") != from_ascii("true")) { + if (getParam("literal") != "true") { docstring const sim = from_ascii("$\\sim$"); for (size_t i = 0, pos; (pos = name.find('~', i)) != string::npos; @@ -205,7 +216,7 @@ void InsetHyperlink::latex(otexstream & os, os << "\\protect"; // output the ready \href command - os << "\\href{" << getParam("type") << url << "}{" << name << '}'; + os << "\\href{" << makeURL(url, utype) << "}{" << name << '}'; } @@ -228,7 +239,8 @@ int InsetHyperlink::plaintext(odocstringstream & os, void InsetHyperlink::docbook(XMLStream & xs, OutputParams const &) const { - xs << xml::StartTag("link", "xlink:href=\"" + subst(getParam("target"), from_ascii("&"), from_ascii("&")) + "\""); + docstring target = subst(getParam("target"), from_ascii("&"), from_ascii("&")) ; + xs << xml::StartTag("link", "xlink:href=\"" + makeURL(target, getParam("type")) + "\""); xs << xml::escapeString(getParam("name")); xs << xml::EndTag("link"); } @@ -238,8 +250,8 @@ docstring InsetHyperlink::xhtml(XMLStream & xs, OutputParams const &) const { docstring const & target = xml::escapeString(getParam("target"), XMLStream::ESCAPE_AND); - docstring const & name = getParam("name"); - xs << xml::StartTag("a", to_utf8("href=\"" + target + "\"")); + docstring const & name = getParam("name"); + xs << xml::StartTag("a", to_utf8("href=\"" + makeURL(target, getParam("type")) + "\"")); xs << (name.empty() ? target : name); xs << xml::EndTag("a"); return docstring(); @@ -267,13 +279,15 @@ void InsetHyperlink::forOutliner(docstring & os, size_t const, bool const) const docstring InsetHyperlink::toolTip(BufferView const & /*bv*/, int /*x*/, int /*y*/) const { - docstring url = getParam("target"); - docstring type = getParam("type"); + docstring const & url = getParam("target"); + docstring const & type = getParam("type"); docstring guitype = _("www"); if (type == "mailto:") guitype = _("email"); else if (type == "file:") guitype = _("file"); + else if (type == "other") + guitype = _("other[[Hyperlink Type]]"); return bformat(_("Hyperlink (%1$s) to %2$s"), guitype, url); } @@ -285,6 +299,13 @@ void InsetHyperlink::validate(LaTeXFeatures & features) const } +pair InsetHyperlink::isWords() const +{ + docstring const label = getParam("name"); + return pair(label.size(), wordCount(label)); +} + + string InsetHyperlink::contextMenuName() const { return "context-hyperlink";