X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph.h;h=2d25f20d2dd4fa6869af21490bc4813db1aaa177;hb=7f68b94d8a7fba6942890b7733403192b98b040a;hp=fa2a4eb92ac42c9078aabdb5162af4712366c690;hpb=462eca7d1a1c15d520b89288f8bd83201092a88d;p=lyx.git diff --git a/src/paragraph.h b/src/paragraph.h index fa2a4eb92a..2d25f20d2d 100644 --- a/src/paragraph.h +++ b/src/paragraph.h @@ -19,23 +19,26 @@ #include "changes.h" #include "InsetList.h" #include "lyxlayout_ptr_fwd.h" -#include "lyxfont.h" // Just for LyXFont::FONT_SIZE #include "RowList_fwd.h" -#include "insets/inset.h" // Just for InsetOld::Code +#include "insets/insetbase.h" // only for InsetBase::Code #include "support/types.h" -#include "support/std_string.h" +#include class Buffer; class BufferParams; class BufferView; class Counters; +class InsetBase; class InsetBibitem; +class InsetOld_code; class Language; class LaTeXFeatures; -class LatexRunParams; +class OutputParams; +class LyXFont; +class LyXFont_size; class ParagraphParameters; class TexRow; class UpdatableInset; @@ -44,7 +47,7 @@ class UpdatableInset; class Paragraph { public: /// - enum META_KIND { + enum { /// Note that this is 1 right now to avoid /// crashes where getChar() is called wrongly /// (returning 0) - if this was 0, then we'd @@ -56,17 +59,21 @@ public: typedef char value_type; /// typedef lyx::depth_type depth_type; + /// + typedef std::vector TextContainer; /// Paragraph(); - /// Paragraph(Paragraph const &); /// - void operator=(Paragraph const &); - /// the destructor removes the new paragraph from the list + Paragraph & operator=(Paragraph const &); + /// ~Paragraph(); + /// + int id() const; + /// Language const * getParLanguage(BufferParams const &) const; /// @@ -75,13 +82,25 @@ public: void changeLanguage(BufferParams const & bparams, Language const * from, Language const * to); /// - bool isMultiLingual(BufferParams const &); + bool isMultiLingual(BufferParams const &) const; /// - string const asString(Buffer const &, bool label) const; + std::string const asString(Buffer const &, + OutputParams const & runparams, + bool label) const; + /// + std::string const asString(Buffer const &, bool label) const; + /// + std::string const Paragraph::asString(Buffer const & buffer, + lyx::pos_type beg, + lyx::pos_type end, + bool label) const; /// - string const asString(Buffer const &, lyx::pos_type beg, lyx::pos_type end, - bool label) const; + std::string const asString(Buffer const &, + OutputParams const & runparams, + lyx::pos_type beg, + lyx::pos_type end, + bool label) const; /// void write(Buffer const &, std::ostream &, BufferParams const &, @@ -89,11 +108,6 @@ public: /// void validate(LaTeXFeatures &) const; - /// 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; @@ -104,7 +118,22 @@ public: /// bool simpleTeXOnePar(Buffer const &, BufferParams const &, LyXFont const & outerfont, std::ostream &, - TexRow & texrow, LatexRunParams const &); + TexRow & texrow, OutputParams const &); + + /// + void simpleLinuxDocOnePar(Buffer const & buf, + std::ostream & os, + LyXFont const & outerfont, + OutputParams const & runparams, + lyx::depth_type depth) const; + + /// + void simpleDocBookOnePar(Buffer const & buf, + std::ostream &, + LyXFont const & outerfont, + OutputParams const & runparams, + lyx::depth_type depth, + bool labelid) const; /// bool hasSameLayout(Paragraph const & par) const; @@ -112,17 +141,21 @@ public: /// void makeSameLayout(Paragraph const & par); + /// + void setInsetOwner(UpdatableInset * inset); /// UpdatableInset * inInset() const; /// - void setInsetOwner(UpdatableInset * inset); + InsetBase::Code ownerCode() const; /// - void deleteInsetsLyXText(BufferView *); + bool autoBreakRows() const; + /// + bool forceDefaultParagraphs() const; /// - lyx::pos_type size() const; + lyx::pos_type size() const { return text_.size(); } /// - bool empty() const; + bool empty() const { return text_.empty(); } /// void setContentsFromPar(Paragraph const & par); /// @@ -133,11 +166,8 @@ public: /// void layout(LyXLayout_ptr const & new_layout); - /// - char enumdepth; - - /// - char itemdepth; + /// This is the item depth, only used by enumerate and itemize + signed char itemdepth; /// InsetBibitem * bibitem() const; // ale970302 @@ -180,15 +210,17 @@ public: /// 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; + lyx::pos_type beginOfBody() const; + /// recompute this value + void setBeginOfBody(); /// - string const & getLabelstring() const; + std::string const & getLabelstring() const; /// the next two functions are for the manual labels - string const getLabelWidthString() const; + std::string const getLabelWidthString() const; /// - void setLabelWidthString(string const & s); + void setLabelWidthString(std::string const & s); /// char getAlign() const; /// The nesting depth of a paragraph @@ -243,31 +275,35 @@ public: /// pos <= size() (there is a dummy font change at the end of each par) void setFont(lyx::pos_type pos, LyXFont const & font); /// Returns the height of the highest font in range - LyXFont::FONT_SIZE - highestFontInRange(lyx::pos_type startpos, - lyx::pos_type endpos, - LyXFont::FONT_SIZE const def_size) const; + LyXFont_size highestFontInRange(lyx::pos_type startpos, + lyx::pos_type endpos, + LyXFont_size def_size) const; + /// + void insert(lyx::pos_type pos, std::string const & str, + LyXFont const & font); /// void insertChar(lyx::pos_type pos, value_type c); /// - void insertChar(lyx::pos_type pos, value_type c, LyXFont const &, Change change = Change(Change::INSERTED)); + void insertChar(lyx::pos_type pos, value_type c, + LyXFont const &, Change change = Change(Change::INSERTED)); /// bool checkInsertChar(LyXFont &); /// - void insertInset(lyx::pos_type pos, InsetOld * inset); + void insertInset(lyx::pos_type pos, InsetBase * inset); /// - void insertInset(lyx::pos_type pos, InsetOld * inset, LyXFont const &, Change change = Change(Change::INSERTED)); + void insertInset(lyx::pos_type pos, InsetBase * inset, + LyXFont const &, Change change = Change(Change::INSERTED)); /// - bool insetAllowed(InsetOld::Code code); + bool insetAllowed(InsetOld_code code); /// - InsetOld * getInset(lyx::pos_type pos); + InsetBase * getInset(lyx::pos_type pos); /// - InsetOld const * getInset(lyx::pos_type pos) const; + InsetBase const * getInset(lyx::pos_type pos) const; /// bool isHfill(lyx::pos_type pos) const; - /// - bool isInset(lyx::pos_type pos) const; + /// hinted by profiler + bool isInset(lyx::pos_type pos) const { return getChar(pos) == META_INSET; } /// bool isNewline(lyx::pos_type pos) const; /// @@ -282,7 +318,7 @@ public: bool isWord(lyx::pos_type pos) const; /// returns -1 if inset not found - int getPositionOfInset(InsetOld const * inset) const; + int getPositionOfInset(InsetBase const * inset) const; /// int stripLeadingSpaces(); @@ -292,11 +328,20 @@ 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(); /// ParagraphParameters const & params() const; + + /// + RowList::iterator getRow(lyx::pos_type pos); + /// + RowList::const_iterator getRow(lyx::pos_type pos) const; + /// + size_t row(lyx::pos_type pos) const; + /// InsetList insetlist; @@ -304,10 +349,19 @@ public: mutable RowList rows; /// last draw y position (baseline of top row) int y; + /// total height of paragraph + unsigned int height; + /// total width of paragraph, may differ from workwidth + unsigned int width; private: /// LyXLayout_ptr layout_; + /// 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; ///