using support::cmd_ret;
using support::createBufferTmpDir;
using support::destroyDir;
+using support::FileName;
using support::getFormatFromContents;
using support::isDirWriteable;
using support::libFileSearch;
using std::for_each;
using std::make_pair;
-using std::ifstream;
using std::ios;
using std::map;
using std::ostream;
namespace {
-int const LYX_FORMAT = 254;
+int const LYX_FORMAT = 255;
} // namespace anon
class Buffer::Impl
{
public:
- Impl(Buffer & parent, string const & file, bool readonly);
+ Impl(Buffer & parent, FileName const & file, bool readonly);
limited_stack<Undo> undostack;
limited_stack<Undo> redostack;
bool read_only;
/// name of the file the buffer is associated with.
- string filename;
+ FileName filename;
boost::scoped_ptr<Messages> messages;
};
-Buffer::Impl::Impl(Buffer & parent, string const & file, bool readonly_)
+Buffer::Impl::Impl(Buffer & parent, FileName const & file, bool readonly_)
: lyx_clean(true), bak_clean(true), unnamed(false), read_only(readonly_),
filename(file), file_fully_loaded(false), inset(params),
toc_backend(&parent)
inset.setAutoBreakRows(true);
lyxvc.buffer(&parent);
temppath = createBufferTmpDir();
- params.filepath = onlyPath(file);
+ params.filepath = onlyPath(file.absFilename());
// FIXME: And now do something if temppath == string(), because we
// assume from now on that temppath points to a valid temp dir.
// See http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg67406.html
Buffer::Buffer(string const & file, bool readonly)
- : pimpl_(new Impl(*this, file, readonly))
+ : pimpl_(new Impl(*this, FileName(file), readonly))
{
lyxerr[Debug::INFO] << "Buffer::Buffer()" << endl;
}
string const path = temppath();
- string const fname = addName(path,
+ FileName const fname(addName(temppath(),
onlyFilename(changeExtension(filename,
- ".log")));
- string const bname =
+ ".log"))));
+ FileName const bname(
addName(path, onlyFilename(
changeExtension(filename,
- formats.extension("literate") + ".out")));
+ formats.extension("literate") + ".out"))));
// If no Latex log or Build log is newer, show Build log
- if (fs::exists(bname) &&
- (!fs::exists(fname) || fs::last_write_time(fname) < fs::last_write_time(bname))) {
+ if (fs::exists(bname.toFilesystemEncoding()) &&
+ (!fs::exists(fname.toFilesystemEncoding()) ||
+ fs::last_write_time(fname.toFilesystemEncoding()) < fs::last_write_time(bname.toFilesystemEncoding()))) {
lyxerr[Debug::FILES] << "Log name calculated as: " << bname << endl;
- return make_pair(Buffer::buildlog, bname);
+ return make_pair(Buffer::buildlog, bname.absFilename());
}
lyxerr[Debug::FILES] << "Log name calculated as: " << fname << endl;
- return make_pair(Buffer::latexlog, fname);
+ return make_pair(Buffer::latexlog, fname.absFilename());
}
void Buffer::setFileName(string const & newfile)
{
- pimpl_->filename = makeAbsPath(newfile);
- params().filepath = onlyPath(pimpl_->filename);
- setReadonly(fs::is_readonly(pimpl_->filename));
+ string const filename = makeAbsPath(newfile);
+ pimpl_->filename = FileName(filename);
+ params().filepath = onlyPath(filename);
+ setReadonly(fs::is_readonly(pimpl_->filename.toFilesystemEncoding()));
updateTitles();
}
docstring const s = bformat(_("Unknown token: "
"%1$s %2$s\n"),
from_utf8(token),
- from_utf8(lex.getString()));
+ lex.getDocString());
errorList.push_back(ErrorItem(_("Document header error"),
s, -1, 0, 0));
}
string theclass = params().getLyXTextClass().name();
Alert::error(_("Can't load document class"), bformat(
_("Using the default document class, because the "
- " class %1$s could not be loaded."), from_utf8(theclass)));
+ "class %1$s could not be loaded."), from_utf8(theclass)));
params().textclass = 0;
}
bool Buffer::readFile(string const & filename)
{
// Check if the file is compressed.
- string const format = getFormatFromContents(filename);
+ FileName const name(makeAbsPath(filename));
+ string const format = getFormatFromContents(name);
if (format == "gzip" || format == "zip" || format == "compress") {
params().compressed = true;
}
// remove dummy empty par
paragraphs().clear();
LyXLex lex(0, 0);
- lex.setFile(filename);
+ lex.setFile(name);
if (!readFile(lex, filename))
return false;
from_utf8(filename)));
return false;
}
- string const lyx2lyx = libFileSearch("lyx2lyx", "lyx2lyx");
+ FileName const lyx2lyx = libFileSearch("lyx2lyx", "lyx2lyx");
if (lyx2lyx.empty()) {
Alert::error(_("Conversion script not found"),
bformat(_("%1$s is from an earlier"
return false;
}
ostringstream command;
- command << os::python() << ' ' << quoteName(lyx2lyx)
+ command << os::python() << ' ' << quoteName(lyx2lyx.toFilesystemEncoding())
<< " -t " << convert<string>(LYX_FORMAT)
<< " -o " << quoteName(tmpfile) << ' '
<< quoteName(filename);
// We don't need autosaves in the immediate future. (Asger)
resetAutosaveTimers();
- // make a backup
+ // make a backup if the file already exists
string s;
- if (lyxrc.make_backup) {
+ if (lyxrc.make_backup && fs::exists(pimpl_->filename.toFilesystemEncoding())) {
s = fileName() + '~';
if (!lyxrc.backupdir_path.empty())
s = addName(lyxrc.backupdir_path,
// But to use this we need fs::copy_file to actually do a copy,
// even when the target file exists. (Lgb)
try {
- fs::copy_file(fileName(), s, false);
+ fs::copy_file(pimpl_->filename.toFilesystemEncoding(), s, false);
}
catch (fs::filesystem_error const & fe) {
Alert::error(_("Backup failure"),
}
}
- if (writeFile(fileName())) {
+ if (writeFile(pimpl_->filename)) {
markClean();
removeAutosaveFile(fileName());
} else {
// Saving failed, so backup is not backup
if (lyxrc.make_backup)
- rename(s, fileName());
+ rename(FileName(s), pimpl_->filename);
return false;
}
return true;
}
-bool Buffer::writeFile(string const & fname) const
+bool Buffer::writeFile(FileName const & fname) const
{
- if (pimpl_->read_only && fname == fileName())
+ if (pimpl_->read_only && fname == pimpl_->filename)
return false;
bool retval = false;
if (params().compressed) {
- io::filtering_ostream ofs(io::gzip_compressor() | io::file_sink(fname));
+ io::filtering_ostream ofs(io::gzip_compressor() | io::file_sink(fname.toFilesystemEncoding()));
if (!ofs)
return false;
retval = do_writeFile(ofs);
} else {
- ofstream ofs(fname.c_str(), ios::out|ios::trunc);
+ ofstream ofs(fname.toFilesystemEncoding().c_str(), ios::out|ios::trunc);
if (!ofs)
return false;
preamble += "<!ENTITY % output.print.bmp \"IGNORE\">\n";
}
- string const name = runparams.nice ? changeExtension(pimpl_->filename, ".sgml")
+ string const name = runparams.nice ? changeExtension(fileName(), ".sgml")
: fname;
preamble += features.getIncludedFiles(name);
preamble += features.getLyXSGMLEntities();
if (it->lyxCode() == InsetBase::BIBTEX_CODE) {
InsetBibtex const & inset =
dynamic_cast<InsetBibtex const &>(*it);
- vector<string> const bibfiles = inset.getFiles(*this);
+ vector<FileName> const bibfiles = inset.getFiles(*this);
bibfilesCache_.insert(bibfilesCache_.end(),
bibfiles.begin(),
bibfiles.end());
InsetInclude & inset =
dynamic_cast<InsetInclude &>(*it);
inset.updateBibfilesCache(*this);
- vector<string> const & bibfiles =
+ vector<FileName> const & bibfiles =
inset.getBibfilesCache(*this);
bibfilesCache_.insert(bibfilesCache_.end(),
bibfiles.begin(),
}
-vector<string> const & Buffer::getBibfilesCache() const
+vector<FileName> const & Buffer::getBibfilesCache() const
{
// if this is a child document and the parent is already loaded
// use the parent's cache instead
// Probably standard layout, try to translate
return B_(to_ascii(label));
else
- // This must be a user defined layout. We can not translate
+ // This must be a user defined layout. We cannot translate
// this, since gettext accepts only ascii keys.
return label;
}
}
-string const & Buffer::fileName() const
+string const Buffer::fileName() const
{
- return pimpl_->filename;
+ return pimpl_->filename.absFilename();
}