X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetHyperlink.cpp;h=aae07ce0da8867a9c4b449508ed6ffb1f5eeeff9;hb=e5c79a43ee78192f45a9ab34873f8bb426b5f37e;hp=3160c0b0010945f6bc01387d754d3153747a8d5e;hpb=322808281ff449c542295c8e07d5b6c4c950b571;p=lyx.git diff --git a/src/insets/InsetHyperlink.cpp b/src/insets/InsetHyperlink.cpp index 3160c0b001..aae07ce0da 100644 --- a/src/insets/InsetHyperlink.cpp +++ b/src/insets/InsetHyperlink.cpp @@ -48,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_; } @@ -75,6 +77,7 @@ docstring InsetHyperlink::screenLabel() const return temp + url; } + void InsetHyperlink::doDispatch(Cursor & cur, FuncRequest & cmd) { switch (cmd.action()) { @@ -108,8 +111,8 @@ void InsetHyperlink::viewTarget() const { if (getParam("type") == "file:") { FileName url = makeAbsPath(to_utf8(getParam("target")), buffer().filePath()); - string const format = formats.getFormatFromFile(url); - formats.view(buffer(), url, format); + string const format = theFormats().getFormatFromFile(url); + theFormats().view(buffer(), url, format); } } @@ -119,23 +122,20 @@ void InsetHyperlink::latex(otexstream & os, { 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 - // 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) { @@ -147,12 +147,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, 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"); @@ -163,47 +164,20 @@ void InsetHyperlink::latex(otexstream & 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); - pair 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)); + 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"; @@ -242,7 +216,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 + "\"")); @@ -287,6 +261,7 @@ docstring InsetHyperlink::toolTip(BufferView const & /*bv*/, int /*x*/, int /*y* void InsetHyperlink::validate(LaTeXFeatures & features) const { features.require("hyperref"); + InsetCommand::validate(features); }