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

Also give sane labelfont to modules.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21398 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Abdelrazak Younes 2007-11-03 01:41:27 +00:00
parent a3f8b0f171
commit 5b8c4888d7
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/TextClass.cpp
View File

@ -707,9 +707,6 @@ void TextClass::readInsetLayout(Lexer & lexrc, docstring const & name)
break; break;
case IL_LABELFONT: case IL_LABELFONT:
labelfont = lyxRead(lexrc, inherit_font); labelfont = lyxRead(lexrc, inherit_font);
// The label font is generally used as-is without
// any realization against a given context.
labelfont.realize(sane_font);
break; break;
case IL_FORCELTR: case IL_FORCELTR:
lexrc.next(); lexrc.next();
@ -755,7 +752,6 @@ void TextClass::readInsetLayout(Lexer & lexrc, docstring const & name)
} }
} }
//
// Here add element to list if getout == true // Here add element to list if getout == true
if (getout) { if (getout) {
InsetLayout il; InsetLayout il;
@ -773,6 +769,9 @@ void TextClass::readInsetLayout(Lexer & lexrc, docstring const & name)
il.forceltr = forceltr; il.forceltr = forceltr;
il.keepempty = keepempty; il.keepempty = keepempty;
il.font = font; il.font = font;
// The label font is generally used as-is without
// any realization against a given context.
labelfont.realize(sane_font);
il.labelfont = labelfont; il.labelfont = labelfont;
il.bgcolor = bgcolor; il.bgcolor = bgcolor;
il.preamble = preamble; il.preamble = preamble;
@ -1108,6 +1107,8 @@ InsetLayout const & TextClass::insetlayout(docstring const & name) const
} }
static InsetLayout empty; static InsetLayout empty;
empty.labelstring = from_utf8("UNDEFINED"); empty.labelstring = from_utf8("UNDEFINED");
empty.labelfont = sane_font;
empty.labelfont.setColor(Color_error);
empty.bgcolor = Color_error; empty.bgcolor = Color_error;
return empty; return empty;
} }