Angus insetindex patch + protect patch from Dekel

[lyx.git] / src / buffer.h

diff --git a/src/buffer.h b/src/buffer.h
index 6a3117959f7fcbd9a956257501e2969414becaf5..598ea56015991c8dd20318aef7555926083617e4 100644 (file)
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -88,11 +88,8 @@ public:
        bool Dispatch(int, auto_mem_buffer &);
 
        /// should be changed to work for a list.
-       void resize() {
-               if (users) {
-                       users->resize();
-               }
-       }
+       void resize();
+       void resizeInsets(BufferView *);
 
        /// Update window titles of all users
        void updateTitles() const;
@@ -135,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.
@@ -175,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 {
@@ -218,7 +223,13 @@ public:
        
         ///
         void markNwDirty() { nw_clean = false; }
-       
+
+       ///
+       void setUnnamed(bool flag=true) { unnamed = flag; }
+
+       ///
+       bool isUnnamed() { return unnamed; }
+
        ///
        void markDirty() {
                if (lyx_clean) {
@@ -345,16 +356,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;
@@ -379,11 +394,6 @@ private:
        void pop_tag(std::ostream & os, char const * tag,
                     int & pos, char stack[5][3]);
 
-#if 0
-       ///
-       void RoffAsciiTable(std::ostream &, LyXParagraph * par);
-#endif
-       
        /// is save needed
        mutable bool lyx_clean;
        
@@ -393,6 +403,9 @@ private:
         /// do we need to run weave/tangle
         bool nw_clean;
 
+       /// is this a unnamed file (New...)
+       bool unnamed;
+
        /// is regenerating .tex necessary
        DEPCLEAN * dep_clean;