From: Dekel Tsur <dekelts@tau.ac.il>
Date: Mon, 29 Apr 2002 21:45:09 +0000 (+0000)
Subject: Fix my error
X-Git-Tag: 1.6.10~19316
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=898dd8a854394f0673efcd286c4968ddc65ecd93;p=features.git

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 fd635b9448..622551b670 100644
--- 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 c948ce9c16..c5c3bfbbcd 100644
--- 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;