Merge branch 'master' into biblatex2

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

diff --git a/src/insets/InsetBibtex.h b/src/insets/InsetBibtex.h
index 954783228cb9b4f82dc80aad4fe1eefeff9ca464..038065ffc0dc8b9a6ddf71d67fd47c08c15820c2 100644 (file)
--- a/src/insets/InsetBibtex.h
+++ b/src/insets/InsetBibtex.h
@@ -20,7 +20,7 @@ class BiblioInfo;
 
 namespace support {
        class FileName;
-       class FileNameList;
+       class FileNamePairList;
 }
 
 /** Used to insert BibTeX's information
@@ -33,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
        //@{
@@ -50,7 +52,10 @@ public:
        ///
        DisplayType display() const { return AlignCenter; }
        ///
-       int latex(otexstream &, OutputParams const &) const;
+       void latex(otexstream &, OutputParams const &) const;
+       ///
+       int plaintext(odocstringstream & ods, OutputParams const & op,
+                     size_t max_length = INT_MAX) const;
        ///
        void collectBibKeys(InsetIterator const &) const;
        ///
@@ -58,7 +63,7 @@ public:
        ///
        docstring xhtml(XHTMLStream &, OutputParams const &) const;
        ///
-       docstring contextMenuName() const;
+       std::string contextMenuName() const;
        //@}
 
        /// \name Static public methods obligated for InsetCommand derived classes
@@ -68,18 +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
        //@{