mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-26 19:25:39 +00:00
* reverting previous workarounds. With Martin's commit 21319 there are not needed.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21320 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
225d92ba43
commit
6e043a9c22
@ -311,16 +311,16 @@ bool Layout::read(Lexer & lexrc, TextClass const & tclass)
|
||||
break;
|
||||
|
||||
case LT_FONT:
|
||||
font = lyxRead(lexrc, sane_font);
|
||||
font = lyxRead(lexrc);
|
||||
labelfont = font;
|
||||
break;
|
||||
|
||||
case LT_TEXTFONT:
|
||||
font = lyxRead(lexrc, sane_font);
|
||||
font = lyxRead(lexrc);
|
||||
break;
|
||||
|
||||
case LT_LABELFONT:
|
||||
labelfont = lyxRead(lexrc, sane_font);
|
||||
labelfont = lyxRead(lexrc);
|
||||
break;
|
||||
|
||||
case LT_NEXTNOINDENT: // Indent next paragraph?
|
||||
|
@ -366,7 +366,7 @@ bool TextClass::read(FileName const & filename, ReadType rt)
|
||||
break;
|
||||
|
||||
case TC_DEFAULTFONT:
|
||||
defaultfont_ = lyxRead(lexrc, sane_font);
|
||||
defaultfont_ = lyxRead(lexrc);
|
||||
if (!defaultfont_.resolved()) {
|
||||
lexrc.printError("Warning: defaultfont should "
|
||||
"be fully instantiated!");
|
||||
|
Loading…
Reference in New Issue
Block a user