#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;
}
-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();
- 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();
}
{
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;
}
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;
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);
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;
}
}
-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();
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) 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<FileName>(), bind(&Buffer::fileName, _1), fname));
+ 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(),
- 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<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;
}
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<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();
+ ".tex")).mangledFileName();
if (suffixIs(s, mangled_child_name))
return *cit;
}
}
-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);
}
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();
}
+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