X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBuffer.cpp;h=cbd46266e938c09351e11982e02dfd00165fb41e;hb=53f8d6d6d373460bdcfebd20d6f826e3915c84ff;hp=0ac68c8db70b5d1e49b0d24afd0595916440a85d;hpb=8eb8e49ebe7e5c7c98dd0954559094ffc9af58b7;p=lyx.git

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 0ac68c8db7..cbd46266e9 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -58,7 +58,6 @@
 #include "SpellChecker.h"
 #include "sgml.h"
 #include "TexRow.h"
-#include "TexStream.h"
 #include "Text.h"
 #include "TextClass.h"
 #include "TocBackend.h"
@@ -354,6 +353,7 @@ private:
 /// Creates the per buffer temporary directory
 static FileName createBufferTmpDir()
 {
+	// FIXME THREAD
 	static int count;
 	// We are in our own directory.  Why bother to mangle name?
 	// In fact I wrote this code to circumvent a problematic behaviour
@@ -529,7 +529,7 @@ void Buffer::cloneWithChildren(BufferMap & bufmap, CloneList * clones) const
 
 	// The clone needs its own DocumentClass, since running updateBuffer() will
 	// modify it, and we would otherwise be sharing it with the original Buffer.
-	buffer_clone->params().makeDocumentClass();
+	buffer_clone->params().makeDocumentClass(true);
 	ErrorList el;
 	cap::switchBetweenClasses(
 			params().documentClassPtr(), buffer_clone->params().documentClassPtr(),
@@ -577,7 +577,7 @@ Buffer * Buffer::cloneBufferOnly() const {
 
 	// The clone needs its own DocumentClass, since running updateBuffer() will
 	// modify it, and we would otherwise be sharing it with the original Buffer.
-	buffer_clone->params().makeDocumentClass();
+	buffer_clone->params().makeDocumentClass(true);
 	ErrorList el;
 	cap::switchBetweenClasses(
 			params().documentClassPtr(), buffer_clone->params().documentClassPtr(),
@@ -636,6 +636,21 @@ BufferParams const & Buffer::params() const
 }
 
 
+BufferParams const & Buffer::masterParams() const
+{
+	if (masterBuffer() == this)
+		return params();
+
+	BufferParams & mparams = const_cast<Buffer *>(masterBuffer())->params();
+	// Copy child authors to the params. We need those pointers.
+	AuthorList const & child_authors = params().authors();
+	AuthorList::Authors::const_iterator it = child_authors.begin();
+	for (; it != child_authors.end(); it++)
+		mparams.authors().record(*it);
+	return mparams;
+}
+
+
 ParagraphList & Buffer::paragraphs()
 {
 	return text().paragraphs();
@@ -913,7 +928,7 @@ bool Buffer::readDocument(Lexer & lex)
 
 	readHeader(lex);
 
-	if (params().outputChanges) {
+	if (params().output_changes) {
 		bool dvipost    = LaTeXFeatures::isAvailable("dvipost");
 		bool xcolorulem = LaTeXFeatures::isAvailable("ulem") &&
 				  LaTeXFeatures::isAvailable("xcolor");
@@ -933,7 +948,7 @@ bool Buffer::readDocument(Lexer & lex)
 		}
 	}
 
-	if (!params().master.empty()) {
+	if (!parent() && !params().master.empty()) {
 		FileName const master_file = makeAbsPath(params().master,
 			   onlyPath(absFileName()));
 		if (isLyXFileName(master_file.absFileName())) {
@@ -994,7 +1009,8 @@ bool Buffer::importString(string const & format, docstring const & contents, Err
 	TempFile const tempfile("Buffer_importStringXXXXXX." + fmt->extension());
 	FileName const name(tempfile.name());
 	ofdocstream os(name.toFilesystemEncoding().c_str());
-	bool const success = (os << contents);
+	// Do not convert os implicitly to bool, since that is forbidden in C++11.
+	bool const success = !(os << contents).fail();
 	os.close();
 
 	bool converted = false;
@@ -1484,7 +1500,6 @@ bool Buffer::makeLaTeXFile(FileName const & fname,
 	if (!openFileWrite(ofs, fname))
 		return false;
 
-	//TexStream ts(ofs.rdbuf(), &texrow());
 	ErrorList & errorList = d->errorLists["Export"];
 	errorList.clear();
 	bool failed_export = false;
@@ -2491,6 +2506,7 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
 					msg += ("\n");
 				msg += bformat(_("Branch \"%1$s\" already exists."), branch_name);
 			} else {
+				undo().recordUndoFullDocument(CursorData());
 				branch_list.add(branch_name);
 				branch = branch_list.find(branch_name);
 				string const x11hexname = X11hexname(branch->color());
@@ -4347,9 +4363,15 @@ void Buffer::updateBuffer(UpdateScope scope, UpdateType utype) const
 		if (master != this) {
 			bufToUpdate.insert(this);
 			master->updateBuffer(UpdateMaster, utype);
-			// Do this here in case the master has no gui associated with it. Then,
-			// the TocModel is not updated and TocModel::toc_ is invalid (bug 5699).
-			if (!master->d->gui_)
+			// If the master buffer has no gui associated with it, then the TocModel is 
+			// 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
+			// 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.
+			if (master->d->gui_ != d->gui_)
 				structureChanged();
 
 			// was buf referenced from the master (i.e. not in bufToUpdate anymore)?