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<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->isInternal()) {
- binternal.push_back(tmpbuf.get());
- } else {
- LYXERR(Debug::INFO, "Assigning to buffer " << bstore.size());
- bstore.push_back(tmpbuf.get());
- }
return tmpbuf.release();
}
FileNameList const & BufferList::fileNames() const
{
+ // FIXME THREAD
static FileNameList nvec;
nvec.clear();
BufferStorage::const_iterator it = bstore.begin();
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;
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;
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), runparams, false);
+ (*it)->makeLaTeXFile(FileName(writefile), masterTmpDir,
+ runparams, Buffer::OnlyBody);
(*it)->markDepClean(masterTmpDir);
}
}
+ runparams.is_child = false;
}
namespace {
+
struct equivalent_to : public binary_function<FileName, FileName, bool>
{
bool operator()(FileName const & x, FileName const & y) const
{ return equivalent(x, y); }
};
+
}