]> git.lyx.org Git - lyx.git/blobdiff - src/TextMetrics.cpp
revert erroneous previous commit.
[lyx.git] / src / TextMetrics.cpp
index 39ac01851b64a10068268c3b6319e389c68f9c90..7d6235426a557362f174a8263c392c440800d24c 100644 (file)
@@ -24,9 +24,9 @@
 #include "buffer_funcs.h"
 #include "BufferParams.h"
 #include "BufferView.h"
+#include "CoordCache.h"
+#include "Cursor.h"
 #include "CutAndPaste.h"
-#include "debug.h"
-#include "FontIterator.h"
 #include "FuncRequest.h"
 #include "InsetList.h"
 #include "Layout.h"
 #include "ParIterator.h"
 #include "rowpainter.h"
 #include "Text.h"
+#include "TextClass.h"
 #include "VSpace.h"
 
+#include "mathed/MacroTable.h"
+#include "mathed/MathMacroTemplate.h"
+
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
-#include <boost/current_function.hpp>
+#include "support/debug.h"
+#include <cstdlib>
+#include "support/lassert.h"
+
+using namespace std;
 
-using std::make_pair;
-using std::max;
-using std::min;
-using std::endl;
-using std::pair;
 
 namespace lyx {
 
 using frontend::FontMetrics;
 
-namespace {
-
-int numberOfSeparators(Paragraph const & par, Row const & row)
+static int numberOfSeparators(Paragraph const & par, Row const & row)
 {
        pos_type const first = max(row.pos(), par.beginOfBody());
        pos_type const last = row.endpos() - 1;
@@ -70,7 +71,7 @@ int numberOfSeparators(Paragraph const & par, Row const & row)
 }
 
 
-int numberOfLabelHfills(Paragraph const & par, Row const & row)
+static int numberOfLabelHfills(Paragraph const & par, Row const & row)
 {
        pos_type last = row.endpos() - 1;
        pos_type first = row.pos();
@@ -91,7 +92,7 @@ int numberOfLabelHfills(Paragraph const & par, Row const & row)
 }
 
 
-int numberOfHfills(Paragraph const & par, Row const & row)
+static int numberOfHfills(Paragraph const & par, Row const & row)
 {
        pos_type const last = row.endpos();
        pos_type first = row.pos();
@@ -112,12 +113,18 @@ int numberOfHfills(Paragraph const & par, Row const & row)
        return n;
 }
 
-} // namespace anon
+
+/////////////////////////////////////////////////////////////////////
+//
+// TextMetrics
+//
+/////////////////////////////////////////////////////////////////////
+
 
 TextMetrics::TextMetrics(BufferView * bv, Text * text)
        : bv_(bv), text_(text)
 {
-       BOOST_ASSERT(bv_);
+       LASSERT(bv_, /**/);
        max_width_ = bv_->workWidth();
        dim_.wid = max_width_;
        dim_.asc = 10;
@@ -127,7 +134,7 @@ TextMetrics::TextMetrics(BufferView * bv, Text * text)
 }
 
 
-bool TextMetrics::has(pit_type pit) const
+bool TextMetrics::contains(pit_type pit) const
 {
        return par_metrics_.find(pit) != par_metrics_.end();
 }
@@ -154,17 +161,15 @@ pair<pit_type, ParagraphMetrics const *> TextMetrics::last() const
 }
 
 
-ParagraphMetrics & TextMetrics::parMetrics(pit_type pit,
-               bool redo)
+ParagraphMetrics & TextMetrics::parMetrics(pit_type pit, bool redo)
 {
        ParMetricsCache::iterator pmc_it = par_metrics_.find(pit);
        if (pmc_it == par_metrics_.end()) {
                pmc_it = par_metrics_.insert(
                        make_pair(pit, ParagraphMetrics(text_->getPar(pit)))).first;
        }
-       if (pmc_it->second.rows().empty() && redo) {
+       if (pmc_it->second.rows().empty() && redo)
                redoParagraph(pit);
-       }
        return pmc_it->second;
 }
 
@@ -173,7 +178,7 @@ int TextMetrics::parPosition(pit_type pit) const
 {
        if (pit < par_metrics_.begin()->first)
                return -1000000;
-       else if (pit > par_metrics_.rbegin()->first)
+       if (pit > par_metrics_.rbegin()->first)
                return +1000000;
 
        return par_metrics_[pit].position();
@@ -182,7 +187,7 @@ int TextMetrics::parPosition(pit_type pit) const
 
 bool TextMetrics::metrics(MetricsInfo & mi, Dimension & dim, int min_width)
 {
-       BOOST_ASSERT(mi.base.textwidth);
+       LASSERT(mi.base.textwidth, /**/);
        max_width_ = mi.base.textwidth;
        // backup old dimension.
        Dimension const old_dim = dim_;
@@ -191,7 +196,7 @@ bool TextMetrics::metrics(MetricsInfo & mi, Dimension & dim, int min_width)
        dim_.wid = min_width;
        pit_type const npar = text_->paragraphs().size();
        if (npar > 1)
-               // If there is more than one row, expand the text to 
+               // If there is more than one row, expand the text to
                // the full allowable width.
                dim_.wid = max_width_;
 
@@ -222,13 +227,13 @@ bool TextMetrics::metrics(MetricsInfo & mi, Dimension & dim, int min_width)
 
 int TextMetrics::rightMargin(ParagraphMetrics const & pm) const
 {
-       return main_text_? pm.rightMargin(bv_->buffer()) : 0;
+       return main_text_? pm.rightMargin(*bv_) : 0;
 }
 
 
 int TextMetrics::rightMargin(pit_type const pit) const
 {
-       return main_text_? par_metrics_[pit].rightMargin(bv_->buffer()) : 0;
+       return main_text_? par_metrics_[pit].rightMargin(*bv_) : 0;
 }
 
 
@@ -242,13 +247,13 @@ void TextMetrics::applyOuterFont(Font & font) const
 }
 
 
-Font TextMetrics::getDisplayFont(pit_type pit, pos_type pos) const
+Font TextMetrics::displayFont(pit_type pit, pos_type pos) const
 {
-       BOOST_ASSERT(pos >= 0);
+       LASSERT(pos >= 0, /**/);
 
        ParagraphList const & pars = text_->paragraphs();
        Paragraph const & par = pars[pit];
-       LayoutPtr const & layout = par.layout();
+       Layout const & layout = par.layout();
        Buffer const & buffer = bv_->buffer();
        // FIXME: broken?
        BufferParams const & params = buffer.params();
@@ -259,11 +264,11 @@ Font TextMetrics::getDisplayFont(pit_type pit, pos_type pos) const
                Font f = par.getFontSettings(params, pos);
                if (!text_->isMainText(buffer))
                        applyOuterFont(f);
-               bool lab = layout->labeltype == LABEL_MANUAL && pos < body_pos;
+               bool lab = layout.labeltype == LABEL_MANUAL && pos < body_pos;
+
+               FontInfo const & lf = lab ? layout.labelfont : layout.font;
+               FontInfo rlf = lab ? layout.reslabelfont : layout.resfont;
 
-               FontInfo const & lf = lab ? layout->labelfont : layout->font;
-               FontInfo rlf = lab ? layout->reslabelfont : layout->resfont;
-               
                // In case the default family has been customized
                if (lf.family() == INHERIT_FAMILY)
                        rlf.setFamily(params.getFont().fontInfo().family());
@@ -272,8 +277,8 @@ Font TextMetrics::getDisplayFont(pit_type pit, pos_type pos) const
        }
 
        // The uncommon case need not be optimized as much
-       FontInfo const & layoutfont = pos < body_pos ? 
-               layout->labelfont : layout->font;
+       FontInfo const & layoutfont = pos < body_pos ?
+               layout.labelfont : layout.font;
 
        Font font = par.getFontSettings(params, pos);
        font.fontInfo().realize(layoutfont);
@@ -302,8 +307,8 @@ bool TextMetrics::isRTL(CursorSlice const & sl, bool boundary) const
        int correction = 0;
        if (boundary && sl.pos() > 0)
                correction = -1;
-               
-       return getDisplayFont(sl.pit(), sl.pos() + correction).isVisibleRightToLeft();
+
+       return displayFont(sl.pit(), sl.pos() + correction).isVisibleRightToLeft();
 }
 
 
@@ -318,12 +323,12 @@ bool TextMetrics::isRTLBoundary(pit_type pit, pos_type pos) const
 
        Paragraph const & par = text_->getPar(pit);
 
-       bool left = getDisplayFont(pit, pos - 1).isVisibleRightToLeft();
+       bool left = displayFont(pit, pos - 1).isVisibleRightToLeft();
        bool right;
        if (pos == par.size())
                right = par.isRTL(bv_->buffer().params());
        else
-               right = getDisplayFont(pit, pos).isVisibleRightToLeft();
+               right = displayFont(pit, pos).isVisibleRightToLeft();
        return left != right;
 }
 
@@ -340,7 +345,7 @@ bool TextMetrics::isRTLBoundary(pit_type pit, pos_type pos,
        if (pos == par.size())
                right = par.isRTL(bv_->buffer().params());
        else
-               right = getDisplayFont(pit, pos).isVisibleRightToLeft();
+               right = displayFont(pit, pos).isVisibleRightToLeft();
        return left != right;
 }
 
@@ -355,29 +360,42 @@ bool TextMetrics::redoParagraph(pit_type const pit)
        pm.reset(par);
 
        Buffer & buffer = bv_->buffer();
-       BufferParams const & bparams = buffer.params();
        main_text_ = (text_ == &buffer.text());
        bool changed = false;
 
-       // FIXME This check ought to be done somewhere else. It is the reason
+       // FIXME: This check ought to be done somewhere else. It is the reason
        // why text_ is not     const. But then, where else to do it?
        // Well, how can you end up with either (a) a biblio environment that
        // has no InsetBibitem or (b) a biblio environment with more than one
        // InsetBibitem? I think the answer is: when paragraphs are merged;
        // when layout is set; when material is pasted.
-       int const moveCursor = par.checkBiblio(buffer.params().trackChanges);
+       int const moveCursor = par.checkBiblio(buffer);
        if (moveCursor > 0)
-               const_cast<Cursor &>(bv_->cursor()).posRight();
+               const_cast<Cursor &>(bv_->cursor()).posForward();
        else if (moveCursor < 0) {
                Cursor & cursor = const_cast<Cursor &>(bv_->cursor());
                if (cursor.pos() >= -moveCursor)
-                       cursor.posLeft();
+                       cursor.posBackward();
        }
 
        // Optimisation: this is used in the next two loops
        // so better to calculate that once here.
        int const right_margin = rightMargin(pm);
 
+       // iterator pointing to paragraph to resolve macros
+       DocIterator parPos = text_->macrocontextPosition();
+       if (!parPos.empty())
+               parPos.pit() = pit;
+       else {
+               LYXERR(Debug::INFO, "MacroContext not initialised!"
+                       << " Going through the buffer again and hope"
+                       << " the context is better then.");
+               updateLabels(bv_->buffer());
+               parPos = text_->macrocontextPosition();
+               LASSERT(!parPos.empty(), /**/);
+               parPos.pit() = pit;
+       }
+
        // redo insets
        // FIXME: We should always use getFont(), see documentation of
        // noFontChange() in Inset.h.
@@ -385,37 +403,31 @@ bool TextMetrics::redoParagraph(pit_type const pit)
        InsetList::const_iterator ii = par.insetList().begin();
        InsetList::const_iterator iend = par.insetList().end();
        for (; ii != iend; ++ii) {
+               // position already initialized?
+               if (!parPos.empty()) {
+                       parPos.pos() = ii->pos;
+
+                       // A macro template would normally not be visible
+                       // by itself. But the tex macro semantics allow
+                       // recursion, so we artifically take the context
+                       // after the macro template to simulate this.
+                       if (ii->inset->lyxCode() == MATHMACRO_CODE)
+                               parPos.pos()++;
+               }
+
+               // do the metric calculation
                Dimension dim;
                int const w = max_width_ - leftMargin(max_width_, pit, ii->pos)
                        - right_margin;
                Font const & font = ii->inset->noFontChange() ?
-                       bufferfont : getDisplayFont(pit, ii->pos);
-               MetricsInfo mi(bv_, font.fontInfo(), w);
+                       bufferfont : displayFont(pit, ii->pos);
+               MacroContext mc(buffer, parPos);
+               MetricsInfo mi(bv_, font.fontInfo(), w, mc);
                ii->inset->metrics(mi, dim);
                Dimension const old_dim = pm.insetDimension(ii->inset);
-               pm.setInsetDimension(ii->inset, dim);
-               changed |= (old_dim != dim);
-       }
-
-       Cursor const & cur = bv_->cursor();
-       DocIterator sel_beg = cur.selectionBegin();
-       DocIterator sel_end = cur.selectionEnd();
-       bool selection = cur.selection()
-               // This is out text.
-               && cur.text() == text_
-               // if the anchor is outside, this is not our selection 
-               && cur.anchor().text() == text_
-               && pit >= sel_beg.pit() && pit <= sel_end.pit();
-
-       // We care only about visible selection.
-       if (selection) {
-               if (pit != sel_beg.pit()) {
-                       sel_beg.pit() = pit;
-                       sel_beg.pos() = 0;
-               }
-               if (pit != sel_end.pit()) {
-                       sel_end.pit() = pit;
-                       sel_end.pos() = sel_end.lastpos();
+               if (old_dim != dim) {
+                       pm.setInsetDimension(ii->inset, dim);
+                       changed = true;
                }
        }
 
@@ -428,31 +440,26 @@ bool TextMetrics::redoParagraph(pit_type const pit)
                Dimension dim;
                pos_type end = rowBreakPoint(width, pit, first);
                if (row_index || end < par.size())
-                       // If there is more than one row, expand the text to 
+                       // If there is more than one row, expand the text to
                        // the full allowable width. This setting here is needed
                        // for the computeRowMetrics() below.
                        dim_.wid = max_width_;
 
+               dim = rowHeight(pit, first, end);
                dim.wid = rowWidth(right_margin, pit, first, end);
-               boost::tie(dim.asc, dim.des) = rowHeight(pit, first, end);
                if (row_index == pm.rows().size())
                        pm.rows().push_back(Row());
                Row & row = pm.rows()[row_index];
                row.setChanged(false);
                row.pos(first);
                row.endpos(end);
-               if (selection)
-                       row.setSelection(sel_beg.pos(), sel_end.pos());
-               else
-                       row.setSelection(-1, -1);
                row.setDimension(dim);
                int const max_row_width = max(dim_.wid, dim.wid);
                computeRowMetrics(pit, row, max_row_width);
-               pm.computeRowSignature(row, bparams);
                first = end;
                ++row_index;
 
-               pm.dim().wid = std::max(pm.dim().wid, dim.wid);
+               pm.dim().wid = max(pm.dim().wid, dim.wid);
                pm.dim().des += dim.height();
        } while (first < par.size());
 
@@ -462,9 +469,8 @@ bool TextMetrics::redoParagraph(pit_type const pit)
        // Make sure that if a par ends in newline, there is one more row
        // under it
        if (first > 0 && par.isNewline(first - 1)) {
-               Dimension dim;
+               Dimension dim = rowHeight(pit, first, first);
                dim.wid = rowWidth(right_margin, pit, first, first);
-               boost::tie(dim.asc, dim.des) = rowHeight(pit, first, first);
                if (row_index == pm.rows().size())
                        pm.rows().push_back(Row());
                Row & row = pm.rows()[row_index];
@@ -474,7 +480,6 @@ bool TextMetrics::redoParagraph(pit_type const pit)
                row.setDimension(dim);
                int const max_row_width = max(dim_.wid, dim.wid);
                computeRowMetrics(pit, row, max_row_width);
-               pm.computeRowSignature(row, bparams);
                pm.dim().des += dim.height();
        }
 
@@ -490,9 +495,7 @@ bool TextMetrics::redoParagraph(pit_type const pit)
 void TextMetrics::computeRowMetrics(pit_type const pit,
                Row & row, int width) const
 {
-
        row.label_hfill = 0;
-       row.hfill = 0;
        row.separator = 0;
 
        Buffer & buffer = bv_->buffer();
@@ -500,7 +503,7 @@ void TextMetrics::computeRowMetrics(pit_type const pit,
 
        double w = width - row.width();
        // FIXME: put back this assertion when the crash on new doc is solved.
-       //BOOST_ASSERT(w >= 0);
+       //LASSERT(w >= 0, /**/);
 
        //lyxerr << "\ndim_.wid " << dim_.wid << endl;
        //lyxerr << "row.width() " << row.width() << endl;
@@ -513,10 +516,10 @@ void TextMetrics::computeRowMetrics(pit_type const pit,
                row.x = leftMargin(max_width_, pit, row.pos());
 
        // is there a manual margin with a manual label
-       LayoutPtr const & layout = par.layout();
+       Layout const & layout = par.layout();
 
-       if (layout->margintype == MARGIN_MANUAL
-           && layout->labeltype == LABEL_MANUAL) {
+       if (layout.margintype == MARGIN_MANUAL
+           && layout.labeltype == LABEL_MANUAL) {
                /// We might have real hfills in the label part
                int nlh = numberOfLabelHfills(par, row);
 
@@ -532,12 +535,11 @@ void TextMetrics::computeRowMetrics(pit_type const pit,
                        row.label_hfill = labelFill(pit, row) / double(nlh);
        }
 
+       double hfill = 0;
        // are there any hfills in the row?
-       int const nh = numberOfHfills(par, row);
-
-       if (nh) {
+       if (int const nh = numberOfHfills(par, row)) {
                if (w > 0)
-                       row.hfill = w / nh;
+                       hfill = w / double(nh);
        // we don't have to look at the alignment if it is ALIGN_LEFT and
        // if the row is already larger then the permitted width as then
        // we force the LEFT_ALIGN'edness!
@@ -546,29 +548,39 @@ void TextMetrics::computeRowMetrics(pit_type const pit,
                // set x how you need it
                int align;
                if (par.params().align() == LYX_ALIGN_LAYOUT)
-                       align = layout->align;
+                       align = layout.align;
                else
                        align = par.params().align();
 
-               // Display-style insets should always be on a centred row
-               // The test on par.size() is to catch zero-size pars, which
-               // would trigger the assert in Paragraph::getInset().
-               //inset = par.size() ? par.getInset(row.pos()) : 0;
-               if (row.pos() < par.size()
-                   && par.isInset(row.pos()))
-               {
-                   switch(par.getInset(row.pos())->display()) {
-                       case Inset::AlignLeft:
-                               align = LYX_ALIGN_BLOCK;
+               // handle alignment inside tabular cells
+               Inset const & owner = par.inInset();
+               switch (owner.contentAlignment()) {
+                       case LYX_ALIGN_CENTER:
+                       case LYX_ALIGN_LEFT:
+                       case LYX_ALIGN_RIGHT:
+                               if (align == LYX_ALIGN_NONE 
+                                   || align == LYX_ALIGN_BLOCK)
+                                       align = owner.contentAlignment();
                                break;
-                       case Inset::AlignCenter:
-                               align = LYX_ALIGN_CENTER;
+                       default:
+                               // unchanged (use align)
                                break;
-                        case Inset::Inline:
-                        case Inset::AlignRight:
-                                // unchanged (use align)
-                                break;
-                    }
+               }
+
+               // Display-style insets should always be on a centred row
+               if (Inset const * inset = par.getInset(row.pos())) {
+                       switch (inset->display()) {
+                               case Inset::AlignLeft:
+                                       align = LYX_ALIGN_BLOCK;
+                                       break;
+                               case Inset::AlignCenter:
+                                       align = LYX_ALIGN_CENTER;
+                                       break;
+                               case Inset::Inline:
+                               case Inset::AlignRight:
+                                       // unchanged (use align)
+                                       break;
+                       }
                }
 
                switch (align) {
@@ -612,12 +624,37 @@ void TextMetrics::computeRowMetrics(pit_type const pit,
                if (body_pos > 0
                    && (body_pos > end || !par.isLineSeparator(body_pos - 1)))
                {
-                       row.x += theFontMetrics(text_->getLabelFont(buffer, par)).
-                               width(layout->labelsep);
+                       row.x += theFontMetrics(text_->labelFont(buffer, par)).
+                               width(layout.labelsep);
                        if (body_pos <= end)
                                row.x += row.label_hfill;
                }
        }
+
+       pos_type const endpos = row.endpos();
+       pos_type body_pos = par.beginOfBody();
+       if (body_pos > 0
+               && (body_pos > endpos || !par.isLineSeparator(body_pos - 1)))
+               body_pos = 0;
+
+       ParagraphMetrics & pm = par_metrics_[pit];
+       InsetList::const_iterator ii = par.insetList().begin();
+       InsetList::const_iterator iend = par.insetList().end();
+       for ( ; ii != iend; ++ii) {
+               if (ii->pos >= endpos || ii->pos < row.pos()
+                       || (ii->inset->lyxCode() != SPACE_CODE ||
+                           !ii->inset->isStretchableSpace()))
+                       continue;
+               Dimension dim = row.dimension();
+               if (pm.hfillExpansion(row, ii->pos))
+                       dim.wid = int(ii->pos >= body_pos ?
+                               max(hfill, 5.0) : row.label_hfill);
+               else
+                       dim.wid = 5;
+               // Cache the inset dimension.
+               bv_->coordCache().insets().add(ii->inset, dim);
+               pm.setInsetDimension(ii->inset, dim);
+       }
 }
 
 
@@ -627,7 +664,7 @@ int TextMetrics::labelFill(pit_type const pit, Row const & row) const
        Paragraph const & par = text_->getPar(pit);
 
        pos_type last = par.beginOfBody();
-       BOOST_ASSERT(last > 0);
+       LASSERT(last > 0, /**/);
 
        // -1 because a label ends with a space that is in the label
        --last;
@@ -645,16 +682,14 @@ int TextMetrics::labelFill(pit_type const pit, Row const & row) const
                return 0;
 
        FontMetrics const & fm
-               = theFontMetrics(text_->getLabelFont(buffer, par));
+               = theFontMetrics(text_->labelFont(buffer, par));
 
        return max(0, fm.width(label) - w);
 }
 
 
-namespace {
-
 // this needs special handling - only newlines count as a break point
-pos_type addressBreakPoint(pos_type i, Paragraph const & par)
+static pos_type addressBreakPoint(pos_type i, Paragraph const & par)
 {
        pos_type const end = par.size();
 
@@ -665,18 +700,73 @@ pos_type addressBreakPoint(pos_type i, Paragraph const & par)
        return end;
 }
 
-};
-
 
 int TextMetrics::labelEnd(pit_type const pit) const
 {
        // labelEnd is only needed if the layout fills a flushleft label.
-       if (text_->getPar(pit).layout()->margintype != MARGIN_MANUAL)
+       if (text_->getPar(pit).layout().margintype != MARGIN_MANUAL)
                return 0;
        // return the beginning of the body
        return leftMargin(max_width_, pit);
 }
 
+namespace {
+
+/**
+ * Calling Text::getFont is slow. While rebreaking we scan a
+ * paragraph from left to right calling getFont for every char.  This
+ * simple class address this problem by hidding an optimization trick
+ * (not mine btw -AB): the font is reused in the whole font span.  The
+ * class handles transparently the "hidden" (not part of the fontlist)
+ * label font (as getFont does).
+ **/
+class FontIterator
+{
+public:
+       ///
+       FontIterator(TextMetrics const & tm,
+               Paragraph const & par, pit_type pit, pos_type pos)
+               : tm_(tm), par_(par), pit_(pit), pos_(pos),
+               font_(tm.displayFont(pit, pos)),
+               endspan_(par.fontSpan(pos).last),
+               bodypos_(par.beginOfBody())
+       {}
+
+       ///
+       Font const & operator*() const { return font_; }
+
+       ///
+       FontIterator & operator++()
+       {
+               ++pos_;
+               if (pos_ > endspan_ || pos_ == bodypos_) {
+                       font_ = tm_.displayFont(pit_, pos_);
+                       endspan_ = par_.fontSpan(pos_).last;
+               }
+               return *this;
+       }
+
+       ///
+       Font * operator->() { return &font_; }
+
+private:
+       ///
+       TextMetrics const & tm_;
+       ///
+       Paragraph const & par_;
+       ///
+       pit_type pit_;
+       ///
+       pos_type pos_;
+       ///
+       Font font_;
+       ///
+       pos_type endspan_;
+       ///
+       pos_type bodypos_;
+};
+
+} // anon namespace
 
 pit_type TextMetrics::rowBreakPoint(int width, pit_type const pit,
                pit_type pos) const
@@ -688,13 +778,22 @@ pit_type TextMetrics::rowBreakPoint(int width, pit_type const pit,
        if (pos == end || width < 0)
                return end;
 
-       LayoutPtr const & layout = par.layout();
+       Layout const & layout = par.layout();
 
-       if (layout->margintype == MARGIN_RIGHT_ADDRESS_BOX)
+       if (layout.margintype == MARGIN_RIGHT_ADDRESS_BOX)
                return addressBreakPoint(pos, par);
 
        pos_type const body_pos = par.beginOfBody();
 
+       // check for possible inline completion
+       DocIterator const & inlineCompletionPos = bv_->inlineCompletionPos();
+       pos_type inlineCompletionLPos = -1;
+       if (inlineCompletionPos.inTexted()
+           && inlineCompletionPos.text() == text_
+           && inlineCompletionPos.pit() == pit) {
+               // draw logically behind the previous character
+               inlineCompletionLPos = inlineCompletionPos.pos() - 1;
+       }
 
        // Now we iterate through until we reach the right margin
        // or the end of the par, then choose the possible break
@@ -713,15 +812,22 @@ pit_type TextMetrics::rowBreakPoint(int width, pit_type const pit,
        for ( ; i < end; ++i, ++fi) {
                int thiswidth = pm.singleWidth(i, *fi);
 
+               // add inline completion width
+               if (inlineCompletionLPos == i) {
+                       docstring const & completion = bv_->inlineCompletion();
+                       if (completion.length() > 0)
+                               thiswidth += theFontMetrics(*fi).width(completion);
+               }
+
                // add the auto-hfill from label end to the body
                if (body_pos && i == body_pos) {
                        FontMetrics const & fm = theFontMetrics(
-                               text_->getLabelFont(buffer, par));
-                       int add = fm.width(layout->labelsep);
+                               text_->labelFont(buffer, par));
+                       int add = fm.width(layout.labelsep);
                        if (par.isLineSeparator(i - 1))
                                add -= singleWidth(pit, i - 1);
 
-                       add = std::max(add, label_end - x);
+                       add = max(add, label_end - x);
                        thiswidth += add;
                }
 
@@ -737,7 +843,6 @@ pit_type TextMetrics::rowBreakPoint(int width, pit_type const pit,
                                        point = i;
                                else
                                        point = i + 1;
-
                        }
                        // exit on last registered breakpoint:
                        break;
@@ -747,20 +852,22 @@ pit_type TextMetrics::rowBreakPoint(int width, pit_type const pit,
                        point = i + 1;
                        break;
                }
+               Inset const * inset = 0;
                // Break before...
                if (i + 1 < end) {
-                       if (par.isInset(i + 1) && par.getInset(i + 1)->display()) {
+                       if ((inset = par.getInset(i + 1)) && inset->display()) {
                                point = i + 1;
                                break;
                        }
                        // ...and after.
-                       if (par.isInset(i) && par.getInset(i)->display()) {
+                       if ((inset = par.getInset(i)) && inset->display()) {
                                point = i + 1;
                                break;
                        }
                }
 
-               if (!par.isInset(i) || par.getInset(i)->isChar()) {
+               inset = par.getInset(i);
+               if (!inset || inset->isChar()) {
                        // some insets are line separators too
                        if (par.isLineSeparator(i)) {
                                // register breakpoint:
@@ -794,6 +901,16 @@ int TextMetrics::rowWidth(int right_margin, pit_type const pit,
        int w = leftMargin(max_width_, pit, first);
        int label_end = labelEnd(pit);
 
+       // check for possible inline completion
+       DocIterator const & inlineCompletionPos = bv_->inlineCompletionPos();
+       pos_type inlineCompletionLPos = -1;
+       if (inlineCompletionPos.inTexted()
+           && inlineCompletionPos.text() == text_
+           && inlineCompletionPos.pit() == pit) {
+               // draw logically behind the previous character
+               inlineCompletionLPos = inlineCompletionPos.pos() - 1;
+       }
+
        pos_type const body_pos = par.beginOfBody();
        pos_type i = first;
 
@@ -802,20 +919,27 @@ int TextMetrics::rowWidth(int right_margin, pit_type const pit,
                for ( ; i < end; ++i, ++fi) {
                        if (body_pos > 0 && i == body_pos) {
                                FontMetrics const & fm = theFontMetrics(
-                                       text_->getLabelFont(buffer, par));
-                               w += fm.width(par.layout()->labelsep);
+                                       text_->labelFont(buffer, par));
+                               w += fm.width(par.layout().labelsep);
                                if (par.isLineSeparator(i - 1))
                                        w -= singleWidth(pit, i - 1);
                                w = max(w, label_end);
                        }
                        w += pm.singleWidth(i, *fi);
+
+                       // add inline completion width
+                       if (inlineCompletionLPos == i) {
+                               docstring const & completion = bv_->inlineCompletion();
+                               if (completion.length() > 0)
+                                       w += theFontMetrics(*fi).width(completion);
+                       }
                }
        }
 
        if (body_pos > 0 && body_pos >= end) {
                FontMetrics const & fm = theFontMetrics(
-                       text_->getLabelFont(buffer, par));
-               w += fm.width(par.layout()->labelsep);
+                       text_->labelFont(buffer, par));
+               w += fm.width(par.layout().labelsep);
                if (end > 0 && par.isLineSeparator(end - 1))
                        w -= singleWidth(pit, end - 1);
                w = max(w, label_end);
@@ -825,8 +949,8 @@ int TextMetrics::rowWidth(int right_margin, pit_type const pit,
 }
 
 
-boost::tuple<int, int> TextMetrics::rowHeight(pit_type const pit, pos_type const first,
-               pos_type const end) const
+Dimension TextMetrics::rowHeight(pit_type const pit, pos_type const first,
+               pos_type const end, bool topBottomSpace) const
 {
        Paragraph const & par = text_->getPar(pit);
        // get the maximum ascent and the maximum descent
@@ -837,26 +961,26 @@ boost::tuple<int, int> TextMetrics::rowHeight(pit_type const pit, pos_type const
        // ok, let us initialize the maxasc and maxdesc value.
        // Only the fontsize count. The other properties
        // are taken from the layoutfont. Nicer on the screen :)
-       LayoutPtr const & layout = par.layout();
+       Layout const & layout = par.layout();
 
        // as max get the first character of this row then it can
        // increase but not decrease the height. Just some point to
        // start with so we don't have to do the assignment below too
        // often.
        Buffer const & buffer = bv_->buffer();
-       Font font = getDisplayFont(pit, first);
+       Font font = displayFont(pit, first);
        FontSize const tmpsize = font.fontInfo().size();
-       font = text_->getLayoutFont(buffer, pit);
+       font.fontInfo() = text_->layoutFont(buffer, pit);
        FontSize const size = font.fontInfo().size();
        font.fontInfo().setSize(tmpsize);
 
-       FontInfo labelfont = text_->getLabelFont(buffer, par);
+       FontInfo labelfont = text_->labelFont(buffer, par);
 
        FontMetrics const & labelfont_metrics = theFontMetrics(labelfont);
        FontMetrics const & fontmetrics = theFontMetrics(font);
 
        // these are minimum values
-       double const spacing_val = layout->spacing.getValue()
+       double const spacing_val = layout.spacing.getValue()
                * text_->spacing(buffer, par);
        //lyxerr << "spacing_val = " << spacing_val << endl;
        int maxasc  = int(fontmetrics.maxAscent()  * spacing_val);
@@ -897,16 +1021,16 @@ boost::tuple<int, int> TextMetrics::rowHeight(pit_type const pit, pos_type const
        ParagraphList const & pars = text_->paragraphs();
 
        // is it a top line?
-       if (first == 0) {
+       if (first == 0 && topBottomSpace) {
                BufferParams const & bufparams = buffer.params();
                // some parskips VERY EASY IMPLEMENTATION
                if (bufparams.paragraph_separation
-                   == BufferParams::PARSEP_SKIP
+                   == BufferParams::ParagraphSkipSeparation
                        && par.ownerCode() != ERT_CODE
                        && par.ownerCode() != LISTINGS_CODE
                        && pit > 0
-                       && ((layout->isParagraph() && par.getDepth() == 0)
-                           || (pars[pit - 1].layout()->isParagraph()
+                       && ((layout.isParagraph() && par.getDepth() == 0)
+                           || (pars[pit - 1].layout().isParagraph()
                                && pars[pit - 1].getDepth() == 0)))
                {
                                maxasc += bufparams.getDefSkip().inPixels(*bv_);
@@ -917,25 +1041,25 @@ boost::tuple<int, int> TextMetrics::rowHeight(pit_type const pit, pos_type const
 
                // This is special code for the chapter, since the label of this
                // layout is printed in an extra row
-               if (layout->counter == "chapter"
+               if (layout.counter == "chapter"
                    && !par.params().labelString().empty()) {
                        labeladdon = int(labelfont_metrics.maxHeight()
-                                    * layout->spacing.getValue()
+                                    * layout.spacing.getValue()
                                     * text_->spacing(buffer, par));
                }
 
                // special code for the top label
-               if ((layout->labeltype == LABEL_TOP_ENVIRONMENT
-                    || layout->labeltype == LABEL_BIBLIO
-                    || layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT)
+               if ((layout.labeltype == LABEL_TOP_ENVIRONMENT
+                    || layout.labeltype == LABEL_BIBLIO
+                    || layout.labeltype == LABEL_CENTERED_TOP_ENVIRONMENT)
                    && isFirstInSequence(pit, pars)
-                   && !par.getLabelstring().empty())
+                   && !par.labelString().empty())
                {
                        labeladdon = int(
                                  labelfont_metrics.maxHeight()
-                                       * layout->spacing.getValue()
+                                       * layout.spacing.getValue()
                                        * text_->spacing(buffer, par)
-                               + (layout->topsep + layout->labelbottomsep) * dh);
+                               + (layout.topsep + layout.labelbottomsep) * dh);
                }
 
                // Add the layout spaces, for example before and after
@@ -949,26 +1073,26 @@ boost::tuple<int, int> TextMetrics::rowHeight(pit_type const pit, pos_type const
                    && prevpar.getDepth() == par.getDepth()
                    && prevpar.getLabelWidthString()
                                        == par.getLabelWidthString()) {
-                       layoutasc = layout->itemsep * dh;
+                       layoutasc = layout.itemsep * dh;
                } else if (pit != 0 || first != 0) {
-                       if (layout->topsep > 0)
-                               layoutasc = layout->topsep * dh;
+                       if (layout.topsep > 0)
+                               layoutasc = layout.topsep * dh;
                }
 
                prev = outerHook(pit, pars);
                if (prev != pit_type(pars.size())) {
-                       maxasc += int(pars[prev].layout()->parsep * dh);
+                       maxasc += int(pars[prev].layout().parsep * dh);
                } else if (pit != 0) {
                        Paragraph const & prevpar = pars[pit - 1];
                        if (prevpar.getDepth() != 0 ||
                                        prevpar.layout() == layout) {
-                               maxasc += int(layout->parsep * dh);
+                               maxasc += int(layout.parsep * dh);
                        }
                }
        }
 
        // is it a bottom line?
-       if (end >= par.size()) {
+       if (end >= par.size() && topBottomSpace) {
                // add the layout spaces, for example before and after
                // a section, or between the items of a itemize or enumerate
                // environment
@@ -979,18 +1103,18 @@ boost::tuple<int, int> TextMetrics::rowHeight(pit_type const pit, pos_type const
                        double unusual = 0;
 
                        if (pars[cpit].getDepth() > pars[nextpit].getDepth()) {
-                               usual = pars[cpit].layout()->bottomsep * dh;
+                               usual = pars[cpit].layout().bottomsep * dh;
                                cpit = depthHook(cpit, pars, pars[nextpit].getDepth());
                                if (pars[cpit].layout() != pars[nextpit].layout()
                                        || pars[nextpit].getLabelWidthString() != pars[cpit].getLabelWidthString())
                                {
-                                       unusual = pars[cpit].layout()->bottomsep * dh;
+                                       unusual = pars[cpit].layout().bottomsep * dh;
                                }
                                layoutdesc = max(unusual, usual);
                        } else if (pars[cpit].getDepth() == pars[nextpit].getDepth()) {
                                if (pars[cpit].layout() != pars[nextpit].layout()
                                        || pars[nextpit].getLabelWidthString() != pars[cpit].getLabelWidthString())
-                                       layoutdesc = int(pars[cpit].layout()->bottomsep * dh);
+                                       layoutdesc = int(pars[cpit].layout().bottomsep * dh);
                        }
                }
        }
@@ -1003,7 +1127,7 @@ boost::tuple<int, int> TextMetrics::rowHeight(pit_type const pit, pos_type const
        // following code in another method specially tailored for the
        // main Text. The following test is thus bogus.
        // Top and bottom margin of the document (only at top-level)
-       if (main_text_) {
+       if (main_text_ && topBottomSpace) {
                if (pit == 0 && first == 0)
                        maxasc += 20;
                if (pit + 1 == pit_type(pars.size()) &&
@@ -1012,7 +1136,7 @@ boost::tuple<int, int> TextMetrics::rowHeight(pit_type const pit, pos_type const
                        maxdesc += 20;
        }
 
-       return boost::make_tuple(maxasc + labeladdon, maxdesc);
+       return Dimension(0, maxasc + labeladdon, maxdesc);
 }
 
 
@@ -1030,14 +1154,13 @@ pos_type TextMetrics::getColumnNearX(pit_type const pit,
        int const xo = origin_.x_;
        x -= xo;
        Paragraph const & par = text_->getPar(pit);
-       ParagraphMetrics const & pm = par_metrics_[pit];
        Bidi bidi;
        bidi.computeTables(par, buffer, row);
 
        pos_type vc = row.pos();
        pos_type end = row.endpos();
        pos_type c = 0;
-       LayoutPtr const & layout = par.layout();
+       Layout const & layout = par.layout();
 
        bool left_side = false;
 
@@ -1061,25 +1184,15 @@ pos_type TextMetrics::getColumnNearX(pit_type const pit,
                last_tmpx = tmpx;
                if (body_pos > 0 && c == body_pos - 1) {
                        FontMetrics const & fm = theFontMetrics(
-                               text_->getLabelFont(buffer, par));
-                       tmpx += row.label_hfill + fm.width(layout->labelsep);
+                               text_->labelFont(buffer, par));
+                       tmpx += row.label_hfill + fm.width(layout.labelsep);
                        if (par.isLineSeparator(body_pos - 1))
                                tmpx -= singleWidth(pit, body_pos - 1);
                }
 
-               if (pm.hfillExpansion(row, c)) {
-                       tmpx += singleWidth(pit, c);
-                       if (c >= body_pos)
-                               tmpx += row.hfill;
-                       else
-                               tmpx += row.label_hfill;
-               } else if (par.isSeparator(c)) {
-                       tmpx += singleWidth(pit, c);
-                       if (c >= body_pos)
+               tmpx += singleWidth(pit, c);
+               if (par.isSeparator(c) && c >= body_pos)
                                tmpx += row.separator;
-               } else {
-                       tmpx += singleWidth(pit, c);
-               }
                ++vc;
        }
 
@@ -1088,7 +1201,7 @@ pos_type TextMetrics::getColumnNearX(pit_type const pit,
                left_side = true;
        }
 
-       BOOST_ASSERT(vc <= end);  // This shouldn't happen.
+       LASSERT(vc <= end, /**/);  // This shouldn't happen.
 
        boundary = false;
        // This (rtl_support test) is not needed, but gives
@@ -1100,9 +1213,10 @@ pos_type TextMetrics::getColumnNearX(pit_type const pit,
        bool const rtl = lastrow ? text_->isRTL(buffer, par) : false;
        if (lastrow &&
            ((rtl  &&  left_side && vc == row.pos() && x < tmpx - 5) ||
-            (!rtl && !left_side && vc == end  && x > tmpx + 5)))
-               c = end;
-       else if (vc == row.pos()) {
+            (!rtl && !left_side && vc == end  && x > tmpx + 5))) {
+               if (!par.isNewline(end - 1))
+                       c = end;
+       } else if (vc == row.pos()) {
                c = bidi.vis2log(vc);
                if (bidi.level(c) % 2 == 1)
                        ++c;
@@ -1166,7 +1280,7 @@ pos_type TextMetrics::x2pos(pit_type pit, int row, int x) const
        // upDownInText() while in selection mode.
        ParagraphMetrics const & pm = parMetrics(pit);
 
-       BOOST_ASSERT(row < int(pm.rows().size()));
+       LASSERT(row < int(pm.rows().size()), /**/);
        bool bound = false;
        Row const & r = pm.rows()[row];
        return r.pos() + getColumnNearX(pit, r, x, bound);
@@ -1183,7 +1297,7 @@ void TextMetrics::newParMetricsDown()
        // do it and update its position.
        redoParagraph(pit);
        par_metrics_[pit].setPosition(last.second.position()
-               + last.second.descent());
+               + last.second.descent() + par_metrics_[pit].ascent());
 }
 
 
@@ -1197,20 +1311,17 @@ void TextMetrics::newParMetricsUp()
        // do it and update its position.
        redoParagraph(pit);
        par_metrics_[pit].setPosition(first.second.position()
-               - first.second.ascent());
+               - first.second.ascent() - par_metrics_[pit].descent());
 }
 
 // y is screen coordinate
 pit_type TextMetrics::getPitNearY(int y)
 {
-       BOOST_ASSERT(!text_->paragraphs().empty());
-       LYXERR(Debug::DEBUG)
-               << BOOST_CURRENT_FUNCTION
-               << ": y: " << y << " cache size: " << par_metrics_.size()
-               << endl;
+       LASSERT(!text_->paragraphs().empty(), /**/);
+       LYXERR(Debug::DEBUG, "y: " << y << " cache size: " << par_metrics_.size());
 
        // look for highest numbered paragraph with y coordinate less than given y
-       pit_type pit = 0;
+       pit_type pit = -1;
        int yy = -1;
        ParMetricsCache::const_iterator it = par_metrics_.begin();
        ParMetricsCache::const_iterator et = par_metrics_.end();
@@ -1218,44 +1329,37 @@ pit_type TextMetrics::getPitNearY(int y)
 
        ParagraphMetrics const & pm = it->second;
 
-       // If we are off-screen (before the visible part)
-       if (y < 0
-               // and even before the first paragraph in the cache.
-               && y < it->second.position() - int(pm.ascent())) {
-               //  and we are not at the first paragraph in the inset.
+       if (y < it->second.position() - int(pm.ascent())) {
+               // We are looking for a position that is before the first paragraph in
+               // the cache (which is in priciple off-screen, that is before the
+               // visible part.
                if (it->first == 0)
+                       // We are already at the first paragraph in the inset.
                        return 0;
-               // then this is the paragraph we are looking for.
+               // OK, this is the paragraph we are looking for.
                pit = it->first - 1;
-               // rebreak it and update the CoordCache.
-               redoParagraph(pit);
-               par_metrics_[pit].setPosition(it->second.position() - pm.descent());
+               newParMetricsUp();
                return pit;
        }
 
        ParagraphMetrics const & pm_last = par_metrics_[last->first];
 
-       // If we are off-screen (after the visible part)
-       if (y > bv_->workHeight()
-               // and even after the first paragraph in the cache.
-               && y >= last->second.position() + int(pm_last.descent())) {
+       if (y >= last->second.position() + int(pm_last.descent())) {
+               // We are looking for a position that is after the last paragraph in
+               // the cache (which is in priciple off-screen, that is before the
+               // visible part.
                pit = last->first + 1;
-               //  and we are not at the last paragraph in the inset.
                if (pit == int(text_->paragraphs().size()))
+                       //  We are already at the last paragraph in the inset.
                        return last->first;
-               // then this is the paragraph we are looking for.
-               // rebreak it and update the CoordCache.
-               redoParagraph(pit);
-               par_metrics_[pit].setPosition(last->second.position() + pm_last.ascent());
+               // OK, this is the paragraph we are looking for.
+               newParMetricsDown();
                return pit;
        }
 
        for (; it != et; ++it) {
-               LYXERR(Debug::DEBUG)
-                       << BOOST_CURRENT_FUNCTION
-                       << "  examining: pit: " << it->first
-                       << " y: " << it->second.position()
-                       << endl;
+               LYXERR(Debug::DEBUG, "examining: pit: " << it->first
+                       << " y: " << it->second.position());
 
                ParagraphMetrics const & pm = par_metrics_[it->first];
 
@@ -1265,10 +1369,7 @@ pit_type TextMetrics::getPitNearY(int y)
                }
        }
 
-       LYXERR(Debug::DEBUG)
-               << BOOST_CURRENT_FUNCTION
-               << ": found best y: " << yy << " for pit: " << pit
-               << endl;
+       LYXERR(Debug::DEBUG, "found best y: " << yy << " for pit: " << pit);
 
        return pit;
 }
@@ -1279,7 +1380,7 @@ Row const & TextMetrics::getRowNearY(int y, pit_type pit) const
        ParagraphMetrics const & pm = par_metrics_[pit];
 
        int yy = pm.position() - pm.ascent();
-       BOOST_ASSERT(!pm.rows().empty());
+       LASSERT(!pm.rows().empty(), /**/);
        RowList::const_iterator rit = pm.rows().begin();
        RowList::const_iterator rlast = pm.rows().end();
        --rlast;
@@ -1295,11 +1396,11 @@ Row const & TextMetrics::getRowNearY(int y, pit_type pit) const
 Inset * TextMetrics::editXY(Cursor & cur, int x, int y)
 {
        if (lyxerr.debugging(Debug::WORKAREA)) {
-               lyxerr << "TextMetrics::editXY(cur, " << x << ", " << y << ")" << std::endl;
+               LYXERR0("TextMetrics::editXY(cur, " << x << ", " << y << ")");
                cur.bv().coordCache().dump();
        }
        pit_type pit = getPitNearY(y);
-       BOOST_ASSERT(pit != -1);
+       LASSERT(pit != -1, /**/);
 
        Row const & row = getRowNearY(y, pit);
        bool bound = false;
@@ -1330,8 +1431,8 @@ Inset * TextMetrics::editXY(Cursor & cur, int x, int y)
 
        // This should be just before or just behind the
        // cursor position set above.
-       BOOST_ASSERT((pos != 0 && inset == insetBefore)
-               || inset == pars[pit].getInset(pos));
+       LASSERT((pos != 0 && inset == insetBefore)
+               || inset == pars[pit].getInset(pos), /**/);
 
        // Make sure the cursor points to the position before
        // this inset.
@@ -1351,21 +1452,17 @@ Inset * TextMetrics::editXY(Cursor & cur, int x, int y)
 
 void TextMetrics::setCursorFromCoordinates(Cursor & cur, int const x, int const y)
 {
-       BOOST_ASSERT(text_ == cur.text());
+       LASSERT(text_ == cur.text(), /**/);
        pit_type pit = getPitNearY(y);
 
        ParagraphMetrics const & pm = par_metrics_[pit];
 
        int yy = pm.position() - pm.ascent();
-       LYXERR(Debug::DEBUG)
-               << BOOST_CURRENT_FUNCTION
-               << ": x: " << x
-               << " y: " << y
-               << " pit: " << pit
-               << " yy: " << yy << endl;
+       LYXERR(Debug::DEBUG, "x: " << x << " y: " << y <<
+               " pit: " << pit << " yy: " << yy);
 
        int r = 0;
-       BOOST_ASSERT(pm.rows().size());
+       LASSERT(pm.rows().size(), /**/);
        for (; r < int(pm.rows().size()) - 1; ++r) {
                Row const & row = pm.rows()[r];
                if (int(yy + row.height()) > y)
@@ -1375,21 +1472,13 @@ void TextMetrics::setCursorFromCoordinates(Cursor & cur, int const x, int const
 
        Row const & row = pm.rows()[r];
 
-       LYXERR(Debug::DEBUG)
-               << BOOST_CURRENT_FUNCTION
-               << ": row " << r
-               << " from pos: " << row.pos()
-               << endl;
+       LYXERR(Debug::DEBUG, "row " << r << " from pos: " << row.pos());
 
        bool bound = false;
        int xx = x;
        pos_type const pos = row.pos() + getColumnNearX(pit, row, xx, bound);
 
-       LYXERR(Debug::DEBUG)
-               << BOOST_CURRENT_FUNCTION
-               << ": setting cursor pit: " << pit
-               << " pos: " << pos
-               << endl;
+       LYXERR(Debug::DEBUG, "setting cursor pit: " << pit << " pos: " << pos);
 
        text_->setCursor(cur, pit, pos, true, bound);
        // remember new position.
@@ -1401,56 +1490,41 @@ void TextMetrics::setCursorFromCoordinates(Cursor & cur, int const x, int const
 Inset * TextMetrics::checkInsetHit(int x, int y)
 {
        pit_type pit = getPitNearY(y);
-       BOOST_ASSERT(pit != -1);
+       LASSERT(pit != -1, /**/);
 
        Paragraph const & par = text_->paragraphs()[pit];
        ParagraphMetrics const & pm = par_metrics_[pit];
 
-       LYXERR(Debug::DEBUG)
-               << BOOST_CURRENT_FUNCTION
-               << ": x: " << x
-               << " y: " << y
-               << "  pit: " << pit
-               << endl;
+       LYXERR(Debug::DEBUG, "x: " << x << " y: " << y << "  pit: " << pit);
+
        InsetList::const_iterator iit = par.insetList().begin();
        InsetList::const_iterator iend = par.insetList().end();
        for (; iit != iend; ++iit) {
                Inset * inset = iit->inset;
 
-               LYXERR(Debug::DEBUG)
-                       << BOOST_CURRENT_FUNCTION
-                       << ": examining inset " << inset << endl;
+               LYXERR(Debug::DEBUG, "examining inset " << inset);
 
                if (!bv_->coordCache().getInsets().has(inset)) {
-                       LYXERR(Debug::DEBUG)
-                               << BOOST_CURRENT_FUNCTION
-                               << ": inset has no cached position" << endl;
+                       LYXERR(Debug::DEBUG, "inset has no cached position");
                        return 0;
                }
 
                Dimension const & dim = pm.insetDimension(inset);
                Point p = bv_->coordCache().getInsets().xy(inset);
 
-               LYXERR(Debug::DEBUG)
-                       << BOOST_CURRENT_FUNCTION
-                       << ": xo: " << p.x_ << "..." << p.x_ + dim.wid
-                       << " yo: " << p.y_ - dim.asc << "..." << p.y_ + dim.des
-                       << endl;
+               LYXERR(Debug::DEBUG, "xo: " << p.x_ << "..." << p.x_ + dim.wid
+                       << " yo: " << p.y_ - dim.asc << "..." << p.y_ + dim.des);
 
                if (x >= p.x_
                        && x <= p.x_ + dim.wid
                        && y >= p.y_ - dim.asc
                        && y <= p.y_ + dim.des) {
-                       LYXERR(Debug::DEBUG)
-                               << BOOST_CURRENT_FUNCTION
-                               << ": Hit inset: " << inset << endl;
+                       LYXERR(Debug::DEBUG, "Hit inset: " << inset);
                        return inset;
                }
        }
 
-       LYXERR(Debug::DEBUG)
-               << BOOST_CURRENT_FUNCTION
-               << ": No inset hit. " << endl;
+       LYXERR(Debug::DEBUG, "No inset hit. ");
        return 0;
 }
 
@@ -1458,7 +1532,7 @@ Inset * TextMetrics::checkInsetHit(int x, int y)
 int TextMetrics::cursorX(CursorSlice const & sl,
                bool boundary) const
 {
-       BOOST_ASSERT(sl.text() == text_);
+       LASSERT(sl.text() == text_, /**/);
        pit_type const pit = sl.pit();
        Paragraph const & par = text_->paragraphs()[pit];
        ParagraphMetrics const & pm = par_metrics_[pit];
@@ -1482,7 +1556,7 @@ int TextMetrics::cursorX(CursorSlice const & sl,
 
        pos_type const row_pos  = row.pos();
        pos_type const end      = row.endpos();
-       // Spaces at logical line breaks in bidi text must be skipped during 
+       // Spaces at logical line breaks in bidi text must be skipped during
        // cursor positioning. However, they may appear visually in the middle
        // of a row; they must be skipped, wherever they are...
        // * logically "abc_[HEBREW_\nHEBREW]"
@@ -1507,6 +1581,18 @@ int TextMetrics::cursorX(CursorSlice const & sl,
            (body_pos > end || !par.isLineSeparator(body_pos - 1)))
                body_pos = 0;
 
+       // check for possible inline completion in this row
+       DocIterator const & inlineCompletionPos = bv_->inlineCompletionPos();
+       pos_type inlineCompletionVPos = -1;
+       if (inlineCompletionPos.inTexted()
+           && inlineCompletionPos.text() == text_
+           && inlineCompletionPos.pit() == pit
+           && inlineCompletionPos.pos() - 1 >= row_pos
+           && inlineCompletionPos.pos() - 1 < end) {
+               // draw logically behind the previous character
+               inlineCompletionVPos = bidi.log2vis(inlineCompletionPos.pos() - 1);
+       }
+
        // Use font span to speed things up, see below
        FontSpan font_span;
        Font font;
@@ -1515,7 +1601,16 @@ int TextMetrics::cursorX(CursorSlice const & sl,
        // it's in the last row of a paragraph; see skipped_sep_vpos declaration
        if (end > 0 && end < par.size() && par.isSeparator(end - 1))
                skipped_sep_vpos = bidi.log2vis(end - 1);
-       
+
+       // Inline completion RTL special case row_pos == cursor_pos:
+       // "__|b" => cursor_pos is right of __
+       if (row_pos == inlineCompletionVPos && row_pos == cursor_vpos) {
+               font = displayFont(pit, row_pos + 1);
+               docstring const & completion = bv_->inlineCompletion();
+               if (font.isRightToLeft() && completion.length() > 0)
+                       x += theFontMetrics(font.fontInfo()).width(completion);
+       }
+
        for (pos_type vpos = row_pos; vpos < cursor_vpos; ++vpos) {
                // Skip the separator which is at the logical end of the row
                if (vpos == skipped_sep_vpos)
@@ -1523,8 +1618,8 @@ int TextMetrics::cursorX(CursorSlice const & sl,
                pos_type pos = bidi.vis2log(vpos);
                if (body_pos > 0 && pos == body_pos - 1) {
                        FontMetrics const & labelfm = theFontMetrics(
-                               text_->getLabelFont(buffer, par));
-                       x += row.label_hfill + labelfm.width(par.layout()->labelsep);
+                               text_->labelFont(buffer, par));
+                       x += row.label_hfill + labelfm.width(par.layout().labelsep);
                        if (par.isLineSeparator(body_pos - 1))
                                x -= singleWidth(pit, body_pos - 1);
                }
@@ -1532,14 +1627,32 @@ int TextMetrics::cursorX(CursorSlice const & sl,
                // Use font span to speed things up, see above
                if (pos < font_span.first || pos > font_span.last) {
                        font_span = par.fontSpan(pos);
-                       font = getDisplayFont(pit, pos);
+                       font = displayFont(pit, pos);
                }
 
                x += pm.singleWidth(pos, font);
 
-               if (pm.hfillExpansion(row, pos))
-                       x += (pos >= body_pos) ? row.hfill : row.label_hfill;
-               else if (par.isSeparator(pos) && pos >= body_pos)
+               // Inline completion RTL case:
+               // "a__|b", __ of b => non-boundary a-pos is right of __
+               if (vpos + 1 == inlineCompletionVPos
+                   && (vpos + 1 < cursor_vpos || !boundary_correction)) {
+                       font = displayFont(pit, vpos + 1);
+                       docstring const & completion = bv_->inlineCompletion();
+                       if (font.isRightToLeft() && completion.length() > 0)
+                               x += theFontMetrics(font.fontInfo()).width(completion);
+               }
+
+               //  Inline completion LTR case:
+               // "b|__a", __ of b => non-boundary a-pos is in front of __
+               if (vpos == inlineCompletionVPos
+                   && (vpos + 1 < cursor_vpos || boundary_correction)) {
+                       font = displayFont(pit, vpos);
+                       docstring const & completion = bv_->inlineCompletion();
+                       if (!font.isRightToLeft() && completion.length() > 0)
+                               x += theFontMetrics(font.fontInfo()).width(completion);
+               }
+
+               if (par.isSeparator(pos) && pos >= body_pos)
                        x += row.separator;
        }
 
@@ -1557,7 +1670,7 @@ int TextMetrics::cursorX(CursorSlice const & sl,
 
 int TextMetrics::cursorY(CursorSlice const & sl, bool boundary) const
 {
-       //lyxerr << "TextMetrics::cursorY: boundary: " << boundary << std::endl;
+       //lyxerr << "TextMetrics::cursorY: boundary: " << boundary << endl;
        ParagraphMetrics const & pm = par_metrics_[sl.pit()];
        if (pm.rows().empty())
                return 0;
@@ -1578,51 +1691,12 @@ int TextMetrics::cursorY(CursorSlice const & sl, bool boundary) const
 }
 
 
-void TextMetrics::cursorPrevious(Cursor & cur)
-{
-       pos_type cpos = cur.pos();
-       pit_type cpar = cur.pit();
-
-       int x = cur.x_target();
-       setCursorFromCoordinates(cur, x, 0);
-       cur.dispatch(FuncRequest(cur.selection()? LFUN_UP_SELECT: LFUN_UP));
-
-       if (cpar == cur.pit() && cpos == cur.pos())
-               // we have a row which is taller than the workarea. The
-               // simplest solution is to move to the previous row instead.
-               cur.dispatch(FuncRequest(cur.selection()? LFUN_UP_SELECT: LFUN_UP));
-
-       cur.finishUndo();
-       cur.updateFlags(Update::Force | Update::FitCursor);
-}
-
-
-void TextMetrics::cursorNext(Cursor & cur)
-{
-       pos_type cpos = cur.pos();
-       pit_type cpar = cur.pit();
-
-       int x = cur.x_target();
-       setCursorFromCoordinates(cur, x, cur.bv().workHeight() - 1);
-       cur.dispatch(FuncRequest(cur.selection()? LFUN_DOWN_SELECT: LFUN_DOWN));
-
-       if (cpar == cur.pit() && cpos == cur.pos())
-               // we have a row which is taller than the workarea. The
-               // simplest solution is to move to the next row instead.
-               cur.dispatch(
-                       FuncRequest(cur.selection()? LFUN_DOWN_SELECT: LFUN_DOWN));
-
-       cur.finishUndo();
-       cur.updateFlags(Update::Force | Update::FitCursor);
-}
-
-
 // the cursor set functions have a special mechanism. When they
 // realize you left an empty paragraph, they will delete it.
 
 bool TextMetrics::cursorHome(Cursor & cur)
 {
-       BOOST_ASSERT(text_ == cur.text());
+       LASSERT(text_ == cur.text(), /**/);
        ParagraphMetrics const & pm = par_metrics_[cur.pit()];
        Row const & row = pm.getRow(cur.pos(),cur.boundary());
        return text_->setCursor(cur, cur.pit(), row.pos());
@@ -1631,7 +1705,7 @@ bool TextMetrics::cursorHome(Cursor & cur)
 
 bool TextMetrics::cursorEnd(Cursor & cur)
 {
-       BOOST_ASSERT(text_ == cur.text());
+       LASSERT(text_ == cur.text(), /**/);
        // if not on the last row of the par, put the cursor before
        // the final space exept if I have a spanning inset or one string
        // is so long that we force a break.
@@ -1653,13 +1727,13 @@ bool TextMetrics::cursorEnd(Cursor & cur)
 
 void TextMetrics::deleteLineForward(Cursor & cur)
 {
-       BOOST_ASSERT(text_ == cur.text());
+       LASSERT(text_ == cur.text(), /**/);
        if (cur.lastpos() == 0) {
                // Paragraph is empty, so we just go forward
                text_->cursorForward(cur);
        } else {
                cur.resetAnchor();
-               cur.selection() = true; // to avoid deletion
+               cur.setSelection(true); // to avoid deletion
                cursorEnd(cur);
                cur.setSelection();
                // What is this test for ??? (JMarc)
@@ -1667,7 +1741,7 @@ void TextMetrics::deleteLineForward(Cursor & cur)
                        text_->deleteWordForward(cur);
                else
                        cap::cutSelection(cur, true, false);
-               checkBufferStructure(cur.buffer(), cur);
+               cur.checkBufferStructure();
        }
 }
 
@@ -1688,8 +1762,8 @@ bool TextMetrics::isFirstRow(pit_type pit, Row const & row) const
 
 int TextMetrics::leftMargin(int max_width, pit_type pit) const
 {
-       BOOST_ASSERT(pit >= 0);
-       BOOST_ASSERT(pit < int(text_->paragraphs().size()));
+       LASSERT(pit >= 0, /**/);
+       LASSERT(pit < int(text_->paragraphs().size()), /**/);
        return leftMargin(max_width, pit, text_->paragraphs()[pit].size());
 }
 
@@ -1699,22 +1773,22 @@ int TextMetrics::leftMargin(int max_width,
 {
        ParagraphList const & pars = text_->paragraphs();
 
-       BOOST_ASSERT(pit >= 0);
-       BOOST_ASSERT(pit < int(pars.size()));
+       LASSERT(pit >= 0, /**/);
+       LASSERT(pit < int(pars.size()), /**/);
        Paragraph const & par = pars[pit];
-       BOOST_ASSERT(pos >= 0);
-       BOOST_ASSERT(pos <= par.size());
+       LASSERT(pos >= 0, /**/);
+       LASSERT(pos <= par.size(), /**/);
        Buffer const & buffer = bv_->buffer();
        //lyxerr << "TextMetrics::leftMargin: pit: " << pit << " pos: " << pos << endl;
-       TextClass const & tclass = buffer.params().getTextClass();
-       LayoutPtr const & layout = par.layout();
+       DocumentClass const & tclass = buffer.params().documentClass();
+       Layout const & layout = par.layout();
 
-       docstring parindent = layout->parindent;
+       docstring parindent = layout.parindent;
 
        int l_margin = 0;
 
        if (text_->isMainText(buffer))
-               l_margin += changebarMargin();
+               l_margin += bv_->leftMargin();
 
        l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(
                tclass.leftmargin());
@@ -1723,14 +1797,15 @@ int TextMetrics::leftMargin(int max_width,
                // find the next level paragraph
                pit_type newpar = outerHook(pit, pars);
                if (newpar != pit_type(pars.size())) {
-                       if (pars[newpar].layout()->isEnvironment()) {
+                       if (pars[newpar].layout().isEnvironment()) {
                                l_margin = leftMargin(max_width, newpar);
                        }
-                       if (par.layout() == tclass.defaultLayout()) {
+                       if (tclass.isDefaultLayout(par.layout())
+                           || tclass.isPlainLayout(par.layout())) {
                                if (pars[newpar].params().noindent())
                                        parindent.erase();
                                else
-                                       parindent = pars[newpar].layout()->parindent;
+                                       parindent = pars[newpar].layout().parindent;
                        }
                }
        }
@@ -1738,34 +1813,34 @@ int TextMetrics::leftMargin(int max_width,
        // This happens after sections in standard classes. The 1.3.x
        // code compared depths too, but it does not seem necessary
        // (JMarc)
-       if (par.layout() == tclass.defaultLayout()
-           && pit > 0 && pars[pit - 1].layout()->nextnoindent)
+       if (tclass.isDefaultLayout(par.layout())
+           && pit > 0 && pars[pit - 1].layout().nextnoindent)
                parindent.erase();
 
-       Font const labelfont = text_->getLabelFont(buffer, par);
+       FontInfo const labelfont = text_->labelFont(buffer, par);
        FontMetrics const & labelfont_metrics = theFontMetrics(labelfont);
 
-       switch (layout->margintype) {
+       switch (layout.margintype) {
        case MARGIN_DYNAMIC:
-               if (!layout->leftmargin.empty()) {
+               if (!layout.leftmargin.empty()) {
                        l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(
-                               layout->leftmargin);
+                               layout.leftmargin);
                }
-               if (!par.getLabelstring().empty()) {
-                       l_margin += labelfont_metrics.signedWidth(layout->labelindent);
-                       l_margin += labelfont_metrics.width(par.getLabelstring());
-                       l_margin += labelfont_metrics.width(layout->labelsep);
+               if (!par.labelString().empty()) {
+                       l_margin += labelfont_metrics.signedWidth(layout.labelindent);
+                       l_margin += labelfont_metrics.width(par.labelString());
+                       l_margin += labelfont_metrics.width(layout.labelsep);
                }
                break;
 
        case MARGIN_MANUAL: {
-               l_margin += labelfont_metrics.signedWidth(layout->labelindent);
+               l_margin += labelfont_metrics.signedWidth(layout.labelindent);
                // The width of an empty par, even with manual label, should be 0
                if (!par.empty() && pos >= par.beginOfBody()) {
                        if (!par.getLabelWidthString().empty()) {
                                docstring labstr = par.getLabelWidthString();
                                l_margin += labelfont_metrics.width(labstr);
-                               l_margin += labelfont_metrics.width(layout->labelsep);
+                               l_margin += labelfont_metrics.width(layout.labelsep);
                        }
                }
                break;
@@ -1773,31 +1848,31 @@ int TextMetrics::leftMargin(int max_width,
 
        case MARGIN_STATIC: {
                l_margin += theFontMetrics(buffer.params().getFont()).
-                       signedWidth(layout->leftmargin) * 4     / (par.getDepth() + 4);
+                       signedWidth(layout.leftmargin) * 4      / (par.getDepth() + 4);
                break;
        }
 
        case MARGIN_FIRST_DYNAMIC:
-               if (layout->labeltype == LABEL_MANUAL) {
+               if (layout.labeltype == LABEL_MANUAL) {
                        if (pos >= par.beginOfBody()) {
-                               l_margin += labelfont_metrics.signedWidth(layout->leftmargin);
+                               l_margin += labelfont_metrics.signedWidth(layout.leftmargin);
                        } else {
-                               l_margin += labelfont_metrics.signedWidth(layout->labelindent);
+                               l_margin += labelfont_metrics.signedWidth(layout.labelindent);
                        }
                } else if (pos != 0
                           // Special case to fix problems with
                           // theorems (JMarc)
-                          || (layout->labeltype == LABEL_STATIC
-                              && layout->latextype == LATEX_ENVIRONMENT
+                          || (layout.labeltype == LABEL_STATIC
+                              && layout.latextype == LATEX_ENVIRONMENT
                               && !isFirstInSequence(pit, pars))) {
-                       l_margin += labelfont_metrics.signedWidth(layout->leftmargin);
-               } else if (layout->labeltype != LABEL_TOP_ENVIRONMENT
-                          && layout->labeltype != LABEL_BIBLIO
-                          && layout->labeltype !=
+                       l_margin += labelfont_metrics.signedWidth(layout.leftmargin);
+               } else if (layout.labeltype != LABEL_TOP_ENVIRONMENT
+                          && layout.labeltype != LABEL_BIBLIO
+                          && layout.labeltype !=
                           LABEL_CENTERED_TOP_ENVIRONMENT) {
-                       l_margin += labelfont_metrics.signedWidth(layout->labelindent);
-                       l_margin += labelfont_metrics.width(layout->labelsep);
-                       l_margin += labelfont_metrics.width(par.getLabelstring());
+                       l_margin += labelfont_metrics.signedWidth(layout.labelindent);
+                       l_margin += labelfont_metrics.width(layout.labelsep);
+                       l_margin += labelfont_metrics.width(par.labelString());
                }
                break;
 
@@ -1812,7 +1887,7 @@ int TextMetrics::leftMargin(int max_width,
                for ( ; rit != end; ++rit)
                        if (rit->fill() < minfill)
                                minfill = rit->fill();
-               l_margin += theFontMetrics(params.getFont()).signedWidth(layout->leftmargin);
+               l_margin += theFontMetrics(params.getFont()).signedWidth(layout.leftmargin);
                l_margin += minfill;
 #endif
                // also wrong, but much shorter.
@@ -1827,29 +1902,30 @@ int TextMetrics::leftMargin(int max_width,
        LyXAlignment align;
 
        if (par.params().align() == LYX_ALIGN_LAYOUT)
-               align = layout->align;
+               align = layout.align;
        else
                align = par.params().align();
 
        // set the correct parindent
        if (pos == 0
-           && (layout->labeltype == LABEL_NO_LABEL
-              || layout->labeltype == LABEL_TOP_ENVIRONMENT
-              || layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT
-              || (layout->labeltype == LABEL_STATIC
-                  && layout->latextype == LATEX_ENVIRONMENT
-                  && !isFirstInSequence(pit, pars)))
+           && (layout.labeltype == LABEL_NO_LABEL
+              || layout.labeltype == LABEL_TOP_ENVIRONMENT
+              || layout.labeltype == LABEL_CENTERED_TOP_ENVIRONMENT
+              || (layout.labeltype == LABEL_STATIC
+                  && layout.latextype == LATEX_ENVIRONMENT
+                  && !isFirstInSequence(pit, pars)))
            && align == LYX_ALIGN_BLOCK
            && !par.params().noindent()
            // in some insets, paragraphs are never indented
-           && !(par.inInset() && par.inInset()->neverIndent(buffer))
+           && !par.inInset().neverIndent()
            // display style insets are always centered, omit indentation
            && !(!par.empty()
                    && par.isInset(pos)
                    && par.getInset(pos)->display())
-           && (par.layout() != tclass.defaultLayout()
-               || buffer.params().paragraph_separation ==
-                  BufferParams::PARSEP_INDENT))
+                       && (!(tclass.isDefaultLayout(par.layout())
+                || tclass.isPlainLayout(par.layout()))
+               || buffer.params().paragraph_separation == BufferParams::ParagraphIndentSeparation)
+           )
        {
                l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(
                        parindent);
@@ -1863,11 +1939,10 @@ int TextMetrics::singleWidth(pit_type pit, pos_type pos) const
 {
        ParagraphMetrics const & pm = par_metrics_[pit];
 
-       return pm.singleWidth(pos, getDisplayFont(pit, pos));
+       return pm.singleWidth(pos, displayFont(pit, pos));
 }
 
 
-// only used for inset right now. should also be used for main text
 void TextMetrics::draw(PainterInfo & pi, int x, int y) const
 {
        if (par_metrics_.empty())
@@ -1893,73 +1968,102 @@ void TextMetrics::draw(PainterInfo & pi, int x, int y) const
 
 void TextMetrics::drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) const
 {
-//     lyxerr << "  paintPar: pit: " << pit << " at y: " << y << endl;
-       int const ww = bv_->workHeight();
-
+       BufferParams const & bparams = bv_->buffer().params();
        ParagraphMetrics const & pm = par_metrics_[pit];
        if (pm.rows().empty())
                return;
 
-       RowList::const_iterator const rb = pm.rows().begin();
-       RowList::const_iterator const re = pm.rows().end();
-
        Bidi bidi;
+       bool const original_drawing_state = pi.pain.isDrawingEnabled();
+       int const ww = bv_->workHeight();
+       size_t const nrows = pm.rows().size();
+
+       Cursor const & cur = bv_->cursor();
+       DocIterator sel_beg = cur.selectionBegin();
+       DocIterator sel_end = cur.selectionEnd();
+       bool selection = cur.selection()
+               // This is our text.
+               && cur.text() == text_
+               // if the anchor is outside, this is not our selection
+               && cur.anchor().text() == text_
+               && pit >= sel_beg.pit() && pit <= sel_end.pit();
 
-       y -= rb->ascent();
-       for (RowList::const_iterator rit = rb; rit != re; ++rit) {
-               y += rit->ascent();
+       // We store the begin and end pos of the selection relative to this par
+       DocIterator sel_beg_par = cur.selectionBegin();
+       DocIterator sel_end_par = cur.selectionEnd();
+       
+       // We care only about visible selection.
+       if (selection) {
+               if (pit != sel_beg.pit()) {
+                       sel_beg_par.pit() = pit;
+                       sel_beg_par.pos() = 0;
+               }
+               if (pit != sel_end.pit()) {
+                       sel_end_par.pit() = pit;
+                       sel_end_par.pos() = sel_end_par.lastpos();
+               }
+       }
 
-               bool const inside = (y + rit->descent() >= 0
-                       && y - rit->ascent() < ww);
-               // it is not needed to draw on screen if we are not inside.
-               pi.pain.setDrawingEnabled(inside);
-               RowPainter rp(pi, *text_, pit, *rit, bidi, x, y);
+       for (size_t i = 0; i != nrows; ++i) {
 
-               // Row signature; has row changed since last paint?
-               bool row_has_changed = rit->changed();
+               Row const & row = pm.rows()[i];
+               if (i)
+                       y += row.ascent();
+
+               bool const inside = (y + row.descent() >= 0
+                       && y - row.ascent() < ww);
+               // It is not needed to draw on screen if we are not inside.
+               pi.pain.setDrawingEnabled(inside && original_drawing_state);
+               RowPainter rp(pi, *text_, pit, row, bidi, x, y);
+
+               if (selection)
+                       row.setSelectionAndMargins(sel_beg_par, sel_end_par);
+               else
+                       row.setSelection(-1, -1);
                
-               bool row_selection = rit->sel_beg != -1 && rit->sel_end != -1;
+               // The row knows nothing about the paragraph, so we have to check
+               // whether this row is the first or last and update the margins.
+               if (row.selection()) {
+                       if (row.sel_beg == 0)
+                               row.begin_margin_sel = sel_beg.pit() < pit;
+                       if (row.sel_end == sel_end_par.lastpos())
+                               row.end_margin_sel = sel_end.pit() > pit;
+               }
 
-               if (!row_selection && !pi.full_repaint && !row_has_changed) {
-                       // Paint the only the insets if the text itself is
+               // Row signature; has row changed since last paint?
+               row.setCrc(pm.computeRowSignature(row, bparams));
+               bool row_has_changed = row.changed();
+
+               // Don't paint the row if a full repaint has not been requested
+               // and if it has not changed.
+               if (!pi.full_repaint && !row_has_changed) {
+                       // Paint only the insets if the text itself is
                        // unchanged.
                        rp.paintOnlyInsets();
-                       y += rit->descent();
+                       y += row.descent();
                        continue;
                }
 
-               // Paint the row if a full repaint has been requested or it has
-               // changed.
-               // Clear background of this row
-               // (if paragraph background was not cleared)
-               if (row_selection || (!pi.full_repaint && row_has_changed)) {
-                       pi.pain.fillRectangle(x, y - rit->ascent(),
-                               width(), rit->height(),
-                               ColorCode(ColorCode(pi.background_color)));
-               }
-               if (row_selection) {
-                       DocIterator beg = bv_->cursor().selectionBegin();
-                       DocIterator end = bv_->cursor().selectionEnd();
-                       beg.pit() = pit;
-                       beg.pos() = rit->sel_beg;
-                       if (pit == end.pit()) {
-                               end.pos() = rit->sel_end;
-                       } else {
-                               end.pit() = pit + 1;
-                               end.pos() = 0;
-                       }
-                       drawSelection(pi, beg, end, x);
+               // Clear background of this row if paragraph background was not
+               // already cleared because of a full repaint.
+               if (!pi.full_repaint && row_has_changed) {
+                       pi.pain.fillRectangle(x, y - row.ascent(),
+                               width(), row.height(), pi.background_color);
                }
+               
+               if (row.selection())
+                       drawRowSelection(pi, x, row, cur, pit);
 
                // Instrumentation for testing row cache (see also
                // 12 lines lower):
-               if (lyxerr.debugging(Debug::PAINTING)) {
-                       if (text_->isMainText(bv_->buffer()))
-                               LYXERR(Debug::PAINTING) << "\n{" << inside <<
-                               pi.full_repaint << row_has_changed << "}";
-                       else
-                               LYXERR(Debug::PAINTING) << "[" << inside <<
-                               pi.full_repaint << row_has_changed << "]";
+               if (lyxerr.debugging(Debug::PAINTING) && inside
+                       && (row.selection() || pi.full_repaint || row_has_changed)) {
+                               string const foreword = text_->isMainText(bv_->buffer()) ?
+                                       "main text redraw " : "inset text redraw: ";
+                       LYXERR(Debug::PAINTING, foreword << "pit=" << pit << " row=" << i
+                               << " row_selection="    << row.selection()
+                               << " full_repaint="     << pi.full_repaint
+                               << " row_has_changed="  << row_has_changed);
                }
 
                // Backup full_repaint status and force full repaint
@@ -1969,157 +2073,145 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) co
                rp.paintAppendix();
                rp.paintDepthBar();
                rp.paintChangeBar();
-               if (rit == rb)
+               if (i == 0)
                        rp.paintFirst();
                rp.paintText();
-               if (rit + 1 == re)
+               if (i == nrows - 1)
                        rp.paintLast();
-               y += rit->descent();
+               y += row.descent();
                // Restore full_repaint status.
                pi.full_repaint = tmp;
        }
        // Re-enable screen drawing for future use of the painter.
-       pi.pain.setDrawingEnabled(true);
+       pi.pain.setDrawingEnabled(original_drawing_state);
 
-       //LYXERR(Debug::PAINTING) << "." << endl;
+       //LYXERR(Debug::PAINTING, ".");
 }
 
 
-// FIXME: only take care of one row!
-void TextMetrics::drawSelection(PainterInfo & pi,
-       DocIterator const & beg, DocIterator const & end, int x) const
+void TextMetrics::drawRowSelection(PainterInfo & pi, int x, Row const & row,
+               Cursor const & curs, pit_type pit) const
 {
-       ParagraphMetrics const & pm1 = parMetrics(beg.pit());
-       ParagraphMetrics const & pm2 = parMetrics(end.pit());
-       Row const & row1 = pm1.getRow(beg.pos(), beg.boundary());
-       Row const & row2 = pm2.getRow(end.pos(), end.boundary());
-
-       // clip above
-       int middleTop;
-       bool const clipAbove = (bv_->cursorStatus(beg) == CUR_ABOVE);
-       if (clipAbove)
-               middleTop = 0;
-       else
-               middleTop = bv_->getPos(beg, beg.boundary()).y_ + row1.descent();
-       
-       // clip below
-       int middleBottom;
-       bool const clipBelow = (bv_->cursorStatus(end) == CUR_BELOW);
-       if (clipBelow)
-               middleBottom = bv_->workHeight();
-       else
-               middleBottom = bv_->getPos(end, end.boundary()).y_ - row2.ascent();
-
-       // start and end in the same line?
-       if (!clipAbove && !clipBelow && &row1 == &row2)
-               // then only draw this row's selection
-               drawRowSelection(pi, x, row1, beg, end, false, false);
-       else {
-               if (!clipAbove) {
-                       // get row end
-                       DocIterator begRowEnd = beg;
-                       begRowEnd.pos() = row1.endpos();
-                       begRowEnd.boundary(true);
-                       
-                       // draw upper rectangle
-                       drawRowSelection(pi, x, row1, beg, begRowEnd, false, true);
-               }
-                       
-               if (middleTop < middleBottom) {
-                       // draw middle rectangle
-                       pi.pain.fillRectangle(x, middleTop, width(), middleBottom - middleTop,
-                               Color_selection);
-               }
+       DocIterator beg = curs.selectionBegin();
+       beg.pit() = pit;
+       beg.pos() = row.sel_beg;
 
-               if (!clipBelow) {
-                       // get row begin
-                       DocIterator endRowBeg = end;
-                       endRowBeg.pos() = row2.pos();
-                       endRowBeg.boundary(false);
-                       
-                       // draw low rectangle
-                       drawRowSelection(pi, x, row2, endRowBeg, end, true, false);
-               }
-       }
-}
+       DocIterator end = curs.selectionEnd();
+       end.pit() = pit;
+       end.pos() = row.sel_end;
 
+       bool const begin_boundary = beg.pos() >= row.endpos();
+       bool const end_boundary = row.sel_end == row.endpos();
 
-void TextMetrics::drawRowSelection(PainterInfo & pi, int x, Row const & row,
-               DocIterator const & beg, DocIterator const & end,
-               bool drawOnBegMargin, bool drawOnEndMargin) const
-{
        Buffer & buffer = bv_->buffer();
        DocIterator cur = beg;
-       int x1 = cursorX(beg.top(), beg.boundary());
-       int x2 = cursorX(end.top(), end.boundary());
-       int y1 = bv_->getPos(cur, cur.boundary()).y_ - row.ascent();
-       int y2 = y1 + row.height();
-       
+       cur.boundary(begin_boundary);
+       int x1 = cursorX(beg.top(), begin_boundary);
+       int x2 = cursorX(end.top(), end_boundary);
+       int const y1 = bv_->getPos(cur, cur.boundary()).y_ - row.ascent();
+       int const y2 = y1 + row.height();
+
+       int const rm = text_->isMainText(buffer) ? bv_->rightMargin() : 0;
+       int const lm = text_->isMainText(buffer) ? bv_->leftMargin() : 0;
+
        // draw the margins
-       if (drawOnBegMargin) {
-               if (text_->isRTL(buffer, beg.paragraph()))
-                       pi.pain.fillRectangle(x + x1, y1, width() - x1, y2 - y1, Color_selection);
-               else
-                       pi.pain.fillRectangle(x, y1, x1, y2 - y1, Color_selection);
+       if (row.begin_margin_sel) {
+               if (text_->isRTL(buffer, beg.paragraph())) {
+                       pi.pain.fillRectangle(x + x1, y1,  width() - rm - x1, y2 - y1,
+                               Color_selection);
+               } else {
+                       pi.pain.fillRectangle(x + lm, y1, x1 - lm, y2 - y1,
+                               Color_selection);
+               }
        }
-       
-       if (drawOnEndMargin) {
-               if (text_->isRTL(buffer, beg.paragraph()))
-                       pi.pain.fillRectangle(x, y1, x2, y2 - y1, Color_selection);
-               else
-                       pi.pain.fillRectangle(x + x2, y1, width() - x2, y2 - y1, Color_selection);
+
+       if (row.end_margin_sel) {
+               if (text_->isRTL(buffer, beg.paragraph())) {
+                       pi.pain.fillRectangle(x + lm, y1, x2 - lm, y2 - y1,
+                               Color_selection);
+               } else {
+                       pi.pain.fillRectangle(x + x2, y1, width() - rm - x2, y2 - y1,
+                               Color_selection);
+               }
        }
-       
+
        // if we are on a boundary from the beginning, it's probably
        // a RTL boundary and we jump to the other side directly as this
        // segement is 0-size and confuses the logic below
        if (cur.boundary())
                cur.boundary(false);
-       
+
        // go through row and draw from RTL boundary to RTL boundary
        while (cur < end) {
                bool drawNow = false;
-               
+
                // simplified cursorForward code below which does not
                // descend into insets and which does not go into the
                // next line. Compare the logic with the original cursorForward
-               
-               // if left of boundary -> just jump to right side
-               // but for RTL boundaries don't, because: abc|DDEEFFghi -> abcDDEEF|Fghi
+
+               // if left of boundary -> just jump to right side, but
+               // for RTL boundaries don't, because: abc|DDEEFFghi -> abcDDEEF|Fghi
                if (cur.boundary()) {
                        cur.boundary(false);
                }       else if (isRTLBoundary(cur.pit(), cur.pos() + 1)) {
-                       // in front of RTL boundary -> Stay on this side of the boundary because:
-                       //   ab|cDDEEFFghi -> abc|DDEEFFghi
+                       // in front of RTL boundary -> Stay on this side of the boundary
+                       // because:  ab|cDDEEFFghi -> abc|DDEEFFghi
                        ++cur.pos();
                        cur.boundary(true);
                        drawNow = true;
                } else {
                        // move right
                        ++cur.pos();
-                       
+
                        // line end?
                        if (cur.pos() == row.endpos())
                                cur.boundary(true);
                }
-                       
+
                if (x1 == -1) {
                        // the previous segment was just drawn, now the next starts
                        x1 = cursorX(cur.top(), cur.boundary());
                }
-               
+
                if (!(cur < end) || drawNow) {
                        x2 = cursorX(cur.top(), cur.boundary());
                        pi.pain.fillRectangle(x + min(x1,x2), y1, abs(x2 - x1), y2 - y1,
                                Color_selection);
-                       
-                       // reset x1, so it is set again next round (which will be on the 
+
+                       // reset x1, so it is set again next round (which will be on the
                        // right side of a boundary or at the selection end)
                        x1 = -1;
                }
        }
 }
 
+
+void TextMetrics::completionPosAndDim(Cursor const & cur, int & x, int & y,
+       Dimension & dim) const
+{
+       Cursor const & bvcur = cur.bv().cursor();
+
+       // get word in front of cursor
+       docstring word = text_->previousWord(bvcur.top());
+       DocIterator wordStart = bvcur;
+       wordStart.pos() -= word.length();
+
+       // get position on screen of the word start and end
+       Point lxy = cur.bv().getPos(wordStart, false);
+       Point rxy = cur.bv().getPos(bvcur, bvcur.boundary());
+
+       // calculate dimensions of the word
+       dim = rowHeight(bvcur.pit(), wordStart.pos(), bvcur.pos(), false);
+       dim.wid = abs(rxy.x_ - lxy.x_);
+
+       // calculate position of word
+       y = lxy.y_;
+       x = min(rxy.x_, lxy.x_);
+
+       //lyxerr << "wid=" << dim.width() << " x=" << x << " y=" << y << " lxy.x_=" << lxy.x_ << " rxy.x_=" << rxy.x_ << " word=" << word << std::endl;
+       //lyxerr << " wordstart=" << wordStart << " bvcur=" << bvcur << " cur=" << cur << std::endl;
+}
+
 //int TextMetrics::pos2x(pit_type pit, pos_type pos) const
 //{
 //     ParagraphMetrics const & pm = par_metrics_[pit];