X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer.C;h=0e7944a17679fdc4efa4b75ebf8a803c88347575;hb=29b6f5cad958e3298fc76d8ca6af6b721fa038cb;hp=cf93290a146ae648b51733d393d9cab4c61a7fac;hpb=f6730f66b0d146cd7ec062cb371014ba0211010b;p=lyx.git diff --git a/src/buffer.C b/src/buffer.C index cf93290a14..0e7944a176 100644 --- a/src/buffer.C +++ b/src/buffer.C @@ -36,7 +36,6 @@ #include "lyxtext.h" #include "lyxrc.h" #include "lyxvc.h" -#include "lyx_main.h" #include "messages.h" #include "output.h" #include "output_docbook.h" @@ -101,6 +100,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 +129,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 +142,7 @@ using std::string; namespace { -int const LYX_FORMAT = 253; +int const LYX_FORMAT = 255; } // namespace anon @@ -153,7 +152,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 +177,7 @@ public: bool read_only; /// name of the file the buffer is associated with. - string filename; + FileName filename; boost::scoped_ptr messages; @@ -199,7 +198,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 +206,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 +214,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; } @@ -229,7 +228,7 @@ Buffer::~Buffer() closing(); - if (!temppath().empty() && !destroyDir(temppath())) { + if (!temppath().empty() && !destroyDir(FileName(temppath()))) { Alert::warning(_("Could not remove temporary directory"), bformat(_("Could not remove the temporary directory %1$s"), from_utf8(temppath()))); @@ -358,23 +357,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 +389,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 +461,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 +501,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; } @@ -554,11 +555,9 @@ void Buffer::insertStringAsLines(ParagraphList & pars, } space_inserted = true; } -/* FIXME: not needed anymore? } else if (!isPrintable(*cit)) { // Ignore unprintables continue; -*/ } else { // just insert the character par.insertChar(pos, *cit, font, params().trackChanges); @@ -570,7 +569,7 @@ void Buffer::insertStringAsLines(ParagraphList & pars, } -bool Buffer::readFile(string const & filename) +bool Buffer::readFile(FileName const & filename) { // Check if the file is compressed. string const format = getFormatFromContents(filename); @@ -606,13 +605,13 @@ void Buffer::fully_loaded(bool const value) } -bool Buffer::readFile(LyXLex & lex, string const & filename) +bool Buffer::readFile(LyXLex & lex, FileName const & filename) { BOOST_ASSERT(!filename.empty()); if (!lex.isOK()) { Alert::error(_("Document could not be read"), - bformat(_("%1$s could not be read."), from_utf8(filename))); + bformat(_("%1$s could not be read."), from_utf8(filename.absFilename()))); return false; } @@ -621,7 +620,7 @@ bool Buffer::readFile(LyXLex & lex, string const & filename) if (!lex.isOK()) { Alert::error(_("Document could not be read"), - bformat(_("%1$s could not be read."), from_utf8(filename))); + bformat(_("%1$s could not be read."), from_utf8(filename.absFilename()))); return false; } @@ -631,7 +630,7 @@ bool Buffer::readFile(LyXLex & lex, string const & filename) Alert::error(_("Document format failure"), bformat(_("%1$s is not a LyX document."), - from_utf8(filename))); + from_utf8(filename.absFilename()))); return false; } @@ -647,31 +646,32 @@ bool Buffer::readFile(LyXLex & lex, string const & filename) //lyxerr << "format: " << file_format << endl; if (file_format != LYX_FORMAT) { - string const tmpfile = tempName(); + FileName const tmpfile(tempName()); if (tmpfile.empty()) { Alert::error(_("Conversion failed"), bformat(_("%1$s is from an earlier" " version of LyX, but a temporary" " file for converting it could" " not be created."), - from_utf8(filename))); + from_utf8(filename.absFilename()))); 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" " version of LyX, but the" " conversion script lyx2lyx" " could not be found."), - from_utf8(filename))); + from_utf8(filename.absFilename()))); return false; } ostringstream command; - command << os::python() << ' ' << quoteName(lyx2lyx) - << " -t " << convert(LYX_FORMAT) - << " -o " << quoteName(tmpfile) << ' ' - << quoteName(filename); + command << os::python() + << ' ' << quoteName(lyx2lyx.toFilesystemEncoding()) + << " -t " << convert(LYX_FORMAT) + << " -o " << quoteName(tmpfile.toFilesystemEncoding()) + << ' ' << quoteName(filename.toFilesystemEncoding()); string const command_str = command.str(); lyxerr[Debug::INFO] << "Running '" @@ -684,7 +684,7 @@ bool Buffer::readFile(LyXLex & lex, string const & filename) bformat(_("%1$s is from an earlier version" " of LyX, but the lyx2lyx script" " failed to convert it."), - from_utf8(filename))); + from_utf8(filename.absFilename()))); return false; } else { bool const ret = readFile(tmpfile); @@ -698,7 +698,7 @@ bool Buffer::readFile(LyXLex & lex, string const & filename) Alert::error(_("Document format failure"), bformat(_("%1$s ended unexpectedly, which means" " that it is probably corrupted."), - from_utf8(filename))); + from_utf8(filename.absFilename()))); } //lyxerr << "removing " << MacroTable::localMacros().size() @@ -716,9 +716,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, @@ -729,7 +729,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"), @@ -741,34 +741,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; @@ -828,25 +828,12 @@ bool Buffer::do_writeFile(ostream & ofs) const } -bool Buffer::makeLaTeXFile(string const & fname, +bool Buffer::makeLaTeXFile(FileName const & fname, string const & original_path, OutputParams const & runparams, bool output_preamble, bool output_body) { - string encoding; - if (params().inputenc == "auto") - encoding = params().language->encoding()->iconvName(); - else { - Encoding const * enc = encodings.getFromLaTeXName(params().inputenc); - if (enc) - encoding = enc->iconvName(); - else { - lyxerr << "Unknown inputenc value `" - << params().inputenc - << "'. Using `auto' instead." << endl; - encoding = params().language->encoding()->iconvName(); - } - } + string const encoding = params().encoding().iconvName(); lyxerr[Debug::LATEX] << "makeLaTeXFile encoding: " << encoding << "..." << endl; @@ -1024,7 +1011,7 @@ bool Buffer::isDocBook() const } -void Buffer::makeDocBookFile(string const & fname, +void Buffer::makeDocBookFile(FileName const & fname, OutputParams const & runparams, bool const body_only) { @@ -1035,7 +1022,7 @@ void Buffer::makeDocBookFile(string const & fname, if (!openFileWrite(ofs, fname)) return; - writeDocBookSource(ofs, fname, runparams, body_only); + writeDocBookSource(ofs, fname.absFilename(), runparams, body_only); ofs.close(); if (ofs.fail()) @@ -1079,7 +1066,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(); @@ -1123,7 +1110,7 @@ int Buffer::runChktex() busy(true); // get LaTeX-Filename - string const name = getLatexName(); + string const name = getLatexName(false); string const path = temppath(); string const org_path = filePath(); @@ -1134,10 +1121,10 @@ int Buffer::runChktex() OutputParams runparams; runparams.flavor = OutputParams::LATEX; runparams.nice = false; - makeLaTeXFile(name, org_path, runparams); + makeLaTeXFile(FileName(name), org_path, runparams); TeXErrors terr; - Chktex chktex(lyxrc.chktex_command, name, filePath()); + Chktex chktex(lyxrc.chktex_command, onlyFilename(name), filePath()); int const res = chktex.run(terr); // run chktex if (res == -1) { @@ -1164,9 +1151,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))); @@ -1221,7 +1210,7 @@ void Buffer::getLabelList(vector & list) const // This is also a buffer property (ale) -void Buffer::fillWithBibKeys(vector > & keys) +void Buffer::fillWithBibKeys(vector > & keys) const { /// if this is a child document and the parent is already loaded @@ -1245,11 +1234,12 @@ void Buffer::fillWithBibKeys(vector > & keys) } else if (it->lyxCode() == InsetBase::BIBITEM_CODE) { InsetBibitem const & inset = dynamic_cast(*it); - string const key = inset.getContents(); - string const opt = inset.getOptions(); - string const ref; // = pit->asString(this, false); - string const info = opt + "TheBibliographyRef" + ref; - keys.push_back(pair(key, info)); + // FIXME UNICODE + string const key = to_utf8(inset.getParam("key")); + docstring const label = inset.getParam("label"); + docstring const ref; // = pit->asString(this, false); + docstring const info = label + "TheBibliographyRef" + ref; + keys.push_back(pair(key, info)); } } } @@ -1271,7 +1261,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()); @@ -1279,7 +1269,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(), @@ -1289,7 +1279,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 @@ -1451,7 +1441,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; } @@ -1518,9 +1508,9 @@ void Buffer::markDirty() } -string const & Buffer::fileName() const +string const Buffer::fileName() const { - return pimpl_->filename; + return pimpl_->filename.absFilename(); } @@ -1628,10 +1618,10 @@ void Buffer::changeRefsIfUnique(docstring const & from, docstring const & to, vector labels; if (code == InsetBase::CITE_CODE) { - vector > keys; + vector > keys; fillWithBibKeys(keys); - vector >::const_iterator bit = keys.begin(); - vector >::const_iterator bend = keys.end(); + vector >::const_iterator bit = keys.begin(); + vector >::const_iterator bend = keys.end(); for (; bit != bend; ++bit) // FIXME UNICODE @@ -1692,7 +1682,7 @@ void Buffer::getSourceCode(odocstream & os, pit_type par_begin, ErrorList const & Buffer::errorList(string const & type) const { static ErrorList const emptyErrorList; - std::map::const_iterator I = errorLists_.find(type); + std::map::const_iterator I = errorLists_.find(type); if (I == errorLists_.end()) return emptyErrorList;