]> git.lyx.org Git - lyx.git/blobdiff - src/insets/InsetBibtex.cpp
Whitespace
[lyx.git] / src / insets / InsetBibtex.cpp
index 200a3c5841ee2ccdaeb721690c51cd6c08bb8ef7..c925bfe3cc9bd3c30c1366c4327a7cbf4837bc2d 100644 (file)
 
 #include "InsetBibtex.h"
 
+#include "BiblioInfo.h"
 #include "Buffer.h"
 #include "BufferParams.h"
+#include "Cursor.h"
 #include "DispatchResult.h"
 #include "Encoding.h"
+#include "Exporter.h"
+#include "Format.h"
 #include "FuncRequest.h"
+#include "FuncStatus.h"
 #include "LaTeXFeatures.h"
-#include "MetricsInfo.h"
+#include "output_xhtml.h"
 #include "OutputParams.h"
+#include "PDFOptions.h"
 #include "TextClass.h"
 
 #include "frontends/alert.h"
 
+#include "support/convert.h"
 #include "support/debug.h"
 #include "support/docstream.h"
 #include "support/ExceptionMessage.h"
+#include "support/FileNameList.h"
 #include "support/filetools.h"
 #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>
@@ -46,9 +54,21 @@ namespace Alert = frontend::Alert;
 namespace os = support::os;
 
 
-InsetBibtex::InsetBibtex(InsetCommandParams const & p)
-       : InsetCommand(p, "bibtex")
-{}
+InsetBibtex::InsetBibtex(Buffer * buf, InsetCommandParams const & p)
+       : InsetCommand(buf, p)
+{
+       buffer().invalidateBibfileCache();
+       buffer().removeBiblioTempFiles();
+}
+
+
+InsetBibtex::~InsetBibtex()
+{
+       if (isBufferLoaded()) {
+               buffer().invalidateBibfileCache();
+               buffer().removeBiblioTempFiles();
+       }
+}
 
 
 ParamInfo const & InsetBibtex::findInfo(string const & /* cmdName */)
@@ -65,27 +85,33 @@ ParamInfo const & InsetBibtex::findInfo(string const & /* cmdName */)
 
 void InsetBibtex::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
-       switch (cmd.action) {
+       switch (cmd.action()) {
+
+       case LFUN_INSET_EDIT:
+               editDatabases();
+               break;
 
        case LFUN_INSET_MODIFY: {
                InsetCommandParams p(BIBTEX_CODE);
                try {
-                       if (!InsetCommand::string2params("bibtex", 
-                                       to_utf8(cmd.argument()), p)) {
-                               cur.noUpdate();
+                       if (!InsetCommand::string2params(to_utf8(cmd.argument()), p)) {
+                               cur.noScreenUpdate();
                                break;
                        }
                } catch (ExceptionMessage const & message) {
                        if (message.type_ == WarningException) {
                                Alert::warning(message.title_, message.details_);
-                               cur.noUpdate();
-                       } else 
+                               cur.noScreenUpdate();
+                       } else
                                throw message;
                        break;
                }
-               //
+
+               cur.recordUndo();
                setParams(p);
-               buffer().updateBibfilesCache();
+               buffer().invalidateBibfileCache();
+               buffer().removeBiblioTempFiles();
+               cur.forceBufferUpdate();
                break;
        }
 
@@ -96,6 +122,49 @@ void InsetBibtex::doDispatch(Cursor & cur, FuncRequest & cmd)
 }
 
 
+bool InsetBibtex::getStatus(Cursor & cur, FuncRequest const & cmd,
+               FuncStatus & flag) const
+{
+       switch (cmd.action()) {
+       case LFUN_INSET_EDIT:
+               flag.setEnabled(true);
+               return true;
+
+       default:
+               return InsetCommand::getStatus(cur, cmd, flag);
+       }
+}
+
+
+void InsetBibtex::editDatabases() const
+{
+       vector<docstring> bibfilelist = getVectorFromString(getParam("bibfiles"));
+
+       if (bibfilelist.empty())
+               return;
+
+       int nr_databases = bibfilelist.size();
+       if (nr_databases > 1) {
+                       docstring message = bformat(_("The BibTeX inset includes %1$s databases.\n"
+                                                      "If you proceed, all of them will be opened."),
+                                                       convert<docstring>(nr_databases));
+                       int const ret = Alert::prompt(_("Open Databases?"),
+                               message, 0, 1, _("&Cancel"), _("&Proceed"));
+
+                       if (ret == 0)
+                               return;
+       }
+
+       vector<docstring>::const_iterator it = bibfilelist.begin();
+       vector<docstring>::const_iterator en = bibfilelist.end();
+       for (; it != en; ++it) {
+               FileName const bibfile = getBibTeXPath(*it, buffer());
+               formats.edit(buffer(), bibfile,
+                    formats.getFormatFromFile(bibfile));
+       }
+}
+
+
 docstring InsetBibtex::screenLabel() const
 {
        return _("BibTeX Generated Bibliography");
@@ -105,7 +174,7 @@ docstring InsetBibtex::screenLabel() const
 docstring InsetBibtex::toolTip(BufferView const & /*bv*/, int /*x*/, int /*y*/) const
 {
        docstring item = from_ascii("* ");
-       docstring tip = _("Databases:\n");
+       docstring tip = _("Databases:") + "\n";
        vector<docstring> bibfilelist = getVectorFromString(getParam("bibfiles"));
 
        if (bibfilelist.empty()) {
@@ -121,20 +190,36 @@ docstring InsetBibtex::toolTip(BufferView const & /*bv*/, int /*x*/, int /*y*/)
        }
 
        // Style-Options
+       bool toc = false;
        docstring style = getParam("options"); // maybe empty! and with bibtotoc
        docstring bibtotoc = from_ascii("bibtotoc");
        if (prefixIs(style, bibtotoc)) {
+               toc = true;
                if (contains(style, char_type(',')))
                        style = split(style, bibtotoc, char_type(','));
        }
 
-       tip += _("Style File:\n");
+       tip += _("Style File:") +"\n";
        tip += item;
        if (!style.empty())
                tip += style;
        else
                tip += _("none");
 
+       tip += "\n" + _("Lists:") + " ";
+       docstring btprint = getParam("btprint");
+               if (btprint == "btPrintAll")
+                       tip += _("all references");
+               else if (btprint == "btPrintNotCited")
+                       tip += _("all uncited references");
+               else
+                       tip += _("all cited references");
+
+       if (toc) {
+               tip += ", ";
+               tip += _("included in TOC");
+       }
+
        return tip;
 }
 
@@ -142,8 +227,8 @@ docstring InsetBibtex::toolTip(BufferView const & /*bv*/, int /*x*/, int /*y*/)
 static string normalizeName(Buffer const & buffer,
        OutputParams const & runparams, string const & name, string const & ext)
 {
-       string const fname = makeAbsPath(name, buffer.filePath()).absFilename();
-       if (FileName(name).isAbsolute() || !FileName(fname + ext).isReadableFile())
+       string const fname = makeAbsPath(name, buffer.filePath()).absFileName();
+       if (FileName::isAbsolute(name) || !FileName(fname + ext).isReadableFile())
                return name;
        if (!runparams.nice)
                return fname;
@@ -154,7 +239,7 @@ static string normalizeName(Buffer const & buffer,
 }
 
 
-int InsetBibtex::latex(odocstream & os, OutputParams const & runparams) const
+void InsetBibtex::latex(otexstream & os, OutputParams const & runparams) const
 {
        // the sequence of the commands:
        // 1. \bibliographystyle{style}
@@ -182,6 +267,9 @@ int InsetBibtex::latex(odocstream & os, OutputParams const & runparams) const
        odocstringstream dbs;
        bool didone = false;
 
+       // determine the export format
+       string const tex_format = flavor2format(runparams.flavor);
+
        for (; it != en; ++it) {
                string utf8input = to_utf8(*it);
                string database =
@@ -192,30 +280,37 @@ int InsetBibtex::latex(odocstream & os, OutputParams const & runparams) const
 
                if (!runparams.inComment && !runparams.dryrun && !runparams.nice &&
                    not_from_texmf) {
-
-                       // mangledFilename() needs the extension
+                       // mangledFileName() needs the extension
                        DocFileName const in_file = DocFileName(try_in_file);
-                       database = removeExtension(in_file.mangledFilename());
+                       database = removeExtension(in_file.mangledFileName());
                        FileName const out_file = makeAbsPath(database + ".bib",
                                        buffer().masterBuffer()->temppath());
-
                        bool const success = in_file.copyTo(out_file);
                        if (!success) {
                                lyxerr << "Failed to copy '" << in_file
                                       << "' to '" << out_file << "'"
                                       << endl;
                        }
-               } else if (!runparams.inComment && runparams.nice && not_from_texmf &&
-                          !isValidLaTeXFilename(database)) {
+               } else if (!runparams.inComment && runparams.nice && not_from_texmf) {
+                       runparams.exportdata->addExternalFile(tex_format, try_in_file, database + ".bib");
+                       if (!isValidLaTeXFileName(database)) {
                                frontend::Alert::warning(_("Invalid filename"),
-                                                        _("The following filename is likely to cause trouble "
-                                                          "when running the exported file through LaTeX: ") +
-                                                           from_utf8(database));
+                                        _("The following filename will cause troubles "
+                                              "when running the exported file through LaTeX: ") +
+                                            from_utf8(database));
+                       }
+                       if (!isValidDVIFileName(database)) {
+                               frontend::Alert::warning(_("Problematic filename for DVI"),
+                                        _("The following filename can cause troubles "
+                                              "when running the exported file through LaTeX "
+                                                  "and opening the resulting DVI: ") +
+                                            from_utf8(database), true);
+                       }
                }
 
                if (didone)
                        dbs << ',';
-               else 
+               else
                        didone = true;
                // FIXME UNICODE
                dbs << from_utf8(latex_path(database));
@@ -227,7 +322,6 @@ int InsetBibtex::latex(odocstream & os, OutputParams const & runparams) const
        if (!warned_about_spaces &&
            runparams.nice && db_out.find(' ') != docstring::npos) {
                warned_about_spaces = true;
-
                Alert::warning(_("Export Warning!"),
                               _("There are spaces in the paths to your BibTeX databases.\n"
                                              "BibTeX will be unable to find them."));
@@ -241,13 +335,12 @@ int InsetBibtex::latex(odocstream & os, OutputParams const & runparams) const
                        style = split(style, bibtotoc, ',');
        }
 
+       if (style == "default")
+               style = buffer().params().biblio_style;
 
-       // line count
-       int nlines = 0;
-
-       if (!style.empty()) {
+       if (!style.empty() && !buffer().params().use_bibtopic) {
                string base = normalizeName(buffer(), runparams, style, ".bst");
-               FileName const try_in_file = 
+               FileName const try_in_file =
                        makeAbsPath(base + ".bst", buffer().filePath());
                bool const not_from_texmf = try_in_file.isReadableFile();
                // If this style does not come from texmf and we are not
@@ -258,7 +351,7 @@ int InsetBibtex::latex(odocstream & os, OutputParams const & runparams) const
                    not_from_texmf) {
                        // use new style name
                        DocFileName const in_file = DocFileName(try_in_file);
-                       base = removeExtension(in_file.mangledFilename());
+                       base = removeExtension(in_file.mangledFileName());
                        FileName const out_file = makeAbsPath(base + ".bst",
                                        buffer().masterBuffer()->temppath());
                        bool const success = in_file.copyTo(out_file);
@@ -272,7 +365,6 @@ int InsetBibtex::latex(odocstream & os, OutputParams const & runparams) const
                os << "\\bibliographystyle{"
                   << from_utf8(latex_path(normalizeName(buffer(), runparams, base, ".bst")))
                   << "}\n";
-               nlines += 1;
        }
 
        // Post this warning only once.
@@ -285,28 +377,26 @@ int InsetBibtex::latex(odocstream & os, OutputParams const & runparams) const
        }
 
        if (!db_out.empty() && buffer().params().use_bibtopic) {
-               os << "\\begin{btSect}{" << db_out << "}\n";
+               os << "\\begin{btSect}";
+               if (!style.empty())
+                       os << "[" << style << "]";
+               os << "{" << db_out << "}\n";
                docstring btprint = getParam("btprint");
                if (btprint.empty())
                        // default
                        btprint = from_ascii("btPrintCited");
                os << "\\" << btprint << "\n"
                   << "\\end{btSect}\n";
-               nlines += 3;
        }
 
        // bibtotoc-Option
        if (!bibtotoc.empty() && !buffer().params().use_bibtopic) {
-               if (buffer().params().documentClass().hasLaTeXLayout("chapter")) {
-                       if (buffer().params().sides == OneSide) {
-                               // oneside
-                               os << "\\clearpage";
-                       } else {
-                               // twoside
-                               os << "\\cleardoublepage";
-                       }
+               // set label for hyperref, see http://www.lyx.org/trac/ticket/6470
+               if (buffer().params().pdfoptions().use_hyperref)
+                               os << "\\phantomsection";
+               if (buffer().params().documentClass().hasLaTeXLayout("chapter"))
                        os << "\\addcontentsline{toc}{chapter}{\\bibname}";
-               else if (buffer().params().documentClass().hasLaTeXLayout("section"))
+               else if (buffer().params().documentClass().hasLaTeXLayout("section"))
                        os << "\\addcontentsline{toc}{section}{\\refname}";
        }
 
@@ -314,13 +404,9 @@ int InsetBibtex::latex(odocstream & os, OutputParams const & runparams) const
                docstring btprint = getParam("btprint");
                if (btprint == "btPrintAll") {
                        os << "\\nocite{*}\n";
-                       nlines += 1;
                }
                os << "\\bibliography{" << db_out << "}\n";
-               nlines += 1;
        }
-
-       return nlines;
 }
 
 
@@ -328,21 +414,21 @@ support::FileNameList InsetBibtex::getBibFiles() const
 {
        FileName path(buffer().filePath());
        support::PathChanger p(path);
-       
+
        support::FileNameList vec;
-       
+
        vector<docstring> bibfilelist = getVectorFromString(getParam("bibfiles"));
        vector<docstring>::const_iterator it = bibfilelist.begin();
        vector<docstring>::const_iterator en = bibfilelist.end();
        for (; it != en; ++it) {
-               FileName const file = 
-                       findtexfile(changeExtension(to_utf8(*it), "bib"), "bib");
-               
-               // If we didn't find a matching file name just fail silently
+               FileName const file = getBibTeXPath(*it, buffer());
+
                if (!file.empty())
                        vec.push_back(file);
+               else
+                       LYXERR0("Couldn't find " + to_utf8(*it) + " in InsetBibtex::getBibFiles()!");
        }
-       
+
        return vec;
 
 }
@@ -357,7 +443,7 @@ namespace {
        /// and further whitespace characters from the stream.
        /// @return true if a comma was found, false otherwise
        ///
-       bool removeWSAndComma(idocfstream & ifs) {
+       bool removeWSAndComma(ifdocstream & ifs) {
                char_type ch;
 
                if (!ifs)
@@ -400,8 +486,8 @@ namespace {
        ///
        /// @return true if a string of length > 0 could be read.
        ///
-       bool readTypeOrKey(docstring & val, idocfstream & ifs,
-               docstring const & delimChars, docstring const &illegalChars, 
+       bool readTypeOrKey(docstring & val, ifdocstream & ifs,
+               docstring const & delimChars, docstring const & illegalChars,
                charCase chCase) {
 
                char_type ch;
@@ -421,10 +507,10 @@ namespace {
 
                // read value
                bool legalChar = true;
-               while (ifs && !isSpace(ch) && 
+               while (ifs && !isSpace(ch) &&
                                                 delimChars.find(ch) == docstring::npos &&
                                                 (legalChar = (illegalChars.find(ch) == docstring::npos))
-                                       ) 
+                                       )
                {
                        if (chCase == makeLowerCase)
                                val += lowercase(ch);
@@ -432,7 +518,7 @@ namespace {
                                val += ch;
                        ifs.get(ch);
                }
-               
+
                if (!legalChar) {
                        ifs.putback(ch);
                        return false;
@@ -455,7 +541,7 @@ namespace {
        /// the variable strings.
        /// @return true if reading was successfull (all single parts were delimited
        /// correctly)
-       bool readValue(docstring & val, idocfstream & ifs, const VarMap & strings) {
+       bool readValue(docstring & val, ifdocstream & ifs, const VarMap & strings) {
 
                char_type ch;
 
@@ -474,13 +560,13 @@ namespace {
                                return false;
 
                        // check for field type
-                       if (isDigit(ch)) {
+                       if (isDigitASCII(ch)) {
 
                                // read integer value
                                do {
                                        val += ch;
                                        ifs.get(ch);
-                               } while (ifs && isDigit(ch));
+                               } while (ifs && isDigitASCII(ch));
 
                                if (!ifs)
                                        return false;
@@ -489,37 +575,37 @@ namespace {
                                // set end delimiter
                                char_type delim = ch == '"' ? '"': '}';
 
-                               //Skip whitespace
+                               // Skip whitespace
                                do {
                                        ifs.get(ch);
                                } while (ifs && isSpace(ch));
-                               
+
                                if (!ifs)
                                        return false;
-                               
-                               //We now have the first non-whitespace character
-                               //We'll collapse adjacent whitespace.
+
+                               // We now have the first non-whitespace character
+                               // We'll collapse adjacent whitespace.
                                bool lastWasWhiteSpace = false;
-                               
+
                                // inside this delimited text braces must match.
                                // Thus we can have a closing delimiter only
                                // when nestLevel == 0
                                int nestLevel = 0;
+
                                while (ifs && (nestLevel > 0 || ch != delim)) {
                                        if (isSpace(ch)) {
                                                lastWasWhiteSpace = true;
                                                ifs.get(ch);
                                                continue;
                                        }
-                                       //We output the space only after we stop getting 
-                                       //whitespace so as not to output any whitespace
-                                       //at the end of the value.
+                                       // We output the space only after we stop getting
+                                       // whitespace so as not to output any whitespace
+                                       // at the end of the value.
                                        if (lastWasWhiteSpace) {
                                                lastWasWhiteSpace = false;
                                                val += ' ';
                                        }
-                                       
+
                                        val += ch;
 
                                        // update nesting level
@@ -529,16 +615,19 @@ namespace {
                                                        break;
                                                case '}':
                                                        --nestLevel;
-                                                       if (nestLevel < 0) return false;
+                                                       if (nestLevel < 0)
+                                                               return false;
                                                        break;
                                        }
 
-                                       ifs.get(ch);
+                                       if (ifs)
+                                               ifs.get(ch);
                                }
 
                                if (!ifs)
                                        return false;
 
+                               // FIXME Why is this here?
                                ifs.get(ch);
 
                                if (!ifs)
@@ -585,9 +674,13 @@ namespace {
 }
 
 
-// This method returns a comma separated list of Bibtex entries
-void InsetBibtex::fillWithBibKeys(BiblioInfo & keylist,
-       InsetIterator const & /*di*/) const
+void InsetBibtex::collectBibKeys(InsetIterator const & /*di*/) const
+{
+       parseBibTeXFiles();
+}
+
+
+void InsetBibtex::parseBibTeXFiles() const
 {
        // This bibtex parser is a first step to parse bibtex files
        // more precisely.
@@ -607,11 +700,14 @@ void InsetBibtex::fillWithBibKeys(BiblioInfo & keylist,
        // We don't restrict keys to ASCII in LyX, since our own
        // InsetBibitem can generate non-ASCII keys, and nonstandard
        // 8bit clean bibtex forks exist.
+
+       BiblioInfo keylist;
+
        support::FileNameList const files = getBibFiles();
        support::FileNameList::const_iterator it = files.begin();
        support::FileNameList::const_iterator en = files.end();
        for (; it != en; ++ it) {
-               idocfstream ifs(it->toFilesystemEncoding().c_str(),
+               ifdocstream ifs(it->toFilesystemEncoding().c_str(),
                        ios_base::in, buffer().params().encoding().iconvName());
 
                char_type ch;
@@ -628,22 +724,29 @@ void InsetBibtex::fillWithBibKeys(BiblioInfo & keylist,
 
                        docstring entryType;
 
-                       if (!readTypeOrKey(entryType, ifs, from_ascii("{("), 
-                                          docstring(), makeLowerCase) || !ifs)
+                       if (!readTypeOrKey(entryType, ifs, from_ascii("{("), docstring(), makeLowerCase)) {
+                               lyxerr << "BibTeX Parser: Error reading entry type." << std::endl;
                                continue;
+                       }
 
-                       if (entryType == from_ascii("comment")) {
+                       if (!ifs) {
+                               lyxerr << "BibTeX Parser: Unexpected end of file." << std::endl;
+                               continue;
+                       }
 
+                       if (entryType == from_ascii("comment")) {
                                ifs.ignore(numeric_limits<int>::max(), '\n');
                                continue;
                        }
 
                        ifs.get(ch);
-                       if (!ifs)
+                       if (!ifs) {
+                               lyxerr << "BibTeX Parser: Unexpected end of file." << std::endl;
                                break;
+                       }
 
                        if ((ch != '(') && (ch != '{')) {
-                               // invalid entry delimiter
+                               lyxerr << "BibTeX Parser: Invalid entry delimiter." << std::endl;
                                ifs.putback(ch);
                                continue;
                        }
@@ -656,17 +759,29 @@ void InsetBibtex::fillWithBibKeys(BiblioInfo & keylist,
                                docstring name;
                                docstring value;
 
-                               if (!readTypeOrKey(name, ifs, from_ascii("="), 
-                                                  from_ascii("#{}(),"), makeLowerCase) || !ifs)
+                               if (!readTypeOrKey(name, ifs, from_ascii("="), from_ascii("#{}(),"), makeLowerCase)) {
+                                       lyxerr << "BibTeX Parser: Error reading string name." << std::endl;
                                        continue;
+                               }
+
+                               if (!ifs) {
+                                       lyxerr << "BibTeX Parser: Unexpected end of file." << std::endl;
+                                       continue;
+                               }
 
                                // next char must be an equal sign
                                ifs.get(ch);
-                               if (!ifs || ch != '=')
+                               if (!ifs || ch != '=') {
+                                       lyxerr << "BibTeX Parser: No `=' after string name: " <<
+                                                       name << "." << std::endl;
                                        continue;
+                               }
 
-                               if (!readValue(value, ifs, strings))
+                               if (!readValue(value, ifs, strings)) {
+                                       lyxerr << "BibTeX Parser: Unable to read value for string: " <<
+                                                       name << "." << std::endl;
                                        continue;
+                               }
 
                                strings[name] = value;
 
@@ -676,54 +791,69 @@ void InsetBibtex::fillWithBibKeys(BiblioInfo & keylist,
                                // can they be of any use in lyx?
                                docstring value;
 
-                               if (!readValue(value, ifs, strings))
+                               if (!readValue(value, ifs, strings)) {
+                                       lyxerr << "BibTeX Parser: Unable to read preamble value." << std::endl;
                                        continue;
+                               }
 
                        } else {
 
                                // Citation entry. Try to read the key.
                                docstring key;
 
-                               if (!readTypeOrKey(key, ifs, from_ascii(","), 
-                                                  from_ascii("}"), keepCase) || !ifs)
+                               if (!readTypeOrKey(key, ifs, from_ascii(","), from_ascii("}"), keepCase)) {
+                                       lyxerr << "BibTeX Parser: Unable to read key for entry type:" <<
+                                                       entryType << "." << std::endl;
                                        continue;
+                               }
+
+                               if (!ifs) {
+                                       lyxerr << "BibTeX Parser: Unexpected end of file." << std::endl;
+                                       continue;
+                               }
 
                                /////////////////////////////////////////////
-                               // now we have a key, so we will add an entry 
+                               // now we have a key, so we will add an entry
                                // (even if it's empty, as bibtex does)
                                //
                                // we now read the field = value pairs.
                                // all items must be separated by a comma. If
                                // it is missing the scanning of this entry is
                                // stopped and the next is searched.
-                               docstring fields;
                                docstring name;
                                docstring value;
-                               docstring commaNewline;
                                docstring data;
                                BibTeXInfo keyvalmap(key, entryType);
-                               
+
                                bool readNext = removeWSAndComma(ifs);
+
                                while (ifs && readNext) {
 
                                        // read field name
-                                       if (!readTypeOrKey(name, ifs, from_ascii("="), 
+                                       if (!readTypeOrKey(name, ifs, from_ascii("="),
                                                           from_ascii("{}(),"), makeLowerCase) || !ifs)
                                                break;
 
                                        // next char must be an equal sign
+                                       // FIXME Whitespace??
                                        ifs.get(ch);
-                                       if (!ifs)
+                                       if (!ifs) {
+                                               lyxerr << "BibTeX Parser: Unexpected end of file." << std::endl;
                                                break;
+                                       }
                                        if (ch != '=') {
+                                               lyxerr << "BibTeX Parser: Missing `=' after field name: " <<
+                                                               name << ", for key: " << key << "." << std::endl;
                                                ifs.putback(ch);
                                                break;
                                        }
 
                                        // read field value
-                                       if (!readValue(value, ifs, strings))
+                                       if (!readValue(value, ifs, strings)) {
+                                               lyxerr << "BibTeX Parser: Unable to read value for field: " <<
+                                                               name << ", for key: " << key << "." << std::endl;
                                                break;
+                                       }
 
                                        keyvalmap[name] = value;
                                        data += "\n\n" + value;
@@ -735,23 +865,25 @@ void InsetBibtex::fillWithBibKeys(BiblioInfo & keylist,
                                keylist.addEntryType(entryType);
                                keyvalmap.setAllData(data);
                                keylist[key] = keyvalmap;
-                       }
+                       } //< else (citation entry)
                } //< searching '@'
        } //< for loop over files
+
+       buffer().addBiblioInfo(keylist);
 }
 
 
 FileName InsetBibtex::getBibTeXPath(docstring const & filename, Buffer const & buf)
 {
        string texfile = changeExtension(to_utf8(filename), "bib");
-       // note that, if the filename can be found directly from the path, 
+       // note that, if the filename can be found directly from the path,
        // findtexfile will just return a FileName object for that path.
        FileName file(findtexfile(texfile, "bib"));
        if (file.empty())
                file = FileName(makeAbsPath(texfile, buf.filePath()));
        return file;
 }
+
 
 bool InsetBibtex::addDatabase(docstring const & db)
 {
@@ -789,6 +921,113 @@ void InsetBibtex::validate(LaTeXFeatures & features) const
 {
        if (features.bufferParams().use_bibtopic)
                features.require("bibtopic");
+       // FIXME XHTML
+       // 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.addCSSSnippet("div.bibtexentry { margin-left: 2em; text-indent: -2em; }\n"
+                       "span.bibtexlabel:before{ content: \"[\"; }\n"
+                       "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();
+}
+
+
+// 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();
+       bool const all_entries = getParam("btprint") == "btPrintAll";
+       vector<docstring> const & cites = 
+           all_entries ? bibinfo.getKeys() : bibinfo.citedEntries();
+
+       docstring const reflabel = buffer().B_("References");
+
+       xs << html::StartTag("h2", "class='bibtex'")
+               << reflabel
+               << html::EndTag("h2")
+               << html::StartTag("div", "class='bibtex'");
+
+       // 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;
+               string const attr = "class='bibtexentry' id='LyXCite-" 
+                   + to_utf8(html::cleanAttr(entry.key())) + "'";
+               xs << html::StartTag("div", attr);
+               
+               // don't print labels if we're outputting all entries
+               if (!all_entries) {
+                       xs << html::StartTag("span", "class='bibtexlabel'")
+                               << 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
+               // entry, so there's a lot of repitition. This should be fixed.
+               xs << html::StartTag("span", "class='bibtexinfo'")
+                  << XHTMLStream::ESCAPE_AND
+                  << bibinfo.getInfo(entry.key(), buffer(), true)
+                  << html::EndTag("span")
+                  << html::EndTag("div")
+                  << html::CR();
+       }
+       xs << html::EndTag("div");
+       return docstring();
+}
+
+
+string InsetBibtex::contextMenuName() const
+{
+       return "context-bibtex";
 }