fix some C++ parsing bugs

[lyx.git] / src / buffer.h

diff --git a/src/buffer.h b/src/buffer.h
index ad57b1ef39665fbd07d444b171cd06dea26340bf..9f749f4969b0bd5c8cd9e1156c89095ea54e41e7 100644 (file)
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -92,32 +92,36 @@ 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);
 
        /** Reads a file without header.
            \param par if != 0 insert the file.
            \return \c false if file is not completely read.
        */
-       bool readLyXformat2(LyXLex &, Paragraph * par = 0);
+       bool readBody(LyXLex &, ParagraphList::iterator pit);
+
+       /// This parses a single token
+       int readParagraph(LyXLex &, string const & token,
+                     ParagraphList & pars, ParagraphList::iterator & pit,
+                     Paragraph::depth_type & depth);
 
-       /// This parses a single LyXformat-Token.
-       bool parseSingleLyXformat2Token(LyXLex &, Paragraph *& par,
-                                       Paragraph *& return_par,
-                                       string const & token, int & pos,
-                                       Paragraph::depth_type & depth,
-                                       LyXFont &);
        ///
        void insertStringAsLines(Paragraph *&, lyx::pos_type &,
-                                LyXFont const &, string const &) const;
+                                LyXFont const &, string const &);
        ///
        Paragraph * getParFromID(int id) const;
-private:
-       /// Parse a single inset.
-       void readInset(LyXLex &, Paragraph *& par, int & pos, LyXFont &);
+
 public:
        /** Save file.
            Takes care of auto-save files and backup file if requested.
@@ -147,11 +151,6 @@ public:
                           bool nice,
                           bool only_body = false,
                           bool only_preamble = false);
-       /** LaTeX all paragraphs from par to endpar.
-           \param \a endpar if == 0 then to the end
-       */
-       void latexParagraphs(std::ostream & os, Paragraph * par,
-                            Paragraph * endpar, TexRow & texrow, bool moving_arg = false) const;
        ///
        void simpleDocBookOnePar(std::ostream &,
                                 Paragraph * par, int & desc_on,
@@ -248,7 +247,7 @@ public:
        void validate(LaTeXFeatures &) const;
 
        /// return all bibkeys from buffer and its childs
-       void fillWithBibKeys(vector<pair<string, string> > & keys) const;
+       void fillWithBibKeys(std::vector<std::pair<string, string> > & keys) const;
        ///
        std::vector<string> const getLabelList() const;
 
@@ -298,9 +297,6 @@ private:
 
        /// need to regenerate .tex ?
        DepClean dep_clean_;
- 
-       /// the author list
-       AuthorList authorlist;
 
        /// is save needed
        mutable bool lyx_clean;