revert recent change to development/FORMAT (don't change history)

[lyx.git] / src / buffer.h

diff --git a/src/buffer.h b/src/buffer.h
index e537ee079ad64989d4176c4131b8481042c3216f..ac12660313763193947206e57f13c3a24b9ece82 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"
@@ -112,8 +113,8 @@ public:
        /// 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;
        /// This signal is emitted when the buffer busy status change.
@@ -148,19 +149,19 @@ 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
@@ -231,13 +232,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;
 
@@ -255,10 +251,10 @@ 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 child documents).
+       /// of loaded child documents).
        void updateBibfilesCache();
        /// Return the cache with all bibfiles in use (including bibfiles
-       /// of child documents).
+       /// of loaded child documents).
        std::vector<std::string> const & getBibfilesCache() const;
        ///
        void getLabelList(std::vector<std::string> &) const;
@@ -344,8 +340,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
@@ -365,9 +368,12 @@ private:
        /// it's BufferView, this should be FIXED in future.
        StableDocIterator cursor_;
        StableDocIterator anchor_;
-       /// A cache for the bibfiles (including bibfiles of child documents),
-       /// needed for appropriate update of natbib labels.
+       /// 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