split LyXText::rowlist_ into individual Paragraph::rows_ chunks

[lyx.git] / src / paragraph.h

diff --git a/src/paragraph.h b/src/paragraph.h
index f38ef03cfc0b70b6565ca8337748827855dc7ffe..79ae05e6d6023488724d38a04382a581fdf0bc79 100644 (file)
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -13,16 +13,15 @@
 #include "lyxfont.h" // Just for LyXFont::FONT_SIZE
 #include "InsetList.h"
 
-#include "insets/inset.h" // Just for Inset::Code
+#include "insets/inset.h" // Just for InsetOld::Code
 
 #include "support/types.h"
 #include "changes.h"
+#include "RowList.h"
 
-#include "ParagraphList.h"
 #include "LString.h"
 
-#include <boost/optional.hpp>
-
+class Buffer;
 class BufferParams;
 class BufferView;
 class Counters;
@@ -32,20 +31,12 @@ class LaTeXFeatures;
 class LatexRunParams;
 class ParagraphParameters;
 class TexRow;
-
-// Define this if you want to try out the new storage container for
-// paragraphs. (Lgb)
-// This is non working and far from finished.
-#define NO_STD_LIST 1
+class ParagraphList;
+class UpdatableInset;
 
 /// A Paragraph holds all text, attributes and insets in a text paragraph
 class Paragraph  {
 public:
-#ifdef NO_STD_LIST
-       // Remove this whan ParagraphList transition is over. (Lgb)
-       friend class ParagraphList;
-       friend class ParagraphList::iterator;
-#endif
        ///
        enum META_KIND {
                /// Note that this is 1 right now to avoid
@@ -64,7 +55,9 @@ public:
        Paragraph();
 
        ///
-       Paragraph(Paragraph const &, bool same_ids);
+       Paragraph(Paragraph const &);
+       ///
+       void operator=(Paragraph const &);
        /// the destructor removes the new paragraph from the list
        ~Paragraph();
 
@@ -114,13 +107,11 @@ public:
        void makeSameLayout(Paragraph const & par);
 
        ///
-       Inset * inInset() const;
+       UpdatableInset * inInset() const;
        ///
-       void setInsetOwner(Inset * i);
+       void setInsetOwner(UpdatableInset * inset);
        ///
        void deleteInsetsLyXText(BufferView *);
-       ///
-       void resizeInsetsLyXText(BufferView *);
 
        ///
        lyx::pos_type size() const;
@@ -143,7 +134,7 @@ public:
        char itemdepth;
 
        ///
-       InsetBibitem * bibitem();  // ale970302
+       InsetBibitem * bibitem() const;  // ale970302
 
        /// initialise tracking for this par
        void trackChanges(Change::Type = Change::UNCHANGED);
@@ -178,10 +169,11 @@ public:
        /// mark whole par as erased
        void markErased();
 
-       /// Paragraphs can contain "manual labels", for example, Description environment.
-       /// The text for this user-editable label is stored in the paragraph alongside
-       /// the text of the rest of the paragraph (the body). This function returns
-       /// the starting position of the body of the text in the paragraph.
+       /// Paragraphs can contain "manual labels", for example, Description
+       /// environment. The text for this user-editable label is stored in
+       /// the paragraph alongside the text of the rest of the paragraph
+       /// (the body). This function returns the starting position of the
+       /// body of the text in the paragraph.
        int beginningOfBody() const;
 
        ///
@@ -229,6 +221,13 @@ public:
                                    LyXFont const & outerfont) const;
        LyXFont const getLabelFont(BufferParams const &,
                                   LyXFont const & outerfont) const;
+       /**
+        * The font returned by the above functions is the same in a
+        * span of characters. This method will return the last position
+        * in the paragraph for which that font is the same.
+        * This can be used to avoid unnecessary calls to getFont.
+        */
+       lyx::pos_type getEndPosOfFontSpan(lyx::pos_type pos) const;
        ///
        value_type getChar(lyx::pos_type pos) const;
        ///
@@ -249,23 +248,15 @@ public:
        ///
        bool checkInsertChar(LyXFont &);
        ///
-       void insertInset(lyx::pos_type pos, Inset * inset);
-       ///
-       void insertInset(lyx::pos_type pos, Inset * inset, LyXFont const &, Change change = Change(Change::INSERTED));
-       ///
-       bool insetAllowed(Inset::Code code);
+       void insertInset(lyx::pos_type pos, InsetOld * inset);
        ///
-       Inset * getInset(lyx::pos_type pos);
+       void insertInset(lyx::pos_type pos, InsetOld * inset, LyXFont const &, Change change = Change(Change::INSERTED));
        ///
-       Inset const * getInset(lyx::pos_type pos) const;
-       /** important for cut and paste
-           Temporary change from BufferParams to Buffer. Will revert when we
-           get rid of the argument to Inset::clone(Buffer const &) */
-       void copyIntoMinibuffer(Buffer const &, lyx::pos_type pos) const;
+       bool insetAllowed(InsetOld::Code code);
        ///
-       void cutIntoMinibuffer(BufferParams const &, lyx::pos_type pos);
+       InsetOld * getInset(lyx::pos_type pos);
        ///
-       bool insertFromMinibuffer(lyx::pos_type pos);
+       InsetOld const * getInset(lyx::pos_type pos) const;
 
        ///
        bool isHfill(lyx::pos_type pos) const;
@@ -285,37 +276,30 @@ public:
        bool isWord(lyx::pos_type pos) const;
 
        /// returns -1 if inset not found
-       int getPositionOfInset(Inset const * inset) const;
+       int getPositionOfInset(InsetOld const * inset) const;
 
        ///
        int stripLeadingSpaces();
 
-       ///
+       /// return true if we allow multiple spaces
        bool isFreeSpacing() const;
 
+       /// return true if we allow this par to stay empty
+       bool allowEmpty() const;
+
        ///
        ParagraphParameters & params();
        ///
        ParagraphParameters const & params() const;
        ///
        InsetList insetlist;
+
        ///
-       //Counters & counters();
-       ///
-       void owningBuffer(Buffer const & b) {
-               buffer_.reset(&b);
-       }
+       mutable RowList rows;
+
 private:
        ///
        LyXLayout_ptr layout_;
-       /// if anything uses this we don't want it to.
-       Paragraph(Paragraph const &);
-#ifdef NO_STD_LIST
-       Paragraph * next_par_;
-       Paragraph * prev_par_;
-#endif
-       ///
-       boost::optional<Buffer const *> buffer_;
 
        struct Pimpl;
        ///
@@ -323,8 +307,6 @@ private:
        ///
        Pimpl * pimpl_;
 
-       /// unimplemented
-       void operator=(Paragraph const &);
 };