Merge branch 'master' into biblatex2

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

diff --git a/src/insets/InsetBibtex.h b/src/insets/InsetBibtex.h
index d4e1ad7ecbfaf2a687d7d30086835cde03567588..038065ffc0dc8b9a6ddf71d67fd47c08c15820c2 100644 (file)
--- a/src/insets/InsetBibtex.h
+++ b/src/insets/InsetBibtex.h
@@ -12,14 +12,16 @@
 #ifndef INSET_BIBTEX_H
 #define INSET_BIBTEX_H
 
-#include "BiblioInfo.h"
 #include "InsetCommand.h"
 
-#include "support/FileNameList.h"
+namespace lyx {
 
-#include <map>
+class BiblioInfo;
 
-namespace lyx {
+namespace support {
+       class FileName;
+       class FileNamePairList;
+}
 
 /** Used to insert BibTeX's information
   */
@@ -31,11 +33,13 @@ public:
        ~InsetBibtex();
 
        ///
-       support::FileNameList getBibFiles() const;
+       support::FileNamePairList getBibFiles() const;
        ///
        bool addDatabase(docstring const &);
        ///
        bool delDatabase(docstring const &);
+       ///
+       void write(std::ostream &) const;
 
        /// \name Public functions inherited from Inset class
        //@{
@@ -48,15 +52,18 @@ public:
        ///
        DisplayType display() const { return AlignCenter; }
        ///
-       int latex(odocstream &, OutputParams const &) const;
+       void latex(otexstream &, OutputParams const &) const;
        ///
-       void fillWithBibKeys(BiblioInfo &, InsetIterator const &) const;
+       int plaintext(odocstringstream & ods, OutputParams const & op,
+                     size_t max_length = INT_MAX) const;
+       ///
+       void collectBibKeys(InsetIterator const &) const;
        ///
        void validate(LaTeXFeatures &) const;
        ///
        docstring xhtml(XHTMLStream &, OutputParams const &) const;
        ///
-       docstring contextMenu(BufferView const &, int, int) const;
+       std::string contextMenuName() const;
        //@}
 
        /// \name Static public methods obligated for InsetCommand derived classes
@@ -66,16 +73,20 @@ public:
        ///
        static std::string defaultCommand() { return "bibtex"; }
        ///
-       static bool isCompatibleCommand(std::string const & s) 
+       static bool isCompatibleCommand(std::string const & s)
                { return s == "bibtex"; }
        //@}
 
 private:
        /// look up the path to the file using TeX
-       static support::FileName 
+       static support::FileName
                getBibTeXPath(docstring const & filename, Buffer const & buf);
        ///
        void editDatabases() const;
+       ///
+       void parseBibTeXFiles() const;
+       ///
+       bool usingBiblatex() const;
 
        /// \name Private functions inherited from Inset class
        //@{