X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferList.cpp;h=c0700b4f879ccaf74bf9a9146dfdb5213fdb54b9;hb=55a3dd7b346d29a52ba305a4558e9e380ef50f47;hp=17b7aea9fa361129615b74e25178f0c4bfed78c3;hpb=30bae1710a2e40dbcebbbb333622a208dd7381bf;p=lyx.git

diff --git a/src/BufferList.cpp b/src/BufferList.cpp
index 17b7aea9fa..c0700b4f87 100644
--- a/src/BufferList.cpp
+++ b/src/BufferList.cpp
@@ -140,9 +140,12 @@ FileNameList const & BufferList::fileNames() const
 {
 	static FileNameList nvec;
 	nvec.clear();
-	transform(bstore.begin(), bstore.end(),
-		  back_inserter(nvec),
-		  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);
 		}
 	}
@@ -251,17 +254,33 @@ struct equivalent_to : public binary_function<FileName, FileName, bool>
 }
 
 
-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(),
 		lyx::bind(equal_to<FileName>(), 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(),
 		lyx::bind(equivalent_to(), lyx::bind(&Buffer::fileName, _1), fname));
-	return it != bstore.end() ? (*it) : 0;
+	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;
 }
 
 
@@ -276,10 +295,10 @@ Buffer * BufferList::getBufferFromTmp(string const & s)
 			if (suffixIs(s, master_name))
 				return *it;
 			// if not, try with the children
-			vector<Buffer *> clist = (*it)->getChildren();
-			vector<Buffer *>::const_iterator cit = clist.begin();
-			vector<Buffer *>::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();
@@ -292,12 +311,12 @@ 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);
 }