Typo.

[lyx.git] / src / Buffer.cpp

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 104e3b1f0ddfd3794e0af792f25fefdaa7fb5142..6173666b61f5aba803312caf46eba73dc5427353 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -115,7 +115,7 @@ namespace os = support::os;
 
 namespace {
 
-int const LYX_FORMAT = 330;
+int const LYX_FORMAT = 338; //Uwe: support for polytonic Greek
 
 typedef map<string, bool> DepClean;
 typedef map<docstring, pair<InsetLabel const *, Buffer::References> > RefCache;
@@ -204,8 +204,16 @@ public:
        /// documents), needed for appropriate update of natbib labels.
        mutable support::FileNameList bibfilesCache_;
 
+       // FIXME The caching mechanism could be improved. At present, we have a 
+       // cache for each Buffer, that caches all the bibliography info for that
+       // Buffer. A more efficient solution would be to have a global cache per 
+       // 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_;
 
        mutable RefCache ref_cache_;
 
@@ -237,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);
@@ -453,6 +461,7 @@ int Buffer::readHeader(Lexer & lex)
        params().headsep.erase();
        params().footskip.erase();
        params().columnsep.erase();
+       params().fontsCJK.erase();
        params().listings_params.clear();
        params().clearLayoutModules();
        params().pdfoptions().clear();
@@ -1339,6 +1348,14 @@ void Buffer::updateBibfilesCache() const
                                bibfiles.end());
                }
        }
+       // the bibinfo cache is now invalid
+       d->bibinfoCacheValid_ = false;
+}
+
+
+void Buffer::invalidateBibinfoCache() 
+{
+       d->bibinfoCacheValid_ = false;
 }
 
 
@@ -1369,27 +1386,27 @@ BiblioInfo const & Buffer::masterBibInfo() const
 
 
 BiblioInfo const & Buffer::localBibInfo() const
-{      
-       // cache the timestamp of the bibliography files.
-       static map<FileName, time_t> bibfileStatus;
-
-       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 != bibfileStatus[*ei]) {
-                       changed = true;
-                       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_;
 }
@@ -1428,6 +1445,19 @@ bool Buffer::dispatch(FuncRequest const & func, bool * result)
                        break;
                }
 
+               case LFUN_BRANCH_ACTIVATE:
+               case LFUN_BRANCH_DEACTIVATE: {
+                       BranchList & branchList = params().branchlist();
+                       docstring const branchName = func.argument();
+                       Branch * branch = branchList.find(branchName);
+                       if (!branch)
+                               LYXERR0("Branch " << branchName << " does not exist.");
+                       else 
+                               branch->setSelected(func.action == LFUN_BRANCH_ACTIVATE);
+                       if (result)
+                               *result = true;
+               }
+
                default:
                        dispatched = false;
        }