X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxparagraph.h;h=6d8d6129109aa9241555ef4440b7b4c563d3ef41;hb=f448e22d483e1370bcbfbb7be8cb47ad7251ed77;hp=8ce181ea92e604f0d39ab48f19971b2d7f5ca018;hpb=2889b5fd3e8987d0c265ff4726a7fb6c6cb6c034;p=lyx.git diff --git a/src/lyxparagraph.h b/src/lyxparagraph.h index 8ce181ea92..6d8d612910 100644 --- a/src/lyxparagraph.h +++ b/src/lyxparagraph.h @@ -16,14 +16,19 @@ #pragma interface #endif +//#define HAVE_ROPE 1 + +#ifdef HAVE_ROPE +#include +#endif + #include #include #include "insets/lyxinset.h" -#include "table.h" #include "vspace.h" #include "layout.h" -#include "support/block.h" +#include #include "language.h" class BufferParams; @@ -31,6 +36,11 @@ class LyXBuffer; class TexRow; struct LaTeXFeatures; class InsetBibKey; +class BufferView; + +// I dare you to enable this and help me find all the bugs that then show +// up. (Lgb) +//#define NEW_INSETS 1 /// A LyXParagraph holds all text, attributes and insets in a text paragraph class LyXParagraph { @@ -57,6 +67,7 @@ public: }; /// enum META_KIND { +#ifndef NEW_INSETS /// META_FOOTNOTE = 1, /// @@ -73,13 +84,18 @@ public: META_WIDE_TAB, /// META_HFILL, +#else /// - META_NEWLINE, + META_HFILL = 1, +#endif /// + META_NEWLINE, + // //META_PROTECTED_SEPARATOR, /// META_INSET }; +#ifndef NEW_INSETS /// The footnoteflag enum footnote_flag { @@ -108,20 +124,27 @@ public: /// WIDE_TAB // CFO-G, 971106 }; - +#endif /// typedef char value_type; /// +#ifndef HAVE_ROPE typedef std::vector TextContainer; +#else + typedef std::rope TextContainer; +#endif /// - typedef int size_type; + /* This should be TextContainer::size_type, but we need + signed values for now. + */ + typedef TextContainer::difference_type size_type; /// LyXParagraph(); - /// this konstruktor inserts the new paragraph in a list + /// this constructor inserts the new paragraph in a list explicit LyXParagraph(LyXParagraph * par); - /// the destruktors removes the new paragraph from the list + /// the destructor removes the new paragraph from the list ~LyXParagraph(); /// @@ -135,12 +158,13 @@ public: bool isMultiLingual(BufferParams const &); /// - string String(BufferParams const &, bool label); + string const String(Buffer const *, bool label); /// - string String(size_type beg, size_type end); + string const String(Buffer const *, size_type beg, size_type end); /// - void writeFile(std::ostream &, BufferParams const &, char, char) const; + void writeFile(Buffer const *, std::ostream &, BufferParams const &, + char, char) const; /// void validate(LaTeXFeatures &) const; @@ -157,20 +181,27 @@ public: void read(); /// - LyXParagraph * TeXOnePar(BufferParams const &, + LyXParagraph * TeXOnePar(Buffer const *, BufferParams const &, std::ostream &, TexRow & texrow, - bool moving_arg, + bool moving_arg +#ifndef NEW_INSETS + , std::ostream & foot, TexRow & foot_texrow, - int & foot_count); + int & foot_count +#endif + ); /// - bool SimpleTeXOnePar(BufferParams const &, + bool SimpleTeXOnePar(Buffer const *, BufferParams const &, std::ostream &, TexRow & texrow, bool moving_arg); /// - LyXParagraph * TeXEnvironment(BufferParams const &, - std::ostream &, TexRow & texrow, - std::ostream & foot, TexRow & foot_texrow, - int & foot_count); + LyXParagraph * TeXEnvironment(Buffer const *, BufferParams const &, + std::ostream &, TexRow & texrow +#ifndef NEW_INSETS + ,std::ostream & foot, TexRow & foot_texrow, + int & foot_count +#endif + ); /// LyXParagraph * Clone() const; @@ -194,7 +225,11 @@ public: /// Inset * InInset() { return inset_owner; } /// - void SetInsetOwner(Inset * i) { inset_owner = i; } + void SetInsetOwner(Inset * i); + /// + void deleteInsetsLyXText(BufferView *); + /// + void resizeInsetsLyXText(BufferView *); private: /// TextContainer text; @@ -206,13 +241,21 @@ public: size_type size() const { return text.size(); } /// void fitToSize() { +#ifndef HAVE_ROPE text.resize(text.size()); +#endif } + /// void setContentsFromPar(LyXParagraph * par) { text = par->text; } + /// void clearContents() { +#ifndef HAVE_ROPE text.clear(); +#else + text.erase(text.mutable_begin(), text.mutable_end()); +#endif } /// @@ -226,7 +269,7 @@ public: /// LyXTextClass::LayoutList::size_type layout; - +#ifndef NEW_INSETS /** \begin{itemize} \item no footnote, closed footnote, @@ -238,9 +281,7 @@ public: /// footnote, margin, fig, tab footnote_kind footnotekind; - - //@Man: the LyX- DTP-switches - //@{ +#endif /// bool line_top; @@ -263,11 +304,14 @@ public: bool noindent; private: - block counter_; + /// + array counter_; public: /// void setCounter(int i, int v) { counter_[i] = v; } + /// int getCounter(int i) const { return counter_[i]; } + /// void incCounter(int i) { counter_[i]++; } /// bool start_of_appendix; @@ -300,18 +344,12 @@ public: /// string labelwidthstring; - //@} /// LyXParagraph * next; /// LyXParagraph * previous; - /* table stuff -- begin*/ - /// - LyXTable * table; - /* table stuff -- end*/ - /// InsetBibKey * bibkey; // ale970302 @@ -324,6 +362,7 @@ public: /// LyXParagraph const * Previous() const; +#ifndef NEW_INSETS /** these function are able to hide open and closed footnotes */ LyXParagraph * NextAfterFootnote(); @@ -341,11 +380,11 @@ public: LyXParagraph * FirstPhysicalPar(); /// LyXParagraph const * FirstPhysicalPar() const; - /// returns the physical paragraph LyXParagraph * ParFromPos(size_type pos); /// returns the position in the physical par int PositionInParFromPos(size_type pos) const; +#endif /// for the environments LyXParagraph * DepthHook(int depth); @@ -354,10 +393,10 @@ public: /// int BeginningOfMainBody() const; /// - string GetLabelstring() const; + string const & GetLabelstring() const; /// the next two functions are for the manual labels - string GetLabelWidthString() const; + string const GetLabelWidthString() const; /// void SetLabelWidthString(string const & s); /// @@ -387,48 +426,57 @@ public: between the characters font and the layoutfont. This is what is stored in the fonttable */ - LyXFont GetFontSettings(BufferParams const &, size_type pos) const; + LyXFont const + GetFontSettings(BufferParams const &, size_type pos) const; /// - LyXFont GetFirstFontSettings() const; + LyXFont const GetFirstFontSettings() const; /** Get fully instantiated font. If pos == -1, use the layout - 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 - LyXFont::TOGGLE. - */ - LyXFont getFont(BufferParams const &, size_type pos) const; - /// - char GetChar(size_type pos); + 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 + LyXFont::TOGGLE. + */ + LyXFont const getFont(BufferParams const &, size_type pos) const; /// - char GetChar(size_type pos) const; + value_type GetChar(size_type pos) const; /// The position must already exist. - void SetChar(size_type pos, char c) { + void SetChar(size_type pos, value_type c) { +#ifndef HAVE_ROPE text[pos] = c; +#else + text.replace(pos, c); +#endif } /// void SetFont(size_type pos, LyXFont const & font); /// - string GetWord(size_type &) const; + string const GetWord(size_type &) const; /// Returns the height of the highest font in range LyXFont::FONT_SIZE HighestFontInRange(size_type startpos, size_type endpos) const; /// - void InsertChar(size_type pos, char c); + void InsertChar(size_type pos, value_type c); + /// + void InsertChar(size_type pos, value_type c, LyXFont const &); /// void InsertInset(size_type pos, Inset * inset); /// + void InsertInset(size_type pos, Inset * inset, LyXFont const &); + /// bool InsertInsetAllowed(Inset * inset); /// Inset * GetInset(size_type pos); /// Inset const * GetInset(size_type pos) const; +#ifndef NEW_INSETS /// void OpenFootnote(size_type pos); /// void CloseFootnote(size_type pos); +#endif /// important for cut and paste void CopyIntoMinibuffer(BufferParams const &, size_type pos) const; /// @@ -440,8 +488,10 @@ public: bool IsHfill(size_type pos) const; /// bool IsInset(size_type pos) const; +#ifndef NEW_INSETS /// bool IsFloat(size_type pos) const; +#endif /// bool IsNewline(size_type pos) const; /// @@ -470,49 +520,38 @@ public: /// returns -1 if inset not found int GetPositionOfInset(Inset * inset) const; - + +#ifndef NEW_INSETS /// ok and now some footnote functions void OpenFootnotes(); /// void CloseFootnotes(); - /// LyXParagraph * FirstSelfrowPar(); +#endif /// int StripLeadingSpaces(LyXTextClassList::size_type tclass); - + +#ifndef NEW_INSETS /** A paragraph following a footnote is a "dummy". A paragraph - with a footnote in it is stored as three paragraphs: - First a paragraph with the text up to the footnote, then - one (or more) paragraphs with the footnote, and finally - the a paragraph with the text after the footnote. Only the - first paragraph keeps information about layoutparameters, */ + with a footnote in it is stored as three paragraphs: + First a paragraph with the text up to the footnote, then + one (or more) paragraphs with the footnote, and finally + the a paragraph with the text after the footnote. Only the + first paragraph keeps information about layoutparameters, */ bool IsDummy() const; - +#endif /* 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, char const * width, char const * widthp); + void SetPExtraType(BufferParams const &, int type, + string const & width, string const & widthp); /// void UnsetPExtraType(BufferParams const &); -#if 0 - /// - bool RoffContTableRows(std::ostream &, size_type i, int actcell); -#endif /// bool linuxDocConvertChar(char c, string & sgml_string); - /// - void DocBookContTableRows(BufferParams const &, - std::ostream &, string & extra, - int & desc_on, size_type i, - int current_cell_number, int & column); - /// - void SimpleDocBookOneTablePar(BufferParams const &, - std::ostream &, string & extra, - int & desc_on, int depth); private: /// struct InsetTable { @@ -527,17 +566,11 @@ private: friend struct matchIT; /// struct matchIT { - /// used by lower_bound + /// used by lower_bound and upper_bound inline int operator()(LyXParagraph::InsetTable const & a, - LyXParagraph::size_type pos) const { - return a.pos < pos; - } - /// used by upper_bound - inline - int operator()(LyXParagraph::size_type pos, - LyXParagraph::InsetTable const & a) const { - return pos < a.pos; + LyXParagraph::InsetTable const & b) const { + return a.pos < b.pos; } }; /** A font entry covers a range of positions. Notice that the @@ -545,12 +578,15 @@ private: I don't think it's worth the effort to implement a more effective datastructure, because the number of different fonts in a paragraph is limited. (Asger) + Nevertheless, I decided to store fontlist using a sorted vector: + fontlist = { {pos_1,font_1} , {pos_2,font_2} , ... } where + pos_1 < pos_2 < ..., font_{i-1} != font_i for all i, + and font_i covers the chars in positions pos_{i-1}+1,...,pos_i + (font_1 covers the chars 0,...,pos_1) (Dekel) */ struct FontTable { - /// Start position of paragraph this font attribute covers + /// End position of paragraph this font attribute covers size_type pos; - /// Ending position of paragraph this font attribute covers - size_type pos_end; /** Font. Interpretation of the font values: If a value is LyXFont::INHERIT_*, it means that the font attribute is inherited from either the layout of this @@ -561,9 +597,23 @@ private: allowed in these font tables. */ LyXFont font; + /// + FontTable(size_type p, LyXFont const & f) {pos = p; font = f;} }; /// - typedef std::list FontList; + friend struct matchFT; + /// + struct matchFT { + /// used by lower_bound and upper_bound + inline + int operator()(LyXParagraph::FontTable const & a, + LyXParagraph::FontTable const & b) const { + return a.pos < b.pos; + } + }; + + /// + typedef std::vector FontList; /// FontList fontlist; /// @@ -571,60 +621,66 @@ private: /// InsetList insetlist; /// - LyXParagraph * TeXDeeper(BufferParams const &, - std::ostream &, TexRow & texrow, - std::ostream & foot, TexRow & foot_texrow, - int & foot_count); + LyXParagraph * TeXDeeper(Buffer const *, BufferParams const &, + std::ostream &, TexRow & texrow +#ifndef NEW_INSETS + ,std::ostream & foot, TexRow & foot_texrow, + int & foot_count +#endif + ); +#ifndef NEW_INSETS /// - LyXParagraph * TeXFootnote(BufferParams const &, + LyXParagraph * TeXFootnote(Buffer const *, BufferParams const &, std::ostream &, TexRow & texrow, std::ostream & foot, TexRow & foot_texrow, int & foot_count, bool parent_is_rtl); - /// - bool SimpleTeXOneTablePar(BufferParams const &, - std::ostream &, TexRow & texrow); - /// - bool TeXContTableRows(BufferParams const &, - std::ostream &, size_type i, - int current_cell_number, - int & column, TexRow & texrow); +#endif /// void SimpleTeXBlanks(std::ostream &, TexRow & texrow, size_type const i, int & column, LyXFont const & font, LyXLayout const & style); /// - void SimpleTeXSpecialChars(BufferParams const &, + void SimpleTeXSpecialChars(Buffer const *, BufferParams const &, std::ostream &, TexRow & texrow, bool moving_arg, LyXFont & font, LyXFont & running_font, LyXFont & basefont, bool & open_font, LyXLayout const & style, size_type & i, - int & column, char const c); + int & column, value_type const c); /// unsigned int id_; /// static unsigned int paragraph_id; public: + /// class inset_iterator { public: + /// inset_iterator() {} + // inset_iterator(InsetList::iterator const & iter) : it(iter) {}; + /// inset_iterator & operator++() { ++it; return *this; } + /// Inset * operator*() { return (*it).inset; } - size_type getPos() {return (*it).pos; } + /// + size_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; }; /// @@ -637,7 +693,6 @@ public: } /// inset_iterator InsetIterator(size_type pos); - }; #endif