Embedding: add embedding support for InsetBibtex. (params["embed"] is added, use...

[lyx.git] / src / Buffer.cpp

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 44572501ea0b866aab72082101c52ef9bf0f5d39..1757a4af91bdc66edbffc00bc506281c9ab478b8 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -207,7 +207,7 @@ public:
 
        /// A cache for the bibfiles (including bibfiles of loaded child
        /// documents), needed for appropriate update of natbib labels.
-       mutable FileNameList bibfilesCache_;
+       mutable EmbeddedFileList bibfilesCache_;
 };
 
 /// Creates the per buffer temporary directory
@@ -672,6 +672,8 @@ bool Buffer::readFile(FileName const & filename)
                FileName lyxfile(addName(temppath(), "content.lyx"));
                // if both manifest.txt and file.lyx exist, this is am embedded file
                if (lyxfile.exists()) {
+                       // if in bundled format, save checksum of the compressed file, not content.lyx
+                       saveCheckSum(filename);
                        params().embedded = true;
                        fname = lyxfile;
                }
@@ -908,20 +910,19 @@ bool Buffer::writeFile(FileName const & fname) const
        }
 
        removeAutosaveFile(d->filename.absFilename());
+
+       if (params().embedded) {
+               message(str + _(" writing embedded files!."));
+               // if embedding is enabled, write file.lyx and all the embedded files
+               // to the zip file fname.
+               if (!d->embedded_files.writeFile(fname)) {
+                       message(str + _(" could not write embedded files!."));
+                       return false;
+               }
+       }
        saveCheckSum(d->filename);
        message(str + _(" done."));
 
-       if (!params().embedded)
-               return true;
-
-       message(str + _(" writing embedded files!."));
-       // if embedding is enabled, write file.lyx and all the embedded files
-       // to the zip file fname.
-       if (!d->embedded_files.writeFile(fname)) {
-               message(str + _(" could not write embedded files!."));
-               return false;
-       }
-       message(str + _(" error while writing embedded files."));
        return true;
 }
 
@@ -1383,7 +1384,7 @@ void Buffer::updateBibfilesCache() const
                if (it->lyxCode() == BIBTEX_CODE) {
                        InsetBibtex const & inset =
                                static_cast<InsetBibtex const &>(*it);
-                       FileNameList const bibfiles = inset.getFiles(*this);
+                       EmbeddedFileList const bibfiles = inset.getFiles(*this);
                        d->bibfilesCache_.insert(d->bibfilesCache_.end(),
                                bibfiles.begin(),
                                bibfiles.end());
@@ -1391,7 +1392,7 @@ void Buffer::updateBibfilesCache() const
                        InsetInclude & inset =
                                static_cast<InsetInclude &>(*it);
                        inset.updateBibfilesCache(*this);
-                       FileNameList const & bibfiles =
+                       EmbeddedFileList const & bibfiles =
                                        inset.getBibfilesCache(*this);
                        d->bibfilesCache_.insert(d->bibfilesCache_.end(),
                                bibfiles.begin(),
@@ -1401,7 +1402,7 @@ void Buffer::updateBibfilesCache() const
 }
 
 
-FileNameList const & Buffer::getBibfilesCache() const
+EmbeddedFileList const & Buffer::getBibfilesCache() const
 {
        // if this is a child document and the parent is already loaded
        // use the parent's cache instead