From: Richard Kimberly Heck <rikiheck@lyx.org>
Date: Tue, 17 Mar 2020 05:33:44 +0000 (-0400)
Subject: Fix bug #11787.
X-Git-Tag: 2.3.5~47
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=b4e613828e7dbab1ce653c509a8bb0e6a8dce43b;p=features.git

Fix bug #11787.

Make sure we are actually at the end of the document before issuing
\maketitle because we are at the end of the document.

(cherry picked from commit 7af6575cf6cd764b8b567b358907ac9a7a8e322b)
---

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 26a0357d11..08958aabb2 100644
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -1540,8 +1540,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";
diff --git a/status.23x b/status.23x
index 2f045e82dd..1d99bb5ed9 100644
--- a/status.23x
+++ b/status.23x
@@ -71,7 +71,9 @@ What's new
 
 - Fix tablefootnote loading order (bug 11841).
 
-- Fix reloading of changed include inset (11842).
+- Fix reloading of changed include inset (bug 11842).
+
+- Don't output \maketitle twice with branches (bug 11787)
 
 
 * USER INTERFACE