commit b4e613828e7dbab1ce653c509a8bb0e6a8dce43b
Author: Richard Kimberly Heck <[email protected]>
Date:   Tue Mar 17 01:33:44 2020 -0400

    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)
---
 src/output_latex.cpp |    7 +++++--
 status.23x           |    4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 26a0357..08958aa 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 2f045e8..1d99bb5 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
-- 
lyx-cvs mailing list
[email protected]
http://lists.lyx.org/mailman/listinfo/lyx-cvs

Reply via email to