Fix bug 886 and others not reported related with the document paper size.

[lyx.git] / src / paragraph.h

diff --git a/src/paragraph.h b/src/paragraph.h
index 26d11218283e4f9d982921cec162fb9a093141c7..b16ac0d5b0c85b34501722bc61a1182aafcd2f90 100644 (file)
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -26,9 +26,8 @@
 
 #include "support/types.h"
 
-#include <boost/assert.hpp>
-
 #include <string>
+#include <utility>
 
 class Buffer;
 class BufferParams;
@@ -46,7 +45,7 @@ class OutputParams;
 class PainterInfo;
 class ParagraphParameters;
 class TexRow;
-class UpdatableInset;
+
 
 /// A Paragraph holds all text, attributes and insets in a text paragraph
 class Paragraph  {
@@ -75,7 +74,6 @@ public:
        Paragraph & operator=(Paragraph const &);
        ///
        ~Paragraph();
-
        ///
        int id() const;
 
@@ -134,7 +132,7 @@ public:
                                  lyx::depth_type depth) const;
 
        /// Can we drop the standard paragraph wrapper?
-       bool Paragraph::emptyTag() const;
+       bool emptyTag() const;
 
        /// Get the id of the paragraph, usefull for docbook and linuxdoc
        std::string getID(Buffer const & buf,
@@ -163,9 +161,9 @@ public:
        void makeSameLayout(Paragraph const & par);
 
        ///
-       void setInsetOwner(UpdatableInset * inset);
+       void setInsetOwner(InsetBase * inset);
        ///
-       UpdatableInset * inInset() const;
+       InsetBase * inInset() const;
        ///
        InsetBase::Code ownerCode() const;
        ///
@@ -280,20 +278,16 @@ public:
                                   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.
+        * span of characters. This method will return the first and
+        * the last last positions 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;
+       std::pair<lyx::pos_type, lyx::pos_type> getFontSpan(lyx::pos_type pos) const;
        ///
        /// this is a bottleneck.
-       value_type getChar(lyx::pos_type pos) const
-       {
-               BOOST_ASSERT(pos >= 0);
-               BOOST_ASSERT(pos < int(text_.size()));
-               return text_[pos];
-       }
-       ///
+       value_type getChar(lyx::pos_type pos) const { return text_[pos]; }
+       /// Get the char, but mirror all bracket characters if it is right-to-left
        value_type getUChar(BufferParams const &, lyx::pos_type pos) const;
        /// The position must already exist.
        void setChar(lyx::pos_type pos, value_type c);
@@ -326,6 +320,9 @@ public:
        InsetBase * getInset(lyx::pos_type pos);
        ///
        InsetBase const * getInset(lyx::pos_type pos) const;
+       ///
+       InsetList insetlist;
+
 
        ///
        bool isHfill(lyx::pos_type pos) const;
@@ -344,7 +341,7 @@ public:
        /// returns -1 if inset not found
        int getPositionOfInset(InsetBase const * inset) const;
 
-       ///
+       /// Returns the number of line breaks and white-space stripped at the start
        int stripLeadingSpaces();
 
        /// return true if we allow multiple spaces
@@ -352,7 +349,7 @@ public:
 
        /// return true if we allow this par to stay empty
        bool allowEmpty() const;
-       ////
+       ///
        unsigned char transformChar(unsigned char c, lyx::pos_type pos) const;
        ///
        ParagraphParameters & params();
@@ -366,47 +363,43 @@ public:
        ///
        size_t pos2row(lyx::pos_type pos) const;
 
-       ///
-       InsetList insetlist;
-
        /// total height of paragraph
        unsigned int height() const { return dim_.height(); }
        /// total width of paragraph, may differ from workwidth
        unsigned int width() const { return dim_.width(); }
        unsigned int ascent() const { return dim_.ascent(); }
        unsigned int descent() const { return dim_.descent(); }
-       ///
+       /// LyXText updates the rows using this access point
        RowList & rows() { return rows_; }
-       ///
+       /// The painter and others use this
        RowList const & rows() const { return rows_; }
 
-       // compute paragraph metrics    
-       void metrics(MetricsInfo & mi, Dimension & dim, LyXText & text);
-       // draw paragraph
-       void draw(PainterInfo & pi, int x, int y, LyXText & text) const;
-       /// dump some information
-       void dump() const;
+       /// LyXText::redoParagraph updates this
+       Dimension & dim() { return dim_; }
 
+       /// dump some information to lyxerr
+       void dump() const;
+private:
        /// cached dimensions of paragraph
        Dimension dim_;
 
-private:
        ///
        mutable RowList rows_;
        ///
        LyXLayout_ptr layout_;
-       /// keeping this here instead of in the pimpl makes LyX >10% faster
-       // for average tasks as buffer loading/switching etc.
+       /**
+        * Keeping this here instead of in the pimpl makes LyX >10% faster
+        * for average tasks as buffer loading/switching etc.
+        */
        TextContainer text_;
        /// end of label
        lyx::pos_type begin_of_body_;
 
-       struct Pimpl;
+       class Pimpl;
        ///
-       friend struct Paragraph::Pimpl;
+       friend class Paragraph::Pimpl;
        ///
        Pimpl * pimpl_;
-
 };