Revert "Use separate BibInfo for child"

This reverts commit cfce0ac009.
This commit is contained in:
Richard Kimberly Heck 2018-09-01 21:47:23 -04:00
parent d5d2f741a3
commit 6dc9e5aa33

View File

@ -2358,7 +2358,7 @@ BiblioInfo const & Buffer::bibInfo() const
void Buffer::registerBibfiles(FileNamePairList const & bf) const {
Buffer const * const tmp = masterBuffer();
if (tmp != this)
tmp->registerBibfiles(bf);
return tmp->registerBibfiles(bf);
for (auto const & p : bf) {
FileNamePairList::const_iterator tmp =
@ -2429,6 +2429,9 @@ 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.
BiblioInfo & bi = d->bibinfo_;
bi.mergeBiblioInfo(bin);