X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftext.C;h=93b31bbec3ec4b351bc11a0d5071bed4493525db;hb=0657a91fd08e9c31d7f9e6be26055cc5050e5f8b;hp=456118fd1ca84c7af8166f77a849a6144e1fb8e5;hpb=df2aea27c6df0246ade98edd2874d6d2adabdbe1;p=lyx.git

diff --git a/src/text.C b/src/text.C
index 456118fd1c..93b31bbec3 100644
--- a/src/text.C
+++ b/src/text.C
@@ -23,6 +23,7 @@
 #include "buffer_funcs.h"
 #include "bufferparams.h"
 #include "BufferView.h"
+#include "bufferview_funcs.h"
 #include "cursor.h"
 #include "pariterator.h"
 #include "coordcache.h"
@@ -52,6 +53,7 @@
 
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
+#include "frontends/Selection.h"
 
 #include "insets/insettext.h"
 #include "insets/insetbibitem.h"
@@ -73,6 +75,13 @@
 
 #include <sstream>
 
+using std::auto_ptr;
+using std::advance;
+using std::distance;
+using std::max;
+using std::min;
+using std::endl;
+using std::string;
 
 namespace lyx {
 
@@ -87,73 +96,8 @@ using cap::pasteParagraphList;
 
 using frontend::FontMetrics;
 
-using std::auto_ptr;
-using std::advance;
-using std::distance;
-using std::max;
-using std::min;
-using std::endl;
-using std::string;
-
-
 namespace {
 
-int numberOfSeparators(Paragraph const & par, Row const & row)
-{
-	pos_type const first = max(row.pos(), par.beginOfBody());
-	pos_type const last = row.endpos() - 1;
-	int n = 0;
-	for (pos_type p = first; p < last; ++p) {
-		if (par.isSeparator(p))
-			++n;
-	}
-	return n;
-}
-
-
-int numberOfLabelHfills(Paragraph const & par, Row const & row)
-{
-	pos_type last = row.endpos() - 1;
-	pos_type first = row.pos();
-
-	// hfill *DO* count at the beginning of paragraphs!
-	if (first) {
-		while (first < last && par.isHfill(first))
-			++first;
-	}
-
-	last = min(last, par.beginOfBody());
-	int n = 0;
-	for (pos_type p = first; p < last; ++p) {
-		if (par.isHfill(p))
-			++n;
-	}
-	return n;
-}
-
-
-int numberOfHfills(Paragraph const & par, Row const & row)
-{
-	pos_type const last = row.endpos();
-	pos_type first = row.pos();
-
-	// hfill *DO* count at the beginning of paragraphs!
-	if (first) {
-		while (first < last && par.isHfill(first))
-			++first;
-	}
-
-	first = max(first, par.beginOfBody());
-
-	int n = 0;
-	for (pos_type p = first; p < last; ++p) {
-		if (par.isHfill(p))
-			++n;
-	}
-	return n;
-}
-
-
 void readParToken(Buffer const & buf, Paragraph & par, LyXLex & lex,
 	string const & token, LyXFont & font, Change & change, ErrorList & errorList)
 {
@@ -218,7 +162,7 @@ void readParToken(Buffer const & buf, Paragraph & par, LyXLex & lex,
 			par.insertInset(par.size(), inset, font, change);
 		else {
 			lex.eatLine();
-			docstring line = from_utf8(lex.getString());
+			docstring line = lex.getDocString();
 			errorList.push_back(ErrorItem(_("Unknown Inset"), line,
 					    par.id(), 0, par.size()));
 		}
@@ -316,6 +260,10 @@ void readParToken(Buffer const & buf, Paragraph & par, LyXLex & lex,
 		par.insertInset(par.size(), new InsetLine, font, change);
 	} else if (token == "\\newpage") {
 		par.insertInset(par.size(), new InsetPagebreak, font, change);
+	} else if (token == "\\clearpage") {
+		par.insertInset(par.size(), new InsetClearPage, font, change);
+	} else if (token == "\\cleardoublepage") {
+		par.insertInset(par.size(), new InsetClearDoublePage, font, change);
 	} else if (token == "\\change_unchanged") {
 		change = Change(Change::UNCHANGED);
 	} else if (token == "\\change_inserted") {
@@ -348,7 +296,7 @@ void readParToken(Buffer const & buf, Paragraph & par, LyXLex & lex,
 		lex.eatLine();
 		errorList.push_back(ErrorItem(_("Unknown token"),
 			bformat(_("Unknown token: %1$s %2$s\n"), from_utf8(token),
-			from_utf8(lex.getString())),
+			lex.getDocString()),
 			par.id(), 0, par.size()));
 	}
 }
@@ -409,18 +357,6 @@ double LyXText::spacing(Buffer const & buffer,
 }
 
 
-int LyXText::width() const
-{
-	return dim_.wid;
-}
-
-
-int LyXText::height() const
-{
-	return dim_.height();
-}
-
-
 int LyXText::singleWidth(Buffer const & buffer, Paragraph const & par,
 		pos_type pos) const
 {
@@ -456,15 +392,15 @@ int LyXText::singleWidth(Paragraph const & par,
 }
 
 
-int LyXText::leftMargin(Buffer const & buffer, pit_type pit) const
+int LyXText::leftMargin(Buffer const & buffer, int max_width, pit_type pit) const
 {
 	BOOST_ASSERT(pit >= 0);
 	BOOST_ASSERT(pit < int(pars_.size()));
-	return leftMargin(buffer, pit, pars_[pit].size());
+	return leftMargin(buffer, max_width, pit, pars_[pit].size());
 }
 
 
-int LyXText::leftMargin(Buffer const & buffer,
+int LyXText::leftMargin(Buffer const & buffer, int max_width,
 		pit_type const pit, pos_type const pos) const
 {
 	BOOST_ASSERT(pit >= 0);
@@ -492,7 +428,7 @@ int LyXText::leftMargin(Buffer const & buffer,
 		pit_type newpar = outerHook(pit, pars_);
 		if (newpar != pit_type(pars_.size())) {
 			if (pars_[newpar].layout()->isEnvironment()) {
-				l_margin = leftMargin(buffer, newpar);
+				l_margin = leftMargin(buffer, max_width, newpar);
 			}
 			if (par.layout() == tclass.defaultLayout()) {
 				if (pars_[newpar].params().noindent())
@@ -593,7 +529,7 @@ int LyXText::leftMargin(Buffer const & buffer,
 #ifdef WITH_WARNINGS
 #warning This is wrong.
 #endif
-		int minfill = maxwidth_;
+		int minfill = max_width;
 		for ( ; rit != end; ++rit)
 			if (rit->fill() < minfill)
 				minfill = rit->fill();
@@ -601,13 +537,13 @@ int LyXText::leftMargin(Buffer const & buffer,
 		l_margin += minfill;
 #endif
 		// also wrong, but much shorter.
-		l_margin += maxwidth_ / 2;
+		l_margin += max_width / 2;
 		break;
 	}
 	}
 
 	if (!par.params().leftIndent().zero())
-		l_margin += par.params().leftIndent().inPixels(maxwidth_);
+		l_margin += par.params().leftIndent().inPixels(max_width);
 
 	LyXAlignment align;
 
@@ -644,436 +580,12 @@ int LyXText::leftMargin(Buffer const & buffer,
 }
 
 
-int LyXText::rightMargin(Buffer const & buffer, Paragraph const & par) const
-{
-	// FIXME: the correct way is to only call rightMargin() only
-	// within the main LyXText. The following test is thus bogus.
-	LyXText const & text = buffer.text();
-	// We do not want rightmargins on inner texts.
-	if (&text != this)
-		return 0;
-
-	BufferParams const & params = buffer.params();
-	LyXTextClass const & tclass = params.getLyXTextClass();
-	docstring trmarg = from_utf8(tclass.rightmargin());
-	docstring lrmarg = from_utf8(par.layout()->rightmargin);
-	FontMetrics const & fm = theFontMetrics(params.getFont());
-	int const r_margin =
-		lyx::rightMargin()
-		+ fm.signedWidth(trmarg)
-		+ fm.signedWidth(lrmarg)
-		* 4 / (par.getDepth() + 4);
-
-	return r_margin;
-}
-
-
-int LyXText::labelEnd(Buffer const & buffer, pit_type const pit) const
-{
-	// labelEnd is only needed if the layout fills a flushleft label.
-	if (pars_[pit].layout()->margintype != MARGIN_MANUAL)
-		return 0;
-	// return the beginning of the body
-	return leftMargin(buffer, pit);
-}
-
-
-namespace {
-
-// this needs special handling - only newlines count as a break point
-pos_type addressBreakPoint(pos_type i, Paragraph const & par)
-{
-	pos_type const end = par.size();
-
-	for (; i < end; ++i)
-		if (par.isNewline(i))
-			return i + 1;
-
-	return end;
-}
-
-};
-
-
-void LyXText::rowBreakPoint(Buffer const & buffer, int right_margin,
-		pit_type const pit,	Row & row) const
-{
-	Paragraph const & par = pars_[pit];
-	pos_type const end = par.size();
-	pos_type const pos = row.pos();
-	if (pos == end) {
-		row.endpos(end);
-		return;
-	}
-
-	// maximum pixel width of a row
-	int width = maxwidth_ - right_margin; // - leftMargin(buffer, pit, row);
-	if (width < 0) {
-		row.endpos(end);
-		return;
-	}
-
-	LyXLayout_ptr const & layout = par.layout();
-
-	if (layout->margintype == MARGIN_RIGHT_ADDRESS_BOX) {
-		row.endpos(addressBreakPoint(pos, par));
-		return;
-	}
-
-	pos_type const body_pos = par.beginOfBody();
-
-
-	// Now we iterate through until we reach the right margin
-	// or the end of the par, then choose the possible break
-	// nearest that.
-
-	int const left = leftMargin(buffer, pit, pos);
-	int x = left;
-
-	// pixel width since last breakpoint
-	int chunkwidth = 0;
-
-	FontIterator fi = FontIterator(buffer, *this, par, pos);
-	pos_type point = end;
-	pos_type i = pos;
-	FontMetrics const & fm = theFontMetrics(getLabelFont(buffer, par));
-	for ( ; i < end; ++i, ++fi) {
-		char_type const c = par.getChar(i);
-		int thiswidth = singleWidth(par, i, c, *fi);
-
-		// add the auto-hfill from label end to the body
-		if (body_pos && i == body_pos) {
-			docstring lsep = from_utf8(layout->labelsep);
-			int add = fm.width(lsep);
-			if (par.isLineSeparator(i - 1))
-				add -= singleWidth(buffer, par, i - 1);
-
-			add = std::max(add, labelEnd(buffer, pit) - x);
-			thiswidth += add;
-		}
-
-		x += thiswidth;
-		chunkwidth += thiswidth;
-
-		// break before a character that will fall off
-		// the right of the row
-		if (x >= width) {
-			// if no break before, break here
-			if (point == end || chunkwidth >= width - left) {
-				if (i > pos)
-					point = i;
-				else
-					point = i + 1;
-
-			}
-			// exit on last registered breakpoint:
-			break;
-		}
-
-		if (par.isNewline(i)) {
-			point = i + 1;
-			break;
-		}
-		// Break before...
-		if (i + 1 < end) {
-			if (par.isInset(i + 1) && par.getInset(i + 1)->display()) {
-				point = i + 1;
-				break;
-			}
-			// ...and after.
-			if (par.isInset(i) && par.getInset(i)->display()) {
-				point = i + 1;
-				break;
-			}
-		}
-
-		if (!par.isInset(i) || par.getInset(i)->isChar()) {
-			// some insets are line separators too
-			if (par.isLineSeparator(i)) {
-				// register breakpoint:
-				point = i + 1;
-				chunkwidth = 0;
-			}
-		}
-	}
-
-	// maybe found one, but the par is short enough.
-	if (i == end && x < width)
-		point = end;
-
-	// manual labels cannot be broken in LaTeX. But we
-	// want to make our on-screen rendering of footnotes
-	// etc. still break
-	if (body_pos && point < body_pos)
-		point = body_pos;
-
-	row.endpos(point);
-}
-
-
-void LyXText::setRowWidth(Buffer const & buffer, pit_type const pit, Row & row) const
-{
-	// get the pure distance
-	pos_type const end = row.endpos();
-
-	Paragraph const & par = pars_[pit];
-	docstring const labelsep = from_utf8(par.layout()->labelsep);
-	int w = leftMargin(buffer, pit, row.pos());
-
-	pos_type const body_pos = par.beginOfBody();
-	pos_type i = row.pos();
-
-	FontMetrics const & fm = theFontMetrics(getLabelFont(buffer, par));
-
-	if (i < end) {
-		FontIterator fi = FontIterator(buffer, *this, par, i);
-		for ( ; i < end; ++i, ++fi) {
-			if (body_pos > 0 && i == body_pos) {
-				w += fm.width(labelsep);
-				if (par.isLineSeparator(i - 1))
-					w -= singleWidth(buffer, par, i - 1);
-				w = max(w, labelEnd(buffer, pit));
-			}
-			char_type const c = par.getChar(i);
-			w += singleWidth(par, i, c, *fi);
-		}
-	}
-
-	if (body_pos > 0 && body_pos >= end) {
-		w += fm.width(labelsep);
-		if (end > 0 && par.isLineSeparator(end - 1))
-			w -= singleWidth(buffer, par, end - 1);
-		w = max(w, labelEnd(buffer, pit));
-	}
-
-	row.width(w + rightMargin(buffer, par));
-}
-
-
-// returns the minimum space a manual label needs on the screen in pixel
-int LyXText::labelFill(Buffer const & buffer, Paragraph const & par,
-		Row const & row) const
-{
-	pos_type last = par.beginOfBody();
-
-	BOOST_ASSERT(last > 0);
-
-	// -1 because a label ends with a space that is in the label
-	--last;
-
-	// a separator at this end does not count
-	if (par.isLineSeparator(last))
-		--last;
-
-	int w = 0;
-	for (pos_type i = row.pos(); i <= last; ++i)
-		w += singleWidth(buffer, par, i);
-
-	docstring const & label = par.params().labelWidthString();
-	if (label.empty())
-		return 0;
-
-	FontMetrics const & fm = theFontMetrics(getLabelFont(buffer, par));
-
-	return max(0, fm.width(label) - w);
-}
-
-
 LColor_color LyXText::backgroundColor() const
 {
 	return LColor_color(LColor::color(background_color_));
 }
 
 
-void LyXText::setHeightOfRow(BufferView const & bv, pit_type const pit,
-		Row & row)
-{
-	Paragraph const & par = pars_[pit];
-	// get the maximum ascent and the maximum descent
-	double layoutasc = 0;
-	double layoutdesc = 0;
-	double const dh = defaultRowHeight();
-
-	// 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 :)
-	LyXLayout_ptr 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();
-	LyXFont font = getFont(buffer, par, row.pos());
-	LyXFont::FONT_SIZE const tmpsize = font.size();
-	font = getLayoutFont(buffer, pit);
-	LyXFont::FONT_SIZE const size = font.size();
-	font.setSize(tmpsize);
-
-	LyXFont labelfont = getLabelFont(buffer, par);
-
-	FontMetrics const & labelfont_metrics = theFontMetrics(labelfont);
-	FontMetrics const & fontmetrics = theFontMetrics(font);
-
-	// these are minimum values
-	double const spacing_val = layout->spacing.getValue()
-		* spacing(*bv.buffer(), par);
-	//lyxerr << "spacing_val = " << spacing_val << endl;
-	int maxasc  = int(fontmetrics.maxAscent()  * spacing_val);
-	int maxdesc = int(fontmetrics.maxDescent() * spacing_val);
-
-	// insets may be taller
-	InsetList::const_iterator ii = par.insetlist.begin();
-	InsetList::const_iterator iend = par.insetlist.end();
-	for ( ; ii != iend; ++ii) {
-		if (ii->pos >= row.pos() && ii->pos < row.endpos()) {
-			maxasc  = max(maxasc,  ii->inset->ascent());
-			maxdesc = max(maxdesc, ii->inset->descent());
-		}
-	}
-
-	// Check if any custom fonts are larger (Asger)
-	// This is not completely correct, but we can live with the small,
-	// cosmetic error for now.
-	int labeladdon = 0;
-	pos_type const pos_end = row.endpos();
-
-	LyXFont::FONT_SIZE maxsize =
-		par.highestFontInRange(row.pos(), pos_end, size);
-	if (maxsize > font.size()) {
-		font.setSize(maxsize);
-		maxasc  = max(maxasc,  fontmetrics.maxAscent());
-		maxdesc = max(maxdesc, fontmetrics.maxDescent());
-	}
-
-	// This is nicer with box insets:
-	++maxasc;
-	++maxdesc;
-
-	row.ascent(maxasc);
-
-	// is it a top line?
-	if (row.pos() == 0) {
-		Buffer const & buffer = *bv.buffer();
-		BufferParams const & bufparams = buffer.params();
-		// some parksips VERY EASY IMPLEMENTATION
-		if (bufparams.paragraph_separation
-		    == BufferParams::PARSEP_SKIP
-			&& pit != 0
-			&& ((layout->isParagraph() && par.getDepth() == 0)
-			    || (pars_[pit - 1].layout()->isParagraph()
-				&& pars_[pit - 1].getDepth() == 0)))
-		{
-				maxasc += bufparams.getDefSkip().inPixels(bv);
-		}
-
-		if (par.params().startOfAppendix())
-			maxasc += int(3 * dh);
-
-		// This is special code for the chapter, since the label of this
-		// layout is printed in an extra row
-		if (layout->counter == "chapter"
-		    && !par.params().labelString().empty()) {
-			labeladdon = int(labelfont_metrics.maxHeight()
-				     * layout->spacing.getValue()
-				     * 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)
-		    && isFirstInSequence(pit, paragraphs())
-		    && !par.getLabelstring().empty())
-		{
-			labeladdon = int(
-				  labelfont_metrics.maxHeight()
-					* layout->spacing.getValue()
-					* spacing(*bv.buffer(), par)
-				+ (layout->topsep + layout->labelbottomsep) * dh);
-		}
-
-		// Add the layout spaces, for example before and after
-		// a section, or between the items of a itemize or enumerate
-		// environment.
-
-		pit_type prev = depthHook(pit, pars_, par.getDepth());
-		if (prev != pit
-		    && pars_[prev].layout() == layout
-		    && pars_[prev].getDepth() == par.getDepth()
-		    && pars_[prev].getLabelWidthString() == par.getLabelWidthString())
-		{
-			layoutasc = layout->itemsep * dh;
-		} else if (pit != 0 || row.pos() != 0) {
-			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);
-		} else if (pit != 0) {
-			if (pars_[pit - 1].getDepth() != 0 ||
-					pars_[pit - 1].layout() == layout) {
-				maxasc += int(layout->parsep * dh);
-			}
-		}
-	}
-
-	// is it a bottom line?
-	if (row.endpos() >= par.size()) {
-		// add the layout spaces, for example before and after
-		// a section, or between the items of a itemize or enumerate
-		// environment
-		pit_type nextpit = pit + 1;
-		if (nextpit != pit_type(pars_.size())) {
-			pit_type cpit = pit;
-			double usual = 0;
-			double unusual = 0;
-
-			if (pars_[cpit].getDepth() > pars_[nextpit].getDepth()) {
-				usual = pars_[cpit].layout()->bottomsep * dh;
-				cpit = depthHook(cpit, paragraphs(), pars_[nextpit].getDepth());
-				if (pars_[cpit].layout() != pars_[nextpit].layout()
-					|| pars_[nextpit].getLabelWidthString() != pars_[cpit].getLabelWidthString())
-				{
-					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);
-			}
-		}
-	}
-
-	// incalculate the layout spaces
-	maxasc  += int(layoutasc  * 2 / (2 + pars_[pit].getDepth()));
-	maxdesc += int(layoutdesc * 2 / (2 + pars_[pit].getDepth()));
-
-	// FIXME: the correct way is to do the following is to move the 
-	// following code in another method specially tailored for the 
-	// main LyXText. The following test is thus bogus.
-	LyXText const & text = buffer.text();
-	// Top and bottom margin of the document (only at top-level)
-	if (&text == this) {
-		if (pit == 0 && row.pos() == 0)
-			maxasc += 20;
-		if (pit + 1 == pit_type(pars_.size()) &&
-		    row.endpos() == par.size())
-			maxdesc += 20;
-	}
-
-	row.ascent(maxasc + labeladdon);
-	row.descent(maxdesc);
-}
-
-
-namespace {
-
-}
-
 void LyXText::breakParagraph(LCursor & cur, bool keep_layout)
 {
 	BOOST_ASSERT(this == cur.text());
@@ -1086,8 +598,8 @@ void LyXText::breakParagraph(LCursor & cur, bool keep_layout)
 
 	// this is only allowed, if the current paragraph is not empty
 	// or caption and if it has not the keepempty flag active
-	if (cur.lastpos() == 0 && !cpar.allowEmpty()
-	   && layout->labeltype != LABEL_SENSITIVE)
+	if (cur.lastpos() == 0 && !cpar.allowEmpty() &&
+	    layout->labeltype != LABEL_SENSITIVE)
 		return;
 
 	// a layout change may affect also the following paragraph
@@ -1096,10 +608,9 @@ void LyXText::breakParagraph(LCursor & cur, bool keep_layout)
 	// Always break behind a space
 	// It is better to erase the space (Dekel)
 	if (cur.pos() != cur.lastpos() && cpar.isLineSeparator(cur.pos()))
-		// FIXME: change tracking (MG)
 		cpar.eraseChar(cur.pos(), cur.buffer().params().trackChanges);
 
-	// How should the layout for the new paragraph be?
+	// What should the layout for the new paragraph be?
 	int preserve_layout = 0;
 	if (keep_layout)
 		preserve_layout = 2;
@@ -1131,9 +642,10 @@ void LyXText::breakParagraph(LCursor & cur, bool keep_layout)
 			pars_[next_par].applyLayout(tclass.defaultLayout());
 	}
 
-	while (!pars_[next_par].empty() && pars_[next_par].isNewline(0))
-		// FIXME: change tracking (MG)
-		pars_[next_par].eraseChar(0, cur.buffer().params().trackChanges);
+	while (!pars_[next_par].empty() && pars_[next_par].isNewline(0)) {
+		if (!pars_[next_par].eraseChar(0, cur.buffer().params().trackChanges))
+			break; // the character couldn't be deleted physically due to change tracking
+	}
 
 	ParIterator current_it(cur);
 	ParIterator last_it(cur);
@@ -1142,19 +654,15 @@ void LyXText::breakParagraph(LCursor & cur, bool keep_layout)
 
 	updateLabels(cur.buffer(), current_it, last_it);
 
-	// Mark "carriage return" as inserted if change tracking:
-	if (cur.buffer().params().trackChanges) {
-		// FIXME: Change tracking (MG)
-		cur.paragraph().setChange(cur.paragraph().size(),
-			Change(Change::INSERTED));
-	}
+	// A singlePar update is not enough in this case.
+	cur.updateFlags(Update::Force);
 
 	// This check is necessary. Otherwise the new empty paragraph will
 	// be deleted automatically. And it is more friendly for the user!
 	if (cur.pos() != 0 || isempty)
-		setCursor(cur, cur.pit() + 1, 0);
+		setCursor(cur.top(), cur.pit() + 1, 0);
 	else
-		setCursor(cur, cur.pit(), 0);
+		setCursor(cur.top(), cur.pit(), 0);
 }
 
 
@@ -1242,7 +750,9 @@ void LyXText::insertChar(LCursor & cur, char_type c)
 	}
 
 	par.insertChar(cur.pos(), c, current_font, cur.buffer().params().trackChanges);
-	setCursor(cur, cur.pit(), cur.pos() + 1, false, cur.boundary());
+
+//		cur.updateFlags(Update::Force);
+	setCursor(cur.top(), cur.pit(), cur.pos() + 1);
 	charInserted();
 }
 
@@ -1261,120 +771,6 @@ void LyXText::charInserted()
 }
 
 
-RowMetrics LyXText::computeRowMetrics(Buffer const & buffer,
-		pit_type const pit, Row const & row) const
-{
-	RowMetrics result;
-	Paragraph const & par = pars_[pit];
-
-	double w = dim_.wid - row.width();
-
-	bool const is_rtl = isRTL(buffer, par);
-	if (is_rtl)
-		result.x = rightMargin(buffer, par);
-	else
-		result.x = leftMargin(buffer, pit, row.pos());
-
-	// is there a manual margin with a manual label
-	LyXLayout_ptr const & layout = par.layout();
-
-	if (layout->margintype == MARGIN_MANUAL
-	    && layout->labeltype == LABEL_MANUAL) {
-		/// We might have real hfills in the label part
-		int nlh = numberOfLabelHfills(par, row);
-
-		// A manual label par (e.g. List) has an auto-hfill
-		// between the label text and the body of the
-		// paragraph too.
-		// But we don't want to do this auto hfill if the par
-		// is empty.
-		if (!par.empty())
-			++nlh;
-
-		if (nlh && !par.getLabelWidthString().empty())
-			result.label_hfill = labelFill(buffer, par, row) / double(nlh);
-	}
-
-	// are there any hfills in the row?
-	int const nh = numberOfHfills(par, row);
-
-	if (nh) {
-		if (w > 0)
-			result.hfill = w / 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!
-	} else if (int(row.width()) < maxwidth_) {
-		// is it block, flushleft or flushright?
-		// set x how you need it
-		int align;
-		if (par.params().align() == LYX_ALIGN_LAYOUT)
-			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 (!par.empty()
-		    && par.isInset(row.pos())
-		    && par.getInset(row.pos())->display())
-		{
-			align = LYX_ALIGN_CENTER;
-		}
-
-		switch (align) {
-		case LYX_ALIGN_BLOCK: {
-			int const ns = numberOfSeparators(par, row);
-			bool disp_inset = false;
-			if (row.endpos() < par.size()) {
-				InsetBase const * in = par.getInset(row.endpos());
-				if (in)
-					disp_inset = in->display();
-			}
-			// If we have separators, this is not the last row of a
-			// par, does not end in newline, and is not row above a
-			// display inset... then stretch it
-			if (ns
-			    && row.endpos() < par.size()
-			    && !par.isNewline(row.endpos() - 1)
-			    && !disp_inset
-				) {
-				result.separator = w / ns;
-			} else if (is_rtl) {
-				result.x += w;
-			}
-			break;
-		}
-		case LYX_ALIGN_RIGHT:
-			result.x += w;
-			break;
-		case LYX_ALIGN_CENTER:
-			result.x += w / 2;
-			break;
-		}
-	}
-
-	bidi.computeTables(par, buffer, row);
-	if (is_rtl) {
-		pos_type body_pos = par.beginOfBody();
-		pos_type end = row.endpos();
-
-		if (body_pos > 0
-		    && (body_pos > end || !par.isLineSeparator(body_pos - 1)))
-		{
-			docstring const lsep = from_utf8(layout->labelsep);
-			result.x += theFontMetrics(getLabelFont(buffer, par)).width(lsep);
-			if (body_pos <= end)
-				result.x += result.label_hfill;
-		}
-	}
-
-	return result;
-}
-
-
 // the cursor set functions have a special mechanism. When they
 // realize, that you left an empty paragraph, they will delete it.
 
@@ -1433,6 +829,7 @@ void LyXText::selectWord(LCursor & cur, word_location loc)
 	cur.resetAnchor();
 	setCursor(cur, to.pit(), to.pos());
 	cur.setSelection();
+	theSelection().haveSelection(cur.selection());
 }
 
 
@@ -1448,76 +845,111 @@ bool LyXText::selectWordWhenUnderCursor(LCursor & cur, word_location loc)
 }
 
 
-void LyXText::acceptChange(LCursor & cur)
+void LyXText::acceptOrRejectChange(LCursor & cur, bool accept)
 {
 	BOOST_ASSERT(this == cur.text());
-	if (!cur.selection() && cur.lastpos() != 0)
+
+	if (!cur.selection())
 		return;
 
-	recordUndoSelection(cur, Undo::INSERT);
-
-	DocIterator it = cur.selectionBegin();
-	DocIterator et = cur.selectionEnd();
-	pit_type pit = it.pit();
-	bool isDeleted = pars_[pit].isDeleted(it.pos());
-	for (; pit <= et.pit(); ++pit) {
-		pos_type left  = ( pit == it.pit() ? it.pos() : 0 );
-		pos_type right =
-		    ( pit == et.pit() ? et.pos() : pars_[pit].size() + 1 );
-		pars_[pit].acceptChanges(left, right);
-	}
-	if (isDeleted) {
-		ParagraphList & plist = paragraphs();
-		if (it.pit() + 1 < et.pit())
-			pars_.erase(boost::next(plist.begin(), it.pit() + 1),
-				    boost::next(plist.begin(), et.pit()));
+	recordUndoSelection(cur, Undo::ATOMIC);
 
-		// Paragraph merge if appropriate:
-		// FIXME: change tracking (MG)
-		if (pars_[it.pit()].isDeleted(pars_[it.pit()].size())) {
-			setCursorIntern(cur, it.pit() + 1, 0);
-			backspacePos0(cur);
-		}
-	}
-	finishUndo();
-	cur.clearSelection();
-	setCursorIntern(cur, it.pit(), 0);
-}
+	pit_type begPit = cur.selectionBegin().pit();
+	pit_type endPit = cur.selectionEnd().pit();
 
+	pos_type begPos = cur.selectionBegin().pos();
+	pos_type endPos = cur.selectionEnd().pos();
 
-void LyXText::rejectChange(LCursor & cur)
-{
-	BOOST_ASSERT(this == cur.text());
-	if (!cur.selection() && cur.lastpos() != 0)
-		return;
+	// keep selection info, because endPos becomes invalid after the first loop
+	bool endsBeforeEndOfPar = (endPos < pars_[endPit].size());
+
+	// first, accept/reject changes within each individual paragraph (do not consider end-of-par)
+ 	
+	for (pit_type pit = begPit; pit <= endPit; ++pit) {
+		pos_type parSize = pars_[pit].size();
+
+		// ignore empty paragraphs; otherwise, an assertion will fail for
+		// acceptChanges(bparams, 0, 0) or rejectChanges(bparams, 0, 0)
+		if (parSize == 0)
+			continue;
+
+		// do not consider first paragraph if the cursor starts at pos size()
+		if (pit == begPit && begPos == parSize)
+			continue;
+
+		// do not consider last paragraph if the cursor ends at pos 0
+		if (pit == endPit && endPos == 0) 
+			break; // last iteration anyway
+
+		pos_type left  = (pit == begPit ? begPos : 0);
+		pos_type right = (pit == endPit ? endPos : parSize);
 
-	recordUndoSelection(cur, Undo::INSERT);
-
-	DocIterator it = cur.selectionBegin();
-	DocIterator et = cur.selectionEnd();
-	pit_type pit = it.pit();
-	bool isInserted = pars_[pit].isInserted(it.pos());
-	for (; pit <= et.pit(); ++pit) {
-		pos_type left  = ( pit == it.pit() ? it.pos() : 0 );
-		pos_type right =
-		    ( pit == et.pit() ? et.pos() : pars_[pit].size() + 1 );
-		pars_[pit].rejectChanges(left, right);
+		if (accept) {
+			pars_[pit].acceptChanges(cur.buffer().params(), left, right);
+		} else {
+			pars_[pit].rejectChanges(cur.buffer().params(), left, right);
+		}
 	}
-	if (isInserted) {
-		ParagraphList & plist = paragraphs();
-		if (it.pit() + 1 < et.pit())
-			pars_.erase(boost::next(plist.begin(), it.pit() + 1),
-				    boost::next(plist.begin(), et.pit()));
-		// Paragraph merge if appropriate:
-		// FIXME: change tracking (MG)
-		if (pars_[it.pit()].isInserted(pars_[it.pit()].size())) {
-			setCursorIntern(cur, it.pit() + 1, 0);
-			backspacePos0(cur);
+	
+	// next, accept/reject imaginary end-of-par characters
+ 
+	for (pit_type pit = begPit; pit <= endPit; ++pit) {
+		pos_type pos = pars_[pit].size();
+
+		// skip if the selection ends before the end-of-par
+		if (pit == endPit && endsBeforeEndOfPar)
+			break; // last iteration anyway
+
+		// skip if this is not the last paragraph of the document
+		// note: the user should be able to accept/reject the par break of the last par!
+		if (pit == endPit && pit != pars_.size() - 1)
+			break; // last iteration anway
+
+		if (accept) {
+			if (pars_[pit].isInserted(pos)) {
+				pars_[pit].setChange(pos, Change(Change::UNCHANGED));
+			} else if (pars_[pit].isDeleted(pos)) {
+				if (pit == pars_.size() - 1) {
+					// we cannot remove a par break at the end of the last paragraph;
+					// instead, we mark it unchanged
+					pars_[pit].setChange(pos, Change(Change::UNCHANGED));
+				} else {
+					mergeParagraph(cur.buffer().params(), pars_, pit);
+					--endPit;
+					--pit;
+				}
+			}
+		} else {
+			if (pars_[pit].isDeleted(pos)) {
+				pars_[pit].setChange(pos, Change(Change::UNCHANGED));
+			} else if (pars_[pit].isInserted(pos)) {
+				if (pit == pars_.size() - 1) {
+					// we mark the par break at the end of the last paragraph unchanged
+					pars_[pit].setChange(pos, Change(Change::UNCHANGED));
+				} else {
+					mergeParagraph(cur.buffer().params(), pars_, pit);
+					--endPit;
+					--pit;
+				}
+			}
 		}
 	}
+
+	// finally, invoke the DEPM
+	// FIXME: the following code will be changed in the near future
+	setCursorIntern(cur, endPit, 0);
+	for (pit_type pit = endPit - 1; pit >= begPit; --pit) {
+		bool dummy;
+		LCursor old = cur;
+		setCursorIntern(cur, pit, 0);
+		deleteEmptyParagraphMechanism(cur, old, dummy);
+	}
+
 	finishUndo();
 	cur.clearSelection();
-	setCursorIntern(cur, it.pit(), 0);
+	setCursorIntern(cur, begPit, begPos);
+	cur.updateFlags(Update::Force);
+	updateLabels(cur.buffer());
 }
 
 
@@ -1636,32 +1068,30 @@ bool LyXText::erase(LCursor & cur)
 		// this is the code for a normal delete, not pasting
 		// any paragraphs
 		recordUndo(cur, Undo::DELETE);
-		// FIXME: change tracking (MG)
-		par.eraseChar(cur.pos(), cur.buffer().params().trackChanges);
-		if (par.isDeleted(cur.pos()))
-			cur.forwardPos();
+		if(!par.eraseChar(cur.pos(), cur.buffer().params().trackChanges)) {
+			// the character has been logically deleted only => skip it
+			cur.forwardPosNoDescend();
+		}
 		needsUpdate = true;
-	} else if (cur.pit() != cur.lastpit()) {
-		if (cur.buffer().params().trackChanges
-		    && par.isInserted(cur.pos())) {
-			// mark "carriage return" as deleted:
-			// FIXME: Change tracking (MG)
+	} else {
+		if (cur.pit() == cur.lastpit())
+			return dissolveInset(cur);
+
+		if (!par.isMergedOnEndOfParDeletion(cur.buffer().params().trackChanges)) {
 			par.setChange(cur.pos(), Change(Change::DELETED));
 			cur.forwardPos();
 			needsUpdate = true;
 		} else {
 			setCursorIntern(cur, cur.pit() + 1, 0);
 			needsUpdate = backspacePos0(cur);
-			// FIXME: Change tracking (MG)
-			if (cur.paragraph().isDeleted(cur.pos()))
-				cur.forwardPos();
 		}
-	} else
-		needsUpdate = dissolveInset(cur);
+	}
 
-	// Make sure the cursor is correct. Is this really needed?
-	if (needsUpdate)
-		setCursorIntern(cur, cur.pit(), cur.pos());
+	if (needsUpdate) {
+		// Make sure the cursor is correct. Is this really needed?
+		// No, not really... at least not here!
+		cur.text()->setCursor(cur.top(), cur.pit(), cur.pos());
+	}
 	
 	return needsUpdate;
 }
@@ -1699,7 +1129,7 @@ bool LyXText::backspacePos0(LCursor & cur)
 		needsUpdate = true;
 	}
 	// Pasting is not allowed, if the paragraphs have different
-	// layout. I think it is a real bug of all other
+	// layouts. I think it is a real bug of all other
 	// word processors to allow it. It confuses the user.
 	// Correction: Pasting is always allowed with standard-layout
 	else if (par.layout() == prevpar.layout()
@@ -1718,8 +1148,6 @@ bool LyXText::backspacePos0(LCursor & cur)
 }
 
 
-
-
 bool LyXText::backspace(LCursor & cur)
 {
 	BOOST_ASSERT(this == cur.text());
@@ -1728,21 +1156,13 @@ bool LyXText::backspace(LCursor & cur)
 		if (cur.pit() == 0)
 			return dissolveInset(cur);
 
-		if (cur.buffer().params().trackChanges) {
-			// FIXME: Change tracking (MG)
-			// Previous paragraph, mark "carriage return" as
-			// deleted:
-			Paragraph & par = pars_[cur.pit() - 1];
-			// Take care of a just inserted para break:
-			// FIXME: change tracking (MG)
-			if (!par.isInserted(par.size())) {
-				// FIXME: change tracking (MG)
-				par.setChange(par.size(), Change(Change::DELETED));
-				setCursorIntern(cur, cur.pit() - 1, par.size());
-				return true;
-			}
-		}
+		Paragraph & prev_par = pars_[cur.pit() - 1];
 
+		if (!prev_par.isMergedOnEndOfParDeletion(cur.buffer().params().trackChanges)) {
+			prev_par.setChange(prev_par.size(), Change(Change::DELETED));
+			setCursorIntern(cur, cur.pit() - 1, prev_par.size());
+			return true;
+		}
 		// The cursor is at the beginning of a paragraph, so
 		// the backspace will collapse two paragraphs into one.
 		needsUpdate = backspacePos0(cur);
@@ -1757,18 +1177,15 @@ bool LyXText::backspace(LCursor & cur)
 		// without the dreaded mechanism. (JMarc)
 		setCursorIntern(cur, cur.pit(), cur.pos() - 1,
 				false, cur.boundary());
-		// FIXME: change tracking (MG)
 		cur.paragraph().eraseChar(cur.pos(), cur.buffer().params().trackChanges);
 	}
 
 	if (cur.pos() == cur.lastpos())
 		setCurrentFont(cur);
 
-	// FIXME: back spacing have nothing to do with setting a cursor.
-	// Because of the mix between the model (the paragraph contents) and the
-	// view (the paragraph breaking in rows, we have to do this here.
-	redoParagraph(cur.bv(), cur.pit());
-	setCursor(cur, cur.pit(), cur.pos(), false, cur.boundary());
+	// A singlePar update is not enough in this case.
+//		cur.updateFlags(Update::Force);
+	setCursor(cur.top(), cur.pit(), cur.pos());
 
 	return needsUpdate;
 }
@@ -1794,9 +1211,18 @@ bool LyXText::dissolveInset(LCursor & cur) {
 		spos += cur.pos();
 	spit += cur.pit();
 	Buffer & b = cur.buffer();
-	// FIXME: change tracking (MG)
 	cur.paragraph().eraseChar(cur.pos(), b.params().trackChanges);
 	if (!plist.empty()) {
+		// ERT paragraphs have the Language latex_language.
+		// This is invalid outside of ERT, so we need to
+		// change it to the buffer language.
+		ParagraphList::iterator it = plist.begin();
+		ParagraphList::iterator it_end = plist.end();
+		for (; it != it_end; it++) {
+			it->changeLanguage(b.params(), latex_language,
+					b.getLanguage());
+		}
+
 		pasteParagraphList(cur, plist, b.params().textclass,
 				   b.errorList("Paste"));
 		// restore position
@@ -1809,130 +1235,6 @@ bool LyXText::dissolveInset(LCursor & cur) {
 }
 
 
-Row const & LyXText::firstRow() const
-{
-	return *paragraphs().front().rows().begin();
-}
-
-
-bool LyXText::redoParagraph(BufferView & bv, pit_type const pit)
-{
-	// remove rows of paragraph, keep track of height changes
-	Paragraph & par = pars_[pit];
-	Buffer const & buffer = *bv.buffer();
-
-	// Add bibitem insets if necessary
-	if (par.layout()->labeltype == LABEL_BIBLIO) {
-		bool hasbibitem(false);
-		if (!par.insetlist.empty()
-			// Insist on it being in pos 0
-			&& par.getChar(0) == Paragraph::META_INSET) {
-			InsetBase * inset = par.insetlist.begin()->inset;
-			if (inset->lyxCode() == InsetBase::BIBITEM_CODE)
-				hasbibitem = true;
-		}
-		if (!hasbibitem) {
-			InsetBibitem * inset(new
-				InsetBibitem(InsetCommandParams("bibitem")));
-			par.insertInset(0, static_cast<InsetBase *>(inset),
-			                Change(buffer.params().trackChanges ?
-			                       Change::INSERTED : Change::UNCHANGED));
-			bv.cursor().posRight();
-		}
-	}
-
-	// Optimisation: this is used in the next two loops
-	// so better to calculate that once here.
-	int right_margin = rightMargin(buffer, par);
-
-	// redo insets
-	// FIXME: We should always use getFont(), see documentation of
-	// noFontChange() in insetbase.h.
-	LyXFont const bufferfont = buffer.params().getFont();
-	InsetList::iterator ii = par.insetlist.begin();
-	InsetList::iterator iend = par.insetlist.end();
-	for (; ii != iend; ++ii) {
-		Dimension dim;
-		int const w = maxwidth_ - leftMargin(buffer, pit, ii->pos)
-			- right_margin;
-		LyXFont const & font = ii->inset->noFontChange() ?
-			bufferfont :
-			getFont(buffer, par, ii->pos);
-		MetricsInfo mi(&bv, font, w);
-		ii->inset->metrics(mi, dim);
-	}
-
-	// rebreak the paragraph
-	par.rows().clear();
-	Dimension dim;
-
-	par.setBeginOfBody();
-	pos_type z = 0;
-	do {
-		Row row(z);
-		rowBreakPoint(buffer, right_margin, pit, row);
-		setRowWidth(buffer, pit, row);
-		setHeightOfRow(bv, pit, row);
-		par.rows().push_back(row);
-		dim.wid = std::max(dim.wid, row.width());
-		dim.des += row.height();
-		z = row.endpos();
-	} while (z < par.size());
-
-	// Make sure that if a par ends in newline, there is one more row
-	// under it
-	// FIXME this is a dirty trick. Now the _same_ position in the
-	// paragraph occurs in _two_ different rows, and has two different
-	// display positions, leading to weird behaviour when moving up/down.
-	if (z > 0 && par.isNewline(z - 1)) {
-		Row row(z - 1);
-		row.endpos(z - 1);
-		setRowWidth(buffer, pit, row);
-		setHeightOfRow(bv, pit, row);
-		par.rows().push_back(row);
-		dim.des += row.height();
-	}
-
-	dim.asc += par.rows()[0].ascent();
-	dim.des -= par.rows()[0].ascent();
-
-	bool const same = dim == par.dim();
-
-	par.dim() = dim;
-	//lyxerr << "redoParagraph: " << par.rows().size() << " rows\n";
-
-	return !same;
-}
-
-
-void LyXText::metrics(MetricsInfo & mi, Dimension & dim)
-{
-	//BOOST_ASSERT(mi.base.textwidth);
-	if (mi.base.textwidth)
-		maxwidth_ = mi.base.textwidth;
-	//lyxerr << "LyXText::metrics: width: " << mi.base.textwidth
-	//	<< " maxWidth: " << maxwidth_ << "\nfont: " << mi.base.font << endl;
-	// save the caller's font locally:
-	font_ = mi.base.font;
-
-	unsigned int h = 0;
-	unsigned int w = 0;
-	for (pit_type pit = 0, n = paragraphs().size(); pit != n; ++pit) {
-		redoParagraph(*mi.base.bv, pit);
-		Paragraph & par = paragraphs()[pit];
-		h += par.height();
-		if (w < par.width())
-			w = par.width();
-	}
-
-	dim.wid = w;
-	dim.asc = pars_[0].ascent();
-	dim.des = h - dim.asc;
-
-	dim_ = dim;
-}
-
-
 // only used for inset right now. should also be used for main text
 void LyXText::draw(PainterInfo & pi, int x, int y) const
 {
@@ -1969,6 +1271,9 @@ void LyXText::drawSelection(PainterInfo & pi, int x, int) const
 
 	Paragraph const & par1 = pars_[beg.pit()];
 	Paragraph const & par2 = pars_[end.pit()];
+	TextMetrics const & tm = bv.textMetrics(this);
+	ParagraphMetrics const & pm1 = tm.parMetrics(beg.pit());
+	ParagraphMetrics const & pm2 = tm.parMetrics(end.pit());
 
 	bool const above = (bv_funcs::status(&bv, beg)
 			    == bv_funcs::CUR_ABOVE);
@@ -1979,15 +1284,15 @@ void LyXText::drawSelection(PainterInfo & pi, int x, int) const
 		y1 = 0;
 		y2 = 0;
 		x1 = 0;
-		x2 = dim_.wid;
+		x2 = tm.width();
 	} else {
-		Row const & row1 = par1.getRow(beg.pos(), beg.boundary());
+		Row const & row1 = pm1.getRow(beg.pos(), beg.boundary());
 		y1 = bv_funcs::getPos(bv, beg, beg.boundary()).y_ - row1.ascent();
 		y2 = y1 + row1.height();
-		int const startx = cursorX(buffer, beg.top(), beg.boundary());
+		int const startx = cursorX(bv, beg.top(), beg.boundary());
 		if (!isRTL(buffer, par1)) {
 			x1 = startx;
-			x2 = 0 + dim_.wid;
+			x2 = 0 + tm.width();
 		}
 		else {
 			x1 = 0;
@@ -2000,24 +1305,24 @@ void LyXText::drawSelection(PainterInfo & pi, int x, int) const
 		Y1 = bv.workHeight();
 		Y2 = bv.workHeight();
 		X1 = 0;
-		X2 = dim_.wid;
+		X2 = tm.width();
 	} else {
-		Row const & row2 = par2.getRow(end.pos(), end.boundary());
+		Row const & row2 = pm2.getRow(end.pos(), end.boundary());
 		Y1 = bv_funcs::getPos(bv, end, end.boundary()).y_ - row2.ascent();
 		Y2 = Y1 + row2.height();
-		int const endx = cursorX(buffer, end.top(), end.boundary());
+		int const endx = cursorX(bv, end.top(), end.boundary());
 		if (!isRTL(buffer, par2)) {
 			X1 = 0;
 			X2 = endx;
 		}
 		else {
 			X1 = endx;
-			X2 = 0 + dim_.wid;
+			X2 = 0 + tm.width();
 		}
 	}
 
-	if (!above && !below && &par1.getRow(beg.pos(), beg.boundary())
-	    == &par2.getRow(end.pos(), end.boundary()))
+	if (!above && !below && &pm1.getRow(beg.pos(), beg.boundary())
+	    == &pm2.getRow(end.pos(), end.boundary()))
 	{
 		// paint only one rectangle
 		int const b( !isRTL(*bv.buffer(), par1) ? x + x1 : x + X1 );
@@ -2028,7 +1333,7 @@ void LyXText::drawSelection(PainterInfo & pi, int x, int) const
 
 	if (lyxerr.debugging(Debug::DEBUG)) {
 		lyxerr[Debug::DEBUG] << " y1: " << y1 << " y2: " << y2
-			   << "X1:" << X1 << " x2: " << X2 << " wid: " << dim_.wid
+			   << "X1:" << X1 << " x2: " << X2 << " wid: " << tm.width()
 			<< endl;
 	}
 
@@ -2039,10 +1344,11 @@ void LyXText::drawSelection(PainterInfo & pi, int x, int) const
 	pi.pain.fillRectangle(x + X1, Y1, X2 - X1, Y2 - Y1,
 				      LColor::selection);
 	// paint center rectangle
-	pi.pain.fillRectangle(x, y2, dim_.wid,
+	pi.pain.fillRectangle(x, y2, tm.width(),
 			      Y1 - y2, LColor::selection);
 }
 
+
 bool LyXText::isLastRow(pit_type pit, Row const & row) const
 {
 	return row.endpos() >= pars_[pit].size()
@@ -2157,25 +1463,14 @@ bool LyXText::read(Buffer const & buf, LyXLex & lex, ErrorList & errorList)
 	return true;
 }
 
-
-int LyXText::ascent() const
-{
-	return dim_.asc;
-}
-
-
-int LyXText::descent() const
-{
-	return dim_.des;
-}
-
-
-int LyXText::cursorX(Buffer const & buffer, CursorSlice const & sl,
+int LyXText::cursorX(BufferView const & bv, CursorSlice const & sl,
 		bool boundary) const
 {
+	TextMetrics const & tm = bv.textMetrics(sl.text());
 	pit_type const pit = sl.pit();
 	Paragraph const & par = pars_[pit];
-	if (par.rows().empty())
+	ParagraphMetrics const & pm = tm.parMetrics(pit);
+	if (pm.rows().empty())
 		return 0;
 
 	pos_type ppos = sl.pos();
@@ -2184,11 +1479,12 @@ int LyXText::cursorX(Buffer const & buffer, CursorSlice const & sl,
 	if (boundary_correction)
 		--ppos;
 
-	Row const & row = par.getRow(sl.pos(), boundary);
+	Row const & row = pm.getRow(sl.pos(), boundary);
 
 	pos_type cursor_vpos = 0;
 
-	RowMetrics const m = computeRowMetrics(buffer, pit, row);
+	Buffer const & buffer = *bv.buffer();
+	RowMetrics const m = tm.computeRowMetrics(pit, row);
 	double x = m.x;
 
 	pos_type const row_pos  = row.pos();
@@ -2261,47 +1557,49 @@ int LyXText::cursorX(Buffer const & buffer, CursorSlice const & sl,
 }
 
 
-int LyXText::cursorY(CursorSlice const & sl, bool boundary) const
+int LyXText::cursorY(BufferView const & bv, CursorSlice const & sl, bool boundary) const
 {
 	//lyxerr << "LyXText::cursorY: boundary: " << boundary << std::endl;
-	Paragraph const & par = getPar(sl.pit());
-	if (par.rows().empty())
+	ParagraphMetrics const & pm = bv.parMetrics(this, sl.pit());
+	if (pm.rows().empty())
 		return 0;
 
 	int h = 0;
-	h -= pars_[0].rows()[0].ascent();
-	for (pit_type pit = 0; pit < sl.pit(); ++pit)
-		h += pars_[pit].height();
+	h -= bv.parMetrics(this, 0).rows()[0].ascent();
+	for (pit_type pit = 0; pit < sl.pit(); ++pit) {
+		h += bv.parMetrics(this, pit).height();
+	}
 	int pos = sl.pos();
 	if (pos && boundary)
 		--pos;
-	size_t const rend = par.pos2row(pos);
+	size_t const rend = pm.pos2row(pos);
 	for (size_t rit = 0; rit != rend; ++rit)
-		h += par.rows()[rit].height();
-	h += par.rows()[rend].ascent();
+		h += pm.rows()[rit].height();
+	h += pm.rows()[rend].ascent();
 	return h;
 }
 
 
 // Returns the current font and depth as a message.
-string LyXText::currentState(LCursor & cur)
+docstring LyXText::currentState(LCursor & cur)
 {
 	BOOST_ASSERT(this == cur.text());
 	Buffer & buf = cur.buffer();
 	Paragraph const & par = cur.paragraph();
-	std::ostringstream os;
+	odocstringstream os;
 
 	if (buf.params().trackChanges)
-		os << "[C] ";
+		os << _("[Change Tracking] ");
 
 	Change change = par.lookupChange(cur.pos());
 
 	if (change.type != Change::UNCHANGED) {
 		Author const & a = buf.params().authors().get(change.author);
-		os << to_utf8(_("Change: ")) << a.name();
+		os << _("Change: ") << a.name();
 		if (!a.email().empty())
 			os << " (" << a.email() << ")";
-		os << to_utf8(_(" at ")) << ctime(&change.changetime);
+		// FIXME ctime is english, we should translate that
+		os << _(" at ") << ctime(&change.changetime);
 		os << " : ";
 	}
 
@@ -2311,34 +1609,30 @@ string LyXText::currentState(LCursor & cur)
 	LyXFont font = real_current_font;
 	font.reduce(buf.params().getFont());
 
-	// avoid to_utf8(_(...)) re-entrance problem
-	string const s = font.stateText(&buf.params());
-	os << to_utf8(bformat(_("Font: %1$s"), from_utf8(s)));
-
-	// os << to_utf8(bformat(_("Font: %1$s"), font.stateText(&buf.params)));
+	os << bformat(_("Font: %1$s"), font.stateText(&buf.params()));
 
 	// The paragraph depth
 	int depth = cur.paragraph().getDepth();
 	if (depth > 0)
-		os << to_utf8(bformat(_(", Depth: %1$d"), depth));
+		os << bformat(_(", Depth: %1$d"), depth);
 
 	// The paragraph spacing, but only if different from
 	// buffer spacing.
 	Spacing const & spacing = par.params().spacing();
 	if (!spacing.isDefault()) {
-		os << to_utf8(_(", Spacing: "));
+		os << _(", Spacing: ");
 		switch (spacing.getSpace()) {
 		case Spacing::Single:
-			os << to_utf8(_("Single"));
+			os << _("Single");
 			break;
 		case Spacing::Onehalf:
-			os << to_utf8(_("OneHalf"));
+			os << _("OneHalf");
 			break;
 		case Spacing::Double:
-			os << to_utf8(_("Double"));
+			os << _("Double");
 			break;
 		case Spacing::Other:
-			os << to_utf8(_("Other (")) << spacing.getValueAsString() << ')';
+			os << _("Other (") << from_ascii(spacing.getValueAsString()) << ')';
 			break;
 		case Spacing::Default:
 			// should never happen, do nothing
@@ -2347,11 +1641,11 @@ string LyXText::currentState(LCursor & cur)
 	}
 
 #ifdef DEVEL_VERSION
-	os << to_utf8(_(", Inset: ")) << &cur.inset();
-	os << to_utf8(_(", Paragraph: ")) << cur.pit();
-	os << to_utf8(_(", Id: ")) << par.id();
-	os << to_utf8(_(", Position: ")) << cur.pos();
-	os << to_utf8(_(", Boundary: ")) << cur.boundary();
+	os << _(", Inset: ") << &cur.inset();
+	os << _(", Paragraph: ") << cur.pit();
+	os << _(", Id: ") << par.id();
+	os << _(", Position: ") << cur.pos();
+	os << _(", Boundary: ") << cur.boundary();
 //	Row & row = cur.textRow();
 //	os << bformat(_(", Row b:%1$d e:%2$d"), row.pos(), row.endpos());
 #endif
@@ -2412,49 +1706,15 @@ docstring LyXText::getPossibleLabel(LCursor & cur) const
 }
 
 
-//pos_type LyXText::x2pos(pit_type pit, int row, int x) const
-//{
-//	int lastx = 0;
-//	int currx = 0;
-//	Paragraph const & par = pars_[pit];
-//	Row const & r = par.rows()[row];
-//	int pos = r.pos();
-//	for (; currx < x && pos < r.endpos(); ++pos) {
-//		lastx = currx;
-//		currx += singleWidth(buffer, par, pos);
-//	}
-//	if (abs(lastx - x) < abs(currx - x) && pos != r.pos())
-//		--pos;
-//	return pos;
-//}
-
-
-pos_type LyXText::x2pos(BufferView const & bv, pit_type pit, int row,
-		int x) const
-{
-	BOOST_ASSERT(row < int(pars_[pit].rows().size()));
-	bool bound = false;
-	Row const & r = pars_[pit].rows()[row];
-	return r.pos() + getColumnNearX(bv, pit, r, x, bound);
-}
-
-
-//int LyXText::pos2x(pit_type pit, pos_type pos) const
-//{
-//	Paragraph const & par = pars_[pit];
-//	Row const & r = par.rows()[row];
-//	int x = 0;
-//	pos -= r.pos();
-//}
-
-
-// x,y are screen coordinates
-// sets cursor only within this LyXText
-bool LyXText::setCursorFromCoordinates(LCursor & cur, int const x, int const y)
+void LyXText::setCursorFromCoordinates(LCursor & cur, int const x, int const y)
 {
 	BOOST_ASSERT(this == cur.text());
 	pit_type pit = getPitNearY(cur.bv(), y);
-	int yy = cur.bv().coordCache().get(this, pit).y_ - pars_[pit].ascent();
+
+	TextMetrics const & tm = cur.bv().textMetrics(this);
+	ParagraphMetrics const & pm = tm.parMetrics(pit);
+
+	int yy = cur.bv().coordCache().get(this, pit).y_ - pm.ascent();
 	lyxerr[Debug::DEBUG]
 		<< BOOST_CURRENT_FUNCTION
 		<< ": x: " << x
@@ -2462,17 +1722,16 @@ bool LyXText::setCursorFromCoordinates(LCursor & cur, int const x, int const y)
 		<< " pit: " << pit
 		<< " yy: " << yy << endl;
 
-	Paragraph const & par = pars_[pit];
 	int r = 0;
-	BOOST_ASSERT(par.rows().size());
-	for (; r < int(par.rows().size()) - 1; ++r) {
-		Row const & row = par.rows()[r];
+	BOOST_ASSERT(pm.rows().size());
+	for (; r < int(pm.rows().size()) - 1; ++r) {
+		Row const & row = pm.rows()[r];
 		if (int(yy + row.height()) > y)
 			break;
 		yy += row.height();
 	}
 
-	Row const & row = par.rows()[r];
+	Row const & row = pm.rows()[r];
 
 	lyxerr[Debug::DEBUG]
 		<< BOOST_CURRENT_FUNCTION
@@ -2482,8 +1741,8 @@ bool LyXText::setCursorFromCoordinates(LCursor & cur, int const x, int const y)
 
 	bool bound = false;
 	int xx = x;
-	pos_type const pos = row.pos() + getColumnNearX(cur.bv(), pit, row,
-		xx, bound);
+	pos_type const pos = row.pos() 
+		+ tm.getColumnNearX(pit, row, xx, bound);
 
 	lyxerr[Debug::DEBUG]
 		<< BOOST_CURRENT_FUNCTION
@@ -2491,7 +1750,66 @@ bool LyXText::setCursorFromCoordinates(LCursor & cur, int const x, int const y)
 		<< " pos: " << pos
 		<< endl;
 
-	return setCursor(cur, pit, pos, true, bound);
+	setCursor(cur, pit, pos, true, bound);
+	// remember new position.
+	cur.setTargetX();
+}
+
+
+void LyXText::charsTranspose(LCursor & cur)
+{
+	BOOST_ASSERT(this == cur.text());
+
+	pos_type pos = cur.pos();
+
+	// If cursor is at beginning or end of paragraph, do nothing.
+	if (pos == cur.lastpos() || pos == 0)
+		return;
+
+	Paragraph & par = cur.paragraph();
+
+	// Get the positions of the characters to be transposed. 
+	pos_type pos1 = pos - 1;
+	pos_type pos2 = pos;
+
+	// In change tracking mode, ignore deleted characters.
+	while (pos2 < cur.lastpos() && par.isDeleted(pos2))
+		++pos2;
+	if (pos2 == cur.lastpos())
+		return;
+
+	while (pos1 >= 0 && par.isDeleted(pos1))
+		--pos1;
+	if (pos1 < 0)
+		return;
+
+	// Don't do anything if one of the "characters" is not regular text.
+	if (par.isInset(pos1) || par.isInset(pos2))
+		return;
+
+	// Store the characters to be transposed (including font information).
+	char_type char1 = par.getChar(pos1);
+	LyXFont const font1 =
+		par.getFontSettings(cur.buffer().params(), pos1);
+	
+	char_type char2 = par.getChar(pos2);
+	LyXFont const font2 =
+		par.getFontSettings(cur.buffer().params(), pos2);
+
+	// And finally, we are ready to perform the transposition.
+	// Track the changes if Change Tracking is enabled.
+	bool const trackChanges = cur.buffer().params().trackChanges;
+
+	recordUndo(cur);
+
+	par.eraseChar(pos2, trackChanges);
+	par.eraseChar(pos1, trackChanges);
+	par.insertChar(pos1, char2, font2, trackChanges);
+	par.insertChar(pos2, char1, font1, trackChanges);
+
+	// After the transposition, move cursor to after the transposition.
+	setCursor(cur, cur.pit(), pos2);
+	cur.forwardPos();
 }