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

Fix compatibility read for "latex" layout as first paragraph of the

Browse Source 
buffer (fix #337).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4094 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Vigna 2002-04-30 10:58:10 +00:00
parent 80fdae686b
commit 2c35ae62a6
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2002-04-30 Juergen Vigna <jug@sad.it>
* buffer.C (parseSingleLyXformat2Token): reset the font before the
ert compatibility check for "latex" layout.
2002-04-29 Dekel Tsur <dekelts@tau.ac.il> 2002-04-29 Dekel Tsur <dekelts@tau.ac.il>
* buffer.C (parseSingleLyXformat2Token): Fix reading of old format * buffer.C (parseSingleLyXformat2Token): Fix reading of old format

11
src/buffer.C
View File

@ -482,6 +482,13 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
layoutname = tclass.defaultLayoutName(); layoutname = tclass.defaultLayoutName();
} }
// reset the font as we start a new layout and if the font is
// not ALL_INHERIT,document_language then it will be set to the
// right values after this tag (Jug 20020420)
font = LyXFont(LyXFont::ALL_INHERIT, params.language);
if (file_format < 216 && params.language->lang() == "hebrew")
font.setLanguage(default_language);
#ifndef NO_COMPABILITY #ifndef NO_COMPABILITY
if (compare_no_case(layoutname, "latex") == 0) { if (compare_no_case(layoutname, "latex") == 0) {
ert_comp.active = true; ert_comp.active = true;
@ -555,10 +562,6 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
if (!layout.obsoleted_by().empty()) if (!layout.obsoleted_by().empty())
par->layout(layout.obsoleted_by()); par->layout(layout.obsoleted_by());
par->params().depth(depth); par->params().depth(depth);
font = LyXFont(LyXFont::ALL_INHERIT, params.language);
if (file_format < 216
&& params.language->lang() == "hebrew")
font.setLanguage(default_language);
#if USE_CAPTION #if USE_CAPTION
} }
#endif #endif