[LyX/2.3.x] Fix bug #12033.

Richard Kimberly Heck rikiheck at lyx.org
Sun Dec 6 01:06:18 UTC 2020


commit 6f433530c57b6401404cc59f36ae78b79b103825
Author: Richard Kimberly Heck <rikiheck at lyx.org>
Date:   Sat Dec 5 20:27:29 2020 -0500

    Fix bug #12033.
    
    Silly mistake: Only considered the parent, not grandparents, etc.
    
    (cherry picked from commit 742348262ec6a8f65abc95a50ce0a270b90e4dbb)
---
 src/Buffer.cpp |   12 +++++-------
 status.23x     |    1 +
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 0e09908..ec480f7 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -2598,16 +2598,14 @@ void Buffer::collectBibKeys(FileNameList & checkedFiles) const
 
 void Buffer::addBiblioInfo(BiblioInfo const & bin) const
 {
-	// We add the biblio info to the master buffer,
-	// if there is one, but also to every single buffer,
-	// in case a child is compiled alone.
+	// We add the biblio info to the parent buffer,
+	// if there is one, but also to this buffer, in case
+	// it is compiled alone.
 	BiblioInfo & bi = d->bibinfo_;
 	bi.mergeBiblioInfo(bin);
 
-	if (parent() != 0) {
-		BiblioInfo & masterbi = parent()->d->bibinfo_;
-		masterbi.mergeBiblioInfo(bin);
-	}
+	if (parent())
+		parent()->addBiblioInfo(bin);
 }
 
 
diff --git a/status.23x b/status.23x
index 72d3564..0370b1b 100644
--- a/status.23x
+++ b/status.23x
@@ -58,6 +58,7 @@ What's new
 - Improve error message for VCS file registration when RCS package
   is not installed.
 
+- Make bibliographies work with grandchildren (bug 12033).
 
 
 * INTERNALS


More information about the lyx-cvs mailing list