]> git.lyx.org Git - features.git/blobdiff - src/Buffer.cpp
Amend f426470a
[features.git] / src / Buffer.cpp
index 10a38f61c79716e59dfed20774cde0ad3ed7a2c4..8ab86d4acd07a413c0479a3da95cc13a8ea1f7f6 100644 (file)
@@ -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"
@@ -69,7 +70,6 @@
 
 #include "insets/InsetBranch.h"
 #include "insets/InsetInclude.h"
-#include "insets/InsetTabular.h"
 #include "insets/InsetText.h"
 
 #include "mathed/InsetMathHull.h"
@@ -354,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_;
@@ -460,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_) {
@@ -624,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<InsetText &>(buffer_clone->inset()), el);
+                       static_cast<InsetText &>(buffer_clone->inset()));
 
        bufmap[this] = buffer_clone;
        clones->insert(buffer_clone);
@@ -669,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<InsetText &>(buffer_clone->inset()), el);
+                       static_cast<InsetText &>(buffer_clone->inset()));
 
        clones->insert(buffer_clone);
        buffer_clone->d->clone_list_ = clones;
@@ -946,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;
@@ -958,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];
@@ -986,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;
@@ -1007,7 +1011,7 @@ int Buffer::readHeader(Lexer & lex)
 
        params().shell_escape = theSession().shellescapeFiles().find(absFileName());
 
-       params().makeDocumentClass();
+       params().makeDocumentClass(isClone(), isInternal());
 
        return unknown_tokens;
 }
@@ -1106,6 +1110,24 @@ bool Buffer::readDocument(Lexer & lex)
 }
 
 
+bool Buffer::isSyncTeXenabled() const
+{
+       bool enabled = params().output_sync;
+
+       if (!enabled)
+               for (auto const & c : theConverters()) {
+                       const string dest = c.to().substr(0,3);
+                       if (dest == "dvi" || dest == "pdf") {
+                               const string cmd = c.command();
+                               enabled |= cmd.find("-synctex=") != string::npos
+                                       && cmd.find("-synctex=0") == string::npos;
+                               if (enabled)
+                                       break;
+                       }
+               }
+       return enabled;
+}
+
 bool Buffer::importString(string const & format, docstring const & contents, ErrorList & errorList)
 {
        Format const * fmt = theFormats().getFormat(format);
@@ -1141,7 +1163,7 @@ bool Buffer::importFile(string const & format, FileName const & name, ErrorList
 
        FileName const lyx = tempFileName("Buffer_importFileXXXXXX.lyx");
        Converters::RetVal const retval =
-               theConverters().convert(nullptr, name, lyx, name, format, "lyx", errorList);
+               theConverters().convert(this, name, lyx, name, format, "lyx", errorList);
        if (retval == Converters::SUCCESS) {
                bool const success = readFile(lyx) == ReadSuccess;
                removeTempFile(lyx);
@@ -1275,9 +1297,9 @@ void Buffer::updatePreviews() const
        if (!ploader)
                return;
 
-       InsetIterator it = inset_iterator_begin(*d->inset);
-       InsetIterator const end = inset_iterator_end(*d->inset);
-       for (; it != end; ++it)
+       InsetIterator it = begin(*d->inset);
+       InsetIterator const itend = end(*d->inset);
+       for (; it != itend; ++it)
                it->addPreview(it, *ploader);
 
        ploader->startLoading();
@@ -1472,7 +1494,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<TempFile>(fileName().onlyPath(),
+       auto tempfile = lyx::make_unique<TempFile>(fileName().onlyPath(),
                                              justname + "-XXXXXX.lyx");
        bool const symlink = fileName().isSymLink();
        if (!symlink)
@@ -1735,7 +1757,7 @@ Buffer::ExportStatus Buffer::makeLaTeXFile(FileName const & fname,
        OutputParams runparams = runparams_in;
 
        string const encoding = runparams.encoding->iconvName();
-       LYXERR(Debug::LATEX, "makeLaTeXFile encoding: " << encoding << ", fname=" << fname.realPath());
+       LYXERR(Debug::OUTFILE, "makeLaTeXFile encoding: " << encoding << ", fname=" << fname.realPath());
 
        ofdocstream ofs;
        try { ofs.reset(encoding); }
@@ -1772,7 +1794,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<uint32_t>(e.failed_char) << dec;
                if (getParFromID(e.par_id).paragraph().layout().pass_thru) {
                        docstring msg = bformat(_("Uncodable character '%1$s'"
                                                  " (code point %2$s)"),
@@ -1847,7 +1869,7 @@ Buffer::ExportStatus Buffer::writeLaTeXSource(otexstream & os,
        BufferEncodings::initUnicodeMath(*this);
 
        // validate the buffer.
-       LYXERR(Debug::LATEX, "  Validating buffer...");
+       LYXERR(Debug::OUTFILE, "  Validating buffer...");
        LaTeXFeatures features(*this, params(), runparams);
        validate(features);
        // This is only set once per document (in master)
@@ -1856,7 +1878,7 @@ Buffer::ExportStatus Buffer::writeLaTeXSource(otexstream & os,
                runparams.use_hyperref = features.isRequired("hyperref");
                runparams.use_CJK = features.mustProvide("CJK");
        }
-       LYXERR(Debug::LATEX, "  Buffer validation done.");
+       LYXERR(Debug::OUTFILE, "  Buffer validation done.");
 
        bool const output_preamble =
                output == FullSource || output == OnlyPreamble;
@@ -2075,9 +2097,9 @@ Buffer::ExportStatus Buffer::writeLaTeXSource(otexstream & os,
 
        if (output_preamble) {
                os << "\\end{document}\n";
-               LYXERR(Debug::LATEX, "makeLaTeXFile...done");
+               LYXERR(Debug::OUTFILE, "makeLaTeXFile...done");
        } else {
-               LYXERR(Debug::LATEX, "LaTeXFile for inclusion made.");
+               LYXERR(Debug::OUTFILE, "LaTeXFile for inclusion made.");
        }
        runparams_in.encoding = runparams.encoding;
 
@@ -2091,7 +2113,7 @@ Buffer::ExportStatus Buffer::makeDocBookFile(FileName const & fname,
                              OutputParams const & runparams,
                              OutputWhat output) const
 {
-       LYXERR(Debug::LATEX, "makeDocBookFile...");
+       LYXERR(Debug::OUTFILE, "makeDocBookFile...");
 
        ofdocstream ofs;
        if (!openFileWrite(ofs, fname))
@@ -2102,8 +2124,7 @@ Buffer::ExportStatus Buffer::makeDocBookFile(FileName const & fname,
        updateBuffer();
        updateMacroInstances(OutputUpdate);
 
-       ExportStatus const retval =
-               writeDocBookSource(ofs, runparams, output);
+       ExportStatus const retval = writeDocBookSource(ofs, runparams, output);
        if (retval == ExportKilled)
                return ExportKilled;
 
@@ -2129,7 +2150,7 @@ Buffer::ExportStatus Buffer::writeDocBookSource(odocstream & os,
        bool const output_preamble =
                output == FullSource || output == OnlyPreamble;
        bool const output_body =
-         output == FullSource || output == OnlyBody || output == IncludedFile;
+               output == FullSource || output == OnlyBody || output == IncludedFile;
 
        if (output_preamble) {
                // XML preamble, no doctype needed.
@@ -2138,14 +2159,25 @@ Buffer::ExportStatus Buffer::writeDocBookSource(odocstream & os,
                // parsep in output_docbook.cpp).
                os << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
                   << "<!-- This DocBook file was created by LyX " << lyx_version
-                  << "\n  See http://www.lyx.org/ for more information -->\n";
+                  << "\n  See https://www.lyx.org/ for more information -->\n";
+
+               // Prepare the name space declaration for MathML depending on document preferences.
+               string mathmlNamespace;
+               if (params().docbook_mathml_prefix != BufferParams::NoPrefix) {
+                       string mathmlPrefix;
+                       if (params().docbook_mathml_prefix == BufferParams::MPrefix)
+                               mathmlPrefix = "m";
+                       else if (params().docbook_mathml_prefix == BufferParams::MMLPrefix)
+                               mathmlPrefix = "mml";
+                       mathmlNamespace = + " xmlns:" + mathmlPrefix + "=\"http://www.w3.org/1998/Math/MathML\"";
+               }
 
                // Directly output the root tag, based on the current type of document.
                string languageCode = params().language->code();
                string params = "xml:lang=\"" + languageCode + '"'
                                                + " xmlns=\"http://docbook.org/ns/docbook\""
                                                + " xmlns:xlink=\"http://www.w3.org/1999/xlink\""
-                                               + " xmlns:m=\"http://www.w3.org/1998/Math/MathML\""
+                                               + mathmlNamespace
                                                + " xmlns:xi=\"http://www.w3.org/2001/XInclude\""
                                                + " version=\"5.2\"";
 
@@ -2171,7 +2203,7 @@ Buffer::ExportStatus Buffer::writeDocBookSource(odocstream & os,
 Buffer::ExportStatus Buffer::makeLyXHTMLFile(FileName const & fname,
                              OutputParams const & runparams) const
 {
-       LYXERR(Debug::LATEX, "makeLyXHTMLFile...");
+       LYXERR(Debug::OUTFILE, "makeLyXHTMLFile...");
 
        ofdocstream ofs;
        if (!openFileWrite(ofs, fname))
@@ -2321,7 +2353,7 @@ int Buffer::runChktex()
 
        // Generate the LaTeX file if neccessary
        OutputParams runparams(&params().encoding());
-       runparams.flavor = OutputParams::LATEX;
+       runparams.flavor = Flavor::LaTeX;
        runparams.nice = false;
        runparams.linelen = lyxrc.plaintext_linelen;
        ExportStatus const retval =
@@ -2369,13 +2401,13 @@ void Buffer::validate(LaTeXFeatures & features) const
        for (Paragraph const & p : paragraphs())
                p.validate(features);
 
-       if (lyxerr.debugging(Debug::LATEX)) {
+       if (lyxerr.debugging(Debug::OUTFILE)) {
                features.showStruct();
        }
 }
 
 
-void Buffer::getLabelList(vector<docstring> & list) const
+void Buffer::getLabelList(vector<std::pair<docstring, docstring>> & list) const
 {
        // If this is a child document, use the master's list instead.
        if (parent()) {
@@ -2387,7 +2419,7 @@ void Buffer::getLabelList(vector<docstring> & list) const
        shared_ptr<Toc> toc = d->toc_backend.toc("label");
        for (auto const & tocit : *toc) {
                if (tocit.depth() == 0)
-                       list.push_back(tocit.str());
+                       list.push_back(make_pair(tocit.str(), tocit.asString()));
        }
 }
 
@@ -2581,7 +2613,7 @@ void Buffer::collectBibKeys(FileNameList & checkedFiles) const
        if (!parent())
                clearIncludeList();
 
-       for (InsetIterator it = inset_iterator_begin(inset()); it; ++it) {
+       for (InsetIterator it = begin(inset()); it; ++it) {
                it->collectBibKeys(it, checkedFiles);
                if (it->lyxCode() == BIBITEM_CODE) {
                        if (parent() != nullptr)
@@ -2593,18 +2625,16 @@ void Buffer::collectBibKeys(FileNameList & checkedFiles) const
 }
 
 
-void Buffer::addBiblioInfo(BiblioInfo const & bin) const
+void Buffer::addBiblioInfo(BiblioInfo const & bi_in) const
 {
-       // We add the biblio info to the master buffer,
-       // if there is one, but also to every single buffer,
-       // in case a child is compiled alone.
-       BiblioInfo & bi = d->bibinfo_;
-       bi.mergeBiblioInfo(bin);
+       // We add the biblio info to the parent buffer,
+       // if there is one, but also to this buffer, in case
+       // it is compiled alone.
+       BiblioInfo & our_bi = d->bibinfo_;
+       our_bi.mergeBiblioInfo(bi_in);
 
-       if (parent() != nullptr) {
-               BiblioInfo & masterbi = parent()->d->bibinfo_;
-               masterbi.mergeBiblioInfo(bin);
-       }
+       if (parent())
+               parent()->addBiblioInfo(bi_in);
 }
 
 
@@ -2941,9 +2971,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);
                        }
@@ -2959,10 +2989,10 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
 
                docstring const oldname = from_utf8(func.getArg(0));
                docstring const newname = from_utf8(func.getArg(1));
-               InsetIterator it  = inset_iterator_begin(inset());
-               InsetIterator const end = inset_iterator_end(inset());
+               InsetIterator it  = begin(inset());
+               InsetIterator const itend = end(inset());
                bool success = false;
-               for (; it != end; ++it) {
+               for (; it != itend; ++it) {
                        if (it->lyxCode() == BRANCH_CODE) {
                                InsetBranch & ins = static_cast<InsetBranch &>(*it);
                                if (ins.branch() == oldname) {
@@ -3139,6 +3169,11 @@ ParConstIterator Buffer::par_iterator_end() const
        return ParConstIterator(doc_iterator_end(this));
 }
 
+bool Buffer::empty() const
+{
+       return paragraphs().size() == 1 && paragraphs().front().empty();
+}
+
 
 Language const * Buffer::language() const
 {
@@ -3726,7 +3761,6 @@ void Buffer::Impl::updateMacros(DocIterator & it, DocIterator & scope)
        while (it.pit() <= lastpit) {
                Paragraph & par = it.paragraph();
 
-               // FIXME Can this be done with the new-style iterators?
                // iterate over the insets of the current paragraph
                for (auto const & insit : par.insetList()) {
                        it.pos() = insit.pos;
@@ -3807,7 +3841,7 @@ void Buffer::Impl::updateMacros(DocIterator & it, DocIterator & scope)
                        // FIXME (Abdel), I don't understand why we pass 'it' here
                        // instead of 'macroTemplate' defined above... is this correct?
                        macros[macroTemplate.name()][it] =
-                               Impl::ScopeMacro(scope, MacroData(const_cast<Buffer *>(owner_), it));
+                               Impl::ScopeMacro(scope, MacroData(owner_, it));
                }
 
                // next paragraph
@@ -3842,11 +3876,9 @@ void Buffer::updateMacros() const
 
 void Buffer::getUsedBranches(std::list<docstring> & result, bool const from_master) const
 {
-       InsetIterator it  = inset_iterator_begin(inset());
-       InsetIterator const end = inset_iterator_end(inset());
-       for (; it != end; ++it) {
-               if (it->lyxCode() == BRANCH_CODE) {
-                       InsetBranch & br = static_cast<InsetBranch &>(*it);
+       for (Inset const & it : inset()) {
+               if (it.lyxCode() == BRANCH_CODE) {
+                       InsetBranch const & br = static_cast<InsetBranch const &>(it);
                        docstring const name = br.branch();
                        if (!from_master && !params().branchlist().find(name))
                                result.push_back(name);
@@ -3854,10 +3886,10 @@ void Buffer::getUsedBranches(std::list<docstring> & result, bool const from_mast
                                result.push_back(name);
                        continue;
                }
-               if (it->lyxCode() == INCLUDE_CODE) {
+               if (it.lyxCode() == INCLUDE_CODE) {
                        // get buffer of external file
                        InsetInclude const & ins =
-                               static_cast<InsetInclude const &>(*it);
+                               static_cast<InsetInclude const &>(it);
                        Buffer * child = ins.loadIfNeeded();
                        if (!child)
                                continue;
@@ -3883,9 +3915,9 @@ void Buffer::updateMacroInstances(UpdateType utype) const
                        continue;
 
                // update macro in all cells of the InsetMathNest
-               DocIterator::idx_type n = minset->nargs();
+               idx_type n = minset->nargs();
                MacroContext mc = MacroContext(this, it);
-               for (DocIterator::idx_type i = 0; i < n; ++i) {
+               for (idx_type i = 0; i < n; ++i) {
                        MathData & data = minset->cell(i);
                        data.updateMacros(nullptr, mc, utype, 0);
                }
@@ -4028,7 +4060,7 @@ void Buffer::changeRefsIfUnique(docstring const & from, docstring const & to)
 
        string const paramName = "key";
        UndoGroupHelper ugh(this);
-       InsetIterator it = inset_iterator_begin(inset());
+       InsetIterator it = begin(inset());
        for (; it; ++it) {
                if (it->lyxCode() != CITE_CODE)
                        continue;
@@ -4057,38 +4089,49 @@ unique_ptr<TexRow> 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("<!-- ");
+               comment_end = 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<docstring>(par_begin),
                                        convert<docstring>(par_end - 1))
+                          << comment_end
                           << "\n\n";
                }
                // output paragraphs
-               if (runparams.flavor == OutputParams::LYX) {
+               if (runparams.flavor == Flavor::LyX) {
                        Paragraph const & par = text().paragraphs()[par_begin];
                        ostringstream ods;
                        depth_type dt = par.getDepth();
                        par.write(ods, params(), dt);
                        os << from_utf8(ods.str());
-               } else if (runparams.flavor == OutputParams::HTML) {
+               } else if (runparams.flavor == Flavor::Html) {
                        XMLStream xs(os);
                        setMathFlavor(runparams);
                        xhtmlParagraphs(text(), *this, xs, runparams);
-               } else if (runparams.flavor == OutputParams::TEXT) {
+               } else if (runparams.flavor == Flavor::Text) {
                        bool dummy = false;
                        // FIXME Handles only one paragraph, unlike the others.
                        // Probably should have some routine with a signature like them.
                        writePlaintextParagraph(*this,
                                text().paragraphs()[par_begin], os, runparams, dummy);
-               } else if (runparams.flavor == OutputParams::DOCBOOK5) {
+               } else if (runparams.flavor == Flavor::DocBook5) {
                        XMLStream xs{os};
                        docbookParagraphs(text(), *this, xs, runparams);
                } else {
@@ -4118,15 +4161,16 @@ unique_ptr<TexRow> 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 == OutputParams::LYX) {
+               if (runparams.flavor == Flavor::LyX) {
                        ostringstream ods;
                        if (output == FullSource)
                                write(ods);
@@ -4135,14 +4179,14 @@ unique_ptr<TexRow> Buffer::getSourceCode(odocstream & os, string const & format,
                        else if (output == OnlyBody)
                                text().write(ods);
                        os << from_utf8(ods.str());
-               } else if (runparams.flavor == OutputParams::HTML) {
+               } else if (runparams.flavor == Flavor::Html) {
                        writeLyXHTMLSource(os, runparams, output);
-               } else if (runparams.flavor == OutputParams::TEXT) {
-                       if (output == OnlyPreamble) {
+               } else if (runparams.flavor == Flavor::Text) {
+                       if (output == OnlyPreamble)
                                os << "% "<< _("Plain text does not have a preamble.");
-                       else
+                       else
                                writePlaintextFile(*this, os, runparams);
-               } else if (runparams.flavor == OutputParams::DOCBOOK5) {
+               } else if (runparams.flavor == Flavor::DocBook5) {
                        writeDocBookSource(os, runparams, output);
                } else {
                        // latex or literate
@@ -4341,6 +4385,9 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
 
 void Buffer::setMathFlavor(OutputParams & op) const
 {
+       // Passes the way to generate formulae to the XHTML output code.
+       // In particular, this function has no impact on the DocBook code, as it
+       // uses another mechanism to handle math flavours.
        switch (params().html_math_output) {
        case BufferParams::MathML:
                op.math_flavor = OutputParams::MathAsMathML;
@@ -4377,14 +4424,14 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
        }
        MarkAsExporting exporting(this);
        string backend_format;
-       runparams.flavor = OutputParams::LATEX;
+       runparams.flavor = Flavor::LaTeX;
        runparams.linelen = lyxrc.plaintext_linelen;
        runparams.includeall = includeall;
        vector<string> backs = params().backends();
        Converters converters = theConverters();
        bool need_nice_file = false;
        if (find(backs.begin(), backs.end(), format) == backs.end()) {
-               // Get shortest path to format
+               // Get the shortest path to format
                converters.buildGraph();
                Graph::EdgePath path;
                for (string const & sit : backs) {
@@ -4421,13 +4468,13 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
                LYXERR(Debug::FILES, "backend_format=" << backend_format);
                // FIXME: Don't hardcode format names here, but use a flag
                if (backend_format == "pdflatex")
-                       runparams.flavor = OutputParams::PDFLATEX;
+                       runparams.flavor = Flavor::PdfLaTeX;
                else if (backend_format == "luatex")
-                       runparams.flavor = OutputParams::LUATEX;
+                       runparams.flavor = Flavor::LuaTeX;
                else if (backend_format == "dviluatex")
-                       runparams.flavor = OutputParams::DVILUATEX;
+                       runparams.flavor = Flavor::DviLuaTeX;
                else if (backend_format == "xetex")
-                       runparams.flavor = OutputParams::XETEX;
+                       runparams.flavor = Flavor::XeTeX;
        }
 
        string filename = latexName(false);
@@ -4438,7 +4485,7 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
 
        // Plain text backend
        if (backend_format == "text") {
-               runparams.flavor = OutputParams::TEXT;
+               runparams.flavor = Flavor::Text;
                try {
                        writePlaintextFile(*this, FileName(filename), runparams);
                }
@@ -4446,7 +4493,7 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
        }
        // HTML backend
        else if (backend_format == "xhtml") {
-               runparams.flavor = OutputParams::HTML;
+               runparams.flavor = Flavor::Html;
                setMathFlavor(runparams);
                if (makeLyXHTMLFile(FileName(filename), runparams) == ExportKilled)
                        return ExportKilled;
@@ -4454,7 +4501,7 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
                writeFile(FileName(filename));
        // DocBook backend
        else if (backend_format == "docbook5") {
-               runparams.flavor = OutputParams::DOCBOOK5;
+               runparams.flavor = Flavor::DocBook5;
                runparams.nice = false;
                if (makeDocBookFile(FileName(filename), runparams) == ExportKilled)
                        return ExportKilled;
@@ -4550,7 +4597,7 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
                result_file = changeExtension(d->exportFileName().absFileName(), ext);
        else
                result_file = dest_filename;
-       // We need to copy referenced files (e. g. included graphics
+       // We need to copy referenced files (e.g. included graphics
        // if format == "dvi") to the result dir.
        vector<ExportedFile> const extfiles =
                runparams.exportdata->externalFiles(format);
@@ -4675,7 +4722,7 @@ Buffer::ReadStatus Buffer::loadEmergency()
                "%1$s exists.\n\nRecover emergency save?"), file);
 
        int const load_emerg = Alert::prompt(_("Load emergency save?"), text,
-               0, 2, _("&Recover"), _("&Load Original"), _("&Cancel"));
+               0, 3, _("&Recover"), _("&Load Original"), _("&Only show difference"), _("&Cancel"));
 
        switch (load_emerg)
        {
@@ -4750,6 +4797,22 @@ Buffer::ReadStatus Buffer::loadEmergency()
                return ReadOriginal;
        }
 
+       case 2: {
+               string const f1 = d->filename.absFileName();
+               string const f2 = emergencyFile.absFileName();
+               if (loadThisLyXFile(d->filename) != ReadSuccess)
+                       return ReadCancel;
+               string const par = "compare run-blocking " + quoteName(f1) + " " + quoteName(f2);
+               LYXERR(Debug::FILES, par << "\n");
+               lyx::dispatch(FuncRequest(LFUN_DIALOG_SHOW, par));
+
+               //release the emergency buffer loaded by compare
+               Buffer * emerBuffer = theBufferList().getBuffer(emergencyFile);
+               if (emerBuffer)
+                       theBufferList().release(emerBuffer);
+
+               return ReadCancel; //Release the buffer of Original immediatelly
+       }
        default:
                break;
        }
@@ -4879,10 +4942,21 @@ void Buffer::bufferRefs(TeXErrors const & terr, ErrorList & errorList) const
 }
 
 
+void Buffer::updateBuffer() const
+{
+       updateBuffer(UpdateMaster, InternalUpdate);
+       d->need_update = false;
+}
+
+
 void Buffer::updateBuffer(UpdateScope scope, UpdateType utype) const
 {
        LBUFERR(!text().paragraphs().empty());
 
+       // This can be called when loading a file, so that there be no
+       // open undo group.
+       UndoGroupHelper ugh(const_cast<Buffer *>(this));
+
        // Use the master text class also for child documents
        Buffer const * const master = masterBuffer();
        DocumentClass const & textclass = master->params().documentClass();
@@ -4992,6 +5066,8 @@ void Buffer::updateBuffer(UpdateScope scope, UpdateType utype) const
        cbuf.tocBackend().update(true, utype);
        if (scope == UpdateMaster)
                cbuf.structureChanged();
+
+       d->need_update = false;
 }
 
 
@@ -5103,31 +5179,11 @@ void Buffer::Impl::setLabel(ParIterator & it, UpdateType utype) const
 
        switch(layout.labeltype) {
        case LABEL_ITEMIZE: {
-               // At some point of time we should do something more
-               // clever here, like:
-               //   par.params().labelString(
-               //    bp.user_defined_bullet(par.itemdepth).getText());
-               // for now, use a simple hardcoded label
-               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:
-                       // · U+00B7 MIDDLE DOT
-                       itemlabel = char_type(0x00b7);
-                       break;
-               }
-               par.params().labelString(itemlabel);
+               par.params().labelString(
+                       (par.itemdepth < 4)
+                                       ? bp.user_defined_bullet(par.itemdepth).getLabel()
+                                         // Display fallback for too deeply nested items
+                                       : bformat(from_ascii("[?%1$d]"), int(par.itemdepth + 1)));
                break;
        }
 
@@ -5153,8 +5209,8 @@ void Buffer::Impl::setLabel(ParIterator & it, UpdateType utype) const
                }
 
                if (needEnumCounterReset(it)) {
-                       // Increase the master counter?
-                       if (layout.stepmastercounter)
+                       // Increase the parent counter?
+                       if (layout.stepparentcounter)
                                counters.stepParent(enumcounter, utype);
                        // Maybe we have to reset the enumeration counter.
                        if (!layout.resumecounter)
@@ -5274,6 +5330,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
 {
@@ -5312,6 +5380,15 @@ int Buffer::spellCheck(DocIterator & from, DocIterator & to,
 }
 
 
+void Buffer::requestSpellcheck()
+{
+       ParagraphList::iterator pit = paragraphs().begin();
+       ParagraphList::iterator pend = paragraphs().end();
+       for (; pit != pend; ++pit)
+               pit->requestSpellCheck();
+}
+
+
 void Buffer::Impl::updateStatistics(DocIterator & from, DocIterator & to, bool skipNoOutput)
 {
        bool inword = false;
@@ -5354,6 +5431,12 @@ void Buffer::Impl::updateStatistics(DocIterator & from, DocIterator & to, bool s
                                }
                                else if (ins && ins->isSpace())
                                        ++blank_count_;
+                               else if (ins) {
+                                       pair<int, int> words = ins->isWords();
+                                       char_count_ += words.first;
+                                       word_count_ += words.second;
+                                       inword = false;
+                               }
                                else {
                                        char_type const c = par.getChar(pos);
                                        if (isPrintableNonspace(c))