Restore XHTML output for InsetBibitem.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32257 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/insets/InsetBibitem.cpp b/src/insets/InsetBibitem.cpp
index 0de432b3775a8cb06f003b104ec563f1f835dbda..1e7d13972efc1e647230b383215ca8fdb3e35cfc 100644 (file)
--- a/src/insets/InsetBibitem.cpp
+++ b/src/insets/InsetBibitem.cpp
@@ -269,10 +269,19 @@ void InsetBibitem::updateLabels(ParIterator const & it)
 }
 
 
-docstring InsetBibitem::xhtml(odocstream & os, OutputParams const &) const
+docstring InsetBibitem::xhtml(XHTMLStream & xs, OutputParams const &) const
 {
-       os << "<a name='" << html::htmlize(getParam("key")) << "'></a>";
-       os << "<span class='biblabel'>" << bibLabel() << "</span> "; 
+       // FIXME XHTML
+       // XHTML 1.1 doesn't have the "name" attribute for <a>, so we have to use
+       // the "id" atttribute to get the document to validate. Probably, we will
+       // 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("key")) + "'";
+       xs << CompTag("a", attrs);
+       xs << StartTag("span", "class='biblabel'");
+       xs << bibLabel();
+       xs << EndTag("span");
        return docstring();
 }
 

diff --git a/src/insets/InsetBibitem.h b/src/insets/InsetBibitem.h
index cc00d48d0bd8e39858a5ff3529f48eacd9e5eb42..b69e85f6cdd1b847976db762b15ccbf3766bb450 100644 (file)
--- a/src/insets/InsetBibitem.h
+++ b/src/insets/InsetBibitem.h
@@ -61,7 +61,7 @@ private:
        ///
        int plaintext(odocstream &, OutputParams const &) const;
        ///
-       docstring xhtml(odocstream &, OutputParams const &) const;
+       docstring xhtml(XHTMLStream &, OutputParams const &) const;
        ///
        virtual void fillWithBibKeys(BiblioInfo &, InsetIterator const &) const;
        /// Update the counter of this inset