anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-29 13:04:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Always update bibfiles cache with bibliography environment before opening citation dialog

Browse Source 
We need to do this unconditionally, since there is no (trivial and non-
awkward) way to update it when the bibliography paragraphs are modified.

Fixes: #4899
This commit is contained in:
Juergen Spitzmueller 2019-01-04 13:01:03 +01:00
parent 21254cd962
commit 35534231d4
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/Buffer.cpp
View File

@ -310,6 +310,8 @@ public:
/// we ran updateBuffer(), i.e., whether citation labels may need /// we ran updateBuffer(), i.e., whether citation labels may need
/// to be updated. /// to be updated.
mutable bool cite_labels_valid_; mutable bool cite_labels_valid_;
/// Do we have a bibliography environment?
mutable bool have_bibitems_;
/// These two hold the file name and format, written to by /// These two hold the file name and format, written to by
/// Buffer::preview and read from by LFUN_BUFFER_VIEW_CACHE. /// Buffer::preview and read from by LFUN_BUFFER_VIEW_CACHE.
@ -447,7 +449,7 @@ Buffer::Impl::Impl(Buffer * owner, FileName const & file, bool readonly_,
file_fully_loaded(false), file_format(LYX_FORMAT), need_format_backup(false), file_fully_loaded(false), file_format(LYX_FORMAT), need_format_backup(false),
ignore_parent(false), toc_backend(owner), macro_lock(false), ignore_parent(false), toc_backend(owner), macro_lock(false),
checksum_(0), wa_(0), gui_(0), undo_(*owner), bibinfo_cache_valid_(false), checksum_(0), wa_(0), gui_(0), undo_(*owner), bibinfo_cache_valid_(false),
cite_labels_valid_(false), preview_error_(false), cite_labels_valid_(false), have_bibitems_(false), preview_error_(false),
inset(0), preview_loader_(0), cloned_buffer_(cloned_buffer), inset(0), preview_loader_(0), cloned_buffer_(cloned_buffer),
clone_list_(0), doing_export(false), clone_list_(0), doing_export(false),
tracked_changes_present_(0), externally_modified_(false), parent_buffer(0), tracked_changes_present_(0), externally_modified_(false), parent_buffer(0),
@ -469,6 +471,7 @@ Buffer::Impl::Impl(Buffer * owner, FileName const & file, bool readonly_,
bibinfo_cache_valid_ = cloned_buffer_->d->bibinfo_cache_valid_; bibinfo_cache_valid_ = cloned_buffer_->d->bibinfo_cache_valid_;
bibfile_status_ = cloned_buffer_->d->bibfile_status_; bibfile_status_ = cloned_buffer_->d->bibfile_status_;
cite_labels_valid_ = cloned_buffer_->d->cite_labels_valid_; cite_labels_valid_ = cloned_buffer_->d->cite_labels_valid_;
have_bibitems_ = cloned_buffer_->d->have_bibitems_;
unnamed = cloned_buffer_->d->unnamed; unnamed = cloned_buffer_->d->unnamed;
internal_buffer = cloned_buffer_->d->internal_buffer; internal_buffer = cloned_buffer_->d->internal_buffer;
layout_position = cloned_buffer_->d->layout_position; layout_position = cloned_buffer_->d->layout_position;
@ -2513,7 +2516,16 @@ void Buffer::checkIfBibInfoCacheIsValid() const
if (!d->bibinfo_cache_valid_) if (!d->bibinfo_cache_valid_)
return; return;
// we'll assume it's ok and change this if it's not if (d->have_bibitems_) {
// We have a bibliography environment.
// Invalidate the bibinfo cache unconditionally.
// Cite labels will get invalidated by the inset if needed.
d->bibinfo_cache_valid_ = false;
return;
}
// OK. This is with Bib(la)tex. We'll assume the cache
// is valid and change this if we find changes in the bibs.
d->bibinfo_cache_valid_ = true; d->bibinfo_cache_valid_ = true;
d->cite_labels_valid_ = true; d->cite_labels_valid_ = true;
@ -2565,6 +2577,7 @@ void Buffer::reloadBibInfoCache(bool const force) const
clearBibFileCache(); clearBibFileCache();
d->bibinfo_.clear(); d->bibinfo_.clear();
FileNameList checkedFiles; FileNameList checkedFiles;
d->have_bibitems_ = false;
collectBibKeys(checkedFiles); collectBibKeys(checkedFiles);
d->bibinfo_cache_valid_ = true; d->bibinfo_cache_valid_ = true;
} }
@ -2572,8 +2585,15 @@ void Buffer::reloadBibInfoCache(bool const force) const
void Buffer::collectBibKeys(FileNameList & checkedFiles) const void Buffer::collectBibKeys(FileNameList & checkedFiles) const
{ {
for (InsetIterator it = inset_iterator_begin(inset()); it; ++it) for (InsetIterator it = inset_iterator_begin(inset()); it; ++it) {
it->collectBibKeys(it, checkedFiles); it->collectBibKeys(it, checkedFiles);
if (it->lyxCode() == BIBITEM_CODE) {
if (parent() != 0)
parent()->d->have_bibitems_ = true;
else
d->have_bibitems_ = true;
}
}
} }