Author: rgheck
Date: Mon Jun 20 17:21:36 2011
New Revision: 39150
URL: http://www.lyx.org/trac/changeset/39150
Log:
Fix problem with bibliography indentation reported on user list.
Porting to branch.
Modified:
lyx-devel/branches/BRANCH_2_0_X/src/Buffer.cpp
lyx-devel/branches/BRANCH_2_0_X/status.20x
Modified: lyx-devel/branches/BRANCH_2_0_X/src/Buffer.cpp
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/src/Buffer.cpp Mon Jun 20 17:19:16
2011 (r39149)
+++ lyx-devel/branches/BRANCH_2_0_X/src/Buffer.cpp Mon Jun 20 17:21:36
2011 (r39150)
@@ -3966,10 +3966,12 @@
// 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());
}
Modified: lyx-devel/branches/BRANCH_2_0_X/status.20x
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/status.20x Mon Jun 20 17:19:16 2011
(r39149)
+++ lyx-devel/branches/BRANCH_2_0_X/status.20x Mon Jun 20 17:21:36 2011
(r39150)
@@ -83,6 +83,8 @@
- 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 @@
- 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.
