X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph.h;h=79ae05e6d6023488724d38a04382a581fdf0bc79;hb=09e01879979643949f1f2c7216023f1f35d5ada2;hp=c89c15b787e06439330285ede006b3f86d7906fb;hpb=e412a2a53ea60a327d6ea8b8b802cb1b169a7108;p=lyx.git diff --git a/src/paragraph.h b/src/paragraph.h index c89c15b787..79ae05e6d6 100644 --- a/src/paragraph.h +++ b/src/paragraph.h @@ -13,10 +13,11 @@ #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 "LString.h" @@ -111,8 +112,6 @@ public: void setInsetOwner(UpdatableInset * inset); /// void deleteInsetsLyXText(BufferView *); - /// - void resizeInsetsLyXText(BufferView *); /// lyx::pos_type size() const; @@ -222,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; /// @@ -242,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; @@ -278,14 +276,17 @@ 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(); /// @@ -293,6 +294,9 @@ public: /// InsetList insetlist; + /// + mutable RowList rows; + private: /// LyXLayout_ptr layout_; @@ -317,7 +321,4 @@ 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