read the Changelog

[features.git] / src / lyxparagraph.h

diff --git a/src/lyxparagraph.h b/src/lyxparagraph.h
index a2dbf2d5b8f2d7a9f3537bd2efcb6344bdb62211..7261cc91e033c741c9ae3c4d9f2d89136cbec49d 100644 (file)
--- a/src/lyxparagraph.h
+++ b/src/lyxparagraph.h
@@ -31,6 +31,7 @@ class LyXBuffer;
 class TexRow;
 struct LaTeXFeatures;
 class InsetBibKey;
+class BufferView;
 
 /// A LyXParagraph holds all text, attributes and insets in a text paragraph
 class LyXParagraph  {
@@ -55,6 +56,7 @@ public:
                ///
                MINIPAGE_ALIGN_BOTTOM
        };
+#ifndef NEW_INSETS
        ///
        enum META_KIND {
                ///
@@ -108,7 +110,7 @@ public:
                ///
                WIDE_TAB    // CFO-G, 971106
        };
-       
+#endif
        ///
        typedef char value_type;
        ///
@@ -195,7 +197,10 @@ 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;
@@ -209,9 +214,11 @@ public:
        void fitToSize() {
                text.resize(text.size());
        }
+       ///
        void setContentsFromPar(LyXParagraph * par) {
                text = par->text;
        }
+       ///
        void clearContents() {
                text.clear();
        }
@@ -227,7 +234,7 @@ public:
        
        ///
        LyXTextClass::LayoutList::size_type layout;
-       
+#ifndef NEW_INSETS
        /**
          \begin{itemize}
          \item no footnote, closed footnote, 
@@ -239,7 +246,7 @@ public:
 
        /// footnote, margin, fig, tab
        footnote_kind footnotekind;
-   
+#endif
        //@Man: the LyX- DTP-switches
        //@{
        ///
@@ -401,11 +408,11 @@ public:
          */
        LyXFont getFont(BufferParams const &, size_type pos) const;
        ///
-       char GetChar(size_type pos);
+       value_type GetChar(size_type pos);
        ///
-       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) {
                text[pos] = c;
        }
        
@@ -417,10 +424,14 @@ public:
        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);
@@ -499,10 +510,6 @@ public:
                           int type, char const * width, char 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);
        ///
@@ -528,17 +535,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
@@ -546,12 +547,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
@@ -562,9 +566,22 @@ private:
                allowed in these font tables.
                */
                LyXFont font;
+               ///
+               FontTable(size_type p, LyXFont const & f) {pos = p; font = f;}
+       };
+       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::list<FontTable> FontList;
+       typedef std::vector<FontTable> FontList;
        ///
        FontList fontlist;
        ///
@@ -638,7 +655,6 @@ public:
        }
        ///
        inset_iterator InsetIterator(size_type pos);
-
 };
 
 #endif