X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_latex.cpp;h=1185e2d6e343149dbb0e7eddbb740958c9bed6ea;hb=b9538b10d41eb693bdd92d0a775ee434e9045429;hp=4befb3cb6d09b4ef4c79ff72507e6d1cad88b7ca;hpb=ada07d0bf1661c19c8178b903b39c3032ea24e42;p=lyx.git

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 4befb3cb6d..1185e2d6e3 100644
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -818,7 +818,8 @@ void TeXOnePar(Buffer const & buf,
 			// Due to the moving argument, some fragile
 			// commands (labels, index entries)
 			// are output after this command (#2154)
-			runparams.postpone_fragile_stuff = true;
+			runparams.postpone_fragile_stuff =
+				bparams.postpone_fragile_content;
 		if (intitle_command)
 			os << '{';
 
@@ -932,7 +933,8 @@ void TeXOnePar(Buffer const & buf,
 			// Due to the moving argument, some fragile
 			// commands (labels, index entries)
 			// are output after this command (#2154)
-			runparams.postpone_fragile_stuff = true;
+			runparams.postpone_fragile_stuff =
+				bparams.postpone_fragile_content;
 		os << '{';
 	}
 
@@ -1149,7 +1151,8 @@ void TeXOnePar(Buffer const & buf,
 			// Due to the moving argument, some fragile
 			// commands (labels, index entries)
 			// are output after this command (#2154)
-			runparams.postpone_fragile_stuff = true;
+			runparams.postpone_fragile_stuff =
+				bparams.postpone_fragile_content;
 	}
 
 	Font const outerfont = text.outerFont(pit);
@@ -1375,7 +1378,8 @@ void TeXOnePar(Buffer const & buf,
 	if (nextpar && state->open_encoding_ == CJK
 		&& bparams.encoding().iconvName() != "UTF-8"
 		&& bparams.encoding().package() != Encoding::CJK
-		&& (nextpar_language->encoding()->package() != Encoding::CJK
+		&& ((nextpar_language &&
+			nextpar_language->encoding()->package() != Encoding::CJK)
 			|| (nextpar->layout().isEnvironment() && nextpar->isMultiLingual(bparams)))
 		// inbetween environments, CJK has to be closed later (nesting!)
 		&& (!style.isEnvironment() || !nextpar->layout().isEnvironment())) {
@@ -1684,8 +1688,11 @@ void latexParagraphs(Buffer const & buf,
 			//os << '\n';
 	}
 
-	// It might be that we only have a title in this document
-	if (was_title && !already_title) {
+	// It might be that we only have a title in this document.
+	// But if we're in a branch, this is not the end of
+	// the document. (There may be some other checks of this
+	// kind that are needed.)
+	if (was_title && !already_title && !runparams.inbranch) {
 		if (tclass.titletype() == TITLE_ENVIRONMENT) {
 			os << "\\end{" << from_ascii(tclass.titlename())
 			   << "}\n";