anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-23 18:24:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

InsetHyperlink.cpp: fix bug 449: handle special characters in the url and name field

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20963 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2007-10-14 03:10:51 +00:00
parent 366b902cdc
commit c841ecd61b
1 changed files with 59 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/insets/InsetHyperlink.cpp
View File

@ -3,7 +3,7 @@
* This file is part of LyX, the document processor. * This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING. * Licence details can be found in the file COPYING.
* *
* \author José Matos * \authors José Matos, Uwe Stöhr
* *
* Full author contact details are available in file CREDITS. * Full author contact details are available in file CREDITS.
*/ */
@ -29,6 +29,13 @@ using support::subst;
using std::string; using std::string;
using std::ostream; using std::ostream;
using std::find;
using std::replace;
static char const * const chars_url[2] = {"%", "#"};
static char const * const chars_name[6] = {
"&", "_", "$", "%", "#", "^"};
InsetHyperlink::InsetHyperlink(InsetCommandParams const & p) InsetHyperlink::InsetHyperlink(InsetCommandParams const & p)
@ -58,14 +65,61 @@ docstring const InsetHyperlink::getScreenLabel(Buffer const &) const
int InsetHyperlink::latex(Buffer const &, odocstream & os, int InsetHyperlink::latex(Buffer const &, odocstream & os,
OutputParams const & runparams) const OutputParams const & runparams) const
{ {
docstring const & name = getParam("name"); string url = to_utf8(getParam("target"));
string backslash = "\\";
string braces = "{}";
// The characters in chars_url[] need to be changed to a command when
// they are in the url field.
if (!url.empty()) {
// the chars_url[] characters must be handled for both, url and href
for (int k = 0; k < 2; k++) {
for (int i = 0, pos;
(pos = url.find(chars_url[k], i)) != string::npos;
i = pos + 2) {
url.replace(pos,1,backslash + chars_url[k]);
}
}
} // end if (!url.empty())
string name = to_utf8(getParam("name"));
// 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
for (int i = 0, pos;
(pos = name.find("\\", i)) != string::npos;
i = pos + 2) {
if (name[pos+1] != '\\')
name.replace(pos,1,"\\textbackslash{}");
}
for (int k = 0; k < 6; k++) {
for (int i = 0, pos;
(pos = name.find(chars_name[k], i)) != string::npos;
i = pos + 2) {
name.replace(pos,1,backslash + chars_name[k] + braces);
}
}
// replace the tilde by the \sim character as suggested in the LaTeX FAQ
// for URLs
for (int 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) if (runparams.moving_arg)
os << "\\protect"; os << "\\protect";
//set the target for the name when no name is given //set the target for the name when no name is given
if (!getParam("name").empty()) if (!name.empty())
os << "\\href{" << getParam("target") << "}{" << getParam("name") << '}'; os << "\\href{" << from_utf8(url) << "}{" << from_utf8(name) << '}';
else else
os << "\\href{" << getParam("target") << "}{" << getParam("target") << '}'; os << "\\href{" << from_utf8(url) << "}{" << from_utf8(url) << '}';
return 0; return 0;
} }