X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBuffer.cpp;h=ec11ac2c88b3ca433b9d3d04495dec41b4cfc863;hb=b536759c0769dab641993347baeb62400455be04;hp=8ca74103a232a48705cd0814cdb14ab1dba8a768;hpb=e6e3777363bfb4ab11ffe2c4e774e30eb639a4fe;p=lyx.git diff --git a/src/Buffer.cpp b/src/Buffer.cpp index 8ca74103a2..ec11ac2c88 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" @@ -135,13 +136,29 @@ namespace { int const LYX_FORMAT = LYX_FORMAT_LYX; typedef map DepClean; -typedef map > RefCache; -} // namespace +// Information about labels and their associated refs +struct LabelInfo { + /// label string + docstring label; + /// label inset + InsetLabel const * inset; + /// associated references cache + Buffer::References references; + /// whether this label is active (i.e., not deleted) + bool active; +}; + +typedef vector LabelCache; +typedef map RefCache; // A storehouse for the cloned buffers. -list cloned_buffers; +typedef list CloneStore; +CloneStore cloned_buffers; + +} // namespace + class Buffer::Impl @@ -184,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; @@ -234,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; @@ -279,7 +263,7 @@ public: /// A cache for the bibfiles (including bibfiles of loaded child /// documents), needed for appropriate update of natbib labels. - mutable FileNamePairList bibfiles_cache_; + mutable docstring_list bibfiles_cache_; // FIXME The caching mechanism could be improved. At present, we have a // cache for each Buffer, that caches all the bibliography info for that @@ -287,25 +271,19 @@ 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_; /// 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. mutable RefCache ref_cache_; + /// Cache the label insets and their activity status. + mutable LabelCache label_cache_; /// our Text that should be wrapped in an InsetText InsetText * inset; @@ -313,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 @@ -320,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. @@ -328,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; } @@ -345,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 @@ -369,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; }; @@ -423,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), 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; @@ -450,13 +489,13 @@ Buffer::Impl::Impl(Buffer * owner, FileName const & file, bool readonly_, bibinfo_cache_valid_ = cloned_buffer_->d->bibinfo_cache_valid_; bibfile_status_ = cloned_buffer_->d->bibfile_status_; cite_labels_valid_ = cloned_buffer_->d->cite_labels_valid_; + have_bibitems_ = cloned_buffer_->d->have_bibitems_; unnamed = cloned_buffer_->d->unnamed; internal_buffer = cloned_buffer_->d->internal_buffer; 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_; } @@ -486,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. @@ -501,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 @@ -511,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 @@ -530,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); } @@ -565,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()) @@ -629,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 @@ -790,10 +830,9 @@ FileName Buffer::Impl::exportFileName() const if (branch_suffix.empty()) return filename; - string const name = filename.onlyFileNameWithoutExt() - + to_utf8(branch_suffix); + string const name = addExtension(filename.onlyFileNameWithoutExt() + + to_utf8(branch_suffix), filename.extension()); FileName res(filename.onlyPath().absFileName() + "/" + name); - res.changeExtension(filename.extension()); return res; } @@ -899,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(); @@ -922,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]; @@ -996,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.")); } @@ -1108,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); @@ -1209,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_; @@ -1228,7 +1269,7 @@ PreviewLoader * Buffer::loader() const void Buffer::removePreviews() const { delete d->preview_loader_; - d->preview_loader_ = 0; + d->preview_loader_ = nullptr; } @@ -1443,6 +1484,9 @@ bool Buffer::save() const FileName savefile(tempfile->name()); LYXERR(Debug::FILES, "Saving to " << savefile.absFileName()); + if (!savefile.clonePermissions(fileName())) + LYXERR0("Failed to clone the permission from " << fileName().absFileName() << " to " << savefile.absFileName()); + if (!writeFile(savefile)) return false; @@ -1695,13 +1739,6 @@ Buffer::ExportStatus Buffer::makeLaTeXFile(FileName const & fname, { OutputParams runparams = runparams_in; - // XeTeX with TeX fonts is only safe with ASCII encoding (see also #9740), - // Check here, because the "flavor" is not known in BufferParams::encoding() - // (power users can override this safety measure selecting "utf8-plain"). - if (!params().useNonTeXFonts && (runparams.flavor == OutputParams::XETEX) - && (runparams.encoding->name() != "utf8-plain")) - runparams.encoding = encodings.fromLyXName("ascii"); - string const encoding = runparams.encoding->iconvName(); LYXERR(Debug::LATEX, "makeLaTeXFile encoding: " << encoding << ", fname=" << fname.realPath()); @@ -1709,9 +1746,11 @@ Buffer::ExportStatus Buffer::makeLaTeXFile(FileName const & fname, try { ofs.reset(encoding); } catch (iconv_codecvt_facet_exception const & e) { lyxerr << "Caught iconv exception: " << e.what() << endl; - Alert::error(_("Iconv software exception Detected"), bformat(_("Please " - "verify that the support software for your encoding (%1$s) is " - "properly installed"), from_ascii(encoding))); + Alert::error(_("Iconv software exception Detected"), + bformat(_("Please verify that the `iconv' support software is" + " properly installed and supports the selected encoding" + " (%1$s), or change the encoding in" + " Document>Settings>Language."), from_ascii(encoding))); return ExportError; } if (!openFileWrite(ofs, fname)) @@ -1799,16 +1838,6 @@ Buffer::ExportStatus Buffer::writeLaTeXSource(otexstream & os, OutputParams runparams = runparams_in; - // XeTeX with TeX fonts is only safe with ASCII encoding, - // Check here, because the "flavor" is not known in BufferParams::encoding() - // (power users can override this safety measure selecting "utf8-plain"). - if (!params().useNonTeXFonts && (runparams.flavor == OutputParams::XETEX) - && (runparams.encoding->name() != "utf8-plain")) - runparams.encoding = encodings.fromLyXName("ascii"); - // FIXME: when only the current paragraph is shown, this is ignored - // (or not reached) and characters encodable in the current - // encoding are not converted to ASCII-representation. - // Some macros rely on font encoding runparams.main_fontenc = params().main_font_encoding(); @@ -1827,8 +1856,10 @@ Buffer::ExportStatus Buffer::writeLaTeXSource(otexstream & os, LaTeXFeatures features(*this, params(), runparams); validate(features); // This is only set once per document (in master) - if (!runparams.is_child) + if (!runparams.is_child) { runparams.use_polyglossia = features.usePolyglossia(); + runparams.use_CJK = features.mustProvide("CJK"); + } LYXERR(Debug::LATEX, " Buffer validation done."); bool const output_preamble = @@ -1913,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) @@ -1940,12 +1978,19 @@ 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 = + vector> const bibfiles = prepareBibFilePaths(runparams, getBibfiles(), true); - for (docstring const & file: bibfiles) - os << "\\addbibresource{" << file << "}\n"; + for (pair const & file: bibfiles) { + os << "\\addbibresource"; + if (!file.second.empty()) + os << "[bibencoding=" << file.second << "]"; + os << "{" << file.first << "}\n"; + } } if (!runparams.dryrun && features.hasPolyglossiaExclusiveLanguages() @@ -2216,10 +2261,6 @@ Buffer::ExportStatus Buffer::writeLyXHTMLSource(odocstream & os, if (!styles.empty()) os << "\n\n" << styles << '\n'; - styles = features.getPreambleSnippets().str; - if (!styles.empty()) - os << "\n\n" << styles << '\n'; - // we will collect CSS information in a stream, and then output it // either here, as part of the header, or else in a separate file. odocstringstream css; @@ -2394,13 +2435,20 @@ void Buffer::invalidateBibinfoCache() const } -FileNamePairList const & Buffer::getBibfiles(UpdateScope scope) const +docstring_list const & Buffer::getBibfiles(UpdateScope scope) const { // FIXME This is probably unnecessary, given where we call this. // If this is a child document, use the master instead. Buffer const * const pbuf = masterBuffer(); if (pbuf != this && scope != UpdateChildOnly) return pbuf->getBibfiles(); + + // In 2.3.x, we have: + //if (!d->bibfile_cache_valid_) + // this->updateBibfilesCache(scope); + // I think that is a leftover, but there have been so many back- + // and-forths with this, due to Windows issues, that I am not sure. + return d->bibfiles_cache_; } @@ -2420,7 +2468,7 @@ BiblioInfo const & Buffer::bibInfo() const } -void Buffer::registerBibfiles(FileNamePairList const & bf) const +void Buffer::registerBibfiles(const docstring_list & bf) const { // We register the bib files in the master buffer, // if there is one, but also in every single buffer, @@ -2430,7 +2478,7 @@ void Buffer::registerBibfiles(FileNamePairList const & bf) const tmp->registerBibfiles(bf); for (auto const & p : bf) { - FileNamePairList::const_iterator temp = + docstring_list::const_iterator temp = find(d->bibfiles_cache_.begin(), d->bibfiles_cache_.end(), p); if (temp == d->bibfiles_cache_.end()) d->bibfiles_cache_.push_back(p); @@ -2438,6 +2486,39 @@ void Buffer::registerBibfiles(FileNamePairList const & bf) const } +static map bibfileCache; + +FileName Buffer::getBibfilePath(docstring const & bibid) const +{ + map::const_iterator it = + bibfileCache.find(bibid); + if (it != bibfileCache.end()) { + // i.e., return bibfileCache[bibid]; + return it->second; + } + + LYXERR(Debug::FILES, "Reading file location for " << bibid); + string const texfile = changeExtension(to_utf8(bibid), "bib"); + // we need to check first if this file exists where it's said to be. + // there's a weird bug that occurs otherwise: if the file is in the + // Buffer's directory but has the same name as some file that would be + // found by kpsewhich, then we find the latter, not the former. + FileName const local_file = makeAbsPath(texfile, filePath()); + FileName file = local_file; + if (!file.exists()) { + // there's no need now to check whether the file can be found + // locally + file = findtexfile(texfile, "bib", true); + if (file.empty()) + file = local_file; + } + LYXERR(Debug::FILES, "Found at: " << file); + + bibfileCache[bibid] = file; + return bibfileCache[bibid]; +} + + void Buffer::checkIfBibInfoCacheIsValid() const { // use the master's cache @@ -2447,17 +2528,35 @@ void Buffer::checkIfBibInfoCacheIsValid() const return; } - // if we already know the cache is invalid, no need to check - // the timestamps + // If we already know the cache is invalid, stop here. + // This is important in the case when the bibliography + // environment (rather than Bib[la]TeX) is used. + // In that case, the timestamp check below gives no + // sensible result. Rather than that, the cache will + // be invalidated explicitly via invalidateBibInfoCache() + // by the Bibitem inset. + // Same applies for bib encoding changes, which trigger + // invalidateBibInfoCache() by InsetBibtex. if (!d->bibinfo_cache_valid_) return; + if (d->have_bibitems_) { + // We have a bibliography environment. + // Invalidate the bibinfo cache unconditionally. + // Cite labels will get invalidated by the inset if needed. + d->bibinfo_cache_valid_ = false; + return; + } + + // OK. This is with Bib(la)tex. We'll assume the cache + // is valid and change this if we find changes in the bibs. + d->bibinfo_cache_valid_ = true; + d->cite_labels_valid_ = true; + // compare the cached timestamps with the actual ones. - FileNamePairList const & bibfiles_cache = getBibfiles(); - FileNamePairList::const_iterator ei = bibfiles_cache.begin(); - FileNamePairList::const_iterator en = bibfiles_cache.end(); - for (; ei != en; ++ ei) { - FileName const fn = ei->second; + docstring_list const & bibfiles_cache = getBibfiles(); + for (auto const & bf : bibfiles_cache) { + FileName const fn = getBibfilePath(bf); time_t lastw = fn.lastModified(); time_t prevw = d->bibfile_status_[fn]; if (lastw != prevw) { @@ -2469,8 +2568,18 @@ void Buffer::checkIfBibInfoCacheIsValid() const } +void Buffer::clearBibFileCache() const +{ + bibfileCache.clear(); +} + + void Buffer::reloadBibInfoCache(bool const force) const { + // we should not need to do this for internal buffers + if (isInternal()) + return; + // use the master's cache Buffer const * const tmp = masterBuffer(); if (tmp != this) { @@ -2478,12 +2587,21 @@ void Buffer::reloadBibInfoCache(bool const force) const return; } - checkIfBibInfoCacheIsValid(); - if (d->bibinfo_cache_valid_ && !force) - return; + if (!force) { + checkIfBibInfoCacheIsValid(); + if (d->bibinfo_cache_valid_) + return; + } + LYXERR(Debug::FILES, "Bibinfo cache was invalid."); + // re-read file locations when this info changes + // FIXME Is this sufficient? Or should we also force that + // in some other cases? If so, then it is easy enough to + // add the following line in some other places. + clearBibFileCache(); d->bibinfo_.clear(); FileNameList checkedFiles; + d->have_bibitems_ = false; collectBibKeys(checkedFiles); d->bibinfo_cache_valid_ = true; } @@ -2491,8 +2609,15 @@ void Buffer::reloadBibInfoCache(bool const force) const void Buffer::collectBibKeys(FileNameList & checkedFiles) const { - for (InsetIterator it = inset_iterator_begin(inset()); it; ++it) + for (InsetIterator it = inset_iterator_begin(inset()); it; ++it) { it->collectBibKeys(it, checkedFiles); + if (it->lyxCode() == BIBITEM_CODE) { + if (parent() != nullptr) + parent()->d->have_bibitems_ = true; + else + d->have_bibitems_ = true; + } + } } @@ -2504,7 +2629,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); } @@ -2519,8 +2644,8 @@ void Buffer::addBibTeXInfo(docstring const & key, BibTeXInfo const & bin) const BiblioInfo & bi = d->bibinfo_; bi[key] = bin; - if (parent() != 0) { - BiblioInfo & masterbi = parent()->d->bibinfo_; + if (parent() != nullptr) { + BiblioInfo & masterbi = masterBuffer()->d->bibinfo_; masterbi[key] = bin; } } @@ -2903,8 +3028,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: @@ -2912,20 +3035,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.")); } @@ -2949,6 +3065,7 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr) for ( ; cur ; cur.forwardPar()) cur.paragraph().anonymize(); dr.forceBufferUpdate(); + dr.screenUpdate(Update::Force); break; } @@ -2999,7 +3116,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); } @@ -3056,7 +3173,7 @@ Language const * Buffer::language() const } -docstring const Buffer::B_(string const & l10n) const +docstring Buffer::B_(string const & l10n) const { return params().B_(l10n); } @@ -3196,8 +3313,8 @@ string const Buffer::prepareFileNameForLaTeX(string const & name, } -vector const Buffer::prepareBibFilePaths(OutputParams const & runparams, - FileNamePairList const bibfilelist, +vector> const Buffer::prepareBibFilePaths(OutputParams const & runparams, + docstring_list const & bibfilelist, bool const add_extension) const { // If we are processing the LaTeX file in a temp directory then @@ -3210,7 +3327,7 @@ vector const Buffer::prepareBibFilePaths(OutputParams const & runpara // Otherwise, store the (maybe absolute) path to the original, // unmangled database name. - vector res; + vector> res; // determine the export format string const tex_format = flavor2format(runparams.flavor); @@ -3219,7 +3336,7 @@ vector const Buffer::prepareBibFilePaths(OutputParams const & runpara bool found_space = false; for (auto const & bit : bibfilelist) { - string utf8input = to_utf8(bit.first); + string utf8input = to_utf8(bit); string database = prepareFileNameForLaTeX(utf8input, ".bib", runparams.nice); FileName try_in_file = @@ -3228,7 +3345,7 @@ vector const Buffer::prepareBibFilePaths(OutputParams const & runpara // If the file has not been found, try with the real file name // (it might come from a child in a sub-directory) if (!not_from_texmf) { - try_in_file = bit.second; + try_in_file = getBibfilePath(bit); if (try_in_file.isReadableFile()) { // Check if the file is in texmf FileName kpsefile(findtexfile(changeExtension(utf8input, "bib"), "bib", true)); @@ -3282,9 +3399,20 @@ vector const Buffer::prepareBibFilePaths(OutputParams const & runpara if (contains(path, ' ')) found_space = true; + string enc; + if (params().useBiblatex() && !params().bibFileEncoding(utf8input).empty()) + enc = params().bibFileEncoding(utf8input); + + bool recorded = false; + for (auto const & pe : res) { + if (pe.first == path) { + recorded = true; + break; + } - if (find(res.begin(), res.end(), path) == res.end()) - res.push_back(path); + } + if (!recorded) + res.push_back(make_pair(path, enc)); } // Check if there are spaces in the path and warn BibTeX users, if so. @@ -3344,7 +3472,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(); } @@ -3357,7 +3485,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; } @@ -3428,7 +3556,7 @@ ListOfBuffers Buffer::getChildren() const } -ListOfBuffers Buffer::getDescendents() const +ListOfBuffers Buffer::getDescendants() const { ListOfBuffers v; collectChildren(v, true); @@ -3452,7 +3580,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; } @@ -3464,11 +3592,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); @@ -3539,11 +3667,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 @@ -3559,11 +3687,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; } @@ -3583,7 +3711,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); @@ -3761,7 +3889,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); } } } @@ -3828,13 +3956,12 @@ Buffer::References & Buffer::getReferenceCache(docstring const & label) RefCache::iterator it = d->ref_cache_.find(label); if (it != d->ref_cache_.end()) - return it->second.second; + return it->second; - static InsetLabel const * dummy_il = 0; static References const dummy_refs = References(); it = d->ref_cache_.insert( - make_pair(label, make_pair(dummy_il, dummy_refs))).first; - return it->second.second; + make_pair(label, dummy_refs)).first; + return it->second; } @@ -3851,22 +3978,43 @@ void Buffer::addReference(docstring const & label, Inset * inset, ParIterator it } -void Buffer::setInsetLabel(docstring const & label, InsetLabel const * il) +void Buffer::setInsetLabel(docstring const & label, InsetLabel const * il, + bool const active) { - masterBuffer()->d->ref_cache_[label].first = il; + LabelInfo linfo; + linfo.label = label; + linfo.inset = il; + linfo.active = active; + masterBuffer()->d->label_cache_.push_back(linfo); } -InsetLabel const * Buffer::insetLabel(docstring const & label) const +InsetLabel const * Buffer::insetLabel(docstring const & label, + bool const active) const { - return masterBuffer()->d->ref_cache_[label].first; + for (auto const & rc : masterBuffer()->d->label_cache_) { + if (rc.label == label && (rc.active || !active)) + return rc.inset; + } + return nullptr; +} + + +bool Buffer::activeLabel(docstring const & label) const +{ + if (!insetLabel(label, true)) + return false; + + return true; } void Buffer::clearReferenceCache() const { - if (!d->parent()) + if (!d->parent()) { d->ref_cache_.clear(); + d->label_cache_.clear(); + } } @@ -3884,14 +4032,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); + } } } @@ -4080,91 +4231,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"); @@ -4238,7 +4304,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; } @@ -4261,7 +4327,7 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir string & result_file) const { bool const update_unincluded = - params().maintain_unincluded_children + params().maintain_unincluded_children != BufferParams::CM_None && !params().getIncludedChildren().empty(); // (1) export with all included children (omit \includeonly) @@ -4335,9 +4401,13 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir if (!put_in_tempdir) { // Only show this alert if this is an export to a non-temporary // file (not for previewing). - Alert::error(_("Couldn't export file"), bformat( - _("No information for exporting the format %1$s."), - theFormats().prettyName(format))); + docstring s = bformat(_("No information for exporting the format %1$s."), + theFormats().prettyName(format)); + if (format == "pdf4") + s += "\n" + + bformat(_("Hint: use non-TeX fonts or set input encoding " + " to '%1$s'"), from_utf8(encodings.fromLyXName("ascii")->guiName())); + Alert::error(_("Couldn't export file"), s); } return ExportNoPathToFormat; } @@ -4408,7 +4478,7 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir bformat(_("The directory path to the document\n%1$s\n" "contains spaces, but your TeX installation does " "not allow them. You should save the file to a directory " - "whose name does not contain spaces."), from_ascii(filePath()))); + "whose name does not contain spaces."), from_utf8(filePath()))); return ExportTexPathHasSpaces; } else { runparams.nice = false; @@ -4428,8 +4498,9 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir string const ext = theFormats().extension(format); FileName const tmp_result_file(changeExtension(filename, ext)); Converters::RetVal const retval = - converters.convert(this, FileName(filename), tmp_result_file, - FileName(absFileName()), backend_format, format, error_list); + converters.convert(this, FileName(filename), tmp_result_file, + FileName(absFileName()), backend_format, format, + error_list, Converters::none, includeall); if (retval == Converters::KILLED) return ExportCancel; bool success = (retval == Converters::SUCCESS); @@ -4445,7 +4516,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(); @@ -4483,7 +4554,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; @@ -4491,7 +4562,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; @@ -4544,7 +4615,7 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir Buffer::ExportStatus Buffer::preview(string const & format) const { bool const update_unincluded = - params().maintain_unincluded_children + params().maintain_unincluded_children != BufferParams::CM_None && !params().getIncludedChildren().empty(); return preview(format, update_unincluded); } @@ -4567,7 +4638,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; @@ -4648,6 +4719,36 @@ Buffer::ReadStatus Buffer::loadEmergency() _("&Remove"), _("&Keep")); if (del_emerg == 0) emergencyFile.removeFile(); + else { + // See bug #11464 + FileName newname; + string const ename = emergencyFile.absFileName(); + bool noname = true; + // Surely we can find one in 100 tries? + for (int i = 1; i < 100; ++i) { + newname.set(ename + to_string(i) + ".lyx"); + if (!newname.exists()) { + noname = false; + break; + } + } + if (!noname) { + // renameTo returns true on success. So inverting that + // will give us true if we fail. + noname = !emergencyFile.renameTo(newname); + } + if (noname) { + Alert::warning(_("Can't rename emergency file!"), + _("LyX was unable to rename the emergency file. " + "You should do so manually. Otherwise, you will be " + "asked about it again the next time you try to load " + "this file, and may over-write your own work.")); + } else { + Alert::warning(_("Emergency File Renames"), + bformat(_("Emergency file renamed as:\n %1$s"), + from_utf8(newname.onlyFileName()))); + } + } return ReadOriginal; } @@ -4729,26 +4830,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; @@ -4756,12 +4857,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()); @@ -4770,7 +4889,7 @@ void Buffer::updateBuffer(UpdateScope scope, UpdateType utype) const Buffer const * const master = masterBuffer(); DocumentClass const & textclass = master->params().documentClass(); - FileNamePairList old_bibfiles; + docstring_list old_bibfiles; // Do this only if we are the top-level Buffer. We also need to account // for the case of a previewed child with ignored parent here. if (master == this && !d->ignore_parent) { @@ -4818,9 +4937,12 @@ 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, + // in effect. so we need to go ahead and reset, even though + // we will do so again when we rebuild the TOC later. + cbuf.tocBackend().reset(); // do the real work ParIterator parit = cbuf.par_iterator_begin(); @@ -4834,7 +4956,7 @@ void Buffer::updateBuffer(UpdateScope scope, UpdateType utype) const return; // if the bibfiles changed, the cache of bibinfo is invalid - FileNamePairList new_bibfiles = d->bibfiles_cache_; + docstring_list new_bibfiles = d->bibfiles_cache_; // this is a trick to determine whether the two vectors have // the same elements. sort(new_bibfiles.begin(), new_bibfiles.end()); @@ -4855,7 +4977,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; @@ -4989,16 +5110,20 @@ void Buffer::Impl::setLabel(ParIterator & it, UpdateType utype) const docstring itemlabel; switch (par.itemdepth) { case 0: + // • U+2022 BULLET itemlabel = char_type(0x2022); break; case 1: + // – U+2013 EN DASH itemlabel = char_type(0x2013); break; case 2: + // ∗ U+2217 ASTERISK OPERATOR itemlabel = char_type(0x2217); break; case 3: - itemlabel = char_type(0x2219); // or 0x00b7 + // · U+00B7 MIDDLE DOT + itemlabel = char_type(0x00b7); break; } par.params().labelString(itemlabel); @@ -5091,7 +5216,7 @@ void Buffer::Impl::setLabel(ParIterator & it, UpdateType utype) const } -void Buffer::updateBuffer(ParIterator & parit, UpdateType utype) const +void Buffer::updateBuffer(ParIterator & parit, UpdateType utype, bool const deleted) const { // LASSERT: Is it safe to continue here, or should we just return? LASSERT(parit.pit() == 0, /**/); @@ -5100,8 +5225,14 @@ void Buffer::updateBuffer(ParIterator & parit, UpdateType utype) const // to resolve macros in it. parit.text()->setMacrocontextPosition(parit); + // Reset bibitem counter in master (#8499) + Buffer const * const master = masterBuffer(); + if (master == this && !d->ignore_parent) + master->params().documentClass().counters().reset(from_ascii("bibitem")); + 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) { @@ -5128,15 +5259,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); + insit.inset->updateBuffer(parit, utype, deleted || parit->isDeleted(insit.pos)); + 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); } @@ -5249,6 +5385,12 @@ int Buffer::charCount(bool with_blanks) const } +bool Buffer::areChangesPresent() const +{ + return inset().isChanged(); +} + + Buffer::ReadStatus Buffer::reload() { setBusy(true); @@ -5259,7 +5401,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(); @@ -5333,8 +5475,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(); @@ -5359,7 +5501,7 @@ void Buffer::checkMasterBuffer() if (master->isChild(this)) setParent(master); else - setParent(0); + setParent(nullptr); } @@ -5392,29 +5534,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()) {