LyXHTML linking from citation to bib entry for LyX 2.0 (fixes #8490).

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 {

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>";
 }
 

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).