X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftext.C;h=9a668d4bfc28e2c7a60e356628d520eba8b619b5;hb=f3a750ab9393d891e9f2610ce06874ce1d1353ee;hp=4d10a9d2c24c517f3447a809dcb3997631e5f683;hpb=f9c1cafbe6b7095bb520891de9b93a2495e3a9a8;p=lyx.git

diff --git a/src/text.C b/src/text.C
index 4d10a9d2c2..9a668d4bfc 100644
--- a/src/text.C
+++ b/src/text.C
@@ -1,5 +1,5 @@
 /**
- * \file text.C
+ * \file src/text.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -18,23 +18,29 @@
 
 #include "lyxtext.h"
 
+#include "author.h"
 #include "buffer.h"
 #include "bufferparams.h"
 #include "BufferView.h"
+#include "cursor.h"
 #include "debug.h"
+#include "dispatchresult.h"
 #include "encoding.h"
 #include "funcrequest.h"
 #include "gettext.h"
 #include "language.h"
+#include "LColor.h"
 #include "lyxlength.h"
+#include "lyxlex.h"
 #include "lyxrc.h"
 #include "lyxrow.h"
 #include "lyxrow_funcs.h"
+#include "metricsinfo.h"
+#include "paragraph.h"
 #include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
 #include "rowpainter.h"
-#include "text_funcs.h"
-#include "undo_funcs.h"
+#include "undo.h"
 #include "vspace.h"
 #include "WordLangTuple.h"
 
@@ -43,139 +49,145 @@
 
 #include "insets/insettext.h"
 
-#include "support/LAssert.h"
 #include "support/lstrings.h"
 #include "support/textutils.h"
+#include "support/tostr.h"
+#include "support/std_sstream.h"
 
+using lyx::pos_type;
+using lyx::word_location;
 
-using namespace lyx::support;
+using lyx::support::bformat;
+using lyx::support::contains;
+using lyx::support::lowercase;
+using lyx::support::split;
+using lyx::support::uppercase;
 
+using std::advance;
+using std::distance;
 using std::max;
+using std::min;
 using std::endl;
+using std::string;
 
-using lyx::pos_type;
-using lyx::word_location;
-
-using namespace bv_funcs;
 
-/// top, right, bottom pixel margin
-extern int const PAPER_MARGIN = 20;
+/// some space for drawing the 'nested' markers (in pixel)
+extern int const NEST_MARGIN = 20;
 /// margin for changebar
 extern int const CHANGEBAR_MARGIN = 10;
-/// left margin
-extern int const LEFT_MARGIN = PAPER_MARGIN + CHANGEBAR_MARGIN;
+/// right margin
+extern int const RIGHT_MARGIN = 10;
 
 
+namespace {
 
-int bibitemMaxWidth(BufferView *, LyXFont const &);
+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;
+}
 
 
-BufferView * LyXText::bv()
+unsigned int maxParagraphWidth(ParagraphList const & plist)
 {
-	Assert(bv_owner != 0);
-	return bv_owner;
+	unsigned int width = 0;
+	ParagraphList::const_iterator pit = plist.begin();
+	ParagraphList::const_iterator end = plist.end();
+		for (; pit != end; ++pit)
+			width = std::max(width, pit->width);
+	return width;
 }
 
 
-BufferView * LyXText::bv() const
+int numberOfLabelHfills(Paragraph const & par, Row const & row)
 {
-	Assert(bv_owner != 0);
-	return bv_owner;
+	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;
 }
 
 
-void LyXText::updateRowPositions()
+int numberOfHfills(Paragraph const & par, Row const & row)
 {
-	ParagraphList::iterator pit = ownerParagraphs().begin();
-	ParagraphList::iterator end = ownerParagraphs().end();
-	for (height = 0; pit != end; ++pit) {
-		RowList::iterator rit = pit->rows.begin();
-		RowList::iterator rend = pit->rows.end();
-		for ( ; rit != rend ; rit = ++rit) {
-			rit->y(height);
-			height += rit->height();
-		}
+	pos_type const 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;
 	}
+
+	first = max(first, par.beginOfBody());
+
+	int n = 0;
+	for (pos_type p = first; p < last; ++p) {
+		if (par.isHfill(p))
+			++n;
+	}
+	return n;
 }
 
+} // namespace anon
+
 
-int LyXText::workWidth() const
+BufferView * LyXText::bv()
 {
-	return inset_owner ? inset_owner->textWidth() : bv()->workWidth();
+	BOOST_ASSERT(bv_owner != 0);
+	return bv_owner;
 }
 
 
-int LyXText::getRealCursorX() const
+double LyXText::spacing(Paragraph const & par) const
 {
-	int x = cursor.x();
-	if (the_locking_inset && (the_locking_inset->getLyXText(bv())!= this))
-		x = the_locking_inset->getLyXText(bv())->getRealCursorX();
-	return x;
+	if (par.params().spacing().isDefault())
+		return bv()->buffer()->params().spacing().getValue();
+	return par.params().spacing().getValue();
 }
 
 
-#warning FIXME  This function seems to belong outside of LyxText.
-unsigned char LyXText::transformChar(unsigned char c, Paragraph const & par,
-				     pos_type pos) const
+BufferView * LyXText::bv() const
 {
-	if (!Encodings::is_arabic(c))
-		if (lyxrc.font_norm_type == LyXRC::ISO_8859_6_8 && IsDigit(c))
-			return c + (0xb0 - '0');
-		else
-			return c;
-
-	unsigned char const prev_char = pos > 0 ? par.getChar(pos - 1) : ' ';
-	unsigned char next_char = ' ';
+	BOOST_ASSERT(bv_owner != 0);
+	return bv_owner;
+}
 
-	pos_type const par_size = par.size();
 
-	for (pos_type i = pos + 1; i < par_size; ++i) {
-		unsigned char const par_char = par.getChar(i);
-		if (!Encodings::IsComposeChar_arabic(par_char)) {
-			next_char = par_char;
-			break;
-		}
+void LyXText::updateParPositions()
+{
+	ParagraphList::iterator pit = paragraphs().begin();
+	ParagraphList::iterator end = paragraphs().end();
+	for (height = 0; pit != end; ++pit) {
+		pit->y = height;
+		height += pit->height;
 	}
+}
 
-	if (Encodings::is_arabic(next_char)) {
-		if (Encodings::is_arabic(prev_char) &&
-			!Encodings::is_arabic_special(prev_char))
-			return Encodings::TransformChar(c, Encodings::FORM_MEDIAL);
-		else
-			return Encodings::TransformChar(c, Encodings::FORM_INITIAL);
-	} else {
-		if (Encodings::is_arabic(prev_char) &&
-			!Encodings::is_arabic_special(prev_char))
-			return Encodings::TransformChar(c, Encodings::FORM_FINAL);
-		else
-			return Encodings::TransformChar(c, Encodings::FORM_ISOLATED);
-	}
+
+int LyXText::textWidth() const
+{
+	return textwidth_;
 }
 
-// This is the comments that some of the warnings below refers to.
-// There are some issues in this file and I don't think they are
-// really related to the FIX_DOUBLE_SPACE patch. I'd rather think that
-// this is a problem that has been here almost from day one and that a
-// larger userbase with differenct access patters triggers the bad
-// behaviour. (segfaults.) What I think happen is: In several places
-// we store the paragraph in the current cursor and then moves the
-// cursor. This movement of the cursor will delete paragraph at the
-// old position if it is now empty. This will make the temporary
-// pointer to the old cursor paragraph invalid and dangerous to use.
-// And is some cases this will trigger a segfault. I have marked some
-// of the cases where this happens with a warning, but I am sure there
-// are others in this file and in text2.C. There is also a note in
-// Delete() that you should read. In Delete I store the paragraph->id
-// instead of a pointer to the paragraph. I am pretty sure this faulty
-// use of temporary pointers to paragraphs that might have gotten
-// invalidated (through a cursor movement) before they are used, are
-// the cause of the strange crashes we get reported often.
-//
-// It is very tiresom to change this code, especially when it is as
-// hard to read as it is. Help to fix all the cases where this is done
-// would be greately appreciated.
-//
-// Lgb
 
 int LyXText::singleWidth(ParagraphList::iterator pit, pos_type pos) const
 {
@@ -183,8 +195,7 @@ int LyXText::singleWidth(ParagraphList::iterator pit, pos_type pos) const
 		return 0;
 
 	char const c = pit->getChar(pos);
-	LyXFont const & font = getFont(pit, pos);
-	return singleWidth(pit, pos, c, font);
+	return singleWidth(pit, pos, c, getFont(pit, pos));
 }
 
 
@@ -193,21 +204,20 @@ int LyXText::singleWidth(ParagraphList::iterator pit,
 {
 	if (pos >= pit->size()) {
 		lyxerr << "in singleWidth(), pos: " << pos << endl;
-		Assert(false);
+		BOOST_ASSERT(false);
 		return 0;
 	}
 
-
 	// The most common case is handled first (Asger)
 	if (IsPrintable(c)) {
-		if (font.language()->RightToLeft()) {
+		if (!font.language()->RightToLeft()) {
 			if ((lyxrc.font_norm_type == LyXRC::ISO_8859_6_8 ||
 			     lyxrc.font_norm_type == LyXRC::ISO_10646_1)
 			    && font.language()->lang() == "arabic") {
 				if (Encodings::IsComposeChar_arabic(c))
 					return 0;
 				else
-					c = transformChar(c, *pit, pos);
+					c = pit->transformChar(c, pos);
 			} else if (font.language()->lang() == "hebrew" &&
 				 Encodings::IsComposeChar_hebrew(c))
 				return 0;
@@ -215,15 +225,8 @@ int LyXText::singleWidth(ParagraphList::iterator pit,
 		return font_metrics::width(c, font);
 	}
 
-	if (c == Paragraph::META_INSET) {
-		InsetOld * tmpinset = pit->getInset(pos);
-		Assert(tmpinset);
-		if (tmpinset->lyxCode() == InsetOld::HFILL_CODE) {
-			// Because of the representation as vertical lines
-			return 3;
-		}
-		return tmpinset->width();
-	}
+	if (c == Paragraph::META_INSET)
+		return pit->getInset(pos)->width();
 
 	if (IsSeparatorChar(c))
 		c = ' ';
@@ -231,204 +234,13 @@ int LyXText::singleWidth(ParagraphList::iterator pit,
 }
 
 
-lyx::pos_type LyXText::log2vis(lyx::pos_type pos) const
-{
-	if (bidi_start == -1)
-		return pos;
-	else
-		return log2vis_list[pos - bidi_start];
-}
-
-
-lyx::pos_type LyXText::vis2log(lyx::pos_type pos) const
-{
-	if (bidi_start == -1)
-		return pos;
-	else
-		return vis2log_list[pos - bidi_start];
-}
-
-
-lyx::pos_type LyXText::bidi_level(lyx::pos_type pos) const
-{
-	if (bidi_start == -1)
-		return 0;
-	else
-		return bidi_levels[pos - bidi_start];
-}
-
-
-bool LyXText::bidi_InRange(lyx::pos_type pos) const
-{
-	return bidi_start == -1 ||
-		(bidi_start <= pos && pos <= bidi_end);
-}
-
-
-void LyXText::computeBidiTables(ParagraphList::iterator pit,
-   Buffer const & buf, RowList::iterator row) const
-{
-	bidi_same_direction = true;
-	if (!lyxrc.rtl_support) {
-		bidi_start = -1;
-		return;
-	}
-
-	InsetOld * inset = pit->inInset();
-	if (inset && inset->owner() &&
-	    inset->owner()->lyxCode() == InsetOld::ERT_CODE) {
-		bidi_start = -1;
-		return;
-	}
-
-	bidi_start = row->pos();
-	bidi_end = lastPos(*pit, row);
-
-	if (bidi_start > bidi_end) {
-		bidi_start = -1;
-		return;
-	}
-
-	if (bidi_end + 2 - bidi_start >
-	    static_cast<pos_type>(log2vis_list.size())) {
-		pos_type new_size =
-			(bidi_end + 2 - bidi_start < 500) ?
-			500 : 2 * (bidi_end + 2 - bidi_start);
-		log2vis_list.resize(new_size);
-		vis2log_list.resize(new_size);
-		bidi_levels.resize(new_size);
-	}
-
-	vis2log_list[bidi_end + 1 - bidi_start] = -1;
-	log2vis_list[bidi_end + 1 - bidi_start] = -1;
-
-	BufferParams const & bufparams = buf.params();
-	pos_type stack[2];
-	bool const rtl_par =
-		pit->isRightToLeftPar(bufparams);
-	int level = 0;
-	bool rtl = false;
-	bool rtl0 = false;
-	pos_type const body_pos = pit->beginningOfBody();
-
-	for (pos_type lpos = bidi_start; lpos <= bidi_end; ++lpos) {
-		bool is_space = pit->isLineSeparator(lpos);
-		pos_type const pos =
-			(is_space && lpos + 1 <= bidi_end &&
-			 !pit->isLineSeparator(lpos + 1) &&
-			 !pit->isNewline(lpos + 1))
-			? lpos + 1 : lpos;
-		LyXFont font = pit->getFontSettings(bufparams, pos);
-		if (pos != lpos && 0 < lpos && rtl0 && font.isRightToLeft() &&
-		    font.number() == LyXFont::ON &&
-		    pit->getFontSettings(bufparams, lpos - 1).number()
-		    == LyXFont::ON) {
-			font = pit->getFontSettings(bufparams, lpos);
-			is_space = false;
-		}
-
-
-		bool new_rtl = font.isVisibleRightToLeft();
-		bool new_rtl0 = font.isRightToLeft();
-		int new_level;
-
-		if (lpos == body_pos - 1
-		    && row->pos() < body_pos - 1
-		    && is_space) {
-			new_level = (rtl_par) ? 1 : 0;
-			new_rtl = new_rtl0 = rtl_par;
-		} else if (new_rtl0)
-			new_level = (new_rtl) ? 1 : 2;
-		else
-			new_level = (rtl_par) ? 2 : 0;
-
-		if (is_space && new_level >= level) {
-			new_level = level;
-			new_rtl = rtl;
-			new_rtl0 = rtl0;
-		}
-
-		int new_level2 = new_level;
-
-		if (level == new_level && rtl0 != new_rtl0) {
-			--new_level2;
-			log2vis_list[lpos - bidi_start] = (rtl) ? 1 : -1;
-		} else if (level < new_level) {
-			log2vis_list[lpos - bidi_start] =  (rtl) ? -1 : 1;
-			if (new_level > rtl_par)
-				bidi_same_direction = false;
-		} else
-			log2vis_list[lpos - bidi_start] = (new_rtl) ? -1 : 1;
-		rtl = new_rtl;
-		rtl0 = new_rtl0;
-		bidi_levels[lpos - bidi_start] = new_level;
-
-		while (level > new_level2) {
-			pos_type old_lpos = stack[--level];
-			int delta = lpos - old_lpos - 1;
-			if (level % 2)
-				delta = -delta;
-			log2vis_list[lpos - bidi_start] += delta;
-			log2vis_list[old_lpos - bidi_start] += delta;
-		}
-		while (level < new_level)
-			stack[level++] = lpos;
-	}
-
-	while (level > 0) {
-		pos_type const old_lpos = stack[--level];
-		int delta = bidi_end - old_lpos;
-		if (level % 2)
-			delta = -delta;
-		log2vis_list[old_lpos - bidi_start] += delta;
-	}
-
-	pos_type vpos = bidi_start - 1;
-	for (pos_type lpos = bidi_start;
-	     lpos <= bidi_end; ++lpos) {
-		vpos += log2vis_list[lpos - bidi_start];
-		vis2log_list[vpos - bidi_start] = lpos;
-		log2vis_list[lpos - bidi_start] = vpos;
-	}
-}
-
-
-// This method requires a previous call to ComputeBidiTables()
-bool LyXText::isBoundary(Buffer const & buf, Paragraph const & par,
-			 pos_type pos) const
-{
-	if (!lyxrc.rtl_support || pos == 0)
-		return false;
-
-	if (!bidi_InRange(pos - 1)) {
-		/// This can happen if pos is the first char of a row.
-		/// Returning false in this case is incorrect!
-		return false;
-	}
-
-	bool const rtl = bidi_level(pos - 1) % 2;
-	bool const rtl2 = bidi_InRange(pos)
-		? bidi_level(pos) % 2
-		: par.isRightToLeftPar(buf.params());
-	return rtl != rtl2;
-}
-
-
-bool LyXText::isBoundary(Buffer const & buf, Paragraph const & par,
-			 pos_type pos, LyXFont const & font) const
+int LyXText::leftMargin(ParagraphList::iterator pit) const
 {
-	if (!lyxrc.rtl_support)
-		return false;    // This is just for speedup
-
-	bool const rtl = font.isVisibleRightToLeft();
-	bool const rtl2 = bidi_InRange(pos)
-		? bidi_level(pos) % 2
-		: par.isRightToLeftPar(buf.params());
-	return rtl != rtl2;
+	return leftMargin(pit, pit->size());
 }
 
 
-int LyXText::leftMargin(ParagraphList::iterator pit, Row const & row) const
+int LyXText::leftMargin(ParagraphList::iterator pit, pos_type pos) const
 {
 	LyXTextClass const & tclass =
 		bv()->buffer()->params().getLyXTextClass();
@@ -436,57 +248,50 @@ int LyXText::leftMargin(ParagraphList::iterator pit, Row const & row) const
 
 	string parindent = layout->parindent;
 
-	int x = LEFT_MARGIN;
+	int x = NEST_MARGIN + CHANGEBAR_MARGIN;
 
 	x += font_metrics::signedWidth(tclass.leftmargin(), tclass.defaultfont());
 
-	// this is the way, LyX handles the LaTeX-Environments.
+	// This is the way LyX handles LaTeX-Environments.
 	// I have had this idea very late, so it seems to be a
 	// later added hack and this is true
-	if (!pit->getDepth()) {
+	if (pit->getDepth() == 0) {
 		if (pit->layout() == tclass.defaultLayout()) {
 			// find the previous same level paragraph
-			if (pit != ownerParagraphs().begin()) {
+			if (pit != paragraphs().begin()) {
 				ParagraphList::iterator newpit =
-					depthHook(pit, ownerParagraphs(),
-						  pit->getDepth());
-				if (newpit == pit &&
-				    newpit->layout()->nextnoindent)
+					depthHook(pit, paragraphs(), pit->getDepth());
+				if (newpit == pit && newpit->layout()->nextnoindent)
 					parindent.erase();
 			}
 		}
 	} else {
 		// find the next level paragraph
-
-		ParagraphList::iterator newpar = outerHook(pit,
-							   ownerParagraphs());
-
-		// make a corresponding row. Needed to call leftMargin()
-
-		// check wether it is a sufficent paragraph
-		if (newpar != ownerParagraphs().end() &&
-		    newpar->layout()->isEnvironment()) {
-			x = leftMargin(newpar, Row(newpar->size()));
+		ParagraphList::iterator newpar =
+			outerHook(pit, paragraphs());
+
+		// Make a corresponding row. Need to call leftMargin()
+		// to check whether it is a sufficent paragraph.
+		if (newpar != paragraphs().end()
+		    && newpar->layout()->isEnvironment()) {
+			x = leftMargin(newpar);
 		}
 
-		if (newpar != ownerParagraphs().end() &&
-		    pit->layout() == tclass.defaultLayout()) {
+		if (newpar != paragraphs().end()
+		    && pit->layout() == tclass.defaultLayout()) {
 			if (newpar->params().noindent())
 				parindent.erase();
-			else {
+			else
 				parindent = newpar->layout()->parindent;
-			}
-
 		}
 	}
 
 	LyXFont const labelfont = getLabelFont(pit);
 	switch (layout->margintype) {
 	case MARGIN_DYNAMIC:
-		if (!layout->leftmargin.empty()) {
+		if (!layout->leftmargin.empty())
 			x += font_metrics::signedWidth(layout->leftmargin,
 						  tclass.defaultfont());
-		}
 		if (!pit->getLabelstring().empty()) {
 			x += font_metrics::signedWidth(layout->labelindent,
 						  labelfont);
@@ -495,10 +300,11 @@ int LyXText::leftMargin(ParagraphList::iterator pit, Row const & row) const
 			x += font_metrics::width(layout->labelsep, labelfont);
 		}
 		break;
+
 	case MARGIN_MANUAL:
 		x += font_metrics::signedWidth(layout->labelindent, labelfont);
 		// The width of an empty par, even with manual label, should be 0
-		if (!pit->empty() && row.pos() >= pit->beginningOfBody()) {
+		if (!pit->empty() && pos >= pit->beginOfBody()) {
 			if (!pit->getLabelWidthString().empty()) {
 				x += font_metrics::width(pit->getLabelWidthString(),
 					       labelfont);
@@ -506,25 +312,27 @@ int LyXText::leftMargin(ParagraphList::iterator pit, Row const & row) const
 			}
 		}
 		break;
+
 	case MARGIN_STATIC:
 		x += font_metrics::signedWidth(layout->leftmargin, tclass.defaultfont()) * 4
 			/ (pit->getDepth() + 4);
 		break;
+
 	case MARGIN_FIRST_DYNAMIC:
 		if (layout->labeltype == LABEL_MANUAL) {
-			if (row.pos() >= pit->beginningOfBody()) {
+			if (pos >= pit->beginOfBody()) {
 				x += font_metrics::signedWidth(layout->leftmargin,
 							  labelfont);
 			} else {
 				x += font_metrics::signedWidth(layout->labelindent,
 							  labelfont);
 			}
-		} else if (row.pos()
+		} else if (pos != 0
 			   // Special case to fix problems with
 			   // theorems (JMarc)
 			   || (layout->labeltype == LABEL_STATIC
 			       && layout->latextype == LATEX_ENVIRONMENT
-			       && !isFirstInSequence(pit, ownerParagraphs()))) {
+			       && !isFirstInSequence(pit, paragraphs()))) {
 			x += font_metrics::signedWidth(layout->leftmargin,
 						  labelfont);
 		} else if (layout->labeltype != LABEL_TOP_ENVIRONMENT
@@ -539,33 +347,29 @@ int LyXText::leftMargin(ParagraphList::iterator pit, Row const & row) const
 		}
 		break;
 
-	case MARGIN_RIGHT_ADDRESS_BOX:
-	{
+	case MARGIN_RIGHT_ADDRESS_BOX: {
+#if 0
 		// ok, a terrible hack. The left margin depends on the widest
-		// row in this paragraph. Do not care about footnotes, they
-		// are *NOT* allowed in the LaTeX realisation of this layout.
-
-		// find the first row of this paragraph
+		// row in this paragraph.
 		RowList::iterator rit = pit->rows.begin();
 		RowList::iterator end = pit->rows.end();
-		int minfill = rit->fill();
+#warning This is wrong.
+		int minfill = textwidth_;
 		for ( ; rit != end; ++rit)
 			if (rit->fill() < minfill)
 				minfill = rit->fill();
-
 		x += font_metrics::signedWidth(layout->leftmargin,
 			tclass.defaultfont());
 		x += minfill;
+#endif
+		// also wrong, but much shorter.
+		x += textwidth_ / 2;
+		break;
 	}
-	break;
 	}
 
-	if (workWidth() > 0 && !pit->params().leftIndent().zero()) {
-		LyXLength const len = pit->params().leftIndent();
-		int const tw = inset_owner ?
-			inset_owner->latexTextWidth(bv()) : workWidth();
-		x += len.inPixels(tw);
-	}
+	if (!pit->params().leftIndent().zero())
+		x += pit->params().leftIndent().inPixels(textWidth());
 
 	LyXAlignment align;
 
@@ -575,61 +379,52 @@ int LyXText::leftMargin(ParagraphList::iterator pit, Row const & row) const
 		align = pit->params().align();
 
 	// set the correct parindent
-	if (row.pos() == 0) {
-		if ((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, ownerParagraphs())))
-		    && align == LYX_ALIGN_BLOCK
-		    && !pit->params().noindent()
-			// in tabulars and ert paragraphs are never indented!
-			&& (!pit->inInset() || !pit->inInset()->owner() ||
-				(pit->inInset()->owner()->lyxCode() != InsetOld::TABULAR_CODE &&
-				 pit->inInset()->owner()->lyxCode() != InsetOld::ERT_CODE))
-		    && (pit->layout() != tclass.defaultLayout() ||
-			bv()->buffer()->params().paragraph_separation ==
-			BufferParams::PARSEP_INDENT)) {
-			x += font_metrics::signedWidth(parindent,
-						  tclass.defaultfont());
-		} else if (layout->labeltype == LABEL_BIBLIO) {
-			// ale970405 Right width for bibitems
-			x += bibitemMaxWidth(bv(), tclass.defaultfont());
-		}
+	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, paragraphs())))
+	    && align == LYX_ALIGN_BLOCK
+	    && !pit->params().noindent()
+	    // in tabulars and ert paragraphs are never indented!
+	    && (!pit->inInset()
+	        || !pit->inInset()->owner()
+	        || (pit->inInset()->owner()->lyxCode() != InsetOld::TABULAR_CODE
+	            && pit->inInset()->owner()->lyxCode() != InsetOld::ERT_CODE))
+	    && (pit->layout() != tclass.defaultLayout()
+	        || bv()->buffer()->params().paragraph_separation ==
+	           BufferParams::PARSEP_INDENT))
+	{
+		x += font_metrics::signedWidth(parindent, tclass.defaultfont());
 	}
 
 	return x;
 }
 
 
-int LyXText::rightMargin(ParagraphList::iterator pit,
-	Buffer const & buf, Row const &) const
+int LyXText::rightMargin(Paragraph const & par) const
 {
-	LyXTextClass const & tclass = buf.params().getLyXTextClass();
-	LyXLayout_ptr const & layout = pit->layout();
+	LyXTextClass const & tclass = bv()->buffer()->params().getLyXTextClass();
 
-	return PAPER_MARGIN
+	return
+		RIGHT_MARGIN
 		+ font_metrics::signedWidth(tclass.rightmargin(),
-				       tclass.defaultfont());
-		+ font_metrics::signedWidth(layout->rightmargin,
 				       tclass.defaultfont())
-		* 4 / (pit->getDepth() + 4);
+		+ font_metrics::signedWidth(par.layout()->rightmargin,
+				       tclass.defaultfont())
+		* 4 / (par.getDepth() + 4);
 }
 
 
-int LyXText::labelEnd(ParagraphList::iterator pit, Row const & row) const
+int LyXText::labelEnd(ParagraphList::iterator pit) const
 {
-	if (pit->layout()->margintype == MARGIN_MANUAL) {
-		Row tmprow = row;
-		tmprow.pos(pit->size());
-		// return the beginning of the body
-		return leftMargin(pit, tmprow);
-	}
-
-	// LabelEnd is only needed if the layout
-	// fills a flushleft label.
-	return 0;
+	// labelEnd is only needed if the layout fills a flushleft label.
+	if (pit->layout()->margintype != MARGIN_MANUAL)
+		return 0;
+	// return the beginning of the body
+	return leftMargin(pit);
 }
 
 
@@ -638,171 +433,164 @@ namespace {
 // this needs special handling - only newlines count as a break point
 pos_type addressBreakPoint(pos_type i, Paragraph const & par)
 {
-	for (; i < par.size(); ++i) {
+	pos_type const end = par.size();
+
+	for (; i < end; ++i)
 		if (par.isNewline(i))
-			return i;
-	}
+			return i + 1;
 
-	return par.size();
+	return end;
 }
 
 };
 
 
-pos_type LyXText::rowBreakPoint(ParagraphList::iterator pit,
-	Row const & row) const
+void LyXText::rowBreakPoint(ParagraphList::iterator pit, Row & row) const
 {
-	// maximum pixel width of a row.
-	int width = workWidth()
-		- rightMargin(pit, *bv()->buffer(), row);
+	pos_type const end = pit->size();
+	pos_type const pos = row.pos();
+	if (pos == end) {
+		row.endpos(end);
+		return;
+	}
 
-	// inset->textWidth() returns -1 via workWidth(),
-	// but why ?
-	if (width < 0)
-		return pit->size();
+	// maximum pixel width of a row
+	int width = textWidth() - rightMargin(*pit); // - leftMargin(pit, row);
+	if (width < 0) {
+		row.endpos(end);
+		return;
+	}
 
 	LyXLayout_ptr const & layout = pit->layout();
 
-	if (layout->margintype == MARGIN_RIGHT_ADDRESS_BOX)
-		return addressBreakPoint(row.pos(), *pit);
+	if (layout->margintype == MARGIN_RIGHT_ADDRESS_BOX) {
+		row.endpos(addressBreakPoint(pos, *pit));
+		return;
+	}
 
-	pos_type const pos = row.pos();
-	pos_type const body_pos = pit->beginningOfBody();
-	pos_type const last = pit->size();
-	pos_type point = last;
+	pos_type const body_pos = pit->beginOfBody();
 
-	if (pos == last)
-		return last;
 
 	// 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(pit, row);
+	int const left = leftMargin(pit, pos);
 	int x = left;
 
 	// pixel width since last breakpoint
 	int chunkwidth = 0;
 
-	pos_type i = pos;
 
 	// We re-use the font resolution for the entire font span when possible
-	LyXFont font = getFont(pit, i);
-	lyx::pos_type endPosOfFontSpan = pit->getEndPosOfFontSpan(i);
+	LyXFont font = getFont(pit, pos);
+	lyx::pos_type endPosOfFontSpan = pit->getEndPosOfFontSpan(pos);
 
-	for (; i < last; ++i) {
+	pos_type point = end;
+	pos_type i = pos;
+	for ( ; i < end; ++i) {
 		if (pit->isNewline(i)) {
-			point = i;
+			point = i + 1;
 			break;
 		}
+		// Break before...
+		if (i + 1 < end) {
+			if (pit->isInset(i + 1) && pit->getInset(i + 1)->display()) {
+				point = i + 1;
+				break;
+			}
+			// ...and after.
+			if (pit->isInset(i) && pit->getInset(i)->display()) {
+				point = i + 1;
+				break;
+			}
+		}
 
 		char const c = pit->getChar(i);
+
 		if (i > endPosOfFontSpan) {
 			font = getFont(pit, i);
 			endPosOfFontSpan = pit->getEndPosOfFontSpan(i);
 		}
 
-		int thiswidth;
-
-		// add the auto-hfill from label end to the body
-		if (body_pos && i == body_pos) {
-			thiswidth = font_metrics::width(layout->labelsep, getLabelFont(pit));
-			if (pit->isLineSeparator(i - 1))
-				thiswidth -= singleWidth(pit, i - 1);
-			int left_margin = labelEnd(pit, row);
-			if (thiswidth + x < left_margin)
-				thiswidth = left_margin - x;
-			thiswidth += singleWidth(pit, i, c, font);
-		} else {
-			thiswidth = singleWidth(pit, i, c, font);
-		}
+		{
+			int thiswidth = singleWidth(pit, i, c, font);
 
-		x += thiswidth;
-		chunkwidth += thiswidth;
+			// add the auto-hfill from label end to the body
+			if (body_pos && i == body_pos) {
+				int add = font_metrics::width(layout->labelsep, getLabelFont(pit));
+				if (pit->isLineSeparator(i - 1))
+					add -= singleWidth(pit, i - 1);
+
+				add = std::max(add, labelEnd(pit) - x);
+				thiswidth += add;
+			}
 
-		InsetOld * in = pit->isInset(i) ? pit->getInset(i) : 0;
+			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 == last || chunkwidth >= (width - left)) {
-				if (pos < i)
-					point = i - 1;
-				else
+			if (point == end || chunkwidth >= width - left) {
+				if (i > pos)
 					point = i;
+				else
+					point = i + 1;
+
 			}
+			// exit on last registered breakpoint:
 			break;
 		}
 
-		if (!in || in->isChar()) {
+		if (!pit->isInset(i) || pit->getInset(i)->isChar()) {
 			// some insets are line separators too
 			if (pit->isLineSeparator(i)) {
-				point = i;
+				// register breakpoint:
+				point = i + 1;
 				chunkwidth = 0;
 			}
-			continue;
 		}
-
-		continue;
 	}
 
-	if (point == last && x >= width) {
-		// didn't find one, break at the point we reached the edge
-		point = i;
-	} else if (i == last && x < width) {
-		// found one, but we fell off the end of the par, so prefer
-		// that.
-		point = last;
+	if (i == end && x < width) {
+		// maybe found one, but the par is short enough.
+		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 - 1;
+		point = body_pos;
 
-	return point;
+	row.endpos(point);
 }
 
 
-// returns the minimum space a row needs on the screen in pixel
-int LyXText::fill(ParagraphList::iterator pit,
-	RowList::iterator row, int paper_width) const
+void LyXText::setRowWidth(ParagraphList::iterator pit, Row & row) const
 {
-	if (paper_width < 0)
-		return 0;
-
-	int w;
 	// get the pure distance
-	pos_type const last = lastPos(*pit, row);
+	pos_type const end = row.endpos();
 
-	LyXLayout_ptr const & layout = pit->layout();
-
-	// special handling of the right address boxes
-	if (layout->margintype == MARGIN_RIGHT_ADDRESS_BOX) {
-		int const tmpfill = row->fill();
-		row->fill(0); // the minfill in MarginLeft()
-		w = leftMargin(pit, *row);
-		row->fill(tmpfill);
-	} else
-		w = leftMargin(pit, *row);
+	string labelsep = pit->layout()->labelsep;
+	int w = leftMargin(pit, row.pos());
 
-	pos_type const body_pos = pit->beginningOfBody();
-	pos_type i = row->pos();
+	pos_type const body_pos = pit->beginOfBody();
+	pos_type i = row.pos();
 
-	if (! pit->empty() && i <= last) {
+	if (i < end) {
 		// We re-use the font resolution for the entire span when possible
 		LyXFont font = getFont(pit, i);
 		lyx::pos_type endPosOfFontSpan = pit->getEndPosOfFontSpan(i);
-		while (i <= last) {
+		for ( ; i < end; ++i) {
 			if (body_pos > 0 && i == body_pos) {
-				w += font_metrics::width(layout->labelsep, getLabelFont(pit));
+				w += font_metrics::width(labelsep, getLabelFont(pit));
 				if (pit->isLineSeparator(i - 1))
 					w -= singleWidth(pit, i - 1);
-				int left_margin = labelEnd(pit, *row);
-				if (w < left_margin)
-					w = left_margin;
+				w = max(w, labelEnd(pit));
 			}
 			char const c = pit->getChar(i);
 			if (IsPrintable(c) && i > endPosOfFontSpan) {
@@ -811,45 +599,28 @@ int LyXText::fill(ParagraphList::iterator pit,
 				endPosOfFontSpan = pit->getEndPosOfFontSpan(i);
 			}
 			w += singleWidth(pit, i, c, font);
-			++i;
 		}
 	}
-	if (body_pos > 0 && body_pos > last) {
-		w += font_metrics::width(layout->labelsep, getLabelFont(pit));
-		if (last >= 0 && pit->isLineSeparator(last))
-			w -= singleWidth(pit, last);
-		int const left_margin = labelEnd(pit, *row);
-		if (w < left_margin)
-			w = left_margin;
-	}
 
-	int const fill = paper_width - w - rightMargin(pit, *bv()->buffer(), *row);
-
-	// If this case happens, it means that our calculation
-	// of the widths of the chars when we do rowBreakPoint()
-	// went wrong for some reason. Typically in list bodies.
-	// Things just about hobble on anyway, though you'll end
-	// up with a "fill_separator" less than zero, which corresponds
-	// to inter-word spacing being too small. Hopefully this problem
-	// will die when the label hacks die.
-	if (lyxerr.debugging() && fill < 0) {
-		lyxerr[Debug::GUI] << "Eek, fill() was < 0: " << fill
-			<< " w " << w << " paper_width " << paper_width
-			<< " right margin " << rightMargin(pit, *bv()->buffer(), *row) << endl;
+	if (body_pos > 0 && body_pos >= end) {
+		w += font_metrics::width(labelsep, getLabelFont(pit));
+		if (end > 0 && pit->isLineSeparator(end - 1))
+			w -= singleWidth(pit, end - 1);
+		w = max(w, labelEnd(pit));
 	}
-	return fill;
+
+	row.width(w + rightMargin(*pit));
 }
 
 
 // returns the minimum space a manual label needs on the screen in pixel
 int LyXText::labelFill(ParagraphList::iterator pit, Row const & row) const
 {
-	pos_type last = pit->beginningOfBody();
+	pos_type last = pit->beginOfBody();
 
-	Assert(last > 0);
+	BOOST_ASSERT(last > 0);
 
-	// -1 because a label ends either with a space that is in the label,
-	// or with the beginning of a footnote that is outside the label.
+	// -1 because a label ends with a space that is in the label
 	--last;
 
 	// a separator at this end does not count
@@ -857,49 +628,40 @@ int LyXText::labelFill(ParagraphList::iterator pit, Row const & row) const
 		--last;
 
 	int w = 0;
-	pos_type i = row.pos();
-	while (i <= last) {
+	for (pos_type i = row.pos(); i <= last; ++i)
 		w += singleWidth(pit, i);
-		++i;
-	}
 
-	int fill = 0;
-	string const & labwidstr = pit->params().labelWidthString();
-	if (!labwidstr.empty()) {
-		LyXFont const labfont = getLabelFont(pit);
-		int const labwidth = font_metrics::width(labwidstr, labfont);
-		fill = max(labwidth - w, 0);
-	}
+	string const & label = pit->params().labelWidthString();
+	if (label.empty())
+		return 0;
 
-	return fill;
+	return max(0, font_metrics::width(label, getLabelFont(pit)) - w);
 }
 
 
-LColor::color LyXText::backgroundColor() const
+LColor_color LyXText::backgroundColor() const
 {
-	if (inset_owner)
-		return inset_owner->backgroundColor();
-	else
-		return LColor::background;
+	return LColor_color(LColor::color(background_color_));
 }
 
 
-void LyXText::setHeightOfRow(ParagraphList::iterator pit, RowList::iterator rit)
+void LyXText::setHeightOfRow(ParagraphList::iterator pit, Row & row)
 {
 	// get the maximum ascent and the maximum descent
 	double layoutasc = 0;
 	double layoutdesc = 0;
-	double tmptop = 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 = pit->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.
-	LyXFont font = getFont(pit, rit->pos());
+	// 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.
+	LyXFont font = getFont(pit, row.pos());
 	LyXFont::FONT_SIZE const tmpsize = font.size();
 	font = getLayoutFont(pit);
 	LyXFont::FONT_SIZE const size = font.size();
@@ -907,77 +669,33 @@ void LyXText::setHeightOfRow(ParagraphList::iterator pit, RowList::iterator rit)
 
 	LyXFont labelfont = getLabelFont(pit);
 
-	double spacing_val = 1.0;
-	if (!pit->params().spacing().isDefault())
-		spacing_val = pit->params().spacing().getValue();
-	else
-		spacing_val = bv()->buffer()->params().spacing().getValue();
+	// these are minimum values
+	double const spacing_val = layout->spacing.getValue() * spacing(*pit);
 	//lyxerr << "spacing_val = " << spacing_val << endl;
-
-	int maxasc  = int(font_metrics::maxAscent(font) *
-	                  layout->spacing.getValue() * spacing_val);
-	int maxdesc = int(font_metrics::maxDescent(font) *
-	                  layout->spacing.getValue() * spacing_val);
-
-	pos_type const pos_end = lastPos(*pit, rit);
-	int labeladdon = 0;
-	int maxwidth = 0;
-
-	if (!pit->empty()) {
-		// We re-use the font resolution for the entire font span when possible
-		LyXFont font = getFont(pit, rit->pos());
-		lyx::pos_type endPosOfFontSpan = pit->getEndPosOfFontSpan(rit->pos());
-
-		// Optimisation
-		Paragraph const & par = *pit;
-
-		// Check if any insets are larger
-		for (pos_type pos = rit->pos(); pos <= pos_end; ++pos) {
-			// Manual inlined optimised version of common case of
-			// "maxwidth += singleWidth(pit, pos);"
-			char const c = par.getChar(pos);
-
-			if (IsPrintable(c)) {
-				if (pos > endPosOfFontSpan) {
-					// We need to get the next font
-					font = getFont(pit, pos);
-					endPosOfFontSpan = par.getEndPosOfFontSpan(pos);
-				}
-				if (! font.language()->RightToLeft()) {
-					maxwidth += font_metrics::width(c, font);
-				} else {
-					// Fall-back to normal case
-					maxwidth += singleWidth(pit, pos, c, font);
-					// And flush font cache
-					endPosOfFontSpan = 0;
-				}
-			} else {
-				// Special handling of insets - are any larger?
-				if (par.isInset(pos)) {
-					InsetOld const * tmpinset = par.getInset(pos);
-					if (tmpinset) {
-						maxwidth += tmpinset->width();
-						maxasc = max(maxasc, tmpinset->ascent());
-						maxdesc = max(maxdesc, tmpinset->descent());
-					}
-				} else {
-					// Fall-back to normal case
-					maxwidth += singleWidth(pit, pos, c, font);
-					// And flush font cache
-					endPosOfFontSpan = 0;
-				}
-			}
+	int maxasc  = int(font_metrics::maxAscent(font)  * spacing_val);
+	int maxdesc = int(font_metrics::maxDescent(font) * spacing_val);
+
+	// insets may be taller
+	InsetList::iterator ii = pit->insetlist.begin();
+	InsetList::iterator iend = pit->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 =
-		pit->highestFontInRange(rit->pos(), pos_end, size);
+		pit->highestFontInRange(row.pos(), pos_end, size);
 	if (maxsize > font.size()) {
 		font.setSize(maxsize);
-		maxasc = max(maxasc, font_metrics::maxAscent(font));
+		maxasc  = max(maxasc,  font_metrics::maxAscent(font));
 		maxdesc = max(maxdesc, font_metrics::maxDescent(font));
 	}
 
@@ -985,233 +703,141 @@ void LyXText::setHeightOfRow(ParagraphList::iterator pit, RowList::iterator rit)
 	++maxasc;
 	++maxdesc;
 
-	rit->ascent_of_text(maxasc);
+	row.ascent_of_text(maxasc);
 
 	// is it a top line?
-	if (!rit->pos()) {
+	if (row.pos() == 0) {
 		BufferParams const & bufparams = bv()->buffer()->params();
 		// some parksips VERY EASY IMPLEMENTATION
-		if (bv()->buffer()->params().paragraph_separation ==
-			BufferParams::PARSEP_SKIP)
+		if (bv()->buffer()->params().paragraph_separation
+		    == BufferParams::PARSEP_SKIP
+			&& pit != paragraphs().begin()
+			&& ((layout->isParagraph() && pit->getDepth() == 0)
+			    || (boost::prior(pit)->layout()->isParagraph()
+			        && boost::prior(pit)->getDepth() == 0)))
 		{
-			if (layout->isParagraph()
-				&& pit->getDepth() == 0
-				&& pit != ownerParagraphs().begin())
-			{
 				maxasc += bufparams.getDefSkip().inPixels(*bv());
-			} else if (pit != ownerParagraphs().begin() &&
-				   boost::prior(pit)->layout()->isParagraph() &&
-				   boost::prior(pit)->getDepth() == 0)
-			{
-				// is it right to use defskip here too? (AS)
-				maxasc += bufparams.getDefSkip().inPixels(*bv());
-			}
 		}
 
-		// the top margin
-		if (pit == ownerParagraphs().begin() && !isInInset())
-			maxasc += PAPER_MARGIN;
-
-		// add the vertical spaces, that the user added
-		maxasc += getLengthMarkerHeight(*bv(), pit->params().spaceTop());
-
-		// do not forget the DTP-lines!
-		// there height depends on the font of the nearest character
-		if (pit->params().lineTop())
-
-			maxasc += 2 * font_metrics::ascent('x', getFont(pit, 0));
-		// and now the pagebreaks
-		if (pit->params().pagebreakTop())
-			maxasc += 3 * defaultRowHeight();
-
 		if (pit->params().startOfAppendix())
-			maxasc += 3 * defaultRowHeight();
+			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->labeltype == LABEL_COUNTER_CHAPTER
-			&& bufparams.secnumdepth >= 0)
-		{
-			float spacing_val = 1.0;
-			if (!pit->params().spacing().isDefault()) {
-				spacing_val = pit->params().spacing().getValue();
-			} else {
-				spacing_val = bufparams.spacing().getValue();
-			}
-
-			labeladdon = int(font_metrics::maxDescent(labelfont) *
-					 layout->spacing.getValue() *
-					 spacing_val)
-				+ int(font_metrics::maxAscent(labelfont) *
-				      layout->spacing.getValue() *
-				      spacing_val);
+		if (layout->counter == "chapter" && bufparams.secnumdepth >= 0) {
+			labeladdon = int(font_metrics::maxHeight(labelfont)
+			             * layout->spacing.getValue() * spacing(*pit));
 		}
 
 		// special code for the top label
 		if ((layout->labeltype == LABEL_TOP_ENVIRONMENT
 		     || layout->labeltype == LABEL_BIBLIO
 		     || layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT)
-		    && isFirstInSequence(pit, ownerParagraphs())
+		    && isFirstInSequence(pit, paragraphs())
 		    && !pit->getLabelstring().empty())
 		{
-			float spacing_val = 1.0;
-			if (!pit->params().spacing().isDefault()) {
-				spacing_val = pit->params().spacing().getValue();
-			} else {
-				spacing_val = bufparams.spacing().getValue();
-			}
-
 			labeladdon = int(
-				(font_metrics::maxAscent(labelfont) +
-				 font_metrics::maxDescent(labelfont)) *
-				  layout->spacing.getValue() *
-				  spacing_val
-				+ layout->topsep * defaultRowHeight()
-				+ layout->labelbottomsep * defaultRowHeight());
+				  font_metrics::maxHeight(labelfont)
+					* layout->spacing.getValue()
+					* spacing(*pit)
+				+ (layout->topsep + layout->labelbottomsep) * dh);
 		}
 
-		// And now the layout spaces, for example before and after
+		// Add the layout spaces, for example before and after
 		// a section, or between the items of a itemize or enumerate
 		// environment.
 
-		if (!pit->params().pagebreakTop()) {
-			ParagraphList::iterator prev =
-				depthHook(pit, ownerParagraphs(),
-					  pit->getDepth());
-			if (prev != pit && prev->layout() == layout &&
-				prev->getDepth() == pit->getDepth() &&
-				prev->getLabelWidthString() == pit->getLabelWidthString())
-			{
-				layoutasc = (layout->itemsep * defaultRowHeight());
-			} else if (rit != firstRow()) {
-				tmptop = layout->topsep;
-
-				//if (boost::prior(pit)->getDepth() >= pit->getDepth())
-				//	tmptop -= getPar(previousRow(rit))->layout()->bottomsep;
-
-				if (tmptop > 0)
-					layoutasc = (tmptop * defaultRowHeight());
-			} else if (pit->params().lineTop()) {
-				tmptop = layout->topsep;
-
-				if (tmptop > 0)
-					layoutasc = (tmptop * defaultRowHeight());
-			}
+		ParagraphList::iterator prev =
+			depthHook(pit, paragraphs(), pit->getDepth());
+		if (prev != pit
+		    && prev->layout() == layout
+		    && prev->getDepth() == pit->getDepth()
+		    && prev->getLabelWidthString() == pit->getLabelWidthString())
+		{
+			layoutasc = layout->itemsep * dh;
+		} else if (pit != paragraphs().begin() || row.pos() != 0) {
+			if (layout->topsep > 0)
+				layoutasc = layout->topsep * dh;
+		}
 
-			prev = outerHook(pit, ownerParagraphs());
-			if (prev != ownerParagraphs().end())  {
-				maxasc += int(prev->layout()->parsep * defaultRowHeight());
-			} else if (pit != ownerParagraphs().begin()) {
-				ParagraphList::iterator prior_pit = boost::prior(pit);
-				if (prior_pit->getDepth() != 0 ||
-				    prior_pit->layout() == layout) {
-					maxasc += int(layout->parsep * defaultRowHeight());
-				}
+		prev = outerHook(pit, paragraphs());
+		if (prev != paragraphs().end()) {
+			maxasc += int(prev->layout()->parsep * dh);
+		} else if (pit != paragraphs().begin()) {
+			ParagraphList::iterator prior_pit = boost::prior(pit);
+			if (prior_pit->getDepth() != 0 ||
+					prior_pit->layout() == layout) {
+				maxasc += int(layout->parsep * dh);
 			}
 		}
 	}
 
 	// is it a bottom line?
-	if (boost::next(rit) == pit->rows.end()) {
-		// the bottom margin
-		ParagraphList::iterator nextpit = boost::next(pit);
-		if (nextpit == ownerParagraphs().end() && !isInInset())
-			maxdesc += PAPER_MARGIN;
-
-		// add the vertical spaces, that the user added
-		maxdesc += getLengthMarkerHeight(*bv(), pit->params().spaceBottom());
-
-		// do not forget the DTP-lines!
-		// there height depends on the font of the nearest character
-		if (pit->params().lineBottom())
-			maxdesc += 2 * font_metrics::ascent('x',
-					getFont(pit, max(pos_type(0), pit->size() - 1)));
-
-		// and now the pagebreaks
-		if (pit->params().pagebreakBottom())
-			maxdesc += 3 * defaultRowHeight();
-
-		// and now the layout spaces, for example before and after
+	if (row.endpos() >= pit->size()) {
+		// add the layout spaces, for example before and after
 		// a section, or between the items of a itemize or enumerate
 		// environment
-		if (!pit->params().pagebreakBottom()
-		    && nextpit != ownerParagraphs().end()) {
-			ParagraphList::iterator comparepit = pit;
-			float usual = 0;
-			float unusual = 0;
-
-			if (comparepit->getDepth() > nextpit->getDepth()) {
-				usual = (comparepit->layout()->bottomsep * defaultRowHeight());
-				comparepit = depthHook(comparepit, ownerParagraphs(), nextpit->getDepth());
-				if (comparepit->layout()!= nextpit->layout()
-					|| nextpit->getLabelWidthString() !=
-					comparepit->getLabelWidthString())
+		ParagraphList::iterator nextpit = boost::next(pit);
+		if (nextpit != paragraphs().end()) {
+			ParagraphList::iterator cpit = pit;
+			double usual = 0;
+			double unusual = 0;
+
+			if (cpit->getDepth() > nextpit->getDepth()) {
+				usual = cpit->layout()->bottomsep * dh;
+				cpit = depthHook(cpit, paragraphs(), nextpit->getDepth());
+				if (cpit->layout() != nextpit->layout()
+					|| nextpit->getLabelWidthString() != cpit->getLabelWidthString())
 				{
-					unusual = (comparepit->layout()->bottomsep * defaultRowHeight());
+					unusual = cpit->layout()->bottomsep * dh;
 				}
-				if (unusual > usual)
-					layoutdesc = unusual;
-				else
-					layoutdesc = usual;
-			} else if (comparepit->getDepth() ==  nextpit->getDepth()) {
-
-				if (comparepit->layout() != nextpit->layout()
-					|| nextpit->getLabelWidthString() !=
-					comparepit->getLabelWidthString())
-					layoutdesc = int(comparepit->layout()->bottomsep * defaultRowHeight());
+				layoutdesc = max(unusual, usual);
+			} else if (cpit->getDepth() == nextpit->getDepth()) {
+				if (cpit->layout() != nextpit->layout()
+					|| nextpit->getLabelWidthString() != cpit->getLabelWidthString())
+					layoutdesc = int(cpit->layout()->bottomsep * dh);
 			}
 		}
 	}
 
 	// incalculate the layout spaces
-	maxasc += int(layoutasc * 2 / (2 + pit->getDepth()));
+	maxasc  += int(layoutasc  * 2 / (2 + pit->getDepth()));
 	maxdesc += int(layoutdesc * 2 / (2 + pit->getDepth()));
 
-	rit->height(maxasc + maxdesc + labeladdon);
-	rit->baseline(maxasc + labeladdon);
-	rit->top_of_text(rit->baseline() - font_metrics::maxAscent(font));
-
-	double x = 0;
-	rit->width(int(maxwidth + x));
-	if (inset_owner) {
-		width = max(0, workWidth());
-		RowList::iterator rit = firstRow();
-		RowList::iterator end = endRow();
-		ParagraphList::iterator it = ownerParagraphs().begin();
-		while (rit != end) {
-			if (rit->width() > width)
-				width = rit->width();
-			nextRow(it, rit);
-		}
-	}
+	row.height(maxasc + maxdesc + labeladdon);
+	row.baseline(maxasc + labeladdon);
+	row.top_of_text(row.baseline() - font_metrics::maxAscent(font));
 }
 
 
-void LyXText::breakParagraph(ParagraphList & paragraphs, char keep_layout)
+void LyXText::breakParagraph(LCursor & cur, char keep_layout)
 {
+	BOOST_ASSERT(this == cur.text());
 	// allow only if at start or end, or all previous is new text
-	if (cursor.pos() && cursor.pos() != cursor.par()->size()
-		&& cursor.par()->isChangeEdited(0, cursor.pos()))
+	Paragraph & cpar = cur.paragraph();
+	ParagraphList::iterator cpit = getPar(cur.par());
+
+	if (cur.pos() != 0 && cur.pos() != cur.lastpos()
+	    && cpar.isChangeEdited(0, cur.pos()))
 		return;
 
 	LyXTextClass const & tclass =
 		bv()->buffer()->params().getLyXTextClass();
-	LyXLayout_ptr const & layout = cursor.par()->layout();
+	LyXLayout_ptr const & layout = cpar.layout();
 
-	// this is only allowed, if the current paragraph is not empty or caption
-	// and if it has not the keepempty flag active
-	if (cursor.par()->empty() && !cursor.par()->allowEmpty()
+	// 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)
 		return;
 
-	recordUndo(bv(), Undo::ATOMIC, cursor.par());
+	// a layout change may affect also the following paragraph
+	recUndo(cur.par(), parOffset(undoSpan(cpit)) - 1);
 
 	// Always break behind a space
-	//
 	// It is better to erase the space (Dekel)
-	if (cursor.pos() < cursor.par()->size()
-	     && cursor.par()->isLineSeparator(cursor.pos()))
-	   cursor.par()->erase(cursor.pos());
+	if (cur.pos() != cur.lastpos() && cpar.isLineSeparator(cur.pos()))
+		cpar.erase(cur.pos());
 
 	// break the paragraph
 	if (keep_layout)
@@ -1223,21 +849,18 @@ void LyXText::breakParagraph(ParagraphList & paragraphs, char keep_layout)
 	// breakParagraph call should return a bool if it inserts the
 	// paragraph before or behind and we should react on that one
 	// but we can fix this in 1.3.0 (Jug 20020509)
-	bool const isempty = (cursor.par()->allowEmpty() && cursor.par()->empty());
-	::breakParagraph(bv()->buffer()->params(), paragraphs, cursor.par(),
-			 cursor.pos(), keep_layout);
+	bool const isempty = cpar.allowEmpty() && cpar.empty();
+	::breakParagraph(bv()->buffer()->params(), paragraphs(), cpit,
+			 cur.pos(), keep_layout);
 
-#warning Trouble Point! (Lgb)
-	// When ::breakParagraph is called from within an inset we must
-	// ensure that the correct ParagraphList is used. Today that is not
-	// the case and the Buffer::paragraphs is used. Not good. (Lgb)
-	ParagraphList::iterator next_par = boost::next(cursor.par());
+	cpit = getPar(cur.par());
+	ParagraphList::iterator next_par = boost::next(cpit);
 
 	// well this is the caption hack since one caption is really enough
 	if (layout->labeltype == LABEL_SENSITIVE) {
-		if (!cursor.pos())
+		if (!cur.pos())
 			// set to standard-layout
-			cursor.par()->applyLayout(tclass.defaultLayout());
+			cpit->applyLayout(tclass.defaultLayout());
 		else
 			// set to standard-layout
 			next_par->applyLayout(tclass.defaultLayout());
@@ -1247,48 +870,51 @@ void LyXText::breakParagraph(ParagraphList & paragraphs, char keep_layout)
 	// move one row up!
 	// This touches only the screen-update. Otherwise we would may have
 	// an empty row on the screen
-	if (cursor.pos() && cursorRow()->pos() == cursor.pos()
-	    && !cursor.par()->isNewline(cursor.pos() - 1))
+	if (cur.pos() != 0 && cur.textRow().pos() == cur.pos()
+	    && !cpit->isNewline(cur.pos() - 1))
 	{
-		cursorLeft(bv());
+		cursorLeft(cur);
 	}
 
 	while (!next_par->empty() && next_par->isNewline(0))
 		next_par->erase(0);
 
 	updateCounters();
-	redoParagraph(cursor.par());
+	redoParagraph(cpit);
 	redoParagraph(next_par);
 
 	// This check is necessary. Otherwise the new empty paragraph will
 	// be deleted automatically. And it is more friendly for the user!
-	if (cursor.pos() || isempty)
-		setCursor(next_par, 0);
+	if (cur.pos() != 0 || isempty)
+		setCursor(cur, cur.par() + 1, 0);
 	else
-		setCursor(cursor.par(), 0);
+		setCursor(cur, cur.par(), 0);
 }
 
 
 // convenience function
-void LyXText::redoParagraph()
+void LyXText::redoParagraph(LCursor & cur)
 {
-	clearSelection();
-	redoParagraph(cursor.par());
-	setCursorIntern(cursor.par(), cursor.pos());
+	BOOST_ASSERT(this == cur.text());
+	cur.clearSelection();
+	redoParagraph(getPar(cur.par()));
+	setCursorIntern(cur, cur.par(), cur.pos());
 }
 
 
 // insert a character, moves all the following breaks in the
 // same Paragraph one to the right and make a rebreak
-void LyXText::insertChar(char c)
+void LyXText::insertChar(LCursor & cur, char c)
 {
-	recordUndo(bv(), Undo::INSERT, cursor.par());
+	BOOST_ASSERT(this == cur.text());
+	recordUndo(cur, Undo::INSERT);
 
-	// When the free-spacing option is set for the current layout,
-	// disable the double-space checking
+	Paragraph & par = cur.paragraph();
+	// try to remove this
+	ParagraphList::iterator pit = getPar(cur.par());
 
-	bool const freeSpacing = cursor.par()->layout()->free_spacing ||
-		cursor.par()->isFreeSpacing();
+	bool const freeSpacing = par.layout()->free_spacing ||
+		par.isFreeSpacing();
 
 	if (lyxrc.auto_number) {
 		static string const number_operators = "+-/*";
@@ -1298,42 +924,33 @@ void LyXText::insertChar(char c)
 		if (current_font.number() == LyXFont::ON) {
 			if (!IsDigit(c) && !contains(number_operators, c) &&
 			    !(contains(number_seperators, c) &&
-			      cursor.pos() >= 1 &&
-			      cursor.pos() < cursor.par()->size() &&
-			      getFont(cursor.par(), cursor.pos()).number() == LyXFont::ON &&
-			      getFont(cursor.par(), cursor.pos() - 1).number() == LyXFont::ON)
+			      cur.pos() != 0 &&
+			      cur.pos() != cur.lastpos() &&
+			      getFont(pit, cur.pos()).number() == LyXFont::ON &&
+			      getFont(pit, cur.pos() - 1).number() == LyXFont::ON)
 			   )
-				number(bv()); // Set current_font.number to OFF
+				number(cur); // Set current_font.number to OFF
 		} else if (IsDigit(c) &&
 			   real_current_font.isVisibleRightToLeft()) {
-			number(bv()); // Set current_font.number to ON
+			number(cur); // Set current_font.number to ON
 
-			if (cursor.pos() > 0) {
-				char const c = cursor.par()->getChar(cursor.pos() - 1);
+			if (cur.pos() != 0) {
+				char const c = par.getChar(cur.pos() - 1);
 				if (contains(number_unary_operators, c) &&
-				    (cursor.pos() == 1 ||
-				     cursor.par()->isSeparator(cursor.pos() - 2) ||
-				     cursor.par()->isNewline(cursor.pos() - 2))
+				    (cur.pos() == 1
+				     || par.isSeparator(cur.pos() - 2)
+				     || par.isNewline(cur.pos() - 2))
 				  ) {
-					setCharFont(
-						    cursor.par(),
-						    cursor.pos() - 1,
-						    current_font);
-				} else if (contains(number_seperators, c) &&
-					   cursor.pos() >= 2 &&
-					   getFont(
-						   cursor.par(),
-						   cursor.pos() - 2).number() == LyXFont::ON) {
-					setCharFont(
-						    cursor.par(),
-						    cursor.pos() - 1,
-						    current_font);
+					setCharFont(pit, cur.pos() - 1, current_font);
+				} else if (contains(number_seperators, c)
+				     && cur.pos() >= 2
+				     && getFont(pit, cur.pos() - 2).number() == LyXFont::ON) {
+					setCharFont(pit, cur.pos() - 1, current_font);
 				}
 			}
 		}
 	}
 
-
 	// First check, if there will be two blanks together or a blank at
 	// the beginning of a paragraph.
 	// I decided to handle blanks like normal characters, the main
@@ -1350,43 +967,48 @@ void LyXText::insertChar(char c)
 	LyXFont realtmpfont = real_current_font;
 	LyXFont rawtmpfont = current_font;
 
+	// When the free-spacing option is set for the current layout,
+	// disable the double-space checking
 	if (!freeSpacing && IsLineSeparatorChar(c)) {
-		if ((cursor.pos() > 0
-		     && cursor.par()->isLineSeparator(cursor.pos() - 1))
-		    || (cursor.pos() > 0
-			&& cursor.par()->isNewline(cursor.pos() - 1))
-		    || (cursor.pos() == 0)) {
+		if (cur.pos() == 0) {
 			static bool sent_space_message = false;
 			if (!sent_space_message) {
-				if (cursor.pos() == 0)
-					bv()->owner()->message(_("You cannot insert a space at the beginning of a paragraph. Please read the Tutorial."));
-				else
-					bv()->owner()->message(_("You cannot type two spaces this way. Please read the Tutorial."));
+				cur.message(_("You cannot insert a space at the "
+					"beginning of a paragraph. Please read the Tutorial."));
+				sent_space_message = true;
+				return;
+			}
+		}
+		BOOST_ASSERT(cur.pos() > 0);
+		if (par.isLineSeparator(cur.pos() - 1)
+		    || par.isNewline(cur.pos() - 1)) {
+			static bool sent_space_message = false;
+			if (!sent_space_message) {
+				cur.message(_("You cannot type two spaces this way. "
+					"Please read the Tutorial."));
 				sent_space_message = true;
 			}
-			charInserted();
 			return;
 		}
 	}
 
 	// Here case LyXText::InsertInset already inserted the character
 	if (c != Paragraph::META_INSET)
-		cursor.par()->insertChar(cursor.pos(), c);
+		par.insertChar(cur.pos(), c);
 
-	setCharFont(cursor.par(), cursor.pos(), rawtmpfont);
+	setCharFont(pit, cur.pos(), rawtmpfont);
 
 	current_font = rawtmpfont;
 	real_current_font = realtmpfont;
-	redoParagraph(cursor.par());
-	setCursor(cursor.par(), cursor.pos() + 1, false, cursor.boundary());
-
+	redoParagraph(cur);
+	setCursor(cur, cur.par(), cur.pos() + 1, false, cur.boundary());
 	charInserted();
 }
 
 
 void LyXText::charInserted()
 {
-	// Here we could call finishUndo for every 20 characters inserted.
+	// Here we call finishUndo for every 20 characters inserted.
 	// This is from my experience how emacs does it. (Lgb)
 	static unsigned int counter;
 	if (counter < 20) {
@@ -1398,21 +1020,19 @@ void LyXText::charInserted()
 }
 
 
-void LyXText::prepareToPrint(ParagraphList::iterator pit,
-           RowList::iterator const rit) const
+void LyXText::prepareToPrint(ParagraphList::iterator pit, Row & row) const
 {
-	double w = rit->fill();
+	double w = textWidth() - row.width();
 	double fill_hfill = 0;
 	double fill_label_hfill = 0;
 	double fill_separator = 0;
 	double x = 0;
 
-	bool const is_rtl =
-		pit->isRightToLeftPar(bv()->buffer()->params());
+	bool const is_rtl = isRTL(*pit);
 	if (is_rtl)
-		x = workWidth() > 0 ? rightMargin(pit, *bv()->buffer(), *rit) : 0;
+		x = rightMargin(*pit);
 	else
-		x = workWidth() > 0 ? leftMargin(pit, *rit) : 0;
+		x = leftMargin(pit, row.pos());
 
 	// is there a manual margin with a manual label
 	LyXLayout_ptr const & layout = pit->layout();
@@ -1420,7 +1040,7 @@ void LyXText::prepareToPrint(ParagraphList::iterator pit,
 	if (layout->margintype == MARGIN_MANUAL
 	    && layout->labeltype == LABEL_MANUAL) {
 		/// We might have real hfills in the label part
-		int nlh = numberOfLabelHfills(*pit, rit);
+		int nlh = numberOfLabelHfills(*pit, row);
 
 		// A manual label par (e.g. List) has an auto-hfill
 		// between the label text and the body of the
@@ -1430,13 +1050,12 @@ void LyXText::prepareToPrint(ParagraphList::iterator pit,
 		if (!pit->empty())
 			++nlh;
 
-		if (nlh && !pit->getLabelWidthString().empty()) {
-			fill_label_hfill = labelFill(pit, *rit) / double(nlh);
-		}
+		if (nlh && !pit->getLabelWidthString().empty())
+			fill_label_hfill = labelFill(pit, row) / double(nlh);
 	}
 
 	// are there any hfills in the row?
-	int const nh = numberOfHfills(*pit, rit);
+	int const nh = numberOfHfills(*pit, row);
 
 	if (nh) {
 		if (w > 0)
@@ -1444,372 +1063,271 @@ void LyXText::prepareToPrint(ParagraphList::iterator pit,
 	// 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(rit->width()) < workWidth()) {
+	} else if (int(row.width()) < textWidth()) {
 		// is it block, flushleft or flushright?
 		// set x how you need it
 		int align;
-		if (pit->params().align() == LYX_ALIGN_LAYOUT) {
+		if (pit->params().align() == LYX_ALIGN_LAYOUT)
 			align = layout->align;
-		} else {
+		else
 			align = pit->params().align();
-		}
-		InsetOld * inset = 0;
-		// ERT insets should always be LEFT ALIGNED on screen
-		inset = pit->inInset();
-		if (inset && inset->owner() &&
-			inset->owner()->lyxCode() == InsetOld::ERT_CODE)
+
+		// Display-style insets should always be on a centred row
+		// The test on pit->size() is to catch zero-size pars, which
+		// would trigger the assert in Paragraph::getInset().
+		//inset = pit->size() ? pit->getInset(row.pos()) : 0;
+		if (!pit->empty()
+		    && pit->isInset(row.pos())
+		    && pit->getInset(row.pos())->display())
 		{
-			align = LYX_ALIGN_LEFT;
+			align = LYX_ALIGN_CENTER;
 		}
 
 		switch (align) {
-	    case LYX_ALIGN_BLOCK:
-		{
-			int const ns = numberOfSeparators(*pit, rit);
-			RowList::iterator next_row = boost::next(rit);
+		case LYX_ALIGN_BLOCK: {
+			int const ns = numberOfSeparators(*pit, row);
+			bool disp_inset = false;
+			if (row.endpos() < pit->size()) {
+				InsetBase * in = pit->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
-				&& next_row != pit->rows.end()
-				&& !pit->isNewline(next_row->pos() - 1)
+			    && row.endpos() < pit->size()
+			    && !pit->isNewline(row.endpos() - 1)
+			    && !disp_inset
 				) {
-					fill_separator = w / ns;
+				fill_separator = w / ns;
 			} else if (is_rtl) {
 				x += w;
 			}
 			break;
-	    }
-	    case LYX_ALIGN_RIGHT:
+		}
+		case LYX_ALIGN_RIGHT:
 			x += w;
 			break;
-	    case LYX_ALIGN_CENTER:
+		case LYX_ALIGN_CENTER:
 			x += w / 2;
 			break;
 		}
 	}
 
-	computeBidiTables(pit, *bv()->buffer(), rit);
+	bidi.computeTables(*pit, *bv()->buffer(), row);
 	if (is_rtl) {
-		pos_type body_pos = pit->beginningOfBody();
-		pos_type last = lastPos(*pit, rit);
+		pos_type body_pos = pit->beginOfBody();
+		pos_type end = row.endpos();
 
-		if (body_pos > 0 &&
-				(body_pos - 1 > last ||
-				 !pit->isLineSeparator(body_pos - 1))) {
+		if (body_pos > 0
+		    && (body_pos > end || !pit->isLineSeparator(body_pos - 1)))
+		{
 			x += font_metrics::width(layout->labelsep, getLabelFont(pit));
-			if (body_pos - 1 <= last)
+			if (body_pos <= end)
 				x += fill_label_hfill;
 		}
 	}
 
-	rit->fill_hfill(fill_hfill);
-	rit->fill_label_hfill(fill_label_hfill);
-	rit->fill_separator(fill_separator);
-	rit->x(x);
+	row.fill_hfill(fill_hfill);
+	row.fill_label_hfill(fill_label_hfill);
+	row.fill_separator(fill_separator);
+	row.x(x);
 }
 
 
-// important for the screen
-
-
 // the cursor set functions have a special mechanism. When they
 // realize, that you left an empty paragraph, they will delete it.
-// They also delete the corresponding row
 
-void LyXText::cursorRightOneWord()
+void LyXText::cursorRightOneWord(LCursor & cur)
 {
-	::cursorRightOneWord(cursor, ownerParagraphs());
-	setCursor(cursor.par(), cursor.pos());
+	BOOST_ASSERT(this == cur.text());
+	if (cur.pos() == cur.lastpos() && cur.par() != cur.lastpar()) {
+		++cur.par();
+		cur.pos() = 0;
+	} else {
+		// Skip through initial nonword stuff.
+		// Treat floats and insets as words.
+		while (cur.pos() != cur.lastpos() && !cur.paragraph().isWord(cur.pos()))
+			++cur.pos();
+		// Advance through word.
+		while (cur.pos() != cur.lastpos() && cur.paragraph().isWord(cur.pos()))
+			++cur.pos();
+	}
+	setCursor(cur, cur.par(), cur.pos());
 }
 
 
-// Skip initial whitespace at end of word and move cursor to *start*
-// of prior word, not to end of next prior word.
-void LyXText::cursorLeftOneWord()
+void LyXText::cursorLeftOneWord(LCursor & cur)
 {
-	LyXCursor tmpcursor = cursor;
-	::cursorLeftOneWord(tmpcursor, ownerParagraphs());
-	setCursor(tmpcursor.par(), tmpcursor.pos());
+	BOOST_ASSERT(this == cur.text());
+	if (cur.pos() == 0 && cur.par() != 0) {
+		--cur.par();
+		cur.pos() = cur.lastpos();
+	} else { 
+		// Skip through initial nonword stuff.
+		// Treat floats and insets as words.
+		while (cur.pos() != 0 && !cur.paragraph().isWord(cur.pos() - 1))
+			--cur.pos();
+		// Advance through word.
+		while (cur.pos() != 0 && cur.paragraph().isWord(cur.pos() - 1))
+			--cur.pos();
+	}
+	setCursor(cur, cur.par(), cur.pos());
 }
 
 
-void LyXText::selectWord(word_location loc)
+void LyXText::selectWord(LCursor & cur, word_location loc)
 {
-	LyXCursor from = cursor;
-	LyXCursor to;
-	::getWord(from, to, loc, ownerParagraphs());
-	if (cursor != from)
-		setCursor(from.par(), from.pos());
+	BOOST_ASSERT(this == cur.text());
+	CursorSlice from = cur.current();
+	CursorSlice to = cur.current();
+	getWord(from, to, loc);
+	if (cur.current() != from)
+		setCursor(cur, from.par(), from.pos());
 	if (to == from)
 		return;
-	selection.cursor = cursor;
-	setCursor(to.par(), to.pos());
-	setSelection();
+	cur.resetAnchor();
+	setCursor(cur, to.par(), to.pos());
+	cur.setSelection();
 }
 
 
 // Select the word currently under the cursor when no
 // selection is currently set
-bool LyXText::selectWordWhenUnderCursor(word_location loc)
+bool LyXText::selectWordWhenUnderCursor(LCursor & cur, word_location loc)
 {
-	if (!selection.set()) {
-		selectWord(loc);
-		return selection.set();
-	}
-	return false;
+	BOOST_ASSERT(this == cur.text());
+	if (cur.selection())
+		return false;
+	selectWord(cur, loc);
+	return cur.selection();
 }
 
 
-void LyXText::acceptChange()
+void LyXText::acceptChange(LCursor & cur)
 {
-	if (!selection.set() && cursor.par()->size())
+	BOOST_ASSERT(this == cur.text());
+	if (!cur.selection() && cur.lastpos() != 0)
 		return;
 
-	if (selection.start.par() == selection.end.par()) {
-		LyXCursor & startc = selection.start;
-		LyXCursor & endc = selection.end;
-		recordUndo(bv(), Undo::INSERT, startc.par());
-		startc.par()->acceptChange(startc.pos(), endc.pos());
+	CursorSlice const & startc = cur.selBegin();
+	CursorSlice const & endc = cur.selEnd();
+	if (startc.par() == endc.par()) {
+		recordUndoSelection(cur, Undo::INSERT);
+		getPar(startc)->acceptChange(startc.pos(), endc.pos());
 		finishUndo();
-		clearSelection();
-		redoParagraph(startc.par());
-		setCursorIntern(startc.par(), 0);
+		cur.clearSelection();
+		redoParagraph(getPar(startc));
+		setCursorIntern(cur, startc.par(), 0);
 	}
 #warning handle multi par selection
 }
 
 
-void LyXText::rejectChange()
+void LyXText::rejectChange(LCursor & cur)
 {
-	if (!selection.set() && cursor.par()->size())
+	BOOST_ASSERT(this == cur.text());
+	if (!cur.selection() && cur.lastpos() != 0)
 		return;
 
-	if (selection.start.par() == selection.end.par()) {
-		LyXCursor & startc = selection.start;
-		LyXCursor & endc = selection.end;
-		recordUndo(bv(), Undo::INSERT, startc.par());
-		startc.par()->rejectChange(startc.pos(), endc.pos());
+	CursorSlice const & startc = cur.selBegin();
+	CursorSlice const & endc = cur.selEnd();
+	if (startc.par() == endc.par()) {
+		recordUndoSelection(cur, Undo::INSERT);
+		getPar(startc)->rejectChange(startc.pos(), endc.pos());
 		finishUndo();
-		clearSelection();
-		redoParagraph(startc.par());
-		setCursorIntern(startc.par(), 0);
+		cur.clearSelection();
+		redoParagraph(getPar(startc));
+		setCursorIntern(cur, startc.par(), 0);
 	}
 #warning handle multi par selection
 }
 
 
-// This function is only used by the spellchecker for NextWord().
-// It doesn't handle LYX_ACCENTs and probably never will.
-WordLangTuple const
-LyXText::selectNextWordToSpellcheck(float & value)
-{
-	if (the_locking_inset) {
-		WordLangTuple word = the_locking_inset->selectNextWordToSpellcheck(bv(), value);
-		if (!word.word().empty()) {
-			value += float(cursor.y());
-			value /= float(height);
-			return word;
-		}
-		// we have to go on checking so move cursor to the next char
-		if (cursor.pos() == cursor.par()->size()) {
-			if (boost::next(cursor.par()) == ownerParagraphs().end())
-				return word;
-			cursor.par(boost::next(cursor.par()));
-			cursor.pos(0);
-		} else
-			cursor.pos(cursor.pos() + 1);
-	}
-	ParagraphList::iterator tmppit = cursor.par();
-
-	// If this is not the very first word, skip rest of
-	// current word because we are probably in the middle
-	// of a word if there is text here.
-	if (cursor.pos() || cursor.par() != ownerParagraphs().begin()) {
-		while (cursor.pos() < cursor.par()->size()
-		       && cursor.par()->isLetter(cursor.pos()))
-			cursor.pos(cursor.pos() + 1);
-	}
-
-	// Now, skip until we have real text (will jump paragraphs)
-	while (true) {
-		ParagraphList::iterator cpit = cursor.par();
-		pos_type const cpos(cursor.pos());
-
-		if (cpos == cpit->size()) {
-			if (boost::next(cpit) != ownerParagraphs().end()) {
-				cursor.par(boost::next(cpit));
-				cursor.pos(0);
-				continue;
-			}
-			break;
-		}
-
-		bool const is_good_inset = cpit->isInset(cpos)
-			&& cpit->getInset(cpos)->allowSpellcheck();
-
-		if (!isDeletedText(*cpit, cpos)
-		    && (is_good_inset || cpit->isLetter(cpos)))
-			break;
-
-		cursor.pos(cpos + 1);
-	}
-
-	// now check if we hit an inset so it has to be a inset containing text!
-	if (cursor.pos() < cursor.par()->size() &&
-	    cursor.par()->isInset(cursor.pos())) {
-		// lock the inset!
-		FuncRequest cmd(bv(), LFUN_INSET_EDIT, "left");
-		cursor.par()->getInset(cursor.pos())->localDispatch(cmd);
-		// now call us again to do the above trick
-		// but obviously we have to start from down below ;)
-		return bv()->text->selectNextWordToSpellcheck(value);
-	}
-
-	// Update the value if we changed paragraphs
-	if (cursor.par() != tmppit) {
-		setCursor(cursor.par(), cursor.pos());
-		value = float(cursor.y())/float(height);
-	}
-
-	// Start the selection from here
-	selection.cursor = cursor;
-
-	string lang_code = getFont(cursor.par(), cursor.pos()).language()->code();
-	// and find the end of the word (insets like optional hyphens
-	// and ligature break are part of a word)
-	while (cursor.pos() < cursor.par()->size()
-	       && cursor.par()->isLetter(cursor.pos())
-	       && !isDeletedText(*cursor.par(), cursor.pos()))
-		cursor.pos(cursor.pos() + 1);
-
-	// Finally, we copy the word to a string and return it
-	string str;
-	if (selection.cursor.pos() < cursor.pos()) {
-		pos_type i;
-		for (i = selection.cursor.pos(); i < cursor.pos(); ++i) {
-			if (!cursor.par()->isInset(i))
-				str += cursor.par()->getChar(i);
-		}
-	}
-	return WordLangTuple(str, lang_code);
-}
-
-
-// This one is also only for the spellchecker
-void LyXText::selectSelectedWord()
-{
-	if (the_locking_inset) {
-		the_locking_inset->selectSelectedWord(bv());
-		return;
-	}
-	// move cursor to the beginning
-	setCursor(selection.cursor.par(), selection.cursor.pos());
-
-	// set the sel cursor
-	selection.cursor = cursor;
-
-	// now find the end of the word
-	while (cursor.pos() < cursor.par()->size()
-	       && cursor.par()->isLetter(cursor.pos()))
-		cursor.pos(cursor.pos() + 1);
-
-	setCursor(cursor.par(), cursor.pos());
-
-	// finally set the selection
-	setSelection();
-}
-
-
 // Delete from cursor up to the end of the current or next word.
-void LyXText::deleteWordForward()
+void LyXText::deleteWordForward(LCursor & cur)
 {
-	if (cursor.par()->empty())
-		cursorRight(bv());
+	BOOST_ASSERT(this == cur.text());
+	if (cur.lastpos() == 0)
+		cursorRight(cur);
 	else {
-		LyXCursor tmpcursor = cursor;
-		selection.set(true); // to avoid deletion
-		cursorRightOneWord();
-		setCursor(tmpcursor, tmpcursor.par(), tmpcursor.pos());
-		selection.cursor = cursor;
-		cursor = tmpcursor;
-		setSelection();
-
-		// Great, CutSelection() gets rid of multiple spaces.
-		cutSelection(true, false);
+		cur.resetAnchor();
+		cur.selection() = true;
+		cursorRightOneWord(cur);
+		cur.setSelection();
+		cutSelection(cur, true, false);
 	}
 }
 
 
 // Delete from cursor to start of current or prior word.
-void LyXText::deleteWordBackward()
+void LyXText::deleteWordBackward(LCursor & cur)
 {
-	if (cursor.par()->empty())
-		cursorLeft(bv());
+	BOOST_ASSERT(this == cur.text());
+	if (cur.lastpos() == 0)
+		cursorLeft(cur);
 	else {
-		LyXCursor tmpcursor = cursor;
-		selection.set(true); // to avoid deletion
-		cursorLeftOneWord();
-		setCursor(tmpcursor, tmpcursor.par(), tmpcursor.pos());
-		selection.cursor = cursor;
-		cursor = tmpcursor;
-		setSelection();
-		cutSelection(true, false);
+		cur.resetAnchor();
+		cur.selection() = true;
+		cursorLeftOneWord(cur);
+		cur.setSelection();
+		cutSelection(cur, true, false);
 	}
 }
 
 
 // Kill to end of line.
-void LyXText::deleteLineForward()
+void LyXText::deleteLineForward(LCursor & cur)
 {
-	if (cursor.par()->empty())
+	BOOST_ASSERT(this == cur.text());
+	if (cur.lastpos() == 0) {
 		// Paragraph is empty, so we just go to the right
-		cursorRight(bv());
-	else {
-		LyXCursor tmpcursor = cursor;
-		// We can't store the row over a regular setCursor
-		// so we set it to 0 and reset it afterwards.
-		selection.set(true); // to avoid deletion
-		cursorEnd();
-		setCursor(tmpcursor, tmpcursor.par(), tmpcursor.pos());
-		selection.cursor = cursor;
-		cursor = tmpcursor;
-		setSelection();
+		cursorRight(cur);
+	} else {
+		cur.resetAnchor();
+		cur.selection() = true; // to avoid deletion
+		cursorEnd(cur);
+		cur.setSelection();
 		// What is this test for ??? (JMarc)
-		if (!selection.set()) {
-			deleteWordForward();
-		} else {
-			cutSelection(true, false);
-		}
+		if (!cur.selection())
+			deleteWordForward(cur);
+		else
+			cutSelection(cur, true, false);
 	}
 }
 
 
-void LyXText::changeCase(LyXText::TextCase action)
+void LyXText::changeCase(LCursor & cur, LyXText::TextCase action)
 {
-	LyXCursor from;
-	LyXCursor to;
+	BOOST_ASSERT(this == cur.text());
+	CursorSlice from;
+	CursorSlice to;
 
-	if (selection.set()) {
-		from = selection.start;
-		to = selection.end;
+	if (cur.selection()) {
+		from = cur.selBegin();
+		to = cur.selEnd();
 	} else {
-		from = cursor;
-		::getWord(from, to, lyx::PARTIAL_WORD, ownerParagraphs());
-		setCursor(to.par(), to.pos() + 1);
+		from = cursor();
+		getWord(from, to, lyx::PARTIAL_WORD);
+		setCursor(cur, to.par(), to.pos() + 1);
 	}
 
-	recordUndo(bv(), Undo::ATOMIC, from.par(), to.par());
+	recordUndoSelection(cur);
 
 	pos_type pos = from.pos();
-	ParagraphList::iterator pit = from.par();
+	int par = from.par();
 
-	while (pit != ownerParagraphs().end() &&
-	       (pos != to.pos() || pit != to.par())) {
+	while (par != int(paragraphs().size()) &&
+	       (pos != to.pos() || par != to.par())) {
+		ParagraphList::iterator pit = getPar(par);
 		if (pos == pit->size()) {
-			++pit;
+			++par;
 			pos = 0;
 			continue;
 		}
 		unsigned char c = pit->getChar(pos);
-		if (!IsInsetChar(c)) {
+		if (c != Paragraph::META_INSET) {
 			switch (action) {
 			case text_lowercase:
 				c = lowercase(c);
@@ -1830,102 +1348,62 @@ void LyXText::changeCase(LyXText::TextCase action)
 }
 
 
-void LyXText::Delete()
+void LyXText::Delete(LCursor & cur)
 {
-	// this is a very easy implementation
-
-	LyXCursor old_cursor = cursor;
-	int const old_cur_par_id = old_cursor.par()->id();
-	int const old_cur_par_prev_id =
-		(old_cursor.par() != ownerParagraphs().begin() ?
-		 boost::prior(old_cursor.par())->id() : -1);
-
-	// just move to the right
-	cursorRight(bv());
-
-	// CHECK Look at the comment here.
-	// This check is not very good...
-	// The cursorRightIntern calls DeleteEmptyParagrapgMechanism
-	// and that can very well delete the par or par->previous in
-	// old_cursor. Will a solution where we compare paragraph id's
-	//work better?
-	if ((cursor.par() != ownerParagraphs().begin() ? boost::prior(cursor.par())->id() : -1)
-	    == old_cur_par_prev_id
-	    && cursor.par()->id() != old_cur_par_id) {
-		// delete-empty-paragraph-mechanism has done it
-		return;
-	}
-
-	// if you had success make a backspace
-	if (old_cursor.par() != cursor.par() || old_cursor.pos() != cursor.pos()) {
-		LyXCursor tmpcursor = cursor;
-		// to make sure undo gets the right cursor position
-		cursor = old_cursor;
-		recordUndo(bv(), Undo::DELETE, cursor.par());
-		cursor = tmpcursor;
-		backspace();
+	BOOST_ASSERT(this == cur.text());
+	// just move to the right, if we had success make a backspace
+	CursorSlice sl = cur.current();
+	cursorRight(cur);
+	if (sl == cur.current()) {
+		recordUndo(cur, Undo::DELETE, cur.par(), max(0, cur.par() - 1));
+		backspace(cur);
 	}
 }
 
 
-void LyXText::backspace()
+void LyXText::backspace(LCursor & cur)
 {
-	// Get the font that is used to calculate the baselineskip
-	pos_type lastpos = cursor.par()->size();
-
-	if (cursor.pos() == 0) {
-		// The cursor is at the beginning of a paragraph,
-		// so the the backspace will collapse two paragraphs into one.
+	BOOST_ASSERT(this == cur.text());
+	if (cur.pos() == 0) {
+		// The cursor is at the beginning of a paragraph, so
+		// the the backspace will collapse two paragraphs into
+		// one.
 
 		// but it's not allowed unless it's new
-		if (cursor.par()->isChangeEdited(0, cursor.par()->size()))
+		Paragraph & par = cur.paragraph();
+		if (par.isChangeEdited(0, par.size()))
 			return;
 
 		// we may paste some paragraphs
 
 		// is it an empty paragraph?
-
-		if (lastpos == 0
-		     || (lastpos == 1 && cursor.par()->isSeparator(0))) {
+		pos_type lastpos = cur.lastpos();
+		if (lastpos == 0 || (lastpos == 1 && par.isSeparator(0))) {
 			// This is an empty paragraph and we delete it just
 			// by moving the cursor one step
 			// left and let the DeleteEmptyParagraphMechanism
 			// handle the actual deletion of the paragraph.
 
-			if (cursor.par() != ownerParagraphs().begin()) {
-				ParagraphList::iterator tmppit = boost::prior(cursor.par());
-				if (cursor.par()->layout() == tmppit->layout()
-				    && cursor.par()->getAlign() == tmppit->getAlign()) {
-					// Inherit bottom DTD from the paragraph below.
-					// (the one we are deleting)
-					tmppit->params().lineBottom(cursor.par()->params().lineBottom());
-					tmppit->params().spaceBottom(cursor.par()->params().spaceBottom());
-					tmppit->params().pagebreakBottom(cursor.par()->params().pagebreakBottom());
-				}
-
-				cursorLeft(bv());
-
+			if (cur.par() != 0) {
+				cursorLeft(cur);
 				// the layout things can change the height of a row !
-				redoParagraph();
+				redoParagraph(cur);
 				return;
 			}
 		}
 
-		if (cursor.par() != ownerParagraphs().begin()) {
-			recordUndo(bv(), Undo::DELETE,
-				boost::prior(cursor.par()),
-				cursor.par());
-		}
+		if (cur.par() != 0)
+			recordUndo(cur, Undo::DELETE, cur.par() - 1);
 
-		ParagraphList::iterator tmppit = cursor.par();
+		ParagraphList::iterator tmppit = getPar(cur.par());
 		// We used to do cursorLeftIntern() here, but it is
 		// not a good idea since it triggers the auto-delete
 		// mechanism. So we do a cursorLeftIntern()-lite,
 		// without the dreaded mechanism. (JMarc)
-		if (cursor.par() != ownerParagraphs().begin()) {
+		if (cur.par() != 0) {
 			// steps into the above paragraph.
-			setCursorIntern(boost::prior(cursor.par()),
-					boost::prior(cursor.par())->size(),
+			setCursorIntern(cur, cur.par() - 1,
+					getPar(cur.par() - 1)->size(),
 					false);
 		}
 
@@ -1936,101 +1414,110 @@ void LyXText::backspace()
 		Buffer & buf = *bv()->buffer();
 		BufferParams const & bufparams = buf.params();
 		LyXTextClass const & tclass = bufparams.getLyXTextClass();
+		ParagraphList::iterator const cpit = getPar(cur.par());
 
-		if (cursor.par() != tmppit
-		    && (cursor.par()->layout() == tmppit->layout()
-			|| tmppit->layout() == tclass.defaultLayout())
-		    && cursor.par()->getAlign() == tmppit->getAlign()) {
-			mergeParagraph(bufparams,
-				       buf.paragraphs(), cursor.par());
+		if (cpit != tmppit
+		    && (cpit->layout() == tmppit->layout()
+		        || tmppit->layout() == tclass.defaultLayout())
+		    && cpit->getAlign() == tmppit->getAlign()) {
+			mergeParagraph(bufparams, buf.paragraphs(), cpit);
 
-			if (cursor.pos() && cursor.par()->isSeparator(cursor.pos() - 1))
-				cursor.pos(cursor.pos() - 1);
+			if (cur.pos() != 0 && cpit->isSeparator(cur.pos() - 1))
+				--cur.pos();
 
-			// the row may have changed, block, hfills etc.
+			// the counters may have changed
 			updateCounters();
-			setCursor(cursor.par(), cursor.pos(), false);
+			setCursor(cur, cur.par(), cur.pos(), false);
 		}
 	} else {
 		// this is the code for a normal backspace, not pasting
 		// any paragraphs
-		recordUndo(bv(), Undo::DELETE, cursor.par());
+		recordUndo(cur, Undo::DELETE);
 		// We used to do cursorLeftIntern() here, but it is
 		// not a good idea since it triggers the auto-delete
 		// mechanism. So we do a cursorLeftIntern()-lite,
 		// without the dreaded mechanism. (JMarc)
-		setCursorIntern(cursor.par(), cursor.pos() - 1,
-				false, cursor.boundary());
-		cursor.par()->erase(cursor.pos());
+		setCursorIntern(cur, cur.par(), cur.pos() - 1,
+				false, cur.boundary());
+		cur.paragraph().erase(cur.pos());
 	}
 
-	lastpos = cursor.par()->size();
-	if (cursor.pos() == lastpos)
-		setCurrentFont();
+	if (cur.pos() == cur.lastpos())
+		setCurrentFont(cur);
 
-	redoParagraph();
-	setCursor(cursor.par(), cursor.pos(), false, !cursor.boundary());
+	redoParagraph(cur);
+	setCursor(cur, cur.par(), cur.pos(), false, cur.boundary());
 }
 
 
-RowList::iterator LyXText::cursorRow() const
+ParagraphList::iterator LyXText::cursorPar() const
 {
-	return getRow(cursor.par(), cursor.pos());
+	//lyxerr << "### cursorPar: cursor: " << bv()->cursor() << endl;
+	//lyxerr << "xxx cursorPar: cursor: " << cursor() << endl;
+	return getPar(cursor().par());
 }
 
 
-RowList::iterator LyXText::getRow(LyXCursor const & cur) const
+ParagraphList::iterator LyXText::getPar(CursorSlice const & cur) const
 {
-	return getRow(cur.par(), cur.pos());
+	return getPar(cur.par());
 }
 
 
-RowList::iterator
-LyXText::getRow(ParagraphList::iterator pit, pos_type pos) const
+ParagraphList::iterator LyXText::getPar(int par) const
 {
-	RowList::iterator rit = boost::prior(pit->rows.end());
-	RowList::iterator const begin = pit->rows.begin();
-
-	while (rit != begin && rit->pos() > pos)
-		--rit;
-
-	return rit;
+	//lyxerr << "getPar: " << par << " from " << paragraphs().size() << endl;
+	BOOST_ASSERT(par >= 0);
+	BOOST_ASSERT(par < int(paragraphs().size()));
+	ParagraphList::iterator pit = paragraphs().begin();
+	advance(pit, par);
+	return pit;
 }
 
 
-// returns pointer to some fancy row 'below' specified row
-RowList::iterator LyXText::cursorIRow() const
+// y is relative to this LyXText's top
+RowList::iterator
+LyXText::getRowNearY(int y, ParagraphList::iterator & pit) const
 {
-	return getRow(cursor.par(), cursor.pos());
-}
-
+	BOOST_ASSERT(!paragraphs().empty());
+	BOOST_ASSERT(!paragraphs().begin()->rows.empty());
+#if 1
+	ParagraphList::iterator const
+		pend = boost::prior(paragraphs().end());
+	pit = paragraphs().begin();
+	while (int(pit->y + pit->height) < y && pit != pend)
+		++pit;
 
-RowList::iterator LyXText::getRowNearY(int y,
-	ParagraphList::iterator & pit) const
-{
-	//lyxerr << "getRowNearY: y " << y << endl;
+	RowList::iterator rit = pit->rows.end();
+	RowList::iterator const rbegin = pit->rows.begin();
+	do {
+		--rit;
+	} while (rit != rbegin && int(pit->y + rit->y_offset()) > y);
 
-	pit = boost::prior(ownerParagraphs().end());
+	return rit;
+#else
+	pit = boost::prior(paragraphs().end());
 
 	RowList::iterator rit = lastRow();
 	RowList::iterator rbegin = firstRow();
 
-	while (rit != rbegin && static_cast<int>(rit->y()) > y)
+	while (rit != rbegin && int(pit->y + rit->y_offset()) > y)
 		previousRow(pit, rit);
 
 	return rit;
+#endif
 }
 
 
 int LyXText::getDepth() const
 {
-	return cursor.par()->getDepth();
+	return cursorPar()->getDepth();
 }
 
 
 RowList::iterator LyXText::firstRow() const
 {
-	return ownerParagraphs().front().rows.begin();
+	return paragraphs().front().rows.begin();
 }
 
 
@@ -2042,7 +1529,7 @@ RowList::iterator LyXText::lastRow() const
 
 RowList::iterator LyXText::endRow() const
 {
-	return ownerParagraphs().back().rows.end();
+	return paragraphs().back().rows.end();
 }
 
 
@@ -2052,7 +1539,7 @@ void LyXText::nextRow(ParagraphList::iterator & pit,
 	++rit;
 	if (rit == pit->rows.end()) {
 		++pit;
-		if (pit == ownerParagraphs().end())
+		if (pit == paragraphs().end())
 			--pit;
 		else
 			rit = pit->rows.begin();
@@ -2066,14 +1553,517 @@ void LyXText::previousRow(ParagraphList::iterator & pit,
 	if (rit != pit->rows.begin())
 		--rit;
 	else {
-		Assert(pit != ownerParagraphs().begin());
+		BOOST_ASSERT(pit != paragraphs().begin());
 		--pit;
 		rit = boost::prior(pit->rows.end());
 	}
 }
 
 
-bool LyXText::noRows() const
+int LyXText::parOffset(ParagraphList::iterator pit) const
+{
+	return distance(paragraphs().begin(), pit);
+}
+
+
+void LyXText::redoParagraphInternal(ParagraphList::iterator pit)
+{
+	// remove rows of paragraph, keep track of height changes
+	height -= pit->height;
+
+	// clear old data
+	pit->rows.clear();
+	pit->height = 0;
+	pit->width = 0;
+
+	// redo insets
+	InsetList::iterator ii = pit->insetlist.begin();
+	InsetList::iterator iend = pit->insetlist.end();
+	for (; ii != iend; ++ii) {
+		Dimension dim;
+		int const w = textWidth() - leftMargin(pit) - rightMargin(*pit);
+		MetricsInfo mi(bv(), getFont(pit, ii->pos), w);
+		ii->inset->metrics(mi, dim);
+	}
+
+	// rebreak the paragraph
+	pit->setBeginOfBody();
+	pos_type z = 0;
+	do {
+		Row row(z);
+		rowBreakPoint(pit, row);
+		setRowWidth(pit, row);
+		prepareToPrint(pit, row);
+		setHeightOfRow(pit, row);
+		row.y_offset(pit->height);
+		pit->rows.push_back(row);
+		pit->width = std::max(pit->width, row.width());
+		pit->height += row.height();
+		z = row.endpos();
+	} while (z < pit->size());
+
+	height += pit->height;
+	//lyxerr << "redoParagraph: " << pit->rows.size() << " rows\n";
+}
+
+
+void LyXText::redoParagraphs(ParagraphList::iterator pit,
+  ParagraphList::iterator end)
+{
+	for ( ; pit != end; ++pit)
+		redoParagraphInternal(pit);
+	updateParPositions();
+}
+
+
+void LyXText::redoParagraph(ParagraphList::iterator pit)
+{
+	redoParagraphInternal(pit);
+	updateParPositions();
+}
+
+
+void LyXText::fullRebreak()
+{
+	redoParagraphs(paragraphs().begin(), paragraphs().end());
+	bv()->cursor().resetAnchor();
+}
+
+
+void LyXText::metrics(MetricsInfo & mi, Dimension & dim)
+{
+	//BOOST_ASSERT(mi.base.textwidth);
+	if (mi.base.textwidth)
+		textwidth_ = mi.base.textwidth;
+	//lyxerr << "LyXText::metrics: width: " << mi.base.textwidth
+	//	<< " textWidth: " << textWidth() << "\nfont: " << mi.base.font << endl;
+
+	// Rebuild row cache. This recomputes height as well.
+	redoParagraphs(paragraphs().begin(), paragraphs().end());
+
+	width = maxParagraphWidth(paragraphs());
+
+	// final dimension
+	dim.asc = firstRow()->ascent_of_text();
+	dim.des = height - dim.asc;
+	dim.wid = width;
+}
+
+
+// only used for inset right now. should also be used for main text
+void LyXText::draw(PainterInfo & pi, int x, int y) const
+{
+	xo_ = x;
+	yo_ = y;
+	paintTextInset(*this, pi, x, y);
+}
+
+
+// only used for inset right now. should also be used for main text
+void LyXText::drawSelection(PainterInfo &, int, int) const
+{
+	//lyxerr << "LyXText::drawSelection at " << x << " " << y << endl;
+}
+
+
+bool LyXText::isLastRow(ParagraphList::iterator pit, Row const & row) const
 {
-	return ownerParagraphs().begin()->rows.empty();
+	return row.endpos() >= pit->size()
+	       && boost::next(pit) == paragraphs().end();
+}
+
+
+bool LyXText::isFirstRow(ParagraphList::iterator pit, Row const & row) const
+{
+	return row.pos() == 0 && pit == paragraphs().begin();
+}
+
+
+void LyXText::getWord(CursorSlice & from, CursorSlice & to,
+	word_location const loc)
+{
+	Paragraph & from_par = *getPar(from);
+	switch (loc) {
+	case lyx::WHOLE_WORD_STRICT:
+		if (from.pos() == 0 || from.pos() == from_par.size()
+		    || from_par.isSeparator(from.pos())
+		    || from_par.isKomma(from.pos())
+		    || from_par.isNewline(from.pos())
+		    || from_par.isSeparator(from.pos() - 1)
+		    || from_par.isKomma(from.pos() - 1)
+		    || from_par.isNewline(from.pos() - 1)) {
+			to = from;
+			return;
+		}
+		// no break here, we go to the next
+
+	case lyx::WHOLE_WORD:
+		// Move cursor to the beginning, when not already there.
+		if (from.pos() && !from_par.isSeparator(from.pos() - 1)
+		    && !(from_par.isKomma(from.pos() - 1)
+			 || from_par.isNewline(from.pos() - 1)))
+			cursorLeftOneWord(bv()->cursor());
+		break;
+	case lyx::PREVIOUS_WORD:
+		// always move the cursor to the beginning of previous word
+		cursorLeftOneWord(bv()->cursor());
+		break;
+	case lyx::NEXT_WORD:
+		lyxerr << "LyXText::getWord: NEXT_WORD not implemented yet"
+		       << endl;
+		break;
+	case lyx::PARTIAL_WORD:
+		break;
+	}
+	to = from;
+	Paragraph & to_par = *getPar(to);
+	while (to.pos() < to_par.size()
+	       && !to_par.isSeparator(to.pos())
+	       && !to_par.isKomma(to.pos())
+	       && !to_par.isNewline(to.pos())
+	       && !to_par.isHfill(to.pos())
+	       && !to_par.isInset(to.pos()))
+	{
+		++to.pos();
+	}
+}
+
+
+void LyXText::write(Buffer const & buf, std::ostream & os) const
+{
+	ParagraphList::const_iterator pit = paragraphs().begin();
+	ParagraphList::const_iterator end = paragraphs().end();
+	Paragraph::depth_type dth = 0;
+	for (; pit != end; ++pit)
+		pit->write(buf, os, buf.params(), dth);
+}
+
+
+bool LyXText::read(Buffer const & buf, LyXLex & lex)
+{
+	static Change current_change;
+
+	bool the_end_read = false;
+	ParagraphList::iterator pit = paragraphs().begin();
+	Paragraph::depth_type depth = 0;
+
+	while (lex.isOK()) {
+		lex.nextToken();
+		string token = lex.getString();
+
+		if (token.empty())
+			continue;
+
+		if (in_inset_) {
+
+			if (token == "\\end_inset") {
+				the_end_read = true;
+				break;
+			}
+
+			if (token == "\\end_document") {
+				lex.printError("\\end_document read in inset! Error in document!");
+				return false;
+			}
+
+		} else {
+
+			if (token == "\\end_document") {
+				the_end_read = true;
+				continue;
+			}
+
+		}
+
+		// FIXME: ugly.
+		int unknown = 0;
+
+		if (token == "\\begin_layout") {
+			lex.pushToken(token);
+
+			Paragraph par;
+			par.params().depth(depth);
+			if (buf.params().tracking_changes)
+				par.trackChanges();
+			LyXFont f(LyXFont::ALL_INHERIT, buf.params().language);
+			par.setFont(0, f);
+
+			// insert after
+			if (pit != paragraphs().end())
+				++pit;
+
+			pit = paragraphs().insert(pit, par);
+
+			// FIXME: goddamn InsetTabular makes us pass a Buffer
+			// not BufferParams
+			::readParagraph(buf, *pit, lex);
+
+		} else if (token == "\\begin_deeper") {
+			++depth;
+		} else if (token == "\\end_deeper") {
+			if (!depth) {
+				lex.printError("\\end_deeper: " "depth is already null");
+			} else {
+				--depth;
+			}
+		} else {
+			++unknown;
+		}
+
+	}
+	return the_end_read;
+}
+
+
+int LyXText::ascent() const
+{
+	return firstRow()->ascent_of_text();
+}
+
+
+int LyXText::descent() const
+{
+	return height - firstRow()->ascent_of_text();
+}
+
+
+int LyXText::cursorX(CursorSlice const & cur) const
+{
+	ParagraphList::iterator pit = getPar(cur);
+	if (pit->rows.empty())
+		return xo_;
+	Row const & row         = *pit->getRow(cur.pos());
+	pos_type pos            = cur.pos();
+	pos_type cursor_vpos    = 0;
+	double x                = row.x();
+	double fill_separator   = row.fill_separator();
+	double fill_hfill       = row.fill_hfill();
+	double fill_label_hfill = row.fill_label_hfill();
+	pos_type const row_pos  = row.pos();
+	pos_type const end      = row.endpos();
+
+	if (end <= row_pos)
+		cursor_vpos = row_pos;
+	else if (pos >= end)
+		cursor_vpos = isRTL(*pit) ? row_pos : end;
+	else if (pos > row_pos && pos >= end)
+		// Place cursor after char at (logical) position pos - 1
+		cursor_vpos = (bidi.level(pos - 1) % 2 == 0)
+			? bidi.log2vis(pos - 1) + 1 : bidi.log2vis(pos - 1);
+	else
+		// Place cursor before char at (logical) position pos
+		cursor_vpos = (bidi.level(pos) % 2 == 0)
+			? bidi.log2vis(pos) : bidi.log2vis(pos) + 1;
+
+	pos_type body_pos = pit->beginOfBody();
+	if (body_pos > 0 &&
+	    (body_pos > end || !pit->isLineSeparator(body_pos - 1)))
+		body_pos = 0;
+
+	for (pos_type vpos = row_pos; vpos < cursor_vpos; ++vpos) {
+		pos_type pos = bidi.vis2log(vpos);
+		if (body_pos > 0 && pos == body_pos - 1) {
+			x += fill_label_hfill
+				+ font_metrics::width(pit->layout()->labelsep,
+						      getLabelFont(pit));
+			if (pit->isLineSeparator(body_pos - 1))
+				x -= singleWidth(pit, body_pos - 1);
+		}
+
+		if (hfillExpansion(*pit, row, pos)) {
+			x += singleWidth(pit, pos);
+			if (pos >= body_pos)
+				x += fill_hfill;
+			else
+				x += fill_label_hfill;
+		} else if (pit->isSeparator(pos)) {
+			x += singleWidth(pit, pos);
+			if (pos >= body_pos)
+				x += fill_separator;
+		} else
+			x += singleWidth(pit, pos);
+	}
+	return xo_ + int(x);
+}
+
+
+int LyXText::cursorY(CursorSlice const & cur) const
+{
+	Paragraph & par = *getPar(cur);
+	Row & row = *par.getRow(cur.pos());
+	return yo_ + par.y + row.y_offset() + row.baseline();
+}
+
+
+CursorSlice & LyXText::cursor()
+{
+	//lyxerr << "# accessing slice " << findText(this) << endl;
+	if (this != bv()->cursor().text()) {
+		lyxerr << "cursor: " << bv()->cursor()
+			<< "\ntext: " << bv()->cursor().text() 
+			<< "\nthis: " << this << endl;
+		BOOST_ASSERT(false);
+	}
+	return bv()->cursor().current();
+}
+
+
+CursorSlice const & LyXText::cursor() const
+{
+	if (this != bv()->cursor().text()) {
+		lyxerr << "cursor: " << bv()->cursor()
+			<< "\ntext: " << bv()->cursor().text() 
+			<< "\nthis: " << this << endl;
+		BOOST_ASSERT(false);
+	}
+	return bv()->cursor().current();
+}
+
+
+void LyXText::replaceSelection(LCursor & cur)
+{
+	BOOST_ASSERT(this == cur.text());
+	if (cur.selection()) {
+		cutSelection(cur, true, false);
+		cur.update();
+	}
+}
+
+
+// Returns the current font and depth as a message.
+string LyXText::currentState(LCursor & cur)
+{
+	BOOST_ASSERT(this == cur.text());
+	Buffer * buffer = bv()->buffer();
+	Paragraph const & par = cur.paragraph();
+	std::ostringstream os;
+
+	bool const show_change = buffer->params().tracking_changes
+		&& cur.pos() != cur.lastpos()
+		&& par.lookupChange(cur.pos()) != Change::UNCHANGED;
+
+	if (show_change) {
+		Change change = par.lookupChangeFull(cur.pos());
+		Author const & a = buffer->params().authors().get(change.author);
+		os << _("Change: ") << a.name();
+		if (!a.email().empty())
+			os << " (" << a.email() << ")";
+		if (change.changetime)
+			os << _(" at ") << ctime(&change.changetime);
+		os << " : ";
+	}
+
+	// I think we should only show changes from the default
+	// font. (Asger)
+	LyXFont font = real_current_font;
+	font.reduce(buffer->params().getLyXTextClass().defaultfont());
+
+	// avoid _(...) re-entrance problem
+	string const s = font.stateText(&buffer->params());
+	os << bformat(_("Font: %1$s"), s);
+
+	// os << bformat(_("Font: %1$s"), font.stateText(&buffer->params));
+
+	// The paragraph depth
+	int depth = getDepth();
+	if (depth > 0)
+		os << bformat(_(", Depth: %1$s"), tostr(depth));
+
+	// The paragraph spacing, but only if different from
+	// buffer spacing.
+	Spacing const & spacing = par.params().spacing();
+	if (!spacing.isDefault()) {
+		os << _(", Spacing: ");
+		switch (spacing.getSpace()) {
+		case Spacing::Single:
+			os << _("Single");
+			break;
+		case Spacing::Onehalf:
+			os << _("OneHalf");
+			break;
+		case Spacing::Double:
+			os << _("Double");
+			break;
+		case Spacing::Other:
+			os << _("Other (") << spacing.getValue() << ')';
+			break;
+		case Spacing::Default:
+			// should never happen, do nothing
+			break;
+		}
+	}
+#ifdef DEVEL_VERSION
+	os << _(", Paragraph: ") << par.id();
+	os << _(", Position: ") << cur.pos();
+	Row & row = cur.textRow();
+	os << bformat(_(", Row b:%1$d e:%2$d"), row.pos(), row.endpos());
+	os << _(", Inset: ");
+	InsetOld * inset = par.inInset();
+	if (inset)
+		os << inset << " owner: " << inset->owner();
+	else
+		os << -1;
+#endif
+	return os.str();
+}
+
+
+string LyXText::getPossibleLabel(LCursor & cur) const
+{
+	ParagraphList & plist = paragraphs();
+	ParagraphList::iterator pit = getPar(cur.par());
+
+	LyXLayout_ptr layout = pit->layout();
+
+	if (layout->latextype == LATEX_PARAGRAPH && pit != plist.begin()) {
+		ParagraphList::iterator pit2 = boost::prior(pit);
+
+		LyXLayout_ptr const & layout2 = pit2->layout();
+
+		if (layout2->latextype != LATEX_PARAGRAPH) {
+			pit = pit2;
+			layout = layout2;
+		}
+	}
+
+	string text = layout->latexname().substr(0, 3);
+	if (layout->latexname() == "theorem")
+		text = "thm"; // Create a correct prefix for prettyref
+
+	text += ':';
+	if (layout->latextype == LATEX_PARAGRAPH || lyxrc.label_init_length < 0)
+		text.erase();
+
+	string par_text = pit->asString(*cur.bv().buffer(), false);
+	for (int i = 0; i < lyxrc.label_init_length; ++i) {
+		if (par_text.empty())
+			break;
+		string head;
+		par_text = split(par_text, head, ' ');
+		// Is it legal to use spaces in labels ?
+		if (i > 0)
+			text += '-';
+		text += head;
+	}
+
+	return text;
+}
+
+
+int LyXText::dist(int x, int y) const
+{
+	int xx = 0;
+	int yy = 0;
+
+	if (x < xo_)
+		xx = xo_ - x;
+	else if (x > xo_ + width)
+		xx = x - xo_ - width;
+
+	if (y < yo_ - ascent())
+		yy = yo_ - ascent() - y;
+	else if (y > yo_ + descent())
+		yy = y - yo_ - descent();
+
+	return xx + yy;
 }