#include "support/FileFilterList.h"
#include "support/filetools.h"
#include "support/Forkedcall.h"
-#include "support/fs_extras.h"
#include "support/gzstream.h"
#include "support/lyxlib.h"
#include "support/os.h"
#endif
#include <boost/bind.hpp>
-#include <boost/filesystem/exception.hpp>
-#include <boost/filesystem/operations.hpp>
#include <boost/shared_ptr.hpp>
#include <algorithm>
namespace Alert = frontend::Alert;
namespace os = support::os;
-namespace fs = boost::filesystem;
namespace {
-int const LYX_FORMAT = 298; //Schimmi: Optional parameters in macros
+int const LYX_FORMAT = 299; // Uwe: Hyperlink types
} // namespace anon
}
-pair<Buffer::LogType, string> Buffer::logName() const
+string Buffer::logName(LogType * type) const
{
string const filename = latexName(false);
- if (filename.empty())
- return make_pair(Buffer::latexlog, string());
+ if (filename.empty()) {
+ if (type)
+ *type = latexlog;
+ return string();
+ }
string const path = temppath();
if (bname.exists() &&
(!fname.exists() || fname.lastModified() < bname.lastModified())) {
LYXERR(Debug::FILES) << "Log name calculated as: " << bname << endl;
- return make_pair(Buffer::buildlog, bname.absFilename());
+ if (type)
+ *type = buildlog;
+ return bname.absFilename();
}
LYXERR(Debug::FILES) << "Log name calculated as: " << fname << endl;
- return make_pair(Buffer::latexlog, fname.absFilename());
+ if (type)
+ *type = latexlog;
+ return fname.absFilename();
}
bool madeBackup = false;
// make a backup if the file already exists
- if (lyxrc.make_backup && fs::exists(encodedFilename)) {
+ if (lyxrc.make_backup && fileName().exists()) {
backupName = FileName(absFileName() + '~');
if (!lyxrc.backupdir_path.empty()) {
string const mangledName =
backupName = FileName(addName(lyxrc.backupdir_path,
mangledName));
}
- try {
- fs::copy_file(encodedFilename, backupName.toFilesystemEncoding(), false);
+ if (fileName().copyTo(backupName, false)) {
madeBackup = true;
- } catch (fs::filesystem_error const & fe) {
+ } else {
Alert::error(_("Backup failure"),
bformat(_("Cannot create backup file %1$s.\n"
"Please check whether the directory exists and is writeable."),
from_utf8(backupName.absFilename())));
- LYXERR(Debug::DEBUG) << "Fs error: " << fe.what() << endl;
+ //LYXERR(Debug::DEBUG) << "Fs error: " << fe.what() << endl;
}
}
// ask if the disk file has been externally modified (use checksum method)
- if (fs::exists(encodedFilename) && isExternallyModified(checksum_method)) {
+ if (fileName().exists() && isExternallyModified(checksum_method)) {
docstring const file = makeDisplayPath(absFileName(), 20);
docstring text = bformat(_("Document %1$s has been externally modified. Are you sure "
"you want to overwrite this file?"), file);
AuthorList::Authors::const_iterator a_it = params().authors().begin();
AuthorList::Authors::const_iterator a_end = params().authors().end();
for (; a_it != a_end; ++a_it)
- a_it->second.used(false);
+ a_it->second.setUsed(false);
ParIterator const end = par_iterator_end();
ParIterator it = par_iterator_begin();
string const name = addName(path.absFilename(), latexName());
string const org_path = filePath();
- support::Path p(path); // path to LaTeX file
+ support::PathChanger p(path); // path to LaTeX file
message(_("Running chktex..."));
// Generate the LaTeX file if neccessary
}
+FileName Buffer::fileName() const
+{
+ return pimpl_->filename;
+}
+
+
string Buffer::absFileName() const
{
return pimpl_->filename.absFilename();
{
Impl::PositionToMacroMap::iterator it;
it = pimpl_->macros[name].upper_bound(par.macrocontextPosition());
- if( it != pimpl_->macros[name].end() )
+ if (it != pimpl_->macros[name].end())
return true;
// If there is a master buffer, query that
- const Buffer *master = masterBuffer();
- if (master && master!=this)
+ const Buffer * master = masterBuffer();
+ if (master && master != this)
return master->hasMacro(name);
return MacroTable::globalMacros().has(name);
return true;
// If there is a master buffer, query that
- const Buffer *master = masterBuffer();
- if (master && master!=this)
+ const Buffer * master = masterBuffer();
+ if (master && master != this)
return master->hasMacro(name);
return MacroTable::globalMacros().has(name);
}
-MacroData const & Buffer::getMacro(docstring const & name, Paragraph const & par) const
+MacroData const & Buffer::getMacro(docstring const & name,
+ Paragraph const & par) const
{
Impl::PositionToMacroMap::iterator it;
it = pimpl_->macros[name].upper_bound(par.macrocontextPosition());
return it->second;
// If there is a master buffer, query that
- const Buffer *master = masterBuffer();
- if (master && master!=this)
+ const Buffer * master = masterBuffer();
+ if (master && master != this)
return master->getMacro(name);
return MacroTable::globalMacros().get(name);
return it->second;
// If there is a master buffer, query that
- const Buffer *master = masterBuffer();
- if (master && master!=this)
+ const Buffer * master = masterBuffer();
+ if (master && master != this)
return master->getMacro(name);
return MacroTable::globalMacros().get(name);