Clean id attributes for citations before outputting them.

For some reason, this was done in trunk but never got to
branch.

diff --git a/src/insets/InsetBibtex.cpp b/src/insets/InsetBibtex.cpp
index bc853995a578c9d22e92899c303d45271da30f55..e2d059ec58fa1a4270b13e19bed485c5fb3c075b 100644 (file)
--- a/src/insets/InsetBibtex.cpp
+++ b/src/insets/InsetBibtex.cpp
@@ -956,7 +956,8 @@ 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='LyXCite-" + to_utf8(entry.key()) + "'";
+               string const attr = "id='LyXCite-" + 
+                               to_utf8(html::cleanAttr(entry.key())) + "'";
                xs << html::CompTag("a", attr);
                docstring citekey;
                if (numbers)

diff --git a/src/insets/InsetCitation.cpp b/src/insets/InsetCitation.cpp
index b01536365093e4d4f213f824fb3d7a2293321011..ec98cfb70a34b82cbbb04973bd52486d5f2b3280 100644 (file)
--- 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='#LyXCite-" + key + "'>" +
+       return "<a href='#LyXCite-" + html::cleanAttr(key) + "'>" +
                        html::htmlize(content, XHTMLStream::ESCAPE_ALL) + "</a>";
 }
 

diff --git a/status.20x b/status.20x
index 9050bc6106d919b9c5a0e2f2b482d2d2ee5714b6..8ce73a61926ec7160c8e25d144ec1eff1471d073 100644 (file)
--- a/status.20x
+++ b/status.20x
@@ -129,6 +129,9 @@ What's new
 
 - Fix problem with HTML output of simple formulas like "y[i]" (bug 8609).
 
+- Clean ids for citations before outputting them. Characters like ":" are
+  not allowed in HTML identifiers, apparently (bug 8606).
+
 
 * USER INTERFACE