X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftext2.C;h=d27f5e1dbdb4fcdfe5b8580174c4e20014816fdd;hb=80328d2053869dc089c23c25adbed4167d7bf0b1;hp=d88edd4af99febe4839f81e82f9fadcf58cb8f55;hpb=d589434ce35c3b52559fa80a3cca85c013a89e39;p=lyx.git

diff --git a/src/text2.C b/src/text2.C
index d88edd4af9..d27f5e1dbd 100644
--- a/src/text2.C
+++ b/src/text2.C
@@ -26,6 +26,7 @@
 #include "bufferlist.h"
 #include "bufferparams.h"
 #include "BufferView.h"
+#include "bufferview_funcs.h"
 #include "Bullet.h"
 #include "coordcache.h"
 #include "cursor.h"
@@ -41,6 +42,7 @@
 #include "lyxrc.h"
 #include "lyxrow.h"
 #include "paragraph.h"
+#include "TextMetrics.h"
 #include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
 #include "pariterator.h"
@@ -71,42 +73,23 @@ using std::max;
 using std::min;
 
 
-LyXText::LyXText(BufferView * bv)
-	: maxwidth_(bv ? bv->workWidth() : 100),
-	  current_font(LyXFont::ALL_INHERIT),
+LyXText::LyXText()
+	: current_font(LyXFont::ALL_INHERIT),
 	  background_color_(LColor::background),
-	  bv_owner(bv),
 	  autoBreakRows_(false)
 {}
 
 
-void LyXText::init(BufferView * bv)
+bool LyXText::isMainText(Buffer const & buffer) const
 {
-	BOOST_ASSERT(bv);
-	bv_owner = bv;
-	maxwidth_ = bv->workWidth();
-	dim_.wid = maxwidth_;
-	dim_.asc = 10;
-	dim_.des = 10;
-
-	pit_type const end = paragraphs().size();
-	for (pit_type pit = 0; pit != end; ++pit)
-		pars_[pit].rows().clear();
-
-	updateLabels(*bv->buffer());
-}
-
-
-bool LyXText::isMainText() const
-{
-	return &bv()->buffer()->text() == this;
+	return &buffer.text() == this;
 }
 
 
 //takes screen x,y coordinates
-InsetBase * LyXText::checkInsetHit(int x, int y) const
+InsetBase * LyXText::checkInsetHit(BufferView & bv, int x, int y)
 {
-	pit_type pit = getPitNearY(y);
+	pit_type pit = getPitNearY(bv, y);
 	BOOST_ASSERT(pit != -1);
 
 	Paragraph const & par = pars_[pit];
@@ -126,21 +109,21 @@ InsetBase * LyXText::checkInsetHit(int x, int y) const
 			<< BOOST_CURRENT_FUNCTION
 			<< ": examining inset " << inset << endl;
 
-		if (bv()->coordCache().getInsets().has(inset))
+		if (bv.coordCache().getInsets().has(inset))
 			lyxerr[Debug::DEBUG]
 				<< BOOST_CURRENT_FUNCTION
-				<< ": xo: " << inset->xo(*bv()) << "..."
-				<< inset->xo(*bv()) + inset->width()
-				<< " yo: " << inset->yo(*bv()) - inset->ascent()
+				<< ": xo: " << inset->xo(bv) << "..."
+				<< inset->xo(bv) + inset->width()
+				<< " yo: " << inset->yo(bv) - inset->ascent()
 				<< "..."
-				<< inset->yo(*bv()) + inset->descent()
+				<< inset->yo(bv) + inset->descent()
 				<< endl;
 		else
 			lyxerr[Debug::DEBUG]
 				<< BOOST_CURRENT_FUNCTION
 				<< ": inset has no cached position" << endl;
 #endif
-		if (inset->covers(*bv(), x, y)) {
+		if (inset->covers(bv, x, y)) {
 			lyxerr[Debug::DEBUG]
 				<< BOOST_CURRENT_FUNCTION
 				<< ": Hit inset: " << inset << endl;
@@ -160,7 +143,8 @@ InsetBase * LyXText::checkInsetHit(int x, int y) const
 // 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)
-LyXFont LyXText::getFont(Paragraph const & par, pos_type const pos) const
+LyXFont LyXText::getFont(Buffer const & buffer, Paragraph const & par,
+		pos_type const pos) const
 {
 	BOOST_ASSERT(pos >= 0);
 
@@ -168,14 +152,14 @@ LyXFont LyXText::getFont(Paragraph const & par, pos_type const pos) const
 #ifdef WITH_WARNINGS
 #warning broken?
 #endif
-	BufferParams const & params = bv()->buffer()->params();
+	BufferParams const & params = buffer.params();
 	pos_type const body_pos = par.beginOfBody();
 
 	// We specialize the 95% common case:
 	if (!par.getDepth()) {
 		LyXFont f = par.getFontSettings(params, pos);
-		if (!isMainText())
-			applyOuterFont(f);
+		if (!isMainText(buffer))
+			applyOuterFont(buffer, f);
 		LyXFont lf;
 		LyXFont rlf;
 		if (layout->labeltype == LABEL_MANUAL && pos < body_pos) {
@@ -201,8 +185,8 @@ LyXFont LyXText::getFont(Paragraph const & par, pos_type const pos) const
 	LyXFont font = par.getFontSettings(params, pos);
 	font.realize(layoutfont);
 
-	if (!isMainText())
-		applyOuterFont(font);
+	if (!isMainText(buffer))
+		applyOuterFont(buffer, font);
 
 	// Find the pit value belonging to paragraph. This will not break
 	// even if pars_ would not be a vector anymore.
@@ -233,16 +217,16 @@ LyXFont LyXText::getFont(Paragraph const & par, pos_type const pos) const
 // the pi/mi parameters, and stored locally in a lyxtext in font_.
 // This is where the two are integrated in the final fully realized
 // font.
-void LyXText::applyOuterFont(LyXFont & font) const {
+void LyXText::applyOuterFont(Buffer const & buffer, LyXFont & font) const {
 	LyXFont lf(font_);
-	lf.reduce(bv()->buffer()->params().getFont());
+	lf.reduce(buffer.params().getFont());
 	lf.realize(font);
 	lf.setLanguage(font.language());
 	font = lf;
 }
 
 
-LyXFont LyXText::getLayoutFont(pit_type const pit) const
+LyXFont LyXText::getLayoutFont(Buffer const & buffer, pit_type const pit) const
 {
 	LyXLayout_ptr const & layout = pars_[pit].layout();
 
@@ -250,20 +234,20 @@ LyXFont LyXText::getLayoutFont(pit_type const pit) const
 		LyXFont lf = layout->resfont;
 		// In case the default family has been customized
 		if (layout->font.family() == LyXFont::INHERIT_FAMILY)
-			lf.setFamily(bv()->buffer()->params().getFont().family());
+			lf.setFamily(buffer.params().getFont().family());
 		return lf;
 	}
 
 	LyXFont font = layout->font;
 	// Realize with the fonts of lesser depth.
 	//font.realize(outerFont(pit, paragraphs()));
-	font.realize(bv()->buffer()->params().getFont());
+	font.realize(buffer.params().getFont());
 
 	return font;
 }
 
 
-LyXFont LyXText::getLabelFont(Paragraph const & par) const
+LyXFont LyXText::getLabelFont(Buffer const & buffer, Paragraph const & par) const
 {
 	LyXLayout_ptr const & layout = par.layout();
 
@@ -271,19 +255,20 @@ LyXFont LyXText::getLabelFont(Paragraph const & par) const
 		LyXFont lf = layout->reslabelfont;
 		// In case the default family has been customized
 		if (layout->labelfont.family() == LyXFont::INHERIT_FAMILY)
-			lf.setFamily(bv()->buffer()->params().getFont().family());
+			lf.setFamily(buffer.params().getFont().family());
 		return lf;
 	}
 
 	LyXFont font = layout->labelfont;
 	// Realize with the fonts of lesser depth.
-	font.realize(bv()->buffer()->params().getFont());
+	font.realize(buffer.params().getFont());
 
 	return font;
 }
 
 
-void LyXText::setCharFont(pit_type pit, pos_type pos, LyXFont const & fnt)
+void LyXText::setCharFont(Buffer const & buffer, pit_type pit,
+		pos_type pos, LyXFont const & fnt)
 {
 	LyXFont font = fnt;
 	LyXLayout_ptr const & layout = pars_[pit].layout();
@@ -310,10 +295,10 @@ void LyXText::setCharFont(pit_type pit, pos_type pos, LyXFont const & fnt)
 
 	// Inside inset, apply the inset's font attributes if any
 	// (charstyle!)
-	if (!isMainText())
+	if (!isMainText(buffer))
 		layoutfont.realize(font_);
 
-	layoutfont.realize(bv()->buffer()->params().getFont());
+	layoutfont.realize(buffer.params().getFont());
 
 	// Now, reduce font against full layout font
 	font.reduce(layoutfont);
@@ -341,17 +326,20 @@ pit_type LyXText::undoSpan(pit_type pit)
 }
 
 
-void LyXText::setLayout(pit_type start, pit_type end, string const & layout)
+void LyXText::setLayout(Buffer const & buffer, pit_type start, pit_type end,
+		string const & layout)
 {
 	BOOST_ASSERT(start != end);
 
-	BufferParams const & bufparams = bv()->buffer()->params();
+	BufferParams const & bufparams = buffer.params();
 	LyXLayout_ptr const & lyxlayout = bufparams.getLyXTextClass()[layout];
 
 	for (pit_type pit = start; pit != end; ++pit) {
-		pars_[pit].applyLayout(lyxlayout);
+		Paragraph & par = pars_[pit];
+		par.applyLayout(lyxlayout);
 		if (lyxlayout->margintype == MARGIN_MANUAL)
-			pars_[pit].setLabelWidthString(lyxlayout->labelstring());
+			par.setLabelWidthString(par.translateIfPossible(
+				lyxlayout->labelstring(), buffer.params()));
 	}
 }
 
@@ -380,8 +368,8 @@ void LyXText::setLayout(LCursor & cur, string const & layout)
 	pit_type start = cur.selBegin().pit();
 	pit_type end = cur.selEnd().pit() + 1;
 	pit_type undopit = undoSpan(end - 1);
-	recUndo(start, undopit - 1);
-	setLayout(start, end, layout);
+	recUndo(cur, start, undopit - 1);
+	setLayout(cur.buffer(), start, end, layout);
 	updateLabels(cur.buffer());
 }
 
@@ -455,9 +443,9 @@ void LyXText::setFont(LCursor & cur, LyXFont const & font, bool toggleall)
 		LyXFont layoutfont;
 		pit_type pit = cur.pit();
 		if (cur.pos() < pars_[pit].beginOfBody())
-			layoutfont = getLabelFont(pars_[pit]);
+			layoutfont = getLabelFont(cur.buffer(), pars_[pit]);
 		else
-			layoutfont = getLayoutFont(pit);
+			layoutfont = getLayoutFont(cur.buffer(), pit);
 
 		// Update current font
 		real_current_font.update(font,
@@ -487,9 +475,9 @@ void LyXText::setFont(LCursor & cur, LyXFont const & font, bool toggleall)
 	// nested insets.
 	for (; dit != ditend; dit.forwardPosNoDescend()) {
 		if (dit.pos() != dit.lastpos()) {
-			LyXFont f = getFont(dit.paragraph(), dit.pos());
+			LyXFont f = getFont(cur.buffer(), dit.paragraph(), dit.pos());
 			f.update(font, params.language, toggleall);
-			setCharFont(dit.pit(), dit.pos(), f);
+			setCharFont(cur.buffer(), dit.pit(), dit.pos(), f);
 		}
 	}
 }
@@ -501,7 +489,8 @@ void LyXText::setFont(LCursor & cur, LyXFont const & font, bool toggleall)
 bool LyXText::cursorHome(LCursor & cur)
 {
 	BOOST_ASSERT(this == cur.text());
-	Row const & row = cur.paragraph().getRow(cur.pos(),cur.boundary());
+	ParagraphMetrics const & pm = cur.bv().parMetrics(this, cur.pit());
+	Row const & row = pm.getRow(cur.pos(),cur.boundary());
 	return setCursor(cur, cur.pit(), row.pos());
 }
 
@@ -575,7 +564,7 @@ void LyXText::toggleFree(LCursor & cur, LyXFont const & font, bool toggleall)
 }
 
 
-string LyXText::getStringToIndex(LCursor const & cur)
+docstring LyXText::getStringToIndex(LCursor const & cur)
 {
 	BOOST_ASSERT(this == cur.text());
 
@@ -597,18 +586,18 @@ string LyXText::getStringToIndex(LCursor const & cur)
 			idxstring = tmpcur.selectionAsString(false);
 	}
 
-	return to_utf8(idxstring);
+	return idxstring;
 }
 
 
 void LyXText::setParagraph(LCursor & cur,
 			   Spacing const & spacing, LyXAlignment align,
-			   string const & labelwidthstring, bool noindent)
+			   docstring const & labelwidthstring, bool noindent)
 {
 	BOOST_ASSERT(cur.text());
 	// make sure that the depth behind the selection are restored, too
 	pit_type undopit = undoSpan(cur.selEnd().pit());
-	recUndo(cur.selBegin().pit(), undopit - 1);
+	recUndo(cur, cur.selBegin().pit(), undopit - 1);
 
 	for (pit_type pit = cur.selBegin().pit(), end = cur.selEnd().pit();
 	     pit <= end; ++pit) {
@@ -627,8 +616,7 @@ void LyXText::setParagraph(LCursor & cur,
 			else
 				params.align(align);
 		}
-		// FIXME UNICODE
-		par.setLabelWidthString(from_ascii(labelwidthstring));
+		par.setLabelWidthString(labelwidthstring);
 		params.noindent(noindent);
 	}
 }
@@ -685,7 +673,7 @@ bool LyXText::setCursor(LCursor & cur, pit_type par, pos_type pos,
 {
 	LCursor old = cur;
 	setCursorIntern(cur, par, pos, setfont, boundary);
-	return deleteEmptyParagraphMechanism(cur, old);
+	return cur.bv().checkDepm(cur, old);
 }
 
 
@@ -719,7 +707,6 @@ void LyXText::setCursorIntern(LCursor & cur,
 	BOOST_ASSERT(this == cur.text());
 	cur.boundary(boundary);
 	setCursor(cur.top(), par, pos);
-	cur.setTargetX();
 	if (setfont)
 		setCurrentFont(cur);
 }
@@ -750,7 +737,7 @@ void LyXText::setCurrentFont(LCursor & cur)
 
 	BufferParams const & bufparams = cur.buffer().params();
 	current_font = par.getFontSettings(bufparams, pos);
-	real_current_font = getFont(par, pos);
+	real_current_font = getFont(cur.buffer(), par, pos);
 
 	if (cur.pos() == cur.lastpos()
 	    && bidi.isBoundary(cur.buffer(), par, cur.pos())
@@ -763,151 +750,12 @@ void LyXText::setCurrentFont(LCursor & cur)
 	}
 }
 
-
-// x is an absolute screen coord
-// 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(pit_type const pit,
-				 Row const & row, int & x, bool & boundary) const
-{
-	int const xo = bv()->coordCache().get(this, pit).x_;
-	x -= xo;
-	RowMetrics const r = computeRowMetrics(pit, row);
-	Paragraph const & par = pars_[pit];
-
-	pos_type vc = row.pos();
-	pos_type end = row.endpos();
-	pos_type c = 0;
-	LyXLayout_ptr const & layout = par.layout();
-
-	bool left_side = false;
-
-	pos_type body_pos = par.beginOfBody();
-
-	double tmpx = r.x;
-	double last_tmpx = tmpx;
-
-	if (body_pos > 0 &&
-	    (body_pos > end || !par.isLineSeparator(body_pos - 1)))
-		body_pos = 0;
-
-	// check for empty row
-	if (vc == end) {
-		x = int(tmpx) + xo;
-		return 0;
-	}
-
-	frontend::FontMetrics const & fm 
-		= theFontMetrics(getLabelFont(par));
-
-	while (vc < end && tmpx <= x) {
-		c = bidi.vis2log(vc);
-		last_tmpx = tmpx;
-		if (body_pos > 0 && c == body_pos - 1) {
-			// FIXME UNICODE
-			docstring const lsep = from_utf8(layout->labelsep);
-			tmpx += r.label_hfill + fm.width(lsep);
-			if (par.isLineSeparator(body_pos - 1))
-				tmpx -= singleWidth(par, body_pos - 1);
-		}
-
-		if (par.hfillExpansion(row, c)) {
-			tmpx += singleWidth(par, c);
-			if (c >= body_pos)
-				tmpx += r.hfill;
-			else
-				tmpx += r.label_hfill;
-		} else if (par.isSeparator(c)) {
-			tmpx += singleWidth(par, c);
-			if (c >= body_pos)
-				tmpx += r.separator;
-		} else {
-			tmpx += singleWidth(par, c);
-		}
-		++vc;
-	}
-
-	if ((tmpx + last_tmpx) / 2 > x) {
-		tmpx = last_tmpx;
-		left_side = true;
-	}
-
-	BOOST_ASSERT(vc <= end);  // This shouldn't happen.
-
-	boundary = false;
-	// This (rtl_support test) is not needed, but gives
-	// some speedup if rtl_support == false
-	bool const lastrow = lyxrc.rtl_support && row.endpos() == par.size();
-
-	// If lastrow is false, we don't need to compute
-	// the value of rtl.
-	bool const rtl = lastrow ? isRTL(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()) {
-		c = bidi.vis2log(vc);
-		if (bidi.level(c) % 2 == 1)
-			++c;
-	} else {
-		c = bidi.vis2log(vc - 1);
-		bool const rtl = (bidi.level(c) % 2 == 1);
-		if (left_side == rtl) {
-			++c;
-			boundary = bidi.isBoundary(*bv()->buffer(), par, c);
-		}
-	}
-
-// I believe this code is not needed anymore (Jug 20050717)
-#if 0
-	// The following code is necessary because the cursor position past
-	// the last char in a row is logically equivalent to that before
-	// the first char in the next row. That's why insets causing row
-	// divisions -- Newline and display-style insets -- must be treated
-	// specially, so cursor up/down doesn't get stuck in an air gap -- MV
-	// Newline inset, air gap below:
-	if (row.pos() < end && c >= end && par.isNewline(end - 1)) {
-		if (bidi.level(end -1) % 2 == 0)
-			tmpx -= singleWidth(par, end - 1);
-		else
-			tmpx += singleWidth(par, end - 1);
-		c = end - 1;
-	}
-
-	// Air gap above display inset:
-	if (row.pos() < end && c >= end && end < par.size()
-	    && par.isInset(end) && par.getInset(end)->display()) {
-		c = end - 1;
-	}
-	// Air gap below display inset:
-	if (row.pos() < end && c >= end && par.isInset(end - 1)
-	    && par.getInset(end - 1)->display()) {
-		c = end - 1;
-	}
-#endif
-
-	x = int(tmpx) + xo;
-	pos_type const col = c - row.pos();
-
-	if (!c || end == par.size())
-		return col;
-
-	if (c==end && !par.isLineSeparator(c-1) && !par.isNewline(c-1)) {
-		boundary = true;
-		return col;
-	}
-
-	return min(col, end - 1 - row.pos());
-}
-
-
 // y is screen coordinate
-pit_type LyXText::getPitNearY(int y) const
+pit_type LyXText::getPitNearY(BufferView & bv, int y)
 {
 	BOOST_ASSERT(!paragraphs().empty());
-	BOOST_ASSERT(bv()->coordCache().getParPos().find(this) != bv()->coordCache().getParPos().end());
-	CoordCache::InnerParPosCache const & cc = bv()->coordCache().getParPos().find(this)->second;
+	BOOST_ASSERT(bv.coordCache().getParPos().find(this) != bv.coordCache().getParPos().end());
+	CoordCache::InnerParPosCache const & cc = bv.coordCache().getParPos().find(this)->second;
 	lyxerr[Debug::DEBUG]
 		<< BOOST_CURRENT_FUNCTION
 		<< ": y: " << y << " cache size: " << cc.size()
@@ -918,6 +766,45 @@ pit_type LyXText::getPitNearY(int y) const
 	int yy = -1;
 	CoordCache::InnerParPosCache::const_iterator it = cc.begin();
 	CoordCache::InnerParPosCache::const_iterator et = cc.end();
+	CoordCache::InnerParPosCache::const_iterator last = et; last--;
+
+	TextMetrics & tm = bv.textMetrics(this);
+	ParagraphMetrics const & pm = tm.parMetrics(it->first);
+
+	// If we are off-screen (before the visible part)
+	if (y < 0
+		// and even before the first paragraph in the cache.
+		&& y < it->second.y_ - int(pm.ascent())) {
+		//  and we are not at the first paragraph in the inset.
+		if (it->first == 0)
+			return 0;
+		// then this is the paragraph we are looking for.
+		pit = it->first - 1;
+		// rebreak it and update the CoordCache.
+		tm.redoParagraph(pit);
+		bv.coordCache().parPos()[this][pit] =
+			Point(0, it->second.y_ - pm.descent());
+		return pit;
+	}
+
+	ParagraphMetrics const & pm_last = bv.parMetrics(this, 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.y_ + int(pm_last.descent())) {
+		pit = last->first + 1;
+		//  and we are not at the last paragraph in the inset.
+		if (pit == int(pars_.size()))
+			return last->first;
+		// then this is the paragraph we are looking for.
+		// rebreak it and update the CoordCache.
+		tm.redoParagraph(pit);
+		bv.coordCache().parPos()[this][pit] =
+			Point(0, last->second.y_ + pm_last.ascent());
+		return pit;
+	}
+
 	for (; it != et; ++it) {
 		lyxerr[Debug::DEBUG]
 			<< BOOST_CURRENT_FUNCTION
@@ -925,7 +812,9 @@ pit_type LyXText::getPitNearY(int y) const
 			<< " y: " << it->second.y_
 			<< endl;
 
-		if (it->first >= pit && int(it->second.y_) - int(pars_[it->first].ascent()) <= y) {
+		ParagraphMetrics const & pm = bv.parMetrics(this, it->first);
+
+		if (it->first >= pit && int(it->second.y_) - int(pm.ascent()) <= y) {
 			pit = it->first;
 			yy = it->second.y_;
 		}
@@ -940,13 +829,14 @@ pit_type LyXText::getPitNearY(int y) const
 }
 
 
-Row const & LyXText::getRowNearY(int y, pit_type pit) const
+Row const & LyXText::getRowNearY(BufferView const & bv, int y, pit_type pit) const
 {
-	Paragraph const & par = pars_[pit];
-	int yy = bv()->coordCache().get(this, pit).y_ - par.ascent();
-	BOOST_ASSERT(!par.rows().empty());
-	RowList::const_iterator rit = par.rows().begin();
-	RowList::const_iterator const rlast = boost::prior(par.rows().end());
+	ParagraphMetrics const & pm = bv.parMetrics(this, pit);
+
+	int yy = bv.coordCache().get(this, pit).y_ - pm.ascent();
+	BOOST_ASSERT(!pm.rows().empty());
+	RowList::const_iterator rit = pm.rows().begin();
+	RowList::const_iterator const rlast = boost::prior(pm.rows().end());
 	for (; rit != rlast; yy += rit->height(), ++rit)
 		if (yy + rit->height() > y)
 			break;
@@ -958,20 +848,27 @@ Row const & LyXText::getRowNearY(int y, pit_type pit) const
 // sets cursor recursively descending into nested editable insets
 InsetBase * LyXText::editXY(LCursor & cur, int x, int y)
 {
-	pit_type pit = getPitNearY(y);
+	if (lyxerr.debugging(Debug::WORKAREA)) {
+		lyxerr << "LyXText::editXY(cur, " << x << ", " << y << ")" << std::endl;
+		cur.bv().coordCache().dump();
+	}
+	pit_type pit = getPitNearY(cur.bv(), y);
 	BOOST_ASSERT(pit != -1);
-	Row const & row = getRowNearY(y, pit);
+
+	Row const & row = getRowNearY(cur.bv(), y, pit);
 	bool bound = false;
 
+	TextMetrics const & tm = cur.bv().textMetrics(this);
 	int xx = x; // is modified by getColumnNearX
-	pos_type const pos = row.pos() + getColumnNearX(pit, row, xx, bound);
+	pos_type const pos = row.pos()
+		+ tm.getColumnNearX(pit, row, xx, bound);
 	cur.pit() = pit;
 	cur.pos() = pos;
 	cur.boundary(bound);
 	cur.x_target() = x;
 
 	// try to descend into nested insets
-	InsetBase * inset = checkInsetHit(x, y);
+	InsetBase * inset = checkInsetHit(cur.bv(), x, y);
 	//lyxerr << "inset " << inset << " hit at x: " << x << " y: " << y << endl;
 	if (!inset) {
 		// Either we deconst editXY or better we move current_font
@@ -980,18 +877,22 @@ InsetBase * LyXText::editXY(LCursor & cur, int x, int y)
 		return 0;
 	}
 
+	InsetBase * insetBefore = pos? pars_[pit].getInset(pos - 1): 0;
+	//InsetBase * insetBehind = pars_[pit].getInset(pos);
+
 	// This should be just before or just behind the
 	// cursor position set above.
-        InsetBase * inset2 = pars_[pit].getInset(pos - 1);
-        InsetBase * inset3 = pars_[pit].getInset(pos);
-        
-	BOOST_ASSERT((pos != 0 && inset == inset2)
-		     || inset == inset3);
+	BOOST_ASSERT((pos != 0 && inset == insetBefore)
+		|| inset == pars_[pit].getInset(pos));
+
 	// Make sure the cursor points to the position before
 	// this inset.
-	if (inset == pars_[pit].getInset(pos - 1))
+	if (inset == insetBefore)
 		--cur.pos();
+
+	// Try to descend recursively inside the inset.
 	inset = inset->editXY(cur, x, y);
+
 	if (cur.top().text() == this)
 		setCurrentFont(cur);
 	return inset;
@@ -1014,6 +915,9 @@ bool LyXText::checkAndActivateInset(LCursor & cur, bool front)
 
 bool LyXText::cursorLeft(LCursor & cur)
 {
+	// Tell BufferView to test for FitCursor in any case!
+	cur.updateFlags(Update::FitCursor);
+
 	if (!cur.boundary() && cur.pos() > 0 &&
 	    cur.textRow().pos() == cur.pos() &&
 	    !cur.paragraph().isLineSeparator(cur.pos()-1) &&
@@ -1021,13 +925,15 @@ bool LyXText::cursorLeft(LCursor & cur)
 		return setCursor(cur, cur.pit(), cur.pos(), true, true);
 	}
 	if (cur.pos() != 0) {
-		bool boundary = cur.boundary();
 		bool updateNeeded = setCursor(cur, cur.pit(), cur.pos() - 1, true, false);
 		if (!checkAndActivateInset(cur, false)) {
+			/** FIXME: What's this cause purpose???
+			bool boundary = cur.boundary();
 			if (false && !boundary &&
 			    bidi.isBoundary(cur.buffer(), cur.paragraph(), cur.pos() + 1))
 				updateNeeded |=
 					setCursor(cur, cur.pit(), cur.pos() + 1, true, true);
+			*/
 		}
 		return updateNeeded;
 	}
@@ -1042,6 +948,9 @@ bool LyXText::cursorLeft(LCursor & cur)
 
 bool LyXText::cursorRight(LCursor & cur)
 {
+	// Tell BufferView to test for FitCursor in any case!
+	cur.updateFlags(Update::FitCursor);
+
 	if (cur.pos() != cur.lastpos()) {
 		if (cur.boundary())
 			return setCursor(cur, cur.pit(), cur.pos(),
@@ -1071,14 +980,22 @@ bool LyXText::cursorRight(LCursor & cur)
 
 bool LyXText::cursorUp(LCursor & cur)
 {
-	Paragraph const & par = cur.paragraph();
-	int row;
-	int const x = cur.targetX();
+	// Tell BufferView to test for FitCursor in any case!
+	cur.updateFlags(Update::FitCursor);
+
+	TextMetrics const & tm = cur.bv().textMetrics(this);
+	ParagraphMetrics const & pm = tm.parMetrics(cur.pit());
 
+	int row;
 	if (cur.pos() && cur.boundary())
-		row = par.pos2row(cur.pos()-1);
+		row = pm.pos2row(cur.pos()-1);
 	else
-		row = par.pos2row(cur.pos());
+		row = pm.pos2row(cur.pos());
+
+	// remember current position only if we are not at the end of a row.
+	if (cur.pos() != pm.rows()[row].endpos())
+		cur.setTargetX();
+	int const x = cur.targetX();
 
 	if (!cur.selection()) {
 		int const y = bv_funcs::getPos(cur.bv(), cur, cur.boundary()).y_;
@@ -1086,7 +1003,7 @@ bool LyXText::cursorUp(LCursor & cur)
 		// Go to middle of previous row. 16 found to work OK;
 		// 12 = top/bottom margin of display math
 		int const margin = 3 * InsetMathHull::displayMargin() / 2;
-		editXY(cur, x, y - par.rows()[row].ascent() - margin);
+		editXY(cur, x, y - pm.rows()[row].ascent() - margin);
 		cur.clearSelection();
 
 		// This happens when you move out of an inset.
@@ -1097,19 +1014,21 @@ bool LyXText::cursorUp(LCursor & cur)
 		if (dummy == old)
 			++dummy.pos();
 
-		return deleteEmptyParagraphMechanism(dummy, old);
+		cur.bv().checkDepm(dummy, old);
+		return false;
 	}
 
 	bool updateNeeded = false;
 
 	if (row > 0) {
 		updateNeeded |= setCursor(cur, cur.pit(),
-					  x2pos(cur.pit(), row - 1, x));
+			tm.x2pos(cur.pit(), row - 1, x));
 	} else if (cur.pit() > 0) {
 		--cur.pit();
 		//cannot use 'par' now
+		ParagraphMetrics const & pmcur = cur.bv().parMetrics(this, cur.pit());
 		updateNeeded |= setCursor(cur, cur.pit(),
-					  x2pos(cur.pit(), cur.paragraph().rows().size() - 1, x));
+			tm.x2pos(cur.pit(), pmcur.rows().size() - 1, x));
 	}
 
 	cur.x_target() = x;
@@ -1120,21 +1039,29 @@ bool LyXText::cursorUp(LCursor & cur)
 
 bool LyXText::cursorDown(LCursor & cur)
 {
-	Paragraph const & par = cur.paragraph();
-	int row;
-	int const x = cur.targetX();
+	// Tell BufferView to test for FitCursor in any case!
+	cur.updateFlags(Update::FitCursor);
 
+	TextMetrics const & tm = cur.bv().textMetrics(this);
+	ParagraphMetrics const & pm = tm.parMetrics(cur.pit());
+
+	int row;
 	if (cur.pos() && cur.boundary())
-		row = par.pos2row(cur.pos()-1);
+		row = pm.pos2row(cur.pos()-1);
 	else
-		row = par.pos2row(cur.pos());
+		row = pm.pos2row(cur.pos());
+
+	// remember current position only if we are not at the end of a row.
+	if (cur.pos() != pm.rows()[row].endpos())
+		cur.setTargetX();
+	int const x = cur.targetX();
 
 	if (!cur.selection()) {
 		int const y = bv_funcs::getPos(cur.bv(), cur, cur.boundary()).y_;
 		LCursor old = cur;
 		// To middle of next row
 		int const margin = 3 * InsetMathHull::displayMargin() / 2;
-		editXY(cur, x, y + par.rows()[row].descent() + margin);
+		editXY(cur, x, y + pm.rows()[row].descent() + margin);
 		cur.clearSelection();
 
 		// This happens when you move out of an inset.
@@ -1144,25 +1071,25 @@ bool LyXText::cursorDown(LCursor & cur)
 		LCursor dummy = cur;
 		if (dummy == old)
 			++dummy.pos();
-
-		bool const changed = deleteEmptyParagraphMechanism(dummy, old);
+		
+		bool const changed = cur.bv().checkDepm(dummy, old);
 
 		// Make sure that cur gets back whatever happened to dummy(Lgb)
 		if (changed)
 			cur = dummy;
 
-		return changed;
+		return false;
 	}
 
 	bool updateNeeded = false;
 
-	if (row + 1 < int(par.rows().size())) {
+	if (row + 1 < int(pm.rows().size())) {
 		updateNeeded |= setCursor(cur, cur.pit(),
-					  x2pos(cur.pit(), row + 1, x));
+			tm.x2pos(cur.pit(), row + 1, x));
 	} else if (cur.pit() + 1 < int(paragraphs().size())) {
 		++cur.pit();
 		updateNeeded |= setCursor(cur, cur.pit(),
-					  x2pos(cur.pit(), 0, x));
+			tm.x2pos(cur.pit(), 0, x));
 	}
 
 	cur.x_target() = x;
@@ -1213,15 +1140,10 @@ void LyXText::fixCursorAfterDelete(CursorSlice & cur, CursorSlice const & where)
 }
 
 
-bool LyXText::deleteEmptyParagraphMechanism(LCursor & cur, LCursor & old)
+bool LyXText::deleteEmptyParagraphMechanism(LCursor & cur,
+		LCursor & old, bool & need_anchor_change)
 {
-	// Would be wrong to delete anything if we have a selection.
-	if (cur.selection())
-		return false;
-
 	//lyxerr[Debug::DEBUG] << "DEPM: cur:\n" << cur << "old:\n" << old << endl;
-	// old should point to us
-	BOOST_ASSERT(old.text() == this);
 
 	Paragraph & oldpar = old.paragraph();
 
@@ -1257,8 +1179,8 @@ bool LyXText::deleteEmptyParagraphMechanism(LCursor & cur, LCursor & old)
 		    && old.pos() < oldpar.size()
 		    && oldpar.isLineSeparator(old.pos())
 		    && oldpar.isLineSeparator(old.pos() - 1)
-		    && oldpar.lookupChange(old.pos() - 1).type != Change::DELETED) {
-			oldpar.erase(old.pos() - 1, false); // do not track changes in DEPM
+		    && !oldpar.isDeleted(old.pos() - 1)) {
+			oldpar.eraseChar(old.pos() - 1, cur.buffer().params().trackChanges);
 #ifdef WITH_WARNINGS
 #warning This will not work anymore when we have multiple views of the same buffer
 // In this case, we will have to correct also the cursors held by
@@ -1268,7 +1190,7 @@ bool LyXText::deleteEmptyParagraphMechanism(LCursor & cur, LCursor & old)
 			// correct all cursor parts
 			if (same_par) {
 				fixCursorAfterDelete(cur.top(), old.top());
-				cur.resetAnchor();
+				need_anchor_change = true;
 			}
 			return true;
 		}
@@ -1305,40 +1227,73 @@ bool LyXText::deleteEmptyParagraphMechanism(LCursor & cur, LCursor & old)
 				// their address has changed. Therefore we
 				// need to `regenerate' cur. (JMarc)
 				cur.updateInsets(&(cur.bottom().inset()));
-				cur.resetAnchor();
+				need_anchor_change = true;
 			}
 		}
-		// There is a crash reported by Edwin Leuven (16/04/2006) because of:
-		//ParIterator par_it(old);
-		//updateLabels(old.buffer(), par_it);
-		// So for now we do the full update:
-		updateLabels(old.buffer());
 		return true;
 	}
 
-	if (oldpar.stripLeadingSpaces())
-		cur.resetAnchor();
+	if (oldpar.stripLeadingSpaces(cur.buffer().params().trackChanges)) {
+		need_anchor_change = true;
+		// We return true here because the Paragraph contents changed and
+		// we need a redraw before further action is processed.
+		return true;
+	}
 
 	return false;
 }
 
 
-void LyXText::recUndo(pit_type first, pit_type last) const
+void LyXText::deleteEmptyParagraphMechanism(pit_type first, pit_type last, bool trackChanges)
 {
-	recordUndo(bv()->cursor(), Undo::ATOMIC, first, last);
+	BOOST_ASSERT(first >= 0 && first <= last && last < (int) pars_.size());
+
+	for (pit_type pit = first; pit <= last; ++pit) {
+		Paragraph & par = pars_[pit];
+
+		// We allow all kinds of "mumbo-jumbo" when freespacing.
+		if (par.isFreeSpacing())
+			continue;
+
+		for (pos_type pos = 1; pos < par.size(); ++pos) {
+			if (par.isLineSeparator(pos) && par.isLineSeparator(pos - 1)
+			    && !par.isDeleted(pos - 1)) {
+				if (par.eraseChar(pos - 1, trackChanges)) {
+					--pos;
+				}
+			}
+		}
+
+		// don't delete anything if this is the only remaining paragraph within the given range
+		// note: LyXText::acceptOrRejectChanges() sets the cursor to 'first' after calling DEPM 
+		if (first == last)
+			continue;
+
+		// don't delete empty paragraphs with keepempty set
+		if (par.allowEmpty())
+			continue;
+
+		if (par.empty() || (par.size() == 1 && par.isLineSeparator(0))) {
+			pars_.erase(boost::next(pars_.begin(), pit));
+			--pit;
+			--last;
+			continue;
+		}
+
+		par.stripLeadingSpaces(trackChanges);
+	}
 }
 
 
-void LyXText::recUndo(pit_type par) const
+void LyXText::recUndo(LCursor & cur, pit_type first, pit_type last) const
 {
-	recordUndo(bv()->cursor(), Undo::ATOMIC, par, par);
+	recordUndo(cur, Undo::ATOMIC, first, last);
 }
 
 
-int defaultRowHeight()
+void LyXText::recUndo(LCursor & cur, pit_type par) const
 {
-	return int(theFontMetrics(LyXFont(LyXFont::ALL_SANE)).maxHeight() *  1.2);
+	recordUndo(cur, Undo::ATOMIC, par, par);
 }
 
-
 } // namespace lyx