"Inter-word Space"

[lyx.git] / src / paragraph.h

diff --git a/src/paragraph.h b/src/paragraph.h
index d26fccac2e0b8d50716b726018f63d76f7c09eba..23df61ad70fa6d616f93fe20aea17868d253e84a 100644 (file)
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -18,30 +18,25 @@
 #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;
 class InsetBibitem;
 class Language;
 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_NEXT 1
+class ParagraphList;
 
 /// A Paragraph holds all text, attributes and insets in a text paragraph
 class Paragraph  {
 public:
-       // Remove this whan ParagraphList transition is over. (Lgb)
-       friend class ParagraphList;
-       friend class ParagraphList::iterator;
-
        ///
        enum META_KIND {
                /// Note that this is 1 right now to avoid
@@ -58,13 +53,11 @@ public:
 
        ///
        Paragraph();
-#ifndef NO_NEXT
-       /// this constructor inserts the new paragraph in a list
-       explicit
-       Paragraph(Paragraph * par);
-#endif
+
+       ///
+       Paragraph(Paragraph const &);
        ///
-       Paragraph(Paragraph const &, bool same_ids);
+       //void operator=(Paragraph const &);
        /// the destructor removes the new paragraph from the list
        ~Paragraph();
 
@@ -92,8 +85,8 @@ public:
 
        /// return the unique ID of this paragraph
        int id() const;
-       ///
-       void read();
+       /// Set the Id of this paragraph.
+       void id(int);
 
        ///
        int startTeXParParams(BufferParams const &, std::ostream &, bool) const;
@@ -104,13 +97,14 @@ public:
 
        ///
        bool simpleTeXOnePar(Buffer const *, BufferParams const &,
-                            std::ostream &, TexRow & texrow, bool moving_arg);
+                            LyXFont const & outerfont, std::ostream &,
+                            TexRow & texrow, LatexRunParams const &);
 
        ///
-       bool hasSameLayout(Paragraph const * par) const;
+       bool hasSameLayout(Paragraph const & par) const;
 
        ///
-       void makeSameLayout(Paragraph const * par);
+       void makeSameLayout(Paragraph const & par);
 
        ///
        Inset * inInset() const;
@@ -126,7 +120,7 @@ public:
        ///
        bool empty() const;
        ///
-       void setContentsFromPar(Paragraph * par);
+       void setContentsFromPar(Paragraph const & par);
        ///
        void clearContents();
 
@@ -142,24 +136,7 @@ public:
        char itemdepth;
 
        ///
-       InsetBibitem * bibitem();  // ale970302
-
-#ifndef NO_NEXT
-       ///
-       void next(Paragraph *);
-       /** these function are able to hide closed footnotes
-        */
-       Paragraph * next();
-       ///
-       Paragraph const * next() const;
-
-       ///
-       void previous(Paragraph *);
-       ///
-       Paragraph * previous();
-       ///
-       Paragraph const * previous() const;
-#endif
+       InsetBibitem * bibitem() const;  // ale970302
 
        /// initialise tracking for this par
        void trackChanges(Change::Type = Change::UNCHANGED);
@@ -194,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;
 
        ///
@@ -219,9 +197,9 @@ public:
        /// definite erase
        void eraseIntern(lyx::pos_type pos);
        /// erase the char at the given position
-       void erase(lyx::pos_type pos);
-       /// erase the given range. Returns true if actually erased.
-       bool erase(lyx::pos_type start, lyx::pos_type end);
+       bool erase(lyx::pos_type pos);
+       /// erase the given range. Returns the number of chars actually erased
+       int erase(lyx::pos_type start, lyx::pos_type end);
 
        /** Get uninstantiated font setting. Returns the difference
            between the characters font and the layoutfont.
@@ -239,9 +217,12 @@ public:
            attributes with values LyXFont::INHERIT, LyXFont::IGNORE or
            LyXFont::TOGGLE.
        */
-       LyXFont const getFont(BufferParams const &, lyx::pos_type pos) const;
-       LyXFont const getLayoutFont(BufferParams const &) const;
-       LyXFont const getLabelFont(BufferParams const &) const;
+       LyXFont const getFont(BufferParams const &, lyx::pos_type pos,
+                             LyXFont const & outerfont) const;
+       LyXFont const getLayoutFont(BufferParams const &,
+                                   LyXFont const & outerfont) const;
+       LyXFont const getLabelFont(BufferParams const &,
+                                  LyXFont const & outerfont) const;
        ///
        value_type getChar(lyx::pos_type pos) const;
        ///
@@ -313,26 +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 &);
-#ifndef NO_NEXT
        ///
-       Paragraph * next_;
-       ///
-       Paragraph * previous_;
-#else
-       Paragraph * next_par_;
-       Paragraph * prev_par_;
-#endif
+       boost::optional<Buffer const *> buffer_;
+
        struct Pimpl;
        ///
        friend struct Paragraph::Pimpl;
        ///
        Pimpl * pimpl_;
+
 };
 
 
@@ -347,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