The branch, 2.0.x, has been updated. - Log -----------------------------------------------------------------
commit fa4b2b1ed12c5e695361aff4932cf1b9dd283674 Author: Julien Rioux <[email protected]> Date: Thu Jan 10 15:29:30 2013 +0100 LyXHTML linking from citation to bib entry for LyX 2.0 (fixes #8490). diff --git a/src/BiblioInfo.cpp b/src/BiblioInfo.cpp index d01cc32..1d76f95 100644 --- a/src/BiblioInfo.cpp +++ b/src/BiblioInfo.cpp @@ -454,10 +454,10 @@ docstring BibTeXInfo::expandFormat(string const & format, ret += trans; } else { docstring const val = getValueForKey(key, xref); - if (richtext) + if (richtext && !scanning_rich) ret += from_ascii("<span class=\"bib-" + key + "\">"); ret += val; - if (richtext) + if (richtext && !scanning_rich) ret += from_ascii("</span>"); } } else { diff --git a/src/insets/InsetCitation.cpp b/src/insets/InsetCitation.cpp index 11362af..b015363 100644 --- a/src/insets/InsetCitation.cpp +++ b/src/insets/InsetCitation.cpp @@ -228,7 +228,7 @@ inline docstring wrapCitation(docstring const & key, return content; // we have to do the escaping here, because we will ultimately // write this as a raw string, so as not to escape the tags. - return "<a href='#" + key + "'>" + + return "<a href='#LyXCite-" + key + "'>" + html::htmlize(content, XHTMLStream::ESCAPE_ALL) + "</a>"; } diff --git a/status.20x b/status.20x index 902a427..07b42a7 100644 --- a/status.20x +++ b/status.20x @@ -94,6 +94,8 @@ What's new - Fix the output of LyXHTML bibliography with richtext (bug 8486). +- Fix linking from citation to bibliography in LyXHTML output (bug 8490). + - Use document language when exporting citations to LyXHTML (bug 7732). - Reordering citations in LyX is now rendered in the output (bug 6955). ----------------------------------------------------------------------- Summary of changes: src/BiblioInfo.cpp | 4 ++-- src/insets/InsetCitation.cpp | 2 +- status.20x | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) hooks/post-receive -- The LyX Source Repository
