"Inter-word Space"

[lyx.git] / src / paragraph.h

diff --git a/src/paragraph.h b/src/paragraph.h
index c426e34132743196a9a33a1339051094b90ab7f8..23df61ad70fa6d616f93fe20aea17868d253e84a 100644 (file)
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -18,9 +18,11 @@
 #include "support/types.h"
 #include "changes.h"
 
-#include "ParagraphList.h"
 #include "LString.h"
 
+#include <boost/optional.hpp>
+
+class Buffer;
 class BufferParams;
 class BufferView;
 class Counters;
@@ -30,20 +32,11 @@ 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;
 
 /// 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
@@ -62,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();
 
@@ -141,7 +136,7 @@ public:
        char itemdepth;
 
        ///
-       InsetBibitem * bibitem();  // ale970302
+       InsetBibitem * bibitem() const;  // ale970302
 
        /// initialise tracking for this par
        void trackChanges(Change::Type = Change::UNCHANGED);
@@ -176,10 +171,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;
 
        ///
@@ -298,24 +294,21 @@ public:
        ///
        InsetList insetlist;
        ///
-       //Counters & counters();
+       void owningBuffer(Buffer const & b) {
+               buffer_.reset(&b);
+       }
 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;
        ///
        friend struct Paragraph::Pimpl;
        ///
        Pimpl * pimpl_;
 
-       /// unimplemented
-       void operator=(Paragraph const &);
 };
 
 
@@ -330,4 +323,7 @@ inline bool isDeletedText(Paragraph const & par, lyx::pos_type pos)
        return par.lookupChange(pos) == Change::DELETED;
 }
 
+
+bool operator==(Paragraph const & lhs, Paragraph const & rhs);
+
 #endif // PARAGRAPH_H