X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferList.cpp;h=c0700b4f879ccaf74bf9a9146dfdb5213fdb54b9;hb=55a3dd7b346d29a52ba305a4558e9e380ef50f47;hp=ac27d2130c0b4822ad6209ee92f8b064df97273d;hpb=536f1d4878d3b009b393ccc384f044eaa7a81b80;p=lyx.git diff --git a/src/BufferList.cpp b/src/BufferList.cpp index ac27d2130c..c0700b4f87 100644 --- a/src/BufferList.cpp +++ b/src/BufferList.cpp @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Lars Gullik Bjønnes + * \author Lars Gullik Bjønnes * * Full author contact details are available in file CREDITS. */ @@ -32,12 +32,12 @@ #include "support/Package.h" #include "support/lassert.h" -#include +#include "support/bind.h" #include #include - -using boost::bind; +#include +#include using namespace std; using namespace lyx::support; @@ -119,7 +119,7 @@ Buffer * BufferList::newBuffer(string const & s, bool const ronly) } } tmpbuf->params().useClassDefaults(); - if (tmpbuf->fileName().extension() == "internal") { + if (tmpbuf->isInternal()) { binternal.push_back(tmpbuf.get()); } else { LYXERR(Debug::INFO, "Assigning to buffer " << bstore.size()); @@ -140,9 +140,12 @@ FileNameList const & BufferList::fileNames() const { static FileNameList nvec; nvec.clear(); - transform(bstore.begin(), bstore.end(), - back_inserter(nvec), - boost::bind(&Buffer::fileName, _1)); + BufferStorage::const_iterator it = bstore.begin(); + BufferStorage::const_iterator end = bstore.end(); + for (; it != end; ++it) { + Buffer * buf = *it; + nvec.push_back(buf->fileName()); + } return nvec; } @@ -177,8 +180,8 @@ Buffer * BufferList::next(Buffer const * buf) const if (bstore.empty()) return 0; - BufferStorage::const_iterator it = find(bstore.begin(), - bstore.end(), buf); + BufferStorage::const_iterator it = + find(bstore.begin(), bstore.end(), buf); LASSERT(it != bstore.end(), /**/); ++it; Buffer * nextbuf = (it == bstore.end()) ? bstore.front() : *it; @@ -192,8 +195,8 @@ Buffer * BufferList::previous(Buffer const * buf) const if (bstore.empty()) return 0; - BufferStorage::const_iterator it = find(bstore.begin(), - bstore.end(), buf); + BufferStorage::const_iterator it = + find(bstore.begin(), bstore.end(), buf); LASSERT(it != bstore.end(), /**/); Buffer * previousbuf = (it == bstore.begin()) ? bstore.back() : *(it - 1); @@ -210,7 +213,7 @@ void BufferList::updateIncludedTeXfiles(string const & masterTmpDir, if (!(*it)->isDepClean(masterTmpDir)) { string writefile = addName(masterTmpDir, (*it)->latexName()); (*it)->makeLaTeXFile(FileName(writefile), masterTmpDir, - runparams, false); + runparams, Buffer::OnlyBody); (*it)->markDepClean(masterTmpDir); } } @@ -219,70 +222,10 @@ void BufferList::updateIncludedTeXfiles(string const & masterTmpDir, void BufferList::emergencyWriteAll() { - for_each(bstore.begin(), bstore.end(), - bind(&BufferList::emergencyWrite, this, _1)); -} - - -docstring BufferList::emergencyWrite(Buffer * buf) -{ - // Use ::assert to avoid a loop, BOOST_ASSERT ends up calling ::assert - // compare with 0 to avoid pointer/interger comparison - // ::assert(buf != 0); - if (!buf) - return _("No file open!"); - - // No need to save if the buffer has not changed. - if (buf->isClean()) - return docstring(); - - string const doc = buf->isUnnamed() - ? onlyFilename(buf->absFileName()) : buf->absFileName(); - - docstring user_message = bformat( - _("LyX: Attempting to save document %1$s\n"), from_utf8(doc)); - - // We try to save three places: - // 1) Same place as document. Unless it is an unnamed doc. - if (!buf->isUnnamed()) { - string s = buf->absFileName(); - s += ".emergency"; - lyxerr << " " << s << endl; - if (buf->writeFile(FileName(s))) { - buf->markClean(); - user_message += _(" Save seems successful. Phew.\n"); - return user_message; - } else { - user_message += _(" Save failed! Trying...\n"); - } - } - - // 2) In HOME directory. - string s = addName(package().home_dir().absFilename(), buf->absFileName()); - s += ".emergency"; - lyxerr << ' ' << s << endl; - if (buf->writeFile(FileName(s))) { - buf->markClean(); - user_message += _(" Save seems successful. Phew.\n"); - return user_message; - } - - user_message += _(" Save failed! Trying...\n"); - - // 3) In "/tmp" directory. - // MakeAbsPath to prepend the current - // drive letter on OS/2 - s = addName(package().temp_dir().absFilename(), buf->absFileName()); - s += ".emergency"; - lyxerr << ' ' << s << endl; - if (buf->writeFile(FileName(s))) { - buf->markClean(); - user_message += _(" Save seems successful. Phew.\n"); - return user_message; - } - - user_message += _(" Save failed! Bummer. Document is lost."); - return user_message; + BufferStorage::const_iterator it = bstore.begin(); + BufferStorage::const_iterator const en = bstore.end(); + for (; it != en; ++it) + (*it)->emergencyWrite(); } @@ -292,19 +235,52 @@ bool BufferList::exists(FileName const & fname) const } -bool BufferList::isLoaded(Buffer const * b) const + bool BufferList::isLoaded(Buffer const * b) const { + if (!b) + return false; BufferStorage::const_iterator cit = find(bstore.begin(), bstore.end(), b); return cit != bstore.end(); } -Buffer * BufferList::getBuffer(support::FileName const & fname) const +namespace { +struct equivalent_to : public binary_function +{ + bool operator()(FileName const & x, FileName const & y) const + { return equivalent(x, y); } +}; +} + + +Buffer * BufferList::getBuffer(support::FileName const & fname, bool internal) const { + // 1) cheap test, using string comparison of file names BufferStorage::const_iterator it = find_if(bstore.begin(), bstore.end(), - bind(equal_to(), bind(&Buffer::fileName, _1), fname)); - return it != bstore.end() ? (*it) : 0; + lyx::bind(equal_to(), lyx::bind(&Buffer::fileName, _1), fname)); + if (it != bstore.end()) + return *it; + // 2) possibly expensive test, using equivalence test of file names + it = find_if(bstore.begin(), bstore.end(), + lyx::bind(equivalent_to(), lyx::bind(&Buffer::fileName, _1), fname)); + if (it != bstore.end()) + return *it; + + if (internal) { + // 1) cheap test, using string comparison of file names + BufferStorage::const_iterator it = find_if(binternal.begin(), binternal.end(), + lyx::bind(equal_to(), lyx::bind(&Buffer::fileName, _1), fname)); + if (it != binternal.end()) + return *it; + // 2) possibly expensive test, using equivalence test of file names + it = find_if(binternal.begin(), binternal.end(), + lyx::bind(equivalent_to(), lyx::bind(&Buffer::fileName, _1), fname)); + if (it != binternal.end()) + return *it; + } + + return 0; } @@ -312,19 +288,35 @@ Buffer * BufferList::getBufferFromTmp(string const & s) { BufferStorage::iterator it = bstore.begin(); BufferStorage::iterator end = bstore.end(); - for (; it < end; ++it) - if (prefixIs(s, (*it)->temppath())) - return *it; + for (; it < end; ++it) { + if (prefixIs(s, (*it)->temppath())) { + // check whether the filename matches the master + string const master_name = (*it)->latexName(); + if (suffixIs(s, master_name)) + return *it; + // if not, try with the children + ListOfBuffers clist = (*it)->getDescendents(); + ListOfBuffers::const_iterator cit = clist.begin(); + ListOfBuffers::const_iterator cend = clist.end(); + for (; cit != cend; ++cit) { + string const mangled_child_name = DocFileName( + changeExtension((*cit)->absFileName(), + ".tex")).mangledFileName(); + if (suffixIs(s, mangled_child_name)) + return *cit; + } + } + } return 0; } -void BufferList::setCurrentAuthor(docstring const & name, docstring const & email) +void BufferList::recordCurrentAuthor(Author const & author) { BufferStorage::iterator it = bstore.begin(); BufferStorage::iterator end = bstore.end(); for (; it != end; ++it) - (*it)->params().authors().record(0, Author(name, email)); + (*it)->params().authors().recordCurrentAuthor(author); } @@ -346,7 +338,8 @@ bool BufferList::releaseChild(Buffer * parent, Buffer * child) LASSERT(parent->isChild(child), return false); // Child document has a different parent, don't close it. - if (child->parent() != parent) + Buffer const * parent_ = child->parent(); + if (parent_ && parent_ != parent) return false; BufferStorage::iterator it = bstore.begin(); @@ -363,4 +356,17 @@ bool BufferList::releaseChild(Buffer * parent, Buffer * child) } +void BufferList::changed(bool update_metrics) const +{ + BufferStorage::const_iterator it = bstore.begin(); + BufferStorage::const_iterator end = bstore.end(); + for (; it != end; ++it) + (*it)->changed(update_metrics); + it = binternal.begin(); + end = binternal.end(); + for (; it != end; ++it) + (*it)->changed(update_metrics); +} + + } // namespace lyx