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 146d67cc83cf8d67843e8fc6db2e7d264d8b3a18..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"
@@ -929,6 +928,54 @@ void InsetBibtex::validate(LaTeXFeatures & features) const
 }
 
 
+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();
+}
+
+
 // FIXME
 // docstring InsetBibtex::entriesAsXHTML(vector<docstring> const & entries)
 // And then here just: entriesAsXHTML(buffer().masterBibInfo().citedEntries())
@@ -939,10 +986,7 @@ docstring InsetBibtex::xhtml(XHTMLStream & xs, OutputParams const &) const
        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
@@ -960,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;
                }