X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph.h;h=f6e437064ae313d7a18ea5d422e93b66c1e5933a;hb=34046e3c4df63b34bd75d5bca09ee3809815b7fc;hp=220049ec8eb8f725d6b5668c8b83cc916201d067;hpb=cd6e293ed7c588748fe0cf5927f46dc5e9ae6e35;p=lyx.git diff --git a/src/paragraph.h b/src/paragraph.h index 220049ec8e..f6e437064a 100644 --- a/src/paragraph.h +++ b/src/paragraph.h @@ -1,9 +1,9 @@ // -*- C++ -*- /* This file is part of - * ====================================================== - * + * ====================================================== + * * LyX, The Document Processor - * + * * Copyright 1995 Matthias Ettrich * Copyright 1995-2001 The LyX Team. * @@ -19,13 +19,13 @@ #include "LString.h" #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; @@ -77,12 +77,8 @@ public: }; /// typedef char value_type; - /// The same as ParameterStruct::depth_type + /// The same as ParameterStruct::depth_type typedef unsigned int depth_type; - /// a position in the paragraph - typedef lyx::pos_type pos_type; - /// a layout number - typedef lyx::layout_type layout_type; /// Paragraph(); @@ -103,19 +99,19 @@ public: Language const * from, Language const * to); /// bool isMultiLingual(BufferParams const &); - /// + /// string const asString(Buffer const *, bool label); /// - string const asString(Buffer const *, pos_type beg, pos_type end, + string const asString(Buffer const *, lyx::pos_type beg, lyx::pos_type end, bool label); - + /// void writeFile(Buffer const *, std::ostream &, BufferParams const &, depth_type) const; /// void validate(LaTeXFeatures &) const; - + /// int id() const; /// @@ -127,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); @@ -156,14 +160,16 @@ public: void resizeInsetsLyXText(BufferView *); /// - pos_type size() const; + lyx::pos_type size() const; /// void setContentsFromPar(Paragraph * par); /// void clearContents(); /// - layout_type layout; + string const & layout() const; + /// + void layout(string const & new_layout); /// void setCounter(int i, int v); @@ -174,11 +180,11 @@ public: /// char enumdepth; - + /// char itemdepth; - /// + /// InsetBibKey * bibkey; // ale970302 /// @@ -200,44 +206,42 @@ public: Paragraph * depthHook(depth_type depth); /// for the environments Paragraph const * depthHook(depth_type depth) const; - /// + /// Paragraph * outerHook(); - /// + /// Paragraph const * outerHook() const; /// int beginningOfMainBody() const; /// string const & getLabelstring() const; - + /// the next two functions are for the manual labels string const getLabelWidthString() const; /// void setLabelWidthString(string const & s); /// - layout_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(layout_type new_layout); - /// - void setOnlyLayout(layout_type new_layout); + void applyLayout(string const & new_layout); /// int getFirstCounter(int i) const; /// - void erase(pos_type pos); + void erase(lyx::pos_type pos); /** the flag determines wether the layout should be copied - */ - void breakParagraph(BufferParams const &, pos_type pos, int flag); + */ + void breakParagraph(BufferParams const &, lyx::pos_type pos, int flag); /// - void breakParagraphConservative(BufferParams const &, pos_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 &, pos_type pos) const; + getFontSettings(BufferParams const &, lyx::pos_type pos) const; /// LyXFont const getFirstFontSettings() const; @@ -245,87 +249,79 @@ public: font attached to this paragraph. If pos == -2, use the label font of the layout attached here. In all cases, the font is instantiated, i.e. does not have any - attributes with values LyXFont::INHERIT, LyXFont::IGNORE or + attributes with values LyXFont::INHERIT, LyXFont::IGNORE or LyXFont::TOGGLE. */ - LyXFont const getFont(BufferParams const &, pos_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(pos_type pos) const; + value_type getChar(lyx::pos_type pos) const; /// - value_type getUChar(BufferParams const &, pos_type pos) const; + value_type getUChar(BufferParams const &, lyx::pos_type pos) const; /// The position must already exist. - void setChar(pos_type pos, value_type c); + void setChar(lyx::pos_type pos, value_type c); /// - void setFont(pos_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(pos_type startpos, - pos_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(pos_type pos, value_type c); + void insertChar(lyx::pos_type pos, value_type c); /// - void insertChar(pos_type pos, value_type c, LyXFont const &); + void insertChar(lyx::pos_type pos, value_type c, LyXFont const &); /// bool checkInsertChar(LyXFont &); /// - void insertInset(pos_type pos, Inset * inset); + void insertInset(lyx::pos_type pos, Inset * inset); /// - void insertInset(pos_type pos, Inset * inset, LyXFont const &); + void insertInset(lyx::pos_type pos, Inset * inset, LyXFont const &); /// bool insetAllowed(Inset::Code code); /// - Inset * getInset(pos_type pos); + Inset * getInset(lyx::pos_type pos); /// - Inset const * getInset(pos_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 &, pos_type pos) const; + void copyIntoMinibuffer(Buffer const &, lyx::pos_type pos) const; /// - void cutIntoMinibuffer(BufferParams const &, pos_type pos); + void cutIntoMinibuffer(BufferParams const &, lyx::pos_type pos); /// - bool insertFromMinibuffer(pos_type pos); + bool insertFromMinibuffer(lyx::pos_type pos); /// - bool isHfill(pos_type pos) const; + bool isHfill(lyx::pos_type pos) const; /// - bool isInset(pos_type pos) const; + bool isInset(lyx::pos_type pos) const; /// - bool isNewline(pos_type pos) const; + bool isNewline(lyx::pos_type pos) const; /// - bool isSeparator(pos_type pos) const; + bool isSeparator(lyx::pos_type pos) const; /// - bool isLineSeparator(pos_type pos) const; + bool isLineSeparator(lyx::pos_type pos) const; /// - bool isKomma(pos_type pos) const; + bool isKomma(lyx::pos_type pos) const; /// Used by the spellchecker - bool isLetter(pos_type pos) const; - /// - bool isWord(pos_type pos) const; - - /** This one resets all layout and dtp switches but not the font - of the single characters - */ - void clear(); + bool isLetter(lyx::pos_type pos) const; + /// + 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 @@ -338,19 +334,22 @@ public: #endif /// bool sgmlConvertChar(char c, string & sgml_string); + /// + bool isFreeSpacing() const; ParagraphParameters & params(); ParagraphParameters const & params() const; private: - + /// + string layout_; /// struct InsetTable { /// - pos_type pos; + lyx::pos_type pos; /// Inset * inset; /// - InsetTable(pos_type p, Inset * i) : pos(p), inset(i) {} + InsetTable(lyx::pos_type p, Inset * i) : pos(p), inset(i) {} }; /// @@ -373,7 +372,10 @@ public: /// Inset * operator*() { return it->inset; } /// - pos_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; @@ -388,13 +390,13 @@ public: }; /// friend class inset_iterator; - + /// inset_iterator inset_iterator_begin(); /// inset_iterator inset_iterator_end(); /// - inset_iterator InsetIterator(pos_type pos); + inset_iterator InsetIterator(lyx::pos_type pos); private: /// if anything uses this we don't want it to. @@ -411,9 +413,4 @@ private: Pimpl * pimpl_; }; -inline bool isMetaInset(Paragraph const * par, Paragraph::pos_type const pos) -{ - return par->getChar(pos) == Paragraph::META_INSET; -} - #endif