X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBuffer.cpp;h=8ca74103a232a48705cd0814cdb14ab1dba8a768;hb=c5cab5a8f7e1f0f3996c1655c45a0fb88576dd5f;hp=47db5f0552a31bb5a5d4647b354f567c440a42be;hpb=aa9543fa2bcb1bda0435cee5c1a24a2c3d5008b7;p=lyx.git

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 47db5f0552..8ca74103a2 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -562,13 +562,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);
@@ -1041,6 +1041,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()));
 			}
 		}
 	}
@@ -1898,8 +1902,7 @@ Buffer::ExportStatus 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"
@@ -1910,9 +1913,20 @@ Buffer::ExportStatus Buffer::writeLaTeXSource(otexstream & os,
 					os << "\\catcode`\\%=11"
 					      "\\def\\%{%}\\catcode`\\%=14\n";
 				}
+				bool const detokenize = !isAscii(from_utf8(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";
 			}
 		}
@@ -2406,7 +2420,8 @@ BiblioInfo const & Buffer::bibInfo() const
 }
 
 
-void Buffer::registerBibfiles(FileNamePairList const & bf) const {
+void Buffer::registerBibfiles(FileNamePairList const & 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.
@@ -2454,17 +2469,17 @@ void Buffer::checkIfBibInfoCacheIsValid() const
 }
 
 
-void Buffer::reloadBibInfoCache() const
+void Buffer::reloadBibInfoCache(bool const force) const
 {
 	// 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_)
+	if (d->bibinfo_cache_valid_ && !force)
 		return;
 
 	d->bibinfo_.clear();