From: Lars Gullik Bjønnes <larsbj@gullik.org>
Date: Thu, 20 Jul 2000 14:00:52 +0000 (+0000)
Subject: NEW_INSETS: fix the layout prob
X-Git-Tag: 1.6.10~22098
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=97d0404f1dbf91256be4d84a438c1fa8dc1996d7;p=features.git

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 4b877ee22d..4d48fc58e5 100644
--- 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 c30089e736..fa51c83419 100644
--- 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);