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 5aae73de6702b5c6569e777ccaafc04c45e7280d..7f52c353939d8dfe73b7dfddfb76cd64fca3a5d5 100644 (file)
--- 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 3c7d7d4eae948076639ecc8cd415ee744dd902eb..56de8a59bb847319dfb5d4e4176fc9533c23c177 100644 (file)
--- 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 8e7f21fc5adeae3eef5b3d357d69458aff6886f7..f9debfc791441f0decd6be1df324a299346209a8 100644 (file)
--- 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 f023ae0663dfff0ea601d92091ecaca8b34810e0..88249a22f3315a64b6332658b3d8946c2d47493b 100644 (file)
--- 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) {