X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBuffer.cpp;h=4f770f18a45e46a65c3717e1e55b66ff1242f649;hb=1929caf4b743dc79a4d2b2adbaf9a0cc537f955f;hp=a85555c169be44bbbe43d1e7d68c23e7f75d900d;hpb=8b9d1b860187338e06e10261b391886d50423239;p=lyx.git

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index a85555c169..4f770f18a4 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -83,6 +83,7 @@
 #include "graphics/GraphicsCache.h"
 #include "graphics/PreviewLoader.h"
 
+#include "frontends/Application.h"
 #include "frontends/alert.h"
 #include "frontends/Delegates.h"
 #include "frontends/WorkAreaManager.h"
@@ -135,7 +136,22 @@ namespace {
 int const LYX_FORMAT = LYX_FORMAT_LYX;
 
 typedef map<string, bool> DepClean;
-typedef map<docstring, pair<InsetLabel const *, Buffer::References> > RefCache;
+
+// 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;
 
 } // namespace
 
@@ -279,7 +295,7 @@ public:
 
 	/// A cache for the bibfiles (including bibfiles of loaded child
 	/// documents), needed for appropriate update of natbib labels.
-	mutable 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
@@ -295,6 +311,8 @@ public:
 	/// 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_;
 
 	/// These two hold the file name and format, written to by
 	/// Buffer::preview and read from by LFUN_BUFFER_VIEW_CACHE.
@@ -305,7 +323,11 @@ public:
 	/// 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;
@@ -382,6 +404,12 @@ public:
 	/// has been externally modified? Can be reset by the user.
 	mutable bool externally_modified_;
 
+	///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;
+
 private:
 	/// So we can force access via the accessors.
 	mutable Buffer const * parent_buffer;
@@ -428,7 +456,7 @@ Buffer::Impl::Impl(Buffer * owner, FileName const & file, bool readonly_,
 	  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),
-	  cite_labels_valid_(false), preview_error_(false),
+	  cite_labels_valid_(false), have_bibitems_(false), preview_error_(false),
 	  inset(0), preview_loader_(0), cloned_buffer_(cloned_buffer),
 	  clone_list_(0), doing_export(false),
 	  tracked_changes_present_(0), externally_modified_(false), parent_buffer(0),
@@ -438,6 +466,11 @@ Buffer::Impl::Impl(Buffer * owner, FileName const & file, bool readonly_,
 	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;
@@ -450,6 +483,7 @@ Buffer::Impl::Impl(Buffer * owner, FileName const & file, bool readonly_,
 	bibinfo_cache_valid_ = cloned_buffer_->d->bibinfo_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;
@@ -562,13 +596,13 @@ Buffer::~Buffer()
 }
 
 
-Buffer * Buffer::cloneFromMaster() const
+Buffer * Buffer::cloneWithChildren() const
 {
 	BufferMap bufmap;
 	cloned_buffers.push_back(new CloneList);
 	CloneList * clones = cloned_buffers.back();
 
-	masterBuffer()->cloneWithChildren(bufmap, clones);
+	cloneWithChildren(bufmap, clones);
 
 	// make sure we got cloned
 	BufferMap::const_iterator bit = bufmap.find(this);
@@ -790,10 +824,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;
 }
@@ -888,6 +921,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();
@@ -898,6 +932,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();
@@ -921,6 +958,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];
@@ -1040,6 +1078,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()));
 			}
 		}
 	}
@@ -1075,8 +1117,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();
@@ -1092,8 +1133,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;
 }
 
@@ -1103,10 +1143,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(0, name, lyx, name, format, "lyx", errorList);
+	if (retval == Converters::SUCCESS) {
+		bool const success = readFile(lyx) == ReadSuccess;
+		removeTempFile(lyx);
+		return success;
+	}
 
 	return false;
 }
@@ -1327,14 +1371,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
@@ -1413,6 +1480,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;
 
@@ -1610,7 +1680,7 @@ 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";
 
@@ -1658,20 +1728,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());
 
@@ -1679,17 +1742,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
@@ -1699,32 +1764,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;
@@ -1735,7 +1813,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;
 	}
 
@@ -1743,11 +1821,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
@@ -1756,15 +1834,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
@@ -1781,8 +1852,10 @@ 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_CJK = features.mustProvide("CJK");
+	}
 	LYXERR(Debug::LATEX, "  Buffer validation done.");
 
 	bool const output_preamble =
@@ -1794,7 +1867,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";
 	}
@@ -1856,8 +1929,7 @@ void Buffer::writeLaTeXSource(otexstream & os,
 					    "file path name."),
 					  inputpath, uncodable_glyphs));
 			} else {
-				string docdir =
-					latex_path(original_path);
+				string docdir = os::latex_path(original_path);
 				if (contains(docdir, '#')) {
 					docdir = subst(docdir, "#", "\\#");
 					os << "\\catcode`\\#=11"
@@ -1868,9 +1940,21 @@ void Buffer::writeLaTeXSource(otexstream & os,
 					os << "\\catcode`\\%=11"
 					      "\\def\\%{%}\\catcode`\\%=14\n";
 				}
+				bool const detokenize = !isAscii(from_utf8(docdir))
+						|| contains(docdir, '~');
+				bool const quote = contains(docdir, ' ');
 				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";
 			}
 		}
@@ -1884,12 +1968,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 =
+			vector<pair<docstring, string>> const bibfiles =
 				prepareBibFilePaths(runparams, getBibfiles(), true);
-			for (docstring const & file: bibfiles)
-				os << "\\addbibresource{" << file << "}\n";
+			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()
@@ -1941,7 +2032,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.
@@ -1964,7 +2055,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)
@@ -1983,10 +2077,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
 {
@@ -1994,22 +2089,26 @@ 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, fname.absFileName(), 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, string const & fname,
 			     OutputParams const & runparams,
 			     OutputWhat output) const
 {
@@ -2038,7 +2137,7 @@ void Buffer::writeDocBookSource(odocstream & os, string const & fname,
 			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\"";
+			    << "\"https://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd\"";
 		else
 			os << " PUBLIC \"-//OASIS//DTD DocBook V4.2//EN\"";
 
@@ -2077,41 +2176,48 @@ void Buffer::writeDocBookSource(odocstream & os, string const & fname,
 
 		os << "<!-- " << ((runparams.flavor == OutputParams::XML)? "XML" : "SGML")
 				<< " file was created by LyX " << lyx_version
-				<< "\n  See http://www.lyx.org/ for more information -->\n";
+				<< "\n  See https://www.lyx.org/ for more information -->\n";
 
 		params().documentClass().counters().reset();
 
 		sgml::openTag(os, top);
 		os << '\n';
-		docbookParagraphs(text(), *this, os, runparams);
+		try {
+			docbookParagraphs(text(), *this, os, runparams);
+		}
+		catch (ConversionException const &) { return ExportKilled; }
 		sgml::closeTag(os, top_element);
 	}
+	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
 {
@@ -2212,13 +2318,18 @@ void Buffer::writeLyXHTMLSource(odocstream & 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;
 }
 
 
@@ -2241,7 +2352,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());
@@ -2313,13 +2429,20 @@ void Buffer::invalidateBibinfoCache() const
 }
 
 
-FileNamePairList const & Buffer::getBibfiles(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 instead.
 	Buffer const * const pbuf = masterBuffer();
 	if (pbuf != this && scope != UpdateChildOnly)
 		return pbuf->getBibfiles();
+
+	// 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_;
 }
 
@@ -2333,20 +2456,63 @@ BiblioInfo const & Buffer::masterBibInfo() const
 }
 
 
-void Buffer::registerBibfiles(FileNamePairList const & bf) 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)
-		return tmp->registerBibfiles(bf);
+		tmp->registerBibfiles(bf);
 
 	for (auto const & p : bf) {
-		FileNamePairList::const_iterator tmp =
+		docstring_list::const_iterator temp =
 			find(d->bibfiles_cache_.begin(), d->bibfiles_cache_.end(), p);
-		if (tmp == d->bibfiles_cache_.end())
+		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
@@ -2356,17 +2522,35 @@ void Buffer::checkIfBibInfoCacheIsValid() const
 		return;
 	}
 
-	// if we already know the cache is invalid, no need to check
-	// the timestamps
+	// 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 = getBibfiles();
-	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) {
@@ -2378,21 +2562,40 @@ 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();
 	FileNameList checkedFiles;
+	d->have_bibitems_ = false;
 	collectBibKeys(checkedFiles);
 	d->bibinfo_cache_valid_ = true;
 }
@@ -2400,26 +2603,45 @@ void Buffer::reloadBibInfoCache() const
 
 void Buffer::collectBibKeys(FileNameList & checkedFiles) const
 {
-	for (InsetIterator it = inset_iterator_begin(inset()); it; ++it)
+	for (InsetIterator it = inset_iterator_begin(inset()); it; ++it) {
 		it->collectBibKeys(it, checkedFiles);
+		if (it->lyxCode() == BIBITEM_CODE) {
+			if (parent() != 0)
+				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() != 0) {
+		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() != 0) {
+		BiblioInfo & masterbi = masterBuffer()->d->bibinfo_;
+		masterbi[key] = bin;
+	}
 }
 
 
@@ -2430,6 +2652,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_;
@@ -2513,10 +2740,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;
@@ -2558,15 +2781,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;
@@ -2596,7 +2820,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:
@@ -2628,10 +2853,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, ' ');
@@ -2721,14 +2942,14 @@ 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 (docstring const & branch_name : branches) {
 			Branch * branch = branch_list.find(branch_name);
@@ -2841,12 +3062,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();
 }
 
 
@@ -2874,24 +3104,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();
 	for (auto const & cit : clist)
-		cit->getLanguages(languages);
+		cit->getLanguages(langs);
 }
 
 
@@ -3025,9 +3255,6 @@ void Buffer::markDirty()
 	}
 	d->bak_clean = false;
 
-	DepClean::iterator it = d->dep_clean.begin();
-	DepClean::const_iterator const end = d->dep_clean.end();
-
 	for (auto & depit : d->dep_clean)
 		depit.second = false;
 }
@@ -3089,8 +3316,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
@@ -3103,7 +3330,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);
@@ -3112,12 +3339,31 @@ vector<docstring> const Buffer::prepareBibFilePaths(OutputParams const & runpara
 	bool found_space = false;
 
 	for (auto const & bit : bibfilelist) {
-		string utf8input = to_utf8(bit.first);
+		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) {
@@ -3156,9 +3402,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 (pair<docstring, string> 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.
@@ -3508,10 +3765,10 @@ void Buffer::Impl::updateMacros(DocIterator & it, DocIterator & scope)
 			// is it an external file?
 			if (insit.inset->lyxCode() == INCLUDE_CODE) {
 				// get buffer of external file
-				InsetInclude const & inset =
+				InsetInclude const & incinset =
 					static_cast<InsetInclude const &>(*insit.inset);
 				macro_lock = true;
-				Buffer * child = inset.getChildBuffer();
+				Buffer * child = incinset.getChildBuffer();
 				macro_lock = false;
 				if (!child)
 					continue;
@@ -3702,13 +3959,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;
 }
 
 
@@ -3725,22 +3981,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 & 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();
+	}
 }
 
 
@@ -3782,6 +4059,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;
@@ -4206,13 +4486,18 @@ 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);
+		runparams.hyperref_driver = converters.getHyperrefDriver(path);
 		for (auto const & edge : path)
 			if (theConverters().get(edge).nice()) {
 				need_nice_file = true;
@@ -4242,40 +4527,53 @@ 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()) {
 		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;
 	}
 
@@ -4284,9 +4582,12 @@ 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);
+	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.
@@ -4321,8 +4622,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];
 	}
 
 
@@ -4502,6 +4803,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;
 	}
 
@@ -4583,26 +4914,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;
+		int errorRow = err->error_in_line;
 		Buffer const * buf = 0;
-		Impl const * p = d;
-		if (err.child_name.empty())
+		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_->getDescendents()) {
 				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;
@@ -4610,12 +4941,30 @@ 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::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
+{
+	TeXErrors::Errors::const_iterator err = terr.begin_ref();
+	TeXErrors::Errors::const_iterator end = terr.end_ref();
+
+	d->traverseErrors(err, end, errorList);
+}
+
+
 void Buffer::updateBuffer(UpdateScope scope, UpdateType utype) const
 {
 	LBUFERR(!text().paragraphs().empty());
@@ -4624,9 +4973,10 @@ void Buffer::updateBuffer(UpdateScope scope, UpdateType utype) const
 	Buffer const * const master = masterBuffer();
 	DocumentClass const & textclass = master->params().documentClass();
 
-	FileNamePairList old_bibfiles;
-	// 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
@@ -4649,7 +4999,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.
@@ -4674,6 +5024,10 @@ void Buffer::updateBuffer(UpdateScope scope, UpdateType utype) const
 	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();
@@ -4687,9 +5041,13 @@ void Buffer::updateBuffer(UpdateScope scope, UpdateType utype) const
 		return;
 
 	// if the bibfiles changed, the cache of bibinfo is invalid
-	sort(d->bibfiles_cache_.begin(), d->bibfiles_cache_.end());
-	// the old one should already be sorted
-	if (old_bibfiles != d->bibfiles_cache_) {
+	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
@@ -4699,10 +5057,21 @@ void Buffer::updateBuffer(UpdateScope scope, UpdateType utype) const
 		// 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();
+		setChangesPresent(false);
 		updateBuffer(parit, utype);
+		// this will already have been done by reloadBibInfoCache();
+		// d->bibinfo_cache_valid_ = true;
 	}
-	else
+	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
 	cbuf.tocBackend().update(true, utype);
@@ -4827,16 +5196,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);
@@ -4938,6 +5311,11 @@ void Buffer::updateBuffer(ParIterator & parit, UpdateType utype) const
 	// to resolve macros in it.
 	parit.text()->setMacrocontextPosition(parit);
 
+	// Reset bibitem counter in master (#8499)
+	Buffer const * const master = masterBuffer();
+	if (master == this && !d->ignore_parent)
+		master->params().documentClass().counters().reset(from_ascii("bibitem"));
+
 	depth_type maxdepth = 0;
 	pit_type const lastpit = parit.lastpit();
 	for ( ; parit.pit() <= lastpit ; ++parit.pit()) {
@@ -5090,7 +5468,7 @@ int Buffer::charCount(bool with_blanks) const
 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();
@@ -5279,7 +5657,6 @@ void Buffer::Impl::fileExternallyModified(bool const exists)
 		       "checksum unchanged: " << filename);
 		return;
 	}
-	lyx_clean = bak_clean = false;
 	// If the file has been deleted, only mark the file as dirty since it is
 	// pointless to prompt for reloading. If later a file is moved into this
 	// location, then the externally modified warning will appear then.