Make lyx2lyx output the new external inset format.

[lyx.git] / src / buffer.h

diff --git a/src/buffer.h b/src/buffer.h
index 8d562bd281ef3c47ee0884206b07baccddb190e1..d5e1f08b365c382a6ed8d2e7547af0c14b8a59f3 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,16 +20,16 @@
 #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;
@@ -122,7 +121,9 @@ public:
        void insertStringAsLines(ParagraphList::iterator &, lyx::pos_type &,
                                 LyXFont const &, string const &);
        ///
-       Paragraph * getParFromID(int id) const;
+       ParIterator getParFromID(int id) const;
+       /// do we have a paragraph with this id?
+       bool hasParWithID(int id) const;
 
 public:
        /** Save file.
@@ -144,22 +145,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 &,
                                 ParagraphList::iterator par, int & desc_on,
-                                Paragraph::depth_type depth) const ;
+                                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);
@@ -270,10 +272,10 @@ public:
        bool isMultiLingual();
 
        /// Does this mean that this is buffer local?
-       limited_stack<boost::shared_ptr<Undo> > undostack;
+       limited_stack<Undo> undostack;
 
        /// Does this mean that this is buffer local?
-       limited_stack<boost::shared_ptr<Undo> > redostack;
+       limited_stack<Undo> redostack;
 
        ///
        BufferParams params;
@@ -365,7 +367,7 @@ public:
                pointer operator->();
 
                ///
-               Paragraph * getPar();
+               ParagraphList::iterator getPar() const;
                ///
                lyx::pos_type getPos() const;
                ///
@@ -383,25 +385,17 @@ public:
                InsetList::iterator it;
        };
 
-       ///
-       inset_iterator inset_iterator_begin() {
-               return inset_iterator(paragraphs.begin(), paragraphs.end());
-       }
+       /// return an iterator to all *top-level* insets in the buffer
+       inset_iterator inset_iterator_begin();
 
-       ///
-       inset_iterator inset_iterator_end() {
-               return inset_iterator();
-       }
+       /// return the end of all *top-level* insets in the buffer
+       inset_iterator inset_iterator_end();
 
-       ///
-       inset_iterator inset_const_iterator_begin() const {
-               return inset_iterator(paragraphs.begin(), paragraphs.end());
-       }
+       /// return a const iterator to all *top-level* insets in the buffer
+       inset_iterator inset_const_iterator_begin() const;
 
-       ///
-       inset_iterator inset_const_iterator_end() const {
-               return inset_iterator();
-       }
+       /// return the const end of all *top-level* insets in the buffer
+       inset_iterator inset_const_iterator_end() const;
 
        ///
        ParIterator par_iterator_begin();