Pure HTML output for math macros.

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

diff --git a/src/insets/InsetBibtex.cpp b/src/insets/InsetBibtex.cpp
index 2c426c72f4e7f6ff74c8ac960dc3b13498a586ce..dff066f12c69a0551ac05ae433005286d8fb5cab 100644 (file)
--- a/src/insets/InsetBibtex.cpp
+++ b/src/insets/InsetBibtex.cpp
@@ -21,7 +21,6 @@
 #include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "LaTeXFeatures.h"
-#include "MetricsInfo.h"
 #include "output_xhtml.h"
 #include "OutputParams.h"
 #include "TextClass.h"
@@ -59,7 +58,7 @@ InsetBibtex::InsetBibtex(Buffer * buf, InsetCommandParams const & p)
 
 InsetBibtex::~InsetBibtex()
 {
-       if (isBufferValid())
+       if (isBufferLoaded())
                buffer_->invalidateBibinfoCache();
 }
 
@@ -909,14 +908,21 @@ void InsetBibtex::validate(LaTeXFeatures & features) const
 }
 
 
+// FIXME 
+// docstring InsetBibtex::entriesAsXHTML(vector<docstring> const & entries)
+// And then here just: entriesAsXHTML(buffer().masterBibInfo().citedEntries())
 docstring InsetBibtex::xhtml(XHTMLStream & xs, OutputParams const &) const
 {
        BiblioInfo const & bibinfo = buffer().masterBibInfo();
        vector<docstring> const & cites = bibinfo.citedEntries();
-       xs << StartTag("h2", "class='bibtex'")
+       CiteEngine const engine = buffer().params().citeEngine();
+       bool const numbers = 
+               (engine == ENGINE_BASIC || engine == ENGINE_NATBIB_NUMERICAL);
+
+       xs << html::StartTag("h2", "class='bibtex'")
                << _("References")
-               << EndTag("h2")
-               << StartTag("div", "class='bibtex'");
+               << html::EndTag("h2")
+               << html::StartTag("div", "class='bibtex'");
 
        // Now we loop over the entries
        vector<docstring>::const_iterator vit = cites.begin();
@@ -926,26 +932,40 @@ docstring InsetBibtex::xhtml(XHTMLStream & xs, OutputParams const &) const
                if (biit == bibinfo.end())
                        continue;
                BibTeXInfo const & entry = biit->second;
-               xs << StartTag("div", "class='bibtexentry'");
+               xs << html::StartTag("div", "class='bibtexentry'");
                // FIXME XHTML
                // The same name/id problem we have elsewhere.
                string const attr = "id='" + to_utf8(entry.key()) + "'";
-               xs << CompTag("a", attr);
-               docstring label = entry.label();
-               if (label.empty())
-                       label = entry.key();
-               xs << StartTag("span", "class='bibtexlabel'")
-                       << label 
-                       << EndTag("span");
+               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='bibtexinfo'") 
-                       << bibinfo.getInfo(entry.key())
-                       << EndTag("span")
-                       << 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();
 }