X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBuffer.cpp;h=a300b2dd4bd829853c63b74192786acae02d678f;hb=62af7ee772f16f154225d2d0b65d77f4376b6001;hp=e16ac169ccd4d774faf5e7bd224675aec8d3cf09;hpb=2e433654c7f3db02bfd0e4dd09eb04cd8ab44bb9;p=lyx.git diff --git a/src/Buffer.cpp b/src/Buffer.cpp index e16ac169cc..a300b2dd4b 100644 --- a/src/Buffer.cpp +++ b/src/Buffer.cpp @@ -83,6 +83,7 @@ #include "graphics/GraphicsCache.h" #include "graphics/PreviewLoader.h" +#include "frontends/Application.h" #include "frontends/alert.h" #include "frontends/Delegates.h" #include "frontends/WorkAreaManager.h" @@ -152,11 +153,12 @@ typedef vector LabelCache; typedef map RefCache; -} // namespace +// A storehouse for the cloned buffers. +typedef list CloneStore; +CloneStore cloned_buffers; +} // namespace -// A storehouse for the cloned buffers. -list cloned_buffers; class Buffer::Impl @@ -199,40 +201,9 @@ public: /// need to regenerate .tex? DepClean dep_clean; - /// is save needed? - mutable bool lyx_clean; - - /// is autosave needed? - mutable bool bak_clean; - - /// is this an unnamed file (New...)? - bool unnamed; - - /// is this an internal bufffer? - bool internal_buffer; - - /// buffer is r/o - bool read_only; - /// name of the file the buffer is associated with. FileName filename; - /** Set to true only when the file is fully loaded. - * Used to prevent the premature generation of previews - * and by the citation inset. - */ - bool file_fully_loaded; - - /// original format of loaded file - int file_format; - - /// if the file was originally loaded from an older format, do - /// we need to back it up still? - bool need_format_backup; - - /// Ignore the parent (e.g. when exporting a child standalone)? - bool ignore_parent; - /// mutable TocBackend toc_backend; @@ -249,13 +220,11 @@ public: /// map from the macro name to the position map, /// which maps the macro definition position to the scope and the MacroData. NamePositionScopeMacroMap macros; - /// This seem to change the way Buffer::getMacro() works - mutable bool macro_lock; /// positions of child buffers in the buffer typedef map BufferPositionMap; struct ScopeBuffer { - ScopeBuffer() : buffer(0) {} + ScopeBuffer() : buffer(nullptr) {} ScopeBuffer(DocIterator const & s, Buffer const * b) : scope(s), buffer(b) {} DocIterator scope; @@ -302,25 +271,13 @@ public: // file, and then to construct the Buffer's bibinfo from that. /// A cache for bibliography info mutable BiblioInfo bibinfo_; - /// whether the bibinfo cache is valid - mutable bool bibinfo_cache_valid_; /// Cache of timestamps of .bib files map bibfile_status_; - /// Indicates whether the bibinfo has changed since the last time - /// we ran updateBuffer(), i.e., whether citation labels may need - /// to be updated. - mutable bool cite_labels_valid_; - /// Do we have a bibliography environment? - mutable bool have_bibitems_; /// These two hold the file name and format, written to by /// Buffer::preview and read from by LFUN_BUFFER_VIEW_CACHE. FileName preview_file_; string preview_format_; - /// If there was an error when previewing, on the next preview we do - /// a fresh compile (e.g. in case the user installed a package that - /// was missing). - bool preview_error_; /// Cache the references associated to a label and their positions /// in the buffer. @@ -334,6 +291,81 @@ public: /// PreviewLoader * preview_loader_; + /// If non zero, this buffer is a clone of existing buffer \p cloned_buffer_ + /// This one is useful for preview detached in a thread. + Buffer const * cloned_buffer_; + /// + CloneList_ptr clone_list_; + +private: + /// So we can force access via the accessors. + mutable Buffer const * parent_buffer; + + FileMonitorPtr file_monitor_; + +/// ints and bools are all listed last so as to avoid alignment issues +public: + /// original format of loaded file + int file_format; + + /// are we in the process of exporting this buffer? + mutable bool doing_export; + + /// If there was an error when previewing, on the next preview we do + /// a fresh compile (e.g. in case the user installed a package that + /// was missing). + bool require_fresh_start_; + + /// Indicates whether the bibinfo has changed since the last time + /// we ran updateBuffer(), i.e., whether citation labels may need + /// to be updated. + mutable bool cite_labels_valid_; + /// Do we have a bibliography environment? + mutable bool have_bibitems_; + + /// is save needed? + mutable bool lyx_clean; + + /// is autosave needed? + mutable bool bak_clean; + + /// is this an unnamed file (New...)? + bool unnamed; + + /// is this an internal bufffer? + bool internal_buffer; + + /// buffer is r/o + bool read_only; + + /** Set to true only when the file is fully loaded. + * Used to prevent the premature generation of previews + * and by the citation inset. + */ + bool file_fully_loaded; + + /// if the file was originally loaded from an older format, do + /// we need to back it up still? + bool need_format_backup; + + /// Ignore the parent (e.g. when exporting a child standalone)? + bool ignore_parent; + + /// This seem to change the way Buffer::getMacro() works + mutable bool macro_lock; + + /// has been externally modified? Can be reset by the user. + mutable bool externally_modified_; + + /// whether the bibinfo cache is valid + mutable bool bibinfo_cache_valid_; + +private: + int word_count_; + int char_count_; + int blank_count_; + +public: /// This is here to force the test to be done whenever parent_buffer /// is accessed. Buffer const * parent() const @@ -341,7 +373,7 @@ public: // ignore_parent temporarily "orphans" a buffer // (e.g. if a child is compiled standalone) if (ignore_parent) - return 0; + return nullptr; // if parent_buffer is not loaded, then it has been unloaded, // which means that parent_buffer is an invalid pointer. So we // set it to null in that case. @@ -349,7 +381,7 @@ public: // they will always be regarded as unloaded. in that case, we hope // for the best. if (!cloned_buffer_ && !theBufferList().isLoaded(parent_buffer)) - parent_buffer = 0; + parent_buffer = nullptr; return parent_buffer; } @@ -366,14 +398,6 @@ public: parent_buffer->invalidateBibinfoCache(); } - /// If non zero, this buffer is a clone of existing buffer \p cloned_buffer_ - /// This one is useful for preview detached in a thread. - Buffer const * cloned_buffer_; - /// - 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 @@ -390,28 +414,17 @@ public: + (with_blanks ? blank_count_ : 0); } - // does the buffer contain tracked changes? (if so, we automatically - // display the review toolbar, for instance) - mutable bool tracked_changes_present_; - // Make sure the file monitor monitors the good file. void refreshFileMonitor(); /// Notify or clear of external modification void fileExternallyModified(bool exists); - /// has been externally modified? Can be reset by the user. - mutable bool externally_modified_; - -private: - /// So we can force access via the accessors. - mutable Buffer const * parent_buffer; - - int word_count_; - int char_count_; - int blank_count_; - - FileMonitorPtr file_monitor_; + ///Binding LaTeX lines with buffer positions. + //Common routine for LaTeX and Reference errors listing. + void traverseErrors(TeXErrors::Errors::const_iterator err, + TeXErrors::Errors::const_iterator end, + ErrorList & errorList) const; }; @@ -444,21 +457,26 @@ static FileName createBufferTmpDir() Buffer::Impl::Impl(Buffer * owner, FileName const & file, bool readonly_, Buffer const * cloned_buffer) - : owner_(owner), lyx_clean(true), bak_clean(true), unnamed(false), - internal_buffer(false), read_only(readonly_), filename(file), - file_fully_loaded(false), file_format(LYX_FORMAT), need_format_backup(false), - ignore_parent(false), toc_backend(owner), macro_lock(false), - checksum_(0), wa_(0), gui_(0), undo_(*owner), bibinfo_cache_valid_(false), - cite_labels_valid_(false), have_bibitems_(false), preview_error_(false), - inset(0), preview_loader_(0), cloned_buffer_(cloned_buffer), - clone_list_(0), doing_export(false), - tracked_changes_present_(0), externally_modified_(false), parent_buffer(0), + : owner_(owner), filename(file), toc_backend(owner), checksum_(0), + wa_(nullptr), gui_(nullptr), undo_(*owner), inset(nullptr), + preview_loader_(nullptr), cloned_buffer_(cloned_buffer), + clone_list_(nullptr), parent_buffer(nullptr), file_format(LYX_FORMAT), + doing_export(false), require_fresh_start_(false), cite_labels_valid_(false), + have_bibitems_(false), lyx_clean(true), bak_clean(true), unnamed(false), + internal_buffer(false), read_only(readonly_), file_fully_loaded(false), + need_format_backup(false), ignore_parent(false), macro_lock(false), + externally_modified_(false), bibinfo_cache_valid_(false), word_count_(0), char_count_(0), blank_count_(0) { refreshFileMonitor(); if (!cloned_buffer_) { temppath = createBufferTmpDir(); lyxvc.setBuffer(owner_); + Language const * inplang = theApp() ? + languages.getFromCode(theApp()->inputLanguageCode()) + : nullptr; + if (inplang) + params.language = inplang; if (use_gui) wa_ = new frontend::WorkAreaManager; return; @@ -477,8 +495,7 @@ Buffer::Impl::Impl(Buffer * owner, FileName const & file, bool readonly_, layout_position = cloned_buffer_->d->layout_position; preview_file_ = cloned_buffer_->d->preview_file_; preview_format_ = cloned_buffer_->d->preview_format_; - preview_error_ = cloned_buffer_->d->preview_error_; - tracked_changes_present_ = cloned_buffer_->d->tracked_changes_present_; + require_fresh_start_ = cloned_buffer_->d->require_fresh_start_; } @@ -508,7 +525,7 @@ Buffer::~Buffer() // saved properly, before it goes into the void. // GuiView already destroyed - d->gui_ = 0; + d->gui_ = nullptr; if (isInternal()) { // No need to do additional cleanups for internal buffer. @@ -523,8 +540,8 @@ Buffer::~Buffer() // loop over children for (auto const & p : d->children_positions) { Buffer * child = const_cast(p.first); - if (d->clone_list_->erase(child)) - delete child; + if (d->clone_list_->erase(child)) + delete child; } // if we're the master buffer, then we should get rid of the list // of clones @@ -533,14 +550,15 @@ Buffer::~Buffer() // children still has a reference to this list. But we will try to // continue, rather than shut down. LATTEST(d->clone_list_->empty()); - list::iterator it = + // The clone list itself is empty, but it's still referenced in our list + // of clones. So let's find it and remove it. + CloneStore::iterator it = find(cloned_buffers.begin(), cloned_buffers.end(), d->clone_list_); if (it == cloned_buffers.end()) { // We will leak in this case, but it is safe to continue. LATTEST(false); } else cloned_buffers.erase(it); - delete d->clone_list_; } // FIXME Do we really need to do this right before we delete d? // clear references to children in macro tables @@ -552,7 +570,7 @@ Buffer::~Buffer() Buffer * child = const_cast(p.first); if (theBufferList().isLoaded(child)) { if (theBufferList().isOthersChild(this, child)) - child->setParent(0); + child->setParent(nullptr); else theBufferList().release(child); } @@ -587,21 +605,21 @@ Buffer::~Buffer() Buffer * Buffer::cloneWithChildren() const { BufferMap bufmap; - cloned_buffers.push_back(new CloneList); - CloneList * clones = cloned_buffers.back(); + cloned_buffers.emplace_back(new CloneList); + CloneList_ptr clones = cloned_buffers.back(); cloneWithChildren(bufmap, clones); // make sure we got cloned BufferMap::const_iterator bit = bufmap.find(this); - LASSERT(bit != bufmap.end(), return 0); + LASSERT(bit != bufmap.end(), return nullptr); Buffer * cloned_buffer = bit->second; return cloned_buffer; } -void Buffer::cloneWithChildren(BufferMap & bufmap, CloneList * clones) const +void Buffer::cloneWithChildren(BufferMap & bufmap, CloneList_ptr clones) const { // have we already been cloned? if (bufmap.find(this) != bufmap.end()) @@ -651,8 +669,8 @@ void Buffer::cloneWithChildren(BufferMap & bufmap, CloneList * clones) const Buffer * Buffer::cloneBufferOnly() const { - cloned_buffers.push_back(new CloneList); - CloneList * clones = cloned_buffers.back(); + cloned_buffers.emplace_back(new CloneList); + CloneList_ptr clones = cloned_buffers.back(); Buffer * buffer_clone = new Buffer(fileName().absFileName(), false, this); // The clone needs its own DocumentClass, since running updateBuffer() will @@ -920,6 +938,9 @@ int Buffer::readHeader(Lexer & lex) params().headsep.erase(); params().footskip.erase(); params().columnsep.erase(); + params().font_roman_opts.erase(); + params().font_sans_opts.erase(); + params().font_typewriter_opts.erase(); params().fonts_cjk.erase(); params().listings_params.clear(); params().clearLayoutModules(); @@ -943,6 +964,7 @@ int Buffer::readHeader(Lexer & lex) params().biblatex_bibstyle.erase(); params().biblatex_citestyle.erase(); params().multibib.erase(); + params().lineno_opts.clear(); for (int i = 0; i < 4; ++i) { params().user_defined_bullet(i) = ITEMIZE_DEFAULTS[i]; @@ -1017,20 +1039,13 @@ bool Buffer::readDocument(Lexer & lex) readHeader(lex); if (params().output_changes) { - bool dvipost = LaTeXFeatures::isAvailable("dvipost"); bool xcolorulem = LaTeXFeatures::isAvailable("ulem") && LaTeXFeatures::isAvailable("xcolor"); - if (!dvipost && !xcolorulem) { + if (!xcolorulem) { Alert::warning(_("Changes not shown in LaTeX output"), _("Changes will not be highlighted in LaTeX output, " - "because neither dvipost nor xcolor/ulem are installed.\n" - "Please install these packages or redefine " - "\\lyxadded and \\lyxdeleted in the LaTeX preamble.")); - } else if (!xcolorulem) { - Alert::warning(_("Changes not shown in LaTeX output"), - _("Changes will not be highlighted in LaTeX output " - "when using pdflatex, because xcolor and ulem are not installed.\n" + "because xcolor and ulem are not installed.\n" "Please install both packages or redefine " "\\lyxadded and \\lyxdeleted in the LaTeX preamble.")); } @@ -1129,7 +1144,7 @@ bool Buffer::importFile(string const & format, FileName const & name, ErrorList FileName const lyx = tempFileName("Buffer_importFileXXXXXX.lyx"); Converters::RetVal const retval = - theConverters().convert(0, name, lyx, name, format, "lyx", errorList); + theConverters().convert(nullptr, name, lyx, name, format, "lyx", errorList); if (retval == Converters::SUCCESS) { bool const success = readFile(lyx) == ReadSuccess; removeTempFile(lyx); @@ -1230,16 +1245,21 @@ void Buffer::setFullyLoaded(bool value) } -bool Buffer::lastPreviewError() const +bool Buffer::freshStartRequired() const { - return d->preview_error_; + return d->require_fresh_start_; +} + +void Buffer::requireFreshStart(bool const b) const +{ + d->require_fresh_start_ = b; } PreviewLoader * Buffer::loader() const { if (!isExporting() && lyxrc.preview == LyXRC::PREVIEW_OFF) - return 0; + return nullptr; if (!d->preview_loader_) d->preview_loader_ = new PreviewLoader(*this); return d->preview_loader_; @@ -1249,7 +1269,7 @@ PreviewLoader * Buffer::loader() const void Buffer::removePreviews() const { delete d->preview_loader_; - d->preview_loader_ = 0; + d->preview_loader_ = nullptr; } @@ -1924,8 +1944,15 @@ Buffer::ExportStatus Buffer::writeLaTeXSource(otexstream & os, os << "\\catcode`\\%=11" "\\def\\%{%}\\catcode`\\%=14\n"; } - bool const detokenize = !isAscii(from_utf8(docdir)); + if (contains(docdir, '~')) + docdir = subst(docdir, "~", "\\string~"); + bool const nonascii = !isAscii(from_utf8(docdir)); + // LaTeX 2019/10/01 handles non-ascii path without detokenize + bool const utfpathlatex = features.isAvailable("LaTeX-2019/10/01"); + bool const detokenize = !utfpathlatex && nonascii; bool const quote = contains(docdir, ' '); + if (utfpathlatex && nonascii) + os << "\\UseRawInputEncoding\n"; os << "\\makeatletter\n" << "\\def\\input@path{{"; if (detokenize) @@ -1951,6 +1978,9 @@ Buffer::ExportStatus Buffer::writeLaTeXSource(otexstream & os, runparams.use_babel = params().writeLaTeX(os, features, d->filename.onlyPath()); + // Active characters + runparams.active_chars = features.getActiveChars(); + // Biblatex bibliographies are loaded here if (params().useBiblatex()) { vector> const bibfiles = @@ -2484,7 +2514,7 @@ FileName Buffer::getBibfilePath(docstring const & bibid) const // locally file = findtexfile(texfile, "bib", true); if (file.empty()) - file = FileName(makeAbsPath(texfile, filePath())); + file = local_file; } LYXERR(Debug::FILES, "Found at: " << file); @@ -2586,7 +2616,7 @@ void Buffer::collectBibKeys(FileNameList & checkedFiles) const for (InsetIterator it = inset_iterator_begin(inset()); it; ++it) { it->collectBibKeys(it, checkedFiles); if (it->lyxCode() == BIBITEM_CODE) { - if (parent() != 0) + if (parent() != nullptr) parent()->d->have_bibitems_ = true; else d->have_bibitems_ = true; @@ -2603,7 +2633,7 @@ void Buffer::addBiblioInfo(BiblioInfo const & bin) const BiblioInfo & bi = d->bibinfo_; bi.mergeBiblioInfo(bin); - if (parent() != 0) { + if (parent() != nullptr) { BiblioInfo & masterbi = parent()->d->bibinfo_; masterbi.mergeBiblioInfo(bin); } @@ -2618,7 +2648,7 @@ void Buffer::addBibTeXInfo(docstring const & key, BibTeXInfo const & bin) const BiblioInfo & bi = d->bibinfo_; bi[key] = bin; - if (parent() != 0) { + if (parent() != nullptr) { BiblioInfo & masterbi = masterBuffer()->d->bibinfo_; masterbi[key] = bin; } @@ -3002,8 +3032,6 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr) if (params().save_transient_properties) undo().recordUndoBufferParams(CursorData()); params().track_changes = !params().track_changes; - if (!params().track_changes) - dr.forceChangesUpdate(); break; case LFUN_CHANGES_OUTPUT: @@ -3011,20 +3039,13 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr) undo().recordUndoBufferParams(CursorData()); params().output_changes = !params().output_changes; if (params().output_changes) { - bool dvipost = LaTeXFeatures::isAvailable("dvipost"); bool xcolorulem = LaTeXFeatures::isAvailable("ulem") && LaTeXFeatures::isAvailable("xcolor"); - if (!dvipost && !xcolorulem) { + if (!xcolorulem) { Alert::warning(_("Changes not shown in LaTeX output"), _("Changes will not be highlighted in LaTeX output, " - "because neither dvipost nor xcolor/ulem are installed.\n" - "Please install these packages or redefine " - "\\lyxadded and \\lyxdeleted in the LaTeX preamble.")); - } else if (!xcolorulem) { - Alert::warning(_("Changes not shown in LaTeX output"), - _("Changes will not be highlighted in LaTeX output " - "when using pdflatex, because xcolor and ulem are not installed.\n" + "because xcolor and ulem are not installed.\n" "Please install both packages or redefine " "\\lyxadded and \\lyxdeleted in the LaTeX preamble.")); } @@ -3099,7 +3120,7 @@ void Buffer::getLanguages(std::set & langs) const for (ParConstIterator it = par_iterator_begin(); it != end; ++it) it->getLanguages(langs); // also children - ListOfBuffers clist = getDescendents(); + ListOfBuffers clist = getDescendants(); for (auto const & cit : clist) cit->getLanguages(langs); } @@ -3455,7 +3476,7 @@ bool Buffer::isReadonly() const void Buffer::setParent(Buffer const * buffer) { // Avoids recursive include. - d->setParent(buffer == this ? 0 : buffer); + d->setParent(buffer == this ? nullptr : buffer); updateMacros(); } @@ -3468,7 +3489,7 @@ Buffer const * Buffer::parent() const ListOfBuffers Buffer::allRelatives() const { - ListOfBuffers lb = masterBuffer()->getDescendents(); + ListOfBuffers lb = masterBuffer()->getDescendants(); lb.push_front(const_cast(masterBuffer())); return lb; } @@ -3539,7 +3560,7 @@ ListOfBuffers Buffer::getChildren() const } -ListOfBuffers Buffer::getDescendents() const +ListOfBuffers Buffer::getDescendants() const { ListOfBuffers v; collectChildren(v, true); @@ -3563,7 +3584,7 @@ typename M::const_iterator greatest_below(M & m, typename M::key_type const & x) if (it == m.begin()) return m.end(); - it--; + --it; return it; } @@ -3575,11 +3596,11 @@ MacroData const * Buffer::Impl::getBufferMacro(docstring const & name, // if paragraphs have no macro context set, pos will be empty if (pos.empty()) - return 0; + return nullptr; // we haven't found anything yet DocIterator bestPos = owner_->par_iterator_begin(); - MacroData const * bestData = 0; + MacroData const * bestData = nullptr; // find macro definitions for name NamePositionScopeMacroMap::const_iterator nameIt = macros.find(name); @@ -3650,11 +3671,11 @@ MacroData const * Buffer::getMacro(docstring const & name, DocIterator const & pos, bool global) const { if (d->macro_lock) - return 0; + return nullptr; // query buffer macros MacroData const * data = d->getBufferMacro(name, pos); - if (data != 0) + if (data != nullptr) return data; // If there is a master buffer, query that @@ -3670,11 +3691,11 @@ MacroData const * Buffer::getMacro(docstring const & name, if (global) { data = MacroTable::globalMacros().get(name); - if (data != 0) + if (data != nullptr) return data; } - return 0; + return nullptr; } @@ -3694,7 +3715,7 @@ MacroData const * Buffer::getMacro(docstring const & name, // look where the child buffer is included first Impl::BufferPositionMap::iterator it = d->children_positions.find(&child); if (it == d->children_positions.end()) - return 0; + return nullptr; // check for macros at the inclusion position return getMacro(name, it->second, global); @@ -3872,7 +3893,7 @@ void Buffer::updateMacroInstances(UpdateType utype) const MacroContext mc = MacroContext(this, it); for (DocIterator::idx_type i = 0; i < n; ++i) { MathData & data = minset->cell(i); - data.updateMacros(0, mc, utype, 0); + data.updateMacros(nullptr, mc, utype, 0); } } } @@ -4015,14 +4036,17 @@ void Buffer::changeRefsIfUnique(docstring const & from, docstring const & to) return; string const paramName = "key"; + UndoGroupHelper ugh(this); InsetIterator it = inset_iterator_begin(inset()); for (; it; ++it) { if (it->lyxCode() != CITE_CODE) continue; InsetCommand * inset = it->asInsetCommand(); docstring const oldValue = inset->getParam(paramName); - if (oldValue == from) + if (oldValue == from) { + undo().recordUndo(CursorData(it)); inset->setParam(paramName, to); + } } } @@ -4211,91 +4235,6 @@ void Buffer::setGuiDelegate(frontend::GuiBufferDelegate * gui) } - -namespace { - -class AutoSaveBuffer : public ForkedProcess { -public: - /// - AutoSaveBuffer(Buffer const & buffer, FileName const & fname) - : buffer_(buffer), fname_(fname) {} - /// - virtual shared_ptr clone() const - { - return make_shared(*this); - } - /// - int start() - { - command_ = to_utf8(bformat(_("Auto-saving %1$s"), - from_utf8(fname_.absFileName()))); - return run(DontWait); - } -private: - /// - virtual int generateChild(); - /// - Buffer const & buffer_; - FileName fname_; -}; - - -int AutoSaveBuffer::generateChild() -{ -#if defined(__APPLE__) - /* FIXME fork() is not usable for autosave on Mac OS X 10.6 (snow leopard) - * We should use something else like threads. - * - * Since I do not know how to determine at run time what is the OS X - * version, I just disable forking altogether for now (JMarc) - */ - pid_t const pid = -1; -#else - // tmp_ret will be located (usually) in /tmp - // will that be a problem? - // Note that this calls ForkedCalls::fork(), so it's - // ok cross-platform. - pid_t const pid = fork(); - // If you want to debug the autosave - // you should set pid to -1, and comment out the fork. - if (pid != 0 && pid != -1) - return pid; -#endif - - // pid = -1 signifies that lyx was unable - // to fork. But we will do the save - // anyway. - bool failed = false; - TempFile tempfile("lyxautoXXXXXX.lyx"); - tempfile.setAutoRemove(false); - FileName const tmp_ret = tempfile.name(); - if (!tmp_ret.empty()) { - if (!buffer_.writeFile(tmp_ret)) - failed = true; - else if (!tmp_ret.moveTo(fname_)) - failed = true; - } else - failed = true; - - if (failed) { - // failed to write/rename tmp_ret so try writing direct - if (!buffer_.writeFile(fname_)) { - // It is dangerous to do this in the child, - // but safe in the parent, so... - if (pid == -1) // emit message signal. - buffer_.message(_("Autosave failed!")); - } - } - - if (pid == 0) // we are the child so... - _exit(0); - - return pid; -} - -} // namespace - - FileName Buffer::getEmergencyFileName() const { return FileName(d->filename.absFileName() + ".emergency"); @@ -4369,7 +4308,7 @@ bool Buffer::autoSave() const void Buffer::setExportStatus(bool e) const { d->doing_export = e; - ListOfBuffers clist = getDescendents(); + ListOfBuffers clist = getDescendants(); for (auto const & bit : clist) bit->d->doing_export = e; } @@ -4471,9 +4410,7 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir if (format == "pdf4") s += "\n" + bformat(_("Hint: use non-TeX fonts or set input encoding " - " to '%1$s' or '%2$s'"), - from_utf8(encodings.fromLyXName("utf8")->guiName()), - from_utf8(encodings.fromLyXName("ascii")->guiName())); + " to '%1$s'"), from_utf8(encodings.fromLyXName("ascii")->guiName())); Alert::error(_("Couldn't export file"), s); } return ExportNoPathToFormat; @@ -4582,7 +4519,7 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir else errors(error_type); // also to the children, in case of master-buffer-view - ListOfBuffers clist = getDescendents(); + ListOfBuffers clist = getDescendants(); for (auto const & bit : clist) { if (runparams.silent) bit->d->errorLists[error_type].clear(); @@ -4620,7 +4557,7 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir result_file = dest_filename; // We need to copy referenced files (e. g. included graphics // if format == "dvi") to the result dir. - vector const files = + vector const extfiles = runparams.exportdata->externalFiles(format); string const dest = runparams.export_folder.empty() ? onlyPath(result_file) : runparams.export_folder; @@ -4628,7 +4565,7 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir : force_overwrite == ALL_FILES; CopyStatus status = use_force ? FORCE : SUCCESS; - for (ExportedFile const & exp : files) { + for (ExportedFile const & exp : extfiles) { if (status == CANCEL) { message(_("Document export cancelled.")); return ExportCancel; @@ -4704,7 +4641,7 @@ Buffer::ExportStatus Buffer::preview(string const & format, bool includeall) con Impl * theimpl = isClone() ? d->cloned_buffer_->d : d; theimpl->preview_file_ = previewFile; theimpl->preview_format_ = format; - theimpl->preview_error_ = (status != ExportSuccess); + theimpl->require_fresh_start_ = (status != ExportSuccess); if (status != ExportSuccess) return status; @@ -4896,26 +4833,26 @@ Buffer::ReadStatus Buffer::loadThisLyXFile(FileName const & fn) } -void Buffer::bufferErrors(TeXErrors const & terr, ErrorList & errorList) const +void Buffer::Impl::traverseErrors(TeXErrors::Errors::const_iterator err, TeXErrors::Errors::const_iterator end, ErrorList & errorList) const { - for (auto const & err : terr) { + for (; err != end; ++err) { TexRow::TextEntry start = TexRow::text_none, end = TexRow::text_none; - int errorRow = err.error_in_line; - Buffer const * buf = 0; - Impl const * p = d; - if (err.child_name.empty()) + int errorRow = err->error_in_line; + Buffer const * buf = nullptr; + Impl const * p = this; + if (err->child_name.empty()) tie(start, end) = p->texrow.getEntriesFromRow(errorRow); else { // The error occurred in a child - for (Buffer const * child : getDescendents()) { + for (Buffer const * child : owner_->getDescendants()) { string const child_name = DocFileName(changeExtension(child->absFileName(), "tex")). mangledFileName(); - if (err.child_name != child_name) + if (err->child_name != child_name) continue; tie(start, end) = child->d->texrow.getEntriesFromRow(errorRow); if (!TexRow::isNone(start)) { - buf = d->cloned_buffer_ + buf = this->cloned_buffer_ ? child->d->cloned_buffer_->d->owner_ : child->d->owner_; p = child->d; @@ -4923,12 +4860,30 @@ void Buffer::bufferErrors(TeXErrors const & terr, ErrorList & errorList) const } } } - errorList.push_back(ErrorItem(err.error_desc, err.error_text, + errorList.push_back(ErrorItem(err->error_desc, err->error_text, start, end, buf)); } } +void Buffer::bufferErrors(TeXErrors const & terr, ErrorList & errorList) const +{ + TeXErrors::Errors::const_iterator err = terr.begin(); + TeXErrors::Errors::const_iterator end = terr.end(); + + d->traverseErrors(err, end, errorList); +} + + +void Buffer::bufferRefs(TeXErrors const & terr, ErrorList & errorList) const +{ + TeXErrors::Errors::const_iterator err = terr.begin_ref(); + TeXErrors::Errors::const_iterator end = terr.end_ref(); + + d->traverseErrors(err, end, errorList); +} + + void Buffer::updateBuffer(UpdateScope scope, UpdateType utype) const { LBUFERR(!text().paragraphs().empty()); @@ -4985,7 +4940,6 @@ void Buffer::updateBuffer(UpdateScope scope, UpdateType utype) const // update all caches clearReferenceCache(); updateMacros(); - setChangesPresent(false); Buffer & cbuf = const_cast(*this); // if we are reloading, then we could have a dangling TOC, @@ -5026,7 +4980,6 @@ void Buffer::updateBuffer(UpdateScope scope, UpdateType utype) const clearReferenceCache(); // we should not need to do this again? // updateMacros(); - setChangesPresent(false); updateBuffer(parit, utype); // this will already have been done by reloadBibInfoCache(); // d->bibinfo_cache_valid_ = true; @@ -5282,6 +5235,7 @@ void Buffer::updateBuffer(ParIterator & parit, UpdateType utype) const depth_type maxdepth = 0; pit_type const lastpit = parit.lastpit(); + bool changed = false; for ( ; parit.pit() <= lastpit ; ++parit.pit()) { // reduce depth if necessary if (parit->params().depth() > maxdepth) { @@ -5308,15 +5262,20 @@ void Buffer::updateBuffer(ParIterator & parit, UpdateType utype) const // set the counter for this paragraph d->setLabel(parit, utype); - // update change-tracking flag - parit->addChangesToBuffer(*this); - // now the insets for (auto const & insit : parit->insetList()) { parit.pos() = insit.pos; insit.inset->updateBuffer(parit, utype); + changed |= insit.inset->isChanged(); } + + // are there changes in this paragraph? + changed |= parit->isChanged(); } + + // set change indicator for the inset (or the cell that the iterator + // points to, if applicable). + parit.text()->inset().isChanged(changed); } @@ -5429,6 +5388,12 @@ int Buffer::charCount(bool with_blanks) const } +bool Buffer::areChangesPresent() const +{ + return inset().isChanged(); +} + + Buffer::ReadStatus Buffer::reload() { setBusy(true); @@ -5439,7 +5404,7 @@ Buffer::ReadStatus Buffer::reload() docstring const disp_fn = makeDisplayPath(d->filename.absFileName()); // clear parent. this will get reset if need be. - d->setParent(0); + d->setParent(nullptr); ReadStatus const status = loadLyXFile(); if (status == ReadSuccess) { updateBuffer(); @@ -5513,8 +5478,8 @@ void Buffer::checkChildBuffers() if (oldloc == newloc) continue; // the location of the child file is incorrect. - cbuf->setParent(0); - inset_inc->setChildBuffer(0); + cbuf->setParent(nullptr); + inset_inc->setChildBuffer(nullptr); } // invalidate cache of children d->children_positions.clear(); @@ -5539,7 +5504,7 @@ void Buffer::checkMasterBuffer() if (master->isChild(this)) setParent(master); else - setParent(0); + setParent(nullptr); } @@ -5572,29 +5537,6 @@ string Buffer::includedFilePath(string const & name, string const & ext) const } -void Buffer::setChangesPresent(bool b) const -{ - d->tracked_changes_present_ = b; -} - - -bool Buffer::areChangesPresent() const -{ - return d->tracked_changes_present_; -} - - -void Buffer::updateChangesPresent() const -{ - LYXERR(Debug::CHANGES, "Buffer::updateChangesPresent"); - setChangesPresent(false); - ParConstIterator it = par_iterator_begin(); - ParConstIterator const end = par_iterator_end(); - for (; !areChangesPresent() && it != end; ++it) - it->addChangesToBuffer(*this); -} - - void Buffer::Impl::refreshFileMonitor() { if (file_monitor_ && file_monitor_->filename() == filename.absFileName()) {