Fix some parsing glitches in Autonest and IsAutonestedBy

[lyx.git] / src / Text3.cpp

diff --git a/src/Text3.cpp b/src/Text3.cpp
index 2158128891b220ad0650960e597283a993f0b2fd..e584d83f47808e2ae04a44396e8075f890088aa2 100644 (file)
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -1207,6 +1207,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                pit_type prev = pit > 0 ? depthHook(pit, par.getDepth()) : pit;
                if (prev < pit && cur.pos() == par.beginOfBody()
                    && !par.size() && !par.isEnvSeparator(cur.pos())
+                   && !par.layout().keepempty
                    && !par.layout().isCommand()
                    && pars_[prev].layout() != par.layout()
                    && pars_[prev].layout().isEnvironment()
@@ -1654,8 +1655,13 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                        DocIterator scur = cur;
                        depth_type const max_depth = cur.paragraph().params().depth() + 1;
                        cur.forwardPar();
-                       while (cur.paragraph().params().depth() < min(nextpar_depth, max_depth))
+                       while (cur.paragraph().params().depth() < min(nextpar_depth, max_depth)) {
+                               depth_type const olddepth = cur.paragraph().params().depth();
                                lyx::dispatch(FuncRequest(LFUN_DEPTH_INCREMENT));
+                               if (olddepth == cur.paragraph().params().depth())
+                                       // leave loop if no incrementation happens
+                                       break;
+                       }
                        cur.setCursor(scur);
                }
 
@@ -2363,7 +2369,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
        // Set the freefont using the contents of \param data dispatched from
        // the frontends and apply it at the current cursor location.
        case LFUN_TEXTSTYLE_UPDATE: {
-               Font font;
+               Font font(ignore_font, ignore_language);
                bool toggle;
                if (font.fromString(to_utf8(cmd.argument()), toggle)) {
                        freefont = font;
@@ -3190,17 +3196,35 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 
        case LFUN_CHANGE_ACCEPT:
        case LFUN_CHANGE_REJECT:
-               // In principle, these LFUNs should only be enabled if there
-               // is a change at the current position/in the current selection.
-               // However, without proper optimizations, this will inevitably
-               // result in unacceptable performance - just imagine a user who
-               // wants to select the complete content of a long document.
                if (!cur.selection())
                        enable = cur.paragraph().isChanged(cur.pos());
-               else
-                       // TODO: context-sensitive enabling of LFUN_CHANGE_ACCEPT/REJECT
-                       // for selections.
-                       enable = true;
+               else {
+                       // will enable if there is a change in the selection
+                       enable = false;
+
+                       // cheap improvement for efficiency: using cached
+                       // buffer variable, if there is no change in the
+                       // document, no need to check further.
+                       if (!cur.buffer()->areChangesPresent())
+                               break;
+
+                       for (DocIterator it = cur.selectionBegin(); ; it.forwardPar()) {
+                               pos_type const beg = it.pos();
+                               pos_type end;
+                               bool const in_last_par = (it.pit() == cur.selectionEnd().pit() &&
+                                                         it.idx() == cur.selectionEnd().idx());
+                               if (in_last_par)
+                                       end = cur.selectionEnd().pos();
+                               else
+                                       end = it.lastpos();
+                               if (beg != end && it.paragraph().isChanged(beg, end)) {
+                                       enable = true;
+                                       break;
+                               }
+                               if (in_last_par)
+                                       break;
+                       }
+               }
                break;
 
        case LFUN_OUTLINE_UP: