"Inter-word Space"

[lyx.git] / src / buffer.h

diff --git a/src/buffer.h b/src/buffer.h
index 7d549045a06a06611a960e3496565a827519f03f..02de0cb72b39a469f2d28bce1b002eb1b7d9be05 100644 (file)
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -1,14 +1,13 @@
 // -*- C++ -*-
-/* This file is part of
- * ======================================================
+/**
+ * \file buffer.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
- *           Copyright 1995 Matthias Ettrich
+ * \author Lars Gullik Bjønnes
  *
- *           This file is Copyleft 1996
- *           Lars Gullik Bjønnes
- *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS
+ */
 
 #ifndef BUFFER_H
 #define BUFFER_H
@@ -21,18 +20,21 @@
 #include "bufferparams.h"
 #include "texrow.h"
 #include "ParagraphList.h"
-#include "paragraph.h"
 #include "author.h"
+#include "iterators.h"
 
 #include <boost/shared_ptr.hpp>
+#include <boost/scoped_ptr.hpp>
 
 class BufferView;
 class LyXRC;
 class TeXErrors;
 class LaTeXFeatures;
+class LatexRunParams;
 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,21 @@ 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 &);
+       ParIterator getParFromID(int id) const;
+       /// do we have a paragraph with this id?
+       bool hasParWithID(int id) const;
+
 public:
        /** Save file.
            Takes care of auto-save files and backup file if requested.
@@ -142,22 +146,23 @@ public:
        /// Just a wrapper for the method below, first creating the ofstream.
        void makeLaTeXFile(string const & filename,
                           string const & original_path,
-                          bool nice,
+                          LatexRunParams const &,
                           bool only_body = false,
                           bool only_preamble = false);
        ///
        void makeLaTeXFile(std::ostream & os,
                           string const & original_path,
-                          bool nice,
+                          LatexRunParams const &,
                           bool only_body = false,
                           bool only_preamble = false);
        ///
        void simpleDocBookOnePar(std::ostream &,
-                                Paragraph * par, int & desc_on,
-                                Paragraph::depth_type depth) const ;
+                                ParagraphList::iterator par, int & desc_on,
+                                Paragraph::depth_type depth) const;
        ///
-       void simpleLinuxDocOnePar(std::ostream & os, Paragraph * par,
-                                 Paragraph::depth_type depth);
+       void simpleLinuxDocOnePar(std::ostream & os,
+              ParagraphList::iterator par,
+                                Paragraph::depth_type depth) const;
        ///
        void makeLinuxDocFile(string const & filename,
                              bool nice, bool only_body = false);
@@ -165,10 +170,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 +265,10 @@ public:
 
        ///
        void changeLanguage(Language const * from, Language const * to);
+
+       ///
+       void updateDocLang(Language const * nlang);
+
        ///
        bool isMultiLingual();
 
@@ -326,6 +338,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 {
@@ -354,7 +368,7 @@ public:
                pointer operator->();
 
                ///
-               Paragraph * getPar();
+               ParagraphList::iterator getPar() const;
                ///
                lyx::pos_type getPos() const;
                ///
@@ -384,7 +398,7 @@ public:
 
        ///
        inset_iterator inset_const_iterator_begin() const {
-               return inset_iterator(paragraphs.begin(), paragraphs.end());
+               return inset_iterator(const_cast<ParagraphList&>(paragraphs).begin(), const_cast<ParagraphList&>(paragraphs).end());
        }
 
        ///