Math.lyx, Tutorial.lyx: fix some typos spotted by a user

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

diff --git a/src/insets/InsetBibtex.cpp b/src/insets/InsetBibtex.cpp
index 2544a493d39a686588557b44d291fae989c0d337..26f0de41f90b7920febfe564bf6821a982fb7cf4 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"
@@ -58,14 +57,17 @@ namespace os = support::os;
 InsetBibtex::InsetBibtex(Buffer * buf, InsetCommandParams const & p)
        : InsetCommand(buf, p)
 {
-       buffer().invalidateBibinfoCache();
+       buffer().invalidateBibfileCache();
+       buffer().removeBiblioTempFiles();
 }
 
 
 InsetBibtex::~InsetBibtex()
 {
-       if (isBufferLoaded())
+       if (isBufferLoaded()) {
                buffer().invalidateBibfileCache();
+               buffer().removeBiblioTempFiles();
+       }
 }
 
 
@@ -108,6 +110,7 @@ void InsetBibtex::doDispatch(Cursor & cur, FuncRequest & cmd)
                cur.recordUndo();
                setParams(p);
                buffer().invalidateBibfileCache();
+               buffer().removeBiblioTempFiles();
                cur.forceBufferUpdate();
                break;
        }
@@ -332,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 =
@@ -916,11 +922,57 @@ 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(odocstream & os, OutputParams const &) const
+{
+       BiblioInfo bibinfo = buffer().masterBibInfo();
+       bibinfo.makeCitationLabels(buffer());
+       vector<docstring> const & cites = bibinfo.citedEntries();
+       CiteEngineType const engine_type = buffer().params().citeEngineType();
+       bool const numbers = (engine_type == ENGINE_TYPE_NUMERICAL);
+
+       docstring refoutput;
+       docstring const reflabel = buffer().B_("References");
+
+       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) {
+               BiblioInfo::const_iterator const biit = bibinfo.find(*vit);
+               if (biit == bibinfo.end())
+                       continue;
+               BibTeXInfo const & entry = biit->second;
+               docstring citekey;
+               if (numbers)
+                       citekey = entry.citeNumber();
+               else {
+                       docstring const auth = entry.getAbbreviatedAuthor(buffer(), false);
+                       // 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, buffer(), true);
+                       if (!auth.empty() && !year.empty())
+                               citekey = auth + ' ' + year;
+               }
+               if (citekey.empty()) {
+                       citekey = entry.label();
+                       if (citekey.empty())
+                               citekey = entry.key();
+               }
+               refoutput += "[" + citekey + "] ";
+               // 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();
 }
 
 
@@ -931,14 +983,10 @@ 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);
+       CiteEngineType const engine_type = buffer().params().citeEngineType();
+       bool const numbers = (engine_type == ENGINE_TYPE_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
@@ -956,16 +1004,17 @@ 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();
+                       docstring const auth = entry.getAbbreviatedAuthor(buffer(), false);
                        // 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);
+                       docstring const year = bibinfo.getYear(*vit, buffer(), true);
                        if (!auth.empty() && !year.empty())
                                citekey = auth + ' ' + year;
                }