Fix my error

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

diff --git a/src/ChangeLog b/src/ChangeLog
index fd635b9448c61cbb5c1d0d5763013482358e7803..622551b67007436ccd45e7c6778bd52c6b51848d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,8 +3,7 @@
        * buffer.C (parseSingleLyXformat2Token): Fix reading of old format 
        minipages: use col% instead of p%, and also use the current font.
        (makeLaTeXFile): Fix use babel condition.
-       (parseSingleLyXformat2Token): Do not reset font when reading old
-       floats.
+       (parseSingleLyXformat2Token): Correct font when reading old floats.
 
 2002-04-28  Dekel Tsur  <dekelts@tau.ac.il>
 

diff --git a/src/buffer.C b/src/buffer.C
index c948ce9c16eaa534eed3240075fdb4fe4894b370..c5c3bfbbcd60a6e11098a9bd6791a1dd8a6cf61d 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -655,14 +655,13 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
                nylex.setStream(istr);
                inset->read(this, nylex);
 
-               // we have to reset the font as in the old format after a float
-               // the font was automatically reset!
-               //font = LyXFont(LyXFont::ALL_INHERIT, params.language);
-               // This is not true (Dekel).
-
                par->insertInset(pos, inset, font);
                ++pos;
                insertErtContents(par, pos);
+
+               // we have to reset the font as in the old format after a float
+               // the font was automatically reset!
+               font = LyXFont(LyXFont::ALL_INHERIT, params.language);
 #endif
        } else if (token == "\\begin_deeper") {
                ++depth;