From: Richard Heck <rgheck@lyx.org>
Date: Sun, 13 May 2012 17:49:24 +0000 (-0400)
Subject: Fix bug #8156.
X-Git-Tag: 2.0.4~90
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=3192dc16a91d07d0b19cfd67fe1d66a6cb4f1ff8;p=features.git

Fix bug #8156.
We want the key as id, not the label (which is optional).
We also need a kind of namespace for the citation ids.
We should also clean the id tag before using it.

(cherry picked from commit 207d7e4ada31d521b75e9290575b97b6bb1e8c38)
---

diff --git a/src/insets/InsetBibitem.cpp b/src/insets/InsetBibitem.cpp
index d3a10ae63c..5fe5e10528 100644
--- a/src/insets/InsetBibitem.cpp
+++ b/src/insets/InsetBibitem.cpp
@@ -348,7 +348,7 @@ docstring InsetBibitem::xhtml(XHTMLStream & xs, OutputParams const &) const
 	// need to use "name" anyway, eventually, because some browsers do not
 	// handle jumping to ids. If we don't do that, though, we can just put the
 	// id into the span tag.
-	string const attrs = "id='" + to_utf8(getParam("label")) + "'";
+	string const attrs = "id='LyXCite-" + to_utf8(getParam("key")) + "'";
 	xs << html::CompTag("a", attrs);
 	xs << html::StartTag("span", "class='bibitemlabel'");
 	xs << bibLabel();
diff --git a/src/insets/InsetBibtex.cpp b/src/insets/InsetBibtex.cpp
index 294ea939ba..0e80857288 100644
--- a/src/insets/InsetBibtex.cpp
+++ b/src/insets/InsetBibtex.cpp
@@ -952,7 +952,7 @@ docstring InsetBibtex::xhtml(XHTMLStream & xs, OutputParams const &) const
 		xs << html::StartTag("div", "class='bibtexentry'");
 		// FIXME XHTML
 		// The same name/id problem we have elsewhere.
-		string const attr = "id='" + to_utf8(entry.key()) + "'";
+		string const attr = "id='LyXCite-" + to_utf8(entry.key()) + "'";
 		xs << html::CompTag("a", attr);
 		docstring citekey;
 		if (numbers)