more changes, read the Changelog

[lyx.git] / src / lyxparagraph.h

diff --git a/src/lyxparagraph.h b/src/lyxparagraph.h
index bafa4a29dc8191812672f78cbe612527ce580a2b..ae3d2ca36666f608826c9e9fbc7bc415ddc2f2c6 100644 (file)
--- a/src/lyxparagraph.h
+++ b/src/lyxparagraph.h
@@ -56,6 +56,7 @@ public:
                ///
                MINIPAGE_ALIGN_BOTTOM
        };
+#ifndef NEW_INSETS
        ///
        enum META_KIND {
                ///
@@ -109,7 +110,7 @@ public:
                ///
                WIDE_TAB    // CFO-G, 971106
        };
-       
+#endif
        ///
        typedef char value_type;
        ///
@@ -230,7 +231,7 @@ public:
        
        ///
        LyXTextClass::LayoutList::size_type layout;
-       
+#ifndef NEW_INSETS
        /**
          \begin{itemize}
          \item no footnote, closed footnote, 
@@ -242,7 +243,7 @@ public:
 
        /// footnote, margin, fig, tab
        footnote_kind footnotekind;
-   
+#endif
        //@Man: the LyX- DTP-switches
        //@{
        ///
@@ -422,8 +423,12 @@ public:
        ///
        void InsertChar(size_type pos, char c);
        ///
+       void InsertChar(size_type pos, char 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);
@@ -502,10 +507,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);
        ///