From: Lars Gullik Bjønnes <larsbj@gullik.org>
Date: Wed, 13 Jun 2001 14:47:08 +0000 (+0000)
Subject: fix compatability reading of floats
X-Git-Tag: 1.6.10~21184
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=5657b861a6f8e4ed7b89db4a3b70b6f60de9ec9d;p=features.git

fix compatability reading of floats


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

diff --git a/ChangeLog b/ChangeLog
index 5aae73de67..7f52c35393 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-06-11  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+	* autogen.sh: remove kde stuff
+
+	* configure.in: remove kde stuff
+
 2001-06-13  John Levon  <moz@compsoc.man.ac.uk>
 
 	* INSTALL: remove mention of kde frontend, mention the need of gnu
diff --git a/config/ChangeLog b/config/ChangeLog
index 3c7d7d4eae..56de8a59bb 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,7 @@
+2001-06-11  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+	* lyxinclude.m4 (tr_hdr): add LYX_PROG_LIBTOOL and AC_FIND_FILE
+
 2001-05-31  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
 	* boost.m3: delete file
diff --git a/src/ChangeLog b/src/ChangeLog
index 8e7f21fc5a..f9debfc791 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-13  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+	* buffer.C (parseSingleLyXformat2Token): fix compatability reading
+	of floats.
+
 2001-06-12  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
 	* gettext.C: include LString.h even when --disable-nls is on. 
diff --git a/src/buffer.C b/src/buffer.C
index f023ae0663..88249a22f3 100644
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -490,23 +490,30 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par,
 			inset = new InsetMarginal;
 		} else if (tmptok == "fig") {
 			inset = new InsetFloat("figure");
-			old_float << "placement htbp\n";
+			old_float << "placement htbp\n"
+				  << "wide false\n";
 		} else if (tmptok == "tab") {
 			inset = new InsetFloat("table");
-			old_float << "placement htbp\n";
+			old_float << "placement htbp\n"
+				  << "wide false\n";
 		} else if (tmptok == "alg") {
 			inset = new InsetFloat("algorithm");
-			old_float << "placement htbp\n";
+			old_float << "placement htbp\n"
+				  << "wide false\n";
 		} else if (tmptok == "wide-fig") {
-			InsetFloat * tmp = new InsetFloat("figure");
-			tmp->wide(true);
-			inset = tmp;
-			old_float << "placement htbp\n";
+			inset = new InsetFloat("figure");
+			//InsetFloat * tmp = new InsetFloat("figure");
+			//tmp->wide(true);
+			//inset = tmp;
+			old_float << "placement htbp\n"
+				  << "wide true\n";
 		} else if (tmptok == "wide-tab") {
-			InsetFloat * tmp = new InsetFloat("table");
-			tmp->wide(true);
-			inset = tmp;
-			old_float << "placement htbp\n";
+			inset = new InsetFloat("table");
+			//InsetFloat * tmp = new InsetFloat("table");
+			//tmp->wide(true);
+			//inset = tmp;
+			old_float << "placement htbp\n"
+				  << "wide true\n";
 		}
 
 		if (!inset) {