X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer.C;h=90cc72c46fc8a4b0bfbaa43ec0b35201850b1400;hb=a087bda7ec81f48c97d3903ac2c27b688e054e65;hp=37ec8955e8a5879cb62cbd11f1dcf8c250acdfc5;hpb=e472c2b740bc49a1f916aeda0a337e711913d0c7;p=lyx.git diff --git a/src/buffer.C b/src/buffer.C index 37ec8955e8..90cc72c46f 100644 --- a/src/buffer.C +++ b/src/buffer.C @@ -13,6 +13,7 @@ #include "buffer.h" #include "author.h" +#include "BranchList.h" #include "buffer_funcs.h" #include "bufferlist.h" #include "bufferparams.h" @@ -63,22 +64,30 @@ #include "graphics/Previews.h" -#include "support/FileInfo.h" #include "support/filetools.h" -#include "support/gzstream.h" +#include "support/fs_extras.h" +#ifdef USE_COMPRESSION +# include "support/gzstream.h" +#endif #include "support/lyxlib.h" #include "support/os.h" #include "support/path.h" #include "support/textutils.h" -#include "support/tostr.h" +#include "support/convert.h" #include +#include -#include +#if defined (HAVE_UTIME_H) +# include +#elif defined (HAVE_SYS_UTIME_H) +# include +#endif #include #include #include +#include using lyx::pos_type; @@ -90,12 +99,10 @@ using lyx::support::ChangeExtension; using lyx::support::cmd_ret; using lyx::support::createBufferTmpDir; using lyx::support::destroyDir; -using lyx::support::FileInfo; -using lyx::support::FileInfo; using lyx::support::getFormatFromContents; using lyx::support::IsDirWriteable; -using lyx::support::IsFileWriteable; using lyx::support::LibFileSearch; +using lyx::support::latex_path; using lyx::support::ltrim; using lyx::support::MakeAbsPath; using lyx::support::MakeDisplayPath; @@ -108,12 +115,12 @@ using lyx::support::removeAutosaveFile; using lyx::support::rename; using lyx::support::RunCommand; using lyx::support::split; -using lyx::support::strToInt; using lyx::support::subst; using lyx::support::tempName; using lyx::support::trim; namespace os = lyx::support::os; +namespace fs = boost::filesystem; using std::endl; using std::for_each; @@ -136,15 +143,16 @@ extern BufferList bufferlist; namespace { -const int LYX_FORMAT = 238; +int const LYX_FORMAT = 241; } // namespace anon typedef std::map DepClean; -struct Buffer::Impl +class Buffer::Impl { +public: Impl(Buffer & parent, string const & file, bool readonly); limited_stack undostack; @@ -196,6 +204,7 @@ Buffer::Impl::Impl(Buffer & parent, string const & file, bool readonly_) filename(file), filepath(OnlyPath(file)), file_fully_loaded(false), inset(params) { + inset.setAutoBreakRows(true); lyxvc.buffer(&parent); temppath = createBufferTmpDir(); // FIXME: And now do something if temppath == string(), because we @@ -219,7 +228,7 @@ Buffer::~Buffer() closing(); - if (!temppath().empty() && destroyDir(temppath()) != 0) { + if (!temppath().empty() && !destroyDir(temppath())) { Alert::warning(_("Could not remove temporary directory"), bformat(_("Could not remove the temporary directory %1$s"), temppath())); } @@ -319,7 +328,7 @@ TexRow const & Buffer::texrow() const } -string const Buffer::getLatexName(bool no_path) const +string const Buffer::getLatexName(bool const no_path) const { string const name = ChangeExtension(MakeLatexName(fileName()), ".tex"); return no_path ? OnlyFilename(name) : name; @@ -345,11 +354,8 @@ pair const Buffer::getLogName() const // If no Latex log or Build log is newer, show Build log - FileInfo const f_fi(fname); - FileInfo const b_fi(bname); - - if (b_fi.exist() && - (!f_fi.exist() || f_fi.getModificationTime() < b_fi.getModificationTime())) { + if (fs::exists(bname) && + (!fs::exists(fname) || fs::last_write_time(fname) < fs::last_write_time(bname))) { lyxerr[Debug::FILES] << "Log name calculated as: " << bname << endl; return make_pair(Buffer::buildlog, bname); } @@ -358,7 +364,7 @@ pair const Buffer::getLogName() const } -void Buffer::setReadonly(bool flag) +void Buffer::setReadonly(bool const flag) { if (pimpl_->read_only != flag) { pimpl_->read_only = flag; @@ -371,7 +377,7 @@ void Buffer::setFileName(string const & newfile) { pimpl_->filename = MakeAbsPath(newfile); pimpl_->filepath = OnlyPath(pimpl_->filename); - setReadonly(IsFileWriteable(pimpl_->filename) == 0); + setReadonly(fs::is_readonly(pimpl_->filename)); updateTitles(); } @@ -395,6 +401,20 @@ int Buffer::readHeader(LyXLex & lex) int line = -1; int begin_header_line = -1; + // Initialize parameters that may be/go lacking in header: + params().branchlist().clear(); + params().options.erase(); + params().float_placement.erase(); + params().paperwidth.erase(); + params().paperheight.erase(); + params().leftmargin.erase(); + params().rightmargin.erase(); + params().topmargin.erase(); + params().bottommargin.erase(); + params().headheight.erase(); + params().headsep.erase(); + params().footskip.erase(); + while (lex.isOK()) { lex.next(); string const token = lex.getString(); @@ -416,7 +436,7 @@ int Buffer::readHeader(LyXLex & lex) string unknown = params().readToken(lex, token); if (!unknown.empty()) { - if (unknown[0] != '\\' and token == "\\textclass") { + if (unknown[0] != '\\' && token == "\\textclass") { unknownClass(unknown); } else { ++unknown_tokens; @@ -473,24 +493,22 @@ bool Buffer::readDocument(LyXLex & lex) // needed to insert the selection void Buffer::insertStringAsLines(ParagraphList & pars, - pit_type & par, pos_type & pos, - LyXFont const & fn, string const & str) + pit_type & pit, pos_type & pos, + LyXFont const & fn, string const & str, bool autobreakrows) { - LyXLayout_ptr const & layout = pars[par].layout(); - LyXFont font = fn; - pars[par].checkInsertChar(font); + pars[pit].checkInsertChar(font); // insert the string, don't insert doublespace bool space_inserted = true; - bool autobreakrows = pars[par].autoBreakRows(); for (string::const_iterator cit = str.begin(); cit != str.end(); ++cit) { + Paragraph & par = pars[pit]; if (*cit == '\n') { - if (autobreakrows && (!pars[par].empty() || pars[par].allowEmpty())) { - breakParagraph(params(), paragraphs(), par, pos, - layout->isEnvironment()); - ++par; + if (autobreakrows && (!par.empty() || par.allowEmpty())) { + breakParagraph(params(), pars, pit, pos, + par.layout()->isEnvironment()); + ++pit; pos = 0; space_inserted = true; } else { @@ -498,18 +516,18 @@ void Buffer::insertStringAsLines(ParagraphList & pars, } // do not insert consecutive spaces if !free_spacing } else if ((*cit == ' ' || *cit == '\t') && - space_inserted && !pars[par].isFreeSpacing()) { + space_inserted && !par.isFreeSpacing()) { continue; } else if (*cit == '\t') { - if (!pars[par].isFreeSpacing()) { + if (!par.isFreeSpacing()) { // tabs are like spaces here - pars[par].insertChar(pos, ' ', font); + par.insertChar(pos, ' ', font); ++pos; space_inserted = true; } else { const pos_type n = 8 - pos % 8; for (pos_type i = 0; i < n; ++i) { - pars[par].insertChar(pos, ' ', font); + par.insertChar(pos, ' ', font); ++pos; } space_inserted = true; @@ -519,7 +537,7 @@ void Buffer::insertStringAsLines(ParagraphList & pars, continue; } else { // just insert the character - pars[par].insertChar(pos, *cit, font); + par.insertChar(pos, *cit, font); ++pos; space_inserted = (*cit == ' '); } @@ -549,7 +567,7 @@ bool Buffer::readFile(string const & filename) } -bool Buffer::readFile(string const & filename, pit_type pit) +bool Buffer::readFile(string const & filename, pit_type const pit) { LyXLex lex(0, 0); lex.setFile(filename); @@ -563,13 +581,13 @@ bool Buffer::fully_loaded() const } -void Buffer::fully_loaded(bool value) +void Buffer::fully_loaded(bool const value) { pimpl_->file_fully_loaded = value; } -bool Buffer::readFile(LyXLex & lex, string const & filename, pit_type pit) +bool Buffer::readFile(LyXLex & lex, string const & filename, pit_type const pit) { BOOST_ASSERT(!filename.empty()); @@ -606,7 +624,7 @@ bool Buffer::readFile(LyXLex & lex, string const & filename, pit_type pit) //lyxerr << " dot found at " << dot << endl; if (dot != string::npos) tmp_format.erase(dot, 1); - int file_format = strToInt(tmp_format); + int const file_format = convert(tmp_format); //lyxerr << "format: " << file_format << endl; if (file_format != LYX_FORMAT) { @@ -620,7 +638,8 @@ bool Buffer::readFile(LyXLex & lex, string const & filename, pit_type pit) filename)); return false; } - string command = LibFileSearch("lyx2lyx", "lyx2lyx"); + string command = + "python " + LibFileSearch("lyx2lyx", "lyx2lyx"); if (command.empty()) { Alert::error(_("Conversion script not found"), bformat(_("%1$s is from an earlier" @@ -631,7 +650,7 @@ bool Buffer::readFile(LyXLex & lex, string const & filename, pit_type pit) return false; } command += " -t" - + tostr(LYX_FORMAT) + + convert(LYX_FORMAT) + " -o " + tmpfile + ' ' + QuoteName(filename); lyxerr[Debug::INFO] << "Running '" @@ -646,7 +665,7 @@ bool Buffer::readFile(LyXLex & lex, string const & filename, pit_type pit) filename)); return false; } else { - bool ret = readFile(tmpfile, pit); + bool const ret = readFile(tmpfile, pit); // Do stuff with tmpfile name and buffer name here. return ret; } @@ -682,53 +701,20 @@ bool Buffer::save() const s = fileName() + '~'; if (!lyxrc.backupdir_path.empty()) s = AddName(lyxrc.backupdir_path, - subst(os::slashify_path(s),'/','!')); - - // Rename is the wrong way of making a backup, - // this is the correct way. - /* truss cp fil fil2: - lstat("LyXVC3.lyx", 0xEFFFF898) Err#2 ENOENT - stat("LyXVC.lyx", 0xEFFFF688) = 0 - open("LyXVC.lyx", O_RDONLY) = 3 - open("LyXVC3.lyx", O_WRONLY|O_CREAT|O_TRUNC, 0600) = 4 - fstat(4, 0xEFFFF508) = 0 - fstat(3, 0xEFFFF508) = 0 - read(3, " # T h i s f i l e w".., 8192) = 5579 - write(4, " # T h i s f i l e w".., 5579) = 5579 - read(3, 0xEFFFD4A0, 8192) = 0 - close(4) = 0 - close(3) = 0 - chmod("LyXVC3.lyx", 0100644) = 0 - lseek(0, 0, SEEK_CUR) = 46440 - _exit(0) - */ - - // Should probably have some more error checking here. - // Doing it this way, also makes the inodes stay the same. - // This is still not a very good solution, in particular we - // might loose the owner of the backup. - FileInfo finfo(fileName()); - if (finfo.exist()) { - mode_t fmode = finfo.getMode(); - struct utimbuf times = { - finfo.getAccessTime(), - finfo.getModificationTime() }; - - ifstream ifs(fileName().c_str()); - ofstream ofs(s.c_str(), ios::out|ios::trunc); - if (ifs && ofs) { - ofs << ifs.rdbuf(); - ifs.close(); - ofs.close(); - ::chmod(s.c_str(), fmode); - - if (::utime(s.c_str(), ×)) { - lyxerr << "utime error." << endl; - } - } else { - lyxerr << "LyX was not able to make " - "backup copy. Beware." << endl; - } + subst(os::internal_path(s),'/','!')); + + // It might very well be that this variant is just + // good enough. (Lgb) + // But to use this we need fs::copy_file to actually do a copy, + // even when the target file exists. (Lgb) + if (fs::exists(fileName()) && fs::is_writable(fs::path(fileName()).branch_path())) { + //try { + fs::copy_file(fileName(), s, false); + //} + //catch (fs::filesystem_error const & fe) { + //lyxerr << "LyX was not able to make backup copy. Beware.\n" + // << fe.what() << endl; + //} } } @@ -750,21 +736,20 @@ bool Buffer::writeFile(string const & fname) const if (pimpl_->read_only && fname == fileName()) return false; - FileInfo finfo(fname); - if (finfo.exist() && !finfo.writable()) - return false; - bool retval = false; if (params().compressed) { - gz::ogzstream ofs(fname.c_str()); +#ifdef USE_COMPRESSION + gz::ogzstream ofs(fname.c_str(), ios::out|ios::trunc); if (!ofs) return false; retval = do_writeFile(ofs); - +#else + return false; +#endif } else { - ofstream ofs(fname.c_str()); + ofstream ofs(fname.c_str(), ios::out|ios::trunc); if (!ofs) return false; @@ -847,7 +832,7 @@ void Buffer::makeLaTeXFile(string const & fname, void Buffer::makeLaTeXFile(ostream & os, string const & original_path, OutputParams const & runparams_in, - bool output_preamble, bool output_body) + bool const output_preamble, bool const output_body) { OutputParams runparams = runparams_in; @@ -890,8 +875,7 @@ void Buffer::makeLaTeXFile(ostream & os, texrow().newline(); } if (!original_path.empty()) { - string inputpath = os::external_path(original_path); - subst(inputpath, "~", "\\string~"); + string const inputpath = latex_path(original_path); os << "\\makeatletter\n" << "\\def\\input@path{{" << inputpath << "/}}\n" @@ -1001,7 +985,7 @@ bool Buffer::isSGML() const void Buffer::makeLinuxDocFile(string const & fname, OutputParams const & runparams, - bool body_only) + bool const body_only) { ofstream ofs; if (!openFileWrite(ofs, fname)) @@ -1014,7 +998,7 @@ void Buffer::makeLinuxDocFile(string const & fname, LyXTextClass const & tclass = params().getLyXTextClass(); - string top_element = tclass.latexname(); + string const & top_element = tclass.latexname(); if (!body_only) { ofs << tclass.class_header(); @@ -1059,7 +1043,7 @@ void Buffer::makeLinuxDocFile(string const & fname, void Buffer::makeDocBookFile(string const & fname, OutputParams const & runparams, - bool only_body) + bool const only_body) { ofstream ofs; if (!openFileWrite(ofs, fname)) @@ -1071,7 +1055,7 @@ void Buffer::makeDocBookFile(string const & fname, texrow().reset(); LyXTextClass const & tclass = params().getLyXTextClass(); - string top_element = tclass.latexname(); + string const & top_element = tclass.latexname(); if (!only_body) { if (runparams.flavor == OutputParams::XML) @@ -1158,7 +1142,7 @@ int Buffer::runChktex() TeXErrors terr; Chktex chktex(lyxrc.chktex_command, name, filePath()); - int res = chktex.run(terr); // run chktex + int const res = chktex.run(terr); // run chktex if (res == -1) { Alert::error(_("chktex failure"), @@ -1178,7 +1162,8 @@ void Buffer::validate(LaTeXFeatures & features) const { LyXTextClass const & tclass = params().getLyXTextClass(); - if (params().tracking_changes) { + if (features.isAvailable("dvipost") && params().tracking_changes + && params().output_changes) { features.require("dvipost"); features.require("color"); } @@ -1221,7 +1206,7 @@ void Buffer::validate(LaTeXFeatures & features) const } -void Buffer::getLabelList(std::vector & list) const +void Buffer::getLabelList(vector & list) const { /// if this is a child document and the parent is already loaded /// Use the parent's list instead [ale990407] @@ -1241,7 +1226,7 @@ void Buffer::getLabelList(std::vector & list) const // This is also a buffer property (ale) -void Buffer::fillWithBibKeys(std::vector > & keys) +void Buffer::fillWithBibKeys(vector > & keys) const { /// if this is a child document and the parent is already loaded @@ -1277,7 +1262,7 @@ void Buffer::fillWithBibKeys(std::vector > & keys) bool Buffer::isDepClean(string const & name) const { - DepClean::const_iterator it = pimpl_->dep_clean.find(name); + DepClean::const_iterator const it = pimpl_->dep_clean.find(name); if (it == pimpl_->dep_clean.end()) return true; return it->second; @@ -1317,6 +1302,9 @@ bool Buffer::dispatch(FuncRequest const & func, bool * result) void Buffer::changeLanguage(Language const * from, Language const * to) { + BOOST_ASSERT(from); + BOOST_ASSERT(to); + lyxerr << "Changing Language!" << endl; // Take care of l10n/i18n @@ -1330,6 +1318,8 @@ void Buffer::changeLanguage(Language const * from, Language const * to) void Buffer::updateDocLang(Language const * nlang) { + BOOST_ASSERT(nlang); + pimpl_->messages.reset(new Messages(nlang->code())); } @@ -1345,10 +1335,10 @@ bool Buffer::isMultiLingual() const } -ParIterator Buffer::getParFromID(int id) const +ParIterator Buffer::getParFromID(int const id) const { ParConstIterator it = par_iterator_begin(); - ParConstIterator end = par_iterator_end(); + ParConstIterator const end = par_iterator_end(); if (id < 0) { // John says this is called with id == -1 from undo @@ -1364,9 +1354,9 @@ ParIterator Buffer::getParFromID(int id) const } -bool Buffer::hasParWithID(int id) const +bool Buffer::hasParWithID(int const id) const { - ParConstIterator it = getParFromID(id); + ParConstIterator const it = getParFromID(id); return it != par_iterator_end(); } @@ -1453,6 +1443,9 @@ bool Buffer::isUnnamed() const } +#ifdef WITH_WARNINGS +#warning this function should be moved to buffer_pimpl.C +#endif void Buffer::markDirty() { if (pimpl_->lyx_clean) {