From b7b610c2cfbc0c169cb9ada4b9eeaafa0b753658 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Thu, 5 Apr 2007 10:59:27 +0000 Subject: [PATCH] * 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/branches/BRANCH_1_4_X@17730 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 6 ++++++ src/lyxlayout.C | 6 +++--- status.14x | 2 ++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 8c0e5b80cf..d89b25609b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2007-04-05 Jean-Marc Lasgouttes + + * 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 * bufferparams.[Ch]: move getEngine() here, and let it sense the diff --git a/src/lyxlayout.C b/src/lyxlayout.C index 1e77971b87..5bfa69ccbe 100644 --- a/src/lyxlayout.C +++ b/src/lyxlayout.C @@ -447,8 +447,10 @@ bool LyXLayout::Read(LyXLex & lexrc, LyXTextClass const & tclass) break; case LT_LABELSTRING: // label string definition - if (lexrc.next()) + if (lexrc.next()) { labelstring_ = trim(lexrc.getString()); + labelstring_appendix_ = labelstring_; + } break; case LT_ENDLABELSTRING: // endlabel string definition @@ -483,8 +485,6 @@ bool LyXLayout::Read(LyXLex & lexrc, LyXTextClass const & tclass) } lexrc.popTable(); - if (labelstring_appendix_.empty()) - labelstring_appendix_ = labelstring_; return error; } diff --git a/status.14x b/status.14x index 2fb9aa8467..95881371b5 100644 --- a/status.14x +++ b/status.14x @@ -49,6 +49,8 @@ What's new - Make it possible to reset itemize bullets to their original state (bug 3312). +- Fix display of Theorem-like environments when in appendix (bug 3351) + - Fix display of math root inset when the exponent contains large things (bug 3295).