X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph.h;h=5c9ba843c3858caae9f60fad1929e90adcdea7cd;hb=fe390e9da1538e20eabbc98977d845295f8e563d;hp=f7fc207b2b1fe21b0da7842e1c4471d4ef8e24c6;hpb=4e2dae89d2edb10e6366d254673ead57355fda49;p=lyx.git diff --git a/src/paragraph.h b/src/paragraph.h index f7fc207b2b..5c9ba843c3 100644 --- a/src/paragraph.h +++ b/src/paragraph.h @@ -9,69 +9,41 @@ #ifndef PARAGRAPH_H #define PARAGRAPH_H -#ifdef __GNUG__ -#pragma interface -#endif - -#include "LString.h" - #include "lyxlayout_ptr_fwd.h" -#include "insets/inset.h" // Just for Inset::Code #include "lyxfont.h" // Just for LyXFont::FONT_SIZE +#include "InsetList.h" + +#include "insets/inset.h" // Just for Inset::Code + #include "support/types.h" +#include "changes.h" -class ParagraphParameters; +#include "LString.h" + +class Buffer; class BufferParams; -class TexRow; -class LaTeXFeatures; -class InsetBibKey; class BufferView; +class Counters; +class InsetBibitem; class Language; - -// After 1.2.0 is released, during 1.3.0cvs, we enable this. And after -// a while we verify that reading of 1.2.x files work perfectly we remove -// this code completely. (Lgb) -#define NO_PEXTRA_REALLY 1 - -// Define this if you want to try out the new storage container for -// paragraphs. std::container instead of obfuscated homegrown -// linked list. (Lgb) -// This is non working and far from finished. -// #define NO_NEXT 1 +class LaTeXFeatures; +class LatexRunParams; +class ParagraphParameters; +class TexRow; +class ParagraphList; +class UpdatableInset; /// A Paragraph holds all text, attributes and insets in a text paragraph class Paragraph { public: -#ifndef NO_PEXTRA_REALLY - /// - enum PEXTRA_TYPE { - /// - PEXTRA_NONE, - /// - PEXTRA_INDENT, - /// - PEXTRA_MINIPAGE, - /// - PEXTRA_FLOATFLT - }; - /// - enum MINIPAGE_ALIGNMENT { - /// - MINIPAGE_ALIGN_TOP, - /// - MINIPAGE_ALIGN_MIDDLE, - /// - MINIPAGE_ALIGN_BOTTOM - }; -#endif /// enum META_KIND { - /// - META_HFILL = 1, - /// - META_NEWLINE, - /// - META_INSET + /// Note that this is 1 right now to avoid + /// crashes where getChar() is called wrongly + /// (returning 0) - if this was 0, then we'd + /// try getInset() and crash. We should fix + /// all these places. + META_INSET = 1 }; /// typedef char value_type; @@ -80,11 +52,11 @@ public: /// Paragraph(); - /// this constructor inserts the new paragraph in a list - explicit - Paragraph(Paragraph * par); + /// - Paragraph(Paragraph const &, bool same_ids); + Paragraph(Paragraph const &); + /// + void operator=(Paragraph const &); /// the destructor removes the new paragraph from the list ~Paragraph(); @@ -99,28 +71,21 @@ public: bool isMultiLingual(BufferParams const &); /// - string const asString(Buffer const *, bool label); + string const asString(Buffer const *, bool label) const; /// string const asString(Buffer const *, lyx::pos_type beg, lyx::pos_type end, - bool label); + bool label) const; /// - void writeFile(Buffer const *, std::ostream &, BufferParams const &, - depth_type) const; + void write(Buffer const *, std::ostream &, BufferParams const &, + depth_type & depth) const; /// void validate(LaTeXFeatures &) const; - /// + /// return the unique ID of this paragraph int id() const; - /// - void id(int id_arg); - /// - void read(); - - /// - Paragraph * TeXOnePar(Buffer const *, BufferParams const &, - std::ostream &, TexRow & texrow, - bool moving_arg); + /// Set the Id of this paragraph. + void id(int); /// int startTeXParParams(BufferParams const &, std::ostream &, bool) const; @@ -131,27 +96,19 @@ public: /// bool simpleTeXOnePar(Buffer const *, BufferParams const &, - std::ostream &, TexRow & texrow, bool moving_arg); + LyXFont const & outerfont, std::ostream &, + TexRow & texrow, LatexRunParams const &); /// - Paragraph * TeXEnvironment(Buffer const *, BufferParams const &, - std::ostream &, TexRow & texrow); - /// - bool hasSameLayout(Paragraph const * par) const; + bool hasSameLayout(Paragraph const & par) const; /// - void makeSameLayout(Paragraph const * par); - - /// Is it the first par with same depth and layout? - bool isFirstInSequence() const; + void makeSameLayout(Paragraph const & par); - /** Check if the current paragraph is the last paragraph in a - proof environment */ - int getEndLabel() const; /// - Inset * inInset() const; + UpdatableInset * inInset() const; /// - void setInsetOwner(Inset * i); + void setInsetOwner(UpdatableInset * inset); /// void deleteInsetsLyXText(BufferView *); /// @@ -160,7 +117,9 @@ public: /// lyx::pos_type size() const; /// - void setContentsFromPar(Paragraph * par); + bool empty() const; + /// + void setContentsFromPar(Paragraph const & par); /// void clearContents(); @@ -169,13 +128,6 @@ public: /// void layout(LyXLayout_ptr const & new_layout); - /// - void setCounter(int i, int v); - /// - int getCounter(int i) const; - /// - void incCounter(int i); - /// char enumdepth; @@ -183,33 +135,48 @@ public: char itemdepth; /// - InsetBibKey * bibkey; // ale970302 + InsetBibitem * bibitem() const; // ale970302 - /// - void next(Paragraph *); - /** these function are able to hide closed footnotes - */ - Paragraph * next(); - /// - Paragraph const * next() const; + /// initialise tracking for this par + void trackChanges(Change::Type = Change::UNCHANGED); - /// - void previous(Paragraph *); - /// - Paragraph * previous(); - /// - Paragraph const * previous() const; + /// stop tracking + void untrackChanges(); + + /// set entire paragraph to new text for change tracking + void cleanChanges(); + + /// look up change type at given pos + Change::Type lookupChange(lyx::pos_type pos) const; + + /// look up change at given pos + Change const lookupChangeFull(lyx::pos_type pos) const; + + /// is there a change within the given range ? + bool isChanged(lyx::pos_type start, lyx::pos_type end) const; + + /// is there a non-addition in this range ? + bool isChangeEdited(lyx::pos_type start, lyx::pos_type end) const; + + /// set change at pos + void setChange(lyx::pos_type pos, Change::Type type); + + /// accept change + void acceptChange(lyx::pos_type start, lyx::pos_type end); + + /// reject change + void rejectChange(lyx::pos_type start, lyx::pos_type end); + + /// 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. + int beginningOfBody() const; - /// for the environments - 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; @@ -225,16 +192,15 @@ public: depth_type getMaxDepthAfter() const; /// void applyLayout(LyXLayout_ptr const & new_layout); - /// - int getFirstCounter(int i) const; - /// - void erase(lyx::pos_type pos); - /** the flag determines wether the layout should be copied - */ - void breakParagraph(BufferParams const &, lyx::pos_type pos, int flag); - /// - void breakParagraphConservative(BufferParams const &, lyx::pos_type pos); - /** Get unistantiated font setting. Returns the difference + + /// definite erase + void eraseIntern(lyx::pos_type pos); + /// erase the char at the given position + 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); + + /** Get uninstantiated font setting. Returns the difference between the characters font and the layoutfont. This is what is stored in the fonttable */ @@ -250,9 +216,12 @@ public: attributes with values LyXFont::INHERIT, LyXFont::IGNORE or LyXFont::TOGGLE. */ - LyXFont const getFont(BufferParams const &, lyx::pos_type pos) const; - LyXFont const getLayoutFont(BufferParams const &) const; - LyXFont const getLabelFont(BufferParams const &) const; + LyXFont const getFont(BufferParams const &, lyx::pos_type pos, + LyXFont const & outerfont) const; + LyXFont const getLayoutFont(BufferParams const &, + LyXFont const & outerfont) const; + LyXFont const getLabelFont(BufferParams const &, + LyXFont const & outerfont) const; /// value_type getChar(lyx::pos_type pos) const; /// @@ -262,19 +231,20 @@ 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::FONT_SIZE + highestFontInRange(lyx::pos_type startpos, + lyx::pos_type endpos, + LyXFont::FONT_SIZE const def_size) const; /// void insertChar(lyx::pos_type pos, value_type c); /// - void insertChar(lyx::pos_type pos, value_type c, LyXFont const &); + 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, Inset * inset); /// - void insertInset(lyx::pos_type pos, Inset * inset, LyXFont const &); + void insertInset(lyx::pos_type pos, Inset * inset, LyXFont const &, Change change = Change(Change::INSERTED)); /// bool insetAllowed(Inset::Code code); /// @@ -307,113 +277,50 @@ public: /// 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 &); - /// returns -1 if inset not found int getPositionOfInset(Inset const * inset) const; - /// some good comment here John? - Paragraph * getParFromID(int id) const; - /// int stripLeadingSpaces(); -#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 */ - /// - void setPExtraType(BufferParams const &, int type, - string const & width, string const & widthp); - /// - void unsetPExtraType(BufferParams const &); -#endif - /// - bool sgmlConvertChar(char c, string & sgml_string); - /// + /// return true if we allow multiple spaces bool isFreeSpacing() const; - ParagraphParameters & params(); - ParagraphParameters const & params() const; -private: - /// - LyXLayout_ptr layout_; -public: - /** Both these definitions must be made public to keep Compaq cxx 6.5 - * happy. - */ - /// - struct InsetTable { - /// - lyx::pos_type pos; - /// - Inset * inset; - /// - InsetTable(lyx::pos_type p, Inset * i) : pos(p), inset(i) {} - }; + /// return true if we allow this par to stay empty + bool allowEmpty() const; /// - typedef std::vector InsetList; -private: - /// - InsetList insetlist; -public: - /// - class inset_iterator { - public: - /// - inset_iterator() {} - // - inset_iterator(InsetList::iterator const & iter); - /// - inset_iterator & operator++() { - ++it; - return *this; - } - /// - Inset * operator*() { return it->inset; } - /// - Inset * operator->() { return it->inset; } - - /// - lyx::pos_type getPos() const { return it->pos; } - /// - bool operator==(inset_iterator const & iter) const { - return it == iter.it; - } - /// - bool operator!=(inset_iterator const & iter) const { - return it != iter.it; - } - private: - /// - InsetList::iterator it; - }; - /// - friend class inset_iterator; - + ParagraphParameters & params(); /// - inset_iterator inset_iterator_begin(); + ParagraphParameters const & params() const; /// - inset_iterator inset_iterator_end(); - /// returns inset iterator of the first inset at or after pos. - inset_iterator InsetIterator(lyx::pos_type pos); + InsetList insetlist; private: - /// if anything uses this we don't want it to. - Paragraph(Paragraph const &); - /// - Paragraph * next_; /// - Paragraph * previous_; + LyXLayout_ptr layout_; struct Pimpl; /// friend struct Paragraph::Pimpl; /// Pimpl * pimpl_; + }; -#endif + +inline bool isInsertedText(Paragraph const & par, lyx::pos_type pos) +{ + return par.lookupChange(pos) == Change::INSERTED; +} + + +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