*
* \author Lars Gullik Bjønnes
*
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
*/
#include <config.h>
#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 <boost/bind.hpp>
-#include <cassert>
#include <algorithm>
#include <functional>
+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()
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 !
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<Buffer> 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;
}
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;
}
vector<string> const BufferList::getFileNames() const
{
vector<string> 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;
}
}
-Buffer * BufferList::getBuffer(unsigned int choice)
+Buffer * BufferList::getBuffer(unsigned int const choice)
{
if (choice >= bstore.size())
return 0;
}
+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();
writefile += '/';
writefile += (*it)->getLatexName();
(*it)->makeLaTeXFile(writefile, mastertmpdir,
- runparams, true);
+ runparams, false);
(*it)->markDepClean(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())
}
// 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)) {
}
-
-Buffer * BufferList::readFile(string const & s, bool ronly)
-{
- string ts(s);
- string e = OnlyPath(s);
- string a = e;
- // File information about normal file
- FileInfo fileInfo2(s);
-
- if (!fileInfo2.exist()) {
- string const file = MakeDisplayPath(s, 50);
- string text = bformat(_("The specified document\n%1$s"
- "\ncould not be read."), file);
- Alert::error(_("Could not read document"), text);
- return 0;
- }
-
- Buffer * b = newBuffer(s, ronly);
-
- // Check if emergency save file exists and is newer.
- e += OnlyFilename(s) + ".emergency";
- FileInfo fileInfoE(e);
-
- bool use_emergency = false;
-
- if (fileInfoE.exist() && fileInfo2.exist()) {
- if (fileInfoE.getModificationTime()
- > fileInfo2.getModificationTime()) {
- string const file = MakeDisplayPath(s, 20);
- string text = bformat(_("An emergency save of the document %1$s exists.\n"
- "\nRecover emergency save?"), file);
- int const ret = Alert::prompt(_("Load emergency save?"),
- text, 0, 1, _("&Recover"), _("&Load Original"));
-
- if (ret == 0) {
- ts = e;
- // the file is not saved if we load the
- // emergency file.
- b->markDirty();
- use_emergency = true;
- }
- }
- }
-
- if (!use_emergency) {
- // Now check if autosave file is newer.
- a += '#';
- a += OnlyFilename(s);
- a += '#';
- FileInfo fileInfoA(a);
- if (fileInfoA.exist() && fileInfo2.exist()) {
- if (fileInfoA.getModificationTime()
- > fileInfo2.getModificationTime()) {
- string const file = MakeDisplayPath(s, 20);
- string text = bformat(_("The backup of the document %1$s is newer.\n\n"
- "Load the backup instead?"), file);
- int const ret = Alert::prompt(_("Load backup?"),
- text, 0, 1, _("&Load backup"), _("Load &original"));
-
- if (ret == 0) {
- ts = a;
- // the file is not saved if we load the
- // autosave file.
- b->markDirty();
- } else {
- // Here, we should delete the autosave
- lyx::unlink(a);
- }
- }
- }
- }
- // not sure if this is the correct place to begin LyXLex
- LyXLex lex(0, 0);
- lex.setFile(ts);
- if (b->readFile(lex, ts))
- return b;
- else {
- release(b);
- return 0;
- }
-}
-
-
bool BufferList::exists(string const & s) const
{
return find_if(bstore.begin(), bstore.end(),
- lyx::compare_memfun(&Buffer::fileName, s))
+ bind(equal_to<string>(),
+ 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();
{
BufferStorage::iterator it =
find_if(bstore.begin(), bstore.end(),
- lyx::compare_memfun(&Buffer::fileName, s));
- return it != bstore.end() ? (*it) : 0;
-}
-
-
-Buffer * BufferList::newFile(string const & name, string tname, bool isNamed)
-{
- // get a free buffer
- Buffer * b = newBuffer(name);
-
- // use defaults.lyx as a default template if it exists.
- if (tname.empty()) {
- tname = LibFileSearch("templates", "defaults.lyx");
- }
- if (!tname.empty()) {
- bool templateok = false;
- LyXLex lex(0, 0);
- lex.setFile(tname);
- if (lex.isOK()) {
- if (b->readFile(lex, tname)) {
- templateok = true;
- }
- }
- if (!templateok) {
- string const file = MakeDisplayPath(tname, 50);
- string text = bformat(_("The specified document template\n%1$s\n"
- "could not be read."), file);
- Alert::error(_("Could not read template"), text);
- // no template, start with empty buffer
- b->paragraphs.push_back(Paragraph());
- b->paragraphs.begin()->layout(b->params.getLyXTextClass().defaultLayout());
- }
- } else { // start with empty buffer
- b->paragraphs.push_back(Paragraph());
- b->paragraphs.begin()->layout(b->params.getLyXTextClass().defaultLayout());
- }
-
- if (!isNamed) {
- b->setUnnamed();
- b->setFileName(name);
- }
+ bind(equal_to<string>(),
+ bind(&Buffer::fileName, _1),
+ s));
- b->setReadonly(false);
- b->updateDocLang(b->params.language);
-
- return b;
+ return it != bstore.end() ? (*it) : 0;
}
-Buffer * BufferList::loadLyXFile(string const & filename, bool tolastfiles)
+Buffer * BufferList::getBufferFromTmp(string const & s)
{
- // get absolute path of file and add ".lyx" to the filename if
- // necessary
- string s = FileSearch(string(), filename, "lyx");
- if (s.empty()) {
- s = filename;
- }
-
- // file already open?
- if (exists(s)) {
- string const file = MakeDisplayPath(s, 20);
- string text = bformat(_("The document %1$s is already loaded.\n\n"
- "Do you want to revert to the saved version?"), file);
- int const ret = Alert::prompt(_("Revert to saved document?"),
- text, 0, 1, _("&Revert"), _("&Switch to document"));
-
- if (ret == 0) {
- // FIXME: should be LFUN_REVERT
- if (!close(getBuffer(s), false)) {
- return 0;
- }
- // Fall through to new load. (Asger)
- } else {
- // Here, we pretend that we just loaded the
- // open document
- return getBuffer(s);
- }
- }
-
- Buffer * b = 0;
- bool ro = false;
- switch (IsFileWriteable(s)) {
- case 0:
- ro = true;
- // Fall through
- case 1:
- b = readFile(s, ro);
- if (b) {
- b->lyxvc.file_found_hook(s);
- }
- break; //fine- it's r/w
- case -1: {
- string const file = MakeDisplayPath(s, 20);
- // Here we probably should run
- if (LyXVC::file_not_found_hook(s)) {
- string text = bformat(_("Do you want to retrieve the document"
- " %1$s from version control?"), file);
- int const ret = Alert::prompt(_("Retrieve from version control?"),
- text, 0, 1, _("&Retrieve"), _("&Cancel"));
-
- if (ret == 0) {
- // How can we know _how_ to do the checkout?
- // With the current VC support it has to be,
- // a RCS file since CVS do not have special ,v files.
- RCS::retrieve(s);
- return loadLyXFile(filename, tolastfiles);
- }
- }
-
- string text = bformat(_("The document %1$s does not yet exist.\n\n"
- "Do you want to create a new document?"), file);
- int const ret = Alert::prompt(_("Create new document?"),
- text, 0, 1, _("&Create"), _("Cancel"));
-
- if (ret == 0)
- b = newFile(s, string(), true);
-
- break;
- }
- }
-
- if (b && tolastfiles)
- lastfiles->newFile(b->fileName());
-
- return b;
+ BufferStorage::iterator it = bstore.begin();
+ BufferStorage::iterator end = bstore.end();
+ for (; it < end; ++it)
+ if (prefixIs(s, (*it)->temppath()))
+ return *it;
+ return 0;
}
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));
}
}
projects / lyx.git / blobdiff