bug 1376 partial fix and simplification.

[lyx.git] / src / text2.C

diff --git a/src/text2.C b/src/text2.C
index d9d356eb002bfa6d20dce2658752b70b4370992e..97fc51aa5b048f91b88c6b82dfdd8765816c54b7 100644 (file)
--- a/src/text2.C
+++ b/src/text2.C
@@ -1,12 +1,21 @@
-/* This file is part of
- * ======================================================
+/**
+ * \file text2.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.

  *
  *

- *           LyX, The Document Processor
+ * \author Asger Alstrup
+ * \author Lars Gullik Bjønnes
+ * \author Alfredo Braunstein
+ * \author Jean-Marc Lasgouttes
+ * \author Angus Leeming
+ * \author John Levon
+ * \author André Pönitz
+ * \author Allan Rae
+ * \author Dekel Tsur
+ * \author Jürgen Vigna

  *
  *

- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS.
+ */

 
 #include <config.h>
 
 
 #include <config.h>
 


@@ -28,7 +37,6 @@
 #include "frontends/font_metrics.h"
 #include "debug.h"
 #include "lyxrc.h"
 #include "frontends/font_metrics.h"
 #include "debug.h"
 #include "lyxrc.h"

-#include "lyxrow.h"

 #include "FloatList.h"
 #include "language.h"
 #include "ParagraphParameters.h"
 #include "FloatList.h"
 #include "language.h"
 #include "ParagraphParameters.h"


@@ -60,23 +68,12 @@ using std::pair;
 using lyx::pos_type;
 
 
 using lyx::pos_type;
 
 

-LyXText::LyXText(BufferView * bv)
-       : height(0), width(0), anchor_row_offset_(0),
-         inset_owner(0), the_locking_inset(0), bv_owner(bv)
+LyXText::LyXText(BufferView * bv, InsetText * inset, bool ininset,
+         ParagraphList & paragraphs)
+       : height(0), width(0), anchor_y_(0),
+         inset_owner(inset), the_locking_inset(0), bv_owner(bv),
+         in_inset_(ininset), paragraphs_(paragraphs)

 {
 {

-       anchor_row_ = rows().end();
-       need_break_row = rows().end();
-       need_refresh_ = true;
-}
-
-
-LyXText::LyXText(BufferView * bv, InsetText * inset)
-       : height(0), width(0), anchor_row_offset_(0),
-         inset_owner(inset), the_locking_inset(0), bv_owner(bv)
-{
-       anchor_row_ = rows().end();
-       need_break_row = rows().end();
-       need_refresh_ = true;

 }
 
 
 }
 
 


@@ -84,23 +81,20 @@ void LyXText::init(BufferView * bview)
 {
        bv_owner = bview;
 
 {
        bv_owner = bview;
 

-       rowlist_.clear();
-       need_break_row = rows().end();
-       width = height = 0;
-       need_refresh_ = true;
-
-       anchor_row_ = rows().end();
-       anchor_row_offset_ = 0;
+       ParagraphList::iterator const beg = ownerParagraphs().begin();
+       ParagraphList::iterator const end = ownerParagraphs().end();
+       for (ParagraphList::iterator pit = beg; pit != end; ++pit)
+               pit->rows.clear();

 
 

-       ParagraphList::iterator pit = ownerParagraphs().begin();
-       ParagraphList::iterator end = ownerParagraphs().end();
+       width = 0;
+       height = 0;

 
 

-       current_font = getFont(bview->buffer(), pit, 0);
+       anchor_y_ = 0;

 
 

-       for (; pit != end; ++pit)
-               insertParagraph(pit, rowlist_.end());
+       current_font = getFont(beg, 0);

 
 

-       setCursorIntern(rowlist_.begin()->par(), 0);
+       redoParagraphs(beg, end);
+       setCursorIntern(beg, 0);

        selection.cursor = cursor;
 
        updateCounters();
        selection.cursor = cursor;
 
        updateCounters();


@@ -112,26 +106,25 @@ void LyXText::init(BufferView * bview)
 // The difference is that this one is used for displaying, and thus we
 // are allowed to make cosmetic improvements. For instance make footnotes
 // smaller. (Asger)
 // The difference is that this one is used for displaying, and thus we
 // are allowed to make cosmetic improvements. For instance make footnotes
 // smaller. (Asger)

-// If position is -1, we get the layout font of the paragraph.
-// If position is -2, we get the font of the manual label of the paragraph.
-LyXFont const LyXText::getFont(Buffer const * buf, ParagraphList::iterator pit,
-                              pos_type pos) const
+LyXFont LyXText::getFont(ParagraphList::iterator pit, pos_type pos) const

 {
        Assert(pos >= 0);
 
        LyXLayout_ptr const & layout = pit->layout();
 {
        Assert(pos >= 0);
 
        LyXLayout_ptr const & layout = pit->layout();

+#warning broken?
+       BufferParams const & params = bv()->buffer()->params;

 
        // We specialize the 95% common case:
        if (!pit->getDepth()) {
                if (layout->labeltype == LABEL_MANUAL
                    && pos < pit->beginningOfBody()) {
                        // 1% goes here
 
        // We specialize the 95% common case:
        if (!pit->getDepth()) {
                if (layout->labeltype == LABEL_MANUAL
                    && pos < pit->beginningOfBody()) {
                        // 1% goes here

-                       LyXFont f = pit->getFontSettings(buf->params, pos);
+                       LyXFont f = pit->getFontSettings(params, pos);

                        if (pit->inInset())
                                pit->inInset()->getDrawFont(f);
                        return f.realize(layout->reslabelfont);
                } else {
                        if (pit->inInset())
                                pit->inInset()->getDrawFont(f);
                        return f.realize(layout->reslabelfont);
                } else {

-                       LyXFont f = pit->getFontSettings(buf->params, pos);
+                       LyXFont f = pit->getFontSettings(params, pos);

                        if (pit->inInset())
                                pit->inInset()->getDrawFont(f);
                        return f.realize(layout->resfont);
                        if (pit->inInset())
                                pit->inInset()->getDrawFont(f);
                        return f.realize(layout->resfont);


@@ -150,7 +143,7 @@ LyXFont const LyXText::getFont(Buffer const * buf, ParagraphList::iterator pit,
                layoutfont = layout->font;
        }
 
                layoutfont = layout->font;
        }
 

-       LyXFont tmpfont = pit->getFontSettings(buf->params, pos);
+       LyXFont tmpfont = pit->getFontSettings(params, pos);

        tmpfont.realize(layoutfont);
 
        if (pit->inInset())
        tmpfont.realize(layoutfont);
 
        if (pit->inInset())


@@ -158,42 +151,41 @@ LyXFont const LyXText::getFont(Buffer const * buf, ParagraphList::iterator pit,
 
        // Realize with the fonts of lesser depth.
        tmpfont.realize(outerFont(pit, ownerParagraphs()));
 
        // Realize with the fonts of lesser depth.
        tmpfont.realize(outerFont(pit, ownerParagraphs()));

+       tmpfont.realize(defaultfont_);

 
 

-       return realizeFont(tmpfont, buf->params);
+       return tmpfont;

 }
 
 
 }
 
 

-LyXFont const LyXText::getLayoutFont(Buffer const * buf,
-                                    ParagraphList::iterator pit) const
+LyXFont LyXText::getLayoutFont(ParagraphList::iterator pit) const

 {
        LyXLayout_ptr const & layout = pit->layout();
 
 {
        LyXLayout_ptr const & layout = pit->layout();
 

-       if (!pit->getDepth()) {
+       if (!pit->getDepth())

                return layout->resfont;
                return layout->resfont;

-       }

 
 

-       LyXFont font(layout->font);
+       LyXFont font = layout->font;

        // Realize with the fonts of lesser depth.
        font.realize(outerFont(pit, ownerParagraphs()));
        // Realize with the fonts of lesser depth.
        font.realize(outerFont(pit, ownerParagraphs()));

+       font.realize(defaultfont_);

 
 

-       return realizeFont(font, buf->params);
+       return font;

 }
 
 
 }
 
 

-LyXFont const LyXText::getLabelFont(Buffer const * buf,
-                                   ParagraphList::iterator pit) const
+LyXFont LyXText::getLabelFont(ParagraphList::iterator pit) const

 {
        LyXLayout_ptr const & layout = pit->layout();
 
 {
        LyXLayout_ptr const & layout = pit->layout();
 

-       if (!pit->getDepth()) {
+       if (!pit->getDepth())

                return layout->reslabelfont;
                return layout->reslabelfont;

-       }

 
 

-       LyXFont font(layout->labelfont);
+       LyXFont font = layout->labelfont;

        // Realize with the fonts of lesser depth.
        font.realize(outerFont(pit, ownerParagraphs()));
        // Realize with the fonts of lesser depth.
        font.realize(outerFont(pit, ownerParagraphs()));

+       font.realize(defaultfont_);

 
 

-       return realizeFont(layout->labelfont, buf->params);
+       return font;

 }
 
 
 }
 
 


@@ -201,30 +193,27 @@ void LyXText::setCharFont(ParagraphList::iterator pit,
                          pos_type pos, LyXFont const & fnt,
                          bool toggleall)
 {
                          pos_type pos, LyXFont const & fnt,
                          bool toggleall)
 {

-       Buffer const * buf = bv()->buffer();
-       LyXFont font = getFont(buf, pit, pos);
-       font.update(fnt, buf->params.language, toggleall);
+       BufferParams const & params = bv()->buffer()->params;
+       LyXFont font = getFont(pit, pos);
+       font.update(fnt, params.language, toggleall);

        // Let the insets convert their font
        if (pit->isInset(pos)) {
        // Let the insets convert their font
        if (pit->isInset(pos)) {

-               Inset * inset = pit->getInset(pos);
+               InsetOld * inset = pit->getInset(pos);

                if (isEditableInset(inset)) {
                if (isEditableInset(inset)) {

-                       UpdatableInset * uinset =
-                               static_cast<UpdatableInset *>(inset);
-                       uinset->setFont(bv(), fnt, toggleall, true);
+                       static_cast<UpdatableInset *>(inset)
+                               ->setFont(bv(), fnt, toggleall, true);

                }
        }
 
                }
        }
 

-       // Plug thru to version below:
-       setCharFont(buf, pit, pos, font);
+       // Plug through to version below:
+       setCharFont(pit, pos, font);

 }
 
 
 }
 
 

-void LyXText::setCharFont(Buffer const * buf, ParagraphList::iterator pit,
-                         pos_type pos, LyXFont const & fnt)
+void LyXText::setCharFont(
+       ParagraphList::iterator pit, pos_type pos, LyXFont const & fnt)

 {
 {

-       LyXFont font(fnt);
-
-       LyXTextClass const & tclass = buf->params.getLyXTextClass();
+       LyXFont font = fnt;

        LyXLayout_ptr const & layout = pit->layout();
 
        // Get concrete layout font to reduce against
        LyXLayout_ptr const & layout = pit->layout();
 
        // Get concrete layout font to reduce against


@@ -247,7 +236,7 @@ void LyXText::setCharFont(Buffer const * buf, ParagraphList::iterator pit,
                }
        }
 
                }
        }
 

-       layoutfont.realize(tclass.defaultfont());
+       layoutfont.realize(defaultfont_);

 
        // Now, reduce font against full layout font
        font.reduce(layoutfont);
 
        // Now, reduce font against full layout font
        font.reduce(layoutfont);


@@ -256,53 +245,7 @@ void LyXText::setCharFont(Buffer const * buf, ParagraphList::iterator pit,
 }
 
 
 }
 
 

-// removes the row and reset the touched counters
-void LyXText::removeRow(RowList::iterator rit)
-{
-       if (anchor_row_ == rit) {
-               if (rit != rows().begin()) {
-                       anchor_row_ = boost::prior(rit);
-                       anchor_row_offset_ += anchor_row_->height();
-               } else {
-                       anchor_row_ = boost::next(rit);
-                       anchor_row_offset_ -= rit->height();
-               }
-       }
-
-       // the text becomes smaller
-       height -= rit->height();
-
-       rowlist_.erase(rit);
-}
-
-
-// remove all following rows of the paragraph of the specified row.
-void LyXText::removeParagraph(RowList::iterator rit)
-{
-       ParagraphList::iterator tmppit = rit->par();
-       ++rit;
-
-       while (rit != rows().end() && rit->par() == tmppit) {
-               RowList::iterator tmprit = boost::next(rit);
-               removeRow(rit);
-               rit = tmprit;
-       }
-}
-
-
-void LyXText::insertParagraph(ParagraphList::iterator pit,
-                             RowList::iterator rowit)
-{
-       // insert a new row, starting at position 0
-       Row newrow(pit, 0);
-       RowList::iterator rit = rowlist_.insert(rowit, newrow);
-
-       // and now append the whole paragraph before the new row
-       appendParagraph(rit);
-}
-
-
-Inset * LyXText::getInset() const
+InsetOld * LyXText::getInset() const

 {
        ParagraphList::iterator pit = cursor.par();
        pos_type const pos = cursor.pos();
 {
        ParagraphList::iterator pit = cursor.par();
        pos_type const pos = cursor.pos();


@@ -316,7 +259,7 @@ Inset * LyXText::getInset() const
 
 void LyXText::toggleInset()
 {
 
 void LyXText::toggleInset()
 {

-       Inset * inset = getInset();
+       InsetOld * inset = getInset();

        // is there an editable inset at cursor position?
        if (!isEditableInset(inset)) {
                // No, try to see if we are inside a collapsable inset
        // is there an editable inset at cursor position?
        if (!isEditableInset(inset)) {
                // No, try to see if we are inside a collapsable inset


@@ -332,13 +275,12 @@ void LyXText::toggleInset()
 
        // do we want to keep this?? (JMarc)
        if (!isHighlyEditableInset(inset))
 
        // do we want to keep this?? (JMarc)
        if (!isHighlyEditableInset(inset))

-               setCursorParUndo(bv());
+               recordUndo(bv(), Undo::ATOMIC);

 
 

-       if (inset->isOpen()) {
+       if (inset->isOpen())

                inset->close(bv());
                inset->close(bv());

-       } else {
+       else

                inset->open(bv());
                inset->open(bv());

-       }

 
        bv()->updateInset(inset);
 }
 
        bv()->updateInset(inset);
 }


@@ -346,7 +288,7 @@ void LyXText::toggleInset()
 
 /* used in setlayout */
 // Asger is not sure we want to do this...
 
 /* used in setlayout */
 // Asger is not sure we want to do this...

-void LyXText::makeFontEntriesLayoutSpecific(Buffer const & buf,
+void LyXText::makeFontEntriesLayoutSpecific(BufferParams const & params,

                                            Paragraph & par)
 {
        LyXLayout_ptr const & layout = par.layout();
                                            Paragraph & par)
 {
        LyXLayout_ptr const & layout = par.layout();


@@ -359,7 +301,7 @@ void LyXText::makeFontEntriesLayoutSpecific(Buffer const & buf,
                else
                        layoutfont = layout->font;
 
                else
                        layoutfont = layout->font;
 

-               LyXFont tmpfont = par.getFontSettings(buf.params, pos);
+               LyXFont tmpfont = par.getFontSettings(params, pos);

                tmpfont.reduce(layoutfont);
                par.setFont(pos, tmpfont);
        }
                tmpfont.reduce(layoutfont);
                par.setFont(pos, tmpfont);
        }


@@ -385,7 +327,7 @@ LyXText::setLayout(LyXCursor & cur, LyXCursor & sstart_cur,
                ++endpit;
        }
 
                ++endpit;
        }
 

-       setUndo(bv(), Undo::EDIT, sstart_cur.par(), boost::prior(undoendpit));
+       recordUndo(bv(), Undo::ATOMIC, sstart_cur.par(), boost::prior(undoendpit));

 
        // ok we have a selection. This is always between sstart_cur
        // and sel_end cursor
 
        // ok we have a selection. This is always between sstart_cur
        // and sel_end cursor


@@ -398,12 +340,11 @@ LyXText::setLayout(LyXCursor & cur, LyXCursor & sstart_cur,
 
        do {
                pit->applyLayout(lyxlayout);
 
        do {
                pit->applyLayout(lyxlayout);

-               makeFontEntriesLayoutSpecific(*bv()->buffer(), *pit);
-               ParagraphList::iterator fppit = pit;
-               fppit->params().spaceTop(lyxlayout->fill_top ?
+               makeFontEntriesLayoutSpecific(bv()->buffer()->params, *pit);
+               pit->params().spaceTop(lyxlayout->fill_top ?

                                         VSpace(VSpace::VFILL)
                                         : VSpace(VSpace::NONE));
                                         VSpace(VSpace::VFILL)
                                         : VSpace(VSpace::NONE));

-               fppit->params().spaceBottom(lyxlayout->fill_bottom ?
+               pit->params().spaceBottom(lyxlayout->fill_bottom ?

                                            VSpace(VSpace::VFILL)
                                            : VSpace(VSpace::NONE));
                if (lyxlayout->margintype == MARGIN_MANUAL)
                                            VSpace(VSpace::VFILL)
                                            : VSpace(VSpace::NONE));
                if (lyxlayout->margintype == MARGIN_MANUAL)


@@ -437,7 +378,7 @@ void LyXText::setLayout(string const & layout)
                bv()->owner()->dispatch(FuncRequest(LFUN_HOME));
                bv()->owner()->dispatch(FuncRequest(LFUN_ENDSEL));
                bv()->owner()->dispatch(FuncRequest(LFUN_CUT));
                bv()->owner()->dispatch(FuncRequest(LFUN_HOME));
                bv()->owner()->dispatch(FuncRequest(LFUN_ENDSEL));
                bv()->owner()->dispatch(FuncRequest(LFUN_CUT));

-               Inset * inset = new InsetEnvironment(params, layout);
+               InsetOld * inset = new InsetEnvironment(params, layout);

                if (bv()->insertInset(inset)) {
                        //inset->edit(bv());
                        //bv()->owner()->dispatch(FuncRequest(LFUN_PASTE));
                if (bv()->insertInset(inset)) {
                        //inset->edit(bv());
                        //bv()->owner()->dispatch(FuncRequest(LFUN_PASTE));


@@ -449,7 +390,7 @@ void LyXText::setLayout(string const & layout)
 
        ParagraphList::iterator endpit = setLayout(cursor, selection.start,
                                                   selection.end, layout);
 
        ParagraphList::iterator endpit = setLayout(cursor, selection.start,
                                                   selection.end, layout);

-       redoParagraphs(selection.start, endpit);
+       redoParagraphs(selection.start.par(), endpit);

 
        // we have to reset the selection, because the
        // geometry could have changed
 
        // we have to reset the selection, because the
        // geometry could have changed


@@ -465,8 +406,8 @@ void LyXText::setLayout(string const & layout)
 
 bool LyXText::changeDepth(bv_funcs::DEPTH_CHANGE type, bool test_only)
 {
 
 bool LyXText::changeDepth(bv_funcs::DEPTH_CHANGE type, bool test_only)
 {

-       ParagraphList::iterator pit(cursor.par());
-       ParagraphList::iterator end(cursor.par());
+       ParagraphList::iterator pit = cursor.par();
+       ParagraphList::iterator end = cursor.par();

        ParagraphList::iterator start = pit;
 
        if (selection.set()) {
        ParagraphList::iterator start = pit;
 
        if (selection.set()) {


@@ -478,7 +419,7 @@ bool LyXText::changeDepth(bv_funcs::DEPTH_CHANGE type, bool test_only)
        ParagraphList::iterator pastend = boost::next(end);
 
        if (!test_only)
        ParagraphList::iterator pastend = boost::next(end);
 
        if (!test_only)

-               setUndo(bv(), Undo::EDIT, start, end);
+               recordUndo(bv(), Undo::ATOMIC, start, end);

 
        bool changed = false;
 
 
        bool changed = false;
 


@@ -494,10 +435,8 @@ bool LyXText::changeDepth(bv_funcs::DEPTH_CHANGE type, bool test_only)
                        if (depth < prev_after_depth
                            && pit->layout()->labeltype != LABEL_BIBLIO) {
                                changed = true;
                        if (depth < prev_after_depth
                            && pit->layout()->labeltype != LABEL_BIBLIO) {
                                changed = true;

-                               if (!test_only) {
+                               if (!test_only)

                                        pit->params().depth(depth + 1);
                                        pit->params().depth(depth + 1);

-                               }
-

                        }
                } else if (depth) {
                        changed = true;
                        }
                } else if (depth) {
                        changed = true;


@@ -517,15 +456,11 @@ bool LyXText::changeDepth(bv_funcs::DEPTH_CHANGE type, bool test_only)
        if (test_only)
                return changed;
 
        if (test_only)
                return changed;
 

-       // Wow, redoParagraphs is stupid.
-       LyXCursor tmpcursor;
-       setCursor(tmpcursor, start, 0);
-
-       redoParagraphs(tmpcursor, pastend);
+       redoParagraphs(start, pastend);

 
        // We need to actually move the text->cursor. I don't
        // understand why ...
 
        // We need to actually move the text->cursor. I don't
        // understand why ...

-       tmpcursor = cursor;
+       LyXCursor tmpcursor = cursor;

 
        // we have to reset the visual selection because the
        // geometry could have changed
 
        // we have to reset the visual selection because the
        // geometry could have changed


@@ -554,11 +489,9 @@ void LyXText::setFont(LyXFont const & font, bool toggleall)
                // Determine basis font
                LyXFont layoutfont;
                if (cursor.pos() < cursor.par()->beginningOfBody()) {
                // Determine basis font
                LyXFont layoutfont;
                if (cursor.pos() < cursor.par()->beginningOfBody()) {

-                       layoutfont = getLabelFont(bv()->buffer(),
-                                                 cursor.par());
+                       layoutfont = getLabelFont(cursor.par());

                } else {
                } else {

-                       layoutfont = getLayoutFont(bv()->buffer(),
-                                                  cursor.par());
+                       layoutfont = getLayoutFont(cursor.par());

                }
                // Update current font
                real_current_font.update(font,
                }
                // Update current font
                real_current_font.update(font,


@@ -579,7 +512,7 @@ void LyXText::setFont(LyXFont const & font, bool toggleall)
        // ok we have a selection. This is always between sel_start_cursor
        // and sel_end cursor
 
        // ok we have a selection. This is always between sel_start_cursor
        // and sel_end cursor
 

-       setUndo(bv(), Undo::EDIT, selection.start.par(), selection.end.par());
+       recordUndo(bv(), Undo::ATOMIC, selection.start.par(), selection.end.par());

        freezeUndo();
        cursor = selection.start;
        while (cursor.par() != selection.end.par() ||
        freezeUndo();
        cursor = selection.start;
        while (cursor.par() != selection.end.par() ||


@@ -597,7 +530,7 @@ void LyXText::setFont(LyXFont const & font, bool toggleall)
        }
        unFreezeUndo();
 
        }
        unFreezeUndo();
 

-       redoParagraphs(selection.start, boost::next(selection.end.par()));
+       redoParagraph(selection.start.par());

 
        // we have to reset the selection, because the
        // geometry could have changed, but we keep
 
        // we have to reset the selection, because the
        // geometry could have changed, but we keep


@@ -611,154 +544,100 @@ void LyXText::setFont(LyXFont const & font, bool toggleall)
 }
 
 
 }
 
 

-void LyXText::redoHeightOfParagraph()
+int LyXText::redoParagraphInternal(ParagraphList::iterator pit)

 {
 {

-       RowList::iterator tmprow = cursorRow();
+       RowList::iterator rit = pit->rows.begin();
+       RowList::iterator end = pit->rows.end();

 
 

-       setHeightOfRow(tmprow);
+       // remove rows of paragraph, keep track of height changes
+       for (int i = 0; rit != end; ++rit, ++i)
+               height -= rit->height();
+       pit->rows.clear();

 
 

-       while (tmprow != rows().begin()
-              && boost::prior(tmprow)->par() == tmprow->par()) {
-               --tmprow;
-               setHeightOfRow(tmprow);
+       // redo insets
+       InsetList::iterator ii = pit->insetlist.begin();
+       InsetList::iterator iend = pit->insetlist.end();
+       for (; ii != iend; ++ii) {
+               Dimension dim;
+               MetricsInfo mi(bv(), getFont(pit, ii->pos), workWidth());
+               ii->inset->metrics(mi, dim);

        }
 
        }
 

-       postPaint();
+       // rebreak the paragraph
+       for (pos_type z = 0; z < pit->size() + 1; ) {
+               Row row(z);
+               z = rowBreakPoint(pit, row) + 1;
+               row.end(z);
+               pit->rows.push_back(row);
+       }
+
+       int par_width = 0;
+       // set height and fill and width of rows
+       int const ww = workWidth();
+       for (rit = pit->rows.begin(); rit != end; ++rit) {
+               int const f = fill(pit, rit, ww);
+               int const w = ww - f;
+               par_width = std::max(par_width, w);
+               rit->fill(f);
+               rit->width(w);
+               prepareToPrint(pit, rit);
+               setHeightOfRow(pit, rit);
+               height += rit->height();
+       }

 
 

-       setCursor(cursor.par(), cursor.pos(), false, cursor.boundary());
+       //lyxerr << "redoParagraph: " << pit->rows.size() << " rows\n";
+       return par_width;

 }
 
 
 }
 
 

-// deletes and inserts again all paragraphs between the cursor
-// and the specified par
-// This function is needed after SetLayout and SetFont etc.
-void LyXText::redoParagraphs(LyXCursor const & cur,
-                            ParagraphList::iterator endpit)
+int LyXText::redoParagraphs(ParagraphList::iterator start,
+  ParagraphList::iterator end)

 {
 {

-       RowList::iterator tmprit = getRow(cur);
-
-       ParagraphList::iterator first_phys_pit;
-       RowList::iterator prevrit;
-       if (tmprit == rows().begin()) {
-               // A trick/hack for UNDO.
-               // This is needed because in an UNDO/REDO we could have
-               // changed the ownerParagraph() so the paragraph inside
-               // the row is NOT my really first par anymore.
-               // Got it Lars ;) (Jug 20011206)
-               first_phys_pit = ownerParagraphs().begin();
-               prevrit = rows().end();
-       } else {
-               first_phys_pit = tmprit->par();
-               while (tmprit != rows().begin()
-                      && boost::prior(tmprit)->par() == first_phys_pit)
-               {
-                       --tmprit;
-               }
-               prevrit = boost::prior(tmprit);
-       }
-
-       // remove it
-       while (tmprit != rows().end() && tmprit->par() != endpit) {
-               RowList::iterator tmprit2 = tmprit++;
-               removeRow(tmprit2);
+       int pars_width = 0;
+       for ( ; start != end; ++start) {
+               int par_width = redoParagraphInternal(start);
+               pars_width = std::max(par_width, pars_width);

        }
        }

+       updateRowPositions();
+       return pars_width;
+}

 
 

-       // Reinsert the paragraphs.
-       ParagraphList::iterator tmppit = first_phys_pit;

 
 

-       while (tmppit != ownerParagraphs().end()) {
-               insertParagraph(tmppit, tmprit);
-               while (tmprit != rows().end()
-                      && tmprit->par() == tmppit) {
-                       ++tmprit;
-               }
-               ++tmppit;
-               if (tmppit == endpit)
-                       break;
-       }
-       if (prevrit != rows().end())
-               setHeightOfRow(prevrit);
-       else
-               setHeightOfRow(rows().begin());
-       postPaint();
-       if (tmprit != rows().end())
-               setHeightOfRow(tmprit);
-
-       updateCounters();
+void LyXText::redoParagraph(ParagraphList::iterator pit)
+{
+       redoParagraphInternal(pit);
+       updateRowPositions();

 }
 
 
 void LyXText::fullRebreak()
 {
 }
 
 
 void LyXText::fullRebreak()
 {

-       init(bv());
-       setCursorIntern(cursor.par(), cursor.pos());
+       redoParagraphs(ownerParagraphs().begin(), ownerParagraphs().end());
+       redoCursor();
+       selection.cursor = cursor;

 }
 
 
 void LyXText::metrics(MetricsInfo & mi, Dimension & dim)
 {
 }
 
 
 void LyXText::metrics(MetricsInfo & mi, Dimension & dim)
 {

-       lyxerr << "LyXText::metrics: width: " << mi.base.textwidth << "\n";
+       //lyxerr << "LyXText::metrics: width: " << mi.base.textwidth
+       //      << " workWidth: " << workWidth() << endl;
+       //Assert(mi.base.textwidth);

 
        // rebuild row cache
 
        // rebuild row cache

-       rowlist_.clear();
-       need_break_row = rows().end();
-       width = height = 0;
-
-       anchor_row_ = rows().end();
-       anchor_row_offset_ = 0;
-
-       ParagraphList::iterator pit = ownerParagraphs().begin();
-       ParagraphList::iterator end = ownerParagraphs().end();
-
-       for (; pit != end; ++pit) {
-               // compute inset metrics
-               for (int pos = 0; pos != pit->size(); ++pos) {
-                       if (pit->isInset(pos)) {
-                               Dimension dim;
-                               MetricsInfo m = mi;
-                               pit->getInset(pos)->metrics(m, dim);
-                       }
-               }
+       width  = 0;
+       ///height = 0;

 
 

-               // insert a new row, starting at position 0
-               Row newrow(pit, 0);
-               RowList::iterator rit = rowlist_.insert(rowlist_.end(), newrow);
-
-               // and now append the whole paragraph before the new row
-               appendParagraph(rit);
-       }
-
-       // compute height
-       //lyxerr << "height 0: " << height << "\n";
-       //for (RowList::iterator rit = rows().begin(); rit != rows().end(); ++rit) {
-       //      height += rit->height();
-       //}
-       //lyxerr << "height 1: " << height << "\n";
+       //anchor_y_ = 0;
+       width = redoParagraphs(ownerParagraphs().begin(), ownerParagraphs().end());

 
        // final dimension
 
        // final dimension

-       dim.asc = rows().begin()->ascent_of_text();
+       dim.asc = firstRow()->ascent_of_text();

        dim.des = height - dim.asc;
        dim.wid = std::max(mi.base.textwidth, int(width));
 }
 
 
        dim.des = height - dim.asc;
        dim.wid = std::max(mi.base.textwidth, int(width));
 }
 
 

-void LyXText::partialRebreak()
-{
-       if (rows().empty()) {
-               init(bv());
-               return;
-       }
-
-       RowList::iterator rows_end = rows().end();
-
-       if (need_break_row != rows_end) {
-               breakAgain(need_break_row);
-               need_break_row = rows_end;
-               return;
-       }
-}
-
-

 // important for the screen
 
 
 // important for the screen
 
 


@@ -769,10 +648,7 @@ void LyXText::partialRebreak()
 // need the selection cursor:
 void LyXText::setSelection()
 {
 // need the selection cursor:
 void LyXText::setSelection()
 {

-       bool const lsel = TextCursor::setSelection();
-
-       if (inset_owner && (selection.set() || lsel))
-               inset_owner->setUpdateStatus(InsetText::SELECTION);
+       TextCursor::setSelection();

 }
 
 
 }
 
 


@@ -799,20 +675,12 @@ void LyXText::cursorEnd()
                return;
 
        RowList::iterator rit = cursorRow();
                return;
 
        RowList::iterator rit = cursorRow();

-       RowList::iterator next_rit = boost::next(rit);
-       ParagraphList::iterator pit = rit->par();
-       pos_type last_pos = lastPos(*this, rit);
-
-       if (next_rit == rows().end() || next_rit->par() != pit) {
-               ++last_pos;
-       } else {
-               if (pit->empty() ||
-                   (pit->getChar(last_pos) != ' ' && !pit->isNewline(last_pos))) {
-                       ++last_pos;
-               }
-       }
-
-       setCursor(pit, last_pos);
+       ParagraphList::iterator pit = cursor.par();
+       pos_type pos = lastPos(*pit, rit);
+       /* cursor should be before a hard newline only */
+       if (!pit->isNewline(pos))
+               ++pos;
+       setCursor(pit, pos);

 }
 
 
 }
 
 


@@ -858,8 +726,6 @@ void LyXText::toggleFree(LyXFont const & font, bool toggleall)
                setCursor(cursor.par(), cursor.pos());
                selection.cursor = cursor;
        }
                setCursor(cursor.par(), cursor.pos());
                selection.cursor = cursor;
        }

-       if (inset_owner)
-               inset_owner->setUpdateStatus(InsetText::CURSOR_PAR);

 }
 
 
 }
 
 


@@ -878,7 +744,7 @@ string LyXText::getStringToIndex()
        else if (selection.start.par() != selection.end.par())
                bv()->owner()->message(_("Cannot index more than one paragraph!"));
        else
        else if (selection.start.par() != selection.end.par())
                bv()->owner()->message(_("Cannot index more than one paragraph!"));
        else

-               idxstring = selectionAsString(bv()->buffer(), false);
+               idxstring = selectionAsString(*bv()->buffer(), false);

 
        // Reset cursors to their original position.
        cursor = reset_cursor;
 
        // Reset cursors to their original position.
        cursor = reset_cursor;


@@ -894,8 +760,8 @@ string LyXText::getStringToIndex()
 
 
 // the DTP switches for paragraphs. LyX will store them in the first
 
 
 // the DTP switches for paragraphs. LyX will store them in the first

-// physicla paragraph. When a paragraph is broken, the top settings rest,
-// the bottom settings are given to the new one. So I can make shure,
+// physical paragraph. When a paragraph is broken, the top settings rest,
+// the bottom settings are given to the new one. So I can make sure,

 // they do not duplicate themself and you cannnot make dirty things with
 // them!
 
 // they do not duplicate themself and you cannnot make dirty things with
 // them!
 


@@ -929,7 +795,7 @@ void LyXText::setParagraph(bool line_top, bool line_bottom,
                ++endpit;
        }
 
                ++endpit;
        }
 

-       setUndo(bv(), Undo::EDIT, selection.start.par(),
+       recordUndo(bv(), Undo::ATOMIC, selection.start.par(),

                boost::prior(undoendpit));
 
 
                boost::prior(undoendpit));
 
 


@@ -963,9 +829,8 @@ void LyXText::setParagraph(bool line_top, bool line_bottom,
                params.noindent(noindent);
                tmppit = boost::prior(pit);
        }
                params.noindent(noindent);
                tmppit = boost::prior(pit);
        }

-       postPaint();

 
 

-       redoParagraphs(selection.start, endpit);
+       redoParagraphs(selection.start.par(), endpit);

 
        clearSelection();
        setCursor(selection.start.par(), selection.start.pos());
 
        clearSelection();
        setCursor(selection.start.par(), selection.start.pos());


@@ -979,9 +844,9 @@ void LyXText::setParagraph(bool line_top, bool line_bottom,
 
 
 // set the counter of a paragraph. This includes the labels
 
 
 // set the counter of a paragraph. This includes the labels

-void LyXText::setCounter(Buffer const * buf, ParagraphList::iterator pit)
+void LyXText::setCounter(Buffer const & buf, ParagraphList::iterator pit)

 {
 {

-       LyXTextClass const & textclass = buf->params.getLyXTextClass();
+       LyXTextClass const & textclass = buf.params.getLyXTextClass();

        LyXLayout_ptr const & layout = pit->layout();
 
        if (pit != ownerParagraphs().begin()) {
        LyXLayout_ptr const & layout = pit->layout();
 
        if (pit != ownerParagraphs().begin()) {


@@ -1000,13 +865,12 @@ void LyXText::setCounter(Buffer const * buf, ParagraphList::iterator pit)
                pit->itemdepth = 0;
        }
 
                pit->itemdepth = 0;
        }
 

-       /* Maybe we have to increment the enumeration depth.
-        * BUT, enumeration in a footnote is considered in isolation from its
-        *      surrounding paragraph so don't increment if this is the
-        *      first line of the footnote
-        * AND, bibliographies can't have their depth changed ie. they
-        *      are always of depth 0
-        */
+       // Maybe we have to increment the enumeration depth.
+       // BUT, enumeration in a footnote is considered in isolation from its
+       //      surrounding paragraph so don't increment if this is the
+       //      first line of the footnote
+       // AND, bibliographies can't have their depth changed ie. they
+       //      are always of depth 0

        if (pit != ownerParagraphs().begin()
            && boost::prior(pit)->getDepth() < pit->getDepth()
            && boost::prior(pit)->layout()->labeltype == LABEL_COUNTER_ENUMI
        if (pit != ownerParagraphs().begin()
            && boost::prior(pit)->getDepth() < pit->getDepth()
            && boost::prior(pit)->layout()->labeltype == LABEL_COUNTER_ENUMI


@@ -1028,9 +892,8 @@ void LyXText::setCounter(Buffer const * buf, ParagraphList::iterator pit)
        }
 
        if (layout->margintype == MARGIN_MANUAL) {
        }
 
        if (layout->margintype == MARGIN_MANUAL) {

-               if (pit->params().labelWidthString().empty()) {
+               if (pit->params().labelWidthString().empty())

                        pit->setLabelWidthString(layout->labelstring());
                        pit->setLabelWidthString(layout->labelstring());

-               }

        } else {
                pit->setLabelWidthString(string());
        }
        } else {
                pit->setLabelWidthString(string());
        }


@@ -1041,7 +904,7 @@ void LyXText::setCounter(Buffer const * buf, ParagraphList::iterator pit)
 
                ostringstream s;
 
 
                ostringstream s;
 

-               if (i >= 0 && i <= buf->params.secnumdepth) {
+               if (i >= 0 && i <= buf.params.secnumdepth) {

                        string numbertype;
                        string langtype;
 
                        string numbertype;
                        string langtype;
 


@@ -1049,9 +912,9 @@ void LyXText::setCounter(Buffer const * buf, ParagraphList::iterator pit)
 
                        // Is there a label? Useful for Chapter layout
                        if (!pit->params().appendix()) {
 
                        // Is there a label? Useful for Chapter layout
                        if (!pit->params().appendix()) {

-                               s << buf->B_(layout->labelstring());
+                               s << buf.B_(layout->labelstring());

                        } else {
                        } else {

-                               s << buf->B_(layout->labelstring_appendix());
+                               s << buf.B_(layout->labelstring_appendix());

                        }
 
                        // Use of an integer is here less than elegant. For now.
                        }
 
                        // Use of an integer is here less than elegant. For now.


@@ -1060,7 +923,7 @@ void LyXText::setCounter(Buffer const * buf, ParagraphList::iterator pit)
                                numbertype = "sectioning";
                        } else {
                                numbertype = "appendix";
                                numbertype = "sectioning";
                        } else {
                                numbertype = "appendix";

-                               if (pit->isRightToLeftPar(buf->params))
+                               if (pit->isRightToLeftPar(buf.params))

                                        langtype = "hebrew";
                                else
                                        langtype = "latin";
                                        langtype = "hebrew";
                                else
                                        langtype = "latin";


@@ -1114,32 +977,37 @@ void LyXText::setCounter(Buffer const * buf, ParagraphList::iterator pit)
                }
                // In biblio should't be following counters but...
        } else {
                }
                // In biblio should't be following counters but...
        } else {

-               string s = buf->B_(layout->labelstring());
+               string s = buf.B_(layout->labelstring());

 
                // the caption hack:
                if (layout->labeltype == LABEL_SENSITIVE) {
 
                // the caption hack:
                if (layout->labeltype == LABEL_SENSITIVE) {

+                       ParagraphList::iterator end = ownerParagraphs().end();

                        ParagraphList::iterator tmppit = pit;
                        ParagraphList::iterator tmppit = pit;

-                       Inset * in = 0;
+                       InsetOld * in = 0;

                        bool isOK = false;
                        bool isOK = false;

-                       while (tmppit != ownerParagraphs().end() &&
-                              tmppit->inInset()
+                       while (tmppit != end && tmppit->inInset()

                               // the single '=' is intended below
                               // the single '=' is intended below

-                              && (in = tmppit->inInset()->owner())) {
-                               if (in->lyxCode() == Inset::FLOAT_CODE ||
-                                   in->lyxCode() == Inset::WRAP_CODE) {
+                              && (in = tmppit->inInset()->owner()))
+                       {
+                               if (in->lyxCode() == InsetOld::FLOAT_CODE ||
+                                   in->lyxCode() == InsetOld::WRAP_CODE) {

                                        isOK = true;
                                        break;
                                } else {
                                        isOK = true;
                                        break;
                                } else {

-                                       tmppit = std::find(ownerParagraphs().begin(), ownerParagraphs().end(), *in->parOwner());
+                                       Paragraph const * owner = &ownerPar(buf, in);
+                                       tmppit = ownerParagraphs().begin();
+                                       for ( ; tmppit != end; ++tmppit)
+                                               if (&*tmppit == owner)
+                                                       break;

                                }
                        }
 
                        if (isOK) {
                                string type;
 
                                }
                        }
 
                        if (isOK) {
                                string type;
 

-                               if (in->lyxCode() == Inset::FLOAT_CODE)
+                               if (in->lyxCode() == InsetOld::FLOAT_CODE)

                                        type = static_cast<InsetFloat*>(in)->params().type;
                                        type = static_cast<InsetFloat*>(in)->params().type;

-                               else if (in->lyxCode() == Inset::WRAP_CODE)
+                               else if (in->lyxCode() == InsetOld::WRAP_CODE)

                                        type = static_cast<InsetWrap*>(in)->params().type;
                                else
                                        Assert(0);
                                        type = static_cast<InsetWrap*>(in)->params().type;
                                else
                                        Assert(0);


@@ -1149,7 +1017,7 @@ void LyXText::setCounter(Buffer const * buf, ParagraphList::iterator pit)
                                textclass.counters().step(fl.type());
 
                                // Doesn't work... yet.
                                textclass.counters().step(fl.type());
 
                                // Doesn't work... yet.

-                               s = bformat(_("%1$s #:"), buf->B_(fl.name()));
+                               s = bformat(_("%1$s #:"), buf.B_(fl.name()));

                        } else {
                                // par->SetLayout(0);
                                // s = layout->labelstring;
                        } else {
                                // par->SetLayout(0);
                                // s = layout->labelstring;


@@ -1179,18 +1047,12 @@ void LyXText::setCounter(Buffer const * buf, ParagraphList::iterator pit)
 // Updates all counters. Paragraphs with changed label string will be rebroken
 void LyXText::updateCounters()
 {
 // Updates all counters. Paragraphs with changed label string will be rebroken
 void LyXText::updateCounters()
 {

-       RowList::iterator rowit = rows().begin();
-       ParagraphList::iterator pit = rowit->par();
-
-       // CHECK if this is really needed. (Lgb)
+       // start over

        bv()->buffer()->params.getLyXTextClass().counters().reset();
 
        ParagraphList::iterator beg = ownerParagraphs().begin();
        ParagraphList::iterator end = ownerParagraphs().end();
        bv()->buffer()->params.getLyXTextClass().counters().reset();
 
        ParagraphList::iterator beg = ownerParagraphs().begin();
        ParagraphList::iterator end = ownerParagraphs().end();

-       for (; pit != end; ++pit) {
-               while (rowit->par() != pit)
-                       ++rowit;
-
+       for (ParagraphList::iterator pit = beg; pit != end; ++pit) {

                string const oldLabel = pit->params().labelString();
 
                size_t maxdepth = 0;
                string const oldLabel = pit->params().labelString();
 
                size_t maxdepth = 0;


@@ -1201,36 +1063,32 @@ void LyXText::updateCounters()
                        pit->params().depth(maxdepth);
 
                // setCounter can potentially change the labelString.
                        pit->params().depth(maxdepth);
 
                // setCounter can potentially change the labelString.

-               setCounter(bv()->buffer(), pit);
+               setCounter(*bv()->buffer(), pit);

 
                string const & newLabel = pit->params().labelString();
 
 
                string const & newLabel = pit->params().labelString();
 

-               if (oldLabel.empty() && !newLabel.empty()) {
-                       removeParagraph(rowit);
-                       appendParagraph(rowit);
-               }
+               if (oldLabel != newLabel)
+                       redoParagraph(pit);

        }
 }
 
 
        }
 }
 
 

-void LyXText::insertInset(Inset * inset)
+void LyXText::insertInset(InsetOld * inset)

 {
        if (!cursor.par()->insetAllowed(inset->lyxCode()))
                return;
 {
        if (!cursor.par()->insetAllowed(inset->lyxCode()))
                return;

-       setUndo(bv(), Undo::FINISH, cursor.par());
+       recordUndo(bv(), Undo::ATOMIC, cursor.par());

        freezeUndo();
        cursor.par()->insertInset(cursor.pos(), inset);
        // Just to rebreak and refresh correctly.
        // The character will not be inserted a second time
        insertChar(Paragraph::META_INSET);
        freezeUndo();
        cursor.par()->insertInset(cursor.pos(), inset);
        // Just to rebreak and refresh correctly.
        // The character will not be inserted a second time
        insertChar(Paragraph::META_INSET);

-       // If we enter a highly editable inset the cursor should be to before
-       // the inset. This couldn't happen before as Undo was not handled inside
-       // inset now after the Undo LyX tries to call inset->Edit(...) again
-       // and cannot do this as the cursor is behind the inset and GetInset
+       // If we enter a highly editable inset the cursor should be before
+       // the inset. After an Undo LyX tries to call inset->edit(...)
+       // and fails if the cursor is behind the inset and getInset

        // does not return the inset!
        // does not return the inset!

-       if (isHighlyEditableInset(inset)) {
+       if (isHighlyEditableInset(inset))

                cursorLeft(true);
                cursorLeft(true);

-       }

        unFreezeUndo();
 }
 
        unFreezeUndo();
 }
 


@@ -1245,7 +1103,7 @@ void LyXText::cutSelection(bool doclear, bool realcut)
        // finished. The solution used currently just works, to make it
        // faster we need to be more clever and probably also have more
        // calls to stuffClipboard. (Lgb)
        // finished. The solution used currently just works, to make it
        // faster we need to be more clever and probably also have more
        // calls to stuffClipboard. (Lgb)

-       bv()->stuffClipboard(selectionAsString(bv()->buffer(), true));
+       bv()->stuffClipboard(selectionAsString(*bv()->buffer(), true));

 
        // This doesn't make sense, if there is no selection
        if (!selection.set())
 
        // This doesn't make sense, if there is no selection
        if (!selection.set())


@@ -1269,9 +1127,8 @@ void LyXText::cutSelection(bool doclear, bool realcut)
                ++endpit;
        }
 
                ++endpit;
        }
 

-       setUndo(bv(), Undo::DELETE, selection.start.par(),
-               boost::prior(undoendpit));
-
+       recordUndo(bv(), Undo::DELETE, selection.start.par(),
+                  boost::prior(undoendpit));

 
        endpit = selection.end.par();
        int endpos = selection.end.pos();
 
        endpit = selection.end.par();
        int endpos = selection.end.pos();


@@ -1292,11 +1149,7 @@ void LyXText::cutSelection(bool doclear, bool realcut)
        if (doclear)
                selection.start.par()->stripLeadingSpaces();
 
        if (doclear)
                selection.start.par()->stripLeadingSpaces();
 

-       redoParagraphs(selection.start, boost::next(endpit));
-#warning FIXME latent bug
-       // endpit will be invalidated on redoParagraphs once ParagraphList
-       // becomes a std::list? There are maybe other places on which this
-       // can happend? (Ab)
+       redoParagraphs(selection.start.par(), boost::next(endpit));

        // cutSelection can invalidate the cursor so we need to set
        // it anew. (Lgb)
        // we prefer the end for when tracking changes
        // cutSelection can invalidate the cursor so we need to set
        // it anew. (Lgb)
        // we prefer the end for when tracking changes


@@ -1315,7 +1168,7 @@ void LyXText::cutSelection(bool doclear, bool realcut)
 void LyXText::copySelection()
 {
        // stuff the selection onto the X clipboard, from an explicit copy request
 void LyXText::copySelection()
 {
        // stuff the selection onto the X clipboard, from an explicit copy request

-       bv()->stuffClipboard(selectionAsString(bv()->buffer(), true));
+       bv()->stuffClipboard(selectionAsString(*bv()->buffer(), true));

 
        // this doesnt make sense, if there is no selection
        if (!selection.set())
 
        // this doesnt make sense, if there is no selection
        if (!selection.set())


@@ -1344,7 +1197,7 @@ void LyXText::pasteSelection(size_t sel_index)
        if (!CutAndPaste::checkPastePossible())
                return;
 
        if (!CutAndPaste::checkPastePossible())
                return;
 

-       setUndo(bv(), Undo::INSERT, cursor.par());
+       recordUndo(bv(), Undo::INSERT, cursor.par());

 
        ParagraphList::iterator endpit;
        PitPosPair ppp;
 
        ParagraphList::iterator endpit;
        PitPosPair ppp;


@@ -1360,7 +1213,7 @@ void LyXText::pasteSelection(size_t sel_index)
        bufferErrors(*bv()->buffer(), el);
        bv()->showErrorList(_("Paste"));
 
        bufferErrors(*bv()->buffer(), el);
        bv()->showErrorList(_("Paste"));
 

-       redoParagraphs(cursor, endpit);
+       redoParagraphs(cursor.par(), endpit);

 
        setCursor(cursor.par(), cursor.pos());
        clearSelection();
 
        setCursor(cursor.par(), cursor.pos());
        clearSelection();


@@ -1387,7 +1240,7 @@ void LyXText::setSelectionRange(lyx::pos_type length)
 // simple replacing. The font of the first selected character is used
 void LyXText::replaceSelectionWithString(string const & str)
 {
 // simple replacing. The font of the first selected character is used
 void LyXText::replaceSelectionWithString(string const & str)
 {

-       setCursorParUndo(bv());
+       recordUndo(bv(), Undo::ATOMIC);

        freezeUndo();
 
        if (!selection.set()) { // create a dummy selection
        freezeUndo();
 
        if (!selection.set()) { // create a dummy selection


@@ -1423,14 +1276,14 @@ void LyXText::insertStringAsLines(string const & str)
        pos_type pos = cursor.pos();
        ParagraphList::iterator endpit = boost::next(cursor.par());
 
        pos_type pos = cursor.pos();
        ParagraphList::iterator endpit = boost::next(cursor.par());
 

-       setCursorParUndo(bv());
+       recordUndo(bv(), Undo::ATOMIC);

 
        // only to be sure, should not be neccessary
        clearSelection();
 
        bv()->buffer()->insertStringAsLines(pit, pos, current_font, str);
 
 
        // only to be sure, should not be neccessary
        clearSelection();
 
        bv()->buffer()->insertStringAsLines(pit, pos, current_font, str);
 

-       redoParagraphs(cursor, endpit);
+       redoParagraphs(cursor.par(), endpit);

        setCursor(cursor.par(), cursor.pos());
        selection.cursor = cursor;
        setCursor(pit, pos);
        setCursor(cursor.par(), cursor.pos());
        selection.cursor = cursor;
        setCursor(pit, pos);


@@ -1466,88 +1319,6 @@ void LyXText::insertStringAsParagraphs(string const & str)
 }
 
 
 }
 
 

-void LyXText::checkParagraph(ParagraphList::iterator pit, pos_type pos)
-{
-       LyXCursor tmpcursor;
-
-       pos_type z;
-       RowList::iterator row = getRow(pit, pos);
-       RowList::iterator beg = rows().begin();
-
-       // is there a break one row above
-       if (row != beg && boost::prior(row)->par() == row->par()) {
-               z = rowBreakPoint(*boost::prior(row));
-               if (z >= row->pos()) {
-                       // set the dimensions of the row above
-                       postPaint();
-
-                       breakAgain(boost::prior(row));
-
-                       // set the cursor again. Otherwise
-                       // dangling pointers are possible
-                       setCursor(cursor.par(), cursor.pos(),
-                                 false, cursor.boundary());
-                       selection.cursor = cursor;
-                       return;
-               }
-       }
-
-       breakAgain(row);
-       postPaint();
-
-       // set the cursor again. Otherwise dangling pointers are possible
-       // also set the selection
-
-       if (selection.set()) {
-               tmpcursor = cursor;
-               setCursorIntern(selection.cursor.par(), selection.cursor.pos(),
-                               false, selection.cursor.boundary());
-               selection.cursor = cursor;
-               setCursorIntern(selection.start.par(),
-                               selection.start.pos(),
-                               false, selection.start.boundary());
-               selection.start = cursor;
-               setCursorIntern(selection.end.par(),
-                               selection.end.pos(),
-                               false, selection.end.boundary());
-               selection.end = cursor;
-               setCursorIntern(last_sel_cursor.par(),
-                               last_sel_cursor.pos(),
-                               false, last_sel_cursor.boundary());
-               last_sel_cursor = cursor;
-               cursor = tmpcursor;
-       }
-       setCursorIntern(cursor.par(), cursor.pos(),
-                       false, cursor.boundary());
-}
-
-
-// returns false if inset wasn't found
-bool LyXText::updateInset(Inset * inset)
-{
-       // first check the current paragraph
-       int pos = cursor.par()->getPositionOfInset(inset);
-       if (pos != -1) {
-               checkParagraph(cursor.par(), pos);
-               return true;
-       }
-
-       // check every paragraph
-
-       ParagraphList::iterator par = ownerParagraphs().begin();
-       ParagraphList::iterator end = ownerParagraphs().end();
-       for (; par != end; ++par) {
-               pos = par->getPositionOfInset(inset);
-               if (pos != -1) {
-                       checkParagraph(par, pos);
-                       return true;
-               }
-       };
-
-       return false;
-}
-
-

 bool LyXText::setCursor(ParagraphList::iterator pit,
                        pos_type pos,
                        bool setfont, bool boundary)
 bool LyXText::setCursor(ParagraphList::iterator pit,
                        pos_type pos,
                        bool setfont, bool boundary)


@@ -1558,6 +1329,13 @@ bool LyXText::setCursor(ParagraphList::iterator pit,
 }
 
 
 }
 
 

+void LyXText::redoCursor()
+{
+#warning maybe the same for selections?
+       setCursor(cursor, cursor.par(), cursor.pos(), cursor.boundary());
+}
+
+

 void LyXText::setCursor(LyXCursor & cur, ParagraphList::iterator pit,
                        pos_type pos, bool boundary)
 {
 void LyXText::setCursor(LyXCursor & cur, ParagraphList::iterator pit,
                        pos_type pos, bool boundary)
 {


@@ -1566,41 +1344,30 @@ void LyXText::setCursor(LyXCursor & cur, ParagraphList::iterator pit,
        cur.par(pit);
        cur.pos(pos);
        cur.boundary(boundary);
        cur.par(pit);
        cur.pos(pos);
        cur.boundary(boundary);

-       if (rows().empty())
+       if (noRows())

                return;
 
        // get the cursor y position in text
                return;
 
        // get the cursor y position in text

-       int y = 0;
-       RowList::iterator row = getRow(pit, pos, y);
-       RowList::iterator beg = rows().begin();
+
+       RowList::iterator row = getRow(pit, pos);
+       int y = row->y();

 
        RowList::iterator old_row = row;
        // if we are before the first char of this row and are still in the
        // same paragraph and there is a previous row then put the cursor on
        // the end of the previous row
        cur.iy(y + row->baseline());
 
        RowList::iterator old_row = row;
        // if we are before the first char of this row and are still in the
        // same paragraph and there is a previous row then put the cursor on
        // the end of the previous row
        cur.iy(y + row->baseline());

-       if (row != beg &&
-           pos &&
-           boost::prior(row)->par() == row->par() &&
-           pos < pit->size() &&
-           pit->getChar(pos) == Paragraph::META_INSET) {
-               Inset * ins = pit->getInset(pos);
-               if (ins && (ins->needFullRow() || ins->display())) {
-                       --row;
-                       y -= row->height();
-               }
-       }

 
        // y is now the beginning of the cursor row
        y += row->baseline();
        // y is now the cursor baseline
        cur.y(y);
 
 
        // y is now the beginning of the cursor row
        y += row->baseline();
        // y is now the cursor baseline
        cur.y(y);
 

-       pos_type last = lastPrintablePos(*this, old_row);
+       pos_type last = lastPrintablePos(*pit, old_row);

 
        // None of these should happen, but we're scaredy-cats
        if (pos > pit->size()) {
 
        // None of these should happen, but we're scaredy-cats
        if (pos > pit->size()) {

-               lyxerr << "dont like 1 please report" << endl;
+               lyxerr << "dont like 1, pos: " << pos << " size: " << pit->size() << endl;

                pos = 0;
                cur.pos(0);
        } else if (pos > last + 1) {
                pos = 0;
                cur.pos(0);
        } else if (pos > last + 1) {


@@ -1615,60 +1382,44 @@ void LyXText::setCursor(LyXCursor & cur, ParagraphList::iterator pit,
        }
 
        // now get the cursors x position
        }
 
        // now get the cursors x position

-       float x = getCursorX(row, pos, last, boundary);
+       float x = getCursorX(pit, row, pos, last, boundary);

        cur.x(int(x));
        cur.x_fix(cur.x());
        if (old_row != row) {
        cur.x(int(x));
        cur.x_fix(cur.x());
        if (old_row != row) {

-               x = getCursorX(old_row, pos, last, boundary);
+               x = getCursorX(pit, old_row, pos, last, boundary);

                cur.ix(int(x));
        } else
                cur.ix(cur.x());
                cur.ix(int(x));
        } else
                cur.ix(cur.x());

-/* We take out this for the time being because 1) the redraw code is not
-   prepared to this yet and 2) because some good policy has yet to be decided
-   while editting: for instance how to act on rows being created/deleted
-   because of DEPM.
-*/
-#if 0
-       //if the cursor is in a visible row, anchor to it
-       int topy = top_y();
-       if (topy < y && y < topy + bv()->workHeight())
-               anchor_row(row);
-#endif

 }
 
 
 }
 
 

-float LyXText::getCursorX(RowList::iterator rit,
+float LyXText::getCursorX(ParagraphList::iterator pit, RowList::iterator rit,

                          pos_type pos, pos_type last, bool boundary) const
 {
                          pos_type pos, pos_type last, bool boundary) const
 {

-       pos_type cursor_vpos = 0;
-       int x;
-       int fill_separator;
-       int fill_hfill;
-       int fill_label_hfill;
-       // This call HAS to be here because of the BidiTables!!!
-       prepareToPrint(rit, x, fill_separator, fill_hfill,
-                      fill_label_hfill);
-
-       ParagraphList::iterator rit_par = rit->par();
-       pos_type const rit_pos = rit->pos();
+       pos_type cursor_vpos    = 0;
+       double x                = rit->x();
+       double fill_separator   = rit->fill_separator();
+       double fill_hfill       = rit->fill_hfill();
+       double fill_label_hfill = rit->fill_label_hfill();
+       pos_type const rit_pos  = rit->pos();

 
        if (last < rit_pos)
                cursor_vpos = rit_pos;
        else if (pos > last && !boundary)
 
        if (last < rit_pos)
                cursor_vpos = rit_pos;
        else if (pos > last && !boundary)

-               cursor_vpos = (rit_par->isRightToLeftPar(bv()->buffer()->params))
+               cursor_vpos = (pit->isRightToLeftPar(bv()->buffer()->params))

                        ? rit_pos : last + 1;
        else if (pos > rit_pos && (pos > last || boundary))
                        ? rit_pos : last + 1;
        else if (pos > rit_pos && (pos > last || boundary))

-               /// Place cursor after char at (logical) position pos - 1
+               // Place cursor after char at (logical) position pos - 1

                cursor_vpos = (bidi_level(pos - 1) % 2 == 0)
                        ? log2vis(pos - 1) + 1 : log2vis(pos - 1);
        else
                cursor_vpos = (bidi_level(pos - 1) % 2 == 0)
                        ? log2vis(pos - 1) + 1 : log2vis(pos - 1);
        else

-               /// Place cursor before char at (logical) position pos
+               // Place cursor before char at (logical) position pos

                cursor_vpos = (bidi_level(pos) % 2 == 0)
                        ? log2vis(pos) : log2vis(pos) + 1;
 
                cursor_vpos = (bidi_level(pos) % 2 == 0)
                        ? log2vis(pos) : log2vis(pos) + 1;
 

-       pos_type body_pos = rit_par->beginningOfBody();
-       if ((body_pos > 0) &&
-           ((body_pos - 1 > last) || !rit_par->isLineSeparator(body_pos - 1)))
+       pos_type body_pos = pit->beginningOfBody();
+       if (body_pos > 0 &&
+           (body_pos - 1 > last || !pit->isLineSeparator(body_pos - 1)))

                body_pos = 0;
 
        for (pos_type vpos = rit_pos; vpos < cursor_vpos; ++vpos) {
                body_pos = 0;
 
        for (pos_type vpos = rit_pos; vpos < cursor_vpos; ++vpos) {


@@ -1676,24 +1427,23 @@ float LyXText::getCursorX(RowList::iterator rit,
                if (body_pos > 0 && pos == body_pos - 1) {
                        x += fill_label_hfill +
                                font_metrics::width(
                if (body_pos > 0 && pos == body_pos - 1) {
                        x += fill_label_hfill +
                                font_metrics::width(

-                                       rit_par->layout()->labelsep,
-                                       getLabelFont(bv()->buffer(), rit_par));
-                       if (rit_par->isLineSeparator(body_pos - 1))
-                               x -= singleWidth(rit_par, body_pos - 1);
+                                       pit->layout()->labelsep, getLabelFont(pit));
+                       if (pit->isLineSeparator(body_pos - 1))
+                               x -= singleWidth(pit, body_pos - 1);

                }
 
                }
 

-               if (hfillExpansion(*this, rit, pos)) {
-                       x += singleWidth(rit_par, pos);
+               if (hfillExpansion(*pit, rit, pos)) {
+                       x += singleWidth(pit, pos);

                        if (pos >= body_pos)
                                x += fill_hfill;
                        else
                                x += fill_label_hfill;
                        if (pos >= body_pos)
                                x += fill_hfill;
                        else
                                x += fill_label_hfill;

-               } else if (rit_par->isSeparator(pos)) {
-                       x += singleWidth(rit_par, pos);
+               } else if (pit->isSeparator(pos)) {
+                       x += singleWidth(pit, pos);

                        if (pos >= body_pos)
                                x += fill_separator;
                } else
                        if (pos >= body_pos)
                                x += fill_separator;
                } else

-                       x += singleWidth(rit_par, pos);
+                       x += singleWidth(pit, pos);

        }
        return x;
 }
        }
        return x;
 }


@@ -1702,32 +1452,6 @@ float LyXText::getCursorX(RowList::iterator rit,
 void LyXText::setCursorIntern(ParagraphList::iterator pit,
                              pos_type pos, bool setfont, bool boundary)
 {
 void LyXText::setCursorIntern(ParagraphList::iterator pit,
                              pos_type pos, bool setfont, bool boundary)
 {

-       UpdatableInset * it = pit->inInset();
-       if (it) {
-               if (it != inset_owner) {
-                       lyxerr[Debug::INSETS] << "InsetText   is " << it
-                                             << endl
-                                             << "inset_owner is "
-                                             << inset_owner << endl;
-#ifdef WITH_WARNINGS
-#warning I believe this code is wrong. (Lgb)
-#warning Jürgen, have a look at this. (Lgb)
-#warning Hmmm, I guess you are right but we
-#warning should verify when this is needed
-#endif
-                       // Jürgen, would you like to have a look?
-                       // I guess we need to move the outer cursor
-                       // and open and lock the inset (bla bla bla)
-                       // stuff I don't know... so can you have a look?
-                       // (Lgb)
-                       // I moved the lyxerr stuff in here so we can see if
-                       // this is actually really needed and where!
-                       // (Jug)
-                       // it->getLyXText(bv())->setCursorIntern(bv(), par, pos, setfont, boundary);
-                       return;
-               }
-       }
-

        setCursor(cursor, pit, pos, boundary);
        if (setfont)
                setCurrentFont();
        setCursor(cursor, pit, pos, boundary);
        if (setfont)
                setCurrentFont();


@@ -1756,12 +1480,11 @@ void LyXText::setCurrentFont()
                        }
        }
 
                        }
        }
 

-       current_font =
-               pit->getFontSettings(bv()->buffer()->params, pos);
-       real_current_font = getFont(bv()->buffer(), pit, pos);
+       current_font = pit->getFontSettings(bv()->buffer()->params, pos);
+       real_current_font = getFont(pit, pos);

 
        if (cursor.pos() == pit->size() &&
 
        if (cursor.pos() == pit->size() &&

-           isBoundary(bv()->buffer(), *pit, cursor.pos()) &&
+           isBoundary(*bv()->buffer(), *pit, cursor.pos()) &&

            !cursor.boundary()) {
                Language const * lang =
                        pit->getParLanguage(bv()->buffer()->params);
            !cursor.boundary()) {
                Language const * lang =
                        pit->getParLanguage(bv()->buffer()->params);


@@ -1775,36 +1498,32 @@ void LyXText::setCurrentFont()
 
 // returns the column near the specified x-coordinate of the row
 // x is set to the real beginning of this column
 
 // returns the column near the specified x-coordinate of the row
 // x is set to the real beginning of this column

-pos_type
-LyXText::getColumnNearX(RowList::iterator rit, int & x, bool & boundary) const
+pos_type LyXText::getColumnNearX(ParagraphList::iterator pit,
+       RowList::iterator rit, int & x, bool & boundary) const

 {
 {

-       int tmpx = 0;
-       int fill_separator;
-       int fill_hfill;
-       int fill_label_hfill;
-
-       prepareToPrint(rit, tmpx, fill_separator, fill_hfill, fill_label_hfill);
+       double tmpx             = rit->x();
+       double fill_separator   = rit->fill_separator();
+       double fill_hfill       = rit->fill_hfill();
+       double fill_label_hfill = rit->fill_label_hfill();

 
        pos_type vc = rit->pos();
 
        pos_type vc = rit->pos();

-       pos_type last = lastPrintablePos(*this, rit);
+       pos_type last = lastPrintablePos(*pit, rit);

        pos_type c = 0;
        pos_type c = 0;

-
-       ParagraphList::iterator rit_par = rit->par();
-       LyXLayout_ptr const & layout = rit->par()->layout();
+       LyXLayout_ptr const & layout = pit->layout();

 
        bool left_side = false;
 
 
        bool left_side = false;
 

-       pos_type body_pos = rit_par->beginningOfBody();
-       int last_tmpx = tmpx;
+       pos_type body_pos = pit->beginningOfBody();
+       double last_tmpx = tmpx;

 
        if (body_pos > 0 &&
            (body_pos - 1 > last ||
 
        if (body_pos > 0 &&
            (body_pos - 1 > last ||

-            !rit_par->isLineSeparator(body_pos - 1)))
+            !pit->isLineSeparator(body_pos - 1)))

                body_pos = 0;
 
        // check for empty row
                body_pos = 0;
 
        // check for empty row

-       if (!rit_par->size()) {
-               x = tmpx;
+       if (!pit->size()) {
+               x = int(tmpx);

                return 0;
        }
 
                return 0;
        }
 


@@ -1813,24 +1532,23 @@ LyXText::getColumnNearX(RowList::iterator rit, int & x, bool & boundary) const
                last_tmpx = tmpx;
                if (body_pos > 0 && c == body_pos - 1) {
                        tmpx += fill_label_hfill +
                last_tmpx = tmpx;
                if (body_pos > 0 && c == body_pos - 1) {
                        tmpx += fill_label_hfill +

-                               font_metrics::width(layout->labelsep,
-                                              getLabelFont(bv()->buffer(), rit_par));
-                       if (rit_par->isLineSeparator(body_pos - 1))
-                               tmpx -= singleWidth(rit_par, body_pos - 1);
+                               font_metrics::width(layout->labelsep, getLabelFont(pit));
+                       if (pit->isLineSeparator(body_pos - 1))
+                               tmpx -= singleWidth(pit, body_pos - 1);

                }
 
                }
 

-               if (hfillExpansion(*this, rit, c)) {
-                       tmpx += singleWidth(rit_par, c);
+               if (hfillExpansion(*pit, rit, c)) {
+                       tmpx += singleWidth(pit, c);

                        if (c >= body_pos)
                                tmpx += fill_hfill;
                        else
                                tmpx += fill_label_hfill;
                        if (c >= body_pos)
                                tmpx += fill_hfill;
                        else
                                tmpx += fill_label_hfill;

-               } else if (rit_par->isSeparator(c)) {
-                       tmpx += singleWidth(rit_par, c);
+               } else if (pit->isSeparator(c)) {
+                       tmpx += singleWidth(pit, c);

                        if (c >= body_pos)
                                tmpx += fill_separator;
                } else {
                        if (c >= body_pos)
                                tmpx += fill_separator;
                } else {

-                       tmpx += singleWidth(rit_par, c);
+                       tmpx += singleWidth(pit, c);

                }
                ++vc;
        }
                }
                ++vc;
        }


@@ -1845,21 +1563,18 @@ LyXText::getColumnNearX(RowList::iterator rit, int & x, bool & boundary) const
 
        boundary = false;
        // This (rtl_support test) is not needed, but gives
 
        boundary = false;
        // This (rtl_support test) is not needed, but gives

-       // some speedup if rtl_support=false
-       RowList::iterator next_rit = boost::next(rit);
-
-       bool const lastrow = lyxrc.rtl_support &&
-               (next_rit == rowlist_.end() ||
-                next_rit->par() != rit_par);
+       // some speedup if rtl_support == false
+       bool const lastrow = lyxrc.rtl_support
+                       && boost::next(rit) == pit->rows.end();

 
        // If lastrow is false, we don't need to compute
        // the value of rtl.
        bool const rtl = (lastrow)
 
        // If lastrow is false, we don't need to compute
        // the value of rtl.
        bool const rtl = (lastrow)

-               ? rit_par->isRightToLeftPar(bv()->buffer()->params)
+               ? pit->isRightToLeftPar(bv()->buffer()->params)

                : false;
        if (lastrow &&
                : false;
        if (lastrow &&

-                ((rtl &&  left_side && vc == rit->pos() && x < tmpx - 5) ||
-                  (!rtl && !left_side && vc == last + 1   && x > tmpx + 5)))
+                ((rtl  &&  left_side && vc == rit->pos() && x < tmpx - 5) ||
+                 (!rtl && !left_side && vc == last + 1   && x > tmpx + 5)))

                c = last + 1;
        else if (vc == rit->pos()) {
                c = vis2log(vc);
                c = last + 1;
        else if (vc == rit->pos()) {
                c = vis2log(vc);


@@ -1870,16 +1585,15 @@ LyXText::getColumnNearX(RowList::iterator rit, int & x, bool & boundary) const
                bool const rtl = (bidi_level(c) % 2 == 1);
                if (left_side == rtl) {
                        ++c;
                bool const rtl = (bidi_level(c) % 2 == 1);
                if (left_side == rtl) {
                        ++c;

-                       boundary = isBoundary(bv()->buffer(), *rit_par, c);
+                       boundary = isBoundary(*bv()->buffer(), *pit, c);

                }
        }
 
                }
        }
 

-       if (rit->pos() <= last && c > last
-           && rit_par->isNewline(last)) {
+       if (rit->pos() <= last && c > last && pit->isNewline(last)) {

                if (bidi_level(last) % 2 == 0)
                if (bidi_level(last) % 2 == 0)

-                       tmpx -= singleWidth(rit_par, last);
+                       tmpx -= singleWidth(pit, last);

                else
                else

-                       tmpx += singleWidth(rit_par, last);
+                       tmpx += singleWidth(pit, last);

                c = last;
        }
 
                c = last;
        }
 


@@ -1891,68 +1605,30 @@ LyXText::getColumnNearX(RowList::iterator rit, int & x, bool & boundary) const
 
 void LyXText::setCursorFromCoordinates(int x, int y)
 {
 
 void LyXText::setCursorFromCoordinates(int x, int y)
 {

-       //LyXCursor old_cursor = cursor;
+       LyXCursor old_cursor = cursor;

        setCursorFromCoordinates(cursor, x, y);
        setCurrentFont();
        setCursorFromCoordinates(cursor, x, y);
        setCurrentFont();

-#warning DEPM disabled, otherwise crash when entering new table
-       //deleteEmptyParagraphMechanism(old_cursor);
-}
-
-
-namespace {
-
-       /**
-        * return true if the cursor given is at the end of a row,
-        * and the next row is filled by an inset that spans an entire
-        * row.
-        */
-       bool beforeFullRowInset(LyXText & lt, LyXCursor const & cur)
-       {
-               RowList::iterator row = lt.getRow(cur);
-               if (boost::next(row) == lt.rows().end())
-                       return false;
-
-               Row const & next = *boost::next(row);
-
-               if (next.pos() != cur.pos() || next.par() != cur.par())
-                       return false;
-
-               if (cur.pos() == cur.par()->size()
-                   || !cur.par()->isInset(cur.pos()))
-                       return false;
-
-               Inset const * inset = cur.par()->getInset(cur.pos());
-               if (inset->needFullRow() || inset->display())
-                       return true;
-
-               return false;
-       }
+       deleteEmptyParagraphMechanism(old_cursor);

 }
 
 
 void LyXText::setCursorFromCoordinates(LyXCursor & cur, int x, int y)
 {
        // Get the row first.
 }
 
 
 void LyXText::setCursorFromCoordinates(LyXCursor & cur, int x, int y)
 {
        // Get the row first.

+       ParagraphList::iterator pit;
+       RowList::iterator rit = getRowNearY(y, pit);
+       y = rit->y();

 
 

-       RowList::iterator row = getRowNearY(y);

        bool bound = false;
        bool bound = false;

-       pos_type const column = getColumnNearX(row, x, bound);
-       cur.par(row->par());
-       cur.pos(row->pos() + column);
+       pos_type const column = getColumnNearX(pit, rit, x, bound);
+       cur.par(pit);
+       cur.pos(rit->pos() + column);

        cur.x(x);
        cur.x(x);

-       cur.y(y + row->baseline());
+       cur.y(y + rit->baseline());

 
 

-       if (beforeFullRowInset(*this, cur)) {
-               pos_type const last = lastPrintablePos(*this, row);
-               RowList::iterator next_row = boost::next(row);
+       cur.iy(cur.y());
+       cur.ix(cur.x());

 
 

-               float x = getCursorX(next_row, cur.pos(), last, bound);
-               cur.ix(int(x));
-               cur.iy(y + row->height() + next_row->baseline());
-       } else {
-               cur.iy(cur.y());
-               cur.ix(cur.x());
-       }

        cur.boundary(bound);
 }
 
        cur.boundary(bound);
 }
 


@@ -1963,9 +1639,10 @@ void LyXText::cursorLeft(bool internal)
                bool boundary = cursor.boundary();
                setCursor(cursor.par(), cursor.pos() - 1, true, false);
                if (!internal && !boundary &&
                bool boundary = cursor.boundary();
                setCursor(cursor.par(), cursor.pos() - 1, true, false);
                if (!internal && !boundary &&

-                   isBoundary(bv()->buffer(), *cursor.par(), cursor.pos() + 1))
+                   isBoundary(*bv()->buffer(), *cursor.par(), cursor.pos() + 1))

                        setCursor(cursor.par(), cursor.pos() + 1, true, true);
                        setCursor(cursor.par(), cursor.pos() + 1, true, true);

-       } else if (cursor.par() != ownerParagraphs().begin()) { // steps into the above paragraph.
+       } else if (cursor.par() != ownerParagraphs().begin()) {
+               // steps into the paragraph above

                ParagraphList::iterator pit = boost::prior(cursor.par());
                setCursor(pit, pit->size());
        }
                ParagraphList::iterator pit = boost::prior(cursor.par());
                setCursor(pit, pit->size());
        }


@@ -1983,7 +1660,7 @@ void LyXText::cursorRight(bool internal)
        else if (!at_end) {
                setCursor(cursor.par(), cursor.pos() + 1, true, false);
                if (!internal &&
        else if (!at_end) {
                setCursor(cursor.par(), cursor.pos() + 1, true, false);
                if (!internal &&

-                   isBoundary(bv()->buffer(), *cursor.par(), cursor.pos()))
+                   isBoundary(*bv()->buffer(), *cursor.par(), cursor.pos()))

                        setCursor(cursor.par(), cursor.pos(), true, true);
        } else if (boost::next(cursor.par()) != ownerParagraphs().end())
                setCursor(boost::next(cursor.par()), 0);
                        setCursor(cursor.par(), cursor.pos(), true, true);
        } else if (boost::next(cursor.par()) != ownerParagraphs().end())
                setCursor(boost::next(cursor.par()), 0);


@@ -1997,19 +1674,21 @@ void LyXText::cursorUp(bool selecting)
        int y = cursor.y() - cursorRow()->baseline() - 1;
        setCursorFromCoordinates(x, y);
        if (!selecting) {
        int y = cursor.y() - cursorRow()->baseline() - 1;
        setCursorFromCoordinates(x, y);
        if (!selecting) {

-               int topy = top_y();
+               int topy = bv_owner->top_y();

                int y1 = cursor.iy() - topy;
                int y2 = y1;
                y -= topy;
                int y1 = cursor.iy() - topy;
                int y2 = y1;
                y -= topy;

-               Inset * inset_hit = checkInsetHit(x, y1);
+               InsetOld * inset_hit = checkInsetHit(x, y1);

                if (inset_hit && isHighlyEditableInset(inset_hit)) {
                        inset_hit->localDispatch(
                                FuncRequest(bv(), LFUN_INSET_EDIT, x, y - (y2 - y1), mouse_button::none));
                }
        }
 #else
                if (inset_hit && isHighlyEditableInset(inset_hit)) {
                        inset_hit->localDispatch(
                                FuncRequest(bv(), LFUN_INSET_EDIT, x, y - (y2 - y1), mouse_button::none));
                }
        }
 #else

-       setCursorFromCoordinates(bv(), cursor.x_fix(),
-                                cursor.y() - cursorRow()->baseline() - 1);
+       lyxerr << "cursorUp: y " << cursor.y() << " bl: " <<
+               cursorRow()->baseline() << endl;
+       setCursorFromCoordinates(cursor.x_fix(),
+               cursor.y() - cursorRow()->baseline() - 1);

 #endif
 }
 
 #endif
 }
 


@@ -2021,32 +1700,29 @@ void LyXText::cursorDown(bool selecting)
        int y = cursor.y() - cursorRow()->baseline() + cursorRow()->height() + 1;
        setCursorFromCoordinates(x, y);
        if (!selecting && cursorRow() == cursorIRow()) {
        int y = cursor.y() - cursorRow()->baseline() + cursorRow()->height() + 1;
        setCursorFromCoordinates(x, y);
        if (!selecting && cursorRow() == cursorIRow()) {

-               int topy = top_y();
+               int topy = bv_owner->top_y();

                int y1 = cursor.iy() - topy;
                int y2 = y1;
                y -= topy;
                int y1 = cursor.iy() - topy;
                int y2 = y1;
                y -= topy;

-               Inset * inset_hit = checkInsetHit(x, y1);
+               InsetOld * inset_hit = checkInsetHit(x, y1);

                if (inset_hit && isHighlyEditableInset(inset_hit)) {
                        FuncRequest cmd(bv(), LFUN_INSET_EDIT, x, y - (y2 - y1), mouse_button::none);
                        inset_hit->localDispatch(cmd);
                }
        }
 #else
                if (inset_hit && isHighlyEditableInset(inset_hit)) {
                        FuncRequest cmd(bv(), LFUN_INSET_EDIT, x, y - (y2 - y1), mouse_button::none);
                        inset_hit->localDispatch(cmd);
                }
        }
 #else

-       setCursorFromCoordinates(bv(), cursor.x_fix(),
-                                cursor.y() - cursorRow()->baseline()
-                                + cursorRow()->height() + 1);
+       setCursorFromCoordinates(cursor.x_fix(),
+                cursor.y() - cursorRow()->baseline() + cursorRow()->height() + 1);

 #endif
 }
 
 
 void LyXText::cursorUpParagraph()
 {
 #endif
 }
 
 
 void LyXText::cursorUpParagraph()
 {

-       if (cursor.pos() > 0) {
+       if (cursor.pos() > 0)

                setCursor(cursor.par(), 0);
                setCursor(cursor.par(), 0);

-       }
-       else if (cursor.par() != ownerParagraphs().begin()) {
+       else if (cursor.par() != ownerParagraphs().begin())

                setCursor(boost::prior(cursor.par()), 0);
                setCursor(boost::prior(cursor.par()), 0);

-       }

 }
 
 
 }
 
 


@@ -2055,17 +1731,16 @@ void LyXText::cursorDownParagraph()
        ParagraphList::iterator par = cursor.par();
        ParagraphList::iterator next_par = boost::next(par);
 
        ParagraphList::iterator par = cursor.par();
        ParagraphList::iterator next_par = boost::next(par);
 

-       if (next_par != ownerParagraphs().end()) {
+       if (next_par != ownerParagraphs().end())

                setCursor(next_par, 0);
                setCursor(next_par, 0);

-       } else {
+       else

                setCursor(par, par->size());
                setCursor(par, par->size());

-       }

 }
 
 }
 

+

 // fix the cursor `cur' after a characters has been deleted at `where'
 // position. Called by deleteEmptyParagraphMechanism
 // fix the cursor `cur' after a characters has been deleted at `where'
 // position. Called by deleteEmptyParagraphMechanism

-void LyXText::fixCursorAfterDelete(LyXCursor & cur,
-                                  LyXCursor const & where)
+void LyXText::fixCursorAfterDelete(LyXCursor & cur, LyXCursor const & where)

 {
        // if cursor is not in the paragraph where the delete occured,
        // do nothing
 {
        // if cursor is not in the paragraph where the delete occured,
        // do nothing


@@ -2094,10 +1769,8 @@ bool LyXText::deleteEmptyParagraphMechanism(LyXCursor const & old_cursor)
                return false;
 
        // We allow all kinds of "mumbo-jumbo" when freespacing.
                return false;
 
        // We allow all kinds of "mumbo-jumbo" when freespacing.

-       if (old_cursor.par()->layout()->free_spacing
-           || old_cursor.par()->isFreeSpacing()) {
+       if (old_cursor.par()->isFreeSpacing())

                return false;
                return false;

-       }

 
        /* Ok I'll put some comments here about what is missing.
           I have fixed BackSpace (and thus Delete) to not delete
 
        /* Ok I'll put some comments here about what is missing.
           I have fixed BackSpace (and thus Delete) to not delete


@@ -2106,7 +1779,7 @@ bool LyXText::deleteEmptyParagraphMechanism(LyXCursor const & old_cursor)
           There are still some small problems that can lead to
           double spaces stored in the document file or space at
           the beginning of paragraphs. This happens if you have
           There are still some small problems that can lead to
           double spaces stored in the document file or space at
           the beginning of paragraphs. This happens if you have

-          the cursor betwenn to spaces and then save. Or if you
+          the cursor between to spaces and then save. Or if you

           cut and paste and the selection have a space at the
           beginning and then save right after the paste. I am
           sure none of these are very hard to fix, but I will
           cut and paste and the selection have a space at the
           beginning and then save right after the paste. I am
           sure none of these are very hard to fix, but I will


@@ -2125,15 +1798,17 @@ bool LyXText::deleteEmptyParagraphMechanism(LyXCursor const & old_cursor)
        // If the pos around the old_cursor were spaces, delete one of them.
        if (old_cursor.par() != cursor.par()
            || old_cursor.pos() != cursor.pos()) {
        // If the pos around the old_cursor were spaces, delete one of them.
        if (old_cursor.par() != cursor.par()
            || old_cursor.pos() != cursor.pos()) {

-               // Only if the cursor has really moved

 
 

+               // Only if the cursor has really moved

                if (old_cursor.pos() > 0
                    && old_cursor.pos() < old_cursor.par()->size()
                    && old_cursor.par()->isLineSeparator(old_cursor.pos())
                    && old_cursor.par()->isLineSeparator(old_cursor.pos() - 1)) {
                if (old_cursor.pos() > 0
                    && old_cursor.pos() < old_cursor.par()->size()
                    && old_cursor.par()->isLineSeparator(old_cursor.pos())
                    && old_cursor.par()->isLineSeparator(old_cursor.pos() - 1)) {

-                       old_cursor.par()->erase(old_cursor.pos() - 1);
-                       redoParagraphs(old_cursor, boost::next(old_cursor.par()));
+                       bool erased = old_cursor.par()->erase(old_cursor.pos() - 1);
+                       redoParagraph(old_cursor.par());

 
 

+                       if (!erased)
+                               return false;

 #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
 #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


@@ -2142,16 +1817,9 @@ bool LyXText::deleteEmptyParagraphMechanism(LyXCursor const & old_cursor)
 #endif
                        // correct all cursors held by the LyXText
                        fixCursorAfterDelete(cursor, old_cursor);
 #endif
                        // correct all cursors held by the LyXText
                        fixCursorAfterDelete(cursor, old_cursor);

-                       fixCursorAfterDelete(selection.cursor,
-                                            old_cursor);
-                       fixCursorAfterDelete(selection.start,
-                                            old_cursor);
+                       fixCursorAfterDelete(selection.cursor, old_cursor);
+                       fixCursorAfterDelete(selection.start, old_cursor);

                        fixCursorAfterDelete(selection.end, old_cursor);
                        fixCursorAfterDelete(selection.end, old_cursor);

-                       fixCursorAfterDelete(last_sel_cursor,
-                                            old_cursor);
-                       fixCursorAfterDelete(toggle_cursor, old_cursor);
-                       fixCursorAfterDelete(toggle_end_cursor,
-                                            old_cursor);

                        return false;
                }
        }
                        return false;
                }
        }


@@ -2175,7 +1843,7 @@ bool LyXText::deleteEmptyParagraphMechanism(LyXCursor const & old_cursor)
        if (old_cursor.par()->empty() ||
            (old_cursor.par()->size() == 1 &&
             old_cursor.par()->isLineSeparator(0))) {
        if (old_cursor.par()->empty() ||
            (old_cursor.par()->size() == 1 &&
             old_cursor.par()->isLineSeparator(0))) {

-               // ok, we will delete anything
+               // ok, we will delete something

                LyXCursor tmpcursor;
 
                deleted = true;
                LyXCursor tmpcursor;
 
                deleted = true;


@@ -2184,67 +1852,19 @@ bool LyXText::deleteEmptyParagraphMechanism(LyXCursor const & old_cursor)
                        selection.cursor.par()  == old_cursor.par()
                        && selection.cursor.pos() == old_cursor.pos());
 
                        selection.cursor.par()  == old_cursor.par()
                        && selection.cursor.pos() == old_cursor.pos());
 

-               if (getRow(old_cursor) != rows().begin()) {
-                       RowList::iterator prevrow = boost::prior(getRow(old_cursor));
-                       postPaint();
-                       tmpcursor = cursor;
-                       cursor = old_cursor; // that undo can restore the right cursor position
-                       #warning FIXME. --end() iterator is usable here
-                       ParagraphList::iterator endpit = boost::next(old_cursor.par());
-                       while (endpit != ownerParagraphs().end() &&
-                              endpit->getDepth()) {
-                               ++endpit;
-                       }
+               tmpcursor = cursor;
+               cursor = old_cursor; // that undo can restore the right cursor position

 
 

-                       setUndo(bv(), Undo::DELETE, old_cursor.par(),
-                               boost::prior(endpit));
-                       cursor = tmpcursor;
-
-                       // delete old row
-                       removeRow(getRow(old_cursor));
-                       // delete old par
-                       ownerParagraphs().erase(old_cursor.par());
-
-                       /* Breakagain the next par. Needed because of
-                        * the parindent that can occur or dissappear.
-                        * The next row can change its height, if
-                        * there is another layout before */
-                       RowList::iterator tmprit = boost::next(prevrow);
-                       if (tmprit != rows().end()) {
-                               breakAgain(tmprit);
-                               updateCounters();
-                       }
-                       setHeightOfRow(prevrow);
-               } else {
-                       RowList::iterator nextrow = boost::next(getRow(old_cursor));
-                       postPaint();
-
-                       tmpcursor = cursor;
-                       cursor = old_cursor; // that undo can restore the right cursor position
-#warning FIXME. --end() iterator is usable here
-                       ParagraphList::iterator endpit = boost::next(old_cursor.par());
-                       while (endpit != ownerParagraphs().end() &&
-                              endpit->getDepth()) {
-                               ++endpit;
-                       }
+               ParagraphList::iterator endpit = boost::next(old_cursor.par());
+               while (endpit != ownerParagraphs().end() && endpit->getDepth())
+                       ++endpit;

 
 

-                       setUndo(bv(), Undo::DELETE, old_cursor.par(), boost::prior(endpit));
-                       cursor = tmpcursor;
-
-                       // delete old row
-                       removeRow(getRow(old_cursor));
-                       // delete old par
-                       ownerParagraphs().erase(old_cursor.par());
-
-                       /* Breakagain the next par. Needed because of
-                          the parindent that can occur or dissappear.
-                          The next row can change its height, if
-                          there is another layout before */
-                       if (nextrow != rows().end()) {
-                               breakAgain(nextrow);
-                               updateCounters();
-                       }
-               }
+               recordUndo(bv(), Undo::DELETE, old_cursor.par(), boost::prior(endpit));
+               cursor = tmpcursor;
+
+               // delete old par
+               ownerParagraphs().erase(old_cursor.par());
+               redoParagraph();

 
                // correct cursor y
                setCursorIntern(cursor.par(), cursor.pos());
 
                // correct cursor y
                setCursorIntern(cursor.par(), cursor.pos());


@@ -2256,7 +1876,7 @@ bool LyXText::deleteEmptyParagraphMechanism(LyXCursor const & old_cursor)
        }
        if (!deleted) {
                if (old_cursor.par()->stripLeadingSpaces()) {
        }
        if (!deleted) {
                if (old_cursor.par()->stripLeadingSpaces()) {

-                       redoParagraphs(old_cursor, boost::next(old_cursor.par()));
+                       redoParagraph(old_cursor.par());

                        // correct cursor y
                        setCursorIntern(cursor.par(), cursor.pos());
                        selection.cursor = cursor;
                        // correct cursor y
                        setCursorIntern(cursor.par(), cursor.pos());
                        selection.cursor = cursor;


@@ -2268,41 +1888,14 @@ bool LyXText::deleteEmptyParagraphMechanism(LyXCursor const & old_cursor)
 
 ParagraphList & LyXText::ownerParagraphs() const
 {
 
 ParagraphList & LyXText::ownerParagraphs() const
 {

-       if (inset_owner) {
-               return inset_owner->paragraphs;
-       }
-       return bv_owner->buffer()->paragraphs;
-}
-
-
-bool LyXText::needRefresh() const
-{
-       return need_refresh_;
-}
-
-
-void LyXText::clearPaint()
-{
-       need_refresh_ = false;
-}
-
-
-void LyXText::postPaint()
-{
-       need_refresh_ = true;
-
-       // We are an inset's lyxtext. Tell the top-level lyxtext
-       // it needs to update the row we're in.
-       if (inset_owner)
-               bv()->text->postPaint();
+       return paragraphs_;

 }
 
 
 bool LyXText::isInInset() const
 {
 }
 
 
 bool LyXText::isInInset() const
 {

-       // Sub-level has non-null bv owner and
-       // non-null inset owner.
-       return inset_owner != 0 && bv_owner != 0;
+       // Sub-level has non-null bv owner and non-null inset owner.
+       return inset_owner != 0;

 }
 
 
 }