* src/tabular.[Ch]: simplify plaintext methods, because there

[lyx.git] / src / text2.C

diff --git a/src/text2.C b/src/text2.C
index 17f419b6b953ccbb370e21d85076a5b53d1a2bd9..d27f5e1dbdb4fcdfe5b8580174c4e20014816fdd 100644 (file)
--- a/src/text2.C
+++ b/src/text2.C
@@ -1180,7 +1180,7 @@ bool LyXText::deleteEmptyParagraphMechanism(LCursor & cur,
                    && oldpar.isLineSeparator(old.pos())
                    && oldpar.isLineSeparator(old.pos() - 1)
                    && !oldpar.isDeleted(old.pos() - 1)) {
-                       oldpar.eraseChar(old.pos() - 1, false); // do not track changes in DEPM
+                       oldpar.eraseChar(old.pos() - 1, cur.buffer().params().trackChanges);
 #ifdef WITH_WARNINGS
 #warning This will not work anymore when we have multiple views of the same buffer
 // In this case, we will have to correct also the cursors held by
@@ -1233,13 +1233,58 @@ bool LyXText::deleteEmptyParagraphMechanism(LCursor & cur,
                return true;
        }
 
-       if (oldpar.stripLeadingSpaces(cur.buffer().params().trackChanges))
+       if (oldpar.stripLeadingSpaces(cur.buffer().params().trackChanges)) {
                need_anchor_change = true;
+               // We return true here because the Paragraph contents changed and
+               // we need a redraw before further action is processed.
+               return true;
+       }
 
        return false;
 }
 
 
+void LyXText::deleteEmptyParagraphMechanism(pit_type first, pit_type last, bool trackChanges)
+{
+       BOOST_ASSERT(first >= 0 && first <= last && last < (int) pars_.size());
+
+       for (pit_type pit = first; pit <= last; ++pit) {
+               Paragraph & par = pars_[pit];
+
+               // We allow all kinds of "mumbo-jumbo" when freespacing.
+               if (par.isFreeSpacing())
+                       continue;
+
+               for (pos_type pos = 1; pos < par.size(); ++pos) {
+                       if (par.isLineSeparator(pos) && par.isLineSeparator(pos - 1)
+                           && !par.isDeleted(pos - 1)) {
+                               if (par.eraseChar(pos - 1, trackChanges)) {
+                                       --pos;
+                               }
+                       }
+               }
+
+               // don't delete anything if this is the only remaining paragraph within the given range
+               // note: LyXText::acceptOrRejectChanges() sets the cursor to 'first' after calling DEPM 
+               if (first == last)
+                       continue;
+
+               // don't delete empty paragraphs with keepempty set
+               if (par.allowEmpty())
+                       continue;
+
+               if (par.empty() || (par.size() == 1 && par.isLineSeparator(0))) {
+                       pars_.erase(boost::next(pars_.begin(), pit));
+                       --pit;
+                       --last;
+                       continue;
+               }
+
+               par.stripLeadingSpaces(trackChanges);
+       }
+}
+
+
 void LyXText::recUndo(LCursor & cur, pit_type first, pit_type last) const
 {
        recordUndo(cur, Undo::ATOMIC, first, last);