X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetLayout.cpp;h=ee415b1b9b6ebbc3ec67af2d95f51d31d228d231;hb=cfeddb92;hp=4a6d0a822564b339f09882ed7905dccc5021190a;hpb=a25569ebb3e739779ff458b287e403c3bf79777a;p=lyx.git diff --git a/src/insets/InsetLayout.cpp b/src/insets/InsetLayout.cpp index 4a6d0a8225..ee415b1b9b 100644 --- a/src/insets/InsetLayout.cpp +++ b/src/insets/InsetLayout.cpp @@ -110,6 +110,7 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass) IL_LATEXTYPE, IL_LEFTDELIM, IL_LYXTYPE, + IL_OBSOLETEDBY, IL_KEEPEMPTY, IL_MULTIPAR, IL_NEEDPROTECT, @@ -164,6 +165,7 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass) { "lyxtype", IL_LYXTYPE }, { "multipar", IL_MULTIPAR }, { "needprotect", IL_NEEDPROTECT }, + { "obsoletedby", IL_OBSOLETEDBY }, { "parbreakisnewline", IL_PARBREAKISNEWLINE }, { "passthru", IL_PASSTHRU }, { "preamble", IL_PREAMBLE }, @@ -330,6 +332,27 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass) } break; } + case IL_OBSOLETEDBY: { + docstring style; + lex >> style; + style = support::subst(style, '_', ' '); + + // We don't want to apply the algorithm in DocumentClass::insetLayout() + // here. So we do it the long way. + TextClass::InsetLayouts::const_iterator it = + tclass.insetLayouts().find(style); + if (it != tclass.insetLayouts().end()) { + docstring const tmpname = name_; + this->operator=(it->second); + name_ = tmpname; + if (obsoleted_by().empty()) + obsoleted_by_ = style; + } else { + LYXERR0("Cannot replace with unknown InsetLayout `" + << style << '\''); + } + break; + } case IL_FONT: { font_ = lyxRead(lex, inherit_font);