- string const layoutname = lex.getString();
- //lyxerr << "Looking for layout '"
- // << layoutname << "'!" << endl;
+ string layoutname = lex.getString();
+
+ LyXTextClass const & tclass = textclasslist[params.textclass];
+
+ if (layoutname.empty()) {
+ layoutname = tclass.defaultLayoutName();
+ }
+
+ bool hasLayout = tclass.hasLayout(layoutname);
+ if (!hasLayout) {
+ lyxerr << "Layout '" << layoutname << "' does not"
+ << " exist in textclass '" << tclass.name()
+ << "'." << endl;
+ lyxerr << "Trying to use default layout instead."
+ << endl;
+ layoutname = tclass.defaultLayoutName();
+ }