NEW_INSETS: fix the layout prob

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@908 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 4b877ee22d7fc821ee4fcd0506c234b605bdb137..4d48fc58e58ce96cf35bf6d4312c40817ea32511 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-20  Lars Gullik Bjønnes  <larsbj@lyx.org>
+
+       * src/paragraph.C (writeFile): NEW_INSETS: possible fix to the
+       layout write problem
+
 2000-07-20  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
        * src/Makefile.am (INCLUDES): remove image directory from include

diff --git a/src/paragraph.C b/src/paragraph.C
index c30089e73607219c3fb3e1795589b8a5fc70cdd3..fa51c834197bd15e7b174c4f5334c8d76f8879fc 100644 (file)
--- a/src/paragraph.C
+++ b/src/paragraph.C
@@ -130,16 +130,14 @@ void LyXParagraph::writeFile(Buffer const * buf, ostream & os,
                             BufferParams const & params,
                             char footflag, char dth) const
 {
-       if (
 #ifndef NEW_INSETS
+       if (
                footnoteflag != LyXParagraph::NO_FOOTNOTE ||
-#endif
            !previous
-#ifndef NEW_INSETS
            || previous->footnoteflag == LyXParagraph::NO_FOOTNOTE
-#endif
                ) {
-
+#endif
+               
 #ifndef NEW_INSETS
                // The beginning or the end of a footnote environment?
                if (footflag != footnoteflag) {
@@ -241,16 +239,14 @@ void LyXParagraph::writeFile(Buffer const * buf, ostream & os,
                         }
                        os << '\n';
                 }
-       } else {
 #ifndef NEW_INSETS
+       } else {
                // Dummy layout. This means that a footnote ended.
                os << "\n\\end_float ";
                footflag = LyXParagraph::NO_FOOTNOTE;
-#else
-               lyxerr << "Why don't we have a previous?" << endl;
-#endif
        }
-#ifndef NEW_TABULAR    
+
+#ifndef NEW_TABULAR
        // It might be a table.
        if (table){
                os << "\\LyXTable\n";
@@ -333,7 +329,8 @@ void LyXParagraph::writeFile(Buffer const * buf, ostream & os,
                        break;
                }
        }
-
+#endif
+       
        // now write the next paragraph
        if (next)
                next->writeFile(buf, os, params, footflag, dth);