From 0de72fc38c017271ed519857055e8beb4dc6d5c0 Mon Sep 17 00:00:00 2001
From: Richard Heck <rgheck@comcast.net>
Date: Mon, 20 Jun 2011 15:21:36 +0000
Subject: [PATCH] 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
---
 src/Buffer.cpp | 6 ++++--
 status.20x     | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 2df65c2a24..238225bcb3 100644
--- 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 f989bf49e4..a5db223106 100644
--- 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.