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 8d7b33f7925156e14609eaf573505d25ff3c8e80..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();
 }
 
@@ -920,10 +919,10 @@ docstring InsetBibtex::xhtml(XHTMLStream & xs, OutputParams const &) const
        bool const numbers = 
                (engine == ENGINE_BASIC || engine == ENGINE_NATBIB_NUMERICAL);
 
-       xs << StartTag("h2", "class='bibtex'")
+       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();
@@ -933,11 +932,11 @@ 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);
+               xs << html::CompTag("a", attr);
                docstring citekey;
                if (numbers)
                        citekey = entry.citeNumber();
@@ -954,19 +953,19 @@ docstring InsetBibtex::xhtml(XHTMLStream & xs, OutputParams const &) const
                        if (citekey.empty())
                                citekey = entry.key();
                }
-               xs << StartTag("span", "class='bibtexlabel'")
+               xs << html::StartTag("span", "class='bibtexlabel'")
                        << citekey
-                       << EndTag("span");
+                       << 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();
 }