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

Do not enter page break in heading (#13040)

Browse Source 
Rather than that, put it before or after, or disallow,
depending on the position.
This commit is contained in:
Juergen Spitzmueller 2024-03-28 18:03:54 +01:00
parent 20c79dd472
commit 698f922d19
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/Text.cpp
View File

@ -5720,12 +5720,27 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
}
case LFUN_NOMENCL_PRINT:
case LFUN_NEWPAGE_INSERT:
// do nothing fancy
doInsertInset(cur, this, cmd, false, false);
cur.posForward();
break;
case LFUN_NEWPAGE_INSERT: {
// When we are in a heading, put the page break in a standard
// paragraph before the heading (if cur.pos() == 0) or after
// (if cur.pos() == cur.lastpos())
if (cur.text()->getTocLevel(cur.pit()) != Layout::NOT_IN_TOC) {
lyx::dispatch(FuncRequest(LFUN_PARAGRAPH_BREAK));
DocumentClass const & tc = bv->buffer().params().documentClass();
lyx::dispatch(FuncRequest(LFUN_LAYOUT, from_ascii("\"") + tc.plainLayout().name()
+ from_ascii("\" ignoreautonests")));
}
// do nothing fancy
doInsertInset(cur, this, cmd, false, false);
cur.posForward();
break;
}
case LFUN_SEPARATOR_INSERT: {
doInsertInset(cur, this, cmd, false, false);
cur.posForward();
@ -6956,9 +6971,11 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
}
case LFUN_NEWPAGE_INSERT:
// not allowed in description items
// not allowed in description items and in the midst of sections
code = NEWPAGE_CODE;
enable = !inDescriptionItem(cur);
enable = !inDescriptionItem(cur)
&& (cur.text()->getTocLevel(cur.pit()) == Layout::NOT_IN_TOC
|| cur.pos() == 0 || cur.pos() == cur.lastpos());
break;
case LFUN_LANGUAGE: