Fix small bug in reading \set_color in lyxrc

[lyx.git] / src / buffer.h

diff --git a/src/buffer.h b/src/buffer.h
index 6e02dfce38503e0a1900eb282a250601c99e8975..9e78027cfcc50a36586a53f3266482f233c42f3d 100644 (file)
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -89,6 +89,7 @@ public:
 
        /// should be changed to work for a list.
        void resize();
+       void resizeInsets(BufferView *);
 
        /// Update window titles of all users
        void updateTitles() const;
@@ -131,10 +132,16 @@ public:
        bool parseSingleLyXformat2Token(LyXLex &, LyXParagraph *& par,
                                        LyXParagraph *& return_par,
                                        string const & token, int & pos,
-                                       char & depth, LyXFont &,
-                                       LyXParagraph::footnote_flag &,
-                                       LyXParagraph::footnote_kind &);
-
+                                       char & depth, LyXFont &
+#ifndef NEW_INSETS
+                                       ,LyXParagraph::footnote_flag &,
+                                       LyXParagraph::footnote_kind &
+#endif
+               );
+private:
+       // Parse a single inset.
+       void readInset(LyXLex &, LyXParagraph *& par, int & pos, LyXFont &);
+public:
        /** Save file
            Takes care of auto-save files and backup file if requested.
            Returns true if the save is successful, false otherwise.
@@ -171,9 +178,11 @@ public:
        int runChktex();
 
        ///
-       void makeLinuxDocFile(string const & filename, int column);
+       void makeLinuxDocFile(string const & filename,
+                             bool nice, bool only_body = false);
        ///
-       void makeDocBookFile(string const & filename, int column);
+       void makeDocBookFile(string const & filename,
+                            bool nice, bool only_body = false);
 
        /// returns the main language for the buffer (document)
        string GetLanguage() const {
@@ -341,16 +350,20 @@ public:
        /// Used when typesetting to place errorboxes.
        TexRow texrow;
 private:
+#ifndef NEW_INSETS
         ///
         void linuxDocHandleFootnote(std::ostream & os,
                                    LyXParagraph * & par, int const depth);
+#endif
         ///
        void DocBookHandleCaption(std::ostream & os, string & inner_tag,
                                  int const depth, int desc_on,
                                  LyXParagraph * & par);
+#ifndef NEW_INSETS
         ///
        void DocBookHandleFootnote(std::ostream & os,
                                   LyXParagraph * & par, int const depth);
+#endif
        ///
         void sgmlOpenTag(std::ostream & os, int depth,
                         string const & latexname) const;