fix reading the author field.

[lyx.git] / src / buffer.h

diff --git a/src/buffer.h b/src/buffer.h
index 0a82f73b96cb22704aa7797892d3532aacd7ff14..20dd748ef0de91d9f57c17cd7f68fd775b3b927b 100644 (file)
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -13,7 +13,6 @@
 #define BUFFER_H
 
 #include "InsetList.h"
-#include "ParagraphList_fwd.h"
 
 #include "support/limited_stack.h"
 #include "support/types.h"
@@ -40,11 +39,11 @@ class LyXText;
 class LyXVC;
 class LaTeXFeatures;
 class Language;
-class Messages;
+class MacroData;
 class OutputParams;
-class ParIterator;
-class PosIterator;
+class ParagraphList;
 class ParConstIterator;
+class ParIterator;
 class TeXErrors;
 class TexRow;
 class Undo;
@@ -87,7 +86,7 @@ public:
        /// load a new file
        bool readFile(std::string const & filename);
 
-       bool readFile(std::string const & filename, ParagraphList::iterator pit);
+       bool readFile(std::string const & filename, lyx::par_type pit);
 
        /// read the header, returns number of unknown tokens
        int readHeader(LyXLex & lex);
@@ -96,11 +95,12 @@ public:
            \param par if != 0 insert the file.
            \return \c false if file is not completely read.
        */
-       bool readBody(LyXLex &);
+       bool readDocument(LyXLex &);
 
        ///
-       void insertStringAsLines(ParagraphList::iterator &, lyx::pos_type &,
-                                LyXFont const &, std::string const &);
+       void insertStringAsLines(ParagraphList & plist,
+               lyx::par_type &, lyx::pos_type &,
+               LyXFont const &, std::string const &);
        ///
        ParIterator getParFromID(int id) const;
        /// do we have a paragraph with this id?
@@ -208,6 +208,11 @@ public:
        /// Name of the document's parent
        void setParentName(std::string const &);
 
+       /** Get the document's master (or \c this if this is not a
+           child document)
+        */
+       Buffer const * getMasterBuffer() const;
+
        /// Is buffer read-only?
        bool isReadonly() const;
 
@@ -281,66 +286,6 @@ public:
        TexRow & texrow();
        TexRow const & texrow() const;
 
-       class inset_iterator {
-       public:
-               typedef std::input_iterator_tag iterator_category;
-               typedef InsetBase value_type;
-               typedef ptrdiff_t difference_type;
-               typedef InsetBase * pointer;
-               typedef InsetBase & reference;
-               typedef ParagraphList::iterator base_type;
-
-               ///
-               inset_iterator();
-               ///
-               inset_iterator(base_type p, base_type e);
-               ///
-               inset_iterator(base_type p, lyx::pos_type pos, base_type e);
-
-               /// prefix ++
-               inset_iterator & operator++();
-               /// postfix ++
-               inset_iterator operator++(int);
-               ///
-               reference operator*();
-               ///
-               pointer operator->();
-
-               ///
-               ParagraphList::iterator getPar() const;
-               ///
-               lyx::pos_type getPos() const;
-               ///
-               friend
-               bool operator==(inset_iterator const & iter1,
-                               inset_iterator const & iter2);
-       private:
-               ///
-               void setParagraph();
-               ///
-               ParagraphList::iterator pit;
-               ///
-               ParagraphList::iterator pend;
-               ///
-               InsetList::iterator it;
-       };
-
-       /// return an iterator to all *top-level* insets in the buffer
-       inset_iterator inset_iterator_begin();
-
-       /// return the end of all *top-level* insets in the buffer
-       inset_iterator inset_iterator_end();
-
-       /// return a const iterator to all *top-level* insets in the buffer
-       inset_iterator inset_const_iterator_begin() const;
-
-       /// return the const end of all *top-level* insets in the buffer
-       inset_iterator inset_const_iterator_end() const;
-
-       ///
-       PosIterator pos_iterator_begin();
-       ///
-       PosIterator pos_iterator_end();
        ///
        ParIterator par_iterator_begin();
        ///
@@ -363,13 +308,25 @@ public:
        ///
        InsetBase & inset() const;
 
+       //
+       // Macro handling
+       //
+       ///
+       void buildMacros();
+       ///
+       bool hasMacro(std::string const & name) const;
+       ///
+       MacroData const & getMacro(std::string const & name) const;
+       ///
+       void insertMacro(std::string const & name, MacroData const & data);
+
 private:
        /** Inserts a file into a document
            \param par if != 0 insert the file.
            \return \c false if method fails.
        */
        bool readFile(LyXLex &, std::string const & filename,
-                     ParagraphList::iterator pit);
+                     lyx::par_type pit);
 
        bool do_writeFile(std::ostream & ofs) const;
 
@@ -379,10 +336,4 @@ private:
        boost::scoped_ptr<Impl> const pimpl_;
 };
 
-bool operator==(Buffer::inset_iterator const & iter1,
-               Buffer::inset_iterator const & iter2);
-
-bool operator!=(Buffer::inset_iterator const & iter1,
-               Buffer::inset_iterator const & iter2);
-
 #endif