X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferList.cpp;h=c253282b795c029ea244769362d4fee5d9e6ca5c;hb=9c375cb606d7950f8f6bd31e7a841399dc7bbfb2;hp=175c58ebe20a14f6654beefdbec57fd3b8618cf5;hpb=21514ad5129df123605cc11b1dc04d525ce4a295;p=lyx.git diff --git a/src/BufferList.cpp b/src/BufferList.cpp index 175c58ebe2..c253282b79 100644 --- a/src/BufferList.cpp +++ b/src/BufferList.cpp @@ -37,7 +37,7 @@ #include #include #include - +#include using namespace std; using namespace lyx::support; @@ -92,23 +92,47 @@ BufferList::const_iterator BufferList::end() const void BufferList::release(Buffer * buf) { - LASSERT(buf, /**/); + // We may leak here, but we probably do not need to + // shut down. + LASSERT(buf, return); BufferStorage::iterator const it = find(bstore.begin(), bstore.end(), buf); if (it != bstore.end()) { Buffer * tmp = (*it); - LASSERT(tmp, /**/); bstore.erase(it); + LASSERT(tmp, return); delete tmp; } } -Buffer * BufferList::newBuffer(string const & s, bool const ronly) +Buffer * BufferList::newInternalBuffer(string const & s) +{ + Buffer * const buf = createNewBuffer(s); + if (buf) { + buf->setInternal(true); + binternal.push_back(buf); + } + return buf; +} + + +Buffer * BufferList::newBuffer(string const & s) +{ + Buffer * const buf = createNewBuffer(s); + if (buf) { + LYXERR(Debug::INFO, "Assigning to buffer " << bstore.size()); + bstore.push_back(buf); + } + return buf; +} + + +Buffer * BufferList::createNewBuffer(string const & s) { auto_ptr tmpbuf; try { - tmpbuf.reset(new Buffer(s, ronly)); + tmpbuf.reset(new Buffer(s)); } catch (ExceptionMessage const & message) { if (message.type_ == ErrorException) { Alert::error(message.title_, message.details_); @@ -119,12 +143,6 @@ Buffer * BufferList::newBuffer(string const & s, bool const ronly) } } tmpbuf->params().useClassDefaults(); - if (tmpbuf->isInternal()) { - binternal.push_back(tmpbuf.get()); - } else { - LYXERR(Debug::INFO, "Assigning to buffer " << bstore.size()); - bstore.push_back(tmpbuf.get()); - } return tmpbuf.release(); } @@ -136,13 +154,15 @@ void BufferList::closeAll() } -FileNameList const & BufferList::fileNames() const +FileNameList BufferList::fileNames() const { - static FileNameList nvec; - nvec.clear(); - transform(bstore.begin(), bstore.end(), - back_inserter(nvec), - bind(&Buffer::fileName, _1)); + FileNameList nvec; + 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; } @@ -173,13 +193,14 @@ Buffer * BufferList::getBuffer(unsigned int choice) Buffer * BufferList::next(Buffer const * buf) const { - LASSERT(buf, /**/); + // Something is wrong, but we can probably survive it. + LASSERT(buf, return 0); if (bstore.empty()) return 0; - BufferStorage::const_iterator it = find(bstore.begin(), - bstore.end(), buf); - LASSERT(it != bstore.end(), /**/); + BufferStorage::const_iterator it = + find(bstore.begin(), bstore.end(), buf); + LASSERT(it != bstore.end(), return 0); ++it; Buffer * nextbuf = (it == bstore.end()) ? bstore.front() : *it; return nextbuf; @@ -188,13 +209,14 @@ Buffer * BufferList::next(Buffer const * buf) const Buffer * BufferList::previous(Buffer const * buf) const { - LASSERT(buf, /**/); + // Something is wrong, but we can probably survive it. + LASSERT(buf, return 0); if (bstore.empty()) return 0; - BufferStorage::const_iterator it = find(bstore.begin(), - bstore.end(), buf); - LASSERT(it != bstore.end(), /**/); + BufferStorage::const_iterator it = + find(bstore.begin(), bstore.end(), buf); + LASSERT(it != bstore.end(), return 0); Buffer * previousbuf = (it == bstore.begin()) ? bstore.back() : *(it - 1); return previousbuf; @@ -202,18 +224,21 @@ Buffer * BufferList::previous(Buffer const * buf) const void BufferList::updateIncludedTeXfiles(string const & masterTmpDir, - OutputParams const & runparams) + OutputParams const & runparams_in) { + OutputParams runparams = runparams_in; + runparams.is_child = true; BufferStorage::iterator it = bstore.begin(); BufferStorage::iterator end = bstore.end(); for (; it != end; ++it) { if (!(*it)->isDepClean(masterTmpDir)) { string writefile = addName(masterTmpDir, (*it)->latexName()); (*it)->makeLaTeXFile(FileName(writefile), masterTmpDir, - runparams, false); + runparams, Buffer::OnlyBody); (*it)->markDepClean(masterTmpDir); } } + runparams.is_child = false; } @@ -243,25 +268,43 @@ bool BufferList::exists(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) const +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)); + lyx::bind(equal_to(), lyx::bind(&Buffer::fileName, _1), fname)); if (it != bstore.end()) - return *it; + return *it; // 2) possibly expensive test, using equivalence test of file names it = find_if(bstore.begin(), bstore.end(), - bind(equivalent_to(), bind(&Buffer::fileName, _1), fname)); - return it != bstore.end() ? (*it) : 0; + 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; } @@ -272,15 +315,14 @@ Buffer * BufferList::getBufferFromTmp(string const & s) for (; it < end; ++it) { if (prefixIs(s, (*it)->temppath())) { // check whether the filename matches the master - string const master_name = changeExtension(onlyFileName( - (*it)->absFileName()), ".tex"); + string const master_name = (*it)->latexName(); if (suffixIs(s, master_name)) return *it; // if not, try with the children - vector clist = (*it)->getChildren(); - vector::const_iterator cit = clist.begin(); - vector::const_iterator cend = clist.end(); - for (; cit < cend; ++cit) { + 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(); @@ -293,18 +335,18 @@ Buffer * BufferList::getBufferFromTmp(string const & s) } -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); } int BufferList::bufferNum(FileName const & fname) const { - FileNameList const & buffers = fileNames(); + FileNameList const buffers(fileNames()); FileNameList::const_iterator cit = find(buffers.begin(), buffers.end(), fname); if (cit == buffers.end())