X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph.h;h=79ae05e6d6023488724d38a04382a581fdf0bc79;hb=09e01879979643949f1f2c7216023f1f35d5ada2;hp=248107ff6c61ed4c9a6a7d91340317c8cb95843c;hpb=653eaace76a8d667375e12c5282cb85c3e903401;p=lyx.git diff --git a/src/paragraph.h b/src/paragraph.h index 248107ff6c..79ae05e6d6 100644 --- a/src/paragraph.h +++ b/src/paragraph.h @@ -13,35 +13,30 @@ #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" +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; +class UpdatableInset; /// 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 &, bool same_ids); + Paragraph(Paragraph const &); + /// + void operator=(Paragraph const &); /// the destructor removes the new paragraph from the list ~Paragraph(); @@ -92,6 +85,8 @@ public: /// return the unique ID of this paragraph int id() const; + /// Set the Id of this paragraph. + void id(int); /// int startTeXParParams(BufferParams const &, std::ostream &, bool) const; @@ -103,7 +98,7 @@ public: /// bool simpleTeXOnePar(Buffer const *, BufferParams const &, LyXFont const & outerfont, std::ostream &, - TexRow & texrow, bool moving_arg); + TexRow & texrow, LatexRunParams const &); /// bool hasSameLayout(Paragraph const & par) const; @@ -112,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; @@ -141,24 +134,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); @@ -193,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; /// @@ -218,7 +195,7 @@ public: /// definite erase void eraseIntern(lyx::pos_type pos); /// erase the char at the given position - void erase(lyx::pos_type pos); + 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); @@ -244,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; /// @@ -264,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; @@ -300,44 +276,37 @@ 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(); + mutable RowList rows; + 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 + struct Pimpl; /// friend struct Paragraph::Pimpl; /// Pimpl * pimpl_; - /// unimplemented - void operator=(Paragraph const &); };