comment

[lyx.git] / src / Buffer.cpp

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 632826fbc6d8c485c52cbc37a1af46d7064affa3..b38a394b48d164d40455db83d492d09a4acc5494 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -115,7 +115,7 @@ namespace os = support::os;
 
 namespace {
 
-int const LYX_FORMAT = 336;
+int const LYX_FORMAT = 338; //Uwe: support for polytonic Greek
 
 typedef map<string, bool> DepClean;
 typedef map<docstring, pair<InsetLabel const *, Buffer::References> > RefCache;
@@ -210,6 +210,8 @@ public:
        // file, and then to construct the Buffer's bibinfo from that.
        /// A cache for bibliography info
        mutable BiblioInfo bibinfo_;
+       /// whether the bibinfo cache is valid
+       bool bibinfoCacheValid_;
        /// Cache of timestamps of .bib files
        map<FileName, time_t> bibfileStatus_;
 
@@ -243,7 +245,7 @@ Buffer::Impl::Impl(Buffer & parent, FileName const & file, bool readonly_)
        : parent_buffer(0), lyx_clean(true), bak_clean(true), unnamed(false),
          read_only(readonly_), filename(file), file_fully_loaded(false),
          toc_backend(&parent), macro_lock(false), timestamp_(0), 
-         checksum_(0), wa_(0), undo_(parent)
+         checksum_(0), wa_(0), undo_(parent), bibinfoCacheValid_(false)
 {
        temppath = createBufferTmpDir();
        lyxvc.setBuffer(&parent);
@@ -273,6 +275,13 @@ Buffer::~Buffer()
        // GuiView already destroyed
        gui_ = 0;
 
+
+       // loop over children
+       Impl::BufferPositionMap::iterator it = d->children_positions.begin();
+       Impl::BufferPositionMap::iterator end = d->children_positions.end();
+       for (; it != end; ++it)
+               theBufferList().releaseChild(this, const_cast<Buffer *>(it->first));
+
        // clear references to children in macro tables
        d->children_positions.clear();
        d->position_to_children.clear();
@@ -284,7 +293,7 @@ Buffer::~Buffer()
        }
 
        // Remove any previewed LaTeX snippets associated with this buffer.
-       graphics::Previews::get().removeLoader(*this);
+       thePreviews().removeLoader(*this);
 
        delete d;
 }
@@ -989,7 +998,7 @@ bool Buffer::makeLaTeXFile(FileName const & fname,
        }
        catch (...) {
                lyxerr << "Caught some really weird exception..." << endl;
-               LyX::cref().exit(1);
+               lyx_exit(1);
        }
 
        ofs.close();
@@ -1346,6 +1355,14 @@ void Buffer::updateBibfilesCache() const
                                bibfiles.end());
                }
        }
+       // the bibinfo cache is now invalid
+       d->bibinfoCacheValid_ = false;
+}
+
+
+void Buffer::invalidateBibinfoCache() 
+{
+       d->bibinfoCacheValid_ = false;
 }
 
 
@@ -1377,23 +1394,26 @@ BiblioInfo const & Buffer::masterBibInfo() const
 
 BiblioInfo const & Buffer::localBibInfo() const
 {
-       support::FileNameList const & bibfilesCache = getBibfilesCache();
-       // compare the cached timestamps with the actual ones.
-       bool changed = false;
-       support::FileNameList::const_iterator ei = bibfilesCache.begin();
-       support::FileNameList::const_iterator en = bibfilesCache.end();
-       for (; ei != en; ++ ei) {
-               time_t lastw = ei->lastModified();
-               if (lastw != d->bibfileStatus_[*ei]) {
-                       changed = true;
-                       d->bibfileStatus_[*ei] = lastw;
-                       break;
+       if (d->bibinfoCacheValid_) {
+               support::FileNameList const & bibfilesCache = getBibfilesCache();
+               // compare the cached timestamps with the actual ones.
+               support::FileNameList::const_iterator ei = bibfilesCache.begin();
+               support::FileNameList::const_iterator en = bibfilesCache.end();
+               for (; ei != en; ++ ei) {
+                       time_t lastw = ei->lastModified();
+                       if (lastw != d->bibfileStatus_[*ei]) {
+                               d->bibinfoCacheValid_ = false;
+                               d->bibfileStatus_[*ei] = lastw;
+                               break;
+                       }
                }
        }
 
-       if (changed) {
+       if (!d->bibinfoCacheValid_) {
+               d->bibinfo_.clear();
                for (InsetIterator it = inset_iterator_begin(inset()); it; ++it)
                        it->fillWithBibKeys(d->bibinfo_, it);
+               d->bibinfoCacheValid_ = true;
        }
        return d->bibinfo_;
 }
@@ -1661,6 +1681,12 @@ Buffer const * Buffer::masterBuffer() const
 }
 
 
+bool Buffer::isChild(Buffer * child) const
+{
+       return d->children_positions.find(child) != d->children_positions.end();
+}
+
+
 template<typename M>
 typename M::iterator greatest_below(M & m, typename M::key_type const & x)
 {
@@ -2361,11 +2387,12 @@ bool Buffer::doExport(string const & format, bool put_in_tempdir,
 
        string const error_type = (format == "program")
                ? "Build" : bufferFormat();
+       ErrorList & error_list = d->errorLists[error_type];
        string const ext = formats.extension(format);
        FileName const tmp_result_file(changeExtension(filename, ext));
        bool const success = theConverters().convert(this, FileName(filename),
                tmp_result_file, FileName(absFileName()), backend_format, format,
-               errorList(error_type));
+               error_list);
        // Emit the signal to show the error list.
        if (format != backend_format)
                errors(error_type);