Fix problem with bibliography indentation reported on user list.

Porting to branch.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39150 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 2df65c2a2414ebab3471e4ce22f0f615b262fe18..238225bcb38492f4687cd1fe9f7d412bc8264873 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -3966,10 +3966,12 @@ void Buffer::Impl::setLabel(ParIterator & it, UpdateType utype) const
        // Compute the item depth of the paragraph
        par.itemdepth = getItemDepth(it);
 
-       if (layout.margintype == MARGIN_MANUAL
-           || layout.latextype == LATEX_BIB_ENVIRONMENT) {
+       if (layout.margintype == MARGIN_MANUAL) {
                if (par.params().labelWidthString().empty())
                        par.params().labelWidthString(par.expandLabel(layout, bp));
+       } else if (layout.latextype == LATEX_BIB_ENVIRONMENT) {
+               // we do not need to do anything here, since the empty case is
+               // handled during export.
        } else {
                par.params().labelWidthString(docstring());
        }

diff --git a/status.20x b/status.20x
index f989bf49e4bd6d93cde21b61d48e97107d7d3d9c..a5db223106f33861cd060240f4a55357279d422c 100644 (file)
--- a/status.20x
+++ b/status.20x
@@ -83,6 +83,8 @@ What's new
 
 - Fix output of decimally aligned columns in unviewed (on screen) tables.
 
+- Fix problem with indentation of bibliography items.
+
 - Inform user of unknown layouts caused by class change (bug 7571).
 
 - Avoid LaTeX errors if font changing commands are used in the wrong mode
@@ -109,7 +111,7 @@ What's new
 - Fix dvi forward search on Windows when compiling with MSVC.
 
 - Calculate relative pathnames to master documents when master is in a
-  directory above the child (bug #7540).
+  directory above the child (bug 7540).
 
 - On Windows, improve detection of the TeX engine when the file system does
   not support short names and the temp directory contains spaces.