How about if we write a script to do some of this and stop doing it

[lyx.git] / src / insets / InsetBibtex.cpp

diff --git a/src/insets/InsetBibtex.cpp b/src/insets/InsetBibtex.cpp
index bb15688869932f324a4aec65b281a2d055cfb7dc..a38f4a7bb4c6da5a465e2f977ff0e816522f1d90 100644 (file)
--- a/src/insets/InsetBibtex.cpp
+++ b/src/insets/InsetBibtex.cpp
@@ -51,10 +51,9 @@ namespace Alert = frontend::Alert;
 namespace os = support::os;
 
 
-InsetBibtex::InsetBibtex(Buffer const & buf, InsetCommandParams const & p)
-       : InsetCommand(p, "bibtex")
+InsetBibtex::InsetBibtex(Buffer * buf, InsetCommandParams const & p)
+       : InsetCommand(buf, p, "bibtex")
 {
-       Inset::setBuffer(const_cast<Buffer &>(buf));
        buffer_->invalidateBibinfoCache();
 }
 
@@ -899,6 +898,15 @@ void InsetBibtex::validate(LaTeXFeatures & features) const
 {
        if (features.bufferParams().use_bibtopic)
                features.require("bibtopic");
+       // FIXME XHTML
+       // It'd be better to be able to get this from an InsetLayout, but at present
+       // InsetLayouts do not seem really to work for things that aren't InsetTexts.
+       if (features.runparams().flavor == OutputParams::HTML)
+               features.addPreambleSnippet("<style type=\"text/css\">\n"
+                       "div.bibtexentry { margin-left: 2em; text-indent: -2em; }\n"
+                       "span.bibtexlabel:before{ content: \"[\"; }\n"
+                       "span.bibtexlabel:after{ content: \"] \"; }\n"
+                       "</style>");
 }
 
 
@@ -911,70 +919,73 @@ namespace {
 }
 
 
-int InsetBibtex::xhtml(odocstream & os, OutputParams const &) const
+docstring InsetBibtex::xhtml(XHTMLStream & xs, OutputParams const &) const
 {
        // We are going to collect all the citation keys used in the document,
        // getting them from the TOC.
        Toc const & toc = buffer().tocBackend().toc("citation");
        Toc::const_iterator it = toc.begin();
-       Toc::const_iterator en = toc.end();
+       Toc::const_iterator const en = toc.end();
        vector<docstring> citekeys;
        for (; it != en; ++it) {
                if (it->str().empty())
                        continue;
-               vector<docstring> keys = getVectorFromString(it->str());
-               vector<docstring>::const_iterator dit = keys.begin();
-               vector<docstring>::const_iterator den = keys.end();
-               for (; dit != den; ++dit)
-                       citekeys.push_back(*dit);
+               vector<docstring> const keys = getVectorFromString(it->str());
+               citekeys.insert(citekeys.end(), keys.begin(), keys.end());
        }
        if (citekeys.empty())
-               return 0;
+               return docstring();
        sort(citekeys.begin(), citekeys.end());
-       unique(citekeys.begin(), citekeys.end());
+       vector<docstring>::iterator uit = 
+               unique(citekeys.begin(), citekeys.end());
+       citekeys.erase(uit, citekeys.end());
        // We now have a sorted, unique list of the keys used in this document.
        // We will now convert it to a list of the BibTeXInfo objects used in 
        // this document...
-       // FIXME We need to do something here about cross-references, if we
-       // want to be able to display them AS cross-references. Probably the
-       // easiest thing to do is to loop over the list again and add whatever
-       // cross-references we find, then sort and unique it, planning just to
-       // add the cross-references to the bibliography.
        vector<BibTeXInfo const *> binfo;
        vector<docstring>::const_iterator cit = citekeys.begin();
-       vector<docstring>::const_iterator cen = citekeys.end();
+       vector<docstring>::const_iterator const cen = citekeys.end();
        BiblioInfo const & bi = buffer().masterBibInfo();
        for (; cit != cen; ++cit) {
-               BiblioInfo::const_iterator bt = bi.find(*cit);
-               if (bt == bi.end())
+               BiblioInfo::const_iterator const bt = bi.find(*cit);
+               if (bt == bi.end() || !bt->second.isBibTeX())
                        continue;
                binfo.push_back(&(bt->second));
        }
        // ...and sort it.
        sort(binfo.begin(), binfo.end(), lSorter);
        // Finally, then, we are ready for output.
-       os << "<h2 class='bibliography'>" << _("References") << "</h2>\n";
-       os << "<div class='bibliography'>\n";
-       vector<BibTeXInfo const *>::const_iterator vit = binfo.begin();
-       vector<BibTeXInfo const *>::const_iterator ven = binfo.end();
+       xs << StartTag("h2", "class='bibtex'")
+               << _("References")
+               << EndTag("h2")
+               << StartTag("div", "class='bibtex'");
+
        // Now we loop over the entries
+       vector<BibTeXInfo const *>::const_iterator vit = binfo.begin();
+       vector<BibTeXInfo const *>::const_iterator const ven = binfo.end();
        for (; vit != ven; ++vit) {
                BibTeXInfo const * bip = *vit;
-               os << "<p class='bibliography'>";
-               os << "<a name='" << html::htmlize(bip->key()) << "'></a>";
+               xs << StartTag("div", "class='bibtexentry'");
+               // FIXME XHTML
+               // The same name/id problem we have elsewhere.
+               string const attr = "id='" + to_utf8(bip->key()) + "'";
+               xs << CompTag("a", attr);
                docstring label = bip->label();
                if (label.empty())
                        label = bip->key();
-               os << "<span class='biblabel'>[" << label << "]</span> ";
+               xs << StartTag("span", "class='bibtexlabel'")
+                       << label 
+                       << EndTag("span");
                // FIXME Right now, we are calling BibInfo::getInfo on the key,
                // which will give us all the cross-referenced info. But for every
-               // entry.
-               os << "<span class='bibinfo'>" << bi.getInfo(bip->key()) << "</span>";
-               os << "</p>\n";
+               // entry, so there's a lot of repitition. This should be fixed.
+               xs << StartTag("span", "class='bibtexinfo'") 
+                       << bi.getInfo(bip->key())
+                       << EndTag("span")
+                       << EndTag("div");
        }
-               
-       os << "</div>\n";
-       return 0;
+       xs << EndTag("div");
+       return docstring();
 }