X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbufferlist.C;h=2ae3df66871419a7450d8f7a8e690c61e7c547fc;hb=9ee46b846e5e84ad40ceda4f4af94aeb86cd90a2;hp=7d7b327b4e63cf95ffa742931b4ef7fcf752c482;hpb=2d8eb4b9d466e8293534ef7410737aa9448361c6;p=lyx.git diff --git a/src/bufferlist.C b/src/bufferlist.C index 7d7b327b4e..2ae3df6687 100644 --- a/src/bufferlist.C +++ b/src/bufferlist.C @@ -5,48 +5,56 @@ * * \author Lars Gullik Bjønnes * - * Full author contact details are available in file CREDITS + * Full author contact details are available in file CREDITS. */ #include #include "bufferlist.h" -#include "lyx_main.h" -#include "lastfiles.h" + +#include "author.h" #include "buffer.h" +#include "bufferparams.h" #include "debug.h" -#include "lyxrc.h" -#include "lyxtext.h" -#include "lyx_cb.h" -#include "bufferview_funcs.h" -#include "BufferView.h" #include "gettext.h" -#include "frontends/LyXView.h" -#include "vc-backend.h" -#include "TextCache.h" -#include "lyxlex.h" +#include "lastfiles.h" +#include "lyx_cb.h" +#include "lyx_main.h" +#include "output_latex.h" +#include "paragraph.h" +#include "ParagraphList_fwd.h" #include "frontends/Alert.h" -#include "support/FileInfo.h" #include "support/filetools.h" -#include "support/lyxmanip.h" -#include "support/lyxfunctional.h" -#include "support/LAssert.h" +#include "support/package.h" #include -#include #include #include +using lyx::support::AddName; +using lyx::support::bformat; +using lyx::support::MakeAbsPath; +using lyx::support::MakeDisplayPath; +using lyx::support::OnlyFilename; +using lyx::support::removeAutosaveFile; +using lyx::support::package; +using lyx::support::prefixIs; -using std::vector; -using std::find; +using boost::bind; + +using std::auto_ptr; using std::endl; +using std::equal_to; +using std::find; using std::find_if; using std::for_each; -using std::mem_fun; +using std::string; +using std::vector; +using std::back_inserter; +using std::transform; BufferList::BufferList() @@ -61,16 +69,19 @@ bool BufferList::empty() const bool BufferList::quitWriteBuffer(Buffer * buf) { + BOOST_ASSERT(buf); + string file; if (buf->isUnnamed()) file = OnlyFilename(buf->fileName()); else file = MakeDisplayPath(buf->fileName(), 30); - string text = bformat(_("The document %1$s has unsaved changes.\n\n" - "Do you want to save the document?"), file); + string const text = + bformat(_("The document %1$s has unsaved changes.\n\n" + "Do you want to save the document or discard the changes?"), file); int const ret = Alert::prompt(_("Save changed document?"), - text, 0, 2, _("&Save Changes"), _("&Discard Changes"), _("&Cancel")); + text, 0, 2, _("&Save"), _("&Discard"), _("&Cancel")); if (ret == 0) { // FIXME: WriteAs can be asynch ! @@ -118,49 +129,43 @@ bool BufferList::quitWriteAll() void BufferList::release(Buffer * buf) { - lyx::Assert(buf); - BufferStorage::iterator it = find(bstore.begin(), bstore.end(), buf); + BOOST_ASSERT(buf); + BufferStorage::iterator const it = + find(bstore.begin(), bstore.end(), buf); if (it != bstore.end()) { - // Make sure that we don't store a LyXText in - // the textcache that points to the buffer - // we just deleted. Buffer * tmp = (*it); + BOOST_ASSERT(tmp); bstore.erase(it); - textcache.removeAllWithBuffer(tmp); delete tmp; } } -Buffer * BufferList::newBuffer(string const & s, bool ronly) +Buffer * BufferList::newBuffer(string const & s, bool const ronly) { - Buffer * tmpbuf = new Buffer(s, ronly); - tmpbuf->params.useClassDefaults(); + auto_ptr tmpbuf(new Buffer(s, ronly)); + tmpbuf->params().useClassDefaults(); lyxerr[Debug::INFO] << "Assigning to buffer " << bstore.size() << endl; - bstore.push_back(tmpbuf); - return tmpbuf; + bstore.push_back(tmpbuf.get()); + return tmpbuf.release(); } void BufferList::closeAll() { - // Since we are closing we can just as well delete all - // in the textcache this will also speed the closing/quiting up a bit. - textcache.clear(); - while (!bstore.empty()) { close(bstore.front(), false); } } -bool BufferList::close(Buffer * buf, bool ask) +bool BufferList::close(Buffer * buf, bool const ask) { - lyx::Assert(buf); + BOOST_ASSERT(buf); // FIXME: is the quitting check still necessary ? - if (!ask || buf->isClean() || quitting || buf->paragraphs.empty()) { + if (!ask || buf->isClean() || quitting || buf->paragraphs().empty()) { release(buf); return true; } @@ -171,17 +176,18 @@ bool BufferList::close(Buffer * buf, bool ask) else fname = MakeDisplayPath(buf->fileName(), 30); - string text = bformat(_("The document %1$s has unsaved changes.\n\n" - "Do you want to save the document?"), fname); + string const text = + bformat(_("The document %1$s has unsaved changes.\n\n" + "Do you want to save the document or discard the changes?"), fname); int const ret = Alert::prompt(_("Save changed document?"), - text, 0, 2, _("&Save Changes"), _("&Discard Changes"), _("&Cancel")); + text, 0, 2, _("&Save"), _("&Discard"), _("&Cancel")); if (ret == 0) { if (buf->isUnnamed()) { if (!WriteAs(buf)) return false; } else if (buf->save()) { - lastfiles->newFile(buf->fileName()); + LyX::ref().lastfiles().newFile(buf->fileName()); } else { return false; } @@ -201,8 +207,9 @@ bool BufferList::close(Buffer * buf, bool ask) vector const BufferList::getFileNames() const { vector nvec; - std::copy(bstore.begin(), bstore.end(), - lyx::back_inserter_fun(nvec, &Buffer::fileName)); + transform(bstore.begin(), bstore.end(), + back_inserter(nvec), + boost::bind(&Buffer::fileName, _1)); return nvec; } @@ -215,7 +222,7 @@ Buffer * BufferList::first() } -Buffer * BufferList::getBuffer(unsigned int choice) +Buffer * BufferList::getBuffer(unsigned int const choice) { if (choice >= bstore.size()) return 0; @@ -223,8 +230,41 @@ Buffer * BufferList::getBuffer(unsigned int choice) } +Buffer * BufferList::next(Buffer const * buf) const +{ + BOOST_ASSERT(buf); + + if (bstore.empty()) + return 0; + BufferStorage::const_iterator it = find(bstore.begin(), + bstore.end(), buf); + BOOST_ASSERT(it != bstore.end()); + ++it; + if (it == bstore.end()) + return bstore.front(); + else + return *it; +} + + +Buffer * BufferList::previous(Buffer const * buf) const +{ + BOOST_ASSERT(buf); + + if (bstore.empty()) + return 0; + BufferStorage::const_iterator it = find(bstore.begin(), + bstore.end(), buf); + BOOST_ASSERT(it != bstore.end()); + if (it == bstore.begin()) + return bstore.back(); + else + return *(it - 1); +} + + void BufferList::updateIncludedTeXfiles(string const & mastertmpdir, - LatexRunParams const & runparams) + OutputParams const & runparams) { BufferStorage::iterator it = bstore.begin(); BufferStorage::iterator end = bstore.end(); @@ -234,7 +274,7 @@ void BufferList::updateIncludedTeXfiles(string const & mastertmpdir, writefile += '/'; writefile += (*it)->getLatexName(); (*it)->makeLaTeXFile(writefile, mastertmpdir, - runparams, true); + runparams, false); (*it)->markDepClean(mastertmpdir); } } @@ -244,16 +284,15 @@ void BufferList::updateIncludedTeXfiles(string const & mastertmpdir, void BufferList::emergencyWriteAll() { for_each(bstore.begin(), bstore.end(), - boost::bind(&BufferList::emergencyWrite, this, _1)); + bind(&BufferList::emergencyWrite, this, _1)); } void BufferList::emergencyWrite(Buffer * buf) { - // assert(buf) // this is not good since C assert takes an int - // and a pointer is a long (JMarc) - assert(buf != 0); // use c assert to avoid a loop - + // Use ::assert to avoid a loop, BOOST_ASSERT ends up calling ::assert + // compare with 0 to avoid pointer/interger comparison + assert(buf != 0); // No need to save if the buffer has not changed. if (buf->isClean()) @@ -280,7 +319,7 @@ void BufferList::emergencyWrite(Buffer * buf) } // 2) In HOME directory. - string s = AddName(GetEnvPath("HOME"), buf->fileName()); + string s = AddName(package().home_dir(), buf->fileName()); s += ".emergency"; lyxerr << ' ' << s << endl; if (buf->writeFile(s)) { @@ -309,15 +348,16 @@ void BufferList::emergencyWrite(Buffer * buf) bool BufferList::exists(string const & s) const { return find_if(bstore.begin(), bstore.end(), - lyx::compare_memfun(&Buffer::fileName, s)) + bind(equal_to(), + bind(&Buffer::fileName, _1), + s)) != bstore.end(); } bool BufferList::isLoaded(Buffer const * b) const { - lyx::Assert(b); - + BOOST_ASSERT(b); BufferStorage::const_iterator cit = find(bstore.begin(), bstore.end(), b); return cit != bstore.end(); @@ -328,16 +368,30 @@ Buffer * BufferList::getBuffer(string const & s) { BufferStorage::iterator it = find_if(bstore.begin(), bstore.end(), - lyx::compare_memfun(&Buffer::fileName, s)); + bind(equal_to(), + bind(&Buffer::fileName, _1), + s)); + return it != bstore.end() ? (*it) : 0; } +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; + return 0; +} + + void BufferList::setCurrentAuthor(string const & name, string const & email) { BufferStorage::iterator it = bstore.begin(); BufferStorage::iterator end = bstore.end(); for (; it != end; ++it) { - (*it)->authors().record(0, Author(name, email)); + (*it)->params().authors().record(0, Author(name, email)); } }