multipar_(true), custompars_(true), forceplain_(false),
passthru_(false), parbreakisnewline_(false), freespacing_(false),
keepempty_(false), forceltr_(false),
- needprotect_(false), intoc_(false), spellcheck_(true)
+ needprotect_(false), intoc_(false), spellcheck_(true),
+ resetsfont_(true), display_(true)
{
labelfont_.setColor(Color_error);
}
IL_COUNTER,
IL_CUSTOMPARS,
IL_DECORATION,
+ IL_DISPLAY,
IL_FONT,
IL_FORCELTR,
IL_FORCEPLAIN,
IL_REQUIRES,
IL_SPELLCHECK,
IL_REFPREFIX,
+ IL_RESETSFONT,
IL_END
};
{ "counter", IL_COUNTER},
{ "custompars", IL_CUSTOMPARS },
{ "decoration", IL_DECORATION },
+ { "display", IL_DISPLAY },
{ "end", IL_END },
{ "font", IL_FONT },
{ "forceltr", IL_FORCELTR },
{ "preamble", IL_PREAMBLE },
{ "refprefix", IL_REFPREFIX },
{ "requires", IL_REQUIRES },
+ { "resetsfont", IL_RESETSFONT },
{ "spellcheck", IL_SPELLCHECK }
};
// way this sort of thing is handled in Layout::read(), namely, by
// using the Lexer.
case IL_LYXTYPE: {
+ // make sure that we have the right sort of name.
+ if (name_ != from_ascii("undefined")
+ && name_.substr(0,5) != from_ascii("Flex:")) {
+ LYXERR0("Flex insets must have names of the form `Flex:<name>'.\n"
+ "This one has the name `" << to_utf8(name_) << "'\n"
+ "Ignoring LyXType declaration.");
+ break;
+ }
string lt;
lex >> lt;
lyxtype_ = translateLyXType(lt);
case IL_CONTENTASLABEL:
lex >> contentaslabel_;
break;
- case IL_COPYSTYLE: { // initialize with a known style
+ case IL_COPYSTYLE: {
+ // initialize with a known style
docstring style;
lex >> style;
style = support::subst(style, '_', ' ');
case IL_SPELLCHECK:
lex >> spellcheck_;
break;
+ case IL_RESETSFONT:
+ lex >> resetsfont_;
+ break;
+ case IL_DISPLAY:
+ lex >> display_;
+ break;
case IL_END:
getout = true;
break;