X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph.h;h=e7192c8d460da7faca797117ec0f4bb31e689e96;hb=4bc6c8ebd5805ea80ec42d6f12c915d0d01431a4;hp=220049ec8eb8f725d6b5668c8b83cc916201d067;hpb=cd6e293ed7c588748fe0cf5927f46dc5e9ae6e35;p=lyx.git diff --git a/src/paragraph.h b/src/paragraph.h index 220049ec8e..e7192c8d46 100644 --- a/src/paragraph.h +++ b/src/paragraph.h @@ -1,71 +1,42 @@ // -*- C++ -*- -/* This file is part of - * ====================================================== - * - * LyX, The Document Processor - * - * Copyright 1995 Matthias Ettrich - * Copyright 1995-2001 The LyX Team. - * - * ====================================================== */ +/** + * \file paragraph.h + * Copyright 1995 Matthias Ettrich + * Copyright 2002 the LyX Team + * Read the file COPYING + */ #ifndef PARAGRAPH_H #define PARAGRAPH_H -#ifdef __GNUG__ -#pragma interface -#endif - -#include "LString.h" +#include "lyxlayout_ptr_fwd.h" +#include "lyxfont.h" // Just for LyXFont::FONT_SIZE +#include "InsetList.h" #include "insets/inset.h" // Just for Inset::Code -#include "layout.h" + #include "support/types.h" +#include "changes.h" + +#include "LString.h" -class ParagraphParameters; class BufferParams; -class TexRow; -struct 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 +class LaTeXFeatures; +class ParagraphParameters; +class TexRow; // Define this if you want to try out the new storage container for -// paragraphs. std::container instead of obfuscated homegrown -// linked list. (Lgb) +// paragraphs. (Lgb) // This is non working and far from finished. // #define NO_NEXT 1 /// 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 { /// @@ -77,18 +48,16 @@ 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(); +#ifndef NO_NEXT /// this constructor inserts the new paragraph in a list explicit Paragraph(Paragraph * par); +#endif /// Paragraph(Paragraph const &, bool same_ids); /// the destructor removes the new paragraph from the list @@ -103,38 +72,36 @@ 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, - bool label); - + string const asString(Buffer const *, bool label) const; /// - void writeFile(Buffer const *, std::ostream &, BufferParams const &, - depth_type) const; + string const asString(Buffer const *, lyx::pos_type beg, lyx::pos_type end, + bool label) const; + /// - void validate(LaTeXFeatures &) 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); + int startTeXParParams(BufferParams const &, std::ostream &, bool) const; + + /// + int endTeXParParams(BufferParams const &, std::ostream &, bool) const; + + /// bool simpleTeXOnePar(Buffer const *, BufferParams const &, std::ostream &, TexRow & texrow, bool moving_arg); /// - Paragraph * TeXEnvironment(Buffer const *, BufferParams const &, - std::ostream &, TexRow & texrow); - /// bool hasSameLayout(Paragraph const * par) const; /// @@ -145,7 +112,7 @@ public: /** Check if the current paragraph is the last paragraph in a proof environment */ - int getEndLabel(BufferParams const &) const; + int getEndLabel() const; /// Inset * inInset() const; /// @@ -156,31 +123,29 @@ public: void resizeInsetsLyXText(BufferView *); /// - pos_type size() const; + lyx::pos_type size() const; + /// + bool empty() const; /// void setContentsFromPar(Paragraph * par); /// void clearContents(); /// - layout_type layout; - - /// - void setCounter(int i, int v); + LyXLayout_ptr const & layout() const; /// - int getCounter(int i) const; - /// - void incCounter(int i); + void layout(LyXLayout_ptr const & new_layout); /// char enumdepth; - + /// char itemdepth; - /// - InsetBibKey * bibkey; // ale970302 + /// + InsetBibitem * bibitem(); // ale970302 +#ifndef NO_NEXT /// void next(Paragraph *); /** these function are able to hide closed footnotes @@ -195,49 +160,80 @@ public: Paragraph * previous(); /// Paragraph const * previous() const; +#endif + + /// initialise tracking for this par + void trackChanges(Change::Type = Change::UNCHANGED); + + /// 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(); /// 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; - + /// 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() const; /// - void setLayout(layout_type new_layout); - /// - void setOnlyLayout(layout_type new_layout); - /// - int getFirstCounter(int i) const; - /// - void erase(pos_type pos); - /** the flag determines wether the layout should be copied - */ - void breakParagraph(BufferParams const &, pos_type pos, int flag); - /// - void breakParagraphConservative(BufferParams const &, pos_type pos); - /** Get unistantiated font setting. Returns the difference + void applyLayout(LyXLayout_ptr const & new_layout); + + /// definite erase + void eraseIntern(lyx::pos_type pos); + /// erase the char at the given position + void erase(lyx::pos_type pos); + /// erase the given range. Returns true if actually erased. + bool 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 */ LyXFont const - getFontSettings(BufferParams const &, pos_type pos) const; + getFontSettings(BufferParams const &, lyx::pos_type pos) const; /// LyXFont const getFirstFontSettings() const; @@ -245,165 +241,95 @@ 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 setFont(pos_type pos, LyXFont const & font); + void setChar(lyx::pos_type pos, value_type c); + /// 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(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 &, Change change = Change(Change::INSERTED)); /// 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 &, Change change = Change(Change::INSERTED)); /// 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(); - - /** 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(); + bool isLetter(lyx::pos_type pos) const; + /// + bool isWord(lyx::pos_type pos) const; /// returns -1 if inset not found - int getPositionOfInset(Inset * inset) const; - - /// some good comment here John? - Paragraph * getParFromID(int id) const; + int getPositionOfInset(Inset const * inset) const; /// - int stripLeadingSpaces(LyXTextClassList::size_type tclass); + 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); + bool isFreeSpacing() const; - ParagraphParameters & params(); - ParagraphParameters const & params() const; -private: - /// - struct InsetTable { - /// - pos_type pos; - /// - Inset * inset; - /// - InsetTable(pos_type p, Inset * i) : pos(p), inset(i) {} - }; - + ParagraphParameters & params(); /// - typedef std::vector InsetList; + ParagraphParameters const & params() const; /// 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; } - /// - 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; - /// - inset_iterator inset_iterator_begin(); - /// - inset_iterator inset_iterator_end(); - /// - inset_iterator InsetIterator(pos_type pos); - + //Counters & counters(); private: + /// + LyXLayout_ptr layout_; /// if anything uses this we don't want it to. Paragraph(Paragraph const &); +#ifndef NO_NEXT /// Paragraph * next_; /// Paragraph * previous_; - +#endif struct Pimpl; /// friend struct Paragraph::Pimpl; @@ -411,9 +337,16 @@ private: Pimpl * pimpl_; }; -inline bool isMetaInset(Paragraph const * par, Paragraph::pos_type const pos) + +inline bool isInsertedText(Paragraph const & par, lyx::pos_type pos) { - return par->getChar(pos) == Paragraph::META_INSET; + return par.lookupChange(pos) == Change::INSERTED; } - -#endif + + +inline bool isDeletedText(Paragraph const & par, lyx::pos_type pos) +{ + return par.lookupChange(pos) == Change::DELETED; +} + +#endif // PARAGRAPH_H