Prevent outputting \maketitle within an inset embedded in title.

Amends [e4ef8ddc0f8202/lyxgit]

(cherry picked from commit 0bddf448ef5756eee90c771ff3277dd805b2b0a3)

diff --git a/src/insets/Inset.h b/src/insets/Inset.h
index a1c0518a2cc729438e598cc69485fbe44b0db6aa..c14f8b526fcfeb1542994ee8ab1c52c74a984046 100644 (file)
--- a/src/insets/Inset.h
+++ b/src/insets/Inset.h
@@ -448,6 +448,8 @@ public:
        virtual InsetLayout const & getLayout() const;
        ///
        virtual bool isPassThru() const { return getLayout().isPassThru(); }
+       /// Is this inset embedded in a title?
+       virtual bool isInTitle() const { return false; }
        /// Is this inset's layout defined in the document's textclass?
        bool undefined() const;
        /// should this inset be handled like a normal character?

diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index d0a37d673200e82e0c889bf38eb191d6c05f7c10..358a377542ddb96c89531c48dea0a82253aada16 100644 (file)
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -79,14 +79,14 @@ using graphics::PreviewLoader;
 /////////////////////////////////////////////////////////////////////
 
 InsetText::InsetText(Buffer * buf, UsePlain type)
-       : Inset(buf), drawFrame_(false), frame_color_(Color_insetframe),
-       text_(this, type == DefaultLayout)
+       : Inset(buf), drawFrame_(false), intitle_context_(false),
+         frame_color_(Color_insetframe), text_(this, type == DefaultLayout)
 {
 }
 
 
 InsetText::InsetText(InsetText const & in)
-       : Inset(in), text_(this, in.text_)
+       : Inset(in), intitle_context_(false), text_(this, in.text_)
 {
        drawFrame_ = in.drawFrame_;
        frame_color_ = in.frame_color_;
@@ -793,6 +793,9 @@ void InsetText::updateBuffer(ParIterator const & it, UpdateType utype)
                        cnt.restoreLastLayout();
                        // FIXME cnt.restoreLastCounter()?
                }
+               // Record in this inset is embedded in a title layout
+               // This is needed to decide when \maketitle is output.
+               intitle_context_ = it.paragraph().layout().intitle;
        } else {
                DocumentClass const & tclass = buffer().masterBuffer()->params().documentClass();
                // Note that we do not need to call:

diff --git a/src/insets/InsetText.h b/src/insets/InsetText.h
index eea88cdd690786ac9fddfaaa127872159b4c9180..76d3a5217fc2a56d1eb0935032af1cf28fd1bb5f 100644 (file)
--- a/src/insets/InsetText.h
+++ b/src/insets/InsetText.h
@@ -157,6 +157,8 @@ public:
        ///
        virtual bool allowMultiPar() const { return getLayout().isMultiPar(); }
        ///
+       bool isInTitle() const { return intitle_context_; }
+       ///
        /// should paragraphs be forced to use the empty layout?
        virtual bool forcePlainLayout(idx_type = 0) const
                { return getLayout().forcePlainLayout(); }
@@ -240,6 +242,8 @@ private:
        ///
        bool drawFrame_;
        ///
+       bool intitle_context_;
+       ///
        ColorCode frame_color_;
        ///
        Text text_;

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index c382050680ef25f3fc689579b0cb68f6ad2e210d..3838ba39934729033881c1b06d08ed2672c7eb37 100644 (file)
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -1496,7 +1496,8 @@ void latexParagraphs(Buffer const & buf,
                                                        << "}\n";
                                }
                        }
-               } else if (runparams.need_maketitle && !runparams.have_maketitle && !layout.inpreamble) {
+               } else if (runparams.need_maketitle && !runparams.have_maketitle
+                          && !layout.inpreamble && !text.inset().isInTitle()) {
                        if (tclass.titletype() == TITLE_ENVIRONMENT) {
                                os << "\\end{" << from_ascii(tclass.titlename())
                                                << "}\n";