X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBuffer.cpp;h=fdce444aefa313e43a41cf6ce1766ae0f72b9819;hb=b37929fdb33222bf55505343647838d0665a9e02;hp=ddce2db44e489be25974cadad25154127b51f7d7;hpb=ad887798c9d7416120967860e200cf8350559dcd;p=lyx.git diff --git a/src/Buffer.cpp b/src/Buffer.cpp index ddce2db44e..fdce444aef 100644 --- a/src/Buffer.cpp +++ b/src/Buffer.cpp @@ -21,6 +21,7 @@ #include "BufferParams.h" #include "Bullet.h" #include "Chktex.h" +#include "ColorSet.h" #include "Converter.h" #include "Counters.h" #include "Cursor.h" @@ -353,6 +354,9 @@ public: /// whether the bibinfo cache is valid mutable bool bibinfo_cache_valid_; + /// + mutable bool need_update; + private: int word_count_; int char_count_; @@ -459,7 +463,7 @@ Buffer::Impl::Impl(Buffer * owner, FileName const & file, bool readonly_, 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) + need_update(false), word_count_(0), char_count_(0), blank_count_(0) { refreshFileMonitor(); if (!cloned_buffer_) { @@ -623,10 +627,9 @@ void Buffer::cloneWithChildren(BufferMap & bufmap, CloneList_ptr clones) const // The clone needs its own DocumentClass, since running updateBuffer() will // modify it, and we would otherwise be sharing it with the original Buffer. buffer_clone->params().makeDocumentClass(true); - ErrorList el; cap::switchBetweenClasses( params().documentClassPtr(), buffer_clone->params().documentClassPtr(), - static_cast(buffer_clone->inset()), el); + static_cast(buffer_clone->inset())); bufmap[this] = buffer_clone; clones->insert(buffer_clone); @@ -668,10 +671,9 @@ Buffer * Buffer::cloneBufferOnly() const { // The clone needs its own DocumentClass, since running updateBuffer() will // modify it, and we would otherwise be sharing it with the original Buffer. buffer_clone->params().makeDocumentClass(true); - ErrorList el; cap::switchBetweenClasses( params().documentClassPtr(), buffer_clone->params().documentClassPtr(), - static_cast(buffer_clone->inset()), el); + static_cast(buffer_clone->inset())); clones->insert(buffer_clone); buffer_clone->d->clone_list_ = clones; @@ -945,7 +947,9 @@ int Buffer::readHeader(Lexer & lex) params().fontcolor = RGBColor(0, 0, 0); params().isfontcolor = false; params().notefontcolor = RGBColor(0xCC, 0xCC, 0xCC); + params().isnotefontcolor = false; params().boxbgcolor = RGBColor(0xFF, 0, 0); + params().isboxbgcolor = false; params().html_latex_start.clear(); params().html_latex_end.clear(); params().html_math_img_scale = 1.0; @@ -957,6 +961,7 @@ int Buffer::readHeader(Lexer & lex) params().biblatex_citestyle.erase(); params().multibib.erase(); params().lineno_opts.clear(); + params().spellignore().clear(); for (int i = 0; i < 4; ++i) { params().user_defined_bullet(i) = ITEMIZE_DEFAULTS[i]; @@ -985,7 +990,7 @@ int Buffer::readHeader(Lexer & lex) << token << '\''); string const result = - params().readToken(lex, token, d->filename.onlyPath()); + params().readToken(lex, token, d->filename); if (!result.empty()) { if (token == "\\textclass") { d->layout_position = result; @@ -1006,7 +1011,7 @@ int Buffer::readHeader(Lexer & lex) params().shell_escape = theSession().shellescapeFiles().find(absFileName()); - params().makeDocumentClass(); + params().makeDocumentClass(isClone(), isInternal()); return unknown_tokens; } @@ -1471,7 +1476,7 @@ bool Buffer::save() const // proper location once that has been done successfully. that // way we preserve the original file if something goes wrong. string const justname = fileName().onlyFileNameWithoutExt(); - auto tempfile = make_unique(fileName().onlyPath(), + auto tempfile = lyx::make_unique(fileName().onlyPath(), justname + "-XXXXXX.lyx"); bool const symlink = fileName().isSymLink(); if (!symlink) @@ -1771,7 +1776,7 @@ Buffer::ExportStatus Buffer::makeLaTeXFile(FileName const & fname, catch (EncodingException const & e) { docstring const failed(1, e.failed_char); ostringstream oss; - oss << "0x" << hex << e.failed_char << dec; + oss << "0x" << hex << static_cast(e.failed_char) << dec; if (getParFromID(e.par_id).paragraph().layout().pass_thru) { docstring msg = bformat(_("Uncodable character '%1$s'" " (code point %2$s)"), @@ -2137,7 +2142,7 @@ Buffer::ExportStatus Buffer::writeDocBookSource(odocstream & os, // parsep in output_docbook.cpp). os << "\n" << "\n"; + << "\n See https://www.lyx.org/ for more information -->\n"; // Directly output the root tag, based on the current type of document. string languageCode = params().language->code(); @@ -2938,9 +2943,9 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr) undo().recordUndoBufferParams(CursorData()); branch_list.add(branch_name); branch = branch_list.find(branch_name); - string const x11hexname = X11hexname(branch->color()); - docstring const str = branch_name + ' ' + from_ascii(x11hexname); - lyx::dispatch(FuncRequest(LFUN_SET_COLOR, str)); + if (branch) + // needed to update the color table for dark mode + branch->setColors("background", "background"); dr.setError(false); dr.screenUpdate(Update::Force); } @@ -3532,6 +3537,9 @@ void Buffer::collectChildren(ListOfBuffers & children, bool grand_children) cons // loop over children for (auto const & p : d->children_positions) { Buffer * child = const_cast(p.first); + // This can happen when called during GUI operations + if (!theBufferList().isLoaded(child)) + continue; // No duplicates ListOfBuffers::const_iterator bit = find(children.begin(), children.end(), child); if (bit != children.end()) @@ -4056,18 +4064,29 @@ unique_ptr Buffer::getSourceCode(odocstream & os, string const & format, // Some macros rely on font encoding runparams.main_fontenc = params().main_font_encoding(); + // Use the right wrapping for the comment at the beginning of the generated + // snippet, so that it is either valid LaTeX or valid XML (including HTML and DocBook). + docstring comment_start = from_ascii("% "); + docstring comment_end = from_ascii(""); + if (runparams.flavor == Flavor::Html || runparams.flavor == Flavor::DocBook5) { + comment_start = from_ascii(""); + } + if (output == CurrentParagraph) { runparams.par_begin = par_begin; runparams.par_end = par_end; if (par_begin + 1 == par_end) { - os << "% " + os << comment_start << bformat(_("Preview source code for paragraph %1$d"), par_begin) + << comment_end << "\n\n"; } else { - os << "% " + os << comment_start << bformat(_("Preview source code from paragraph %1$s to %2$s"), convert(par_begin), convert(par_end - 1)) + << comment_end << "\n\n"; } // output paragraphs @@ -4117,13 +4136,14 @@ unique_ptr Buffer::getSourceCode(odocstream & os, string const & format, d->ignore_parent = false; } } else { - os << "% "; + os << comment_start; if (output == FullSource) os << _("Preview source code"); else if (output == OnlyPreamble) os << _("Preview preamble"); else if (output == OnlyBody) os << _("Preview body"); + os << comment_end; os << "\n\n"; if (runparams.flavor == Flavor::LyX) { ostringstream ods; @@ -4137,9 +4157,9 @@ unique_ptr Buffer::getSourceCode(odocstream & os, string const & format, } else if (runparams.flavor == Flavor::Html) { writeLyXHTMLSource(os, runparams, output); } else if (runparams.flavor == Flavor::Text) { - if (output == OnlyPreamble) { + if (output == OnlyPreamble) os << "% "<< _("Plain text does not have a preamble."); - } else + else writePlaintextFile(*this, os, runparams); } else if (runparams.flavor == Flavor::DocBook5) { writeDocBookSource(os, runparams, output); @@ -4991,6 +5011,8 @@ void Buffer::updateBuffer(UpdateScope scope, UpdateType utype) const cbuf.tocBackend().update(true, utype); if (scope == UpdateMaster) cbuf.structureChanged(); + + d->need_update = false; } @@ -5273,6 +5295,18 @@ void Buffer::updateBuffer(ParIterator & parit, UpdateType utype, bool const dele } +void Buffer::forceUpdate() const +{ + d->need_update = true; +} + + +bool Buffer::needUpdate() const +{ + return d->need_update; +} + + int Buffer::spellCheck(DocIterator & from, DocIterator & to, WordLangTuple & word_lang, docstring_list & suggestions) const { @@ -5353,6 +5387,12 @@ void Buffer::Impl::updateStatistics(DocIterator & from, DocIterator & to, bool s } else if (ins && ins->isSpace()) ++blank_count_; + else if (ins) { + pair words = ins->isWords(); + char_count_ += words.first; + word_count_ += words.second; + inword = false; + } else { char_type const c = par.getChar(pos); if (isPrintableNonspace(c))