From 570793b48706dbc0cff422e461e9f11265bbf8c0 Mon Sep 17 00:00:00 2001 From: Dekel Tsur Date: Mon, 29 Apr 2002 20:41:51 +0000 Subject: [PATCH] Fix bugs. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4090 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 3 +++ src/buffer.C | 12 +++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index c48d5fe168..fd635b9448 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -2,6 +2,9 @@ * 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. 2002-04-28 Dekel Tsur diff --git a/src/buffer.C b/src/buffer.C index 7e779df886..c948ce9c16 100644 --- a/src/buffer.C +++ b/src/buffer.C @@ -625,10 +625,6 @@ 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) @@ -658,6 +654,12 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, LyXLex nylex(0, 0); 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); @@ -2189,7 +2191,7 @@ void Buffer::makeLaTeXFile(string const & fname, if (lyxrc.language_use_babel || params.language->lang() != lyxrc.default_language || - !features.hasLanguages()) { + features.hasLanguages()) { use_babel = true; language_options << features.getLanguages(); language_options << params.language->babel(); -- 2.39.5