X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph.h;h=9523a23a7cb73464533ad78c28294a8a451620e6;hb=b2f4586c984226bcc945d93891f3d0736d6ffb43;hp=c1c58ac2bf508aa5e0e5a8b0ccd5acdfcfcc051d;hpb=9d0ba3ddf295225939fcb04ffc11d6de509abdc8;p=lyx.git diff --git a/src/paragraph.h b/src/paragraph.h index c1c58ac2bf..9523a23a7c 100644 --- a/src/paragraph.h +++ b/src/paragraph.h @@ -18,15 +18,14 @@ #include "LString.h" -#include - #include "insets/inset.h" // Just for Inset::Code -#include "layout.h" +#include "lyxfont.h" // Just for LyXFont::FONT_SIZE +#include "support/types.h" class ParagraphParameters; class BufferParams; class TexRow; -struct LaTeXFeatures; +class LaTeXFeatures; class InsetBibKey; class BufferView; class Language; @@ -80,13 +79,6 @@ public: typedef char value_type; /// The same as ParameterStruct::depth_type typedef unsigned int depth_type; - /// - typedef std::vector TextContainer; - /// - /* This should be TextContainer::size_type, but we need - signed values for now. - */ - typedef TextContainer::difference_type size_type; /// Paragraph(); @@ -107,11 +99,11 @@ public: Language const * from, Language const * to); /// bool isMultiLingual(BufferParams const &); - /// + /// string const asString(Buffer const *, bool label); /// - string const asString(Buffer const *, size_type beg, size_type end, + string const asString(Buffer const *, lyx::pos_type beg, lyx::pos_type end, bool label); /// @@ -131,6 +123,14 @@ public: Paragraph * TeXOnePar(Buffer const *, BufferParams const &, std::ostream &, TexRow & texrow, bool moving_arg); + + /// + int startTeXParParams(BufferParams const &, std::ostream &) const; + + /// + int endTeXParParams(BufferParams const &, std::ostream &) const; + + /// bool simpleTeXOnePar(Buffer const *, BufferParams const &, std::ostream &, TexRow & texrow, bool moving_arg); @@ -160,15 +160,17 @@ public: void resizeInsetsLyXText(BufferView *); /// - size_type size() const; + lyx::pos_type size() const; /// void setContentsFromPar(Paragraph * par); /// void clearContents(); /// - LyXTextClass::LayoutList::size_type layout; - + string const & layout() const; + /// + void layout(string const & new_layout); + /// void setCounter(int i, int v); /// @@ -182,8 +184,8 @@ public: /// char itemdepth; - /// - InsetBibKey * bibkey; // ale970302 + /// + InsetBibKey * bibkey; // ale970302 /// void next(Paragraph *); @@ -218,30 +220,28 @@ public: /// void setLabelWidthString(string const & s); /// - LyXTextClass::LayoutList::size_type getLayout() const; - /// char getAlign() const; - /// + /// The nesting depth of a paragraph depth_type getDepth() const; + /// The maximal possible depth of a paragraph after this one + depth_type getMaxDepthAfter(Buffer const *) const; /// - void setLayout(LyXTextClass::LayoutList::size_type new_layout); - /// - void setOnlyLayout(LyXTextClass::LayoutList::size_type new_layout); + void applyLayout(string const & new_layout); /// int getFirstCounter(int i) const; /// - void erase(size_type pos); + void erase(lyx::pos_type pos); /** the flag determines wether the layout should be copied */ - void breakParagraph(BufferParams const &, size_type pos, int flag); + void breakParagraph(BufferParams const &, lyx::pos_type pos, int flag); /// - void breakParagraphConservative(BufferParams const &, size_type pos); + void breakParagraphConservative(BufferParams const &, lyx::pos_type pos); /** Get unistantiated font setting. Returns the difference between the characters font and the layoutfont. This is what is stored in the fonttable */ LyXFont const - getFontSettings(BufferParams const &, size_type pos) const; + getFontSettings(BufferParams const &, lyx::pos_type pos) const; /// LyXFont const getFirstFontSettings() const; @@ -252,109 +252,104 @@ public: attributes with values LyXFont::INHERIT, LyXFont::IGNORE or LyXFont::TOGGLE. */ - LyXFont const getFont(BufferParams const &, size_type pos) const; + LyXFont const getFont(BufferParams const &, lyx::pos_type pos) const; LyXFont const getLayoutFont(BufferParams const &) const; LyXFont const getLabelFont(BufferParams const &) const; /// - value_type getChar(size_type pos) const; + value_type getChar(lyx::pos_type pos) const; /// - value_type getUChar(BufferParams const &, size_type pos) const; + value_type getUChar(BufferParams const &, lyx::pos_type pos) const; /// The position must already exist. - void setChar(size_type pos, value_type c); + void setChar(lyx::pos_type pos, value_type c); /// - void setFont(size_type pos, LyXFont const & font); + void setFont(lyx::pos_type pos, LyXFont const & font); /// Returns the height of the highest font in range - LyXFont::FONT_SIZE highestFontInRange(size_type startpos, - size_type endpos, - LyXFont::FONT_SIZE const def_size) const; + LyXFont::FONT_SIZE highestFontInRange(lyx::pos_type startpos, + lyx::pos_type endpos, + LyXFont::FONT_SIZE const def_size) const; /// - void insertChar(size_type pos, value_type c); + void insertChar(lyx::pos_type pos, value_type c); /// - void insertChar(size_type pos, value_type c, LyXFont const &); + void insertChar(lyx::pos_type pos, value_type c, LyXFont const &); /// bool checkInsertChar(LyXFont &); /// - void insertInset(size_type pos, Inset * inset); + void insertInset(lyx::pos_type pos, Inset * inset); /// - void insertInset(size_type pos, Inset * inset, LyXFont const &); + void insertInset(lyx::pos_type pos, Inset * inset, LyXFont const &); /// bool insetAllowed(Inset::Code code); /// - Inset * getInset(size_type pos); + Inset * getInset(lyx::pos_type pos); /// - Inset const * getInset(size_type pos) const; + 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 &, size_type pos) const; + void copyIntoMinibuffer(Buffer const &, lyx::pos_type pos) const; /// - void cutIntoMinibuffer(BufferParams const &, size_type pos); + void cutIntoMinibuffer(BufferParams const &, lyx::pos_type pos); /// - bool insertFromMinibuffer(size_type pos); + bool insertFromMinibuffer(lyx::pos_type pos); /// - bool isHfill(size_type pos) const; + bool isHfill(lyx::pos_type pos) const; /// - bool isInset(size_type pos) const; + bool isInset(lyx::pos_type pos) const; /// - bool isNewline(size_type pos) const; + bool isNewline(lyx::pos_type pos) const; /// - bool isSeparator(size_type pos) const; + bool isSeparator(lyx::pos_type pos) const; /// - bool isLineSeparator(size_type pos) const; + bool isLineSeparator(lyx::pos_type pos) const; /// - bool isKomma(size_type pos) const; + bool isKomma(lyx::pos_type pos) const; /// Used by the spellchecker - bool isLetter(size_type pos) const; + bool isLetter(lyx::pos_type pos) const; /// - bool isWord(size_type pos) const; - - /** This one resets all layout and dtp switches but not the font - of the single characters - */ - void clear(); + bool isWord(lyx::pos_type pos) const; /** paste this paragraph with the next one be carefull, this doesent make any check at all */ void pasteParagraph(BufferParams const &); - /// used to remove the error messages - int autoDeleteInsets(); - /// returns -1 if inset not found - int getPositionOfInset(Inset * inset) const; + int getPositionOfInset(Inset const * inset) const; /// some good comment here John? Paragraph * getParFromID(int id) const; /// - int stripLeadingSpaces(LyXTextClassList::size_type tclass); + int stripLeadingSpaces(lyx::textclass_type tclass); #ifndef NO_PEXTRA_REALLY - /* If I set a PExtra Indent on one paragraph of a ENV_LIST-TYPE - I have to set it on each of it's elements */ + /* If I set a PExtra Indent on one paragraph of a ENV_LIST-TYPE + I have to set it on each of it's elements */ /// - void setPExtraType(BufferParams const &, int type, + void setPExtraType(BufferParams const &, int type, string const & width, string const & widthp); /// - void unsetPExtraType(BufferParams const &); + void unsetPExtraType(BufferParams const &); #endif /// bool sgmlConvertChar(char c, string & sgml_string); + /// + bool isFreeSpacing() const; ParagraphParameters & params(); ParagraphParameters const & params() const; private: - + /// + string layout_; /// struct InsetTable { /// - size_type pos; + lyx::pos_type pos; /// Inset * inset; /// - InsetTable(size_type p, Inset * i) : pos(p), inset(i) {} + InsetTable(lyx::pos_type p, Inset * i) : pos(p), inset(i) {} }; /// @@ -377,7 +372,10 @@ public: /// Inset * operator*() { return it->inset; } /// - size_type getPos() const {return it->pos; } + Inset * operator->() { return it->inset; } + + /// + lyx::pos_type getPos() const { return it->pos; } /// bool operator==(inset_iterator const & iter) const { return it == iter.it; @@ -398,7 +396,7 @@ public: /// inset_iterator inset_iterator_end(); /// - inset_iterator InsetIterator(size_type pos); + inset_iterator InsetIterator(lyx::pos_type pos); private: /// if anything uses this we don't want it to. @@ -415,10 +413,4 @@ private: Pimpl * pimpl_; }; - -inline bool isMetaInset(Paragraph const * par, Paragraph::size_type const pos) -{ - return par->getChar(pos) == Paragraph::META_INSET; -} - #endif