X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBuffer.cpp;h=888fb93d9b16a7dbc19f0186b02ed28e3c730f01;hb=2104d41f71ff39f5c3f9f5a485707633b1bfb25b;hp=084b94c03f7d6ccba50e3f01868218c4d737e275;hpb=b032e2dfafbf1e86918dd0cd66e5de602edeee00;p=lyx.git

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 084b94c03f..888fb93d9b 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -57,6 +57,7 @@
 #include "PDFOptions.h"
 #include "SpellChecker.h"
 #include "sgml.h"
+#include "texstream.h"
 #include "TexRow.h"
 #include "Text.h"
 #include "TextClass.h"
@@ -236,8 +237,8 @@ public:
 	/// positions of child buffers in the buffer
 	typedef map<Buffer const * const, DocIterator> BufferPositionMap;
 	struct ScopeBuffer {
-		ScopeBuffer() {}
-		ScopeBuffer(DocIterator const & s,Buffer const * b)
+		ScopeBuffer() : buffer(0) {}
+		ScopeBuffer(DocIterator const & s, Buffer const * b)
 			: scope(s), buffer(b) {}
 		DocIterator scope;
 		Buffer const * buffer;
@@ -1659,9 +1660,11 @@ bool Buffer::makeLaTeXFile(FileName const & fname,
 {
 	OutputParams runparams = runparams_in;
 
-	// XeTeX with TeX fonts is only safe with ASCII encoding,
-	// but the "flavor" is not known in BufferParams::encoding().
-	if (!params().useNonTeXFonts && (runparams.flavor == OutputParams::XETEX))
+	// 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();
@@ -1682,7 +1685,7 @@ bool Buffer::makeLaTeXFile(FileName const & fname,
 	ErrorList & errorList = d->errorLists["Export"];
 	errorList.clear();
 	bool failed_export = false;
-	otexstream os(ofs, d->texrow);
+	otexstream os(ofs);
 
 	// make sure we are ready to export
 	// this needs to be done before we validate
@@ -1692,7 +1695,6 @@ bool Buffer::makeLaTeXFile(FileName const & fname,
 	updateMacroInstances(OutputUpdate);
 
 	try {
-		os.texrow().reset();
 		writeLaTeXSource(os, original_path, runparams, output);
 	}
 	catch (EncodingException const & e) {
@@ -1723,6 +1725,8 @@ bool Buffer::makeLaTeXFile(FileName const & fname,
 		lyx_exit(1);
 	}
 
+	d->texrow = move(os.texrow());
+
 	ofs.close();
 	if (ofs.fail()) {
 		failed_export = true;
@@ -1747,8 +1751,10 @@ void Buffer::writeLaTeXSource(otexstream & os,
 	OutputParams runparams = runparams_in;
 
 	// XeTeX with TeX fonts is only safe with ASCII encoding,
-	// but the "flavor" is not known in BufferParams::encoding().
-	if (!params().useNonTeXFonts && (runparams.flavor == OutputParams::XETEX))
+	// 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
@@ -2214,8 +2220,8 @@ void Buffer::validate(LaTeXFeatures & features) const
 	if (!features.runparams().is_child)
 		params().validate(features);
 
-	for_each(paragraphs().begin(), paragraphs().end(),
-		 bind(&Paragraph::validate, _1, ref(features)));
+	for (Paragraph const & p : paragraphs())
+		p.validate(features);
 
 	if (lyxerr.debugging(Debug::LATEX)) {
 		features.showStruct();
@@ -3711,14 +3717,13 @@ unique_ptr<TexRow> Buffer::getSourceCode(odocstream & os, string const & format,
 			LaTeXFeatures features(*this, params(), runparams);
 			params().validate(features);
 			runparams.use_polyglossia = features.usePolyglossia();
-			texrow = make_unique<TexRow>();
-			texrow->newline();
-			texrow->newline();
 			// latex or literate
-			otexstream ots(os, *texrow);
-
+			otexstream ots(os);
+			// output above
+			ots.texrow().newlines(2);
 			// the real stuff
 			latexParagraphs(*this, text(), ots, runparams);
+			texrow = ots.releaseTexRow();
 			texrow->finalize();
 
 			// Restore the parenthood
@@ -3754,13 +3759,13 @@ unique_ptr<TexRow> Buffer::getSourceCode(odocstream & os, string const & format,
 				writeDocBookSource(os, absFileName(), runparams, output);
 		} else {
 			// latex or literate
-			texrow = make_unique<TexRow>();
-			texrow->newline();
-			texrow->newline();
-			otexstream ots(os, *texrow);
+			otexstream ots(os);
+			// output above
+			ots.texrow().newlines(2);
 			if (master)
 				runparams.is_child = true;
 			writeLaTeXSource(ots, string(), runparams, output);
+			texrow = ots.releaseTexRow();
 			texrow->finalize();
 		}
 	}
@@ -4310,26 +4315,22 @@ Buffer::ExportStatus Buffer::preview(string const & format, bool includeall) con
 	ExportStatus const status = doExport(format, true, false, result_file);
 	FileName const previewFile(result_file);
 
-	LATTEST (isClone());
-	d->cloned_buffer_->d->preview_file_ = previewFile;
-	d->cloned_buffer_->d->preview_format_ = format;
-	d->cloned_buffer_->d->preview_error_ = (status != ExportSuccess);
+	Impl * theimpl = isClone() ? d->cloned_buffer_->d : d;
+	theimpl->preview_file_ = previewFile;
+	theimpl->preview_format_ = format;
+	theimpl->preview_error_ = (status != ExportSuccess);
 
 	if (status != ExportSuccess)
 		return status;
-	if (previewFile.exists()) {
-		if (!formats.view(*this, previewFile, format))
-			return PreviewError;
-		else
-			return PreviewSuccess;
-	}
-	else {
-		// Successful export but no output file?
-		// Probably a bug in error detection.
-		LATTEST (status != ExportSuccess);
 
-		return status;
-	}
+	if (previewFile.exists())
+		return formats.view(*this, previewFile, format) ?
+			PreviewSuccess : PreviewError;
+
+	// Successful export but no output file?
+	// Probably a bug in error detection.
+	LATTEST(status != ExportSuccess);
+	return status;
 }
 
 
@@ -4618,6 +4619,11 @@ static depth_type getDepth(DocIterator const & it)
 		if (!it[i].inset().inMathed())
 			depth += it[i].paragraph().getDepth() + 1;
 	// remove 1 since the outer inset does not count
+	// we should have at least one non-math inset, so
+	// depth should nevery be 0. but maybe it is worth
+	// marking this, just in case.
+	LATTEST(depth > 0);
+	// coverity[INTEGER_OVERFLOW]
 	return depth - 1;
 }