}
}
tmpbuf->params().useClassDefaults();
- if (tmpbuf->fileName().extension() == "internal") {
+ if (tmpbuf->isInternal()) {
binternal.push_back(tmpbuf.get());
} else {
LYXERR(Debug::INFO, "Assigning to buffer " << bstore.size());
void BufferList::emergencyWriteAll()
{
- for_each(bstore.begin(), bstore.end(),
- bind(&BufferList::emergencyWrite, this, _1));
-}
-
-
-docstring BufferList::emergencyWrite(Buffer * buf)
-{
- // 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)->emergencyWrite();
}
bind(equal_to<FileName>(), bind(&Buffer::fileName, _1), fname));
if (it != bstore.end())
return *it;
- // 2) possibly expensive test, using quivalence test of file names
+ // 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;
{
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 = changeExtension(onlyFilename(
+ (*it)->absFileName()), ".tex");
+ 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) {
+ string const mangled_child_name = DocFileName(
+ changeExtension((*cit)->absFileName(),
+ ".tex")).mangledFilename();
+ if (suffixIs(s, mangled_child_name))
+ return *cit;
+ }
+ }
+ }
return 0;
}
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();