]> git.lyx.org Git - lyx.git/blobdiff - src/insets/InsetBibtex.cpp
Pure HTML output for math macros.
[lyx.git] / src / insets / InsetBibtex.cpp
index 459098486fe14a11dead803ef33a2a4f50973cda..dff066f12c69a0551ac05ae433005286d8fb5cab 100644 (file)
 #include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "LaTeXFeatures.h"
-#include "MetricsInfo.h"
 #include "output_xhtml.h"
 #include "OutputParams.h"
 #include "TextClass.h"
-#include "TocBackend.h"
 
 #include "frontends/alert.h"
 
@@ -60,7 +58,7 @@ InsetBibtex::InsetBibtex(Buffer * buf, InsetCommandParams const & p)
 
 InsetBibtex::~InsetBibtex()
 {
-       if (isBufferValid())
+       if (isBufferLoaded())
                buffer_->invalidateBibinfoCache();
 }
 
@@ -898,84 +896,76 @@ 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>");
 }
 
 
-namespace {
-       // used in xhtml to sort a list of BibTeXInfo objects
-       bool lSorter(BibTeXInfo const * lhs, BibTeXInfo const * rhs)
-       {
-               return lhs->getAbbreviatedAuthor() < rhs->getAbbreviatedAuthor();
-       }
-}
-
-
+// FIXME 
+// docstring InsetBibtex::entriesAsXHTML(vector<docstring> const & entries)
+// And then here just: entriesAsXHTML(buffer().masterBibInfo().citedEntries())
 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 const en = toc.end();
-       vector<docstring> citekeys;
-       for (; it != en; ++it) {
-               if (it->str().empty())
-                       continue;
-               vector<docstring> const keys = getVectorFromString(it->str());
-               citekeys.insert(citekeys.end(), keys.begin(), keys.end());
-       }
-       if (citekeys.empty())
-               return docstring();
-       sort(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...
-       vector<BibTeXInfo const *> binfo;
-       vector<docstring>::const_iterator cit = citekeys.begin();
-       vector<docstring>::const_iterator const cen = citekeys.end();
-       BiblioInfo const & bi = buffer().masterBibInfo();
-       for (; cit != cen; ++cit) {
-               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.
-       xs << StartTag("h2", "class='bibliography'");
-       xs << _("References");
-       xs << EndTag("h2");
-       xs << StartTag("div", "class='bibliography'");
+       BiblioInfo const & bibinfo = buffer().masterBibInfo();
+       vector<docstring> const & cites = bibinfo.citedEntries();
+       CiteEngine const engine = buffer().params().citeEngine();
+       bool const numbers = 
+               (engine == ENGINE_BASIC || engine == ENGINE_NATBIB_NUMERICAL);
+
+       xs << html::StartTag("h2", "class='bibtex'")
+               << _("References")
+               << html::EndTag("h2")
+               << html::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();
+       vector<docstring>::const_iterator vit = cites.begin();
+       vector<docstring>::const_iterator const ven = cites.end();
        for (; vit != ven; ++vit) {
-               BibTeXInfo const * bip = *vit;
-               xs << StartTag("div", "class='bibentry'");
+               BiblioInfo::const_iterator const biit = bibinfo.find(*vit);
+               if (biit == bibinfo.end())
+                       continue;
+               BibTeXInfo const & entry = biit->second;
+               xs << html::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();
-               xs << StartTag("span", "class='biblabel'");
-               xs << "[" << label << "] ";
-               xs << EndTag("span");
+               string const attr = "id='" + to_utf8(entry.key()) + "'";
+               xs << html::CompTag("a", attr);
+               docstring citekey;
+               if (numbers)
+                       citekey = entry.citeNumber();
+               else {
+                       docstring const auth = entry.getAbbreviatedAuthor();
+                       // we do it this way so as to access the xref, if necessary
+                       // note that this also gives us the modifier
+                       docstring const year = bibinfo.getYear(*vit, true);
+                       if (!auth.empty() && !year.empty())
+                               citekey = auth + ' ' + year;
+               }
+               if (citekey.empty()) {
+                       citekey = entry.label();
+                       if (citekey.empty())
+                               citekey = entry.key();
+               }
+               xs << html::StartTag("span", "class='bibtexlabel'")
+                       << citekey
+                       << html::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, so there's a lot of repitition. This should be fixed.
-               xs << StartTag("span", "class='bibinfo'");
-               xs << bi.getInfo(bip->key());
-               xs << EndTag("span");
-               xs << EndTag("div");
+               xs << html::StartTag("span", "class='bibtexinfo'") 
+                       << bibinfo.getInfo(entry.key(), buffer(), true)
+                       << html::EndTag("span")
+                       << html::EndTag("div");
+               xs.cr();
        }
-       xs << EndTag("div");
+       xs << html::EndTag("div");
        return docstring();
 }