more cursor dispatch

[lyx.git] / src / buffer.h

diff --git a/src/buffer.h b/src/buffer.h
index 9637b9d059fe44c1a3f9ca9c8ebf0de452032d7c..431725bb378e8221346cf102014fc6a0e057839a 100644 (file)
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -31,15 +31,18 @@
 class BufferParams;
 class ErrorItem;
 class FuncRequest;
+class InsetBase;
 class LyXFont;
 class LyXLex;
 class LyXRC;
+class LyXText;
 class LyXVC;
 class LaTeXFeatures;
-class LatexRunParams;
 class Language;
 class Messages;
+class OutputParams;
 class ParIterator;
+class PosIterator;
 class ParConstIterator;
 class TeXErrors;
 class TexRow;
@@ -92,13 +95,7 @@ public:
            \param par if != 0 insert the file.
            \return \c false if file is not completely read.
        */
-       bool readBody(LyXLex &, ParagraphList::iterator pit);
-
-       /// This parses a single token
-       int readParagraph(LyXLex &, std::string const & token,
-                         ParagraphList & pars,
-                         ParagraphList::iterator & pit,
-                         lyx::depth_type & depth);
+       bool readBody(LyXLex &);
 
        ///
        void insertStringAsLines(ParagraphList::iterator &, lyx::pos_type &,
@@ -134,28 +131,28 @@ public:
        bool writeFile(std::string const &) const;
 
        ///
-       void writeFileAscii(std::string const &, LatexRunParams const &);
+       void writeFileAscii(std::string const &, OutputParams const &);
        ///
-       void writeFileAscii(std::ostream &, LatexRunParams const &);
+       void writeFileAscii(std::ostream &, OutputParams const &);
        /// Just a wrapper for the method below, first creating the ofstream.
        void makeLaTeXFile(std::string const & filename,
                           std::string const & original_path,
-                          LatexRunParams const &,
+                          OutputParams const &,
                           bool output_preamble = true,
                           bool output_body = true);
        ///
        void makeLaTeXFile(std::ostream & os,
                           std::string const & original_path,
-                          LatexRunParams const &,
+                          OutputParams const &,
                           bool output_preamble = true,
                           bool output_body = true);
        ///
        void makeLinuxDocFile(std::string const & filename,
-                             LatexRunParams const & runparams_in,
+                             OutputParams const & runparams_in,
                              bool only_body = false);
        ///
        void makeDocBookFile(std::string const & filename,
-                            LatexRunParams const & runparams_in,
+                            OutputParams const & runparams_in,
                             bool only_body = false);
        /// returns the main language for the buffer (document)
        Language const * getLanguage() const;
@@ -279,12 +276,6 @@ public:
        /// Where to put temporary files.
        std::string const & temppath() const;
 
-       /** If we are writing a nice LaTeX file or not.
-           While writing as LaTeX, tells whether we are
-           doing a 'nice' LaTeX file */
-       bool & niceFile();
-       bool niceFile() const;
-
        /// Used when typesetting to place errorboxes.
        TexRow & texrow();
        TexRow const & texrow() const;
@@ -292,10 +283,10 @@ public:
        class inset_iterator {
        public:
                typedef std::input_iterator_tag iterator_category;
-               typedef InsetOld value_type;
+               typedef InsetBase value_type;
                typedef ptrdiff_t difference_type;
-               typedef InsetOld * pointer;
-               typedef InsetOld & reference;
+               typedef InsetBase * pointer;
+               typedef InsetBase & reference;
                typedef ParagraphList::iterator base_type;
 
                ///
@@ -345,6 +336,10 @@ public:
        /// 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();
        ///
@@ -354,9 +349,6 @@ public:
        ///
        ParConstIterator par_iterator_end() const;
 
-       ///
-       InsetOld * getInsetFromID(int id_arg) const;
-
        /** \returns true only when the file is fully loaded.
         *  Used to prevent the premature generation of previews
         *  and by the citation inset.
@@ -365,6 +357,9 @@ public:
        /// Set by buffer_funcs' newFile.
        void fully_loaded(bool);
 
+       ///
+       LyXText & text() const;
+
 private:
        /** Inserts a file into a document
            \param par if != 0 insert the file.