]> git.lyx.org Git - lyx.git/blobdiff - src/Buffer.cpp
Cmake build: Don't use temporary doc-files as source for installation
[lyx.git] / src / Buffer.cpp
index 4facf09479d4e33037a57f09737bfcedfe06db2b..c4ce8ea053d45633e4ace7f8f3c4463e26047b14 100644 (file)
@@ -55,6 +55,7 @@
 #include "ParagraphParameters.h"
 #include "ParIterator.h"
 #include "PDFOptions.h"
+#include "Session.h"
 #include "SpellChecker.h"
 #include "sgml.h"
 #include "texstream.h"
@@ -76,7 +77,7 @@
 
 #include "mathed/InsetMathHull.h"
 #include "mathed/MacroTable.h"
-#include "mathed/MathMacroTemplate.h"
+#include "mathed/InsetMathMacroTemplate.h"
 #include "mathed/MathSupport.h"
 
 #include "graphics/GraphicsCache.h"
@@ -91,6 +92,7 @@
 #include "support/debug.h"
 #include "support/docstring_list.h"
 #include "support/ExceptionMessage.h"
+#include "support/FileMonitor.h"
 #include "support/FileName.h"
 #include "support/FileNameList.h"
 #include "support/filetools.h"
@@ -135,7 +137,7 @@ int const LYX_FORMAT = LYX_FORMAT_LYX;
 typedef map<string, bool> DepClean;
 typedef map<docstring, pair<InsetLabel const *, Buffer::References> > RefCache;
 
-} // namespace anon
+} // namespace
 
 
 // A storehouse for the cloned buffers.
@@ -263,9 +265,8 @@ public:
        /// Container for all sort of Buffer dependant errors.
        map<string, ErrorList> errorLists;
 
-       /// timestamp and checksum used to test if the file has been externally
-       /// modified. (Used to properly enable 'File->Revert to saved', bug 4114).
-       time_t timestamp_;
+       /// checksum used to test if the file has been externally modified.  Used to
+       /// double check whether the file had been externally modified when saving.
        unsigned long checksum_;
 
        ///
@@ -278,7 +279,7 @@ public:
 
        /// A cache for the bibfiles (including bibfiles of loaded child
        /// documents), needed for appropriate update of natbib labels.
-       mutable support::FileNameList bibfiles_cache_;
+       mutable support::FileNamePairList 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
@@ -376,6 +377,15 @@ public:
        // 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;
@@ -384,6 +394,7 @@ private:
        int char_count_;
        int blank_count_;
 
+       FileMonitorPtr file_monitor_;
 };
 
 
@@ -419,13 +430,15 @@ Buffer::Impl::Impl(Buffer * owner, FileName const & file, bool readonly_,
        : 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), timestamp_(0),
+         ignore_parent(false),  toc_backend(owner), macro_lock(false),
          checksum_(0), wa_(0),  gui_(0), undo_(*owner), bibinfo_cache_valid_(false),
          bibfile_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), parent_buffer(0),
+         clone_list_(0), doing_export(false),
+         tracked_changes_present_(0), externally_modified_(false), parent_buffer(0),
          word_count_(0), char_count_(0), blank_count_(0)
 {
+       refreshFileMonitor();
        if (!cloned_buffer_) {
                temppath = createBufferTmpDir();
                lyxvc.setBuffer(owner_);
@@ -524,17 +537,21 @@ Buffer::~Buffer()
                Impl::BufferPositionMap::iterator end = d->children_positions.end();
                for (; it != end; ++it) {
                        Buffer * child = const_cast<Buffer *>(it->first);
-                       if (theBufferList().isLoaded(child)) { 
-                        if (theBufferList().isOthersChild(this, child))
-                                child->setParent(0);
-                        else
-                               theBufferList().release(child);
+                       if (theBufferList().isLoaded(child)) {
+                               if (theBufferList().isOthersChild(this, child))
+                                       child->setParent(0);
+                               else
+                                       theBufferList().release(child);
                        }
                }
 
                if (!isClean()) {
                        docstring msg = _("LyX attempted to close a document that had unsaved changes!\n");
-                       msg += emergencyWrite();
+                       try {
+                               msg += emergencyWrite();
+                       } catch (...) {
+                               msg += "  " + _("Save failed! Document is lost.");
+                       }
                        Alert::warning(_("Attempting to close changed document!"), msg);
                }
 
@@ -706,7 +723,7 @@ BufferParams const & Buffer::masterParams() const
 double Buffer::fontScalingFactor() const
 {
        return isExporting() ? 75.0 * params().html_math_img_scale
-               : 0.01 * lyxrc.dpi * lyxrc.zoom * lyxrc.preview_scale_factor * params().display_pixel_ratio;
+               : 0.01 * lyxrc.dpi * lyxrc.currentZoom * lyxrc.preview_scale_factor * params().display_pixel_ratio;
 }
 
 
@@ -815,7 +832,7 @@ string Buffer::logName(LogType * type) const
        FileName const bname(
                addName(path, onlyFileName(
                        changeExtension(filename,
-                                       formats.extension(params().bufferFormat()) + ".out"))));
+                                       theFormats().extension(params().bufferFormat()) + ".out"))));
 
        // Also consider the master buffer log file
        FileName masterfname = fname;
@@ -863,6 +880,7 @@ void Buffer::setFileName(FileName const & fname)
 {
        bool const changed = fname != d->filename;
        d->filename = fname;
+       d->refreshFileMonitor();
        if (changed)
                lyxvc().file_found_hook(fname);
        setReadonly(d->filename.isReadOnly());
@@ -912,6 +930,10 @@ int Buffer::readHeader(Lexer & lex)
        params().output_sync_macro.erase();
        params().setLocalLayout(docstring(), false);
        params().setLocalLayout(docstring(), true);
+       params().biblio_opts.erase();
+       params().biblatex_bibstyle.erase();
+       params().biblatex_citestyle.erase();
+       params().multibib.erase();
 
        for (int i = 0; i < 4; ++i) {
                params().user_defined_bullet(i) = ITEMIZE_DEFAULTS[i];
@@ -959,6 +981,8 @@ int Buffer::readHeader(Lexer & lex)
                errorList.push_back(ErrorItem(_("Document header error"), s));
        }
 
+       params().shell_escape = theSession().shellescapeFiles().find(absFileName());
+
        params().makeDocumentClass();
 
        return unknown_tokens;
@@ -1061,7 +1085,7 @@ bool Buffer::readDocument(Lexer & lex)
 
 bool Buffer::importString(string const & format, docstring const & contents, ErrorList & errorList)
 {
-       Format const * fmt = formats.getFormat(format);
+       Format const * fmt = theFormats().getFormat(format);
        if (!fmt)
                return false;
        // It is important to use the correct extension here, since some
@@ -1175,7 +1199,7 @@ Buffer::ReadStatus Buffer::readFile(FileName const & fn)
 
        d->file_fully_loaded = true;
        d->read_only = !d->filename.isWritable();
-       params().compressed = formats.isZippedFile(d->filename);
+       params().compressed = theFormats().isZippedFile(d->filename);
        saveCheckSum();
        return ReadSuccess;
 }
@@ -1289,7 +1313,7 @@ Buffer::ReadStatus Buffer::convertLyXFormat(FileName const & fn,
        command << os::python()
                << ' ' << quoteName(lyx2lyx.toFilesystemEncoding())
                << " -t " << convert<string>(LYX_FORMAT)
-               << " -o " << quoteName(tmpfile.toFilesystemEncoding())
+               << " -o " << quoteName(tmpfile.toSafeFilesystemEncoding())
                << ' ' << quoteName(fn.toSafeFilesystemEncoding());
        string const command_str = command.str();
 
@@ -1370,7 +1394,7 @@ bool Buffer::save() const
        }
 
        // ask if the disk file has been externally modified (use checksum method)
-       if (fileName().exists() && isExternallyModified(checksum_method)) {
+       if (fileName().exists() && isChecksumModified()) {
                docstring text =
                        bformat(_("Document %1$s has been externally modified. "
                                "Are you sure you want to overwrite this file?"), file);
@@ -1385,12 +1409,12 @@ bool Buffer::save() const
 
        // if the file does not yet exist, none of the backup activity
        // that follows is necessary
-  if (!fileName().exists()) {
+       if (!fileName().exists()) {
                if (!writeFile(fileName()))
-      return false;
-    markClean();
-    return true;
-  }
+                       return false;
+               markClean();
+               return true;
+       }
 
        // we first write the file to a new name, then move it to its
        // proper location once that has been done successfully. that
@@ -1581,7 +1605,7 @@ docstring Buffer::emergencyWrite()
                return user_message;
        }
 
-       user_message += "  " + _("Save failed! Bummer. Document is lost.");
+       user_message += "  " + _("Save failed! Document is lost.");
        // Don't try again.
        markClean();
        return user_message;
@@ -1716,6 +1740,7 @@ bool Buffer::makeLaTeXFile(FileName const & fname,
        catch (exception const & e) {
                errorList.push_back(ErrorItem(_("conversion failed"),
                                              _(e.what())));
+               lyxerr << e.what() << endl;
                failed_export = true;
        }
        catch (...) {
@@ -1875,7 +1900,15 @@ void Buffer::writeLaTeXSource(otexstream & os,
                // Write the preamble
                runparams.use_babel = params().writeLaTeX(os, features,
                                                          d->filename.onlyPath());
-               
+
+               // Biblatex bibliographies are loaded here
+               if (params().useBiblatex()) {
+                       vector<docstring> const bibfiles =
+                               prepareBibFilePaths(runparams, getBibfilesCache(), true);
+                       for (docstring const & file: bibfiles)
+                               os << "\\addbibresource{" << file << "}\n";
+               }
+
                if (!runparams.dryrun && features.hasPolyglossiaExclusiveLanguages()
                    && !features.hasOnlyPolyglossiaLanguages()) {
                        docstring blangs;
@@ -1904,7 +1937,7 @@ void Buffer::writeLaTeXSource(otexstream & os,
                                            support::bformat(_("The languages %1$s are only supported by Polyglossia."), langs)
                                          : support::bformat(_("The language %1$s is only supported by Polyglossia."), langs);
                                if (!blangs.empty())
-                                       plangs += "\n"; 
+                                       plangs += "\n";
                        }
 
                        frontend::Alert::warning(
@@ -2023,7 +2056,7 @@ void Buffer::writeDocBookSource(odocstream & os, string const & fname,
                if (! tclass.class_header().empty())
                        os << from_ascii(tclass.class_header());
                else if (runparams.flavor == OutputParams::XML)
-                       os << "PUBLIC \"-//OASIS//DTD DocBook XML//EN\" "
+                       os << "PUBLIC \"-//OASIS//DTD DocBook XML V4.2//EN\" "
                            << "\"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd\"";
                else
                        os << " PUBLIC \"-//OASIS//DTD DocBook V4.2//EN\"";
@@ -2302,7 +2335,7 @@ void Buffer::updateBibfilesCache(UpdateScope scope) const
        for (InsetIterator it = inset_iterator_begin(inset()); it; ++it) {
                if (it->lyxCode() == BIBTEX_CODE) {
                        InsetBibtex const & inset = static_cast<InsetBibtex const &>(*it);
-                       support::FileNameList const bibfiles = inset.getBibFiles();
+                       support::FileNamePairList const bibfiles = inset.getBibFiles();
                        d->bibfiles_cache_.insert(d->bibfiles_cache_.end(),
                                bibfiles.begin(),
                                bibfiles.end());
@@ -2311,7 +2344,7 @@ void Buffer::updateBibfilesCache(UpdateScope scope) const
                        Buffer const * const incbuf = inset.getChildBuffer();
                        if (!incbuf)
                                continue;
-                       support::FileNameList const & bibfiles =
+                       support::FileNamePairList const & bibfiles =
                                        incbuf->getBibfilesCache(UpdateChildOnly);
                        if (!bibfiles.empty()) {
                                d->bibfiles_cache_.insert(d->bibfiles_cache_.end(),
@@ -2349,7 +2382,7 @@ void Buffer::invalidateBibfileCache() const
 }
 
 
-support::FileNameList const & Buffer::getBibfilesCache(UpdateScope scope) const
+support::FileNamePairList const & Buffer::getBibfilesCache(UpdateScope scope) const
 {
        // FIXME This is probably unnecessary, given where we call this.
        // If this is a child document, use the master's cache instead.
@@ -2383,16 +2416,17 @@ void Buffer::checkIfBibInfoCacheIsValid() const
        }
 
        // compare the cached timestamps with the actual ones.
-       FileNameList const & bibfiles_cache = getBibfilesCache();
-       FileNameList::const_iterator ei = bibfiles_cache.begin();
-       FileNameList::const_iterator en = bibfiles_cache.end();
+       FileNamePairList const & bibfiles_cache = getBibfilesCache();
+       FileNamePairList::const_iterator ei = bibfiles_cache.begin();
+       FileNamePairList::const_iterator en = bibfiles_cache.end();
        for (; ei != en; ++ ei) {
-               time_t lastw = ei->lastModified();
-               time_t prevw = d->bibfile_status_[*ei];
+               FileName const fn = ei->second;
+               time_t lastw = fn.lastModified();
+               time_t prevw = d->bibfile_status_[fn];
                if (lastw != prevw) {
                        d->bibinfo_cache_valid_ = false;
                        d->cite_labels_valid_ = false;
-                       d->bibfile_status_[*ei] = lastw;
+                       d->bibfile_status_[fn] = lastw;
                }
        }
 }
@@ -2501,7 +2535,7 @@ bool Buffer::getStatus(FuncRequest const & cmd, FuncStatus & flag)
        switch (cmd.action()) {
 
        case LFUN_BUFFER_TOGGLE_READ_ONLY:
-               flag.setOnOff(isReadonly());
+               flag.setOnOff(hasReadonlyFlag());
                break;
 
                // FIXME: There is need for a command-line import.
@@ -2520,7 +2554,8 @@ bool Buffer::getStatus(FuncRequest const & cmd, FuncStatus & flag)
                        enable = true;
                        break;
                }
-               string format = to_utf8(arg);
+               string format = (arg.empty() || arg == "default") ?
+                       params().getDefaultOutputFormat() : to_utf8(arg);
                size_t pos = format.find(' ');
                if (pos != string::npos)
                        format = format.substr(0, pos);
@@ -2624,15 +2659,17 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
                                dr.setMessage(log);
                }
                else
-                       setReadonly(!isReadonly());
+                       setReadonly(!hasReadonlyFlag());
                break;
 
        case LFUN_BUFFER_EXPORT: {
-               ExportStatus const status = doExport(argument, false);
+               string const format = (argument.empty() || argument == "default") ?
+                       params().getDefaultOutputFormat() : argument;
+               ExportStatus const status = doExport(format, false);
                dr.setError(status != ExportSuccess);
                if (status != ExportSuccess)
                        dr.setMessage(bformat(_("Error exporting to format: %1$s."),
-                                             func.argument()));
+                                             from_utf8(format)));
                break;
        }
 
@@ -2651,7 +2688,7 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
        case LFUN_BUFFER_EXPORT_CUSTOM: {
                string format_name;
                string command = split(argument, format_name, ' ');
-               Format const * format = formats.getFormat(format_name);
+               Format const * format = theFormats().getFormat(format_name);
                if (!format) {
                        lyxerr << "Format \"" << format_name
                                << "\" not recognized!"
@@ -2810,7 +2847,7 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
        }
 
        case LFUN_BUFFER_VIEW_CACHE:
-               if (!formats.view(*this, d->preview_file_,
+               if (!theFormats().view(*this, d->preview_file_,
                                  d->preview_format_))
                        dr.setMessage(_("Error viewing the output file."));
                break;
@@ -2978,29 +3015,19 @@ bool Buffer::isClean() const
 }
 
 
-bool Buffer::isExternallyModified(CheckMethod method) const
+bool Buffer::isChecksumModified() const
 {
        LASSERT(d->filename.exists(), return false);
-       // if method == timestamp, check timestamp before checksum
-       return (method == checksum_method
-               || d->timestamp_ != d->filename.lastModified())
-               && d->checksum_ != d->filename.checksum();
+       return d->checksum_ != d->filename.checksum();
 }
 
 
 void Buffer::saveCheckSum() const
 {
        FileName const & file = d->filename;
-
        file.refresh();
-       if (file.exists()) {
-               d->timestamp_ = file.lastModified();
-               d->checksum_ = file.checksum();
-       } else {
-               // in the case of save to a new file.
-               d->timestamp_ = 0;
-               d->checksum_ = 0;
-       }
+       d->checksum_ = file.exists() ? file.checksum()
+               : 0; // in the case of save to a new file.
 }
 
 
@@ -3014,6 +3041,7 @@ void Buffer::markClean() const
        // autosave
        d->bak_clean = true;
        d->undo_.markDirty();
+       clearExternalModification();
 }
 
 
@@ -3103,6 +3131,114 @@ DocFileName Buffer::getReferencedFileName(string const & fn) const
 }
 
 
+string const Buffer::prepareFileNameForLaTeX(string const & name,
+                                            string const & ext, bool nice) const
+{
+       string const fname = makeAbsPath(name, filePath()).absFileName();
+       if (FileName::isAbsolute(name) || !FileName(fname + ext).isReadableFile())
+               return name;
+       if (!nice)
+               return fname;
+
+       // FIXME UNICODE
+       return to_utf8(makeRelPath(from_utf8(fname),
+               from_utf8(masterBuffer()->filePath())));
+}
+
+
+vector<docstring> const Buffer::prepareBibFilePaths(OutputParams const & runparams,
+                                               FileNamePairList const bibfilelist,
+                                               bool const add_extension) const
+{
+       // If we are processing the LaTeX file in a temp directory then
+       // copy the .bib databases to this temp directory, mangling their
+       // names in the process. Store this mangled name in the list of
+       // all databases.
+       // (We need to do all this because BibTeX *really*, *really*
+       // can't handle "files with spaces" and Windows users tend to
+       // use such filenames.)
+       // Otherwise, store the (maybe absolute) path to the original,
+       // unmangled database name.
+
+       vector<docstring> res;
+
+       // determine the export format
+       string const tex_format = flavor2format(runparams.flavor);
+
+       // check for spaces in paths
+       bool found_space = false;
+
+       FileNamePairList::const_iterator it = bibfilelist.begin();
+       FileNamePairList::const_iterator en = bibfilelist.end();
+       for (; it != en; ++it) {
+               string utf8input = to_utf8(it->first);
+               string database =
+                       prepareFileNameForLaTeX(utf8input, ".bib", runparams.nice);
+               FileName const try_in_file =
+                       makeAbsPath(database + ".bib", filePath());
+               bool const not_from_texmf = try_in_file.isReadableFile();
+
+               if (!runparams.inComment && !runparams.dryrun && !runparams.nice &&
+                   not_from_texmf) {
+                       // mangledFileName() needs the extension
+                       DocFileName const in_file = DocFileName(try_in_file);
+                       database = removeExtension(in_file.mangledFileName());
+                       FileName const out_file = makeAbsPath(database + ".bib",
+                                       masterBuffer()->temppath());
+                       bool const success = in_file.copyTo(out_file);
+                       if (!success) {
+                               LYXERR0("Failed to copy '" << in_file
+                                      << "' to '" << out_file << "'");
+                       }
+               } else if (!runparams.inComment && runparams.nice && not_from_texmf) {
+                       runparams.exportdata->addExternalFile(tex_format, try_in_file, database + ".bib");
+                       if (!isValidLaTeXFileName(database)) {
+                               frontend::Alert::warning(_("Invalid filename"),
+                                        _("The following filename will cause troubles "
+                                              "when running the exported file through LaTeX: ") +
+                                            from_utf8(database));
+                       }
+                       if (!isValidDVIFileName(database)) {
+                               frontend::Alert::warning(_("Problematic filename for DVI"),
+                                        _("The following filename can cause troubles "
+                                              "when running the exported file through LaTeX "
+                                                  "and opening the resulting DVI: ") +
+                                            from_utf8(database), true);
+                       }
+               }
+
+               if (add_extension)
+                       database += ".bib";
+
+               // FIXME UNICODE
+               docstring const path = from_utf8(latex_path(database));
+
+               if (contains(path, ' '))
+                       found_space = true;
+
+               if (find(res.begin(), res.end(), path) == res.end())
+                       res.push_back(path);
+       }
+
+       // Check if there are spaces in the path and warn BibTeX users, if so.
+       // (biber can cope with such paths)
+       if (!prefixIs(runparams.bibtex_command, "biber")) {
+               // Post this warning only once.
+               static bool warned_about_spaces = false;
+               if (!warned_about_spaces &&
+                   runparams.nice && found_space) {
+                       warned_about_spaces = true;
+                       Alert::warning(_("Export Warning!"),
+                                      _("There are spaces in the paths to your BibTeX databases.\n"
+                                                     "BibTeX will be unable to find them."));
+               }
+       }
+
+       return res;
+}
+
+
+
 string Buffer::layoutPos() const
 {
        return d->layout_position;
@@ -3126,12 +3262,18 @@ void Buffer::setLayoutPos(string const & path)
 }
 
 
-bool Buffer::isReadonly() const
+bool Buffer::hasReadonlyFlag() const
 {
        return d->read_only;
 }
 
 
+bool Buffer::isReadonly() const
+{
+       return hasReadonlyFlag() || notifiesExternalModification();
+}
+
+
 void Buffer::setParent(Buffer const * buffer)
 {
        // Avoids recursive include.
@@ -3459,7 +3601,7 @@ void Buffer::Impl::updateMacros(DocIterator & it, DocIterator & scope)
                                continue;
 
                        // get macro data
-                       MathMacroTemplate & macroTemplate =
+                       InsetMathMacroTemplate & macroTemplate =
                                *iit->inset->asInsetMath()->asMacroTemplate();
                        MacroContext mc(owner_, it);
                        macroTemplate.updateToContext(mc);
@@ -3556,7 +3698,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);
+                       data.updateMacros(0, mc, utype, 0);
                }
        }
 }
@@ -3578,8 +3720,12 @@ void Buffer::listMacroNames(MacroNameSet & macros) const
        // loop over children
        Impl::BufferPositionMap::iterator it = d->children_positions.begin();
        Impl::BufferPositionMap::iterator end = d->children_positions.end();
-       for (; it != end; ++it)
-               it->first->listMacroNames(macros);
+       for (; it != end; ++it) {
+               Buffer * child = const_cast<Buffer *>(it->first);
+               // The buffer might have been closed (see #10766).
+               if (theBufferList().isLoaded(child))
+                       child->listMacroNames(macros);
+       }
 
        // call parent
        Buffer const * const pbuf = d->parent();
@@ -3609,7 +3755,7 @@ void Buffer::listParentMacros(MacroSet & macros, LaTeXFeatures & features) const
                if (data) {
                        macros.insert(data);
 
-                       // we cannot access the original MathMacroTemplate anymore
+                       // we cannot access the original InsetMathMacroTemplate anymore
                        // here to calls validate method. So we do its work here manually.
                        // FIXME: somehow make the template accessible here.
                        if (data->optionals() > 0)
@@ -3802,6 +3948,7 @@ unique_ptr<TexRow> Buffer::getSourceCode(odocstream & os, string const & format,
                        ots.texrow().newlines(2);
                        if (master)
                                runparams.is_child = true;
+                       updateBuffer();
                        writeLaTeXSource(ots, string(), runparams, output);
                        texrow = ots.releaseTexRow();
                }
@@ -3960,7 +4107,7 @@ int AutoSaveBuffer::generateChild()
        return pid;
 }
 
-} // namespace anon
+} // namespace
 
 
 FileName Buffer::getEmergencyFileName() const
@@ -4008,7 +4155,7 @@ void Buffer::moveAutosaveFile(support::FileName const & oldauto) const
 bool Buffer::autoSave() const
 {
        Buffer const * buf = d->cloned_buffer_ ? d->cloned_buffer_ : this;
-       if (buf->d->bak_clean || isReadonly())
+       if (buf->d->bak_clean || hasReadonlyFlag())
                return true;
 
        message(_("Autosaving current document..."));
@@ -4106,6 +4253,8 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
        if (pos != string::npos) {
                dest_filename = target.substr(pos + 1, target.length() - pos - 1);
                format = target.substr(0, pos);
+               if (format == "default")
+                       format = params().getDefaultOutputFormat();
                runparams.export_folder = FileName(dest_filename).onlyPath().realPath();
                FileName(dest_filename).onlyPath().createPath();
                LYXERR(Debug::FILES, "format=" << format << ", dest_filename=" << dest_filename << ", export_folder=" << runparams.export_folder);
@@ -4136,7 +4285,7 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
                                // file (not for previewing).
                                Alert::error(_("Couldn't export file"), bformat(
                                        _("No information for exporting the format %1$s."),
-                                       formats.prettyName(format)));
+                                       theFormats().prettyName(format)));
                        }
                        return ExportNoPathToFormat;
                }
@@ -4166,7 +4315,7 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
        string filename = latexName(false);
        filename = addName(temppath(), filename);
        filename = changeExtension(filename,
-                                  formats.extension(backend_format));
+                                  theFormats().extension(backend_format));
        LYXERR(Debug::FILES, "filename=" << filename);
 
        // Plain text backend
@@ -4212,7 +4361,7 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
        string const error_type = (format == "program")
                ? "Build" : params().bufferFormat();
        ErrorList & error_list = d->errorLists[error_type];
-       string const ext = formats.extension(format);
+       string const ext = theFormats().extension(format);
        FileName const tmp_result_file(changeExtension(filename, ext));
        bool const success = converters.convert(this, FileName(filename),
                tmp_result_file, FileName(absFileName()), backend_format, format,
@@ -4280,7 +4429,7 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
        vector<ExportedFile>::const_iterator it = files.begin();
        vector<ExportedFile>::const_iterator const en = files.end();
        for (; it != en && status != CANCEL; ++it) {
-               string const fmt = formats.getFormatFromFile(it->sourceName);
+               string const fmt = theFormats().getFormatFromFile(it->sourceName);
                string fixedName = it->exportName;
                if (!runparams.export_folder.empty()) {
                        // Relative pathnames starting with ../ will be sanitized
@@ -4316,13 +4465,13 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
                } else {
                        message(bformat(_("Document exported as %1$s "
                                "to file `%2$s'"),
-                               formats.prettyName(format),
+                               theFormats().prettyName(format),
                                makeDisplayPath(result_file)));
                }
        } else {
                // This must be a dummy converter like fax (bug 1888)
                message(bformat(_("Document exported as %1$s"),
-                       formats.prettyName(format)));
+                       theFormats().prettyName(format)));
        }
 
        return success ? ExportSuccess : ExportConverterError;
@@ -4361,7 +4510,7 @@ Buffer::ExportStatus Buffer::preview(string const & format, bool includeall) con
                return status;
 
        if (previewFile.exists())
-               return formats.view(*this, previewFile, format) ?
+               return theFormats().view(*this, previewFile, format) ?
                        PreviewSuccess : PreviewError;
 
        // Successful export but no output file?
@@ -4403,7 +4552,7 @@ Buffer::ReadStatus Buffer::loadEmergency()
                ReadStatus const ret_llf = loadThisLyXFile(emergencyFile);
                bool const success = (ret_llf == ReadSuccess);
                if (success) {
-                       if (isReadonly()) {
+                       if (hasReadonlyFlag()) {
                                Alert::warning(_("File is read-only"),
                                        bformat(_("An emergency file is successfully loaded, "
                                        "but the original file %1$s is marked read-only. "
@@ -4466,7 +4615,7 @@ Buffer::ReadStatus Buffer::loadAutosave()
                ReadStatus const ret_llf = loadThisLyXFile(autosaveFile);
                // the file is not saved if we load the autosave file.
                if (ret_llf == ReadSuccess) {
-                       if (isReadonly()) {
+                       if (hasReadonlyFlag()) {
                                Alert::warning(_("File is read-only"),
                                        bformat(_("A backup file is successfully loaded, "
                                        "but the original file %1$s is marked read-only. "
@@ -4520,7 +4669,7 @@ Buffer::ReadStatus Buffer::loadThisLyXFile(FileName const & fn)
 void Buffer::bufferErrors(TeXErrors const & terr, ErrorList & errorList) const
 {
        for (auto const & err : terr) {
-               TexRow::TextEntry start, end = TexRow::text_none;
+               TexRow::TextEntry start = TexRow::text_none, end = TexRow::text_none;
                int errorRow = err.error_in_line;
                Buffer const * buf = 0;
                Impl const * p = d;
@@ -4614,7 +4763,10 @@ void Buffer::updateBuffer(UpdateScope scope, UpdateType utype) const
        updateBuffer(parit, utype);
 
        if (master != this)
-               // TocBackend update will be done later.
+               // If this document has siblings, then update the TocBackend later. The
+               // reason is to ensure that later siblings are up to date when e.g. the
+               // broken or not status of references is computed. The update is called
+               // in InsetInclude::addToToc.
                return;
 
        d->bibinfo_cache_valid_ = true;
@@ -4764,8 +4916,10 @@ void Buffer::Impl::setLabel(ParIterator & it, UpdateType utype) const
                switch (par.itemdepth) {
                case 2:
                        enumcounter += 'i';
+                       // fall through
                case 1:
                        enumcounter += 'i';
+                       // fall through
                case 0:
                        enumcounter += 'i';
                        break;
@@ -4878,7 +5032,7 @@ void Buffer::updateBuffer(ParIterator & parit, UpdateType utype) const
                // set the counter for this paragraph
                d->setLabel(parit, utype);
 
-               // update change-tracking flag 
+               // update change-tracking flag
                parit->addChangesToBuffer(*this);
 
                // now the insets
@@ -5169,5 +5323,60 @@ void Buffer::updateChangesPresent() const
 }
 
 
+void Buffer::Impl::refreshFileMonitor()
+{
+       if (file_monitor_ && file_monitor_->filename() == filename.absFileName()) {
+               file_monitor_->refresh();
+               return;
+       }
+
+       // The previous file monitor is invalid
+       // This also destroys the previous file monitor and all its connections
+       file_monitor_ = FileSystemWatcher::monitor(filename);
+       // file_monitor_ will be destroyed with *this, so it is not going to call a
+       // destroyed object method.
+       file_monitor_->connect([this](bool exists) {
+                       fileExternallyModified(exists);
+               });
+}
+
+
+void Buffer::Impl::fileExternallyModified(bool const exists)
+{
+       // ignore notifications after our own saving operations
+       if (checksum_ == filename.checksum()) {
+               LYXERR(Debug::FILES, "External modification but "
+                      "checksum unchanged: " << filename);
+               return;
+       }
+       lyx_clean = bak_clean = false;
+       // If the file has been deleted, only mark the file as dirty since it is
+       // pointless to prompt for reloading. If later a file is moved into this
+       // location, then the externally modified warning will appear then.
+       if (exists)
+                       externally_modified_ = true;
+       // Update external modification notification.
+       // Dirty buffers must be visible at all times.
+       if (wa_ && wa_->unhide(owner_))
+               wa_->updateTitles();
+       else
+               // Unable to unhide the buffer (e.g. no GUI or not current View)
+               lyx_clean = true;
+}
+
+
+bool Buffer::notifiesExternalModification() const
+{
+       return d->externally_modified_;
+}
+
+
+void Buffer::clearExternalModification() const
+{
+       d->externally_modified_ = false;
+       if (d->wa_)
+               d->wa_->updateTitles();
+}
+
 
 } // namespace lyx