Alfredo's second patch

[lyx.git] / src / buffer.h

diff --git a/src/buffer.h b/src/buffer.h
index 7d549045a06a06611a960e3496565a827519f03f..bc352c1d238e45c0900e10d5a4969476dbfaba19 100644 (file)
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -25,6 +25,7 @@
 #include "author.h"
 
 #include <boost/shared_ptr.hpp>
+#include <boost/scoped_ptr.hpp>
 
 class BufferView;
 class LyXRC;
@@ -33,6 +34,7 @@ class LaTeXFeatures;
 class Language;
 class ParIterator;
 class ParConstIterator;
+class Messages;
 
 
 /** The buffer object.
@@ -92,11 +94,15 @@ public:
        /// Load the autosaved file.
        void loadAutoSaveFile();
 
-       /** Reads a file.
+       /** Inserts a file into a document
            \param par if != 0 insert the file.
            \return \c false if method fails.
        */
-       bool readFile(LyXLex &, string const &, Paragraph * par = 0);
+       bool readFile(LyXLex &, string const &, ParagraphList::iterator pit);
+
+       // FIXME: it's very silly to pass a lex in here
+       /// load a new file
+       bool readFile(LyXLex &, string const &);
 
        /// read the header, returns number of unknown tokens
        int readHeader(LyXLex & lex);
@@ -105,23 +111,19 @@ public:
            \param par if != 0 insert the file.
            \return \c false if file is not completely read.
        */
-       bool readBody(LyXLex &, Paragraph * par = 0);
+       bool readBody(LyXLex &, ParagraphList::iterator pit);
 
        /// This parses a single token
-       int readToken(LyXLex &, Paragraph *& par,
-                     Paragraph *& return_par,
-                     string const & token, int & pos,
-                     Paragraph::depth_type & depth,
-                     LyXFont &);
+       int readParagraph(LyXLex &, string const & token,
+                     ParagraphList & pars, ParagraphList::iterator & pit,
+                     Paragraph::depth_type & depth);
 
        ///
-       void insertStringAsLines(Paragraph *&, lyx::pos_type &,
+       void insertStringAsLines(ParagraphList::iterator &, lyx::pos_type &,
                                 LyXFont const &, string const &);
        ///
-       Paragraph * getParFromID(int id) const;
-private:
-       /// Parse a single inset.
-       void readInset(LyXLex &, Paragraph *& par, int & pos, LyXFont &);
+       ParagraphList::iterator getParFromID(int id) const;
+
 public:
        /** Save file.
            Takes care of auto-save files and backup file if requested.
@@ -153,7 +155,7 @@ public:
                           bool only_preamble = false);
        ///
        void simpleDocBookOnePar(std::ostream &,
-                                Paragraph * par, int & desc_on,
+                                ParagraphList::iterator par, int & desc_on,
                                 Paragraph::depth_type depth) const ;
        ///
        void simpleLinuxDocOnePar(std::ostream & os, Paragraph * par,
@@ -165,10 +167,13 @@ public:
        void makeDocBookFile(string const & filename,
                             bool nice, bool only_body = false);
        ///
-       void sgmlError(Paragraph * par, int pos, string const & message) const;
+       void sgmlError(ParagraphList::iterator par, int pos, string const & message) const;
 
        /// returns the main language for the buffer (document)
        Language const * getLanguage() const;
+       /// get l10n translated to the buffers language
+       string const B_(string const & l10n) const;
+
        ///
        int runChktex();
        /// return true if the main lyx file does not need saving
@@ -257,6 +262,10 @@ public:
 
        ///
        void changeLanguage(Language const * from, Language const * to);
+
+       ///
+       void updateDocLang(Language const * nlang);
+
        ///
        bool isMultiLingual();
 
@@ -326,6 +335,8 @@ private:
            of the buffers in the list of users to do a #updateLayoutChoice#.
        */
        BufferView * users;
+       ///
+       boost::scoped_ptr<Messages> messages_;
 public:
        ///
        class inset_iterator {