fix compatability reading of floats

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2119 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2001-06-13 14:47:08 +00:00
parent 0c2a3e5960
commit 5657b861a6
4 changed files with 33 additions and 11 deletions

View File

@ -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

View File

@ -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

View File

@ -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.

View File

@ -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) {