X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetHyperlink.cpp;h=afa49d4e35b36d8573385cb1fddfbcf7dfceb853;hb=2777b51c587cb061b3214c670a3cc4b357528e6c;hp=b688b22aca3a071f963fc96486f2638cd24368bb;hpb=b1d6406ac4da81d589c0b0aafeb99ac6de363d6e;p=lyx.git diff --git a/src/insets/InsetHyperlink.cpp b/src/insets/InsetHyperlink.cpp index b688b22aca..afa49d4e35 100644 --- a/src/insets/InsetHyperlink.cpp +++ b/src/insets/InsetHyperlink.cpp @@ -15,12 +15,15 @@ #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 "output_xhtml.h" +#include "sgml.h" +#include "texstream.h" #include "support/docstream.h" #include "support/FileName.h" @@ -28,6 +31,8 @@ #include "support/gettext.h" #include "support/lstrings.h" +#include "frontends/alert.h" + using namespace std; using namespace lyx::support; @@ -35,7 +40,7 @@ namespace lyx { InsetHyperlink::InsetHyperlink(Buffer * buf, InsetCommandParams const & p) - : InsetCommand(buf, p, "href") + : InsetCommand(buf, p) {} @@ -43,9 +48,11 @@ ParamInfo const & InsetHyperlink::findInfo(string const & /* cmdName */) { static ParamInfo param_info_; if (param_info_.empty()) { - param_info_.add("name", ParamInfo::LATEX_OPTIONAL); + param_info_.add("name", ParamInfo::LATEX_OPTIONAL, + ParamInfo::HANDLING_LATEXIFY); param_info_.add("target", ParamInfo::LATEX_REQUIRED); param_info_.add("type", ParamInfo::LATEX_REQUIRED); + param_info_.add("literal", ParamInfo::LYX_INTERNAL); } return param_info_; } @@ -53,7 +60,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 +70,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,27 +108,20 @@ bool InsetHyperlink::getStatus(Cursor & cur, FuncRequest const & cmd, void InsetHyperlink::viewTarget() const { - if (getParam("type").empty()) - formats.viewURL(to_ascii(getParam("target"))); - - else if (getParam("type") == "file:") { + if (getParam("type") == "file:") { FileName url = makeAbsPath(to_utf8(getParam("target")), buffer().filePath()); - string format = formats.getFormatFromFile(url); - formats.view(buffer(), url, format); + string const format = theFormats().getFormatFromFile(url); + theFormats().view(buffer(), url, format); } } -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"); - static docstring const backslash = from_ascii("\\"); - static docstring const braces = from_ascii("{}"); static char_type const chars_url[2] = {'%', '#'}; - static char_type const chars_name[6] = { - '&', '_', '$', '%', '#', '^'}; // 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 @@ -148,8 +149,8 @@ int InsetHyperlink::latex(odocstream & os, for (size_t i = 0, pos; (pos = url.find(chars_url[k], i)) != string::npos; i = pos + 2) - url.replace(pos, 1, backslash + chars_url[k]); - + 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"); @@ -160,48 +161,30 @@ int InsetHyperlink::latex(odocstream & os, } // end if (!url.empty()) - // The characters in chars_name[] need to be changed to a command when - // they are in the name field. if (!name.empty()) { - // handle the "\" character, but only when the following character - // is not also a "\", because "\\" is valid code - docstring const textbackslash = from_ascii("\\textbackslash{}"); - for (size_t i = 0, pos; - (pos = name.find('\\', i)) != string::npos; - i = pos + 2) { - if (name[pos + 1] != '\\') - name.replace(pos, 1, textbackslash); - } - // The characters in chars_name[] need to be changed to a command - // when they are in the name field. - // Therefore the treatment of "\" must be the first thing - for (int k = 0; k < 6; k++) - for (size_t i = 0, pos; - (pos = name.find(chars_name[k], i)) != string::npos; - i = pos + 2) - name.replace(pos, 1, backslash + chars_name[k] + braces); - + name = params().prepareCommand(runparams, name, + ParamInfo::HANDLING_LATEXIFY); // replace the tilde by the \sim character as suggested in the // LaTeX FAQ for URLs - docstring const sim = from_ascii("$\\sim$"); - for (size_t i = 0, pos; - (pos = name.find('~', i)) != string::npos; - i = pos + 1) - name.replace(pos, 1, sim); + if (getParam("literal") != from_ascii("true")) { + docstring const sim = from_ascii("$\\sim$"); + for (size_t i = 0, pos; + (pos = name.find('~', i)) != string::npos; + i = pos + 1) + name.replace(pos, 1, sim); + } + } - } // end if (!name.empty()) - if (runparams.moving_arg) os << "\\protect"; // 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; @@ -222,7 +205,7 @@ int InsetHyperlink::docbook(odocstream & os, OutputParams const &) const os << "" - << getParam("name") + << sgml::escapeString(getParam("name")) << ""; return 0; } @@ -230,7 +213,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 +223,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"); } @@ -261,12 +258,13 @@ docstring InsetHyperlink::toolTip(BufferView const & /*bv*/, int /*x*/, int /*y* void InsetHyperlink::validate(LaTeXFeatures & features) const { features.require("hyperref"); + InsetCommand::validate(features); } -docstring InsetHyperlink::contextMenu(BufferView const &, int, int) const +string InsetHyperlink::contextMenuName() const { - return from_ascii("context-hyperlink"); + return "context-hyperlink"; }