anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 21:40:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make outline function work in an inset

Browse Source 
The function outline is modified to operate only in the inset that
contains the cursor. This means that the function can be enabled in
insets (this had been forbidden to fix #5004).

Of course, there may be cases where the user expects something to
happen outside of the inset. I am sorry to announce that this is not
going to happen ;)

Fixes bug #12809.
This commit is contained in:
Jean-Marc Lasgouttes 2023-06-22 00:21:54 +02:00
parent 7d9e29d498
commit 8aea6af6a0
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/Text.cpp
View File

@ -3746,11 +3746,12 @@ void insertSeparator(Cursor const & cur, depth_type const depth)
} }
void outline(OutlineOp mode, Cursor & cur, Text * text) void outline(OutlineOp mode, Cursor & cur)
{ {
Buffer & buf = *cur.buffer(); Buffer & buf = *cur.buffer();
Text & text = *cur.text();
pit_type & pit = cur.pit(); pit_type & pit = cur.pit();
ParagraphList & pars = buf.text().paragraphs(); ParagraphList & pars = text.paragraphs();
ParagraphList::iterator const bgn = pars.begin(); ParagraphList::iterator const bgn = pars.begin();
// The first paragraph of the area to be copied: // The first paragraph of the area to be copied:
ParagraphList::iterator start = pars.iterator_at(pit); ParagraphList::iterator start = pars.iterator_at(pit);
@ -3759,7 +3760,7 @@ void outline(OutlineOp mode, Cursor & cur, Text * text)
ParagraphList::iterator const end = pars.end(); ParagraphList::iterator const end = pars.end();
depth_type const current_depth = cur.paragraph().params().depth(); depth_type const current_depth = cur.paragraph().params().depth();
int const thistoclevel = buf.text().getTocLevel(distance(bgn, start)); int const thistoclevel = text.getTocLevel(distance(bgn, start));
int toclevel; int toclevel;
// Move out (down) from this section header // Move out (down) from this section header
@ -3768,7 +3769,7 @@ void outline(OutlineOp mode, Cursor & cur, Text * text)
// Seek the one (on same level) below // Seek the one (on same level) below
for (; finish != end; ++finish) { for (; finish != end; ++finish) {
toclevel = buf.text().getTocLevel(distance(bgn, finish)); toclevel = text.getTocLevel(distance(bgn, finish));
if (toclevel != Layout::NOT_IN_TOC && toclevel <= thistoclevel) if (toclevel != Layout::NOT_IN_TOC && toclevel <= thistoclevel)
break; break;
} }
@ -3785,7 +3786,7 @@ void outline(OutlineOp mode, Cursor & cur, Text * text)
// Search previous same-level header above // Search previous same-level header above
do { do {
--dest; --dest;
toclevel = buf.text().getTocLevel(distance(bgn, dest)); toclevel = text.getTocLevel(distance(bgn, dest));
} while(dest != bgn } while(dest != bgn
&& (toclevel == Layout::NOT_IN_TOC && (toclevel == Layout::NOT_IN_TOC
|| toclevel > thistoclevel)); || toclevel > thistoclevel));
@ -3819,7 +3820,7 @@ void outline(OutlineOp mode, Cursor & cur, Text * text)
// Get the parent paragraph (outer in nested context) // Get the parent paragraph (outer in nested context)
pit_type const parent = pit_type const parent =
before->params().depth() > current_depth before->params().depth() > current_depth
? text->depthHook(distance(bgn, before), current_depth) ? text.depthHook(distance(bgn, before), current_depth)
: distance(bgn, before); : distance(bgn, before);
// If a environment with same layout preceeds the moved one in the new // If a environment with same layout preceeds the moved one in the new
// position, and there is no separator yet, insert one. // position, and there is no separator yet, insert one.
@ -3845,7 +3846,7 @@ void outline(OutlineOp mode, Cursor & cur, Text * text)
ParagraphList::iterator dest = next(finish, 1); ParagraphList::iterator dest = next(finish, 1);
// Go further down to find header to insert in front of: // Go further down to find header to insert in front of:
for (; dest != end; ++dest) { for (; dest != end; ++dest) {
toclevel = buf.text().getTocLevel(distance(bgn, dest)); toclevel = text.getTocLevel(distance(bgn, dest));
if (toclevel != Layout::NOT_IN_TOC if (toclevel != Layout::NOT_IN_TOC
&& toclevel <= thistoclevel) && toclevel <= thistoclevel)
break; break;
@ -3861,7 +3862,7 @@ void outline(OutlineOp mode, Cursor & cur, Text * text)
// Get the parent paragraph (outer in nested context) // Get the parent paragraph (outer in nested context)
pit_type const parent = pit_type const parent =
before->params().depth() > current_depth before->params().depth() > current_depth
? text->depthHook(distance(bgn, before), current_depth) ? text.depthHook(distance(bgn, before), current_depth)
: distance(bgn, before); : distance(bgn, before);
// If a environment with same layout preceeds the moved one in the new // If a environment with same layout preceeds the moved one in the new
// position, and there is no separator yet, insert one. // position, and there is no separator yet, insert one.
@ -3902,7 +3903,7 @@ void outline(OutlineOp mode, Cursor & cur, Text * text)
ParagraphList::iterator cstart = start; ParagraphList::iterator cstart = start;
bool strucchange = false; bool strucchange = false;
for (; cstart != finish; ++cstart) { for (; cstart != finish; ++cstart) {
toclevel = buf.text().getTocLevel(distance(bgn, cstart)); toclevel = text.getTocLevel(distance(bgn, cstart));
if (toclevel == Layout::NOT_IN_TOC) if (toclevel == Layout::NOT_IN_TOC)
continue; continue;
@ -3938,7 +3939,7 @@ void outline(OutlineOp mode, Cursor & cur, Text * text)
pit_type const len = distance(start, finish); pit_type const len = distance(start, finish);
buf.undo().recordUndo(cur, pit, pit + len - 1); buf.undo().recordUndo(cur, pit, pit + len - 1);
for (; start != finish; ++start) { for (; start != finish; ++start) {
toclevel = buf.text().getTocLevel(distance(bgn, start)); toclevel = text.getTocLevel(distance(bgn, start));
if (toclevel == Layout::NOT_IN_TOC) if (toclevel == Layout::NOT_IN_TOC)
continue; continue;
@ -6247,7 +6248,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
case LFUN_OUTLINE_UP: { case LFUN_OUTLINE_UP: {
pos_type const opos = cur.pos(); pos_type const opos = cur.pos();
outline(OutlineUp, cur, this); outline(OutlineUp, cur);
setCursor(cur, cur.pit(), opos); setCursor(cur, cur.pit(), opos);
cur.forceBufferUpdate(); cur.forceBufferUpdate();
needsUpdate = true; needsUpdate = true;
@ -6256,7 +6257,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
case LFUN_OUTLINE_DOWN: { case LFUN_OUTLINE_DOWN: {
pos_type const opos = cur.pos(); pos_type const opos = cur.pos();
outline(OutlineDown, cur, this); outline(OutlineDown, cur);
setCursor(cur, cur.pit(), opos); setCursor(cur, cur.pit(), opos);
cur.forceBufferUpdate(); cur.forceBufferUpdate();
needsUpdate = true; needsUpdate = true;
@ -6264,13 +6265,13 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
} }
case LFUN_OUTLINE_IN: case LFUN_OUTLINE_IN:
outline(OutlineIn, cur, this); outline(OutlineIn, cur);
cur.forceBufferUpdate(); cur.forceBufferUpdate();
needsUpdate = true; needsUpdate = true;
break; break;
case LFUN_OUTLINE_OUT: case LFUN_OUTLINE_OUT:
outline(OutlineOut, cur, this); outline(OutlineOut, cur);
cur.forceBufferUpdate(); cur.forceBufferUpdate();
needsUpdate = true; needsUpdate = true;
break; break;
@ -6879,9 +6880,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
case LFUN_OUTLINE_DOWN: case LFUN_OUTLINE_DOWN:
case LFUN_OUTLINE_IN: case LFUN_OUTLINE_IN:
case LFUN_OUTLINE_OUT: case LFUN_OUTLINE_OUT:
// FIXME: LyX is not ready for outlining within inset. enable = cur.text()->getTocLevel(cur.pit()) != Layout::NOT_IN_TOC;
enable = isMainText()
&& cur.buffer()->text().getTocLevel(cur.pit()) != Layout::NOT_IN_TOC;
break; break;
case LFUN_NEWLINE_INSERT: case LFUN_NEWLINE_INSERT: