Rename BufferView::updateScrollbar to show what does

[lyx.git] / src / Buffer.cpp

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 5c7b88682b1e0e041f841ea92af61ebbcf2b8b30..e78a443a88ab3c44e721f15d7b493c85109bc080 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -627,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);
@@ -672,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;
@@ -963,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];
@@ -2107,8 +2106,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;
 
@@ -2145,12 +2143,23 @@ Buffer::ExportStatus Buffer::writeDocBookSource(odocstream & os,
                   << "<!-- This DocBook file was created by LyX " << lyx_version
                   << "\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\"";
 
@@ -3817,7 +3826,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
@@ -4361,6 +4370,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;
@@ -4404,7 +4416,7 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
        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) {
@@ -4570,7 +4582,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);
@@ -4695,7 +4707,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)
        {
@@ -4770,6 +4782,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;
        }
@@ -4899,6 +4927,13 @@ 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());