X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBuffer.cpp;h=9826b51f7fd3b0bf068a8961be5bf141c878083c;hb=3bbce7f24afbb469fff5ad352778af73d57b44d8;hp=0a1f851e6fbff0cd1f5783f481346e2d7474b50f;hpb=df59649a18f19486dc06b3e921272cea6d4ee343;p=features.git

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 0a1f851e6f..9826b51f7f 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -1110,6 +1110,24 @@ bool Buffer::readDocument(Lexer & lex)
 }
 
 
+bool Buffer::isSyncTeXenabled() const
+{
+	bool enabled = params().output_sync;
+
+	if (!enabled)
+		for (auto const & c : theConverters()) {
+			const string dest = c.to().substr(0,3);
+			if (dest == "dvi" || dest == "pdf") {
+				const string cmd = c.command();
+				enabled |= cmd.find("-synctex=") != string::npos
+					&& cmd.find("-synctex=0") == string::npos;
+				if (enabled)
+					break;
+			}
+		}
+	return enabled;
+}
+
 bool Buffer::importString(string const & format, docstring const & contents, ErrorList & errorList)
 {
 	Format const * fmt = theFormats().getFormat(format);
@@ -1145,7 +1163,7 @@ bool Buffer::importFile(string const & format, FileName const & name, ErrorList
 
 	FileName const lyx = tempFileName("Buffer_importFileXXXXXX.lyx");
 	Converters::RetVal const retval =
-		theConverters().convert(nullptr, name, lyx, name, format, "lyx", errorList);
+		theConverters().convert(this, name, lyx, name, format, "lyx", errorList);
 	if (retval == Converters::SUCCESS) {
 		bool const success = readFile(lyx) == ReadSuccess;
 		removeTempFile(lyx);
@@ -1739,7 +1757,7 @@ Buffer::ExportStatus Buffer::makeLaTeXFile(FileName const & fname,
 	OutputParams runparams = runparams_in;
 
 	string const encoding = runparams.encoding->iconvName();
-	LYXERR(Debug::LATEX, "makeLaTeXFile encoding: " << encoding << ", fname=" << fname.realPath());
+	LYXERR(Debug::OUTFILE, "makeLaTeXFile encoding: " << encoding << ", fname=" << fname.realPath());
 
 	ofdocstream ofs;
 	try { ofs.reset(encoding); }
@@ -1812,7 +1830,7 @@ Buffer::ExportStatus Buffer::makeLaTeXFile(FileName const & fname,
 		lyx_exit(1);
 	}
 
-	d->texrow = move(os.texrow());
+	d->texrow = std::move(os.texrow());
 
 	ofs.close();
 	if (ofs.fail()) {
@@ -1851,7 +1869,7 @@ Buffer::ExportStatus Buffer::writeLaTeXSource(otexstream & os,
 	BufferEncodings::initUnicodeMath(*this);
 
 	// validate the buffer.
-	LYXERR(Debug::LATEX, "  Validating buffer...");
+	LYXERR(Debug::OUTFILE, "  Validating buffer...");
 	LaTeXFeatures features(*this, params(), runparams);
 	validate(features);
 	// This is only set once per document (in master)
@@ -1860,7 +1878,7 @@ Buffer::ExportStatus Buffer::writeLaTeXSource(otexstream & os,
 		runparams.use_hyperref = features.isRequired("hyperref");
 		runparams.use_CJK = features.mustProvide("CJK");
 	}
-	LYXERR(Debug::LATEX, "  Buffer validation done.");
+	LYXERR(Debug::OUTFILE, "  Buffer validation done.");
 
 	bool const output_preamble =
 		output == FullSource || output == OnlyPreamble;
@@ -2079,9 +2097,9 @@ Buffer::ExportStatus Buffer::writeLaTeXSource(otexstream & os,
 
 	if (output_preamble) {
 		os << "\\end{document}\n";
-		LYXERR(Debug::LATEX, "makeLaTeXFile...done");
+		LYXERR(Debug::OUTFILE, "makeLaTeXFile...done");
 	} else {
-		LYXERR(Debug::LATEX, "LaTeXFile for inclusion made.");
+		LYXERR(Debug::OUTFILE, "LaTeXFile for inclusion made.");
 	}
 	runparams_in.encoding = runparams.encoding;
 
@@ -2095,7 +2113,7 @@ Buffer::ExportStatus Buffer::makeDocBookFile(FileName const & fname,
 			      OutputParams const & runparams,
 			      OutputWhat output) const
 {
-	LYXERR(Debug::LATEX, "makeDocBookFile...");
+	LYXERR(Debug::OUTFILE, "makeDocBookFile...");
 
 	ofdocstream ofs;
 	if (!openFileWrite(ofs, fname))
@@ -2132,7 +2150,7 @@ Buffer::ExportStatus Buffer::writeDocBookSource(odocstream & os,
 	bool const output_preamble =
 		output == FullSource || output == OnlyPreamble;
 	bool const output_body =
-	  output == FullSource || output == OnlyBody || output == IncludedFile;
+		output == FullSource || output == OnlyBody || output == IncludedFile;
 
 	if (output_preamble) {
 		// XML preamble, no doctype needed.
@@ -2146,13 +2164,13 @@ Buffer::ExportStatus Buffer::writeDocBookSource(odocstream & os,
 		// Prepare the name space declaration for MathML depending on document preferences.
 		string mathmlNamespace;
 		if (params().docbook_mathml_prefix != BufferParams::NoPrefix) {
-            string mathmlPrefix;
-            if (params().docbook_mathml_prefix == BufferParams::MPrefix)
-	            mathmlPrefix = "m";
-            else if (params().docbook_mathml_prefix == BufferParams::MMLPrefix)
-	            mathmlPrefix = "mml";
+			string mathmlPrefix;
+			if (params().docbook_mathml_prefix == BufferParams::MPrefix)
+				mathmlPrefix = "m";
+			else if (params().docbook_mathml_prefix == BufferParams::MMLPrefix)
+				mathmlPrefix = "mml";
 			mathmlNamespace = + " xmlns:" + mathmlPrefix + "=\"http://www.w3.org/1998/Math/MathML\"";
-	    }
+		}
 
 		// Directly output the root tag, based on the current type of document.
 		string languageCode = params().language->code();
@@ -2185,7 +2203,7 @@ Buffer::ExportStatus Buffer::writeDocBookSource(odocstream & os,
 Buffer::ExportStatus Buffer::makeLyXHTMLFile(FileName const & fname,
 			      OutputParams const & runparams) const
 {
-	LYXERR(Debug::LATEX, "makeLyXHTMLFile...");
+	LYXERR(Debug::OUTFILE, "makeLyXHTMLFile...");
 
 	ofdocstream ofs;
 	if (!openFileWrite(ofs, fname))
@@ -2383,7 +2401,7 @@ void Buffer::validate(LaTeXFeatures & features) const
 	for (Paragraph const & p : paragraphs())
 		p.validate(features);
 
-	if (lyxerr.debugging(Debug::LATEX)) {
+	if (lyxerr.debugging(Debug::OUTFILE)) {
 		features.showStruct();
 	}
 }
@@ -2686,7 +2704,7 @@ void Buffer::markDepClean(string const & name)
 }
 
 
-bool Buffer::getStatus(FuncRequest const & cmd, FuncStatus & flag)
+bool Buffer::getStatus(FuncRequest const & cmd, FuncStatus & flag) const
 {
 	if (isInternal()) {
 		// FIXME? if there is an Buffer LFUN that can be dispatched even
@@ -4935,6 +4953,10 @@ void Buffer::updateBuffer(UpdateScope scope, UpdateType utype) const
 {
 	LBUFERR(!text().paragraphs().empty());
 
+	// This can be called when loading a file, so that there be no
+	// open undo group.
+	UndoGroupHelper ugh(const_cast<Buffer *>(this));
+
 	// Use the master text class also for child documents
 	Buffer const * const master = masterBuffer();
 	DocumentClass const & textclass = master->params().documentClass();
@@ -5158,7 +5180,10 @@ void Buffer::Impl::setLabel(ParIterator & it, UpdateType utype) const
 	switch(layout.labeltype) {
 	case LABEL_ITEMIZE: {
 		par.params().labelString(
-			bp.user_defined_bullet(par.itemdepth).getUnicode());
+			(par.itemdepth < 4)
+					? bp.user_defined_bullet(par.itemdepth).getLabel()
+					  // Display fallback for too deeply nested items
+					: bformat(from_ascii("[?%1$d]"), int(par.itemdepth + 1)));
 		break;
 	}