X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBuffer.cpp;h=b6d09a954c41a3bfde2737e9d5f99327a758ad46;hb=e14f8daca43c69d638a37d7883d398bcc68d459c;hp=1f6436662d56c37017878922b661482bc3a50f3c;hpb=04fe818b2239ac2fcc4af48618b699cb50ccf543;p=lyx.git diff --git a/src/Buffer.cpp b/src/Buffer.cpp index 1f6436662d..b6d09a954c 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,7 +136,22 @@ namespace { int const LYX_FORMAT = LYX_FORMAT_LYX; typedef map DepClean; -typedef map > RefCache; + +// 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; } // namespace @@ -295,6 +311,8 @@ public: /// 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. @@ -305,7 +323,11 @@ public: /// 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; @@ -382,6 +404,12 @@ public: /// has been externally modified? Can be reset by the user. mutable bool externally_modified_; + ///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; + private: /// So we can force access via the accessors. mutable Buffer const * parent_buffer; @@ -428,7 +456,7 @@ Buffer::Impl::Impl(Buffer * owner, FileName const & file, bool readonly_, 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), + 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), @@ -438,6 +466,11 @@ Buffer::Impl::Impl(Buffer * owner, FileName const & file, bool readonly_, 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,6 +483,7 @@ 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; @@ -790,10 +824,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 +932,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 +958,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]; @@ -1698,13 +1735,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()); @@ -1712,9 +1742,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)) @@ -1802,16 +1834,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(); @@ -1830,8 +1852,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 = @@ -1916,7 +1940,8 @@ Buffer::ExportStatus Buffer::writeLaTeXSource(otexstream & os, os << "\\catcode`\\%=11" "\\def\\%{%}\\catcode`\\%=14\n"; } - bool const detokenize = !isAscii(from_utf8(docdir)); + bool const detokenize = !isAscii(from_utf8(docdir)) + || contains(docdir, '~'); bool const quote = contains(docdir, ' '); os << "\\makeatletter\n" << "\\def\\input@path{{"; @@ -1945,10 +1970,14 @@ Buffer::ExportStatus Buffer::writeLaTeXSource(otexstream & os, // 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() @@ -2404,6 +2433,13 @@ docstring_list const & Buffer::getBibfiles(UpdateScope scope) const 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_; } @@ -2448,17 +2484,25 @@ FileName Buffer::getBibfilePath(docstring const & bibid) const map::const_iterator it = bibfileCache.find(bibid); if (it != bibfileCache.end()) { - // i.e., bibfileCache[bibid] + // i.e., return bibfileCache[bibid]; return it->second; } LYXERR(Debug::FILES, "Reading file location for " << bibid); - string texfile = changeExtension(to_utf8(bibid), "bib"); - // note that, if the filename can be found directly from the path, - // findtexfile will just return a FileName object for that path. - FileName file(findtexfile(texfile, "bib")); - if (file.empty()) - file = FileName(makeAbsPath(texfile, filePath())); + 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; @@ -2475,11 +2519,31 @@ 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. docstring_list const & bibfiles_cache = getBibfiles(); for (auto const & bf : bibfiles_cache) { @@ -2503,6 +2567,10 @@ void Buffer::clearBibFileCache() const 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) { @@ -2516,6 +2584,7 @@ void Buffer::reloadBibInfoCache(bool const force) const 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 @@ -2523,6 +2592,7 @@ void Buffer::reloadBibInfoCache(bool const force) const clearBibFileCache(); d->bibinfo_.clear(); FileNameList checkedFiles; + d->have_bibitems_ = false; collectBibKeys(checkedFiles); d->bibinfo_cache_valid_ = true; } @@ -2530,8 +2600,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() != 0) + parent()->d->have_bibitems_ = true; + else + d->have_bibitems_ = true; + } + } } @@ -3236,7 +3313,7 @@ string const Buffer::prepareFileNameForLaTeX(string const & name, } -vector const Buffer::prepareBibFilePaths(OutputParams const & runparams, +vector> const Buffer::prepareBibFilePaths(OutputParams const & runparams, docstring_list const & bibfilelist, bool const add_extension) const { @@ -3250,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); @@ -3322,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 (pair 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. @@ -3868,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; } @@ -3891,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 & 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(); + } } @@ -4375,9 +4483,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; } @@ -4448,7 +4560,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; @@ -4688,6 +4800,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; } @@ -4769,26 +4911,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; + int errorRow = err->error_in_line; Buffer const * buf = 0; - Impl const * p = d; - if (err.child_name.empty()) + 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_->getDescendents()) { 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; @@ -4796,12 +4938,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()); @@ -4861,6 +5021,10 @@ void Buffer::updateBuffer(UpdateScope scope, UpdateType utype) const 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(); @@ -5029,16 +5193,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); @@ -5140,6 +5308,11 @@ 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(); for ( ; parit.pit() <= lastpit ; ++parit.pit()) {