X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferList.cpp;h=8a94c4208cd4b2de0dc10a44c8b22f4ad05865e6;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=4f7c4e0ac4a2f34001420b28c19409b66dcb1180;hpb=22204cda0ba93d0ae4b79418315a159962517309;p=lyx.git

diff --git a/src/BufferList.cpp b/src/BufferList.cpp
index 4f7c4e0ac4..8a94c4208c 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,10 @@
 #include "support/Package.h"
 
 #include "support/lassert.h"
-#include <boost/bind.hpp>
 
 #include <algorithm>
-#include <functional>
-
-using boost::bind;
+#include <iterator>
+#include <memory>
 
 using namespace std;
 using namespace lyx::support;
@@ -92,23 +90,52 @@ 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 const * parent = buf ? buf->parent() : 0;
 		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::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, bool const ronly)
+Buffer * BufferList::newBuffer(string const & s)
 {
-	auto_ptr<Buffer> tmpbuf;
+	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)
+{
+	unique_ptr<Buffer> tmpbuf;
 	try {
-		tmpbuf.reset(new Buffer(s, ronly));
+		tmpbuf = make_unique<Buffer>(s);
 	} catch (ExceptionMessage const & message) {
 		if (message.type_ == ErrorException) {
 			Alert::error(message.title_, message.details_);
@@ -119,12 +146,6 @@ Buffer * BufferList::newBuffer(string const & s, bool const ronly)
 		}
 	}
 	tmpbuf->params().useClassDefaults();
-	if (tmpbuf->fileName().extension() == "internal") {
-		binternal.push_back(tmpbuf.get());
-	} else {
-		LYXERR(Debug::INFO, "Assigning to buffer " << bstore.size());
-		bstore.push_back(tmpbuf.get());
-	}
 	return tmpbuf.release();
 }
 
@@ -136,13 +157,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),
-		  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;
 }
 
@@ -173,13 +196,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 +212,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,87 +227,39 @@ 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;
 }
 
 
 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();
 }
 
 
@@ -292,20 +269,55 @@ bool BufferList::exists(FileName const & fname) const
 }
 
 
-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)
 {
-	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;
+	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;
+
+	for(Buffer * buf : bstore)
+		if (buf != parent && buf->isChild(child))
+			return true;
+	return false;
+}
+
+
+Buffer * BufferList::getBuffer(support::FileName const & fname, bool internal) const
+{
+	// 1) cheap test, using string comparison of file names
+	for (Buffer * b : bstore)
+		if (b->fileName() == fname)
+			return b;
+	// 2) possibly expensive test, using equivalence test of file names
+	for (Buffer * b : bstore)
+		if (equivalent(b->fileName(), fname))
+			return b;
+	if (internal) {
+		// 1) cheap test, using string comparison of file names
+		for (Buffer * b : binternal)
+			if (b->fileName() == fname)
+				return b;
+		// 2) possibly expensive test, using equivalence test of file names
+		for (Buffer * b : binternal)
+			if (equivalent(b->fileName(), fname))
+				return b;
+	}
+	return 0;
 }
 
 
@@ -313,25 +325,50 @@ 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().recordCurrentAuthor(author);
+}
+
+
+void BufferList::updatePreviews()
 {
 	BufferStorage::iterator it = bstore.begin();
 	BufferStorage::iterator end = bstore.end();
 	for (; it != end; ++it)
-		(*it)->params().authors().record(0, Author(name, email));
+		(*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())
@@ -340,27 +377,16 @@ int BufferList::bufferNum(FileName const & fname) const
 }
 
 
-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);
 }