Fix logic of new InsetFlex::updateBuffer() routine from a9614f1.

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

diff --git a/src/insets/InsetBibtex.cpp b/src/insets/InsetBibtex.cpp
index ac21162b9b59c259d6b170fc8bf63e32fbb8d070..1abafd60b3189679a6c57d3a41ba4d47770d3406 100644 (file)
--- a/src/insets/InsetBibtex.cpp
+++ b/src/insets/InsetBibtex.cpp
@@ -23,7 +23,6 @@
 #include "Format.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "Language.h"
 #include "LaTeXFeatures.h"
 #include "output_xhtml.h"
 #include "OutputParams.h"
@@ -41,7 +40,7 @@
 #include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/os.h"
-#include "support/Path.h"
+#include "support/PathChanger.h"
 #include "support/textutils.h"
 
 #include <limits>
@@ -58,7 +57,7 @@ namespace os = support::os;
 InsetBibtex::InsetBibtex(Buffer * buf, InsetCommandParams const & p)
        : InsetCommand(buf, p)
 {
-       buffer().invalidateBibinfoCache();
+       buffer().invalidateBibfileCache();
        buffer().removeBiblioTempFiles();
 }
 
@@ -336,6 +335,9 @@ void InsetBibtex::latex(otexstream & os, OutputParams const & runparams) const
                        style = split(style, bibtotoc, ',');
        }
 
+       if (style == "default")
+               style = buffer().params().biblio_style;
+
        if (!style.empty()) {
                string base = normalizeName(buffer(), runparams, style, ".bst");
                FileName const try_in_file =
@@ -797,7 +799,7 @@ void InsetBibtex::parseBibTeXFiles() const
                                docstring key;
 
                                if (!readTypeOrKey(key, ifs, from_ascii(","), from_ascii("}"), keepCase)) {
-                                       lyxerr << "BibTeX Parser: Unable to read key for entry type:" << 
+                                       lyxerr << "BibTeX Parser: Unable to read key for entry type:" <<
                                                        entryType << "." << std::endl;
                                        continue;
                                }
@@ -878,7 +880,7 @@ FileName InsetBibtex::getBibTeXPath(docstring const & filename, Buffer const & b
                file = FileName(makeAbsPath(texfile, buf.filePath()));
        return file;
 }
- 
+
 
 bool InsetBibtex::addDatabase(docstring const & db)
 {
@@ -920,11 +922,51 @@ void InsetBibtex::validate(LaTeXFeatures & features) const
        // 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"
+               features.addCSSSnippet("div.bibtexentry { margin-left: 2em; text-indent: -2em; }\n"
                        "span.bibtexlabel:before{ content: \"[\"; }\n"
-                       "span.bibtexlabel:after{ content: \"] \"; }\n"
-                       "</style>");
+                       "span.bibtexlabel:after{ content: \"] \"; }");
+}
+
+
+int InsetBibtex::plaintext(odocstringstream & os,
+       OutputParams const & op, size_t max_length) const
+{
+       docstring const reflabel = buffer().B_("References");
+
+       // We could output more information here, e.g., what databases are included
+       // and information about options. But I don't necessarily see any reason to
+       // do this right now.
+       if (op.for_tooltip || op.for_toc || op.for_search) {
+               os << '[' << reflabel << ']' << '\n';
+               return PLAINTEXT_NEWLINE;
+       }
+
+       BiblioInfo bibinfo = buffer().masterBibInfo();
+       bibinfo.makeCitationLabels(buffer());
+       vector<docstring> const & cites = bibinfo.citedEntries();
+
+       size_t start_size = os.str().size();
+       docstring refoutput;
+       refoutput += reflabel + "\n\n";
+
+       // Now we loop over the entries
+       vector<docstring>::const_iterator vit = cites.begin();
+       vector<docstring>::const_iterator const ven = cites.end();
+       for (; vit != ven; ++vit) {
+               if (start_size + refoutput.size() >= max_length)
+                       break;
+               BiblioInfo::const_iterator const biit = bibinfo.find(*vit);
+               if (biit == bibinfo.end())
+                       continue;
+               BibTeXInfo const & entry = biit->second;
+               refoutput += "[" + entry.label() + "] ";
+               // 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.
+               refoutput += bibinfo.getInfo(entry.key(), buffer(), false) + "\n\n";
+       }
+       os << refoutput;
+       return refoutput.size();
 }
 
 
@@ -935,14 +977,8 @@ docstring InsetBibtex::xhtml(XHTMLStream & xs, OutputParams const &) const
 {
        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);
 
-       docstring reflabel = from_ascii("References");
-       Language const * l = buffer().params().language;
-       if (l)
-               reflabel = translateIfPossible(reflabel, l->code());
+       docstring const reflabel = buffer().B_("References");
 
        xs << html::StartTag("h2", "class='bibtex'")
                << reflabel
@@ -960,26 +996,11 @@ docstring InsetBibtex::xhtml(XHTMLStream & xs, OutputParams const &) const
                xs << html::StartTag("div", "class='bibtexentry'");
                // FIXME XHTML
                // The same name/id problem we have elsewhere.
-               string const attr = "id='" + to_utf8(entry.key()) + "'";
+               string const attr =
+                       "id='LyXCite-" + to_utf8(html::cleanAttr(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
+                       << entry.label()
                        << 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