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.

diff --git a/src/insets/InsetBibitem.cpp b/src/insets/InsetBibitem.cpp
index ac3c9149679b9073db7146afa1dfd2416e732c71..3b77c8e0a5938bd424f5562ec0e29f5ffdb3029f 100644 (file)
--- a/src/insets/InsetBibitem.cpp
+++ b/src/insets/InsetBibitem.cpp
@@ -351,7 +351,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 146d67cc83cf8d67843e8fc6db2e7d264d8b3a18..21e5f774adcd1eb013580b595e8152450ebf8652 100644 (file)
--- a/src/insets/InsetBibtex.cpp
+++ b/src/insets/InsetBibtex.cpp
@@ -960,7 +960,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)