fixedwidthpreambleencoding_(false), htmlforcecss_ (false),
htmlisblock_(true), multipar_(true), custompars_(true),
forceplain_(false), passthru_(false), parbreakisnewline_(false),
- freespacing_(false), keepempty_(false), forceltr_(false),
+ parbreakignored_(false), freespacing_(false), keepempty_(false), forceltr_(false),
forceownlines_(false), needprotect_(false), needcprotect_(false),
needmboxprotect_(false), intoc_(false), spellcheck_(true),
resetsfont_(false), display_(true), forcelocalfontswitch_(false),
} // namespace
-bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
+bool InsetLayout::read(Lexer & lex, TextClass const & tclass,
+ bool validating)
{
enum {
IL_ADDTOTOC,
IL_HTMLLABEL,
IL_HTMLSTYLE,
IL_HTMLPREAMBLE,
+ IL_DOCBOOKTAG,
+ IL_DOCBOOKATTR,
IL_INTOC,
IL_ISTOCCAPTION,
IL_LABELFONT,
IL_NEWLINE_CMD,
IL_PASSTHRU,
IL_PASSTHRU_CHARS,
+ IL_PARBREAKIGNORED,
IL_PARBREAKISNEWLINE,
IL_PREAMBLE,
IL_REQUIRES,
{ "custompars", IL_CUSTOMPARS },
{ "decoration", IL_DECORATION },
{ "display", IL_DISPLAY },
+ { "docbookattr", IL_DOCBOOKATTR },
+ { "docbooktag", IL_DOCBOOKTAG },
{ "editexternal", IL_EDITEXTERNAL },
{ "end", IL_END },
{ "fixedwidthpreambleencoding", IL_FIXEDWIDTH_PREAMBLE_ENCODING },
{ "needprotect", IL_NEEDPROTECT },
{ "newlinecmd", IL_NEWLINE_CMD },
{ "obsoletedby", IL_OBSOLETEDBY },
+ { "parbreakignored", IL_PARBREAKIGNORED },
{ "parbreakisnewline", IL_PARBREAKISNEWLINE },
{ "passthru", IL_PASSTHRU },
{ "passthruchars", IL_PASSTHRU_CHARS },
switch (le) {
case Lexer::LEX_UNDEF:
lex.printError("Unknown InsetLayout tag");
+ if (validating)
+ return false;
continue;
default:
break;
LYXERR0("Flex insets must have names of the form `Flex:<name>'.\n"
"This one has the name `" << to_utf8(name_) << "'\n"
"Ignoring LyXType declaration.");
+ // this is not really a reason to abort
+ if (validating)
+ return false;
break;
}
string lt;
lex >> lt;
lyxtype_ = translateLyXType(lt);
- if (lyxtype_ == NOLYXTYPE)
+ if (lyxtype_ == NOLYXTYPE) {
LYXERR0("Unknown LyXType `" << lt << "'.");
+ // this is not really a reason to abort
+ if (validating)
+ return false;
+ }
if (lyxtype_ == CHARSTYLE) {
// by default, charstyles force the plain layout
multipar_ = false;
string lt;
lex >> lt;
latextype_ = translateLaTeXType(lt);
- if (latextype_ == ILT_ERROR)
+ if (latextype_ == ILT_ERROR) {
LYXERR0("Unknown LaTeXType `" << lt << "'.");
+ // this is not really a reason to abort
+ if (validating)
+ return false;
+ }
break;
}
case IL_LABELSTRING:
case IL_NEWLINE_CMD:
lex >> newline_cmd_;
break;
+ case IL_PARBREAKIGNORED:
+ lex >> parbreakignored_;
+ break;
case IL_PARBREAKISNEWLINE:
lex >> parbreakisnewline_;
break;
tclass.insetLayouts().end();
for (; lit != len; ++lit)
lyxerr << lit->second.name() << "\n";
+ // this is not really a reason to abort
+ if (validating)
+ return false;
}
break;
}
tclass.insetLayouts().end();
for (; lit != len; ++lit)
lyxerr << lit->second.name() << "\n";
+ // this is not really a reason to abort
+ if (validating)
+ return false;
}
break;
}
case IL_HTMLPREAMBLE:
htmlpreamble_ = lex.getLongString(from_ascii("EndPreamble"));
break;
+ case IL_DOCBOOKTAG:
+ lex >> docbooktag_;
+ break;
+ case IL_DOCBOOKATTR:
+ lex >> docbookattr_;
+ break;
case IL_REQUIRES: {
lex.eatLine();
vector<string> const req
= getVectorFromString(lex.getString(true));
- requires_.insert(req.begin(), req.end());
+ required_.insert(req.begin(), req.end());
break;
}
case IL_SPELLCHECK:
return InsetLayout::CHARSTYLE;
if (compare_ascii_no_case(str, "custom") == 0)
return InsetLayout::CUSTOM;
- if (compare_ascii_no_case(str, "element") == 0)
- return InsetLayout::ELEMENT;
if (compare_ascii_no_case(str, "end") == 0)
return InsetLayout::END;
if (compare_ascii_no_case(str, "standard") == 0)
arg.mandatory = false;
arg.autoinsert = false;
arg.insertcotext = false;
+ arg.insertonnewline = false;
bool error = false;
bool finished = false;
arg.font = inherit_font;
arg.labelfont = inherit_font;
arg.is_toc_caption = false;
+ arg.free_spacing = false;
arg.passthru = PT_INHERITED;
arg.nodelims = false;
string nr;
} else if (tok == "insertcotext") {
lex.next();
arg.insertcotext = lex.getBool();
+ } else if (tok == "insertonnewline") {
+ lex.next();
+ arg.insertonnewline = lex.getBool();
} else if (tok == "leftdelim") {
lex.next();
arg.ldelim = lex.getDocString();
arg.tooltip = lex.getDocString();
} else if (tok == "requires") {
lex.next();
- arg.requires = lex.getString();
+ arg.required = lex.getString();
} else if (tok == "decoration") {
lex.next();
arg.decoration = lex.getString();
} else if (tok == "istoccaption") {
lex.next();
arg.is_toc_caption = lex.getBool();
+ } else if (tok == "freespacing") {
+ lex.next();
+ arg.free_spacing = lex.getBool();
} else {
lex.printError("Unknown tag");
error = true;