]> git.lyx.org Git - lyx.git/blobdiff - src/lyxparagraph.h
more NEW_INSETS changes, define NEW_MANUBAR as default some other changes, read ChangeLog
[lyx.git] / src / lyxparagraph.h
index 97a43ce6b8028f90994e65eaa0f23d13310dc992..dcccb3cd75cfe95bb681f7c517e0eda1898238a9 100644 (file)
@@ -37,6 +37,10 @@ class BufferView;
 // 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:
@@ -184,9 +188,12 @@ public:
 
        ///
        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;
        
@@ -329,11 +336,12 @@ public:
        ///
        LyXParagraph * previous;
 
+#ifndef NEW_TABULAR
        /* table stuff -- begin*/
        ///
        LyXTable * table;
        /* table stuff -- end*/
-
+#endif
         /// 
         InsetBibKey * bibkey;  // ale970302
 
@@ -364,12 +372,11 @@ public:
        LyXParagraph * FirstPhysicalPar();
        ///
        LyXParagraph const * FirstPhysicalPar() const;
-#endif
-
        /// 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);
@@ -424,8 +431,6 @@ public:
          */
        LyXFont getFont(BufferParams const &, size_type pos) const;
        ///
-       value_type GetChar(size_type pos);
-       ///
        value_type GetChar(size_type pos) const;
        /// The position must already exist.
        void SetChar(size_type pos, value_type c) {
@@ -534,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,
@@ -543,6 +549,7 @@ public:
        void SimpleDocBookOneTablePar(Buffer const *,
                                      std::ostream &, string & extra,
                                      int & desc_on, int depth);
+#endif
 private:
        ///
        struct InsetTable {
@@ -612,9 +619,12 @@ 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 &,
@@ -623,6 +633,7 @@ private:
                                   int & foot_count,
                                   bool parent_is_rtl);
 #endif
+#ifndef NEW_TABULAR
        ///
        bool SimpleTeXOneTablePar(Buffer const *, BufferParams const &,
                                  std::ostream &, TexRow & texrow);
@@ -631,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,