[LyX/master] Allow inserting a blank line also after a nested environment.

[Enrico Forestieri]

commit d4c21b42dd09875720ed90d8dcabcc486a4a38a4
Author: Enrico Forestieri for...@lyx.org
Date:   Mon May 26 21:29:33 2014 +0200

Allow inserting a blank line also after a nested environment.

diff --git a/src/Text3.cpp b/src/Text3.cpp
index 707a4e2..b78ba15 100644
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -1071,15 +1071,20 @@ void Text::dispatch(Cursor  cur, FuncRequest  cmd)
cap::replaceSelection(cur);
pit_type pit = cur.pit();
Paragraph const  par = pars_[pit];
-   pit_type prev =
-   pit  0  pars_[pit - 1].getDepth() = par.getDepth() ?
-   depthHook(pit, par.getDepth()) : pit;
+   pit_type prev = pit;
+   if (pit  0) {
+   if (!pars_[pit - 1].layout().isEnvironment())
+   prev = depthHook(pit, par.getDepth());
+   else if (pars_[pit - 1].getDepth() = par.getDepth())
+   prev = pit - 1;
+   }
if (prev  pit  cur.pos() == par.beginOfBody()
 !par.isEnvSeparator(cur.pos())
 !par.layout().isCommand()
 pars_[prev].layout() != par.layout()
 pars_[prev].layout().isEnvironment()) {
-   if (par.layout().isEnvironment()) {
+   if (par.layout().isEnvironment()
+pars_[prev].getDepth() == par.getDepth()) {
docstring const layout = par.layout().name();
DocumentClass const  tc = 
bv-buffer().params().documentClass();
lyx::dispatch(FuncRequest(LFUN_LAYOUT, 
tc.plainLayout().name()));

[LyX/master] Allow inserting a blank line also after a nested environment.

[Enrico Forestieri]

commit d4c21b42dd09875720ed90d8dcabcc486a4a38a4
Author: Enrico Forestieri 
Date:   Mon May 26 21:29:33 2014 +0200

Allow inserting a blank line also after a nested environment.

diff --git a/src/Text3.cpp b/src/Text3.cpp
index 707a4e2..b78ba15 100644
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -1071,15 +1071,20 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
cap::replaceSelection(cur);
pit_type pit = cur.pit();
Paragraph const & par = pars_[pit];
-   pit_type prev =
-   pit > 0 && pars_[pit - 1].getDepth() >= par.getDepth() ?
-   depthHook(pit, par.getDepth()) : pit;
+   pit_type prev = pit;
+   if (pit > 0) {
+   if (!pars_[pit - 1].layout().isEnvironment())
+   prev = depthHook(pit, par.getDepth());
+   else if (pars_[pit - 1].getDepth() >= par.getDepth())
+   prev = pit - 1;
+   }
if (prev < pit && cur.pos() == par.beginOfBody()
&& !par.isEnvSeparator(cur.pos())
&& !par.layout().isCommand()
&& pars_[prev].layout() != par.layout()
&& pars_[prev].layout().isEnvironment()) {
-   if (par.layout().isEnvironment()) {
+   if (par.layout().isEnvironment()
+   && pars_[prev].getDepth() == par.getDepth()) {
docstring const layout = par.layout().name();
DocumentClass const & tc = 
bv->buffer().params().documentClass();
lyx::dispatch(FuncRequest(LFUN_LAYOUT, 
tc.plainLayout().name()));