X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBuffer.cpp;h=462094f960f79548db02e265109440ed93d84c54;hb=2dae4ab4f35458f3caa4f85f8c0e64e5fe9065d1;hp=9eded216f1f32daa5203f5344a3b75ba3cf29bc9;hpb=2058faaa3bd7604e1b8c25b50efd23893ec845d4;p=lyx.git

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 9eded216f1..97a6cfbd31 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -46,17 +46,18 @@
 #include "LyX.h"
 #include "LyXRC.h"
 #include "LyXVC.h"
-#include "output_docbook.h"
 #include "output.h"
 #include "output_latex.h"
-#include "output_xhtml.h"
+#include "output_docbook.h"
 #include "output_plaintext.h"
+#include "output_xhtml.h"
 #include "Paragraph.h"
 #include "ParagraphParameters.h"
 #include "ParIterator.h"
 #include "PDFOptions.h"
+#include "Session.h"
 #include "SpellChecker.h"
-#include "sgml.h"
+#include "xml.h"
 #include "texstream.h"
 #include "TexRow.h"
 #include "Text.h"
@@ -76,12 +77,13 @@
 
 #include "mathed/InsetMathHull.h"
 #include "mathed/MacroTable.h"
-#include "mathed/MathMacroTemplate.h"
+#include "mathed/InsetMathMacroTemplate.h"
 #include "mathed/MathSupport.h"
 
 #include "graphics/GraphicsCache.h"
 #include "graphics/PreviewLoader.h"
 
+#include "frontends/Application.h"
 #include "frontends/alert.h"
 #include "frontends/Delegates.h"
 #include "frontends/WorkAreaManager.h"
@@ -109,8 +111,6 @@
 #include "support/textutils.h"
 #include "support/types.h"
 
-#include "support/bind.h"
-
 #include <algorithm>
 #include <fstream>
 #include <iomanip>
@@ -134,13 +134,29 @@ namespace {
 int const LYX_FORMAT = LYX_FORMAT_LYX;
 
 typedef map<string, bool> DepClean;
-typedef map<docstring, pair<InsetLabel const *, Buffer::References> > RefCache;
 
-} // namespace anon
+// 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<LabelInfo> LabelCache;
 
+typedef map<docstring, Buffer::References> RefCache;
 
 // A storehouse for the cloned buffers.
-list<CloneList *> cloned_buffers;
+typedef list<CloneList_ptr> CloneStore;
+CloneStore cloned_buffers;
+
+} // namespace
+
 
 
 class Buffer::Impl
@@ -171,7 +187,7 @@ public:
 	/** If we have branches that use the file suffix
 	    feature, return the file name with suffix appended.
 	*/
-	support::FileName exportFileName() const;
+	FileName exportFileName() const;
 
 	Buffer * owner_;
 
@@ -183,40 +199,9 @@ public:
 	/// need to regenerate .tex?
 	DepClean dep_clean;
 
-	/// is save needed?
-	mutable bool lyx_clean;
-
-	/// is autosave needed?
-	mutable bool bak_clean;
-
-	/// is this an unnamed file (New...)?
-	bool unnamed;
-
-	/// is this an internal bufffer?
-	bool internal_buffer;
-
-	/// buffer is r/o
-	bool read_only;
-
 	/// name of the file the buffer is associated with.
 	FileName filename;
 
-	/** Set to true only when the file is fully loaded.
-	 *  Used to prevent the premature generation of previews
-	 *  and by the citation inset.
-	 */
-	bool file_fully_loaded;
-
-	/// original format of loaded file
-	int file_format;
-
-	/// if the file was originally loaded from an older format, do
-	/// we need to back it up still?
-	bool need_format_backup;
-
-	/// Ignore the parent (e.g. when exporting a child standalone)?
-	bool ignore_parent;
-
 	///
 	mutable TocBackend toc_backend;
 
@@ -233,13 +218,11 @@ public:
 	/// map from the macro name to the position map,
 	/// which maps the macro definition position to the scope and the MacroData.
 	NamePositionScopeMacroMap macros;
-	/// This seem to change the way Buffer::getMacro() works
-	mutable bool macro_lock;
 
 	/// positions of child buffers in the buffer
 	typedef map<Buffer const * const, DocIterator> BufferPositionMap;
 	struct ScopeBuffer {
-		ScopeBuffer() : buffer(0) {}
+		ScopeBuffer() : buffer(nullptr) {}
 		ScopeBuffer(DocIterator const & s, Buffer const * b)
 			: scope(s), buffer(b) {}
 		DocIterator scope;
@@ -278,7 +261,7 @@ public:
 
 	/// A cache for the bibfiles (including bibfiles of loaded child
 	/// documents), needed for appropriate update of natbib labels.
-	mutable support::FileNamePairList bibfiles_cache_;
+	mutable docstring_list 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
@@ -286,27 +269,19 @@ public:
 	// file, and then to construct the Buffer's bibinfo from that.
 	/// A cache for bibliography info
 	mutable BiblioInfo bibinfo_;
-	/// whether the bibinfo cache is valid
-	mutable bool bibinfo_cache_valid_;
-	/// whether the bibfile cache is valid
-	mutable bool bibfile_cache_valid_;
 	/// Cache of timestamps of .bib files
 	map<FileName, time_t> bibfile_status_;
-	/// Indicates whether the bibinfo has changed since the last time
-	/// we ran updateBuffer(), i.e., whether citation labels may need
-	/// to be updated.
-	mutable bool cite_labels_valid_;
 
 	/// These two hold the file name and format, written to by
 	/// Buffer::preview and read from by LFUN_BUFFER_VIEW_CACHE.
 	FileName preview_file_;
 	string preview_format_;
-	/// If there was an error when previewing, on the next preview we do
-	/// a fresh compile (e.g. in case the user installed a package that
-	/// 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;
@@ -314,6 +289,83 @@ public:
 	///
 	PreviewLoader * preview_loader_;
 
+	/// If non zero, this buffer is a clone of existing buffer \p cloned_buffer_
+	/// This one is useful for preview detached in a thread.
+	Buffer const * cloned_buffer_;
+	///
+	CloneList_ptr clone_list_;
+
+	///
+	std::list<Buffer const *> include_list_;
+private:
+	/// So we can force access via the accessors.
+	mutable Buffer const * parent_buffer;
+
+	FileMonitorPtr file_monitor_;
+
+/// ints and bools are all listed last so as to avoid alignment issues
+public:
+	/// original format of loaded file
+	int file_format;
+
+	/// are we in the process of exporting this buffer?
+	mutable bool doing_export;
+
+	/// If there was an error when previewing, on the next preview we do
+	/// a fresh compile (e.g. in case the user installed a package that
+	/// was missing).
+	bool require_fresh_start_;
+
+	/// Indicates whether the bibinfo has changed since the last time
+	/// 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_;
+
+	/// is save needed?
+	mutable bool lyx_clean;
+
+	/// is autosave needed?
+	mutable bool bak_clean;
+
+	/// is this an unnamed file (New...)?
+	bool unnamed;
+
+	/// is this an internal bufffer?
+	bool internal_buffer;
+
+	/// buffer is r/o
+	bool read_only;
+
+	/** Set to true only when the file is fully loaded.
+	 *  Used to prevent the premature generation of previews
+	 *  and by the citation inset.
+	 */
+	bool file_fully_loaded;
+
+	/// if the file was originally loaded from an older format, do
+	/// we need to back it up still?
+	bool need_format_backup;
+
+	/// Ignore the parent (e.g. when exporting a child standalone)?
+	bool ignore_parent;
+
+	/// This seem to change the way Buffer::getMacro() works
+	mutable bool macro_lock;
+
+	/// has been externally modified? Can be reset by the user.
+	mutable bool externally_modified_;
+
+	/// whether the bibinfo cache is valid
+	mutable bool bibinfo_cache_valid_;
+
+private:
+	int word_count_;
+	int char_count_;
+	int blank_count_;
+
+public:
 	/// This is here to force the test to be done whenever parent_buffer
 	/// is accessed.
 	Buffer const * parent() const
@@ -321,7 +373,7 @@ public:
 		// ignore_parent temporarily "orphans" a buffer
 		// (e.g. if a child is compiled standalone)
 		if (ignore_parent)
-			return 0;
+			return nullptr;
 		// if parent_buffer is not loaded, then it has been unloaded,
 		// which means that parent_buffer is an invalid pointer. So we
 		// set it to null in that case.
@@ -329,7 +381,7 @@ public:
 		// they will always be regarded as unloaded. in that case, we hope
 		// for the best.
 		if (!cloned_buffer_ && !theBufferList().isLoaded(parent_buffer))
-			parent_buffer = 0;
+			parent_buffer = nullptr;
 		return parent_buffer;
 	}
 
@@ -342,20 +394,10 @@ public:
 		if (!cloned_buffer_ && parent_buffer && pb)
 			LYXERR0("Warning: a buffer should not have two parents!");
 		parent_buffer = pb;
-		if (!cloned_buffer_ && parent_buffer) {
-			parent_buffer->invalidateBibfileCache();
+		if (!cloned_buffer_ && parent_buffer)
 			parent_buffer->invalidateBibinfoCache();
-		}
 	}
 
-	/// If non zero, this buffer is a clone of existing buffer \p cloned_buffer_
-	/// This one is useful for preview detached in a thread.
-	Buffer const * cloned_buffer_;
-	///
-	CloneList * clone_list_;
-	/// are we in the process of exporting this buffer?
-	mutable bool doing_export;
-
 	/// compute statistics
 	/// \p from initial position
 	/// \p to points to the end position
@@ -372,34 +414,17 @@ public:
 		+ (with_blanks ? blank_count_ : 0);
 	}
 
-	// does the buffer contain tracked changes? (if so, we automatically
-	// display the review toolbar, for instance)
-	mutable bool tracked_changes_present_;
-
 	// Make sure the file monitor monitors the good file.
 	void refreshFileMonitor();
 
-	/// has it been notified of an external modification?
-	bool isExternallyModified() const { return externally_modified_; }
-
 	/// Notify or clear of external modification
-	void fileExternallyModified(bool modified) const;
-
-	/// Block notifications of external modifications
-	FileMonitorBlocker blockFileMonitor() { return file_monitor_->block(); }
-
-private:
-	/// So we can force access via the accessors.
-	mutable Buffer const * parent_buffer;
-
-	int word_count_;
-	int char_count_;
-	int blank_count_;
+	void fileExternallyModified(bool exists);
 
-	/// has been externally modified? Can be reset by the user.
-	mutable bool externally_modified_;
-
-	FileMonitorPtr file_monitor_;
+	///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;
 };
 
 
@@ -432,22 +457,26 @@ static FileName createBufferTmpDir()
 
 Buffer::Impl::Impl(Buffer * owner, FileName const & file, bool readonly_,
 	Buffer const * cloned_buffer)
-	: 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),
-	  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),
-	  tracked_changes_present_(0), parent_buffer(0),
-	  word_count_(0), char_count_(0), blank_count_(0),
-	  externally_modified_(false)
+	: owner_(owner), filename(file), toc_backend(owner), checksum_(0),
+	  wa_(nullptr),  gui_(nullptr), undo_(*owner), inset(nullptr),
+	  preview_loader_(nullptr), cloned_buffer_(cloned_buffer),
+	  clone_list_(nullptr), parent_buffer(nullptr), file_format(LYX_FORMAT),
+	  doing_export(false), require_fresh_start_(false), cite_labels_valid_(false),
+	  have_bibitems_(false), lyx_clean(true), bak_clean(true), unnamed(false),
+	  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)
 {
 	refreshFileMonitor();
 	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;
@@ -458,16 +487,15 @@ Buffer::Impl::Impl(Buffer * owner, FileName const & file, bool readonly_,
 	bibfiles_cache_ = cloned_buffer_->d->bibfiles_cache_;
 	bibinfo_ = cloned_buffer_->d->bibinfo_;
 	bibinfo_cache_valid_ = cloned_buffer_->d->bibinfo_cache_valid_;
-	bibfile_cache_valid_ = cloned_buffer_->d->bibfile_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;
 	preview_file_ = cloned_buffer_->d->preview_file_;
 	preview_format_ = cloned_buffer_->d->preview_format_;
-	preview_error_ = cloned_buffer_->d->preview_error_;
-	tracked_changes_present_ = cloned_buffer_->d->tracked_changes_present_;
+	require_fresh_start_ = cloned_buffer_->d->require_fresh_start_;
 }
 
 
@@ -497,7 +525,7 @@ Buffer::~Buffer()
 	// saved properly, before it goes into the void.
 
 	// GuiView already destroyed
-	d->gui_ = 0;
+	d->gui_ = nullptr;
 
 	if (isInternal()) {
 		// No need to do additional cleanups for internal buffer.
@@ -510,12 +538,10 @@ Buffer::~Buffer()
 		// ourselves as a child.
 		d->clone_list_->erase(this);
 		// loop over children
-		Impl::BufferPositionMap::iterator it = d->children_positions.begin();
-		Impl::BufferPositionMap::iterator end = d->children_positions.end();
-		for (; it != end; ++it) {
-			Buffer * child = const_cast<Buffer *>(it->first);
-				if (d->clone_list_->erase(child))
-					delete child;
+		for (auto const & p : d->children_positions) {
+			Buffer * child = const_cast<Buffer *>(p.first);
+			if (d->clone_list_->erase(child))
+				delete child;
 		}
 		// if we're the master buffer, then we should get rid of the list
 		// of clones
@@ -524,14 +550,15 @@ Buffer::~Buffer()
 			// children still has a reference to this list. But we will try to
 			// continue, rather than shut down.
 			LATTEST(d->clone_list_->empty());
-			list<CloneList *>::iterator it =
+			// The clone list itself is empty, but it's still referenced in our list
+			// of clones. So let's find it and remove it.
+			CloneStore::iterator it =
 				find(cloned_buffers.begin(), cloned_buffers.end(), d->clone_list_);
 			if (it == cloned_buffers.end()) {
 				// We will leak in this case, but it is safe to continue.
 				LATTEST(false);
 			} else
 				cloned_buffers.erase(it);
-			delete d->clone_list_;
 		}
 		// FIXME Do we really need to do this right before we delete d?
 		// clear references to children in macro tables
@@ -539,15 +566,13 @@ Buffer::~Buffer()
 		d->position_to_children.clear();
 	} else {
 		// loop over children
-		Impl::BufferPositionMap::iterator it = d->children_positions.begin();
-		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);
+		for (auto const & p : d->children_positions) {
+			Buffer * child = const_cast<Buffer *>(p.first);
+			if (theBufferList().isLoaded(child)) {
+				if (theBufferList().isOthersChild(this, child))
+					child->setParent(nullptr);
+				else
+					theBufferList().release(child);
 			}
 		}
 
@@ -577,24 +602,24 @@ Buffer::~Buffer()
 }
 
 
-Buffer * Buffer::cloneFromMaster() const
+Buffer * Buffer::cloneWithChildren() const
 {
 	BufferMap bufmap;
-	cloned_buffers.push_back(new CloneList);
-	CloneList * clones = cloned_buffers.back();
+	cloned_buffers.emplace_back(new CloneList);
+	CloneList_ptr clones = cloned_buffers.back();
 
-	masterBuffer()->cloneWithChildren(bufmap, clones);
+	cloneWithChildren(bufmap, clones);
 
 	// make sure we got cloned
 	BufferMap::const_iterator bit = bufmap.find(this);
-	LASSERT(bit != bufmap.end(), return 0);
+	LASSERT(bit != bufmap.end(), return nullptr);
 	Buffer * cloned_buffer = bit->second;
 
 	return cloned_buffer;
 }
 
 
-void Buffer::cloneWithChildren(BufferMap & bufmap, CloneList * clones) const
+void Buffer::cloneWithChildren(BufferMap & bufmap, CloneList_ptr clones) const
 {
 	// have we already been cloned?
 	if (bufmap.find(this) != bufmap.end())
@@ -620,12 +645,10 @@ void Buffer::cloneWithChildren(BufferMap & bufmap, CloneList * clones) const
 	// math macro caches need to be rethought and simplified.
 	// I am not sure wether we should handle Buffer cloning here or in BufferList.
 	// Right now BufferList knows nothing about buffer clones.
-	Impl::PositionScopeBufferMap::iterator it = d->position_to_children.begin();
-	Impl::PositionScopeBufferMap::iterator end = d->position_to_children.end();
-	for (; it != end; ++it) {
-		DocIterator dit = it->first.clone(buffer_clone);
+	for (auto const & p : d->position_to_children) {
+		DocIterator dit = p.first.clone(buffer_clone);
 		dit.setBuffer(buffer_clone);
-		Buffer * child = const_cast<Buffer *>(it->second.buffer);
+		Buffer * child = const_cast<Buffer *>(p.second.buffer);
 
 		child->cloneWithChildren(bufmap, clones);
 		BufferMap::iterator const bit = bufmap.find(child);
@@ -646,8 +669,8 @@ void Buffer::cloneWithChildren(BufferMap & bufmap, CloneList * clones) const
 
 
 Buffer * Buffer::cloneBufferOnly() const {
-	cloned_buffers.push_back(new CloneList);
-	CloneList * clones = cloned_buffers.back();
+	cloned_buffers.emplace_back(new CloneList);
+	CloneList_ptr clones = cloned_buffers.back();
 	Buffer * buffer_clone = new Buffer(fileName().absFileName(), false, this);
 
 	// The clone needs its own DocumentClass, since running updateBuffer() will
@@ -718,10 +741,8 @@ BufferParams const & Buffer::masterParams() const
 
 	BufferParams & mparams = const_cast<Buffer *>(masterBuffer())->params();
 	// Copy child authors to the params. We need those pointers.
-	AuthorList const & child_authors = params().authors();
-	AuthorList::Authors::const_iterator it = child_authors.begin();
-	for (; it != child_authors.end(); ++it)
-		mparams.authors().record(*it);
+	for (Author const & a : params().authors())
+		mparams.authors().record(a);
 	return mparams;
 }
 
@@ -809,10 +830,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;
 }
@@ -907,6 +927,7 @@ int Buffer::readHeader(Lexer & lex)
 	params().options.erase();
 	params().master.erase();
 	params().float_placement.erase();
+	params().float_alignment.erase();
 	params().paperwidth.erase();
 	params().paperheight.erase();
 	params().leftmargin.erase();
@@ -917,6 +938,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();
@@ -940,6 +964,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];
@@ -987,6 +1012,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;
@@ -1012,20 +1039,13 @@ bool Buffer::readDocument(Lexer & lex)
 	readHeader(lex);
 
 	if (params().output_changes) {
-		bool dvipost    = LaTeXFeatures::isAvailable("dvipost");
 		bool xcolorulem = LaTeXFeatures::isAvailable("ulem") &&
 				  LaTeXFeatures::isAvailable("xcolor");
 
-		if (!dvipost && !xcolorulem) {
+		if (!xcolorulem) {
 			Alert::warning(_("Changes not shown in LaTeX output"),
 				       _("Changes will not be highlighted in LaTeX output, "
-					 "because neither dvipost nor xcolor/ulem are installed.\n"
-					 "Please install these packages or redefine "
-					 "\\lyxadded and \\lyxdeleted in the LaTeX preamble."));
-		} else if (!xcolorulem) {
-			Alert::warning(_("Changes not shown in LaTeX output"),
-				       _("Changes will not be highlighted in LaTeX output "
-					 "when using pdflatex, because xcolor and ulem are not installed.\n"
+					 "because xcolor and ulem are not installed.\n"
 					 "Please install both packages or redefine "
 					 "\\lyxadded and \\lyxdeleted in the LaTeX preamble."));
 		}
@@ -1057,6 +1077,10 @@ bool Buffer::readDocument(Lexer & lex)
 						<< absFileName()
 						<< ") does not include "
 						"this document. Ignoring the master assignment.");
+				// If the master has just been created, un-hide it (#11162)
+				if (!master->fileName().exists())
+					lyx::dispatch(FuncRequest(LFUN_BUFFER_SWITCH,
+								  master->absFileName()));
 			}
 		}
 	}
@@ -1069,16 +1093,18 @@ bool Buffer::readDocument(Lexer & lex)
 		d->old_position = params().origin;
 	else
 		d->old_position = filePath();
+
+	if (!parent())
+		clearIncludeList();
+
 	bool const res = text().read(lex, errorList, d->inset);
 	d->old_position.clear();
 
 	// inform parent buffer about local macros
 	if (parent()) {
 		Buffer const * pbuf = parent();
-		UserMacroSet::const_iterator cit = usermacros.begin();
-		UserMacroSet::const_iterator end = usermacros.end();
-		for (; cit != end; ++cit)
-			pbuf->usermacros.insert(*cit);
+		for (auto const & m : usermacros)
+			pbuf->usermacros.insert(m);
 	}
 	usermacros.clear();
 	updateMacros();
@@ -1094,8 +1120,7 @@ bool Buffer::importString(string const & format, docstring const & contents, Err
 		return false;
 	// It is important to use the correct extension here, since some
 	// converters create a wrong output file otherwise (e.g. html2latex)
-	TempFile const tempfile("Buffer_importStringXXXXXX." + fmt->extension());
-	FileName const name(tempfile.name());
+	FileName const name = tempFileName("Buffer_importStringXXXXXX." + fmt->extension());
 	ofdocstream os(name.toFilesystemEncoding().c_str());
 	// Do not convert os implicitly to bool, since that is forbidden in C++11.
 	bool const success = !(os << contents).fail();
@@ -1111,8 +1136,7 @@ bool Buffer::importString(string const & format, docstring const & contents, Err
 		converted = importFile(format, name, errorList);
 	}
 
-	if (name.exists())
-		name.removeFile();
+	removeTempFile(name);
 	return converted;
 }
 
@@ -1122,10 +1146,14 @@ bool Buffer::importFile(string const & format, FileName const & name, ErrorList
 	if (!theConverters().isReachable(format, "lyx"))
 		return false;
 
-	TempFile const tempfile("Buffer_importFileXXXXXX.lyx");
-	FileName const lyx(tempfile.name());
-	if (theConverters().convert(0, name, lyx, name, format, "lyx", errorList))
-		return readFile(lyx) == ReadSuccess;
+	FileName const lyx = tempFileName("Buffer_importFileXXXXXX.lyx");
+	Converters::RetVal const retval =
+		theConverters().convert(nullptr, name, lyx, name, format, "lyx", errorList);
+	if (retval == Converters::SUCCESS) {
+		bool const success = readFile(lyx) == ReadSuccess;
+		removeTempFile(lyx);
+		return success;
+	}
 
 	return false;
 }
@@ -1221,16 +1249,21 @@ void Buffer::setFullyLoaded(bool value)
 }
 
 
-bool Buffer::lastPreviewError() const
+bool Buffer::freshStartRequired() const
+{
+	return d->require_fresh_start_;
+}
+
+void Buffer::requireFreshStart(bool const b) const
 {
-	return d->preview_error_;
+	d->require_fresh_start_ = b;
 }
 
 
 PreviewLoader * Buffer::loader() const
 {
 	if (!isExporting() && lyxrc.preview == LyXRC::PREVIEW_OFF)
-		return 0;
+		return nullptr;
 	if (!d->preview_loader_)
 		d->preview_loader_ = new PreviewLoader(*this);
 	return d->preview_loader_;
@@ -1240,7 +1273,7 @@ PreviewLoader * Buffer::loader() const
 void Buffer::removePreviews() const
 {
 	delete d->preview_loader_;
-	d->preview_loader_ = 0;
+	d->preview_loader_ = nullptr;
 }
 
 
@@ -1346,14 +1379,37 @@ Buffer::ReadStatus Buffer::convertLyXFormat(FileName const & fn,
 
 
 FileName Buffer::getBackupName() const {
+	map<int, string> const file_formats = {
+	  {544, "23"},
+	  {508, "22"},
+	  {474, "21"},
+	  {413, "20"},
+	  {345, "16"},
+	  {276, "15"},
+	  {245, "14"},
+	  {221, "13"},
+	  {220, "12"},
+	  {218, "1163"},
+	  {217, "116"},
+	  {216, "115"},
+	  {215, "11"},
+	  {210, "010"},
+	  {200, "006"}
+	};
 	FileName const & fn = fileName();
 	string const fname = fn.onlyFileNameWithoutExt();
 	string const fext  = fn.extension() + "~";
 	string const fpath = lyxrc.backupdir_path.empty() ?
 		fn.onlyPath().absFileName() :
 		lyxrc.backupdir_path;
-	string const fform = convert<string>(d->file_format);
-	string const backname = fname + "-lyxformat-" + fform;
+	string backup_suffix;
+	// If file format is from a stable series use version instead of file format
+	auto const it = file_formats.find(d->file_format);
+	if (it != file_formats.end())
+		backup_suffix = "-lyx" + it->second;
+	else
+		backup_suffix = "-lyxformat-" + convert<string>(d->file_format);
+	string const backname = fname + backup_suffix;
 	FileName backup(addName(fpath, addExtension(backname, fext)));
 
 	// limit recursion, just in case
@@ -1383,7 +1439,6 @@ FileName Buffer::getBackupName() const {
 // Should probably be moved to somewhere else: BufferView? GuiView?
 bool Buffer::save() const
 {
-	FileMonitorBlocker block = d->blockFileMonitor();
 	docstring const file = makeDisplayPath(absFileName(), 20);
 	d->filename.refresh();
 
@@ -1433,6 +1488,9 @@ bool Buffer::save() const
 
 	FileName savefile(tempfile->name());
 	LYXERR(Debug::FILES, "Saving to " << savefile.absFileName());
+	if (!savefile.clonePermissions(fileName()))
+		LYXERR0("Failed to clone the permission from " << fileName().absFileName() << " to " << savefile.absFileName());
+
 	if (!writeFile(savefile))
 		return false;
 
@@ -1630,16 +1688,14 @@ bool Buffer::write(ostream & ofs) const
 	// Important: Keep the version formatting in sync with lyx2lyx and
 	//            tex2lyx (bug 7951)
 	ofs << "#LyX " << lyx_version_major << "." << lyx_version_minor
-	    << " created this file. For more info see http://www.lyx.org/\n"
+	    << " created this file. For more info see https://www.lyx.org/\n"
 	    << "\\lyxformat " << LYX_FORMAT << "\n"
 	    << "\\begin_document\n";
 
 	/// For each author, set 'used' to true if there is a change
 	/// by this author in the document; otherwise set it to 'false'.
-	AuthorList::Authors::const_iterator a_it = params().authors().begin();
-	AuthorList::Authors::const_iterator a_end = params().authors().end();
-	for (; a_it != a_end; ++a_it)
-		a_it->setUsed(false);
+	for (Author const & a : params().authors())
+		a.setUsed(false);
 
 	ParIterator const end = const_cast<Buffer *>(this)->par_iterator_end();
 	ParIterator it = const_cast<Buffer *>(this)->par_iterator_begin();
@@ -1680,20 +1736,13 @@ bool Buffer::write(ostream & ofs) const
 }
 
 
-bool Buffer::makeLaTeXFile(FileName const & fname,
+Buffer::ExportStatus Buffer::makeLaTeXFile(FileName const & fname,
 			   string const & original_path,
 			   OutputParams const & runparams_in,
 			   OutputWhat output) const
 {
 	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());
 
@@ -1701,17 +1750,19 @@ bool 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)));
-		return false;
+		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))
-		return false;
+		return ExportError;
 
 	ErrorList & errorList = d->errorLists["Export"];
 	errorList.clear();
-	bool failed_export = false;
+	ExportStatus status = ExportSuccess;
 	otexstream os(ofs);
 
 	// make sure we are ready to export
@@ -1721,32 +1772,45 @@ bool Buffer::makeLaTeXFile(FileName const & fname,
 	updateBuffer();
 	updateMacroInstances(OutputUpdate);
 
+	ExportStatus retval;
 	try {
-		writeLaTeXSource(os, original_path, runparams, output);
+		retval = writeLaTeXSource(os, original_path, runparams, output);
+		if (retval == ExportKilled)
+			return ExportKilled;
 	}
 	catch (EncodingException const & e) {
 		docstring const failed(1, e.failed_char);
 		ostringstream oss;
 		oss << "0x" << hex << e.failed_char << dec;
-		docstring msg = bformat(_("Could not find LaTeX command for character '%1$s'"
-					  " (code point %2$s)"),
-					  failed, from_utf8(oss.str()));
-		errorList.push_back(ErrorItem(msg, _("Some characters of your document are probably not "
-				"representable in the chosen encoding.\n"
-				"Changing the document encoding to utf8 could help."),
-		                              {e.par_id, e.pos}, {e.par_id, e.pos + 1}));
-		failed_export = true;
+		if (getParFromID(e.par_id).paragraph().layout().pass_thru) {
+			docstring msg = bformat(_("Uncodable character '%1$s'"
+						  " (code point %2$s)"),
+						  failed, from_utf8(oss.str()));
+			errorList.push_back(ErrorItem(msg, _("Some characters of your document are not "
+					"representable in specific verbatim contexts.\n"
+					"Changing the document encoding to utf8 could help."),
+						      {e.par_id, e.pos}, {e.par_id, e.pos + 1}));
+		} else {
+			docstring msg = bformat(_("Could not find LaTeX command for character '%1$s'"
+						  " (code point %2$s)"),
+						  failed, from_utf8(oss.str()));
+			errorList.push_back(ErrorItem(msg, _("Some characters of your document are probably not "
+					"representable in the chosen encoding.\n"
+					"Changing the document encoding to utf8 could help."),
+						      {e.par_id, e.pos}, {e.par_id, e.pos + 1}));
+		}
+		status = ExportError;
 	}
 	catch (iconv_codecvt_facet_exception const & e) {
 		errorList.push_back(ErrorItem(_("iconv conversion failed"),
 		                              _(e.what())));
-		failed_export = true;
+		status = ExportError;
 	}
 	catch (exception const & e) {
 		errorList.push_back(ErrorItem(_("conversion failed"),
 		                              _(e.what())));
 		lyxerr << e.what() << endl;
-		failed_export = true;
+		status = ExportError;
 	}
 	catch (...) {
 		lyxerr << "Caught some really weird exception..." << endl;
@@ -1757,7 +1821,7 @@ bool Buffer::makeLaTeXFile(FileName const & fname,
 
 	ofs.close();
 	if (ofs.fail()) {
-		failed_export = true;
+		status = ExportError;
 		lyxerr << "File '" << fname << "' was not closed properly." << endl;
 	}
 
@@ -1765,11 +1829,11 @@ bool Buffer::makeLaTeXFile(FileName const & fname,
 		errorList.clear();
 	else
 		errors("Export");
-	return !failed_export;
+	return status;
 }
 
 
-void Buffer::writeLaTeXSource(otexstream & os,
+Buffer::ExportStatus Buffer::writeLaTeXSource(otexstream & os,
 			   string const & original_path,
 			   OutputParams const & runparams_in,
 			   OutputWhat output) const
@@ -1778,15 +1842,8 @@ void 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();
 
 	// If we are compiling a file standalone, even if this is the
 	// child of some other buffer, let's cut the link here, so the
@@ -1803,8 +1860,11 @@ void 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_hyperref = features.isRequired("hyperref");
+		runparams.use_CJK = features.mustProvide("CJK");
+	}
 	LYXERR(Debug::LATEX, "  Buffer validation done.");
 
 	bool const output_preamble =
@@ -1816,7 +1876,7 @@ void Buffer::writeLaTeXSource(otexstream & os,
 	// first paragraph of the document. (Asger)
 	if (output_preamble && runparams.nice) {
 		os << "%% LyX " << lyx_version << " created this file.  "
-			"For more info, see http://www.lyx.org/.\n"
+			"For more info, see https://www.lyx.org/.\n"
 			"%% Do not edit unless you really know what "
 			"you are doing.\n";
 	}
@@ -1860,7 +1920,7 @@ void Buffer::writeLaTeXSource(otexstream & os,
 			if (!uncodable_glyphs.empty()) {
 				frontend::Alert::warning(
 					_("Uncodable character in file path"),
-					support::bformat(
+					bformat(
 					  _("The path of your document\n"
 					    "(%1$s)\n"
 					    "contains glyphs that are unknown "
@@ -1878,8 +1938,7 @@ void Buffer::writeLaTeXSource(otexstream & os,
 					    "file path name."),
 					  inputpath, uncodable_glyphs));
 			} else {
-				string docdir =
-					support::latex_path(original_path);
+				string docdir = os::latex_path(original_path);
 				if (contains(docdir, '#')) {
 					docdir = subst(docdir, "#", "\\#");
 					os << "\\catcode`\\#=11"
@@ -1890,9 +1949,27 @@ void Buffer::writeLaTeXSource(otexstream & os,
 					os << "\\catcode`\\%=11"
 					      "\\def\\%{%}\\catcode`\\%=14\n";
 				}
+				if (contains(docdir, '~'))
+					docdir = subst(docdir, "~", "\\string~");
+				bool const nonascii = !isAscii(from_utf8(docdir));
+				// LaTeX 2019/10/01 handles non-ascii path without detokenize
+				bool const utfpathlatex = features.isAvailable("LaTeX-2019/10/01");
+				bool const detokenize = !utfpathlatex && nonascii;
+				bool const quote = contains(docdir, ' ');
+				if (utfpathlatex && nonascii)
+					os << "\\UseRawInputEncoding\n";
 				os << "\\makeatletter\n"
-				   << "\\def\\input@path{{"
-				   << docdir << "}}\n"
+				   << "\\def\\input@path{{";
+				if (detokenize)
+					os << "\\detokenize{";
+				if (quote)
+					os << "\"";
+				os << docdir;
+				if (quote)
+					os << "\"";
+				if (detokenize)
+					os << "}";
+				os << "}}\n"
 				   << "\\makeatother\n";
 			}
 		}
@@ -1906,12 +1983,19 @@ void Buffer::writeLaTeXSource(otexstream & os,
 		runparams.use_babel = params().writeLaTeX(os, features,
 							  d->filename.onlyPath());
 
+		// Active characters
+		runparams.active_chars = features.getActiveChars();
+
 		// 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";
+			vector<pair<docstring, string>> const bibfiles =
+				prepareBibFilePaths(runparams, getBibfiles(), true);
+			for (pair<docstring, string> const & file: bibfiles) {
+				os << "\\addbibresource";
+				if (!file.second.empty())
+					os << "[bibencoding=" << file.second << "]";
+				os << "{" << file.first << "}\n";
+			}
 		}
 
 		if (!runparams.dryrun && features.hasPolyglossiaExclusiveLanguages()
@@ -1922,32 +2006,32 @@ void Buffer::writeLaTeXSource(otexstream & os,
 			vector<string> pll = features.getPolyglossiaExclusiveLanguages();
 			if (!bll.empty()) {
 				docstring langs;
-				for (vector<string>::const_iterator it = bll.begin(); it != bll.end(); ++it) {
+				for (string const & sit : bll) {
 					if (!langs.empty())
 						langs += ", ";
-					langs += _(*it);
+					langs += _(sit);
 				}
 				blangs = bll.size() > 1 ?
-					    support::bformat(_("The languages %1$s are only supported by Babel."), langs)
-					  : support::bformat(_("The language %1$s is only supported by Babel."), langs);
+					    bformat(_("The languages %1$s are only supported by Babel."), langs)
+					  : bformat(_("The language %1$s is only supported by Babel."), langs);
 			}
 			if (!pll.empty()) {
 				docstring langs;
-				for (vector<string>::const_iterator it = pll.begin(); it != pll.end(); ++it) {
+				for (string const & pit : pll) {
 					if (!langs.empty())
 						langs += ", ";
-					langs += _(*it);
+					langs += _(pit);
 				}
 				plangs = pll.size() > 1 ?
-					    support::bformat(_("The languages %1$s are only supported by Polyglossia."), langs)
-					  : support::bformat(_("The language %1$s is only supported by Polyglossia."), langs);
+					    bformat(_("The languages %1$s are only supported by Polyglossia."), langs)
+					  : bformat(_("The language %1$s is only supported by Polyglossia."), langs);
 				if (!blangs.empty())
-					plangs += "\n"; 
+					plangs += "\n";
 			}
 
 			frontend::Alert::warning(
 				_("Incompatible Languages!"),
-				support::bformat(
+				bformat(
 				  _("You cannot use the following languages "
 				    "together in one LaTeX document because "
 				    "they require conflicting language packages:\n"
@@ -1963,7 +2047,7 @@ void Buffer::writeLaTeXSource(otexstream & os,
 			// Restore the parenthood if needed
 			if (!runparams.is_child)
 				d->ignore_parent = false;
-			return;
+			return ExportSuccess;
 		}
 
 		// make the body.
@@ -1976,10 +2060,8 @@ void Buffer::writeLaTeXSource(otexstream & os,
 		os.lastChar('\n');
 
 		// output the parent macros
-		MacroSet::iterator it = parentMacros.begin();
-		MacroSet::iterator end = parentMacros.end();
-		for (; it != end; ++it) {
-			int num_lines = (*it)->write(os.os(), true);
+		for (auto const & mac : parentMacros) {
+			int num_lines = mac->write(os.os(), true);
 			os.texrow().newlines(num_lines);
 		}
 
@@ -1988,7 +2070,10 @@ void Buffer::writeLaTeXSource(otexstream & os,
 	LYXERR(Debug::INFO, "preamble finished, now the body.");
 
 	// the real stuff
-	latexParagraphs(*this, text(), os, runparams);
+	try {
+		latexParagraphs(*this, text(), os, runparams);
+	}
+	catch (ConversionException const &) { return ExportKilled; }
 
 	// Restore the parenthood if needed
 	if (!runparams.is_child)
@@ -2007,10 +2092,11 @@ void Buffer::writeLaTeXSource(otexstream & os,
 
 	LYXERR(Debug::INFO, "Finished making LaTeX file.");
 	LYXERR(Debug::INFO, "Row count was " << os.texrow().rows() - 1 << '.');
+	return ExportSuccess;
 }
 
 
-void Buffer::makeDocBookFile(FileName const & fname,
+Buffer::ExportStatus Buffer::makeDocBookFile(FileName const & fname,
 			      OutputParams const & runparams,
 			      OutputWhat output) const
 {
@@ -2018,124 +2104,106 @@ void Buffer::makeDocBookFile(FileName const & fname,
 
 	ofdocstream ofs;
 	if (!openFileWrite(ofs, fname))
-		return;
+		return ExportError;
 
 	// make sure we are ready to export
 	// this needs to be done before we validate
 	updateBuffer();
 	updateMacroInstances(OutputUpdate);
 
-	writeDocBookSource(ofs, fname.absFileName(), runparams, output);
+	ExportStatus const retval =
+		writeDocBookSource(ofs, runparams, output);
+	if (retval == ExportKilled)
+		return ExportKilled;
 
 	ofs.close();
 	if (ofs.fail())
 		lyxerr << "File '" << fname << "' was not closed properly." << endl;
+	return ExportSuccess;
 }
 
 
-void Buffer::writeDocBookSource(odocstream & os, string const & fname,
+Buffer::ExportStatus Buffer::writeDocBookSource(odocstream & os,
 			     OutputParams const & runparams,
 			     OutputWhat output) const
 {
 	LaTeXFeatures features(*this, params(), runparams);
 	validate(features);
+	d->bibinfo_.makeCitationLabels(*this);
 
 	d->texrow.reset();
 
 	DocumentClass const & tclass = params().documentClass();
-	string const & top_element = tclass.latexname();
 
 	bool const output_preamble =
 		output == FullSource || output == OnlyPreamble;
 	bool const output_body =
 	  output == FullSource || output == OnlyBody;
 
-	if (output_preamble) {
-		if (runparams.flavor == OutputParams::XML)
-			os << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
+	XMLStream xs(os);
 
-		// FIXME UNICODE
-		os << "<!DOCTYPE " << from_ascii(top_element) << ' ';
-
-		// FIXME UNICODE
-		if (! tclass.class_header().empty())
-			os << from_ascii(tclass.class_header());
-		else if (runparams.flavor == OutputParams::XML)
-			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\"";
-
-		docstring preamble = params().preamble;
-		if (runparams.flavor != OutputParams::XML ) {
-			preamble += "<!ENTITY % output.print.png \"IGNORE\">\n";
-			preamble += "<!ENTITY % output.print.pdf \"IGNORE\">\n";
-			preamble += "<!ENTITY % output.print.eps \"IGNORE\">\n";
-			preamble += "<!ENTITY % output.print.bmp \"IGNORE\">\n";
-		}
+	if (output_preamble) {
+		// XML preamble, no doctype needed.
+		// Not using XMLStream for this, as the root tag would be in the tag stack and make troubles with the error
+		// detection mechanisms (these are called before the end tag is output, and thus interact with the canary
+		// 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";
 
-		string const name = runparams.nice
-			? changeExtension(absFileName(), ".sgml") : fname;
-		preamble += features.getIncludedFiles(name);
-		preamble += features.getLyXSGMLEntities();
+		// 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\""
+						+ " xmlns:xi=\"http://www.w3.org/2001/XInclude\""
+						+ " version=\"5.2\"";
 
-		if (!preamble.empty()) {
-			os << "\n [ " << preamble << " ]";
-		}
-		os << ">\n\n";
+		os << "<" << from_ascii(tclass.docbookroot()) << " " << from_ascii(params) << ">\n";
 	}
 
 	if (output_body) {
-		string top = top_element;
-		top += " lang=\"";
-		if (runparams.flavor == OutputParams::XML)
-			top += params().language->code();
-		else
-			top += params().language->code().substr(0, 2);
-		top += '"';
-
-		if (!params().options.empty()) {
-			top += ' ';
-			top += params().options;
-		}
-
-		os << "<!-- " << ((runparams.flavor == OutputParams::XML)? "XML" : "SGML")
-				<< " file was created by LyX " << lyx_version
-				<< "\n  See http://www.lyx.org/ for more information -->\n";
-
 		params().documentClass().counters().reset();
 
-		sgml::openTag(os, top);
-		os << '\n';
-		docbookParagraphs(text(), *this, os, runparams);
-		sgml::closeTag(os, top_element);
+		// Start to output the document.
+		docbookParagraphs(text(), *this, xs, runparams);
 	}
+
+	if (output_preamble) {
+		// Close the root element.
+		os << "\n</" << from_ascii(tclass.docbookroot()) << ">";
+	}
+	return ExportSuccess;
 }
 
 
-void Buffer::makeLyXHTMLFile(FileName const & fname,
+Buffer::ExportStatus Buffer::makeLyXHTMLFile(FileName const & fname,
 			      OutputParams const & runparams) const
 {
 	LYXERR(Debug::LATEX, "makeLyXHTMLFile...");
 
 	ofdocstream ofs;
 	if (!openFileWrite(ofs, fname))
-		return;
+		return ExportError;
 
 	// make sure we are ready to export
 	// this has to be done before we validate
 	updateBuffer(UpdateMaster, OutputUpdate);
 	updateMacroInstances(OutputUpdate);
 
-	writeLyXHTMLSource(ofs, runparams, FullSource);
+	ExportStatus const retval = writeLyXHTMLSource(ofs, runparams, FullSource);
+	if (retval == ExportKilled)
+		return retval;
 
 	ofs.close();
 	if (ofs.fail())
 		lyxerr << "File '" << fname << "' was not closed properly." << endl;
+	return retval;
 }
 
 
-void Buffer::writeLyXHTMLSource(odocstream & os,
+Buffer::ExportStatus Buffer::writeLyXHTMLSource(odocstream & os,
 			     OutputParams const & runparams,
 			     OutputWhat output) const
 {
@@ -2162,17 +2230,13 @@ void Buffer::writeLyXHTMLSource(odocstream & os,
 		os << "<title>"
 		   << (doctitle.empty() ?
 		         from_ascii("LyX Document") :
-		         html::htmlize(doctitle, XHTMLStream::ESCAPE_ALL))
+		         xml::escapeString(doctitle, XMLStream::ESCAPE_ALL))
 		   << "</title>\n";
 
 		docstring styles = features.getTClassHTMLPreamble();
 		if (!styles.empty())
 			os << "\n<!-- Text Class Preamble -->\n" << styles << '\n';
 
-		styles = features.getPreambleSnippets().str;
-		if (!styles.empty())
-			os << "\n<!-- Preamble Snippets -->\n" << styles << '\n';
-
 		// we will collect CSS information in a stream, and then output it
 		// either here, as part of the header, or else in a separate file.
 		odocstringstream css;
@@ -2232,17 +2296,22 @@ void Buffer::writeLyXHTMLSource(odocstream & os,
 		bool const output_body_tag = (output != IncludedFile);
 		if (output_body_tag)
 			os << "<body dir=\"auto\">\n";
-		XHTMLStream xs(os);
+		XMLStream xs(os);
 		if (output != IncludedFile)
 			// if we're an included file, the counters are in the master.
 			params().documentClass().counters().reset();
-		xhtmlParagraphs(text(), *this, xs, runparams);
+		try {
+			xhtmlParagraphs(text(), *this, xs, runparams);
+		}
+		catch (ConversionException const &) { return ExportKilled; }
 		if (output_body_tag)
 			os << "</body>\n";
 	}
 
 	if (output_preamble)
 		os << "</html>\n";
+
+	return ExportSuccess;
 }
 
 
@@ -2265,7 +2334,12 @@ int Buffer::runChktex()
 	runparams.flavor = OutputParams::LATEX;
 	runparams.nice = false;
 	runparams.linelen = lyxrc.plaintext_linelen;
-	makeLaTeXFile(FileName(name), org_path, runparams);
+	ExportStatus const retval =
+		makeLaTeXFile(FileName(name), org_path, runparams);
+	if (retval != ExportSuccess) {
+		// error code on failure
+		return -1;
+	}
 
 	TeXErrors terr;
 	Chktex chktex(lyxrc.chktex_command, onlyFileName(name), filePath());
@@ -2299,6 +2373,9 @@ void Buffer::validate(LaTeXFeatures & features) const
 	if (!features.runparams().is_child)
 		params().validate(features);
 
+	if (!parent())
+		clearIncludeList();
+
 	for (Paragraph const & p : paragraphs())
 		p.validate(features);
 
@@ -2318,49 +2395,10 @@ void Buffer::getLabelList(vector<docstring> & list) const
 
 	list.clear();
 	shared_ptr<Toc> toc = d->toc_backend.toc("label");
-	Toc::const_iterator toc_it = toc->begin();
-	Toc::const_iterator end = toc->end();
-	for (; toc_it != end; ++toc_it) {
-		if (toc_it->depth() == 0)
-			list.push_back(toc_it->str());
-	}
-}
-
-
-void Buffer::updateBibfilesCache(UpdateScope scope) const
-{
-	// FIXME This is probably unnecssary, given where we call this.
-	// If this is a child document, use the parent's cache instead.
-	if (parent() && scope != UpdateChildOnly) {
-		masterBuffer()->updateBibfilesCache();
-		return;
-	}
-
-	d->bibfiles_cache_.clear();
-	for (InsetIterator it = inset_iterator_begin(inset()); it; ++it) {
-		if (it->lyxCode() == BIBTEX_CODE) {
-			InsetBibtex const & inset = static_cast<InsetBibtex const &>(*it);
-			support::FileNamePairList const bibfiles = inset.getBibFiles();
-			d->bibfiles_cache_.insert(d->bibfiles_cache_.end(),
-				bibfiles.begin(),
-				bibfiles.end());
-		} else if (it->lyxCode() == INCLUDE_CODE) {
-			InsetInclude & inset = static_cast<InsetInclude &>(*it);
-			Buffer const * const incbuf = inset.getChildBuffer();
-			if (!incbuf)
-				continue;
-			support::FileNamePairList const & bibfiles =
-					incbuf->getBibfilesCache(UpdateChildOnly);
-			if (!bibfiles.empty()) {
-				d->bibfiles_cache_.insert(d->bibfiles_cache_.end(),
-					bibfiles.begin(),
-					bibfiles.end());
-			}
-		}
+	for (auto const & tocit : *toc) {
+		if (tocit.depth() == 0)
+			list.push_back(tocit.str());
 	}
-	d->bibfile_cache_valid_ = true;
-	d->bibinfo_cache_valid_ = false;
-	d->cite_labels_valid_ = false;
 }
 
 
@@ -2368,6 +2406,7 @@ void Buffer::invalidateBibinfoCache() const
 {
 	d->bibinfo_cache_valid_ = false;
 	d->cite_labels_valid_ = false;
+	removeBiblioTempFiles();
 	// also invalidate the cache for the parent buffer
 	Buffer const * const pbuf = d->parent();
 	if (pbuf)
@@ -2375,28 +2414,19 @@ void Buffer::invalidateBibinfoCache() const
 }
 
 
-void Buffer::invalidateBibfileCache() const
-{
-	d->bibfile_cache_valid_ = false;
-	d->bibinfo_cache_valid_ = false;
-	d->cite_labels_valid_ = false;
-	// also invalidate the cache for the parent buffer
-	Buffer const * const pbuf = d->parent();
-	if (pbuf)
-		pbuf->invalidateBibfileCache();
-}
-
-
-support::FileNamePairList const & Buffer::getBibfilesCache(UpdateScope scope) const
+docstring_list const & Buffer::getBibfiles(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.
+	// If this is a child document, use the master instead.
 	Buffer const * const pbuf = masterBuffer();
 	if (pbuf != this && scope != UpdateChildOnly)
-		return pbuf->getBibfilesCache();
+		return pbuf->getBibfiles();
 
-	if (!d->bibfile_cache_valid_)
-		this->updateBibfilesCache(scope);
+	// 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_;
 }
@@ -2411,6 +2441,63 @@ BiblioInfo const & Buffer::masterBibInfo() const
 }
 
 
+BiblioInfo const & Buffer::bibInfo() const
+{
+	return d->bibinfo_;
+}
+
+
+void Buffer::registerBibfiles(const docstring_list & bf) const
+{
+	// We register the bib files in the master buffer,
+	// if there is one, but also in every single buffer,
+	// in case a child is compiled alone.
+	Buffer const * const tmp = masterBuffer();
+	if (tmp != this)
+		tmp->registerBibfiles(bf);
+
+	for (auto const & p : bf) {
+		docstring_list::const_iterator temp =
+			find(d->bibfiles_cache_.begin(), d->bibfiles_cache_.end(), p);
+		if (temp == d->bibfiles_cache_.end())
+			d->bibfiles_cache_.push_back(p);
+	}
+}
+
+
+static map<docstring, FileName> bibfileCache;
+
+FileName Buffer::getBibfilePath(docstring const & bibid) const
+{
+	map<docstring, FileName>::const_iterator it =
+		bibfileCache.find(bibid);
+	if (it != bibfileCache.end()) {
+		// i.e., return bibfileCache[bibid];
+		return it->second;
+	}
+
+	LYXERR(Debug::FILES, "Reading file location for " << bibid);
+	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;
+	return bibfileCache[bibid];
+}
+
+
 void Buffer::checkIfBibInfoCacheIsValid() const
 {
 	// use the master's cache
@@ -2420,12 +2507,35 @@ void Buffer::checkIfBibInfoCacheIsValid() const
 		return;
 	}
 
+	// 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.
-	FileNamePairList const & bibfiles_cache = getBibfilesCache();
-	FileNamePairList::const_iterator ei = bibfiles_cache.begin();
-	FileNamePairList::const_iterator en = bibfiles_cache.end();
-	for (; ei != en; ++ ei) {
-		FileName const fn = ei->second;
+	docstring_list const & bibfiles_cache = getBibfiles();
+	for (auto const & bf : bibfiles_cache) {
+		FileName const fn = getBibfilePath(bf);
 		time_t lastw = fn.lastModified();
 		time_t prevw = d->bibfile_status_[fn];
 		if (lastw != prevw) {
@@ -2437,47 +2547,89 @@ void Buffer::checkIfBibInfoCacheIsValid() const
 }
 
 
-void Buffer::reloadBibInfoCache() const
+void Buffer::clearBibFileCache() const
+{
+	bibfileCache.clear();
+}
+
+
+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) {
-		tmp->reloadBibInfoCache();
+		tmp->reloadBibInfoCache(force);
 		return;
 	}
 
-	checkIfBibInfoCacheIsValid();
-	if (d->bibinfo_cache_valid_)
-		return;
+	if (!force) {
+		checkIfBibInfoCacheIsValid();
+		if (d->bibinfo_cache_valid_)
+			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
+	// add the following line in some other places.
+	clearBibFileCache();
 	d->bibinfo_.clear();
-	collectBibKeys();
+	FileNameList checkedFiles;
+	d->have_bibitems_ = false;
+	collectBibKeys(checkedFiles);
 	d->bibinfo_cache_valid_ = true;
 }
 
 
-void Buffer::collectBibKeys() const
+void Buffer::collectBibKeys(FileNameList & checkedFiles) const
 {
-	for (InsetIterator it = inset_iterator_begin(inset()); it; ++it)
-		it->collectBibKeys(it);
+	if (!parent())
+		clearIncludeList();
+
+	for (InsetIterator it = inset_iterator_begin(inset()); it; ++it) {
+		it->collectBibKeys(it, checkedFiles);
+		if (it->lyxCode() == BIBITEM_CODE) {
+			if (parent() != nullptr)
+				parent()->d->have_bibitems_ = true;
+			else
+				d->have_bibitems_ = true;
+		}
+	}
 }
 
 
-void Buffer::addBiblioInfo(BiblioInfo const & bi) const
+void Buffer::addBiblioInfo(BiblioInfo const & bin) const
 {
-	Buffer const * tmp = masterBuffer();
-	BiblioInfo & masterbi = (tmp == this) ?
-		d->bibinfo_ : tmp->d->bibinfo_;
-	masterbi.mergeBiblioInfo(bi);
+	// 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);
+
+	if (parent() != nullptr) {
+		BiblioInfo & masterbi = parent()->d->bibinfo_;
+		masterbi.mergeBiblioInfo(bin);
+	}
 }
 
 
-void Buffer::addBibTeXInfo(docstring const & key, BibTeXInfo const & bi) const
+void Buffer::addBibTeXInfo(docstring const & key, BibTeXInfo const & bin) const
 {
-	Buffer const * tmp = masterBuffer();
-	BiblioInfo & masterbi = (tmp == this) ?
-		d->bibinfo_ : tmp->d->bibinfo_;
-	masterbi[key] = bi;
+	// We add the bibtex 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[key] = bin;
+
+	if (parent() != nullptr) {
+		BiblioInfo & masterbi = masterBuffer()->d->bibinfo_;
+		masterbi[key] = bin;
+	}
 }
 
 
@@ -2488,6 +2640,11 @@ void Buffer::makeCitationLabels() const
 }
 
 
+void Buffer::invalidateCiteLabels() const
+{
+	masterBuffer()->d->cite_labels_valid_ = false;
+}
+
 bool Buffer::citeLabelsValid() const
 {
 	return masterBuffer()->d->cite_labels_valid_;
@@ -2571,10 +2728,6 @@ bool Buffer::getStatus(FuncRequest const & cmd, FuncStatus & flag)
 		break;
 	}
 
-	case LFUN_BUFFER_CHKTEX:
-		enable = params().isLatex() && !lyxrc.chktex_command.empty();
-		break;
-
 	case LFUN_BUILD_PROGRAM:
 		enable = params().isExportable("program", false);
 		break;
@@ -2616,15 +2769,16 @@ bool Buffer::getStatus(FuncRequest const & cmd, FuncStatus & flag)
 		flag.setOnOff(params().output_changes);
 		break;
 
-	case LFUN_BUFFER_TOGGLE_COMPRESSION: {
+	case LFUN_BUFFER_TOGGLE_COMPRESSION:
 		flag.setOnOff(params().compressed);
 		break;
-	}
 
-	case LFUN_BUFFER_TOGGLE_OUTPUT_SYNC: {
+	case LFUN_BUFFER_TOGGLE_OUTPUT_SYNC:
 		flag.setOnOff(params().output_sync);
 		break;
-	}
+
+	case LFUN_BUFFER_ANONYMIZE:
+		break;
 
 	default:
 		return false;
@@ -2654,7 +2808,8 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
 	string const argument = to_utf8(func.argument());
 	// We'll set this back to false if need be.
 	bool dispatched = true;
-	undo().beginUndoGroup();
+	// This handles undo groups automagically
+	UndoGroupHelper ugh(this);
 
 	switch (func.action()) {
 	case LFUN_BUFFER_TOGGLE_READ_ONLY:
@@ -2686,10 +2841,6 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
 		break;
 	}
 
-	case LFUN_BUFFER_CHKTEX:
-		runChktex();
-		break;
-
 	case LFUN_BUFFER_EXPORT_CUSTOM: {
 		string format_name;
 		string command = split(argument, format_name, ' ');
@@ -2779,18 +2930,16 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
 	}
 
 	case LFUN_BRANCH_ADD: {
-		docstring branch_name = func.argument();
-		if (branch_name.empty()) {
+		docstring branchnames = func.argument();
+		if (branchnames.empty()) {
 			dispatched = false;
 			break;
 		}
 		BranchList & branch_list = params().branchlist();
 		vector<docstring> const branches =
-			getVectorFromString(branch_name, branch_list.separator());
+			getVectorFromString(branchnames, branch_list.separator());
 		docstring msg;
-		for (vector<docstring>::const_iterator it = branches.begin();
-		     it != branches.end(); ++it) {
-			branch_name = *it;
+		for (docstring const & branch_name : branches) {
 			Branch * branch = branch_list.find(branch_name);
 			if (branch) {
 				LYXERR0("Branch " << branch_name << " already exists.");
@@ -2837,7 +2986,7 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
 				// get buffer of external file
 				InsetInclude const & ins =
 					static_cast<InsetInclude const &>(*it);
-				Buffer * child = ins.getChildBuffer();
+				Buffer * child = ins.loadIfNeeded();
 				if (!child)
 					continue;
 				child->dispatch(func, dr);
@@ -2861,8 +3010,6 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
 		if (params().save_transient_properties)
 			undo().recordUndoBufferParams(CursorData());
 		params().track_changes = !params().track_changes;
-		if (!params().track_changes)
-			dr.forceChangesUpdate();
 		break;
 
 	case LFUN_CHANGES_OUTPUT:
@@ -2870,20 +3017,13 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
 			undo().recordUndoBufferParams(CursorData());
 		params().output_changes = !params().output_changes;
 		if (params().output_changes) {
-			bool dvipost    = LaTeXFeatures::isAvailable("dvipost");
 			bool xcolorulem = LaTeXFeatures::isAvailable("ulem") &&
 					  LaTeXFeatures::isAvailable("xcolor");
 
-			if (!dvipost && !xcolorulem) {
+			if (!xcolorulem) {
 				Alert::warning(_("Changes not shown in LaTeX output"),
 					       _("Changes will not be highlighted in LaTeX output, "
-						 "because neither dvipost nor xcolor/ulem are installed.\n"
-						 "Please install these packages or redefine "
-						 "\\lyxadded and \\lyxdeleted in the LaTeX preamble."));
-			} else if (!xcolorulem) {
-				Alert::warning(_("Changes not shown in LaTeX output"),
-					       _("Changes will not be highlighted in LaTeX output "
-						 "when using pdflatex, because xcolor and ulem are not installed.\n"
+						 "because xcolor and ulem are not installed.\n"
 						 "Please install both packages or redefine "
 						 "\\lyxadded and \\lyxdeleted in the LaTeX preamble."));
 			}
@@ -2901,12 +3041,21 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
 		params().output_sync = !params().output_sync;
 		break;
 
+	case LFUN_BUFFER_ANONYMIZE: {
+		undo().recordUndoFullBuffer(CursorData());
+		CursorData cur(doc_iterator_begin(this));
+		for ( ; cur ; cur.forwardPar())
+			cur.paragraph().anonymize();
+		dr.forceBufferUpdate();
+		dr.screenUpdate(Update::Force);
+		break;
+	}
+
 	default:
 		dispatched = false;
 		break;
 	}
 	dr.dispatched(dispatched);
-	undo().endUndoGroup();
 }
 
 
@@ -2915,9 +3064,10 @@ void Buffer::changeLanguage(Language const * from, Language const * to)
 	LASSERT(from, return);
 	LASSERT(to, return);
 
-	for_each(par_iterator_begin(),
-		 par_iterator_end(),
-		 bind(&Paragraph::changeLanguage, _1, params(), from, to));
+	ParIterator it = par_iterator_begin();
+	ParIterator eit = par_iterator_end();
+	for (; it != eit; ++it)
+		it->changeLanguage(params(), from, to);
 }
 
 
@@ -2934,26 +3084,24 @@ bool Buffer::isMultiLingual() const
 
 std::set<Language const *> Buffer::getLanguages() const
 {
-	std::set<Language const *> languages;
-	getLanguages(languages);
-	return languages;
+	std::set<Language const *> langs;
+	getLanguages(langs);
+	return langs;
 }
 
 
-void Buffer::getLanguages(std::set<Language const *> & languages) const
+void Buffer::getLanguages(std::set<Language const *> & langs) const
 {
 	ParConstIterator end = par_iterator_end();
 	// add the buffer language, even if it's not actively used
-	languages.insert(language());
+	langs.insert(language());
 	// iterate over the paragraphs
 	for (ParConstIterator it = par_iterator_begin(); it != end; ++it)
-		it->getLanguages(languages);
+		it->getLanguages(langs);
 	// also children
-	ListOfBuffers clist = getDescendents();
-	ListOfBuffers::const_iterator cit = clist.begin();
-	ListOfBuffers::const_iterator const cen = clist.end();
-	for (; cit != cen; ++cit)
-		(*cit)->getLanguages(languages);
+	ListOfBuffers clist = getDescendants();
+	for (auto const & cit : clist)
+		cit->getLanguages(langs);
 }
 
 
@@ -3008,7 +3156,7 @@ Language const * Buffer::language() const
 }
 
 
-docstring const Buffer::B_(string const & l10n) const
+docstring Buffer::B_(string const & l10n) const
 {
 	return params().B_(l10n);
 }
@@ -3087,11 +3235,8 @@ void Buffer::markDirty()
 	}
 	d->bak_clean = false;
 
-	DepClean::iterator it = d->dep_clean.begin();
-	DepClean::const_iterator const end = d->dep_clean.end();
-
-	for (; it != end; ++it)
-		it->second = false;
+	for (auto & depit : d->dep_clean)
+		depit.second = false;
 }
 
 
@@ -3151,8 +3296,8 @@ string const Buffer::prepareFileNameForLaTeX(string const & name,
 }
 
 
-vector<docstring> const Buffer::prepareBibFilePaths(OutputParams const & runparams,
-						FileNamePairList const bibfilelist,
+vector<pair<docstring, string>> const Buffer::prepareBibFilePaths(OutputParams const & runparams,
+						docstring_list const & bibfilelist,
 						bool const add_extension) const
 {
 	// If we are processing the LaTeX file in a temp directory then
@@ -3165,7 +3310,7 @@ vector<docstring> const Buffer::prepareBibFilePaths(OutputParams const & runpara
 	// Otherwise, store the (maybe absolute) path to the original,
 	// unmangled database name.
 
-	vector<docstring> res;
+	vector<pair<docstring, string>> res;
 
 	// determine the export format
 	string const tex_format = flavor2format(runparams.flavor);
@@ -3173,15 +3318,32 @@ vector<docstring> const Buffer::prepareBibFilePaths(OutputParams const & runpara
 	// 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);
+	for (auto const & bit : bibfilelist) {
+		string utf8input = to_utf8(bit);
 		string database =
 			prepareFileNameForLaTeX(utf8input, ".bib", runparams.nice);
-		FileName const try_in_file =
+		FileName try_in_file =
 			makeAbsPath(database + ".bib", filePath());
-		bool const not_from_texmf = try_in_file.isReadableFile();
+		bool not_from_texmf = try_in_file.isReadableFile();
+		// If the file has not been found, try with the real file name
+		// (it might come from a child in a sub-directory)
+		if (!not_from_texmf) {
+			try_in_file = getBibfilePath(bit);
+			if (try_in_file.isReadableFile()) {
+				// Check if the file is in texmf
+				FileName kpsefile(findtexfile(changeExtension(utf8input, "bib"), "bib", true));
+				not_from_texmf = kpsefile.empty()
+						|| kpsefile.absFileName() != try_in_file.absFileName();
+				if (not_from_texmf)
+					// If this exists, make path relative to the master
+					// FIXME Unicode
+					database =
+						removeExtension(prepareFileNameForLaTeX(
+											to_utf8(makeRelPath(from_utf8(try_in_file.absFileName()),
+																from_utf8(filePath()))),
+											".bib", runparams.nice));
+			}
+		}
 
 		if (!runparams.inComment && !runparams.dryrun && !runparams.nice &&
 		    not_from_texmf) {
@@ -3220,9 +3382,20 @@ vector<docstring> 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 (auto const & 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.
@@ -3281,8 +3454,37 @@ bool Buffer::isReadonly() const
 
 void Buffer::setParent(Buffer const * buffer)
 {
-	// Avoids recursive include.
-	d->setParent(buffer == this ? 0 : buffer);
+	// We need to do some work here to avoid recursive parent structures.
+	// This is the easy case.
+	if (buffer == this) {
+		LYXERR0("Ignoring attempt to set self as parent in\n" << fileName());
+		return;
+	}
+	// Now we check parents going upward, to make sure that IF we set the
+	// parent as requested, we would not generate a recursive include.
+	set<Buffer const *> sb;
+	Buffer const * b = buffer;
+	bool found_recursion = false;
+	while (b) {
+		if (sb.find(b) != sb.end()) {
+			found_recursion = true;
+			break;
+		}
+		sb.insert(b);
+		b = b->parent();
+	}
+
+	if (found_recursion) {
+		LYXERR0("Ignoring attempt to set parent of\n" <<
+			fileName() <<
+			"\nto " <<
+			buffer->fileName() <<
+			"\nbecause that would create a recursive inclusion.");
+		return;
+	}
+
+	// We should be safe now.
+	d->setParent(buffer);
 	updateMacros();
 }
 
@@ -3295,7 +3497,7 @@ Buffer const * Buffer::parent() const
 
 ListOfBuffers Buffer::allRelatives() const
 {
-	ListOfBuffers lb = masterBuffer()->getDescendents();
+	ListOfBuffers lb = masterBuffer()->getDescendants();
 	lb.push_front(const_cast<Buffer *>(masterBuffer()));
 	return lb;
 }
@@ -3303,8 +3505,6 @@ ListOfBuffers Buffer::allRelatives() const
 
 Buffer const * Buffer::masterBuffer() const
 {
-	// FIXME Should be make sure we are not in some kind
-	// of recursive include? A -> B -> A will crash this.
 	Buffer const * const pbuf = d->parent();
 	if (!pbuf)
 		return this;
@@ -3338,10 +3538,8 @@ bool Buffer::hasChildren() const
 void Buffer::collectChildren(ListOfBuffers & clist, bool grand_children) const
 {
 	// loop over children
-	Impl::BufferPositionMap::iterator it = d->children_positions.begin();
-	Impl::BufferPositionMap::iterator end = d->children_positions.end();
-	for (; it != end; ++it) {
-		Buffer * child = const_cast<Buffer *>(it->first);
+	for (auto const & p : d->children_positions) {
+		Buffer * child = const_cast<Buffer *>(p.first);
 		// No duplicates
 		ListOfBuffers::const_iterator bit = find(clist.begin(), clist.end(), child);
 		if (bit != clist.end())
@@ -3368,7 +3566,7 @@ ListOfBuffers Buffer::getChildren() const
 }
 
 
-ListOfBuffers Buffer::getDescendents() const
+ListOfBuffers Buffer::getDescendants() const
 {
 	ListOfBuffers v;
 	collectChildren(v, true);
@@ -3392,7 +3590,7 @@ typename M::const_iterator greatest_below(M & m, typename M::key_type const & x)
 	if (it == m.begin())
 		return m.end();
 
-	it--;
+	--it;
 	return it;
 }
 
@@ -3404,11 +3602,11 @@ MacroData const * Buffer::Impl::getBufferMacro(docstring const & name,
 
 	// if paragraphs have no macro context set, pos will be empty
 	if (pos.empty())
-		return 0;
+		return nullptr;
 
 	// we haven't found anything yet
 	DocIterator bestPos = owner_->par_iterator_begin();
-	MacroData const * bestData = 0;
+	MacroData const * bestData = nullptr;
 
 	// find macro definitions for name
 	NamePositionScopeMacroMap::const_iterator nameIt = macros.find(name);
@@ -3479,11 +3677,11 @@ MacroData const * Buffer::getMacro(docstring const & name,
 	DocIterator const & pos, bool global) const
 {
 	if (d->macro_lock)
-		return 0;
+		return nullptr;
 
 	// query buffer macros
 	MacroData const * data = d->getBufferMacro(name, pos);
-	if (data != 0)
+	if (data != nullptr)
 		return data;
 
 	// If there is a master buffer, query that
@@ -3499,11 +3697,11 @@ MacroData const * Buffer::getMacro(docstring const & name,
 
 	if (global) {
 		data = MacroTable::globalMacros().get(name);
-		if (data != 0)
+		if (data != nullptr)
 			return data;
 	}
 
-	return 0;
+	return nullptr;
 }
 
 
@@ -3523,7 +3721,7 @@ MacroData const * Buffer::getMacro(docstring const & name,
 	// look where the child buffer is included first
 	Impl::BufferPositionMap::iterator it = d->children_positions.find(&child);
 	if (it == d->children_positions.end())
-		return 0;
+		return nullptr;
 
 	// check for macros at the inclusion position
 	return getMacro(name, it->second, global);
@@ -3538,17 +3736,15 @@ 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
-		InsetList const & insets = par.insetList();
-		InsetList::const_iterator iit = insets.begin();
-		InsetList::const_iterator end = insets.end();
-		for (; iit != end; ++iit) {
-			it.pos() = iit->pos;
+		for (auto const & insit : par.insetList()) {
+			it.pos() = insit.pos;
 
 			// is it a nested text inset?
-			if (iit->inset->asInsetText()) {
+			if (insit.inset->asInsetText()) {
 				// Inset needs its own scope?
-				InsetText const * itext = iit->inset->asInsetText();
+				InsetText const * itext = insit.inset->asInsetText();
 				bool newScope = itext->isMacroScope();
 
 				// scope which ends just behind the inset
@@ -3556,14 +3752,14 @@ void Buffer::Impl::updateMacros(DocIterator & it, DocIterator & scope)
 				++insetScope.pos();
 
 				// collect macros in inset
-				it.push_back(CursorSlice(*iit->inset));
+				it.push_back(CursorSlice(*insit.inset));
 				updateMacros(it, newScope ? insetScope : scope);
 				it.pop_back();
 				continue;
 			}
 
-			if (iit->inset->asInsetTabular()) {
-				CursorSlice slice(*iit->inset);
+			if (insit.inset->asInsetTabular()) {
+				CursorSlice slice(*insit.inset);
 				size_t const numcells = slice.nargs();
 				for (; slice.idx() < numcells; slice.forwardIdx()) {
 					it.push_back(slice);
@@ -3574,12 +3770,12 @@ void Buffer::Impl::updateMacros(DocIterator & it, DocIterator & scope)
 			}
 
 			// is it an external file?
-			if (iit->inset->lyxCode() == INCLUDE_CODE) {
+			if (insit.inset->lyxCode() == INCLUDE_CODE) {
 				// get buffer of external file
-				InsetInclude const & inset =
-					static_cast<InsetInclude const &>(*iit->inset);
+				InsetInclude const & incinset =
+					static_cast<InsetInclude const &>(*insit.inset);
 				macro_lock = true;
-				Buffer * child = inset.getChildBuffer();
+				Buffer * child = incinset.loadIfNeeded();
 				macro_lock = false;
 				if (!child)
 					continue;
@@ -3595,19 +3791,19 @@ void Buffer::Impl::updateMacros(DocIterator & it, DocIterator & scope)
 				continue;
 			}
 
-			InsetMath * im = iit->inset->asInsetMath();
+			InsetMath * im = insit.inset->asInsetMath();
 			if (doing_export && im)  {
 				InsetMathHull * hull = im->asHullInset();
 				if (hull)
 					hull->recordLocation(it);
 			}
 
-			if (iit->inset->lyxCode() != MATHMACRO_CODE)
+			if (insit.inset->lyxCode() != MATHMACRO_CODE)
 				continue;
 
 			// get macro data
-			MathMacroTemplate & macroTemplate =
-				*iit->inset->asInsetMath()->asMacroTemplate();
+			InsetMathMacroTemplate & macroTemplate =
+				*insit.inset->asInsetMath()->asMacroTemplate();
 			MacroContext mc(owner_, it);
 			macroTemplate.updateToContext(mc);
 
@@ -3674,7 +3870,7 @@ void Buffer::getUsedBranches(std::list<docstring> & result, bool const from_mast
 			// get buffer of external file
 			InsetInclude const & ins =
 				static_cast<InsetInclude const &>(*it);
-			Buffer * child = ins.getChildBuffer();
+			Buffer * child = ins.loadIfNeeded();
 			if (!child)
 				continue;
 			child->getUsedBranches(result, true);
@@ -3703,7 +3899,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, 0);
+			data.updateMacros(nullptr, mc, utype, 0);
 		}
 	}
 }
@@ -3717,16 +3913,16 @@ void Buffer::listMacroNames(MacroNameSet & macros) const
 	d->macro_lock = true;
 
 	// loop over macro names
-	Impl::NamePositionScopeMacroMap::iterator nameIt = d->macros.begin();
-	Impl::NamePositionScopeMacroMap::iterator nameEnd = d->macros.end();
-	for (; nameIt != nameEnd; ++nameIt)
-		macros.insert(nameIt->first);
+	for (auto const & nameit : d->macros)
+		macros.insert(nameit.first);
 
 	// 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 (auto const & p : d->children_positions) {
+		Buffer * child = const_cast<Buffer *>(p.first);
+		// The buffer might have been closed (see #10766).
+		if (theBufferList().isLoaded(child))
+			child->listMacroNames(macros);
+	}
 
 	// call parent
 	Buffer const * const pbuf = d->parent();
@@ -3747,16 +3943,13 @@ void Buffer::listParentMacros(MacroSet & macros, LaTeXFeatures & features) const
 	pbuf->listMacroNames(names);
 
 	// resolve macros
-	MacroNameSet::iterator it = names.begin();
-	MacroNameSet::iterator end = names.end();
-	for (; it != end; ++it) {
+	for (auto const & mit : names) {
 		// defined?
-		MacroData const * data =
-		pbuf->getMacro(*it, *this, false);
+		MacroData const * data = pbuf->getMacro(mit, *this, false);
 		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)
@@ -3773,13 +3966,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;
 }
 
 
@@ -3796,22 +3988,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 const & 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();
+	}
 }
 
 
@@ -3821,26 +4034,25 @@ void Buffer::changeRefsIfUnique(docstring const & from, docstring const & to)
 	reloadBibInfoCache();
 
 	// Check if the label 'from' appears more than once
-	BiblioInfo const & keys = masterBibInfo();
-	BiblioInfo::const_iterator bit  = keys.begin();
-	BiblioInfo::const_iterator bend = keys.end();
 	vector<docstring> labels;
-
-	for (; bit != bend; ++bit)
-		// FIXME UNICODE
-		labels.push_back(bit->first);
+	for (auto const & bibit : masterBibInfo())
+		labels.push_back(bibit.first);
 
 	if (count(labels.begin(), labels.end(), from) > 1)
 		return;
 
 	string const paramName = "key";
-	for (InsetIterator it = inset_iterator_begin(inset()); it; ++it) {
+	UndoGroupHelper ugh(this);
+	InsetIterator it = inset_iterator_begin(inset());
+	for (; it; ++it) {
 		if (it->lyxCode() != CITE_CODE)
 			continue;
 		InsetCommand * inset = it->asInsetCommand();
 		docstring const oldValue = inset->getParam(paramName);
-		if (oldValue == from)
+		if (oldValue == from) {
+			undo().recordUndo(CursorData(it));
 			inset->setParam(paramName, to);
+		}
 	}
 }
 
@@ -3857,6 +4069,9 @@ unique_ptr<TexRow> Buffer::getSourceCode(odocstream & os, string const & format,
 	// No side effect of file copying and image conversion
 	runparams.dryrun = true;
 
+	// Some macros rely on font encoding
+	runparams.main_fontenc = params().main_font_encoding();
+
 	if (output == CurrentParagraph) {
 		runparams.par_begin = par_begin;
 		runparams.par_end = par_end;
@@ -3879,7 +4094,7 @@ unique_ptr<TexRow> Buffer::getSourceCode(odocstream & os, string const & format,
 			par.write(ods, params(), dt);
 			os << from_utf8(ods.str());
 		} else if (runparams.flavor == OutputParams::HTML) {
-			XHTMLStream xs(os);
+			XMLStream xs(os);
 			setMathFlavor(runparams);
 			xhtmlParagraphs(text(), *this, xs, runparams);
 		} else if (runparams.flavor == OutputParams::TEXT) {
@@ -3888,8 +4103,9 @@ unique_ptr<TexRow> Buffer::getSourceCode(odocstream & os, string const & format,
 			// Probably should have some routine with a signature like them.
 			writePlaintextParagraph(*this,
 				text().paragraphs()[par_begin], os, runparams, dummy);
-		} else if (params().isDocBook()) {
-			docbookParagraphs(text(), *this, os, runparams);
+		} else if (runparams.flavor == OutputParams::DOCBOOK5) {
+			XMLStream xs{os};
+			docbookParagraphs(text(), *this, xs, runparams);
 		} else {
 			// If we are previewing a paragraph, even if this is the
 			// child of some other buffer, let's cut the link here,
@@ -3903,6 +4119,7 @@ unique_ptr<TexRow> Buffer::getSourceCode(odocstream & os, string const & format,
 			LaTeXFeatures features(*this, params(), runparams);
 			validate(features);
 			runparams.use_polyglossia = features.usePolyglossia();
+			runparams.use_hyperref = features.isRequired("hyperref");
 			// latex or literate
 			otexstream ots(os);
 			// output above
@@ -3940,8 +4157,8 @@ unique_ptr<TexRow> Buffer::getSourceCode(odocstream & os, string const & format,
 				os << "% "<< _("Plain text does not have a preamble.");
 			} else
 				writePlaintextFile(*this, os, runparams);
-		} else if (params().isDocBook()) {
-				writeDocBookSource(os, absFileName(), runparams, output);
+		} else if (runparams.flavor == OutputParams::DOCBOOK5) {
+			writeDocBookSource(os, runparams, output);
 		} else {
 			// latex or literate
 			otexstream ots(os);
@@ -4026,91 +4243,6 @@ void Buffer::setGuiDelegate(frontend::GuiBufferDelegate * gui)
 }
 
 
-
-namespace {
-
-class AutoSaveBuffer : public ForkedProcess {
-public:
-	///
-	AutoSaveBuffer(Buffer const & buffer, FileName const & fname)
-		: buffer_(buffer), fname_(fname) {}
-	///
-	virtual shared_ptr<ForkedProcess> clone() const
-	{
-		return make_shared<AutoSaveBuffer>(*this);
-	}
-	///
-	int start()
-	{
-		command_ = to_utf8(bformat(_("Auto-saving %1$s"),
-						 from_utf8(fname_.absFileName())));
-		return run(DontWait);
-	}
-private:
-	///
-	virtual int generateChild();
-	///
-	Buffer const & buffer_;
-	FileName fname_;
-};
-
-
-int AutoSaveBuffer::generateChild()
-{
-#if defined(__APPLE__)
-	/* FIXME fork() is not usable for autosave on Mac OS X 10.6 (snow leopard)
-	 *   We should use something else like threads.
-	 *
-	 * Since I do not know how to determine at run time what is the OS X
-	 * version, I just disable forking altogether for now (JMarc)
-	 */
-	pid_t const pid = -1;
-#else
-	// tmp_ret will be located (usually) in /tmp
-	// will that be a problem?
-	// Note that this calls ForkedCalls::fork(), so it's
-	// ok cross-platform.
-	pid_t const pid = fork();
-	// If you want to debug the autosave
-	// you should set pid to -1, and comment out the fork.
-	if (pid != 0 && pid != -1)
-		return pid;
-#endif
-
-	// pid = -1 signifies that lyx was unable
-	// to fork. But we will do the save
-	// anyway.
-	bool failed = false;
-	TempFile tempfile("lyxautoXXXXXX.lyx");
-	tempfile.setAutoRemove(false);
-	FileName const tmp_ret = tempfile.name();
-	if (!tmp_ret.empty()) {
-		if (!buffer_.writeFile(tmp_ret))
-			failed = true;
-		else if (!tmp_ret.moveTo(fname_))
-			failed = true;
-	} else
-		failed = true;
-
-	if (failed) {
-		// failed to write/rename tmp_ret so try writing direct
-		if (!buffer_.writeFile(fname_)) {
-			// It is dangerous to do this in the child,
-			// but safe in the parent, so...
-			if (pid == -1) // emit message signal.
-				buffer_.message(_("Autosave failed!"));
-		}
-	}
-
-	if (pid == 0) // we are the child so...
-		_exit(0);
-
-	return pid;
-}
-
-} // namespace anon
-
-
 FileName Buffer::getEmergencyFileName() const
 {
 	return FileName(d->filename.absFileName() + ".emergency");
@@ -4143,7 +4275,7 @@ void Buffer::removeAutosaveFile() const
 }
 
 
-void Buffer::moveAutosaveFile(support::FileName const & oldauto) const
+void Buffer::moveAutosaveFile(FileName const & oldauto) const
 {
 	FileName const newauto = getAutosaveFileName();
 	oldauto.refresh();
@@ -4184,11 +4316,9 @@ bool Buffer::autoSave() const
 void Buffer::setExportStatus(bool e) const
 {
 	d->doing_export = e;
-	ListOfBuffers clist = getDescendents();
-	ListOfBuffers::const_iterator cit = clist.begin();
-	ListOfBuffers::const_iterator const cen = clist.end();
-	for (; cit != cen; ++cit)
-		(*cit)->d->doing_export = e;
+	ListOfBuffers clist = getDescendants();
+	for (auto const & bit : clist)
+		bit->d->doing_export = e;
 }
 
 
@@ -4209,7 +4339,7 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
 	string & result_file) const
 {
 	bool const update_unincluded =
-			params().maintain_unincluded_children
+			params().maintain_unincluded_children != BufferParams::CM_None
 			&& !params().getIncludedChildren().empty();
 
 	// (1) export with all included children (omit \includeonly)
@@ -4272,11 +4402,10 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
 		// Get shortest path to format
 		converters.buildGraph();
 		Graph::EdgePath path;
-		for (vector<string>::const_iterator it = backs.begin();
-		     it != backs.end(); ++it) {
-			Graph::EdgePath p = converters.getPath(*it, format);
+		for (string const & sit : backs) {
+			Graph::EdgePath p = converters.getPath(sit, format);
 			if (!p.empty() && (path.empty() || p.size() < path.size())) {
-				backend_format = *it;
+				backend_format = sit;
 				path = p;
 			}
 		}
@@ -4284,17 +4413,20 @@ 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;
 		}
 		runparams.flavor = converters.getFlavor(path, this);
-		Graph::EdgePath::const_iterator it = path.begin();
-		Graph::EdgePath::const_iterator en = path.end();
-		for (; it != en; ++it)
-			if (theConverters().get(*it).nice()) {
+		runparams.hyperref_driver = converters.getHyperrefDriver(path);
+		for (auto const & edge : path)
+			if (theConverters().get(edge).nice()) {
 				need_nice_file = true;
 				break;
 			}
@@ -4322,40 +4454,54 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
 	// Plain text backend
 	if (backend_format == "text") {
 		runparams.flavor = OutputParams::TEXT;
-		writePlaintextFile(*this, FileName(filename), runparams);
+		try {
+			writePlaintextFile(*this, FileName(filename), runparams);
+		}
+		catch (ConversionException const &) { return ExportCancel; }
 	}
 	// HTML backend
 	else if (backend_format == "xhtml") {
 		runparams.flavor = OutputParams::HTML;
 		setMathFlavor(runparams);
-		makeLyXHTMLFile(FileName(filename), runparams);
+		if (makeLyXHTMLFile(FileName(filename), runparams) == ExportKilled)
+			return ExportKilled;
 	} else if (backend_format == "lyx")
 		writeFile(FileName(filename));
-	// Docbook backend
-	else if (params().isDocBook()) {
+	// DocBook backend
+	else if (backend_format == "docbook5") {
+		runparams.flavor = OutputParams::DOCBOOK5;
 		runparams.nice = !put_in_tempdir;
-		makeDocBookFile(FileName(filename), runparams);
+		if (makeDocBookFile(FileName(filename), runparams) == ExportKilled)
+			return ExportKilled;
 	}
 	// LaTeX backend
 	else if (backend_format == format || need_nice_file) {
 		runparams.nice = true;
-		bool const success = makeLaTeXFile(FileName(filename), string(), runparams);
+		ExportStatus const retval =
+			makeLaTeXFile(FileName(filename), string(), runparams);
+		if (retval == ExportKilled)
+			return ExportKilled;
 		if (d->cloned_buffer_)
 			d->cloned_buffer_->d->errorLists["Export"] = d->errorLists["Export"];
-		if (!success)
-			return ExportError;
+		if (retval != ExportSuccess)
+			return retval;
 	} else if (!lyxrc.tex_allows_spaces
 		   && contains(filePath(), ' ')) {
 		Alert::error(_("File name error"),
-			   _("The directory path to the document cannot contain spaces."));
+			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_utf8(filePath())));
 		return ExportTexPathHasSpaces;
 	} else {
 		runparams.nice = false;
-		bool const success = makeLaTeXFile(
-			FileName(filename), filePath(), runparams);
+		ExportStatus const retval =
+			makeLaTeXFile(FileName(filename), filePath(), runparams);
+		if (retval == ExportKilled)
+			return ExportKilled;
 		if (d->cloned_buffer_)
 			d->cloned_buffer_->d->errorLists["Export"] = d->errorLists["Export"];
-		if (!success)
+		if (retval != ExportSuccess)
 			return ExportError;
 	}
 
@@ -4364,9 +4510,13 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
 	ErrorList & error_list = d->errorLists[error_type];
 	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,
-		error_list);
+	Converters::RetVal const retval = 
+		converters.convert(this, FileName(filename), tmp_result_file,
+				   FileName(absFileName()), backend_format, format,
+				   error_list, Converters::none, includeall);
+	if (retval == Converters::KILLED)
+		return ExportCancel;
+	bool success = (retval == Converters::SUCCESS);
 
 	// Emit the signal to show the error list or copy it back to the
 	// cloned Buffer so that it can be emitted afterwards.
@@ -4379,21 +4529,19 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
 		else
 			errors(error_type);
 		// also to the children, in case of master-buffer-view
-		ListOfBuffers clist = getDescendents();
-		ListOfBuffers::const_iterator cit = clist.begin();
-		ListOfBuffers::const_iterator const cen = clist.end();
-		for (; cit != cen; ++cit) {
+		ListOfBuffers clist = getDescendants();
+		for (auto const & bit : clist) {
 			if (runparams.silent)
-				(*cit)->d->errorLists[error_type].clear();
+				bit->d->errorLists[error_type].clear();
 			else if (d->cloned_buffer_) {
 				// Enable reverse search by copying back the
 				// texrow object to the cloned buffer.
 				// FIXME: this is not thread safe.
-				(*cit)->d->cloned_buffer_->d->texrow = (*cit)->d->texrow;
-				(*cit)->d->cloned_buffer_->d->errorLists[error_type] =
-					(*cit)->d->errorLists[error_type];
+				bit->d->cloned_buffer_->d->texrow = bit->d->texrow;
+				bit->d->cloned_buffer_->d->errorLists[error_type] =
+					bit->d->errorLists[error_type];
 			} else
-				(*cit)->errors(error_type, true);
+				bit->errors(error_type, true);
 		}
 	}
 
@@ -4403,8 +4551,8 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
 		// FIXME: There is a possibility of concurrent access to texrow
 		// here from the main GUI thread that should be securized.
 		d->cloned_buffer_->d->texrow = d->texrow;
-		string const error_type = params().bufferFormat();
-		d->cloned_buffer_->d->errorLists[error_type] = d->errorLists[error_type];
+		string const err_type = params().bufferFormat();
+		d->cloned_buffer_->d->errorLists[error_type] = d->errorLists[err_type];
 	}
 
 
@@ -4419,7 +4567,7 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
 		result_file = dest_filename;
 	// We need to copy referenced files (e. g. included graphics
 	// if format == "dvi") to the result dir.
-	vector<ExportedFile> const files =
+	vector<ExportedFile> const extfiles =
 		runparams.exportdata->externalFiles(format);
 	string const dest = runparams.export_folder.empty() ?
 		onlyPath(result_file) : runparams.export_folder;
@@ -4427,11 +4575,13 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
 				 : force_overwrite == ALL_FILES;
 	CopyStatus status = use_force ? FORCE : SUCCESS;
 
-	vector<ExportedFile>::const_iterator it = files.begin();
-	vector<ExportedFile>::const_iterator const en = files.end();
-	for (; it != en && status != CANCEL; ++it) {
-		string const fmt = theFormats().getFormatFromFile(it->sourceName);
-		string fixedName = it->exportName;
+	for (ExportedFile const & exp : extfiles) {
+		if (status == CANCEL) {
+			message(_("Document export cancelled."));
+			return ExportCancel;
+		}
+		string const fmt = theFormats().getFormatFromFile(exp.sourceName);
+		string fixedName = exp.exportName;
 		if (!runparams.export_folder.empty()) {
 			// Relative pathnames starting with ../ will be sanitized
 			// if exporting to a different folder
@@ -4440,16 +4590,12 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
 		}
 		FileName fixedFileName = makeAbsPath(fixedName, dest);
 		fixedFileName.onlyPath().createPath();
-		status = copyFile(fmt, it->sourceName,
+		status = copyFile(fmt, exp.sourceName,
 			fixedFileName,
-			it->exportName, status == FORCE,
+			exp.exportName, status == FORCE,
 			runparams.export_folder.empty());
 	}
 
-	if (status == CANCEL) {
-		message(_("Document export cancelled."));
-		return ExportCancel;
-	}
 
 	if (tmp_result_file.exists()) {
 		// Finally copy the main file
@@ -4482,7 +4628,7 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
 Buffer::ExportStatus Buffer::preview(string const & format) const
 {
 	bool const update_unincluded =
-			params().maintain_unincluded_children
+			params().maintain_unincluded_children != BufferParams::CM_None
 			&& !params().getIncludedChildren().empty();
 	return preview(format, update_unincluded);
 }
@@ -4505,7 +4651,7 @@ Buffer::ExportStatus Buffer::preview(string const & format, bool includeall) con
 	Impl * theimpl = isClone() ? d->cloned_buffer_->d : d;
 	theimpl->preview_file_ = previewFile;
 	theimpl->preview_format_ = format;
-	theimpl->preview_error_ = (status != ExportSuccess);
+	theimpl->require_fresh_start_ = (status != ExportSuccess);
 
 	if (status != ExportSuccess)
 		return status;
@@ -4586,6 +4732,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;
 	}
 
@@ -4667,26 +4843,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;
-		Buffer const * buf = 0;
-		Impl const * p = d;
-		if (err.child_name.empty())
+		int errorRow = err->error_in_line;
+		Buffer const * buf = nullptr;
+		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_->getDescendants()) {
 				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;
@@ -4694,15 +4870,27 @@ 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::setBuffersForInsets() const
+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
 {
-	inset().setBuffer(const_cast<Buffer &>(*this));
+	TeXErrors::Errors::const_iterator err = terr.begin_ref();
+	TeXErrors::Errors::const_iterator end = terr.end_ref();
+
+	d->traverseErrors(err, end, errorList);
 }
 
 
@@ -4714,10 +4902,17 @@ void Buffer::updateBuffer(UpdateScope scope, UpdateType utype) const
 	Buffer const * const master = masterBuffer();
 	DocumentClass const & textclass = master->params().documentClass();
 
-	// do this only if we are the top-level Buffer
-	if (master == this) {
+	docstring_list old_bibfiles;
+	// Do this only if we are the top-level Buffer. We also need to account
+	// for the case of a previewed child with ignored parent here.
+	if (master == this && !d->ignore_parent) {
 		textclass.counters().reset(from_ascii("bibitem"));
 		reloadBibInfoCache();
+		// we will re-read this cache as we go through, but we need
+		// to know whether it's changed to know whether we need to
+		// update the bibinfo cache.
+		old_bibfiles = d->bibfiles_cache_;
+		d->bibfiles_cache_.clear();
 	}
 
 	// keep the buffers to be children in this set. If the call from the
@@ -4733,7 +4928,7 @@ void Buffer::updateBuffer(UpdateScope scope, UpdateType utype) const
 			// not updated during the updateBuffer call and TocModel::toc_ is invalid
 			// (bug 5699). The same happens if the master buffer is open in a different
 			// window. This test catches both possibilities.
-			// See: http://marc.info/?l=lyx-devel&m=138590578911716&w=2
+			// See: https://marc.info/?l=lyx-devel&m=138590578911716&w=2
 			// There remains a problem here: If there is another child open in yet a third
 			// window, that TOC is not updated. So some more general solution is needed at
 			// some point.
@@ -4755,24 +4950,60 @@ void Buffer::updateBuffer(UpdateScope scope, UpdateType utype) const
 	// update all caches
 	clearReferenceCache();
 	updateMacros();
-	setChangesPresent(false);
 
 	Buffer & cbuf = const_cast<Buffer &>(*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();
+	if (scope == UpdateMaster)
+		clearIncludeList();
 	updateBuffer(parit, utype);
 
+	// 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.
 	if (master != this)
-		// 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;
+	// if the bibfiles changed, the cache of bibinfo is invalid
+	docstring_list new_bibfiles = d->bibfiles_cache_;
+	// this is a trick to determine whether the two vectors have
+	// the same elements.
+	sort(new_bibfiles.begin(), new_bibfiles.end());
+	sort(old_bibfiles.begin(), old_bibfiles.end());
+	if (old_bibfiles != new_bibfiles) {
+		LYXERR(Debug::FILES, "Reloading bibinfo cache.");
+		invalidateBibinfoCache();
+		reloadBibInfoCache();
+		// We relied upon the bibinfo cache when recalculating labels. But that
+		// cache was invalid, although we didn't find that out until now. So we
+		// have to do it all again.
+		// That said, the only thing we really need to do is update the citation
+		// labels. Nothing else will have changed. So we could create a new 
+		// UpdateType that would signal that fact, if we needed to do so.
+		parit = cbuf.par_iterator_begin();
+		// we will be re-doing the counters and references and such.
+		textclass.counters().reset();
+		clearReferenceCache();
+		// we should not need to do this again?
+		// updateMacros();
+		updateBuffer(parit, utype);
+		// this will already have been done by reloadBibInfoCache();
+		// d->bibinfo_cache_valid_ = true;
+	}
+	else {
+		LYXERR(Debug::FILES, "Bibfiles unchanged.");
+		// this is also set to true on the other path, by reloadBibInfoCache.
+		d->bibinfo_cache_valid_ = true;
+	}
 	d->cite_labels_valid_ = true;
 	/// FIXME: Perf
+	clearIncludeList();
 	cbuf.tocBackend().update(true, utype);
 	if (scope == UpdateMaster)
 		cbuf.structureChanged();
@@ -4895,16 +5126,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);
@@ -4917,8 +5152,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;
@@ -4930,13 +5167,14 @@ void Buffer::Impl::setLabel(ParIterator & it, UpdateType utype) const
 			break;
 		}
 
-		// Increase the master counter?
-		if (layout.stepmastercounter && needEnumCounterReset(it))
-			counters.stepMaster(enumcounter, utype);
-
-		// Maybe we have to reset the enumeration counter.
-		if (!layout.resumecounter && needEnumCounterReset(it))
-			counters.reset(enumcounter);
+		if (needEnumCounterReset(it)) {
+			// Increase the master counter?
+			if (layout.stepmastercounter)
+				counters.stepMaster(enumcounter, utype);
+			// Maybe we have to reset the enumeration counter.
+			if (!layout.resumecounter)
+				counters.reset(enumcounter);
+		}
 		counters.step(enumcounter, utype);
 
 		string const & lang = par.getParLanguage(bp)->code();
@@ -4994,8 +5232,9 @@ void Buffer::Impl::setLabel(ParIterator & it, UpdateType utype) const
 }
 
 
-void Buffer::updateBuffer(ParIterator & parit, UpdateType utype) const
+void Buffer::updateBuffer(ParIterator & parit, UpdateType utype, bool const deleted) const
 {
+	pushIncludedBuffer(this);
 	// LASSERT: Is it safe to continue here, or should we just return?
 	LASSERT(parit.pit() == 0, /**/);
 
@@ -5005,6 +5244,7 @@ void Buffer::updateBuffer(ParIterator & parit, UpdateType utype) const
 
 	depth_type maxdepth = 0;
 	pit_type const lastpit = parit.lastpit();
+	bool changed = false;
 	for ( ; parit.pit() <= lastpit ; ++parit.pit()) {
 		// reduce depth if necessary
 		if (parit->params().depth() > maxdepth) {
@@ -5015,7 +5255,7 @@ void Buffer::updateBuffer(ParIterator & parit, UpdateType utype) const
 			 * non-const. This would however be costly in
 			 * terms of code duplication.
 			 */
-			const_cast<Buffer *>(this)->undo().recordUndo(CursorData(parit));
+			CursorData(parit).recordUndo();
 			parit->params().depth(maxdepth);
 		}
 		maxdepth = parit->getMaxDepthAfter();
@@ -5031,17 +5271,21 @@ void Buffer::updateBuffer(ParIterator & parit, UpdateType utype) const
 		// set the counter for this paragraph
 		d->setLabel(parit, utype);
 
-		// update change-tracking flag 
-		parit->addChangesToBuffer(*this);
-
 		// now the insets
-		InsetList::const_iterator iit = parit->insetList().begin();
-		InsetList::const_iterator end = parit->insetList().end();
-		for (; iit != end; ++iit) {
-			parit.pos() = iit->pos;
-			iit->inset->updateBuffer(parit, utype);
+		for (auto const & insit : parit->insetList()) {
+			parit.pos() = insit.pos;
+			insit.inset->updateBuffer(parit, utype, deleted || parit->isDeleted(insit.pos));
+			changed |= insit.inset->isChanged();
 		}
+
+		// are there changes in this paragraph?
+		changed |= parit->isChanged();
 	}
+
+	// set change indicator for the inset (or the cell that the iterator
+	// points to, if applicable).
+	parit.text()->inset().isChanged(changed);
+	popIncludedBuffer();
 }
 
 
@@ -5118,8 +5362,11 @@ void Buffer::Impl::updateStatistics(DocIterator & from, DocIterator & to, bool s
 					++word_count_;
 					inword = true;
 				}
-				if (ins && ins->isLetter())
-					++char_count_;
+				if (ins && ins->isLetter()) {
+					odocstringstream os;
+					ins->toString(os);
+					char_count_ += os.str().length();
+				}
 				else if (ins && ins->isSpace())
 					++blank_count_;
 				else {
@@ -5154,17 +5401,23 @@ int Buffer::charCount(bool with_blanks) const
 }
 
 
+bool Buffer::areChangesPresent() const
+{
+	return inset().isChanged();
+}
+
+
 Buffer::ReadStatus Buffer::reload()
 {
 	setBusy(true);
-	// c.f. bug http://www.lyx.org/trac/ticket/6587
+	// c.f. bug https://www.lyx.org/trac/ticket/6587
 	removeAutosaveFile();
 	// e.g., read-only status could have changed due to version control
 	d->filename.refresh();
 	docstring const disp_fn = makeDisplayPath(d->filename.absFileName());
 
 	// clear parent. this will get reset if need be.
-	d->setParent(0);
+	d->setParent(nullptr);
 	ReadStatus const status = loadLyXFile();
 	if (status == ReadSuccess) {
 		updateBuffer();
@@ -5223,11 +5476,9 @@ bool Buffer::saveAs(FileName const & fn)
 
 void Buffer::checkChildBuffers()
 {
-	Impl::BufferPositionMap::iterator it = d->children_positions.begin();
-	Impl::BufferPositionMap::iterator const en = d->children_positions.end();
-	for (; it != en; ++it) {
-		DocIterator dit = it->second;
-		Buffer * cbuf = const_cast<Buffer *>(it->first);
+	for (auto const & bit : d->children_positions) {
+		DocIterator dit = bit.second;
+		Buffer * cbuf = const_cast<Buffer *>(bit.first);
 		if (!cbuf || !theBufferList().isLoaded(cbuf))
 			continue;
 		Inset * inset = dit.nextInset();
@@ -5240,8 +5491,8 @@ void Buffer::checkChildBuffers()
 		if (oldloc == newloc)
 			continue;
 		// the location of the child file is incorrect.
-		cbuf->setParent(0);
-		inset_inc->setChildBuffer(0);
+		cbuf->setParent(nullptr);
+		inset_inc->setChildBuffer(nullptr);
 	}
 	// invalidate cache of children
 	d->children_positions.clear();
@@ -5266,7 +5517,7 @@ void Buffer::checkMasterBuffer()
 	if (master->isChild(this))
 		setParent(master);
 	else
-		setParent(0);
+		setParent(nullptr);
 }
 
 
@@ -5299,29 +5550,6 @@ string Buffer::includedFilePath(string const & name, string const & ext) const
 }
 
 
-void Buffer::setChangesPresent(bool b) const
-{
-	d->tracked_changes_present_ = b;
-}
-
-
-bool Buffer::areChangesPresent() const
-{
-	return d->tracked_changes_present_;
-}
-
-
-void Buffer::updateChangesPresent() const
-{
-	LYXERR(Debug::CHANGES, "Buffer::updateChangesPresent");
-	setChangesPresent(false);
-	ParConstIterator it = par_iterator_begin();
-	ParConstIterator const end = par_iterator_end();
-	for (; !areChangesPresent() && it != end; ++it)
-		it->addChangesToBuffer(*this);
-}
-
-
 void Buffer::Impl::refreshFileMonitor()
 {
 	if (file_monitor_ && file_monitor_->filename() == filename.absFileName()) {
@@ -5332,41 +5560,100 @@ void Buffer::Impl::refreshFileMonitor()
 	// The previous file monitor is invalid
 	// This also destroys the previous file monitor and all its connections
 	file_monitor_ = FileSystemWatcher::monitor(filename);
-	fileExternallyModified(false);
 	// file_monitor_ will be destroyed with *this, so it is not going to call a
 	// destroyed object method.
-	file_monitor_->connect([this](){ fileExternallyModified(true); });
+	file_monitor_->connect([this](bool exists) {
+			fileExternallyModified(exists);
+		});
 }
 
 
-void Buffer::Impl::fileExternallyModified(bool modified) const
+void Buffer::Impl::fileExternallyModified(bool const exists)
 {
-	if (modified) {
-		// prevent false positives, because FileMonitorBlocker is not enough on
-		// OSX.
-		if (filename.exists() && checksum_ == filename.checksum()) {
-			LYXERR(Debug::FILES, "External modification but "
-			       "checksum unchanged: " << filename);
-			return;
-		}
-		lyx_clean = bak_clean = false;
+	// ignore notifications after our own saving operations
+	if (checksum_ == filename.checksum()) {
+		LYXERR(Debug::FILES, "External modification but "
+		       "checksum unchanged: " << filename);
+		return;
 	}
-	externally_modified_ = modified;
-	if (wa_)
+	// 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->isExternallyModified();
+	return d->externally_modified_;
 }
 
 
 void Buffer::clearExternalModification() const
 {
-	d->fileExternallyModified(false);
+	d->externally_modified_ = false;
+	if (d->wa_)
+		d->wa_->updateTitles();
+}
+
+
+void Buffer::pushIncludedBuffer(Buffer const * buf) const
+{
+	masterBuffer()->d->include_list_.push_back(buf);
+	if (lyxerr.debugging(Debug::FILES)) {
+		LYXERR0("Pushed. Stack now:");
+		if (masterBuffer()->d->include_list_.empty())
+			LYXERR0("EMPTY!");
+		else
+			for (auto const & b : masterBuffer()->d->include_list_)
+				LYXERR0(b->fileName());
+	}
+}
+
+
+void Buffer::popIncludedBuffer() const
+{
+	masterBuffer()->d->include_list_.pop_back();
+	if (lyxerr.debugging(Debug::FILES)) {
+		LYXERR0("Popped. Stack now:");
+		if (masterBuffer()->d->include_list_.empty())
+			LYXERR0("EMPTY!");
+		else
+			for (auto const & b : masterBuffer()->d->include_list_)
+				LYXERR0(b->fileName());
+	}
+}
+
+
+bool Buffer::isBufferIncluded(Buffer const * buf) const
+{
+	if (!buf)
+		return false;
+	if (lyxerr.debugging(Debug::FILES)) {
+		LYXERR0("Checking for " << buf->fileName() << ". Stack now:");
+		if (masterBuffer()->d->include_list_.empty())
+			LYXERR0("EMPTY!");
+		else
+			for (auto const & b : masterBuffer()->d->include_list_)
+				LYXERR0(b->fileName());
+	}
+	list<Buffer const *> const & blist = masterBuffer()->d->include_list_;
+	return find(blist.begin(), blist.end(), buf) != blist.end();
 }
 
 
+void Buffer::clearIncludeList() const
+{
+	LYXERR(Debug::FILES, "Clearing include list for " << fileName());
+	d->include_list_.clear();
+}
+
 } // namespace lyx