* 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.
*/
#include "support/Package.h"
#include "support/lassert.h"
-#include <boost/bind.hpp>
+#include "support/bind.h"
#include <algorithm>
#include <functional>
-
-using boost::bind;
+#include <iterator>
+#include <memory>
using namespace std;
using namespace lyx::support;
{}
+BufferList::~BufferList()
+{
+ BufferStorage::iterator it = binternal.begin();
+ BufferStorage::iterator end = binternal.end();
+ for (; it != end; ++it)
+ delete (*it);
+}
+
+
bool BufferList::empty() const
{
return bstore.empty();
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 const * parent = buf->parent();
Buffer * tmp = (*it);
- LASSERT(tmp, /**/);
bstore.erase(it);
+ LASSERT(tmp, return);
delete tmp;
+ if (parent)
+ // If this was a child, update the parent's buffer
+ // to avoid crashes due to dangling pointers (bug 9979)
+ parent->updateBuffer();
}
}
-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<Buffer> 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_);
}
}
tmpbuf->params().useClassDefaults();
- LYXERR(Debug::INFO, "Assigning to buffer " << bstore.size());
- bstore.push_back(tmpbuf.get());
return tmpbuf.release();
}
}
-FileNameList const & BufferList::fileNames() const
+FileNameList BufferList::fileNames() const
{
- static FileNameList nvec;
- nvec.clear();
- transform(bstore.begin(), bstore.end(),
- back_inserter(nvec),
- boost::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;
}
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;
- if (nextbuf->fileName().extension() == "internal")
- return next(nextbuf);
return nextbuf;
}
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);
- if (previousbuf->fileName().extension() == "internal")
- return previous(previousbuf);
return previousbuf;
}
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;
}
void BufferList::emergencyWriteAll()
{
- for_each(bstore.begin(), bstore.end(),
- bind(&BufferList::emergencyWrite, this, _1));
+ BufferStorage::const_iterator it = bstore.begin();
+ BufferStorage::const_iterator const en = bstore.end();
+ for (; it != en; ++it)
+ (*it)->emergencyWrite();
}
-docstring BufferList::emergencyWrite(Buffer * buf)
+void BufferList::invalidateConverterCache() const
{
- // 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)->params().invalidateConverterCache();
}
}
-bool BufferList::isLoaded(Buffer const * b) const
+ bool BufferList::isLoaded(Buffer const * b) const
{
- LASSERT(b, /**/);
+ 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
+bool BufferList::isOthersChild(Buffer * parent, Buffer * child)
+{
+ LASSERT(parent, return false);
+ LASSERT(child, return false);
+ LASSERT(parent->isChild(child), return false);
+
+ // Does child document have a different parent?
+ Buffer const * parent_ = child->parent();
+ if (parent_ && parent_ != parent)
+ return true;
+
+ BufferStorage::iterator it = bstore.begin();
+ BufferStorage::iterator end = bstore.end();
+ for (; it != end; ++it) {
+ Buffer * buf = *it;
+ if (buf != parent && buf->isChild(child))
+ return true;
+ }
+ return false;
+}
+
+
+namespace {
+
+struct equivalent_to : public binary_function<FileName, FileName, bool>
+{
+ 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<FileName>(), bind(&Buffer::fileName, _1), fname));
- return it != bstore.end() ? (*it) : 0;
+ lyx::bind(equal_to<FileName>(), 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<FileName>(), 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;
}
{
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);
+}
+
+
+void BufferList::updatePreviews()
+{
+ BufferStorage::iterator it = bstore.begin();
+ BufferStorage::iterator end = bstore.end();
+ for (; it != end; ++it)
+ (*it)->updatePreviews();
}
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())
}
-bool BufferList::releaseChild(Buffer * parent, Buffer * child)
+void BufferList::changed(bool update_metrics) const
{
- LASSERT(parent, return false);
- LASSERT(child, return false);
- LASSERT(parent->isChild(child), return false);
-
- // Child document has a different parent, don't close it.
- if (child->parent() != parent)
- return false;
-
- BufferStorage::iterator it = bstore.begin();
- BufferStorage::iterator end = bstore.end();
- for (; it != end; ++it) {
- Buffer * buf = *it;
- if (buf != parent && buf->isChild(child)) {
- child->setParent(0);
- return false;
- }
- }
- release(child);
- return true;
+ 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);
}
projects / lyx.git / blobdiff