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

Mark follow-up paragraphs in a paragraph group as nested.

Browse Source 
This gives a more consistent indication of what belongs to an environment
(and semantically, such paragraphs are synonymous to nested standard
paragraphs)

Addresses part of #9261.
This commit is contained in:
Juergen Spitzmueller 2017-12-31 10:37:35 +01:00
parent fe698caeec
commit 761a542551
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/RowPainter.cpp
View File

@ -272,7 +272,12 @@ void RowPainter::paintAppendix() const
void RowPainter::paintDepthBar() const void RowPainter::paintDepthBar() const
{ {
depth_type const depth = par_.getDepth(); depth_type depth = par_.getDepth();
// We also mark follow-up paragraphs in a paragraph group
if (par_.layout().isParagraphGroup()
&& !text_.isFirstInSequence(row_.pit()))
++depth;
if (depth <= 0) if (depth <= 0)
return; return;
@ -283,6 +288,10 @@ void RowPainter::paintDepthBar() const
if (row_.pos() == 0) if (row_.pos() == 0)
--pit2; --pit2;
prev_depth = pars_[pit2].getDepth(); prev_depth = pars_[pit2].getDepth();
// We also mark follow-up paragraphs in a paragraph group
if (pars_[pit2].layout().isParagraphGroup()
&& !text_.isFirstInSequence(pit2))
++prev_depth;
} }
depth_type next_depth = 0; depth_type next_depth = 0;
@ -291,6 +300,10 @@ void RowPainter::paintDepthBar() const
if (row_.endpos() >= pars_[pit2].size()) if (row_.endpos() >= pars_[pit2].size())
++pit2; ++pit2;
next_depth = pars_[pit2].getDepth(); next_depth = pars_[pit2].getDepth();
// We also mark follow-up paragraphs in a paragraph group
if (pars_[pit2].layout().isParagraphGroup()
&& !text_.isFirstInSequence(pit2))
++next_depth;
} }
for (depth_type i = 1; i <= depth; ++i) { for (depth_type i = 1; i <= depth; ++i) {