#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/filetools.h"
-#include "support/lyxfunctional.h"
+#include "support/os.h"
#include <boost/bind.hpp>
+#include <algorithm>
+#include <functional>
+
using lyx::support::AddName;
using lyx::support::bformat;
-using lyx::support::GetEnvPath;
using lyx::support::MakeAbsPath;
using lyx::support::MakeDisplayPath;
using lyx::support::OnlyFilename;
using lyx::support::removeAutosaveFile;
using lyx::support::prefixIs;
+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::string;
using std::vector;
+using std::back_inserter;
+using std::transform;
+namespace os = lyx::support::os;
BufferList::BufferList()
{}
Buffer * BufferList::newBuffer(string const & s, bool ronly)
{
- Buffer * tmpbuf = new Buffer(s, ronly);
+ 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();
}
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::next(Buffer const * buf) const
+{
+ 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
+{
+ 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();
void BufferList::emergencyWriteAll()
{
for_each(bstore.begin(), bstore.end(),
- boost::bind(&BufferList::emergencyWrite, this, _1));
+ bind(&BufferList::emergencyWrite, this, _1));
}
}
// 2) In HOME directory.
- string s = AddName(GetEnvPath("HOME"), buf->fileName());
+ string s = AddName(os::homepath(), buf->fileName());
s += ".emergency";
lyxerr << ' ' << s << endl;
if (buf->writeFile(s)) {
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();
}
{
BufferStorage::iterator it =
find_if(bstore.begin(), bstore.end(),
- lyx::compare_memfun(&Buffer::fileName, s));
+ bind(equal_to<string>(),
+ bind(&Buffer::fileName, _1),
+ s));
+
return it != bstore.end() ? (*it) : 0;
}