From: Dekel Tsur <dekelts@tau.ac.il>
Date: Mon, 13 Aug 2001 21:46:19 +0000 (+0000)
Subject: Fix compatability code.
X-Git-Tag: 1.6.10~20838
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=19f1292262bd19d3d8400dee6c0bb1a78d27cf0f;p=features.git

Fix compatability code.


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

diff --git a/src/ChangeLog b/src/ChangeLog
index 391c102412..2161d93e2d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-14  Dekel Tsur  <dekelts@tau.ac.il>
+
+	* buffer.C (parseSingleLyXformat2Token): Do not generate errors
+	when converting LaTeX layout to insetERT.
+	Generate a non-collapsed float when reading old float
+
 2001-08-13  Dekel Tsur  <dekelts@tau.ac.il>
 
 	* BufferView2.C (showLockedInsetCursor): Use normal cursor shape in
diff --git a/src/buffer.C b/src/buffer.C
index 935bce5956..67d895c460 100644
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -521,6 +521,10 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
 			pos = 0;
 			if (pp.first) {
 				par->layout = pp.second;
+#ifndef NO_COMPABILITY
+			} else if (ert_comp.active) {
+				par->layout = 0;
+#endif
 			} else {
 				// layout not found
 				// use default layout "Standard" (0)
@@ -568,34 +572,41 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
 		
 		if (tmptok == "footnote") {
 			inset = new InsetFoot;
+			old_float << "collapsed true\n";
 		} else if (tmptok == "margin") {
 			inset = new InsetMarginal;
+			old_float << "collapsed true\n";
 		} else if (tmptok == "fig") {
 			inset = new InsetFloat("figure");
 			old_float << "placement htbp\n"
-				  << "wide false\n";
+				  << "wide false\n"
+				  << "collapsed false\n";
 		} else if (tmptok == "tab") {
 			inset = new InsetFloat("table");
 			old_float << "placement htbp\n"
-				  << "wide false\n";
+				  << "wide false\n"
+				  << "collapsed false\n";
 		} else if (tmptok == "alg") {
 			inset = new InsetFloat("algorithm");
 			old_float << "placement htbp\n"
-				  << "wide false\n";
+				  << "wide false\n"
+				  << "collapsed false\n";
 		} else if (tmptok == "wide-fig") {
 			inset = new InsetFloat("figure");
 			//InsetFloat * tmp = new InsetFloat("figure");
 			//tmp->wide(true);
 			//inset = tmp;
 			old_float << "placement htbp\n"
-				  << "wide true\n";
+				  << "wide true\n"
+				  << "collapsed false\n";
 		} else if (tmptok == "wide-tab") {
 			inset = new InsetFloat("table");
 			//InsetFloat * tmp = new InsetFloat("table");
 			//tmp->wide(true);
 			//inset = tmp;
 			old_float << "placement htbp\n"
-				  << "wide true\n";
+				  << "wide true\n"
+				  << "collapsed false\n";
 		}
 
 		if (!inset) {
@@ -604,8 +615,6 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
 #endif
 			return false; // no end read yet
 		}
-		
-		old_float << "collapsed true\n";
 
 		// Here we need to check for \end_deeper and handle that
 		// before we do the footnote parsing.