X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBuffer.cpp;h=014dcd6929cb8df769eee32b63d8aedb727635a4;hb=bfc731de452ff0dce6fe6c32f316af4dbd5e78ae;hp=3fdd32b813b71b1a5e9e0a7353e3617146c353c7;hpb=fa0c2d96311d275a6ac971440ea926e03527705a;p=lyx.git

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 3fdd32b813..014dcd6929 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -24,6 +24,8 @@
 #include "Chktex.h"
 #include "Converter.h"
 #include "Counters.h"
+#include "Cursor.h"
+#include "CutAndPaste.h"
 #include "DispatchResult.h"
 #include "DocIterator.h"
 #include "Encoding.h"
@@ -98,8 +100,9 @@
 #include "support/lyxalgo.h"
 #include "support/os.h"
 #include "support/Package.h"
-#include "support/Path.h"
+#include "support/PathChanger.h"
 #include "support/Systemcall.h"
+#include "support/TempFile.h"
 #include "support/textutils.h"
 #include "support/types.h"
 
@@ -112,7 +115,6 @@
 #include <map>
 #include <set>
 #include <sstream>
-#include <stack>
 #include <vector>
 
 using namespace std;
@@ -195,6 +197,9 @@ public:
 	/// is this an unnamed file (New...)?
 	bool unnamed;
 
+	/// is this an internal bufffer?
+	bool internal_buffer;
+
 	/// buffer is r/o
 	bool read_only;
 
@@ -207,6 +212,9 @@ public:
 	 */
 	bool file_fully_loaded;
 
+	/// Ignore the parent (e.g. when exporting a child standalone)?
+	bool ignore_parent;
+
 	///
 	mutable TocBackend toc_backend;
 
@@ -276,7 +284,12 @@ public:
 
 	/// This is here to force the test to be done whenever parent_buffer
 	/// is accessed.
-	Buffer const * parent() const {
+	Buffer const * parent() const
+	{
+		// ignore_parent temporarily "orphans" a buffer
+		// (e.g. if a child is compiled standalone)
+		if (ignore_parent)
+			return 0;
 		// 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.
@@ -289,7 +302,8 @@ public:
 	}
 
 	///
-	void setParent(Buffer const * pb) {
+	void setParent(Buffer const * pb)
+	{
 		if (parent_buffer == pb)
 			// nothing to do
 			return;
@@ -314,10 +328,14 @@ public:
 	/// \p from initial position
 	/// \p to points to the end position
 	void updateStatistics(DocIterator & from, DocIterator & to,
-						  bool skipNoOutput = true);
+			      bool skipNoOutput = true);
 	/// statistics accessor functions
-	int wordCount() const { return word_count_; }
-	int charCount(bool with_blanks) const {
+	int wordCount() const
+	{
+		return word_count_;
+	}
+	int charCount(bool with_blanks) const
+	{
 		return char_count_
 		+ (with_blanks ? blank_count_ : 0);
 	}
@@ -355,11 +373,12 @@ 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),
-	  read_only(readonly_), filename(file), file_fully_loaded(false),
-	  toc_backend(owner), macro_lock(false), timestamp_(0), checksum_(0),
-	  wa_(0), gui_(0), undo_(*owner), bibinfo_cache_valid_(false),
-	  bibfile_cache_valid_(false), cite_labels_valid_(false),
-	  preview_loader_(0), cloned_buffer_(cloned_buffer), clone_list_(0),
+	  internal_buffer(false), read_only(readonly_), filename(file),
+	  file_fully_loaded(false), ignore_parent(false), toc_backend(owner),
+	  macro_lock(false), timestamp_(0), checksum_(0), wa_(0), gui_(0),
+	  undo_(*owner), bibinfo_cache_valid_(false), bibfile_cache_valid_(false),
+	  cite_labels_valid_(false), preview_loader_(0),
+	  cloned_buffer_(cloned_buffer), clone_list_(0),
 	  doing_export(false), parent_buffer(0)
 {
 	if (!cloned_buffer_) {
@@ -379,6 +398,7 @@ Buffer::Impl::Impl(Buffer * owner, FileName const & file, bool readonly_,
 	bibfile_status_ = cloned_buffer_->d->bibfile_status_;
 	cite_labels_valid_ = cloned_buffer_->d->cite_labels_valid_;
 	unnamed = cloned_buffer_->d->unnamed;
+	internal_buffer = cloned_buffer_->d->internal_buffer;
 }
 
 
@@ -432,13 +452,17 @@ Buffer::~Buffer()
 		// if we're the master buffer, then we should get rid of the list
 		// of clones
 		if (!parent()) {
-			// if this is not empty, we have leaked something. worse, one of the
-			// children still has a reference to this list.
-			LASSERT(d->clone_list_->empty(), /* */);
+			// If this is not empty, we have leaked something. Worse, one of the
+			// 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 =
 				find(cloned_buffers.begin(), cloned_buffers.end(), d->clone_list_);
-			LASSERT(it != cloned_buffers.end(), /* */);
-			cloned_buffers.erase(it);
+			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?
@@ -481,7 +505,7 @@ Buffer::~Buffer()
 Buffer * Buffer::cloneFromMaster() const
 {
 	BufferMap bufmap;
-	cloned_buffers.push_back(new CloneList());
+	cloned_buffers.push_back(new CloneList);
 	CloneList * clones = cloned_buffers.back();
 
 	masterBuffer()->cloneWithChildren(bufmap, clones);
@@ -502,11 +526,21 @@ void Buffer::cloneWithChildren(BufferMap & bufmap, CloneList * clones) const
 		return;
 
 	Buffer * buffer_clone = new Buffer(fileName().absFileName(), false, this);
+
+	// The clone needs its own DocumentClass, since running updateBuffer() will
+	// modify it, and we would otherwise be sharing it with the original Buffer.
+	buffer_clone->params().makeDocumentClass();
+	ErrorList el;
+	cap::switchBetweenClasses(
+			params().documentClassPtr(), buffer_clone->params().documentClassPtr(),
+			static_cast<InsetText &>(buffer_clone->inset()), el);
+
 	bufmap[this] = buffer_clone;
 	clones->insert(buffer_clone);
 	buffer_clone->d->clone_list_ = clones;
 	buffer_clone->d->macro_lock = true;
 	buffer_clone->d->children_positions.clear();
+
 	// FIXME (Abdel 09/01/2010): this is too complicated. The whole children_positions and
 	// math macro caches need to be rethought and simplified.
 	// I am not sure wether we should handle Buffer cloning here or in BufferList.
@@ -537,11 +571,21 @@ void Buffer::cloneWithChildren(BufferMap & bufmap, CloneList * clones) const
 
 
 Buffer * Buffer::cloneBufferOnly() const {
-	cloned_buffers.push_back(new CloneList());
+	cloned_buffers.push_back(new CloneList);
 	CloneList * clones = cloned_buffers.back();
 	Buffer * buffer_clone = new Buffer(fileName().absFileName(), false, this);
+
+	// The clone needs its own DocumentClass, since running updateBuffer() will
+	// modify it, and we would otherwise be sharing it with the original Buffer.
+	buffer_clone->params().makeDocumentClass();
+	ErrorList el;
+	cap::switchBetweenClasses(
+			params().documentClassPtr(), buffer_clone->params().documentClassPtr(),
+			static_cast<InsetText &>(buffer_clone->inset()), el);
+
 	clones->insert(buffer_clone);
 	buffer_clone->d->clone_list_ = clones;
+
 	// we won't be cloning the children
 	buffer_clone->d->children_positions.clear();
 	return buffer_clone;
@@ -563,7 +607,7 @@ void Buffer::changed(bool update_metrics) const
 
 frontend::WorkAreaManager & Buffer::workAreaManager() const
 {
-	LASSERT(d->wa_, /**/);
+	LBUFERR(d->wa_);
 	return *d->wa_;
 }
 
@@ -743,7 +787,10 @@ void Buffer::setReadonly(bool const flag)
 
 void Buffer::setFileName(FileName const & fname)
 {
+	bool const changed = fname != d->filename;
 	d->filename = fname;
+	if (changed)
+		lyxvc().file_found_hook(fname);
 	setReadonly(d->filename.isReadOnly());
 	saveCheckSum();
 	updateTitles();
@@ -789,6 +836,8 @@ int Buffer::readHeader(Lexer & lex)
 	params().html_latex_end.clear();
 	params().html_math_img_scale = 1.0;
 	params().output_sync_macro.erase();
+	params().setLocalLayout(string(), false);
+	params().setLocalLayout(string(), true);
 
 	for (int i = 0; i < 4; ++i) {
 		params().user_defined_bullet(i) = ITEMIZE_DEFAULTS[i];
@@ -935,6 +984,49 @@ bool Buffer::readDocument(Lexer & lex)
 }
 
 
+bool Buffer::importString(string const & format, docstring const & contents, ErrorList & errorList)
+{
+	Format const * fmt = formats.getFormat(format);
+	if (!fmt)
+		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());
+	ofdocstream os(name.toFilesystemEncoding().c_str());
+	bool const success = (os << contents);
+	os.close();
+
+	bool converted = false;
+	if (success) {
+		params().compressed = false;
+
+		// remove dummy empty par
+		paragraphs().clear();
+
+		converted = importFile(format, name, errorList);
+	}
+
+	if (name.exists())
+		name.removeFile();
+	return converted;
+}
+
+
+bool Buffer::importFile(string const & format, FileName const & name, ErrorList & 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;
+
+	return false;
+}
+
+
 bool Buffer::readString(string const & s)
 {
 	params().compressed = false;
@@ -945,22 +1037,23 @@ bool Buffer::readString(string const & s)
 	FileName const fn = FileName::tempName("Buffer_readString");
 
 	int file_format;
-	ReadStatus const ret_plf = parseLyXFormat(lex, fn, file_format);
-	if (ret_plf != ReadSuccess)
-		return ret_plf;
+	bool success = parseLyXFormat(lex, fn, file_format) == ReadSuccess;
 
-	if (file_format != LYX_FORMAT) {
+	if (success && file_format != LYX_FORMAT) {
 		// We need to call lyx2lyx, so write the input to a file
 		ofstream os(fn.toFilesystemEncoding().c_str());
 		os << s;
 		os.close();
 		// lyxvc in readFile
-		return readFile(fn) == ReadSuccess;
+		if (readFile(fn) != ReadSuccess)
+			success = false;
 	}
-
-	if (readDocument(lex))
-		return false;
-	return true;
+	else if (success)
+		if (readDocument(lex))
+			success = false;
+	if (fn.exists())
+		fn.removeFile();
+	return success;
 }
 
 
@@ -1080,7 +1173,7 @@ Buffer::ReadStatus Buffer::parseLyXFormat(Lexer & lex,
 Buffer::ReadStatus Buffer::convertLyXFormat(FileName const & fn,
 	FileName & tmpfile, int from_format)
 {
-	tmpfile = FileName::tempName("Buffer_convertLyXFormat");
+	tmpfile = FileName::tempName("Buffer_convertLyXFormatXXXXXX.lyx");
 	if(tmpfile.empty()) {
 		Alert::error(_("Conversion failed"),
 			bformat(_("%1$s is from a different"
@@ -1210,11 +1303,6 @@ bool Buffer::save() const
 
 bool Buffer::writeFile(FileName const & fname) const
 {
-	// FIXME Do we need to do these here? I don't think writing
-	// the LyX file depends upon it. (RGH)
-	// updateBuffer();
-	// updateMacroInstances();
-
 	if (d->read_only && fname == d->filename)
 		return false;
 
@@ -1384,7 +1472,7 @@ bool Buffer::makeLaTeXFile(FileName const & fname,
 
 	ofdocstream ofs;
 	try { ofs.reset(encoding); }
-	catch (iconv_codecvt_facet_exception & e) {
+	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 "
@@ -1411,7 +1499,7 @@ bool Buffer::makeLaTeXFile(FileName const & fname,
 		os.texrow().reset();
 		writeLaTeXSource(os, original_path, runparams, output);
 	}
-	catch (EncodingException & e) {
+	catch (EncodingException const & e) {
 		odocstringstream ods;
 		ods.put(e.failed_char);
 		ostringstream oss;
@@ -1425,7 +1513,7 @@ bool Buffer::makeLaTeXFile(FileName const & fname,
 				e.par_id, e.pos, e.pos + 1));
 		failed_export = true;
 	}
-	catch (iconv_codecvt_facet_exception & e) {
+	catch (iconv_codecvt_facet_exception const & e) {
 		errorList.push_back(ErrorItem(_("iconv conversion failed"),
 			_(e.what()), -1, 0, 0));
 		failed_export = true;
@@ -1454,12 +1542,19 @@ bool Buffer::makeLaTeXFile(FileName const & fname,
 void Buffer::writeLaTeXSource(otexstream & os,
 			   string const & original_path,
 			   OutputParams const & runparams_in,
-         OutputWhat output) const
+			   OutputWhat output) const
 {
 	// The child documents, if any, shall be already loaded at this point.
 
 	OutputParams runparams = runparams_in;
 
+	// 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
+	// file is really independent and no concurring settings from
+	// the master (e.g. branch state) interfere (see #8100).
+	if (!runparams.is_child)
+		d->ignore_parent = true;
+
 	// Classify the unicode characters appearing in math insets
 	Encodings::initUnicodeMath(*this);
 
@@ -1467,12 +1562,13 @@ void Buffer::writeLaTeXSource(otexstream & os,
 	LYXERR(Debug::LATEX, "  Validating buffer...");
 	LaTeXFeatures features(*this, params(), runparams);
 	validate(features);
+	runparams.use_polyglossia = features.usePolyglossia();
 	LYXERR(Debug::LATEX, "  Buffer validation done.");
 
 	bool const output_preamble =
 		output == FullSource || output == OnlyPreamble;
 	bool const output_body =
-	  output == FullSource || output == OnlyBody;
+		output == FullSource || output == OnlyBody;
 
 	// The starting paragraph of the coming rows is the
 	// first paragraph of the document. (Asger)
@@ -1508,9 +1604,8 @@ void Buffer::writeLaTeXSource(otexstream & os,
 			Encoding const * const enc = runparams.encoding;
 			if (enc) {
 				for (size_t n = 0; n < inputpath.size(); ++n) {
-					docstring const glyph =
-						docstring(1, inputpath[n]);
-					if (enc->latexChar(inputpath[n], true) != glyph) {
+					if (!enc->encodable(inputpath[n])) {
+						docstring const glyph(1, inputpath[n]);
 						LYXERR0("Uncodable character '"
 							<< glyph
 							<< "' in input path!");
@@ -1565,15 +1660,18 @@ void Buffer::writeLaTeXSource(otexstream & os,
 		MacroSet parentMacros;
 		listParentMacros(parentMacros, features);
 
-		runparams.use_polyglossia = features.usePolyglossia();
 		// Write the preamble
 		runparams.use_babel = params().writeLaTeX(os, features,
 							  d->filename.onlyPath());
 
 		runparams.use_japanese = features.isRequired("japanese");
 
-		if (!output_body)
+		if (!output_body) {
+			// Restore the parenthood if needed
+			if (!runparams.is_child)
+				d->ignore_parent = false;
 			return;
+		}
 
 		// make the body.
 		os << "\\begin{document}\n";
@@ -1592,21 +1690,12 @@ void Buffer::writeLaTeXSource(otexstream & os,
 
 	LYXERR(Debug::INFO, "preamble finished, now the body.");
 
-	// if we are doing a real file with body, even if this is the
-	// child of some other buffer, let's cut the link here.
-	// This happens for example if only a child document is printed.
-	Buffer const * save_parent = 0;
-	if (output_preamble) {
-		save_parent = d->parent();
-		d->setParent(0);
-	}
-
 	// the real stuff
 	latexParagraphs(*this, text(), os, runparams);
 
 	// Restore the parenthood if needed
-	if (output_preamble)
-		d->setParent(save_parent);
+	if (!runparams.is_child)
+		d->ignore_parent = false;
 
 	// add this just in case after all the paragraphs
 	os << endl;
@@ -1769,11 +1858,11 @@ void Buffer::writeLyXHTMLSource(odocstream & os,
 	bool const output_preamble =
 		output == FullSource || output == OnlyPreamble;
 	bool const output_body =
-	  output == FullSource || output == OnlyBody;
+	  output == FullSource || output == OnlyBody || output == IncludedFile;
 
 	if (output_preamble) {
 		os << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-		   << "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN\" \"http://www.w3.org/TR/MathML2/dtd/xhtml-math11-f.dtd\">\n"
+		   << "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN\" \"http://www.w3.org/TR/2001/REC-MathML2-20010221/dtd/xhtml-math11-f.dtd\">\n"
 		   // FIXME Language should be set properly.
 		   << "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n"
 		   << "<head>\n"
@@ -1852,11 +1941,16 @@ void Buffer::writeLyXHTMLSource(odocstream & os,
 	}
 
 	if (output_body) {
-		os << "<body>\n";
+		bool const output_body_tag = (output != IncludedFile);
+		if (output_body_tag)
+			os << "<body>\n";
 		XHTMLStream xs(os);
-		params().documentClass().counters().reset();
+		if (output != IncludedFile)
+			// if we're an included file, the counters are in the master.
+			params().documentClass().counters().reset();
 		xhtmlParagraphs(text(), *this, xs, runparams);
-		os << "</body>\n";
+		if (output_body_tag)
+			os << "</body>\n";
 	}
 
 	if (output_preamble)
@@ -1892,7 +1986,7 @@ int Buffer::runChktex()
 	if (res == -1) {
 		Alert::error(_("chktex failure"),
 			     _("Could not run chktex successfully."));
-	} else if (res > 0) {
+	} else {
 		ErrorList & errlist = d->errorLists["ChkTeX"];
 		errlist.clear();
 		bufferErrors(terr, errlist);
@@ -1908,7 +2002,11 @@ int Buffer::runChktex()
 
 void Buffer::validate(LaTeXFeatures & features) const
 {
-	params().validate(features);
+	// Validate the buffer params, but not for included
+	// files, since they also use the parent buffer's
+	// params (# 5941)
+	if (!features.runparams().is_child)
+		params().validate(features);
 
 	for_each(paragraphs().begin(), paragraphs().end(),
 		 bind(&Paragraph::validate, _1, ref(features)));
@@ -2091,6 +2189,13 @@ void Buffer::addBibTeXInfo(docstring const & key, BibTeXInfo const & bi) const
 }
 
 
+void Buffer::makeCitationLabels() const
+{
+	Buffer const * const master = masterBuffer();
+	return d->bibinfo_.makeCitationLabels(*master);
+}
+
+
 bool Buffer::citeLabelsValid() const
 {
 	return masterBuffer()->d->cite_labels_valid_;
@@ -2142,57 +2247,70 @@ bool Buffer::getStatus(FuncRequest const & cmd, FuncStatus & flag)
 
 	switch (cmd.action()) {
 
-		case LFUN_BUFFER_TOGGLE_READ_ONLY:
-			flag.setOnOff(isReadonly());
-			break;
+	case LFUN_BUFFER_TOGGLE_READ_ONLY:
+		flag.setOnOff(isReadonly());
+		break;
 
 		// FIXME: There is need for a command-line import.
 		//case LFUN_BUFFER_IMPORT:
 
-		case LFUN_BUFFER_AUTO_SAVE:
-			break;
+	case LFUN_BUFFER_AUTO_SAVE:
+		break;
 
-		case LFUN_BUFFER_EXPORT_CUSTOM:
-			// FIXME: Nothing to check here?
-			break;
+	case LFUN_BUFFER_EXPORT_CUSTOM:
+		// FIXME: Nothing to check here?
+		break;
 
-		case LFUN_BUFFER_EXPORT: {
-			docstring const arg = cmd.argument();
-			if (arg == "custom") {
-				enable = true;
-				break;
-			}
-			string format = to_utf8(arg);
-			size_t pos = format.find(' ');
-			if (pos != string::npos)
-				format = format.substr(0, pos);
-			enable = params().isExportable(format);
-			if (!enable)
-				flag.message(bformat(
-					_("Don't know how to export to format: %1$s"), arg));
+	case LFUN_BUFFER_EXPORT: {
+		docstring const arg = cmd.argument();
+		if (arg == "custom") {
+			enable = true;
 			break;
 		}
+		string format = to_utf8(arg);
+		size_t pos = format.find(' ');
+		if (pos != string::npos)
+			format = format.substr(0, pos);
+		enable = params().isExportable(format);
+		if (!enable)
+			flag.message(bformat(
+					     _("Don't know how to export to format: %1$s"), arg));
+		break;
+	}
 
-		case LFUN_BUFFER_CHKTEX:
-			enable = params().isLatex() && !lyxrc.chktex_command.empty();
-			break;
+	case LFUN_BUFFER_CHKTEX:
+		enable = params().isLatex() && !lyxrc.chktex_command.empty();
+		break;
 
-		case LFUN_BUILD_PROGRAM:
-			enable = params().isExportable("program");
-			break;
+	case LFUN_BUILD_PROGRAM:
+		enable = params().isExportable("program");
+		break;
 
-		case LFUN_BRANCH_ADD:
-		case LFUN_BRANCHES_RENAME:
-		case LFUN_BUFFER_PRINT:
-			// if no Buffer is present, then of course we won't be called!
-			break;
+	case LFUN_BRANCH_ACTIVATE:
+	case LFUN_BRANCH_DEACTIVATE:
+	case LFUN_BRANCH_MASTER_ACTIVATE:
+	case LFUN_BRANCH_MASTER_DEACTIVATE: {
+		bool const master = (cmd.action() == LFUN_BRANCH_MASTER_ACTIVATE
+				     || cmd.action() == LFUN_BRANCH_MASTER_DEACTIVATE);
+		BranchList const & branchList = master ? masterBuffer()->params().branchlist()
+			: params().branchlist();
+		docstring const branchName = cmd.argument();
+		flag.setEnabled(!branchName.empty() && branchList.find(branchName));
+		break;
+	}
 
-		case LFUN_BUFFER_LANGUAGE:
-			enable = !isReadonly();
-			break;
+	case LFUN_BRANCH_ADD:
+	case LFUN_BRANCHES_RENAME:
+	case LFUN_BUFFER_PRINT:
+		// if no Buffer is present, then of course we won't be called!
+		break;
 
-		default:
-			return false;
+	case LFUN_BUFFER_LANGUAGE:
+		enable = !isReadonly();
+		break;
+
+	default:
+		return false;
 	}
 	flag.setEnabled(enable);
 	return true;
@@ -2223,8 +2341,11 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
 
 	switch (func.action()) {
 	case LFUN_BUFFER_TOGGLE_READ_ONLY:
-		if (lyxvc().inUse())
-			lyxvc().toggleReadOnly();
+		if (lyxvc().inUse()) {
+			string log = lyxvc().toggleReadOnly();
+			if (!log.empty())
+				dr.setMessage(log);
+		}
 		else
 			setReadonly(!isReadonly());
 		break;
@@ -2297,6 +2418,42 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
 		resetAutosaveTimers();
 		break;
 
+	case LFUN_BRANCH_ACTIVATE:
+	case LFUN_BRANCH_DEACTIVATE:
+	case LFUN_BRANCH_MASTER_ACTIVATE:
+	case LFUN_BRANCH_MASTER_DEACTIVATE: {
+		bool const master = (func.action() == LFUN_BRANCH_MASTER_ACTIVATE
+				     || func.action() == LFUN_BRANCH_MASTER_DEACTIVATE);
+		Buffer * buf = master ? const_cast<Buffer *>(masterBuffer())
+				      : this;
+
+		docstring const branch_name = func.argument();
+		// the case without a branch name is handled elsewhere
+		if (branch_name.empty()) {
+			dispatched = false;
+			break;
+		}
+		Branch * branch = buf->params().branchlist().find(branch_name);
+		if (!branch) {
+			LYXERR0("Branch " << branch_name << " does not exist.");
+			dr.setError(true);
+			docstring const msg =
+				bformat(_("Branch \"%1$s\" does not exist."), branch_name);
+			dr.setMessage(msg);
+			break;
+		}
+		bool const activate = (func.action() == LFUN_BRANCH_ACTIVATE
+				       || func.action() == LFUN_BRANCH_MASTER_ACTIVATE);
+		if (branch->isSelected() != activate) {
+			buf->undo().recordUndoFullDocument(CursorData());
+			branch->setSelected(activate);
+			dr.setError(false);
+			dr.screenUpdate(Update::Force);
+			dr.forceBufferUpdate();
+		}
+		break;
+	}
+
 	case LFUN_BRANCH_ADD: {
 		docstring branch_name = func.argument();
 		if (branch_name.empty()) {
@@ -2345,7 +2502,7 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
 			if (it->lyxCode() == BRANCH_CODE) {
 				InsetBranch & ins = static_cast<InsetBranch &>(*it);
 				if (ins.branch() == oldname) {
-					undo().recordUndo(it);
+					undo().recordUndo(CursorData(it));
 					ins.rename(newname);
 					success = true;
 					continue;
@@ -2497,8 +2654,8 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
 
 void Buffer::changeLanguage(Language const * from, Language const * to)
 {
-	LASSERT(from, /**/);
-	LASSERT(to, /**/);
+	LASSERT(from, return);
+	LASSERT(to, return);
 
 	for_each(par_iterator_begin(),
 		 par_iterator_end(),
@@ -2609,7 +2766,7 @@ bool Buffer::isClean() const
 
 bool Buffer::isExternallyModified(CheckMethod method) const
 {
-	LASSERT(d->filename.exists(), /**/);
+	LASSERT(d->filename.exists(), return false);
 	// if method == timestamp, check timestamp before checksum
 	return (method == checksum_method
 		|| d->timestamp_ != d->filename.lastModified())
@@ -2665,7 +2822,13 @@ bool Buffer::isUnnamed() const
 /// retrieving fileName() nor for checking if it is unnamed or not.
 bool Buffer::isInternal() const
 {
-	return fileName().extension() == "internal";
+	return d->internal_buffer;
+}
+
+
+void Buffer::setInternal(bool flag)
+{
+	d->internal_buffer = flag;
 }
 
 
@@ -2699,7 +2862,12 @@ string Buffer::absFileName() const
 
 string Buffer::filePath() const
 {
-	return d->filename.onlyPath().absFileName() + "/";
+	string const abs = d->filename.onlyPath().absFileName();
+	if (abs.empty())
+		return abs;
+	int last = abs.length() - 1;
+
+	return abs[last] == '/' ? abs : abs + '/';
 }
 
 
@@ -2861,7 +3029,7 @@ MacroData const * Buffer::Impl::getBufferMacro(docstring const & name,
 				// try previous macro if there is one
 				if (it == nameIt->second.begin())
 					break;
-				it--;
+				--it;
 			}
 		}
 	}
@@ -3196,10 +3364,10 @@ void Buffer::listParentMacros(MacroSet & macros, LaTeXFeatures & features) const
 }
 
 
-Buffer::References & Buffer::references(docstring const & label)
+Buffer::References & Buffer::getReferenceCache(docstring const & label)
 {
 	if (d->parent())
-		return const_cast<Buffer *>(masterBuffer())->references(label);
+		return const_cast<Buffer *>(masterBuffer())->getReferenceCache(label);
 
 	RefCache::iterator it = d->ref_cache_.find(label);
 	if (it != d->ref_cache_.end())
@@ -3215,7 +3383,14 @@ Buffer::References & Buffer::references(docstring const & label)
 
 Buffer::References const & Buffer::references(docstring const & label) const
 {
-	return const_cast<Buffer *>(this)->references(label);
+	return const_cast<Buffer *>(this)->getReferenceCache(label);
+}
+
+
+void Buffer::addReference(docstring const & label, Inset * inset, ParIterator it)
+{
+	References & refs = getReferenceCache(label);
+	refs.push_back(make_pair(inset, it));
 }
 
 
@@ -3238,12 +3413,9 @@ void Buffer::clearReferenceCache() const
 }
 
 
-void Buffer::changeRefsIfUnique(docstring const & from, docstring const & to,
-	InsetCode code)
+void Buffer::changeRefsIfUnique(docstring const & from, docstring const & to)
 {
 	//FIXME: This does not work for child documents yet.
-	LASSERT(code == CITE_CODE, /**/);
-
 	reloadBibInfoCache();
 
 	// Check if the label 'from' appears more than once
@@ -3261,21 +3433,19 @@ void Buffer::changeRefsIfUnique(docstring const & from, docstring const & to,
 
 	string const paramName = "key";
 	for (InsetIterator it = inset_iterator_begin(inset()); it; ++it) {
-		if (it->lyxCode() == code) {
-			InsetCommand * inset = it->asInsetCommand();
-			if (!inset)
-				continue;
-			docstring const oldValue = inset->getParam(paramName);
-			if (oldValue == from)
-				inset->setParam(paramName, to);
-		}
+		if (it->lyxCode() != CITE_CODE) 
+			continue;
+		InsetCommand * inset = it->asInsetCommand();
+		docstring const oldValue = inset->getParam(paramName);
+		if (oldValue == from)
+			inset->setParam(paramName, to);
 	}
 }
 
 
 void Buffer::getSourceCode(odocstream & os, string const format,
 			   pit_type par_begin, pit_type par_end,
-			   OutputWhat output) const
+			   OutputWhat output, bool master) const
 {
 	OutputParams runparams(&params().encoding());
 	runparams.nice = true;
@@ -3298,14 +3468,14 @@ void Buffer::getSourceCode(odocstream & os, string const format,
 					convert<docstring>(par_end - 1))
 			   << "\n\n";
 		}
-		TexRow texrow;
-		texrow.reset();
-		texrow.newline();
-		texrow.newline();
 		// output paragraphs
-		if (params().isDocBook())
-			docbookParagraphs(text(), *this, os, runparams);
-		else if (runparams.flavor == OutputParams::HTML) {
+		if (runparams.flavor == OutputParams::LYX) {
+			Paragraph const & par = text().paragraphs()[par_begin];
+			ostringstream ods;
+			depth_type dt = par.getDepth();
+			par.write(ods, params(), dt);
+			os << from_utf8(ods.str());
+		} else if (runparams.flavor == OutputParams::HTML) {
 			XHTMLStream xs(os);
 			setMathFlavor(runparams);
 			xhtmlParagraphs(text(), *this, xs, runparams);
@@ -3315,10 +3485,34 @@ void 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 we are previewing a paragraph, even if this is the
+			// child of some other buffer, let's cut the link here,
+			// so that no concurring settings from the master
+			// (e.g. branch state) interfere (see #8101).
+			if (!master)
+				d->ignore_parent = true;
+			// We need to validate the Buffer params' features here
+			// in order to know if we should output polyglossia
+			// macros (instead of babel macros)
+			LaTeXFeatures features(*this, params(), runparams);
+			params().validate(features);
+			runparams.use_polyglossia = features.usePolyglossia();
+			TexRow texrow;
+			texrow.reset();
+			texrow.newline();
+			texrow.newline();
 			// latex or literate
 			otexstream ots(os, texrow);
+
+			// the real stuff
 			latexParagraphs(*this, text(), ots, runparams);
+
+			// Restore the parenthood
+			if (!master)
+				d->ignore_parent = false;
 		}
 	} else {
 		os << "% ";
@@ -3329,16 +3523,32 @@ void Buffer::getSourceCode(odocstream & os, string const format,
 		else if (output == OnlyBody)
 			os << _("Preview body");
 		os << "\n\n";
-		d->texrow.reset();
-		d->texrow.newline();
-		d->texrow.newline();
-		if (params().isDocBook())
-			writeDocBookSource(os, absFileName(), runparams, output);
-		else if (runparams.flavor == OutputParams::HTML)
+		if (runparams.flavor == OutputParams::LYX) {
+			ostringstream ods;
+			if (output == FullSource)
+				write(ods);
+			else if (output == OnlyPreamble)
+				params().writeFile(ods);
+			else if (output == OnlyBody)
+				text().write(ods);
+			os << from_utf8(ods.str());
+		} else if (runparams.flavor == OutputParams::HTML) {
 			writeLyXHTMLSource(os, runparams, output);
-		else {
+		} else if (runparams.flavor == OutputParams::TEXT) {
+			if (output == OnlyPreamble) {
+				os << "% "<< _("Plain text does not have a preamble.");
+			} else
+				writePlaintextFile(*this, os, runparams);
+		} else if (params().isDocBook()) {
+				writeDocBookSource(os, absFileName(), runparams, output);
+		} else {
 			// latex or literate
+			d->texrow.reset();
+			d->texrow.newline();
+			d->texrow.newline();
 			otexstream ots(os, d->texrow);
+			if (master)
+				runparams.is_child = true;
 			writeLaTeXSource(ots, string(), runparams, output);
 		}
 	}
@@ -3548,45 +3758,20 @@ bool Buffer::autoSave() const
 	buf->d->bak_clean = true;
 
 	FileName const fname = getAutosaveFileName();
-	if (d->cloned_buffer_) {
-		// If this buffer is cloned, we assume that
-		// we are running in a separate thread already.
-		FileName const tmp_ret = FileName::tempName("lyxauto");
-		if (!tmp_ret.empty()) {
-			writeFile(tmp_ret);
-			// assume successful write of tmp_ret
-			if (tmp_ret.moveTo(fname))
-				return true;
-		}
-		// failed to write/rename tmp_ret so try writing direct
-		return writeFile(fname);
-	} else {
-		/// This function is deprecated as the frontend needs to take care
-		/// of cloning the buffer and autosaving it in another thread. It
-		/// is still here to allow (QT_VERSION < 0x040400).
-		AutoSaveBuffer autosave(*this, fname);
-		autosave.start();
-		return true;
-	}
-}
+	LASSERT(d->cloned_buffer_, return false);
 
-
-// helper class, to guarantee this gets reset properly
-class Buffer::MarkAsExporting {
-public:
-	MarkAsExporting(Buffer const * buf) : buf_(buf)
-	{
-		LASSERT(buf_, /* */);
-		buf_->setExportStatus(true);
-	}
-	~MarkAsExporting()
-	{
-		buf_->setExportStatus(false);
+	// If this buffer is cloned, we assume that
+	// we are running in a separate thread already.
+	FileName const tmp_ret = FileName::tempName("lyxauto");
+	if (!tmp_ret.empty()) {
+		writeFile(tmp_ret);
+		// assume successful write of tmp_ret
+		if (tmp_ret.moveTo(fname))
+			return true;
 	}
-private:
-	Buffer const * const buf_;
-};
-
+	// failed to write/rename tmp_ret so try writing direct
+	return writeFile(fname);
+}
 
 
 void Buffer::setExportStatus(bool e) const
@@ -3673,6 +3858,7 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
 	runparams.includeall = includeall;
 	vector<string> backs = params().backends();
 	Converters converters = theConverters();
+	bool need_nice_file = false;
 	if (find(backs.begin(), backs.end(), format) == backs.end()) {
 		// Get shortest path to format
 		converters.buildGraph();
@@ -3695,7 +3881,14 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
 			}
 			return ExportNoPathToFormat;
 		}
-		runparams.flavor = converters.getFlavor(path);
+		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) {
+				need_nice_file = true;
+				break;
+			}
 
 	} else {
 		backend_format = format;
@@ -3735,15 +3928,13 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
 		makeDocBookFile(FileName(filename), runparams);
 	}
 	// LaTeX backend
-	else if (backend_format == format) {
+	else if (backend_format == format || need_nice_file) {
 		runparams.nice = true;
-		if (!makeLaTeXFile(FileName(filename), string(), runparams)) {
-			if (d->cloned_buffer_) {
-				d->cloned_buffer_->d->errorLists["Export"] =
-					d->errorLists["Export"];
-			}
+		bool const success = makeLaTeXFile(FileName(filename), string(), runparams);
+		if (d->cloned_buffer_)
+			d->cloned_buffer_->d->errorLists["Export"] = d->errorLists["Export"];
+		if (!success)
 			return ExportError;
-		}
 	} else if (!lyxrc.tex_allows_spaces
 		   && contains(filePath(), ' ')) {
 		Alert::error(_("File name error"),
@@ -3751,13 +3942,12 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
 		return ExportTexPathHasSpaces;
 	} else {
 		runparams.nice = false;
-		if (!makeLaTeXFile(FileName(filename), filePath(), runparams)) {
-			if (d->cloned_buffer_) {
-				d->cloned_buffer_->d->errorLists["Export"] =
-					d->errorLists["Export"];
-			}
+		bool const success = makeLaTeXFile(
+			FileName(filename), filePath(), runparams);
+		if (d->cloned_buffer_)
+			d->cloned_buffer_->d->errorLists["Export"] = d->errorLists["Export"];
+		if (!success)
 			return ExportError;
-		}
 	}
 
 	string const error_type = (format == "program")
@@ -3946,6 +4136,7 @@ Buffer::ReadStatus Buffer::loadEmergency()
 					"file."), from_utf8(d->filename.absFileName())));
 			}
 			markDirty();
+			lyxvc().file_found_hook(d->filename);
 			str = _("Document was successfully recovered.");
 		} else
 			str = _("Document was NOT successfully recovered.");
@@ -4009,6 +4200,7 @@ Buffer::ReadStatus Buffer::loadAutosave()
 					from_utf8(d->filename.absFileName())));
 			}
 			markDirty();
+			lyxvc().file_found_hook(d->filename);
 			return ReadSuccess;
 		}
 		return ReadAutosaveFailure;
@@ -4114,13 +4306,17 @@ void Buffer::setBuffersForInsets() const
 
 void Buffer::updateBuffer(UpdateScope scope, UpdateType utype) const
 {
+	LBUFERR(!text().paragraphs().empty());
+
 	// Use the master text class also for child documents
 	Buffer const * const master = masterBuffer();
 	DocumentClass const & textclass = master->params().documentClass();
 
 	// do this only if we are the top-level Buffer
-	if (master == this)
+	if (master == this) {
+		textclass.counters().reset(from_ascii("bibitem"));
 		reloadBibInfoCache();
+	}
 
 	// keep the buffers to be children in this set. If the call from the
 	// master comes back we can see which of them were actually seen (i.e.
@@ -4154,8 +4350,6 @@ void Buffer::updateBuffer(UpdateScope scope, UpdateType utype) const
 
 	Buffer & cbuf = const_cast<Buffer &>(*this);
 
-	LASSERT(!text().paragraphs().empty(), /**/);
-
 	// do the real work
 	ParIterator parit = cbuf.par_iterator_begin();
 	updateBuffer(parit, utype);
@@ -4166,7 +4360,7 @@ void Buffer::updateBuffer(UpdateScope scope, UpdateType utype) const
 
 	d->bibinfo_cache_valid_ = true;
 	d->cite_labels_valid_ = true;
-	cbuf.tocBackend().update();
+	cbuf.tocBackend().update(utype == OutputUpdate);
 	if (scope == UpdateMaster)
 		cbuf.structureChanged();
 }
@@ -4227,7 +4421,7 @@ static depth_type getItemDepth(ParIterator const & it)
 static bool needEnumCounterReset(ParIterator const & it)
 {
 	Paragraph const & par = *it;
-	LASSERT(par.layout().labeltype == LABEL_ENUMERATE, /**/);
+	LASSERT(par.layout().labeltype == LABEL_ENUMERATE, return false);
 	depth_type const cur_depth = par.getDepth();
 	ParIterator prev_it = it;
 	while (prev_it.pit()) {
@@ -4251,9 +4445,11 @@ void Buffer::Impl::setLabel(ParIterator & it, UpdateType utype) const
 	Counters & counters = textclass.counters();
 
 	if (par.params().startOfAppendix()) {
-		// FIXME: only the counter corresponding to toplevel
-		// sectioning should be reset
-		counters.reset();
+		// We want to reset the counter corresponding to toplevel sectioning
+		Layout const & lay = textclass.getTOCLayout();
+		docstring const cnt = lay.counter;
+		if (!cnt.empty())
+			counters.reset(cnt);
 		counters.appendix(true);
 	}
 	par.params().appendix(counters.appendix());
@@ -4272,17 +4468,6 @@ void Buffer::Impl::setLabel(ParIterator & it, UpdateType utype) const
 	}
 
 	switch(layout.labeltype) {
-	case LABEL_COUNTER:
-		if (layout.toclevel <= bp.secnumdepth
-		      && (layout.latextype != LATEX_ENVIRONMENT
-			  || it.text()->isFirstInSequence(it.pit()))) {
-			if (counters.hasCounter(layout.counter))
-				counters.step(layout.counter, utype);
-			par.params().labelString(par.expandLabel(layout, bp));
-		} else
-			par.params().labelString(docstring());
-		break;
-
 	case LABEL_ITEMIZE: {
 		// At some point of time we should do something more
 		// clever here, like:
@@ -4362,19 +4547,34 @@ void Buffer::Impl::setLabel(ParIterator & it, UpdateType utype) const
 		par.params().labelString(docstring());
 		break;
 
+	case LABEL_ABOVE:
+	case LABEL_CENTERED:
+	case LABEL_STATIC: {
+		docstring const & lcounter = layout.counter;
+		if (!lcounter.empty()) {
+			if (layout.toclevel <= bp.secnumdepth
+						&& (layout.latextype != LATEX_ENVIRONMENT
+					|| it.text()->isFirstInSequence(it.pit()))) {
+				if (counters.hasCounter(lcounter))
+					counters.step(lcounter, utype);
+				par.params().labelString(par.expandLabel(layout, bp));
+			} else
+				par.params().labelString(docstring());
+		} else
+			par.params().labelString(par.expandLabel(layout, bp));
+		break;
+	}
+
 	case LABEL_MANUAL:
-	case LABEL_TOP_ENVIRONMENT:
-	case LABEL_CENTERED_TOP_ENVIRONMENT:
-	case LABEL_STATIC:
 	case LABEL_BIBLIO:
 		par.params().labelString(par.expandLabel(layout, bp));
-		break;
 	}
 }
 
 
 void Buffer::updateBuffer(ParIterator & parit, UpdateType utype) const
 {
+	// LASSERT: Is it safe to continue here, or should we just return?
 	LASSERT(parit.pit() == 0, /**/);
 
 	// Set the position of the text in the buffer to be able
@@ -4385,7 +4585,17 @@ void Buffer::updateBuffer(ParIterator & parit, UpdateType utype) const
 	pit_type const lastpit = parit.lastpit();
 	for ( ; parit.pit() <= lastpit ; ++parit.pit()) {
 		// reduce depth if necessary
-		parit->params().depth(min(parit->params().depth(), maxdepth));
+		if (parit->params().depth() > maxdepth) {
+			/** FIXME: this function is const, but
+			 * nevertheless it modifies the buffer. To be
+			 * cleaner, one should modify the buffer in
+			 * another function, which is actually
+			 * non-const. This would however be costly in
+			 * terms of code duplication.
+			 */
+			const_cast<Buffer *>(this)->undo().recordUndo(CursorData(parit));
+			parit->params().depth(maxdepth);
+		}
 		maxdepth = parit->getMaxDepthAfter();
 
 		if (utype == OutputUpdate) {
@@ -4520,7 +4730,7 @@ int Buffer::charCount(bool with_blanks) const
 }
 
 
-Buffer::ReadStatus Buffer::reload()
+Buffer::ReadStatus Buffer::reload(bool clearUndo)
 {
 	setBusy(true);
 	// c.f. bug http://www.lyx.org/trac/ticket/6587
@@ -4538,7 +4748,8 @@ Buffer::ReadStatus Buffer::reload()
 		updateTitles();
 		markClean();
 		message(bformat(_("Document %1$s reloaded."), disp_fn));
-		d->undo_.clear();
+		if (clearUndo)
+			d->undo_.clear();
 	} else {
 		message(bformat(_("Could not reload document %1$s."), disp_fn));
 	}
@@ -4571,6 +4782,7 @@ bool Buffer::saveAs(FileName const & fn)
 		// we need to check that the locations of child buffers
 		// are still valid.
 		checkChildBuffers();
+		checkMasterBuffer();
 		return true;
 	} else {
 		// save failed
@@ -4619,4 +4831,25 @@ void Buffer::checkChildBuffers()
 	d->position_to_children.clear();
 }
 
+
+// If a child has been saved under a different name/path, it might have been
+// orphaned. Therefore the master needs to be reset (bug 8161).
+void Buffer::checkMasterBuffer()
+{
+	Buffer const * const master = masterBuffer();
+	if (master == this)
+		return;
+
+	// necessary to re-register the child (bug 5873)
+	// FIXME: clean up updateMacros (here, only
+	// child registering is needed).
+	master->updateMacros();
+	// (re)set master as master buffer, but only
+	// if we are a real child
+	if (master->isChild(this))
+		setParent(master);
+	else
+		setParent(0);
+}
+
 } // namespace lyx