X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBuffer.cpp;h=1eaa6ac224b201a172bbe3f063f470252d4c52d7;hb=0a93c9b70f861b12e27239167d9ba59ddd6ece1e;hp=43b5ecd792f76065950c61e4439f156426260392;hpb=21c5bbec71b7a8a191e10be68396ccef49909c7b;p=lyx.git diff --git a/src/Buffer.cpp b/src/Buffer.cpp index 43b5ecd792..1eaa6ac224 100644 --- a/src/Buffer.cpp +++ b/src/Buffer.cpp @@ -28,7 +28,7 @@ #include "CutAndPaste.h" #include "DispatchResult.h" #include "DocIterator.h" -#include "Encoding.h" +#include "BufferEncodings.h" #include "ErrorList.h" #include "Exporter.h" #include "Format.h" @@ -58,7 +58,6 @@ #include "SpellChecker.h" #include "sgml.h" #include "TexRow.h" -#include "TexStream.h" #include "Text.h" #include "TextClass.h" #include "TocBackend.h" @@ -98,6 +97,7 @@ #include "support/gzstream.h" #include "support/lstrings.h" #include "support/lyxalgo.h" +#include "support/mutex.h" #include "support/os.h" #include "support/Package.h" #include "support/PathChanger.h" @@ -323,7 +323,7 @@ public: CloneList * clone_list_; /// are we in the process of exporting this buffer? mutable bool doing_export; - + /// compute statistics /// \p from initial position /// \p to points to the end position @@ -354,12 +354,20 @@ private: /// Creates the per buffer temporary directory static FileName createBufferTmpDir() { - static int count; + // FIXME This would be the ideal application for a TempDir class (like + // TempFile but for directories) + string counter; + { + static int count; + static Mutex mutex; + Mutex::Locker locker(&mutex); + counter = convert(count++); + } // We are in our own directory. Why bother to mangle name? // In fact I wrote this code to circumvent a problematic behaviour // (bug?) of EMX mkstemp(). FileName tmpfl(package().temp_dir().absFileName() + "/lyx_tmpbuf" + - convert(count++)); + counter); if (!tmpfl.createDirectory(0777)) { throw ExceptionMessage(WarningException, _("Disk Error: "), bformat( @@ -529,7 +537,7 @@ void Buffer::cloneWithChildren(BufferMap & bufmap, CloneList * clones) const // The clone needs its own DocumentClass, since running updateBuffer() will // modify it, and we would otherwise be sharing it with the original Buffer. - buffer_clone->params().makeDocumentClass(); + buffer_clone->params().makeDocumentClass(true); ErrorList el; cap::switchBetweenClasses( params().documentClassPtr(), buffer_clone->params().documentClassPtr(), @@ -577,7 +585,7 @@ Buffer * Buffer::cloneBufferOnly() const { // The clone needs its own DocumentClass, since running updateBuffer() will // modify it, and we would otherwise be sharing it with the original Buffer. - buffer_clone->params().makeDocumentClass(); + buffer_clone->params().makeDocumentClass(true); ErrorList el; cap::switchBetweenClasses( params().documentClassPtr(), buffer_clone->params().documentClassPtr(), @@ -636,6 +644,28 @@ BufferParams const & Buffer::params() const } +BufferParams const & Buffer::masterParams() const +{ + if (masterBuffer() == this) + return params(); + + BufferParams & mparams = const_cast(masterBuffer())->params(); + // Copy child authors to the params. We need those pointers. + AuthorList const & child_authors = params().authors(); + AuthorList::Authors::const_iterator it = child_authors.begin(); + for (; it != child_authors.end(); ++it) + mparams.authors().record(*it); + return mparams; +} + + +double Buffer::fontScalingFactor() const +{ + return isExporting() ? 75.0 * params().html_math_img_scale + : 0.01 * lyxrc.dpi * lyxrc.zoom * lyxrc.preview_scale_factor * params().display_pixel_ratio; +} + + ParagraphList & Buffer::paragraphs() { return text().paragraphs(); @@ -836,7 +866,8 @@ int Buffer::readHeader(Lexer & lex) params().html_latex_end.clear(); params().html_math_img_scale = 1.0; params().output_sync_macro.erase(); - params().local_layout.clear(); + params().setLocalLayout(string(), false); + params().setLocalLayout(string(), true); for (int i = 0; i < 4; ++i) { params().user_defined_bullet(i) = ITEMIZE_DEFAULTS[i]; @@ -912,7 +943,7 @@ bool Buffer::readDocument(Lexer & lex) readHeader(lex); - if (params().outputChanges) { + if (params().output_changes) { bool dvipost = LaTeXFeatures::isAvailable("dvipost"); bool xcolorulem = LaTeXFeatures::isAvailable("ulem") && LaTeXFeatures::isAvailable("xcolor"); @@ -932,7 +963,7 @@ bool Buffer::readDocument(Lexer & lex) } } - if (!params().master.empty()) { + if (!parent() && !params().master.empty()) { FileName const master_file = makeAbsPath(params().master, onlyPath(absFileName())); if (isLyXFileName(master_file.absFileName())) { @@ -993,7 +1024,8 @@ bool Buffer::importString(string const & format, docstring const & contents, Err TempFile const tempfile("Buffer_importStringXXXXXX." + fmt->extension()); FileName const name(tempfile.name()); ofdocstream os(name.toFilesystemEncoding().c_str()); - bool const success = (os << contents); + // Do not convert os implicitly to bool, since that is forbidden in C++11. + bool const success = !(os << contents).fail(); os.close(); bool converted = false; @@ -1033,7 +1065,8 @@ bool Buffer::readString(string const & s) Lexer lex; istringstream is(s); lex.setStream(is); - FileName const fn = FileName::tempName("Buffer_readString"); + TempFile tempfile("Buffer_readStringXXXXXX.lyx"); + FileName const fn = tempfile.name(); int file_format; bool success = parseLyXFormat(lex, fn, file_format) == ReadSuccess; @@ -1050,8 +1083,6 @@ bool Buffer::readString(string const & s) else if (success) if (readDocument(lex)) success = false; - if (fn.exists()) - fn.removeFile(); return success; } @@ -1172,7 +1203,9 @@ Buffer::ReadStatus Buffer::parseLyXFormat(Lexer & lex, Buffer::ReadStatus Buffer::convertLyXFormat(FileName const & fn, FileName & tmpfile, int from_format) { - tmpfile = FileName::tempName("Buffer_convertLyXFormatXXXXXX.lyx"); + TempFile tempfile("Buffer_convertLyXFormatXXXXXX.lyx"); + tempfile.setAutoRemove(false); + tmpfile = tempfile.name(); if(tmpfile.empty()) { Alert::error(_("Conversion failed"), bformat(_("%1$s is from a different" @@ -1259,12 +1292,32 @@ bool Buffer::save() const // We don't need autosaves in the immediate future. (Asger) resetAutosaveTimers(); - FileName backupName; - bool madeBackup = false; + // if the file does not yet exist, none of the backup activity + // that follows is necessary + if (!fileName().exists()) + return writeFile(fileName()); + + // we first write the file to a new name, then move it to its + // proper location once that has been done successfully. that + // way we preserve the original file if something goes wrong. + string const justname = fileName().onlyFileNameWithoutExt(); + boost::scoped_ptr + tempfile(new TempFile(fileName().onlyPath(), + justname + "-XXXXXX.lyx")); + bool const symlink = fileName().isSymLink(); + if (!symlink) + tempfile->setAutoRemove(false); + + FileName savefile(tempfile->name()); + LYXERR(Debug::FILES, "Saving to " << savefile.absFileName()); + if (!writeFile(savefile)) + return false; - // make a backup if the file already exists - if (lyxrc.make_backup && fileName().exists()) { - backupName = FileName(absFileName() + '~'); + // we will set this to false if we fail + bool made_backup = true; + + FileName backupName(absFileName() + '~'); + if (lyxrc.make_backup) { if (!lyxrc.backupdir_path.empty()) { string const mangledName = subst(subst(backupName.absFileName(), '/', '!'), ':', '!'); @@ -1272,14 +1325,15 @@ bool Buffer::save() const mangledName)); } + LYXERR(Debug::FILES, "Backing up original file to " << + backupName.absFileName()); // Except file is symlink do not copy because of #6587. // Hard links have bad luck. - if (fileName().isSymLink()) - madeBackup = fileName().copyTo(backupName); - else - madeBackup = fileName().moveTo(backupName); + made_backup = symlink ? + fileName().copyTo(backupName): + fileName().moveTo(backupName); - if (!madeBackup) { + if (!made_backup) { Alert::error(_("Backup failure"), bformat(_("Cannot create backup file %1$s.\n" "Please check whether the directory exists and is writable."), @@ -1288,15 +1342,46 @@ bool Buffer::save() const } } - if (writeFile(d->filename)) { + // Destroy tempfile since it keeps the file locked on windows (bug 9234) + // Only do this if tempfile is not in autoremove mode + if (!symlink) + tempfile.reset(); + // If we have no symlink, we can simply rename the temp file. + // Otherwise, we need to copy it so the symlink stays intact. + if (made_backup && symlink ? savefile.copyTo(fileName(), true) : + savefile.moveTo(fileName())) + { + // saveCheckSum() was already called by writeFile(), but the + // time stamp is invalidated by copying/moving + saveCheckSum(); markClean(); return true; + } + // else we saved the file, but failed to move it to the right location. + + if (lyxrc.make_backup && made_backup && !symlink) { + // the original file was moved to filename.lyx~, so it will look + // to the user as if it was deleted. (see bug #9234.) we could try + // to restore it, but that would basically mean trying to do again + // what we just failed to do. better to leave things as they are. + Alert::error(_("Write failure"), + bformat(_("The file has successfully been saved as:\n %1$s.\n" + "But LyX could not move it to:\n %2$s.\n" + "Your original file has been backed up to:\n %3$s"), + from_utf8(savefile.absFileName()), + from_utf8(fileName().absFileName()), + from_utf8(backupName.absFileName()))); } else { - // Saving failed, so backup is not backup - if (madeBackup) - backupName.moveTo(d->filename); - return false; + // either we did not try to make a backup, or else we tried and failed, + // or else the original file was a symlink, in which case it was copied, + // not moved. so the original file is intact. + Alert::error(_("Write failure"), + bformat(_("Cannot move saved file to:\n %1$s.\n" + "But the file has successfully been saved as:\n %2$s."), + from_utf8(fileName().absFileName()), + from_utf8(savefile.absFileName()))); } + return false; } @@ -1403,6 +1488,8 @@ bool Buffer::write(ostream & ofs) const // The top of the file should not be written by params(). // write out a comment in the top of the file + // Important: Keep the version formatting in sync with lyx2lyx and + // tex2lyx (bug 7951) ofs << "#LyX " << lyx_version_major << "." << lyx_version_minor << " created this file. For more info see http://www.lyx.org/\n" << "\\lyxformat " << LYX_FORMAT << "\n" @@ -1481,7 +1568,6 @@ bool Buffer::makeLaTeXFile(FileName const & fname, if (!openFileWrite(ofs, fname)) return false; - //TexStream ts(ofs.rdbuf(), &texrow()); ErrorList & errorList = d->errorLists["Export"]; errorList.clear(); bool failed_export = false; @@ -1499,13 +1585,12 @@ bool Buffer::makeLaTeXFile(FileName const & fname, writeLaTeXSource(os, original_path, runparams, output); } catch (EncodingException const & e) { - odocstringstream ods; - ods.put(e.failed_char); + docstring const failed(1, e.failed_char); ostringstream oss; oss << "0x" << hex << e.failed_char << dec; docstring msg = bformat(_("Could not find LaTeX command for character '%1$s'" " (code point %2$s)"), - ods.str(), from_utf8(oss.str())); + failed, from_utf8(oss.str())); errorList.push_back(ErrorItem(msg, _("Some characters of your document are probably not " "representable in the chosen encoding.\n" "Changing the document encoding to utf8 could help."), @@ -1533,7 +1618,10 @@ bool Buffer::makeLaTeXFile(FileName const & fname, lyxerr << "File '" << fname << "' was not closed properly." << endl; } - errors("Export"); + if (runparams_in.silent) + errorList.clear(); + else + errors("Export"); return !failed_export; } @@ -1555,13 +1643,15 @@ void Buffer::writeLaTeXSource(otexstream & os, d->ignore_parent = true; // Classify the unicode characters appearing in math insets - Encodings::initUnicodeMath(*this); + BufferEncodings::initUnicodeMath(*this); // validate the buffer. LYXERR(Debug::LATEX, " Validating buffer..."); LaTeXFeatures features(*this, params(), runparams); validate(features); - runparams.use_polyglossia = features.usePolyglossia(); + // This is only set once per document (in master) + if (!runparams.is_child) + runparams.use_polyglossia = features.usePolyglossia(); LYXERR(Debug::LATEX, " Buffer validation done."); bool const output_preamble = @@ -1663,7 +1753,9 @@ void Buffer::writeLaTeXSource(otexstream & os, runparams.use_babel = params().writeLaTeX(os, features, d->filename.onlyPath()); - runparams.use_japanese = features.isRequired("japanese"); + // Japanese might be required only in some children of a document, + // but once required, we must keep use_japanese true. + runparams.use_japanese |= features.isRequired("japanese"); if (!output_body) { // Restore the parenthood if needed @@ -1861,7 +1953,7 @@ void Buffer::writeLyXHTMLSource(odocstream & os, if (output_preamble) { os << "\n" - << "\n" + << "\n" // FIXME Language should be set properly. << "\n" << "\n" @@ -1909,7 +2001,7 @@ void Buffer::writeLyXHTMLSource(odocstream & os, << ";\n"; css << "}\n"; } - + docstring const dstyles = css.str(); if (!dstyles.empty()) { bool written = false; @@ -1993,7 +2085,10 @@ int Buffer::runChktex() setBusy(false); - errors("ChkTeX"); + if (runparams.silent) + d->errorLists["ChkTeX"].clear(); + else + errors("ChkTeX"); return res; } @@ -2358,9 +2453,13 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr) break; } - case LFUN_BUILD_PROGRAM: - doExport("program", true); + case LFUN_BUILD_PROGRAM: { + ExportStatus const status = doExport("program", true); + dr.setError(status != ExportSuccess); + if (status != ExportSuccess) + dr.setMessage(_("Error generating literate programming code.")); break; + } case LFUN_BUFFER_CHKTEX: runChktex(); @@ -2474,6 +2573,7 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr) msg += ("\n"); msg += bformat(_("Branch \"%1$s\" already exists."), branch_name); } else { + undo().recordUndoFullDocument(CursorData()); branch_list.add(branch_name); branch = branch_list.find(branch_name); string const x11hexname = X11hexname(branch->color()); @@ -2549,7 +2649,7 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr) break; } - if (!doExport("dvi", true)) { + if (doExport("dvi", true) != ExportSuccess) { showPrintError(absFileName()); dr.setMessage(_("Error exporting to DVI.")); break; @@ -3432,7 +3532,7 @@ void Buffer::changeRefsIfUnique(docstring const & from, docstring const & to) string const paramName = "key"; for (InsetIterator it = inset_iterator_begin(inset()); it; ++it) { - if (it->lyxCode() != CITE_CODE) + if (it->lyxCode() != CITE_CODE) continue; InsetCommand * inset = it->asInsetCommand(); docstring const oldValue = inset->getParam(paramName); @@ -3442,7 +3542,7 @@ void Buffer::changeRefsIfUnique(docstring const & from, docstring const & to) } -void Buffer::getSourceCode(odocstream & os, string const format, +void Buffer::getSourceCode(odocstream & os, string const & format, pit_type par_begin, pit_type par_end, OutputWhat output, bool master) const { @@ -3677,11 +3777,13 @@ int AutoSaveBuffer::generateChild() // to fork. But we will do the save // anyway. bool failed = false; - FileName const tmp_ret = FileName::tempName("lyxauto"); + TempFile tempfile("lyxautoXXXXXX.lyx"); + tempfile.setAutoRemove(false); + FileName const tmp_ret = tempfile.name(); if (!tmp_ret.empty()) { - buffer_.writeFile(tmp_ret); - // assume successful write of tmp_ret - if (!tmp_ret.moveTo(fname_)) + if (!buffer_.writeFile(tmp_ret)) + failed = true; + else if (!tmp_ret.moveTo(fname_)) failed = true; } else failed = true; @@ -3761,7 +3863,9 @@ bool Buffer::autoSave() const // If this buffer is cloned, we assume that // we are running in a separate thread already. - FileName const tmp_ret = FileName::tempName("lyxauto"); + TempFile tempfile("lyxautoXXXXXX.lyx"); + tempfile.setAutoRemove(false); + FileName const tmp_ret = tempfile.name(); if (!tmp_ret.empty()) { writeFile(tmp_ret); // assume successful write of tmp_ret @@ -3884,7 +3988,7 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir Graph::EdgePath::const_iterator it = path.begin(); Graph::EdgePath::const_iterator en = path.end(); for (; it != en; ++it) - if (theConverters().get(*it).nice) { + if (theConverters().get(*it).nice()) { need_nice_file = true; break; } @@ -3961,17 +4065,21 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir // Emit the signal to show the error list or copy it back to the // cloned Buffer so that it can be emitted afterwards. if (format != backend_format) { - if (d->cloned_buffer_) { + if (runparams.silent) + error_list.clear(); + else if (d->cloned_buffer_) d->cloned_buffer_->d->errorLists[error_type] = d->errorLists[error_type]; - } else + else errors(error_type); // also to the children, in case of master-buffer-view ListOfBuffers clist = getDescendents(); ListOfBuffers::const_iterator cit = clist.begin(); ListOfBuffers::const_iterator const cen = clist.end(); for (; cit != cen; ++cit) { - if (d->cloned_buffer_) { + if (runparams.silent) + (*cit)->d->errorLists[error_type].clear(); + else if (d->cloned_buffer_) { // Enable reverse search by copying back the // texrow object to the cloned buffer. // FIXME: this is not thread safe. @@ -4075,6 +4183,7 @@ Buffer::ExportStatus Buffer::preview(string const & format) const return preview(format, update_unincluded); } + Buffer::ExportStatus Buffer::preview(string const & format, bool includeall) const { MarkAsExporting exporting(this); @@ -4312,8 +4421,10 @@ void Buffer::updateBuffer(UpdateScope scope, UpdateType utype) const DocumentClass const & textclass = master->params().documentClass(); // do this only if we are the top-level Buffer - if (master == this) + if (master == this) { + textclass.counters().reset(from_ascii("bibitem")); reloadBibInfoCache(); + } // keep the buffers to be children in this set. If the call from the // master comes back we can see which of them were actually seen (i.e. @@ -4324,9 +4435,15 @@ void Buffer::updateBuffer(UpdateScope scope, UpdateType utype) const if (master != this) { bufToUpdate.insert(this); master->updateBuffer(UpdateMaster, utype); - // Do this here in case the master has no gui associated with it. Then, - // the TocModel is not updated and TocModel::toc_ is invalid (bug 5699). - if (!master->d->gui_) + // If the master buffer has no gui associated with it, then the TocModel is + // not updated during the updateBuffer call and TocModel::toc_ is invalid + // (bug 5699). The same happens if the master buffer is open in a different + // window. This test catches both possibilities. + // See: http://marc.info/?l=lyx-devel&m=138590578911716&w=2 + // There remains a problem here: If there is another child open in yet a third + // window, that TOC is not updated. So some more general solution is needed at + // some point. + if (master->d->gui_ != d->gui_) structureChanged(); // was buf referenced from the master (i.e. not in bufToUpdate anymore)? @@ -4662,16 +4779,16 @@ void Buffer::Impl::updateStatistics(DocIterator & from, DocIterator & to, bool s word_count_ = 0; char_count_ = 0; blank_count_ = 0; - + for (DocIterator dit = from ; dit != to && !dit.atEnd(); ) { if (!dit.inTexted()) { dit.forwardPos(); continue; } - + Paragraph const & par = dit.paragraph(); pos_type const pos = dit.pos(); - + // Copied and adapted from isWordSeparator() in Paragraph if (pos == dit.lastpos()) { inword = false; @@ -4685,7 +4802,7 @@ void Buffer::Impl::updateStatistics(DocIterator & from, DocIterator & to, bool s break; continue; } else if (!par.isDeleted(pos)) { - if (par.isWordSeparator(pos)) + if (par.isWordSeparator(pos)) inword = false; else if (!inword) { ++word_count_; @@ -4727,7 +4844,7 @@ int Buffer::charCount(bool with_blanks) const } -Buffer::ReadStatus Buffer::reload(bool clearUndo) +Buffer::ReadStatus Buffer::reload() { setBusy(true); // c.f. bug http://www.lyx.org/trac/ticket/6587 @@ -4745,8 +4862,7 @@ Buffer::ReadStatus Buffer::reload(bool clearUndo) updateTitles(); markClean(); message(bformat(_("Document %1$s reloaded."), disp_fn)); - if (clearUndo) - d->undo_.clear(); + d->undo_.clear(); } else { message(bformat(_("Could not reload document %1$s."), disp_fn)); }