anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-12 22:14:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bugs.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4090 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Dekel Tsur 2002-04-29 20:41:51 +00:00
parent 88a039737d
commit 570793b487
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ChangeLog
View File

@ -2,6 +2,9 @@
* buffer.C (parseSingleLyXformat2Token): Fix reading of old format * buffer.C (parseSingleLyXformat2Token): Fix reading of old format
minipages: use col% instead of p%, and also use the current font. 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 <dekelts@tau.ac.il> 2002-04-28 Dekel Tsur <dekelts@tau.ac.il>

12
src/buffer.C
View File

@ -625,10 +625,6 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
return false; // no end read yet 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 // Here we need to check for \end_deeper and handle that
// before we do the footnote parsing. // before we do the footnote parsing.
// This _is_ a hack! (Lgb) // This _is_ a hack! (Lgb)
@ -658,6 +654,12 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
LyXLex nylex(0, 0); LyXLex nylex(0, 0);
nylex.setStream(istr); nylex.setStream(istr);
inset->read(this, nylex); 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); par->insertInset(pos, inset, font);
++pos; ++pos;
insertErtContents(par, pos); insertErtContents(par, pos);
@ -2189,7 +2191,7 @@ void Buffer::makeLaTeXFile(string const & fname,
if (lyxrc.language_use_babel || if (lyxrc.language_use_babel ||
params.language->lang() != lyxrc.default_language || params.language->lang() != lyxrc.default_language ||
!features.hasLanguages()) { features.hasLanguages()) {
use_babel = true; use_babel = true;
language_options << features.getLanguages(); language_options << features.getLanguages();
language_options << params.language->babel(); language_options << params.language->babel();