#include "FuncRequest.h"
#include "InsetIterator.h"
#include "InsetList.h"
+#include "Language.h"
#include "Lexer.h"
#include "output_xhtml.h"
#include "Paragraph.h"
#include "ParagraphList.h"
+#include "ParIterator.h"
#include "TextClass.h"
#include "frontends/alert.h"
docstring const key_prefix = from_ascii("key-");
-InsetBibitem::InsetBibitem(Buffer const & buf, InsetCommandParams const & p)
- : InsetCommand(p, "bibitem")
+InsetBibitem::InsetBibitem(Buffer * buf, InsetCommandParams const & p)
+ : InsetCommand(buf, p, "bibitem")
{
- Inset::setBuffer(const_cast<Buffer &>(buf));
buffer_->invalidateBibinfoCache();
if (getParam("key").empty())
setParam("key", key_prefix + convert<docstring>(++key_counter));
// Update the counters of this inset and of its contents
-void InsetBibitem::updateLabels(ParIterator const &)
+void InsetBibitem::updateLabels(ParIterator const & it, bool)
{
- Counters & counters = buffer().masterBuffer()->params().documentClass().counters();
+ BufferParams const & bp = buffer().masterBuffer()->params();
+ Counters & counters = bp.documentClass().counters();
docstring const bibitem = from_ascii("bibitem");
if (counters.hasCounter(bibitem) && getParam("label").empty()) {
counters.step(bibitem);
- autolabel_ = counters.theCounter(bibitem);
+ string const & lang = it.paragraph().getParLanguage(bp)->code();
+ autolabel_ = counters.theCounter(bibitem, lang);
} else {
autolabel_ = from_ascii("??");
}
}
-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='bibitemlabel'");
+ xs << bibLabel();
+ xs << EndTag("span");
return docstring();
}