* remove various xforms relicts, in particular:

[lyx.git] / src / buffer.C

diff --git a/src/buffer.C b/src/buffer.C
index 2375a9b11de1eacce0fc854d1662a4ce261099b4..d5e60413b353dcfe050e107cfa7eb1d610d60917 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -68,9 +68,10 @@
 #include "support/lyxalgo.h"
 #include "support/filetools.h"
 #include "support/fs_extras.h"
-#ifdef USE_COMPRESSION
-# include "support/gzstream.h"
-#endif
+# include <boost/iostreams/filtering_stream.hpp>
+# include <boost/iostreams/filter/gzip.hpp>
+# include <boost/iostreams/device/file.hpp>
+namespace io = boost::iostreams;
 #include "support/lyxlib.h"
 #include "support/os.h"
 #include "support/path.h"
@@ -145,7 +146,7 @@ extern BufferList bufferlist;
 
 namespace {
 
-int const LYX_FORMAT = 245;
+int const LYX_FORMAT = 248;
 
 } // namespace anon
 
@@ -486,6 +487,7 @@ bool Buffer::readDocument(LyXLex & lex)
        for_each(text().paragraphs().begin(),
                 text().paragraphs().end(),
                 bind(&Paragraph::setInsetOwner, _1, &inset()));
+       updateBibfilesCache();
        return res;
 }
 
@@ -641,7 +643,7 @@ bool Buffer::readFile(LyXLex & lex, string const & filename)
                        return false;
                }
                ostringstream command;
-               command << "python " << quoteName(lyx2lyx)
+               command << os::python() << ' ' << quoteName(lyx2lyx)
                        << " -t " << convert<string>(LYX_FORMAT)
                        << " -o " << quoteName(tmpfile) << ' '
                        << quoteName(filename);
@@ -733,15 +735,11 @@ bool Buffer::writeFile(string const & fname) const
        bool retval = false;
 
        if (params().compressed) {
-#ifdef USE_COMPRESSION
-               gz::ogzstream ofs(fname.c_str(), ios::out|ios::trunc);
+               io::filtering_ostream ofs(io::gzip_compressor() | io::file_sink(fname));
                if (!ofs)
                        return false;
 
                retval = do_writeFile(ofs);
-#else
-               return false;
-#endif
        } else {
                ofstream ofs(fname.c_str(), ios::out|ios::trunc);
                if (!ofs)
@@ -1252,6 +1250,53 @@ void Buffer::fillWithBibKeys(vector<pair<string, string> > & keys)
 }
 
 
+void Buffer::updateBibfilesCache()
+{
+       // if this is a child document and the parent is already loaded
+       // update the parent's cache instead
+       Buffer * tmp = getMasterBuffer();
+       BOOST_ASSERT(tmp);
+       if (tmp != this) {
+               tmp->updateBibfilesCache();
+               return;
+       }
+
+       bibfilesCache_.clear();
+       for (InsetIterator it = inset_iterator_begin(inset()); it; ++it) {
+               if (it->lyxCode() == InsetBase::BIBTEX_CODE) {
+                       InsetBibtex const & inset =
+                               dynamic_cast<InsetBibtex const &>(*it);
+                       vector<string> const bibfiles = inset.getFiles(*this);
+                       bibfilesCache_.insert(bibfilesCache_.end(),
+                               bibfiles.begin(),
+                               bibfiles.end());
+               } else if (it->lyxCode() == InsetBase::INCLUDE_CODE) {
+                       InsetInclude & inset =
+                               dynamic_cast<InsetInclude &>(*it);
+                       inset.updateBibfilesCache(*this);
+                       vector<string> const & bibfiles =
+                                       inset.getBibfilesCache(*this);
+                       bibfilesCache_.insert(bibfilesCache_.end(),
+                               bibfiles.begin(),
+                               bibfiles.end());
+               }
+       }
+}
+
+
+vector<string> const & Buffer::getBibfilesCache() const
+{
+       // if this is a child document and the parent is already loaded
+       // use the parent's cache instead
+       Buffer const * tmp = getMasterBuffer();
+       BOOST_ASSERT(tmp);
+       if (tmp != this)
+               return tmp->getBibfilesCache();
+
+       return bibfilesCache_;
+}
+
+
 bool Buffer::isDepClean(string const & name) const
 {
        DepClean::const_iterator const it = pimpl_->dep_clean.find(name);
@@ -1278,7 +1323,7 @@ bool Buffer::dispatch(FuncRequest const & func, bool * result)
        bool dispatched = true;
 
        switch (func.action) {
-               case LFUN_EXPORT: {
+               case LFUN_BUFFER_EXPORT: {
                        bool const tmp = Exporter::Export(this, func.argument, false);
                        if (result)
                                *result = tmp;
@@ -1297,8 +1342,6 @@ void Buffer::changeLanguage(Language const * from, Language const * to)
        BOOST_ASSERT(from);
        BOOST_ASSERT(to);
 
-       lyxerr << "Changing Language!" << endl;
-
        // Take care of l10n/i18n
        updateDocLang(to);
 
@@ -1495,6 +1538,19 @@ Buffer const * Buffer::getMasterBuffer() const
 }
 
 
+Buffer * Buffer::getMasterBuffer()
+{
+       if (!params().parentname.empty()
+           && bufferlist.exists(params().parentname)) {
+               Buffer * buf = bufferlist.getBuffer(params().parentname);
+               if (buf)
+                       return buf->getMasterBuffer();
+       }
+
+       return this;
+}
+
+
 MacroData const & Buffer::getMacro(std::string const & name) const
 {
        return pimpl_->macros.get(name);
@@ -1576,7 +1632,7 @@ void Buffer::changeRefsIfUnique(string const & from, string const & to)
 }
 
 
-void Buffer::getSourceCode(ostream& os, lyx::pit_type par_begin, lyx::pit_type par_end)
+void Buffer::getSourceCode(ostream & os, lyx::pit_type par_begin, lyx::pit_type par_end)
 {
        OutputParams runparams;
        runparams.nice = true;
@@ -1587,16 +1643,6 @@ void Buffer::getSourceCode(ostream& os, lyx::pit_type par_begin, lyx::pit_type p
        // No side effect of file copying and image conversion
        runparams.dryrun = true;
 
-       // set source type for the view-source dialog
-       if (isLatex())
-               os << "%LaTeX\n";
-       else if (isLinuxDoc())
-               os << "%LinuxDoc\n";
-       else if (isDocBook())
-               os << "%DocBook\n";
-       else
-               BOOST_ASSERT(false);
-       // start text
        if (par_begin + 1 == par_end)
                os << "% Preview source code for paragraph " << par_begin << "\n\n";
        else