more NEW_INSETS changes, define NEW_MANUBAR as default some other changes, read ChangeLog

[lyx.git] / src / lyxparagraph.h

diff --git a/src/lyxparagraph.h b/src/lyxparagraph.h
index ae3d2ca36666f608826c9e9fbc7bc415ddc2f2c6..dcccb3cd75cfe95bb681f7c517e0eda1898238a9 100644 (file)
--- a/src/lyxparagraph.h
+++ b/src/lyxparagraph.h
@@ -33,6 +33,14 @@ 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
+
+// I dare you to try this one too. It is ortogonal with NEW_INSETS so you
+// can try both or just one of them.
+//#define NEW_TABULAR 1
+
 /// A LyXParagraph holds all text, attributes and insets in a text paragraph
 class LyXParagraph  {
 public:
@@ -56,9 +64,9 @@ public:
                ///
                MINIPAGE_ALIGN_BOTTOM
        };
-#ifndef NEW_INSETS
        ///
        enum META_KIND {
+#ifndef NEW_INSETS
                ///
                META_FOOTNOTE = 1,
                ///
@@ -75,6 +83,10 @@ public:
                META_WIDE_TAB,
                ///
                META_HFILL,
+#else
+               ///
+               META_HFILL = 1,
+#endif
                ///
                META_NEWLINE,
                ///
@@ -82,6 +94,7 @@ public:
                ///
                META_INSET
        };
+#ifndef NEW_INSETS
 
        /// The footnoteflag
        enum footnote_flag {
@@ -162,18 +175,25 @@ public:
        ///
        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(Buffer const *, BufferParams const &,
                             std::ostream &, TexRow & texrow, bool moving_arg);
 
        ///
        LyXParagraph * TeXEnvironment(Buffer const *, BufferParams const &,
-                                     std::ostream &, TexRow & texrow,
-                                     std::ostream & foot, TexRow & foot_texrow,
-                                     int & foot_count);
+                                     std::ostream &, TexRow & texrow
+#ifndef NEW_INSETS
+                                     ,std::ostream & foot, TexRow & foot_texrow,
+                                     int & foot_count
+#endif
+               );
        ///
        LyXParagraph * Clone() const;
        
@@ -200,6 +220,7 @@ public:
        void SetInsetOwner(Inset * i);
        ///
        void deleteInsetsLyXText(BufferView *);
+       void resizeInsetsLyXText(BufferView *);
 private:
        ///
        TextContainer text;
@@ -213,9 +234,11 @@ public:
        void fitToSize() {
                text.resize(text.size());
        }
+       ///
        void setContentsFromPar(LyXParagraph * par) {
                text = par->text;
        }
+       ///
        void clearContents() {
                text.clear();
        }
@@ -268,6 +291,7 @@ public:
         bool noindent;
        
 private:
+       ///
        block<int, 10> counter_;
 public:
        ///
@@ -312,11 +336,12 @@ public:
        ///
        LyXParagraph * previous;
 
+#ifndef NEW_TABULAR
        /* table stuff -- begin*/
        ///
        LyXTable * table;
        /* table stuff -- end*/
-
+#endif
         /// 
         InsetBibKey * bibkey;  // ale970302
 
@@ -329,6 +354,7 @@ public:
        ///
        LyXParagraph const * Previous() const;
 
+#ifndef NEW_INSETS
        /** these function are able to hide open and closed footnotes
         */ 
        LyXParagraph * NextAfterFootnote();
@@ -346,11 +372,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);
@@ -359,7 +385,7 @@ public:
        ///
        int BeginningOfMainBody() const;
        ///
-       string GetLabelstring() const;
+       string const & GetLabelstring() const;
        
        /// the next two functions are for the manual labels
        string GetLabelWidthString() const;
@@ -405,11 +431,9 @@ public:
          */
        LyXFont getFont(BufferParams const &, size_type pos) const;
        ///
-       char 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;
        }
        
@@ -421,9 +445,9 @@ 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, char c, LyXFont const &);
+       void InsertChar(size_type pos, value_type c, LyXFont const &);
        ///
        void InsertInset(size_type pos, Inset * inset);
        ///
@@ -434,10 +458,12 @@ public:
        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;
        ///
@@ -449,8 +475,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;
        ///
@@ -479,19 +507,21 @@ 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
@@ -499,7 +529,7 @@ public:
          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 */
        ///
@@ -509,6 +539,7 @@ public:
         void UnsetPExtraType(BufferParams const &);
        ///
        bool linuxDocConvertChar(char c, string & sgml_string);
+#ifndef NEW_TABULAR
        ///
        void DocBookContTableRows(Buffer const *,
                                  std::ostream &, string & extra,
@@ -518,6 +549,7 @@ public:
        void SimpleDocBookOneTablePar(Buffer const *,
                                      std::ostream &, string & extra,
                                      int & desc_on, int depth);
+#endif
 private:
        ///
        struct InsetTable {
@@ -532,17 +564,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
@@ -575,17 +601,11 @@ private:
        friend struct matchFT;
        ///
        struct matchFT {
-               /// used by lower_bound
+               /// used by lower_bound and upper_bound
                inline
                int operator()(LyXParagraph::FontTable const & a,
-                              LyXParagraph::size_type pos) const {
-                       return a.pos < pos;
-               }
-               /// used by upper_bound
-               inline
-               int operator()(LyXParagraph::size_type pos,
-                              LyXParagraph::FontTable const & a) const {
-                       return pos < a.pos;
+                              LyXParagraph::FontTable const & b) const {
+                       return a.pos < b.pos;
                }
        };
 
@@ -599,15 +619,21 @@ private:
        InsetList insetlist;
        ///
        LyXParagraph * TeXDeeper(Buffer const *, BufferParams const &,
-                                std::ostream &, TexRow & texrow,
-                                std::ostream & foot, TexRow & foot_texrow,
-                                int & foot_count);
+                                std::ostream &, TexRow & texrow
+#ifndef NEW_INSETS
+                                ,std::ostream & foot, TexRow & foot_texrow,
+                                int & foot_count
+#endif
+               );
+#ifndef NEW_INSETS
        ///
        LyXParagraph * TeXFootnote(Buffer const *, BufferParams const &,
                                   std::ostream &, TexRow & texrow,
                                   std::ostream & foot, TexRow & foot_texrow,
                                   int & foot_count,
                                   bool parent_is_rtl);
+#endif
+#ifndef NEW_TABULAR
        ///
        bool SimpleTeXOneTablePar(Buffer const *, BufferParams const &,
                                  std::ostream &, TexRow & texrow);
@@ -616,6 +642,7 @@ private:
                              std::ostream &, size_type i,
                              int current_cell_number,
                               int & column, TexRow & texrow);
+#endif
        ///
        void SimpleTeXBlanks(std::ostream &, TexRow & texrow,
                             size_type const i,
@@ -629,7 +656,7 @@ private:
                                   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_;
        ///
@@ -664,7 +691,6 @@ public:
        }
        ///
        inset_iterator InsetIterator(size_type pos);
-
 };
 
 #endif