anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-11 11:08:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Richard Kimberly Heck 2020-03-17 01:54:47 -04:00
parent b536759c07
commit 861c6167ca
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/OutputParams.cpp
View File

@ -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);

3
src/OutputParams.h
View File

@ -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;
};

6
src/output_latex.cpp
View File

@ -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, "