]> git.lyx.org Git - lyx.git/blobdiff - src/buffer.h
ws chanes only
[lyx.git] / src / buffer.h
index 5f03cab458dd5f2cd2657c9e32564f8bdb7697d7..5f603a41e5acb86e5e24a04e5cfff274d36c2ee7 100644 (file)
 #ifndef BUFFER_H
 #define BUFFER_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include "LString.h"
 #include "undo.h"
 #include "support/limited_stack.h"
@@ -26,6 +22,7 @@
 #include "texrow.h"
 #include "ParagraphList.h"
 #include "paragraph.h"
+#include "author.h"
 
 #include <boost/shared_ptr.hpp>
 
@@ -35,18 +32,8 @@ class TeXErrors;
 class LaTeXFeatures;
 class Language;
 class ParIterator;
+class ParConstIterator;
 
-#define NO_COMPABILITY 1
-
-///
-struct DEPCLEAN {
-       ///
-       bool clean;
-       ///
-       string master;
-       ///
-       DEPCLEAN * next;
-};
 
 /** The buffer object.
   This is the buffer object. It contains all the informations about
@@ -109,7 +96,7 @@ public:
            \param par if != 0 insert the file.
            \return \c false if method fails.
        */
-       bool readFile(LyXLex &, Paragraph * par = 0);
+       bool readFile(LyXLex &, string const &, Paragraph * par = 0);
 
        /** Reads a file without header.
            \param par if != 0 insert the file.
@@ -126,13 +113,6 @@ public:
        ///
        void insertStringAsLines(Paragraph *&, lyx::pos_type &,
                                 LyXFont const &, string const &) const;
-#ifndef NO_COMPABILITY
-       ///
-       Inset * isErtInset(Paragraph * par, int pos) const;
-       ///
-       void insertErtContents(Paragraph * par, int & pos,
-                              bool set_inactive = true);
-#endif
        ///
        Paragraph * getParFromID(int id) const;
 private:
@@ -153,7 +133,7 @@ public:
        ///
        void writeFileAscii(std::ostream &, int);
        ///
-       string const asciiParagraph(Paragraph const *, unsigned int linelen,
+       string const asciiParagraph(Paragraph const &, unsigned int linelen,
                                    bool noparbreak = false) const;
        /// Just a wrapper for the method below, first creating the ofstream.
        void makeLaTeXFile(string const & filename,
@@ -185,12 +165,6 @@ public:
        ///
        void makeDocBookFile(string const & filename,
                             bool nice, bool only_body = false);
-       /// Open SGML/XML tag.
-       int sgmlOpenTag(std::ostream & os, Paragraph::depth_type depth, bool mixcont,
-               string const & latexname) const;
-       /// Closes SGML/XML tag.
-       int sgmlCloseTag(std::ostream & os, Paragraph::depth_type depth, bool mixcont,
-               string const & latexname) const;
        ///
        void sgmlError(Paragraph * par, int pos, string const & message) const;
 
@@ -273,12 +247,10 @@ public:
        */
        void validate(LaTeXFeatures &) const;
 
+       /// return all bibkeys from buffer and its childs
+       void fillWithBibKeys(std::vector<std::pair<string, string> > & keys) const;
        ///
-       string const getIncludeonlyList(char delim = ',');
-       ///
-       std::vector<std::pair<string, string> > const getBibkeyList() const;
-       ///
-       std::vector<string> const getLabelList();
+       std::vector<string> const getLabelList() const;
 
        /** This will clearly have to change later. Later we can have more
            than one user per buffer. */
@@ -317,7 +289,19 @@ public:
 
        /// Used when typesetting to place errorboxes.
        TexRow texrow;
+
+       /// the author list for the document
+       AuthorList & authors();
+
 private:
+       typedef std::map<string, bool> DepClean;
+
+       /// need to regenerate .tex ?
+       DepClean dep_clean_;
+
+       /// the author list
+       AuthorList authorlist;
+
        /// is save needed
        mutable bool lyx_clean;
 
@@ -327,9 +311,6 @@ private:
        /// is this a unnamed file (New...)
        bool unnamed;
 
-       /// is regenerating #.tex# necessary
-       DEPCLEAN * dep_clean;
-
        /// buffer is r/o
        bool read_only;
 
@@ -349,7 +330,6 @@ private:
            of the buffers in the list of users to do a #updateLayoutChoice#.
        */
        BufferView * users;
-
 public:
        ///
        class inset_iterator {
@@ -359,47 +339,28 @@ public:
                typedef ptrdiff_t difference_type;
                typedef Inset * pointer;
                typedef Inset & reference;
-
+               typedef ParagraphList::iterator base_type;
 
                ///
-               inset_iterator() : par(0) /*, it(0)*/ {}
-               //
-               inset_iterator(Paragraph * paragraph) : par(paragraph) {
-                       setParagraph();
-               }
+               inset_iterator();
                ///
-               inset_iterator(Paragraph * paragraph, lyx::pos_type pos);
+               inset_iterator(base_type p, base_type e);
                ///
-               inset_iterator & operator++() { // prefix ++
-                       if (par) {
-                               ++it;
-                               if (it == par->insetlist.end()) {
-                                       par = par->next();
-                                       setParagraph();
-                               }
-                       }
-                       return *this;
-               }
-               ///
-               inset_iterator operator++(int) { // postfix ++
-                       inset_iterator tmp(par, it.getPos());
-                       if (par) {
-                               ++it;
-                               if (it == par->insetlist.end()) {
-                                       par = par->next();
-                                       setParagraph();
-                               }
-                       }
-                       return tmp;
-               }
+               inset_iterator(base_type p, lyx::pos_type pos, base_type e);
 
+               /// prefix ++
+               inset_iterator & operator++();
+               /// postfix ++
+               inset_iterator operator++(int);
+               ///
+               reference operator*();
                ///
-               Inset * operator*() { return it.getInset(); }
+               pointer operator->();
 
                ///
-               Paragraph * getPar() { return par; }
+               Paragraph * getPar();
                ///
-               lyx::pos_type getPos() const { return it.getPos(); }
+               lyx::pos_type getPos() const;
                ///
                friend
                bool operator==(inset_iterator const & iter1,
@@ -408,23 +369,28 @@ public:
                ///
                void setParagraph();
                ///
-               Paragraph * par;
+               ParagraphList::iterator pit;
+               ///
+               ParagraphList::iterator pend;
                ///
                InsetList::iterator it;
        };
 
        ///
        inset_iterator inset_iterator_begin() {
-               return inset_iterator(&*paragraphs.begin());
+               return inset_iterator(paragraphs.begin(), paragraphs.end());
        }
+
        ///
        inset_iterator inset_iterator_end() {
                return inset_iterator();
        }
+
        ///
        inset_iterator inset_const_iterator_begin() const {
-               return inset_iterator(&*paragraphs.begin());
+               return inset_iterator(paragraphs.begin(), paragraphs.end());
        }
+
        ///
        inset_iterator inset_const_iterator_end() const {
                return inset_iterator();
@@ -433,149 +399,19 @@ public:
        ///
        ParIterator par_iterator_begin();
        ///
+       ParConstIterator par_iterator_begin() const;
+       ///
        ParIterator par_iterator_end();
+       ///
+       ParConstIterator par_iterator_end() const;
 
        ///
        Inset * getInsetFromID(int id_arg) const;
 };
 
-
-inline
-void Buffer::addUser(BufferView * u)
-{
-       users = u;
-}
-
-
-inline
-void Buffer::delUser(BufferView *)
-{
-       users = 0;
-}
-
-
-inline
-Language const * Buffer::getLanguage() const
-{
-       return params.language;
-}
-
-
-inline
-bool Buffer::isClean() const
-{
-       return lyx_clean;
-}
-
-
-inline
-bool Buffer::isBakClean() const
-{
-       return bak_clean;
-}
-
-
-inline
-void Buffer::markClean() const
-{
-       if (!lyx_clean) {
-               lyx_clean = true;
-               updateTitles();
-       }
-       // if the .lyx file has been saved, we don't need an
-       // autosave
-       bak_clean = true;
-}
-
-
-inline
-void Buffer::markBakClean()
-{
-       bak_clean = true;
-}
-
-
-inline
-void Buffer::setUnnamed(bool flag)
-{
-       unnamed = flag;
-}
-
-
-inline
-bool Buffer::isUnnamed()
-{
-       return unnamed;
-}
-
-
-inline
-void Buffer::markDirty()
-{
-       if (lyx_clean) {
-               lyx_clean = false;
-               updateTitles();
-       }
-       bak_clean = false;
-       DEPCLEAN * tmp = dep_clean;
-       while (tmp) {
-               tmp->clean = false;
-               tmp = tmp->next;
-       }
-}
-
-
-inline
-string const & Buffer::fileName() const
-{
-       return filename_;
-}
-
-
-inline
-string const & Buffer::filePath() const
-{
-       return filepath_;
-}
-
-
-inline
-bool Buffer::isReadonly() const
-{
-       return read_only;
-}
-
-
-inline
-BufferView * Buffer::getUser() const
-{
-       return users;
-}
-
-
-inline
-void Buffer::setParentName(string const & name)
-{
-       params.parentname = name;
-}
-
-
-///
-inline
 bool operator==(Buffer::inset_iterator const & iter1,
-               Buffer::inset_iterator const & iter2)
-{
-       return iter1.par == iter2.par
-               && (iter1.par == 0 || iter1.it == iter2.it);
-}
+               Buffer::inset_iterator const & iter2);
 
-
-///
-inline
 bool operator!=(Buffer::inset_iterator const & iter1,
-               Buffer::inset_iterator const & iter2)
-{
-       return !(iter1 == iter2);
-}
-
+               Buffer::inset_iterator const & iter2);
 #endif