Fix counters bug with bibliography layout.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2200 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/ChangeLog b/src/ChangeLog
index bb518722f45c3d50705d7afc2ec9350c663a2845..f756bcff8df39b322d4ab6fc6702d2b69aae1d24 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-07  Dekel Tsur  <dekelts@tau.ac.il>
+
+       * text2.C (setCounter): Fix counters bug with bibliography layout.
+
 2001-07-06  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
        * paragraph_pimpl.C (simpleTeXBlanks): don't go through owner_ for

diff --git a/src/text2.C b/src/text2.C
index 7121831aac3fa2fbdb540f56ca7021ff84df21eb..3dac232451dedf466b50c08dbf7c07b1f4dfd7bc 100644 (file)
--- a/src/text2.C
+++ b/src/text2.C
@@ -1202,13 +1202,8 @@ void LyXText::setCounter(Buffer const * buf, Paragraph * par) const
        LyXTextClass const & textclass =
                textclasslist.TextClass(buf->params.textclass);
 
-       /* copy the prev-counters to this one, unless this is the start of a 
-          footnote or of a bibliography or the very first paragraph */
-       if (par->previous()
-           && !(textclasslist.Style(buf->params.textclass,
-                               par->previous()->getLayout()
-                               ).labeltype != LABEL_BIBLIO
-                && layout.labeltype == LABEL_BIBLIO)) {
+       // copy the prev-counters to this one, unless this is the first paragraph
+       if (par->previous()) {
                for (int i = 0; i < 10; ++i) {
                        par->setCounter(i, par->previous()->getFirstCounter(i));
                }