mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-23 02:14:50 +00:00
* lyxlayout.C (read): set labelstringappendix_ every time
labelstring is set (instead of using this value only as a fallback) (bug 3351) git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17729 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
29dacff0f0
commit
2086684135
@ -450,8 +450,10 @@ bool LyXLayout::read(LyXLex & lexrc, LyXTextClass const & tclass)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case LT_LABELSTRING: // label string definition
|
case LT_LABELSTRING: // label string definition
|
||||||
if (lexrc.next())
|
if (lexrc.next()) {
|
||||||
labelstring_ = trim(lexrc.getDocString());
|
labelstring_ = trim(lexrc.getDocString());
|
||||||
|
labelstring_appendix_ = labelstring_;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case LT_ENDLABELSTRING: // endlabel string definition
|
case LT_ENDLABELSTRING: // endlabel string definition
|
||||||
@ -486,8 +488,6 @@ bool LyXLayout::read(LyXLex & lexrc, LyXTextClass const & tclass)
|
|||||||
}
|
}
|
||||||
lexrc.popTable();
|
lexrc.popTable();
|
||||||
|
|
||||||
if (labelstring_appendix_.empty())
|
|
||||||
labelstring_appendix_ = labelstring_;
|
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user