cleanup after svn hang-up, #undef CursorShape. Should be compilable ganin now.

[lyx.git] / src / buffer.h

diff --git a/src/buffer.h b/src/buffer.h
index 4a680e65c4bad74c9ded5fd06e632aef2f298bdc..2c52c7b04cb4d6e991a57243aa8bf4fd104fed38 100644 (file)
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -12,6 +12,7 @@
 #ifndef BUFFER_H
 #define BUFFER_H
 
+#include "errorlist.h"
 #include "InsetList.h"
 
 #include "dociterator.h"
@@ -19,11 +20,13 @@
 
 #include "support/limited_stack.h"
 #include "support/types.h"
+#include "support/docstring.h"
 
 #include <boost/scoped_ptr.hpp>
 #include <boost/signal.hpp>
 
 #include <iosfwd>
+#include <string>
 #include <map>
 #include <utility>
 #include <vector>
@@ -105,16 +108,16 @@ public:
        ///
        void insertStringAsLines(ParagraphList & plist,
                lyx::pit_type &, lyx::pos_type &,
-               LyXFont const &, std::string const &, bool);
+               LyXFont const &, lyx::docstring const &, bool);
        ///
        ParIterator getParFromID(int id) const;
        /// do we have a paragraph with this id?
        bool hasParWithID(int id) const;
 
-       /// This signal is emitted when a parsing error shows up.
-       boost::signal<void(ErrorItem)> error;
+       /// This signal is emitted when some parsing error shows up.
+       boost::signal<void(std::string)> errors;
        /// This signal is emitted when some message shows up.
-       boost::signal<void(std::string)> message;
+       boost::signal<void(lyx::docstring)> message;
        /// This signal is emitted when the buffer busy status change.
        boost::signal<void(bool)> busy;
        /// This signal is emitted when the buffer readonly status change.
@@ -147,23 +150,23 @@ public:
                           bool output_preamble = true,
                           bool output_body = true);
        ///
-       void makeLaTeXFile(std::ostream & os,
+       void writeLaTeXSource(std::ostream & os,
                           std::string const & original_path,
                           OutputParams const &,
                           bool output_preamble = true,
                           bool output_body = true);
        ///
-       void makeLinuxDocFile(std::string const & filename,
-                             OutputParams const & runparams_in,
-                             bool only_body = false);
-       ///
        void makeDocBookFile(std::string const & filename,
                             OutputParams const & runparams_in,
                             bool only_body = false);
+       ///
+       void writeDocBookSource(std::ostream & os, std::string const & filename,
+                            OutputParams const & runparams_in,
+                            bool only_body = false);
        /// returns the main language for the buffer (document)
        Language const * getLanguage() const;
        /// get l10n translated to the buffers language
-       std::string const B_(std::string const & l10n) const;
+       lyx::docstring const B_(std::string const & l10n) const;
 
        ///
        int runChktex();
@@ -217,6 +220,10 @@ public:
            child document)
         */
        Buffer const * getMasterBuffer() const;
+       /** Get the document's master (or \c this if this is not a
+           child document)
+        */
+       Buffer * getMasterBuffer();
 
        /// Is buffer read-only?
        bool isReadonly() const;
@@ -226,13 +233,8 @@ public:
 
        /// returns \c true if the buffer contains a LaTeX document
        bool isLatex() const;
-       /// returns \c true if the buffer contains a LinuxDoc document
-       bool isLinuxDoc() const;
        /// returns \c true if the buffer contains a DocBook document
        bool isDocBook() const;
-       /** returns \c true if the buffer contains either a LinuxDoc
-           or DocBook document */
-       bool isSGML() const;
        /// returns \c true if the buffer contains a Wed document
        bool isLiterate() const;
 
@@ -249,6 +251,12 @@ public:
 
        /// return all bibkeys from buffer and its childs
        void fillWithBibKeys(std::vector<std::pair<std::string, std::string> > & keys) const;
+       /// Update the cache with all bibfiles in use (including bibfiles
+       /// of loaded child documents).
+       void updateBibfilesCache();
+       /// Return the cache with all bibfiles in use (including bibfiles
+       /// of loaded child documents).
+       std::vector<std::string> const & getBibfilesCache() const;
        ///
        void getLabelList(std::vector<std::string> &) const;
 
@@ -333,8 +341,15 @@ public:
        StableDocIterator getAnchor() const { return anchor_; }
        ///
        void changeRefsIfUnique(std::string const & from, std::string const & to);
-       /// get source code (latex/docbook/linuxdoc) for some paragraphs
-       void getSourceCode(std::ostream & os, lyx::pit_type par_begin, lyx::pit_type par_end);
+       /// get source code (latex/docbook) for some paragraphs, or all paragraphs
+       /// including preamble
+       void getSourceCode(std::ostream & os, lyx::pit_type par_begin, lyx::pit_type par_end, bool full_source);
+
+       /// errorLists_ accessors.
+       //@{
+       ErrorList const & errorList(std::string const & type) const;
+       ErrorList & errorList(std::string const & type);
+       //@}
 
 private:
        /** Inserts a file into a document
@@ -354,6 +369,12 @@ private:
        /// it's BufferView, this should be FIXED in future.
        StableDocIterator cursor_;
        StableDocIterator anchor_;
+       /// A cache for the bibfiles (including bibfiles of loaded child
+       /// documents), needed for appropriate update of natbib labels.
+       std::vector<std::string> bibfilesCache_;
+
+       /// Container for all sort of Buffer dependant errors.
+       std::map<std::string, ErrorList> errorLists_;
 };
 
 #endif