X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer.C;h=e0877225236d80d11965fe5c15af5cddd7dcc8cb;hb=4d5282a7aca1e8d80d310ce3a3514562d6584b36;hp=32960215b9eff2d7e94671dacb93dcec823e54b0;hpb=a116e04b8b75b847bfcb5114cc4d92ce3cc2386a;p=lyx.git diff --git a/src/buffer.C b/src/buffer.C index 32960215b9..e087722523 100644 --- a/src/buffer.C +++ b/src/buffer.C @@ -101,6 +101,7 @@ using support::changeExtension; using support::cmd_ret; using support::createBufferTmpDir; using support::destroyDir; +using support::FileName; using support::getFormatFromContents; using support::isDirWriteable; using support::libFileSearch; @@ -129,7 +130,6 @@ using std::endl; using std::for_each; using std::make_pair; -using std::ifstream; using std::ios; using std::map; using std::ostream; @@ -143,7 +143,7 @@ using std::string; namespace { -int const LYX_FORMAT = 253; +int const LYX_FORMAT = 255; } // namespace anon @@ -153,7 +153,7 @@ typedef std::map DepClean; class Buffer::Impl { public: - Impl(Buffer & parent, string const & file, bool readonly); + Impl(Buffer & parent, FileName const & file, bool readonly); limited_stack undostack; limited_stack redostack; @@ -178,7 +178,7 @@ public: bool read_only; /// name of the file the buffer is associated with. - string filename; + FileName filename; boost::scoped_ptr messages; @@ -199,7 +199,7 @@ public: }; -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) @@ -207,7 +207,7 @@ Buffer::Impl::Impl(Buffer & parent, string const & file, bool readonly_) 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 @@ -215,7 +215,7 @@ Buffer::Impl::Impl(Buffer & parent, string const & file, bool readonly_) 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; } @@ -358,23 +358,24 @@ pair const Buffer::getLogName() const 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()); } @@ -389,9 +390,10 @@ void Buffer::setReadonly(bool const flag) 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(); } @@ -460,7 +462,7 @@ int Buffer::readHeader(LyXLex & lex) 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)); } @@ -500,7 +502,7 @@ bool Buffer::readDocument(LyXLex & lex) 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; } @@ -571,7 +573,8 @@ void Buffer::insertStringAsLines(ParagraphList & pars, 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; } @@ -579,7 +582,7 @@ bool Buffer::readFile(string const & filename) // remove dummy empty par paragraphs().clear(); LyXLex lex(0, 0); - lex.setFile(filename); + lex.setFile(name); if (!readFile(lex, filename)) return false; @@ -655,7 +658,7 @@ bool Buffer::readFile(LyXLex & lex, string const & filename) 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" @@ -666,7 +669,7 @@ bool Buffer::readFile(LyXLex & lex, string const & filename) return false; } ostringstream command; - command << os::python() << ' ' << quoteName(lyx2lyx) + command << os::python() << ' ' << quoteName(lyx2lyx.toFilesystemEncoding()) << " -t " << convert(LYX_FORMAT) << " -o " << quoteName(tmpfile) << ' ' << quoteName(filename); @@ -714,9 +717,9 @@ bool Buffer::save() const // 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, @@ -727,7 +730,7 @@ bool Buffer::save() const // 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"), @@ -739,34 +742,34 @@ bool Buffer::save() const } } - 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; @@ -1077,7 +1080,7 @@ void Buffer::writeDocBookSource(odocstream & os, string const & fname, preamble += "\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(); @@ -1162,9 +1165,11 @@ void Buffer::validate(LaTeXFeatures & features) const features.require("dvipost"); // AMS Style is at document level - if (params().use_amsmath == BufferParams::AMS_ON + if (params().use_amsmath == BufferParams::package_on || tclass.provides(LyXTextClass::amsmath)) features.require("amsmath"); + if (params().use_esint == BufferParams::package_on) + features.require("esint"); for_each(paragraphs().begin(), paragraphs().end(), boost::bind(&Paragraph::validate, _1, boost::ref(features))); @@ -1269,7 +1274,7 @@ void Buffer::updateBibfilesCache() if (it->lyxCode() == InsetBase::BIBTEX_CODE) { InsetBibtex const & inset = dynamic_cast(*it); - vector const bibfiles = inset.getFiles(*this); + vector const bibfiles = inset.getFiles(*this); bibfilesCache_.insert(bibfilesCache_.end(), bibfiles.begin(), bibfiles.end()); @@ -1277,7 +1282,7 @@ void Buffer::updateBibfilesCache() InsetInclude & inset = dynamic_cast(*it); inset.updateBibfilesCache(*this); - vector const & bibfiles = + vector const & bibfiles = inset.getBibfilesCache(*this); bibfilesCache_.insert(bibfilesCache_.end(), bibfiles.begin(), @@ -1287,7 +1292,7 @@ void Buffer::updateBibfilesCache() } -vector const & Buffer::getBibfilesCache() const +vector const & Buffer::getBibfilesCache() const { // if this is a child document and the parent is already loaded // use the parent's cache instead @@ -1449,7 +1454,7 @@ docstring const Buffer::translateLabel(docstring const & label) const // 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; } @@ -1516,9 +1521,9 @@ void Buffer::markDirty() } -string const & Buffer::fileName() const +string const Buffer::fileName() const { - return pimpl_->filename; + return pimpl_->filename.absFilename(); }