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

Dekel's fix of reading layout compatibility.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4115 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Vigna 2002-05-02 12:21:42 +00:00
parent ae167d7459
commit 8d4e2f31c4
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ChangeLog
View File

@ -1,3 +1,9 @@
2002-05-02 Juergen Vigna <jug@sad.it>
* buffer.C (parseSingleLyXformat2Token): move the compatibility
parts of layout read further up as it still was in the wrong
position.
2002-05-02 Lars Gullik Bjønnes <larsbj@birdstep.com>
* screen.C (drawFromTo): change sine fullRebreak always return

27
src/buffer.C
View File

@ -463,6 +463,13 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
// Do the insetert.
insertErtContents(par, pos);
#endif
// 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);
lex.eatLine();
string layoutname = lex.getString();
@ -471,7 +478,12 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
if (layoutname.empty()) {
layoutname = tclass.defaultLayoutName();
}
#ifndef NO_COMPABILITY
if (compare_no_case(layoutname, "latex") == 0) {
ert_comp.active = true;
ert_comp.font = font;
}
#endif
bool hasLayout = tclass.hasLayout(layoutname);
if (!hasLayout) {
lyxerr << "Layout '" << layoutname << "' does not"
@ -482,19 +494,6 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
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
if (compare_no_case(layoutname, "latex") == 0) {
ert_comp.active = true;
ert_comp.font = font;
}
#endif
#ifdef USE_CAPTION
// The is the compability reading of layout caption.
// It can be removed in LyX version 1.3.0. (Lgb)