reset font after read of an old float_type as this was the case in the old

code! (fix #324).

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

diff --git a/src/ChangeLog b/src/ChangeLog
index b1fc3c0582098af89dfbc956a7f53199c59f774f..6a0fdd1fe543da77fefb15c9be97ca38acacd8ad 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2002-04-11  Juergen Vigna  <jug@sad.it>
 
+       * buffer.C (parseSingleLyXformat2Token): reset font after read of
+       an old float_type as this was the case in the old code!
+
        * paragraph.C (simpleTeXOnePar): fix closing of foreignlanguage tags.
 
        * BufferView2.C (showLockedInsetCursor): use iy

diff --git a/src/buffer.C b/src/buffer.C
index 67ddc7672e3990fc07672b5c4c44491a1a8254db..185e4ee4d6ec7babd41b1c7e5656285913eea7f6 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -625,6 +625,10 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
                        return false; // no end read yet
                }
 
+               // 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);
+
                // Here we need to check for \end_deeper and handle that
                // before we do the footnote parsing.
                // This _is_ a hack! (Lgb)