Track whether we have warned about mixing layouts across e.g. branches.

diff --git a/src/OutputParams.cpp b/src/OutputParams.cpp
index 8b1d60e690d2a121f7074d7c4f395868250e442f..7913758276fd8179db18dcdbeb7336a2f67b1fd7 100644 (file)
--- a/src/OutputParams.cpp
+++ b/src/OutputParams.cpp
@@ -34,7 +34,7 @@ OutputParams::OutputParams(Encoding const * enc)
          html_disable_captions(false), html_in_par(false),
          html_make_pars(true), for_toc(false), for_tooltip(false),
          for_search(false), for_preview(false), includeall(false),
-         already_title(false), issued_title_cmd(false)
+         already_title(false), issued_title_cmd(false), gave_layout_warning(false)
 {
        // Note: in PreviewLoader::Impl::dumpPreamble
        // OutputParams runparams(0);

diff --git a/src/OutputParams.h b/src/OutputParams.h
index 7e578c3b0c07293f7162952ba1f78278de1f1a28..9a9577f560fc29d2a8af3e9576b0bfdae0097b18 100644 (file)
--- a/src/OutputParams.h
+++ b/src/OutputParams.h
@@ -363,6 +363,9 @@ public:
        /// Used to signal we need to output \end{TITLEBLOCK} when title
        /// environment is used.
        mutable bool issued_title_cmd;
+       /// Did we already issue the warning about mixing title and
+       /// non-title layouts?
+       mutable bool gave_layout_warning;
 };
 
 

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 07490e5dfe90e524fb9feb5525c1883110dbf435..04d1e1789f04201c006a3ecaa541b1a1d3e2e6e6 100644 (file)
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -1595,8 +1595,6 @@ void latexParagraphs(Buffer const & buf,
        // variables used in the loop:
        DocumentClass const & tclass = bparams.documentClass();
 
-       // Did we already warn about inTitle layout mixing? (we only warn once)
-       bool gave_layout_warning = false;
        for (; pit < runparams.par_end; ++pit) {
                lastpit = pit;
                ParagraphList::const_iterator par = paragraphs.constIterator(pit);
@@ -1608,8 +1606,8 @@ void latexParagraphs(Buffer const & buf,
 
                if (layout.intitle) {
                        if (runparams.already_title) {
-                               if (!gave_layout_warning && !runparams.dryrun) {
-                                       gave_layout_warning = true;
+                               if (!runparams.gave_layout_warning && !runparams.dryrun) {
+                                       runparams.gave_layout_warning = true;
                                        frontend::Alert::warning(_("Error in latexParagraphs"),
                                                        bformat(_("You are using at least one "
                                                          "layout (%1$s) intended for the title, "