* Layout.cpp (read): fix ObsoletedBy and DependsOn for layout names

that contain underscores.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19053 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2007-07-12 09:25:52 +00:00
parent dbd627f521
commit f99d41a25a

View File

@ -241,7 +241,8 @@ bool Layout::read(Lexer & lexrc, TextClass const & tclass)
case LT_OBSOLETEDBY: // replace with a known style case LT_OBSOLETEDBY: // replace with a known style
if (lexrc.next()) { if (lexrc.next()) {
docstring const style = lexrc.getDocString(); docstring const style =
subst(lexrc.getDocString(), '_', ' ');
if (tclass.hasLayout(style)) { if (tclass.hasLayout(style)) {
docstring const tmpname = name_; docstring const tmpname = name_;
@ -262,7 +263,7 @@ bool Layout::read(Lexer & lexrc, TextClass const & tclass)
case LT_DEPENDSON: case LT_DEPENDSON:
if (lexrc.next()) if (lexrc.next())
depends_on_ = lexrc.getDocString(); depends_on_ = subst(lexrc.getDocString(), '_', ' ');
break; break;
case LT_MARGIN: // margin style definition. case LT_MARGIN: // margin style definition.