anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-07 09:46:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* lyxlayout.C (Read): set labelstringappendix_ every time

Browse Source 
labelstring is set (instead of using this value only as a
	fallback) (bug 3351)



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_4_X@17730 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2007-04-05 10:59:27 +00:00
parent c42e66e486
commit b7b610c2cf
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ChangeLog
View File

@ -1,3 +1,9 @@
2007-04-05 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* lyxlayout.C (Read): set labelstringappendix_ every time
labelstring is set (instead of using this value only as a
fallback) (bug 3351)
2007-03-20 Martin Vermeer <martin.vermeer@tkk.fi> 2007-03-20 Martin Vermeer <martin.vermeer@tkk.fi>
* bufferparams.[Ch]: move getEngine() here, and let it sense the * bufferparams.[Ch]: move getEngine() here, and let it sense the

6
src/lyxlayout.C
View File

@ -447,8 +447,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.getString()); labelstring_ = trim(lexrc.getString());
labelstring_appendix_ = labelstring_;
}
break; break;
case LT_ENDLABELSTRING: // endlabel string definition case LT_ENDLABELSTRING: // endlabel string definition
@ -483,8 +485,6 @@ bool LyXLayout::Read(LyXLex & lexrc, LyXTextClass const & tclass)
} }
lexrc.popTable(); lexrc.popTable();
if (labelstring_appendix_.empty())
labelstring_appendix_ = labelstring_;
return error; return error;
} }

2
status.14x
View File

@ -49,6 +49,8 @@ What's new
- Make it possible to reset itemize bullets to their original state - Make it possible to reset itemize bullets to their original state
(bug 3312). (bug 3312).
- Fix display of Theorem-like environments when in appendix (bug 3351)
- Fix display of math root inset when the exponent contains large - Fix display of math root inset when the exponent contains large
things (bug 3295). things (bug 3295).