X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftext.C;h=797f7968233423c3904e16457c6e60a0067c2a77;hb=86e0dfa3e11957318ca4f3f549248326aa806eb4;hp=a474fb75369d550c176f500892822be1147ec530;hpb=5ea277209f9caa40798e71ef0545f55af9466ff8;p=lyx.git

diff --git a/src/text.C b/src/text.C
index a474fb7536..797f796823 100644
--- a/src/text.C
+++ b/src/text.C
@@ -18,17 +18,24 @@
 
 #include "lyxtext.h"
 
+#include "author.h"
 #include "buffer.h"
 #include "bufferparams.h"
 #include "BufferView.h"
+#include "cursor.h"
+#include "CutAndPaste.h"
 #include "debug.h"
 #include "dispatchresult.h"
 #include "encoding.h"
+#include "errorlist.h"
 #include "funcrequest.h"
+#include "factory.h"
+#include "FontIterator.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"
@@ -45,18 +52,39 @@
 #include "frontends/LyXView.h"
 
 #include "insets/insettext.h"
+#include "insets/insetbibitem.h"
+#include "insets/insethfill.h"
+#include "insets/insetlatexaccent.h"
+#include "insets/insetline.h"
+#include "insets/insetnewline.h"
+#include "insets/insetpagebreak.h"
+#include "insets/insetoptarg.h"
+#include "insets/insetspace.h"
+#include "insets/insetspecialchar.h"
+#include "insets/insettabular.h"
 
 #include "support/lstrings.h"
 #include "support/textutils.h"
+#include "support/tostr.h"
+#include "support/std_sstream.h"
 
+using lyx::par_type;
 using lyx::pos_type;
 using lyx::word_location;
 
+using lyx::support::bformat;
 using lyx::support::contains;
 using lyx::support::lowercase;
+using lyx::support::split;
 using lyx::support::uppercase;
 
+using lyx::cap::cutSelection;
+
+using std::auto_ptr;
+using std::advance;
+using std::distance;
 using std::max;
+using std::min;
 using std::endl;
 using std::string;
 
@@ -71,6 +99,19 @@ extern int const RIGHT_MARGIN = 10;
 
 namespace {
 
+int numberOfSeparators(Paragraph const & par, Row const & row)
+{
+	pos_type const first = max(row.pos(), par.beginOfBody());
+	pos_type const last = row.endpos() - 1;
+	int n = 0;
+	for (pos_type p = first; p < last; ++p) {
+		if (par.isSeparator(p))
+			++n;
+	}
+	return n;
+}
+
+
 unsigned int maxParagraphWidth(ParagraphList const & plist)
 {
 	unsigned int width = 0;
@@ -81,6 +122,282 @@ unsigned int maxParagraphWidth(ParagraphList const & plist)
 	return width;
 }
 
+
+int numberOfLabelHfills(Paragraph const & par, Row const & row)
+{
+	pos_type last = row.endpos() - 1;
+	pos_type first = row.pos();
+
+	// hfill *DO* count at the beginning of paragraphs!
+	if (first) {
+		while (first < last && par.isHfill(first))
+			++first;
+	}
+
+	last = min(last, par.beginOfBody());
+	int n = 0;
+	for (pos_type p = first; p < last; ++p) {
+		if (par.isHfill(p))
+			++n;
+	}
+	return n;
+}
+
+
+int numberOfHfills(Paragraph const & par, Row const & row)
+{
+	pos_type const last = row.endpos() - 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;
+}
+
+
+int readParToken(Buffer const & buf, Paragraph & par, LyXLex & lex,
+	string const & token)
+{
+	static LyXFont font;
+	static Change change;
+
+	BufferParams const & bp = buf.params();
+
+	if (token[0] != '\\') {
+		string::const_iterator cit = token.begin();
+		for (; cit != token.end(); ++cit) {
+			par.insertChar(par.size(), (*cit), font, change);
+		}
+	} else if (token == "\\begin_layout") {
+		lex.eatLine();
+		string layoutname = lex.getString();
+
+		font = LyXFont(LyXFont::ALL_INHERIT, bp.language);
+		change = Change();
+
+		LyXTextClass const & tclass = bp.getLyXTextClass();
+
+		if (layoutname.empty()) {
+			layoutname = tclass.defaultLayoutName();
+		}
+
+		bool hasLayout = tclass.hasLayout(layoutname);
+
+		if (!hasLayout) {
+			lyxerr << "Layout '" << layoutname << "' does not"
+			       << " exist in textclass '" << tclass.name()
+			       << "'." << endl;
+			lyxerr << "Trying to use default layout instead."
+			       << endl;
+			layoutname = tclass.defaultLayoutName();
+		}
+
+		par.layout(bp.getLyXTextClass()[layoutname]);
+
+		// Test whether the layout is obsolete.
+		LyXLayout_ptr const & layout = par.layout();
+		if (!layout->obsoleted_by().empty())
+			par.layout(bp.getLyXTextClass()[layout->obsoleted_by()]);
+
+		par.params().read(lex);
+
+	} else if (token == "\\end_layout") {
+		lyxerr << "Solitary \\end_layout in line " << lex.getLineNo() << "\n"
+		       << "Missing \\begin_layout?.\n";
+	} else if (token == "\\end_inset") {
+		lyxerr << "Solitary \\end_inset in line " << lex.getLineNo() << "\n"
+		       << "Missing \\begin_inset?.\n";
+	} else if (token == "\\begin_inset") {
+		InsetBase * inset = readInset(lex, buf);
+		if (inset)
+			par.insertInset(par.size(), inset, font, change);
+		else {
+			lex.eatLine();
+			string line = lex.getString();
+			buf.error(ErrorItem(_("Unknown Inset"), line,
+					    par.id(), 0, par.size()));
+			return 1;
+		}
+	} else if (token == "\\family") {
+		lex.next();
+		font.setLyXFamily(lex.getString());
+	} else if (token == "\\series") {
+		lex.next();
+		font.setLyXSeries(lex.getString());
+	} else if (token == "\\shape") {
+		lex.next();
+		font.setLyXShape(lex.getString());
+	} else if (token == "\\size") {
+		lex.next();
+		font.setLyXSize(lex.getString());
+	} else if (token == "\\lang") {
+		lex.next();
+		string const tok = lex.getString();
+		Language const * lang = languages.getLanguage(tok);
+		if (lang) {
+			font.setLanguage(lang);
+		} else {
+			font.setLanguage(bp.language);
+			lex.printError("Unknown language `$$Token'");
+		}
+	} else if (token == "\\numeric") {
+		lex.next();
+		font.setNumber(font.setLyXMisc(lex.getString()));
+	} else if (token == "\\emph") {
+		lex.next();
+		font.setEmph(font.setLyXMisc(lex.getString()));
+	} else if (token == "\\bar") {
+		lex.next();
+		string const tok = lex.getString();
+
+		if (tok == "under")
+			font.setUnderbar(LyXFont::ON);
+		else if (tok == "no")
+			font.setUnderbar(LyXFont::OFF);
+		else if (tok == "default")
+			font.setUnderbar(LyXFont::INHERIT);
+		else
+			lex.printError("Unknown bar font flag "
+				       "`$$Token'");
+	} else if (token == "\\noun") {
+		lex.next();
+		font.setNoun(font.setLyXMisc(lex.getString()));
+	} else if (token == "\\color") {
+		lex.next();
+		font.setLyXColor(lex.getString());
+	} else if (token == "\\InsetSpace" || token == "\\SpecialChar") {
+
+		// Insets don't make sense in a free-spacing context! ---Kayvan
+		if (par.isFreeSpacing()) {
+			if (token == "\\InsetSpace")
+				par.insertChar(par.size(), ' ', font, change);
+			else if (lex.isOK()) {
+				lex.next();
+				string const next_token = lex.getString();
+				if (next_token == "\\-")
+					par.insertChar(par.size(), '-', font, change);
+				else {
+					lex.printError("Token `$$Token' "
+						       "is in free space "
+						       "paragraph layout!");
+				}
+			}
+		} else {
+			auto_ptr<InsetBase> inset;
+			if (token == "\\SpecialChar" )
+				inset.reset(new InsetSpecialChar);
+			else
+				inset.reset(new InsetSpace);
+			inset->read(buf, lex);
+			par.insertInset(par.size(), inset.release(),
+					font, change);
+		}
+	} else if (token == "\\i") {
+		auto_ptr<InsetBase> inset(new InsetLatexAccent);
+		inset->read(buf, lex);
+		par.insertInset(par.size(), inset.release(), font, change);
+	} else if (token == "\\backslash") {
+		par.insertChar(par.size(), '\\', font, change);
+	} else if (token == "\\newline") {
+		auto_ptr<InsetBase> inset(new InsetNewline);
+		inset->read(buf, lex);
+		par.insertInset(par.size(), inset.release(), font, change);
+	} else if (token == "\\LyXTable") {
+		auto_ptr<InsetBase> inset(new InsetTabular(buf));
+		inset->read(buf, lex);
+		par.insertInset(par.size(), inset.release(), font, change);
+	} else if (token == "\\bibitem") {
+		InsetCommandParams p("bibitem", "dummy");
+		auto_ptr<InsetBibitem> inset(new InsetBibitem(p));
+		inset->read(buf, lex);
+		par.insertInset(par.size(), inset.release(), font, change);
+	} else if (token == "\\hfill") {
+		par.insertInset(par.size(), new InsetHFill, font, change);
+	} else if (token == "\\lyxline") {
+		par.insertInset(par.size(), new InsetLine, font, change);
+	} else if (token == "\\newpage") {
+		par.insertInset(par.size(), new InsetPagebreak, font, change);
+	} else if (token == "\\change_unchanged") {
+		// Hack ! Needed for empty paragraphs :/
+		// FIXME: is it still ??
+		if (!par.size())
+			par.cleanChanges();
+		change = Change(Change::UNCHANGED);
+	} else if (token == "\\change_inserted") {
+		lex.nextToken();
+		std::istringstream is(lex.getString());
+		int aid;
+		lyx::time_type ct;
+		is >> aid >> ct;
+		change = Change(Change::INSERTED, bp.author_map[aid], ct);
+	} else if (token == "\\change_deleted") {
+		lex.nextToken();
+		std::istringstream is(lex.getString());
+		int aid;
+		lyx::time_type ct;
+		is >> aid >> ct;
+		change = Change(Change::DELETED, bp.author_map[aid], ct);
+	} else {
+		lex.eatLine();
+		buf.error(ErrorItem(_("Unknown token"),
+			bformat(_("Unknown token: %1$s %2$s\n"), token, lex.getString()),
+			par.id(), 0, par.size()));
+		return 1;
+	}
+	return 0;
+}
+
+
+int readParagraph(Buffer const & buf, Paragraph & par, LyXLex & lex)
+{
+	int unknown = 0;
+
+	lex.nextToken();
+	string token = lex.getString();
+
+	while (lex.isOK()) {
+
+		unknown += readParToken(buf, par, lex, token);
+
+		lex.nextToken();
+		token = lex.getString();
+
+		if (token.empty())
+			continue;
+
+		if (token == "\\end_layout") {
+			//Ok, paragraph finished
+			break;
+		}
+
+		lyxerr[Debug::PARSER] << "Handling paragraph token: `"
+				      << token << '\'' << endl;
+		if (token == "\\begin_layout" || token == "\\end_document"
+		    || token == "\\end_inset" || token == "\\begin_deeper"
+		    || token == "\\end_deeper") {
+			lex.pushToken(token);
+			lyxerr << "Paragraph ended in line "
+			       << lex.getLineNo() << "\n"
+			       << "Missing \\end_layout.\n";
+			break;
+		}
+	}
+
+	return unknown;
+}
+
+
 } // namespace anon
 
 
@@ -91,6 +408,13 @@ BufferView * LyXText::bv()
 }
 
 
+BufferView * LyXText::bv() const
+{
+	BOOST_ASSERT(bv_owner != 0);
+	return bv_owner;
+}
+
+
 double LyXText::spacing(Paragraph const & par) const
 {
 	if (par.params().spacing().isDefault())
@@ -99,44 +423,43 @@ double LyXText::spacing(Paragraph const & par) const
 }
 
 
-BufferView * LyXText::bv() const
+void LyXText::updateParPositions()
 {
-	BOOST_ASSERT(bv_owner != 0);
-	return bv_owner;
+	par_type pit = 0;
+	par_type end = pars_.size();
+	for (height_ = 0; pit != end; ++pit) {
+		pars_[pit].y = height_;
+		height_ += pars_[pit].height;
+	}
 }
 
 
-void LyXText::updateParPositions()
+int LyXText::width() const
 {
-	ParagraphList::iterator pit = paragraphs().begin();
-	ParagraphList::iterator end = paragraphs().end();
-	for (height = 0; pit != end; ++pit) {
-		pit->y = height;
-		height += pit->height;
-	}
+	return width_;
 }
 
 
-int LyXText::textWidth() const
+int LyXText::height() const
 {
-	return textwidth_;
+	return height_;
 }
 
 
-int LyXText::singleWidth(ParagraphList::iterator pit, pos_type pos) const
+int LyXText::singleWidth(par_type par, pos_type pos) const
 {
-	if (pos >= pit->size())
+	if (pos >= pars_[par].size())
 		return 0;
 
-	char const c = pit->getChar(pos);
-	return singleWidth(pit, pos, c, getFont(pit, pos));
+	char const c = pars_[par].getChar(pos);
+	return singleWidth(par, pos, c, getFont(par, pos));
 }
 
 
-int LyXText::singleWidth(ParagraphList::iterator pit,
+int LyXText::singleWidth(par_type pit,
 			 pos_type pos, char c, LyXFont const & font) const
 {
-	if (pos >= pit->size()) {
+	if (pos >= pars_[pit].size()) {
 		lyxerr << "in singleWidth(), pos: " << pos << endl;
 		BOOST_ASSERT(false);
 		return 0;
@@ -151,7 +474,7 @@ int LyXText::singleWidth(ParagraphList::iterator pit,
 				if (Encodings::IsComposeChar_arabic(c))
 					return 0;
 				else
-					c = pit->transformChar(c, pos);
+					c = pars_[pit].transformChar(c, pos);
 			} else if (font.language()->lang() == "hebrew" &&
 				 Encodings::IsComposeChar_hebrew(c))
 				return 0;
@@ -160,7 +483,7 @@ int LyXText::singleWidth(ParagraphList::iterator pit,
 	}
 
 	if (c == Paragraph::META_INSET)
-		return pit->getInset(pos)->width();
+		return pars_[pit].getInset(pos)->width();
 
 	if (IsSeparatorChar(c))
 		c = ' ';
@@ -168,17 +491,17 @@ int LyXText::singleWidth(ParagraphList::iterator pit,
 }
 
 
-int LyXText::leftMargin(ParagraphList::iterator pit) const
+int LyXText::leftMargin(par_type pit) const
 {
-	return leftMargin(pit, pit->size());
+	return leftMargin(pit, pars_[pit].size());
 }
 
 
-int LyXText::leftMargin(ParagraphList::iterator pit, pos_type pos) const
+int LyXText::leftMargin(par_type pit, pos_type pos) const
 {
 	LyXTextClass const & tclass =
 		bv()->buffer()->params().getLyXTextClass();
-	LyXLayout_ptr const & layout = pit->layout();
+	LyXLayout_ptr const & layout = pars_[pit].layout();
 
 	string parindent = layout->parindent;
 
@@ -189,34 +512,33 @@ int LyXText::leftMargin(ParagraphList::iterator pit, pos_type pos) const
 	// 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() == 0) {
-		if (pit->layout() == tclass.defaultLayout()) {
+	if (pars_[pit].getDepth() == 0) {
+		if (pars_[pit].layout() == tclass.defaultLayout()) {
 			// find the previous same level paragraph
-			if (pit != paragraphs().begin()) {
-				ParagraphList::iterator newpit =
-					depthHook(pit, paragraphs(), pit->getDepth());
-				if (newpit == pit && newpit->layout()->nextnoindent)
+			if (pit != 0) {
+				par_type newpit =
+					depthHook(pit, paragraphs(), pars_[pit].getDepth());
+				if (newpit == pit && pars_[newpit].layout()->nextnoindent)
 					parindent.erase();
 			}
 		}
 	} else {
 		// find the next level paragraph
-		ParagraphList::iterator newpar =
-			outerHook(pit, paragraphs());
+		par_type newpar = outerHook(pit, pars_);
 
 		// Make a corresponding row. Need to call leftMargin()
 		// to check whether it is a sufficent paragraph.
-		if (newpar != paragraphs().end()
-		    && newpar->layout()->isEnvironment()) {
+		if (newpar != par_type(pars_.size())
+		    && pars_[newpar].layout()->isEnvironment()) {
 			x = leftMargin(newpar);
 		}
 
-		if (newpar != paragraphs().end()
-		    && pit->layout() == tclass.defaultLayout()) {
-			if (newpar->params().noindent())
+		if (newpar != par_type(paragraphs().size())
+		    && pars_[pit].layout() == tclass.defaultLayout()) {
+			if (pars_[newpar].params().noindent())
 				parindent.erase();
 			else
-				parindent = newpar->layout()->parindent;
+				parindent = pars_[newpar].layout()->parindent;
 		}
 	}
 
@@ -226,10 +548,10 @@ int LyXText::leftMargin(ParagraphList::iterator pit, pos_type pos) const
 		if (!layout->leftmargin.empty())
 			x += font_metrics::signedWidth(layout->leftmargin,
 						  tclass.defaultfont());
-		if (!pit->getLabelstring().empty()) {
+		if (!pars_[pit].getLabelstring().empty()) {
 			x += font_metrics::signedWidth(layout->labelindent,
 						  labelfont);
-			x += font_metrics::width(pit->getLabelstring(),
+			x += font_metrics::width(pars_[pit].getLabelstring(),
 					    labelfont);
 			x += font_metrics::width(layout->labelsep, labelfont);
 		}
@@ -238,9 +560,9 @@ int LyXText::leftMargin(ParagraphList::iterator pit, pos_type pos) const
 	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() && pos >= pit->beginOfBody()) {
-			if (!pit->getLabelWidthString().empty()) {
-				x += font_metrics::width(pit->getLabelWidthString(),
+		if (!pars_[pit].empty() && pos >= pars_[pit].beginOfBody()) {
+			if (!pars_[pit].getLabelWidthString().empty()) {
+				x += font_metrics::width(pars_[pit].getLabelWidthString(),
 					       labelfont);
 				x += font_metrics::width(layout->labelsep, labelfont);
 			}
@@ -249,12 +571,12 @@ int LyXText::leftMargin(ParagraphList::iterator pit, pos_type pos) const
 
 	case MARGIN_STATIC:
 		x += font_metrics::signedWidth(layout->leftmargin, tclass.defaultfont()) * 4
-			/ (pit->getDepth() + 4);
+			/ (pars_[pit].getDepth() + 4);
 		break;
 
 	case MARGIN_FIRST_DYNAMIC:
 		if (layout->labeltype == LABEL_MANUAL) {
-			if (pos >= pit->beginOfBody()) {
+			if (pos >= pars_[pit].beginOfBody()) {
 				x += font_metrics::signedWidth(layout->leftmargin,
 							  labelfont);
 			} else {
@@ -276,7 +598,7 @@ int LyXText::leftMargin(ParagraphList::iterator pit, pos_type pos) const
 			x += font_metrics::signedWidth(layout->labelindent,
 						  labelfont);
 			x += font_metrics::width(layout->labelsep, labelfont);
-			x += font_metrics::width(pit->getLabelstring(),
+			x += font_metrics::width(pars_[pit].getLabelstring(),
 					    labelfont);
 		}
 		break;
@@ -285,10 +607,12 @@ int LyXText::leftMargin(ParagraphList::iterator pit, pos_type pos) const
 #if 0
 		// ok, a terrible hack. The left margin depends on the widest
 		// row in this paragraph.
-		RowList::iterator rit = pit->rows.begin();
-		RowList::iterator end = pit->rows.end();
+		RowList::iterator rit = pars_[pit].rows.begin();
+		RowList::iterator end = pars_[pit].rows.end();
+#ifdef WITH_WARNINGS
 #warning This is wrong.
-		int minfill = textwidth_;
+#endif
+		int minfill = maxwidth_;
 		for ( ; rit != end; ++rit)
 			if (rit->fill() < minfill)
 				minfill = rit->fill();
@@ -297,41 +621,40 @@ int LyXText::leftMargin(ParagraphList::iterator pit, pos_type pos) const
 		x += minfill;
 #endif
 		// also wrong, but much shorter.
-		x += textwidth_ / 2;
+		x += maxwidth_ / 2;
 		break;
 	}
 	}
 
-	if (!pit->params().leftIndent().zero())
-		x += pit->params().leftIndent().inPixels(textWidth());
+
+	if (!pars_[pit].params().leftIndent().zero())
+		x += pars_[pit].params().leftIndent().inPixels(maxwidth_);
 
 	LyXAlignment align;
 
-	if (pit->params().align() == LYX_ALIGN_LAYOUT)
+	if (pars_[pit].params().align() == LYX_ALIGN_LAYOUT)
 		align = layout->align;
 	else
-		align = pit->params().align();
+		align = pars_[pit].params().align();
 
 	// set the correct parindent
-	if (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, 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());
-		}
+	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
+	    && !pars_[pit].params().noindent()
+	    // in tabulars and ert paragraphs are never indented!
+	    && (pars_[pit].ownerCode() != InsetOld::TABULAR_CODE
+	            && pars_[pit].ownerCode() != InsetOld::ERT_CODE)
+	    && (pars_[pit].layout() != tclass.defaultLayout()
+	        || bv()->buffer()->params().paragraph_separation ==
+	           BufferParams::PARSEP_INDENT))
+	{
+		x += font_metrics::signedWidth(parindent, tclass.defaultfont());
 	}
 
 	return x;
@@ -342,7 +665,7 @@ int LyXText::rightMargin(Paragraph const & par) const
 {
 	LyXTextClass const & tclass = bv()->buffer()->params().getLyXTextClass();
 
-	return 
+	return
 		RIGHT_MARGIN
 		+ font_metrics::signedWidth(tclass.rightmargin(),
 				       tclass.defaultfont())
@@ -352,10 +675,10 @@ int LyXText::rightMargin(Paragraph const & par) const
 }
 
 
-int LyXText::labelEnd(ParagraphList::iterator pit) const
+int LyXText::labelEnd(par_type pit) const
 {
 	// labelEnd is only needed if the layout fills a flushleft label.
-	if (pit->layout()->margintype != MARGIN_MANUAL)
+	if (pars_[pit].layout()->margintype != MARGIN_MANUAL)
 		return 0;
 	// return the beginning of the body
 	return leftMargin(pit);
@@ -379,9 +702,9 @@ pos_type addressBreakPoint(pos_type i, Paragraph const & par)
 };
 
 
-void LyXText::rowBreakPoint(ParagraphList::iterator pit, Row & row) const
+void LyXText::rowBreakPoint(par_type pit, Row & row) const
 {
-	pos_type const end = pit->size();
+	pos_type const end = pars_[pit].size();
 	pos_type const pos = row.pos();
 	if (pos == end) {
 		row.endpos(end);
@@ -389,20 +712,20 @@ void LyXText::rowBreakPoint(ParagraphList::iterator pit, Row & row) const
 	}
 
 	// maximum pixel width of a row
-	int width = textWidth() - rightMargin(*pit); // - leftMargin(pit, row);
+	int width = maxwidth_ - rightMargin(pars_[pit]); // - leftMargin(pit, row);
 	if (width < 0) {
 		row.endpos(end);
 		return;
 	}
 
-	LyXLayout_ptr const & layout = pit->layout();
+	LyXLayout_ptr const & layout = pars_[pit].layout();
 
 	if (layout->margintype == MARGIN_RIGHT_ADDRESS_BOX) {
-		row.endpos(addressBreakPoint(pos, *pit));
+		row.endpos(addressBreakPoint(pos, pars_[pit]));
 		return;
 	}
 
-	pos_type const body_pos = pit->beginOfBody();
+	pos_type const body_pos = pars_[pit].beginOfBody();
 
 
 	// Now we iterate through until we reach the right margin
@@ -415,45 +738,19 @@ void LyXText::rowBreakPoint(ParagraphList::iterator pit, Row & row) const
 	// pixel width since last breakpoint
 	int chunkwidth = 0;
 
-
-	// We re-use the font resolution for the entire font span when possible
-	LyXFont font = getFont(pit, pos);
-	lyx::pos_type endPosOfFontSpan = pit->getEndPosOfFontSpan(pos);
-
+	FontIterator fi = FontIterator(*this, pit, pos);
 	pos_type point = end;
 	pos_type i = pos;
-	for ( ; i < end; ++i) {
-		if (pit->isNewline(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);
-		}
+	for ( ; i < end; ++i, ++fi) {
+		char const c = pars_[pit].getChar(i);
 
 		{
-			int thiswidth = singleWidth(pit, i, c, font);
+			int thiswidth = singleWidth(pit, i, c, *fi);
 
 			// 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))
+				if (pars_[pit].isLineSeparator(i - 1))
 					add -= singleWidth(pit, i - 1);
 
 				add = std::max(add, labelEnd(pit) - x);
@@ -461,8 +758,6 @@ void LyXText::rowBreakPoint(ParagraphList::iterator pit, Row & row) const
 			}
 
 			x += thiswidth;
-			//lyxerr << "i: " << i << " x: "
-			//<< x << " width: " << width << endl;
 			chunkwidth += thiswidth;
 		}
 
@@ -471,18 +766,36 @@ void LyXText::rowBreakPoint(ParagraphList::iterator pit, Row & row) const
 		if (x >= width) {
 			// if no break before, break here
 			if (point == end || chunkwidth >= width - left) {
-				if (i > pos) {
+				if (i > pos)
 					point = i;
-					break;
-				}
+				else
+					point = i + 1;
+
 			}
 			// exit on last registered breakpoint:
 			break;
 		}
 
-		if (!pit->isInset(i) || pit->getInset(i)->isChar()) {
+		if (pars_[pit].isNewline(i)) {
+			point = i + 1;
+			break;
+		}
+		// Break before...
+		if (i + 1 < end) {
+			if (pars_[pit].isInset(i + 1) && pars_[pit].getInset(i + 1)->display()) {
+				point = i + 1;
+				break;
+			}
+			// ...and after.
+			if (pars_[pit].isInset(i) && pars_[pit].getInset(i)->display()) {
+				point = i + 1;
+				break;
+			}
+		}
+
+		if (!pars_[pit].isInset(i) || pars_[pit].getInset(i)->isChar()) {
 			// some insets are line separators too
-			if (pit->isLineSeparator(i)) {
+			if (pars_[pit].isLineSeparator(i)) {
 				// register breakpoint:
 				point = i + 1;
 				chunkwidth = 0;
@@ -490,10 +803,9 @@ void LyXText::rowBreakPoint(ParagraphList::iterator pit, Row & row) const
 		}
 	}
 
-	if (i == end && x < width) {
-		// maybe found one, but the par is short enough.
+	// maybe found one, but the par is short enough.
+	if (i == end && x < width)
 		point = end;
-	}
 
 	// manual labels cannot be broken in LaTeX. But we
 	// want to make our on-screen rendering of footnotes
@@ -505,56 +817,46 @@ void LyXText::rowBreakPoint(ParagraphList::iterator pit, Row & row) const
 }
 
 
-// returns the minimum space a row needs on the screen in pixel
-void LyXText::fill(ParagraphList::iterator pit, Row & row, int workwidth) const
+void LyXText::setRowWidth(par_type pit, Row & row) const
 {
 	// get the pure distance
 	pos_type const end = row.endpos();
 
-	string labelsep = pit->layout()->labelsep;
+	string labelsep = pars_[pit].layout()->labelsep;
 	int w = leftMargin(pit, row.pos());
 
-	pos_type const body_pos = pit->beginOfBody();
+	pos_type const body_pos = pars_[pit].beginOfBody();
 	pos_type i = row.pos();
 
 	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);
-		for ( ; i < end; ++i) {
+		FontIterator fi = FontIterator(*this, pit, i);
+		for ( ; i < end; ++i, ++fi) {
 			if (body_pos > 0 && i == body_pos) {
 				w += font_metrics::width(labelsep, getLabelFont(pit));
-				if (pit->isLineSeparator(i - 1))
+				if (pars_[pit].isLineSeparator(i - 1))
 					w -= singleWidth(pit, i - 1);
 				w = max(w, labelEnd(pit));
 			}
-			char const c = pit->getChar(i);
-			if (IsPrintable(c) && i > endPosOfFontSpan) {
-				// We need to get the next font
-				font = getFont(pit, i);
-				endPosOfFontSpan = pit->getEndPosOfFontSpan(i);
-			}
-			w += singleWidth(pit, i, c, font);
+			char const c = pars_[pit].getChar(i);
+			w += singleWidth(pit, i, c, *fi);
 		}
 	}
 
 	if (body_pos > 0 && body_pos >= end) {
 		w += font_metrics::width(labelsep, getLabelFont(pit));
-		if (end > 0 && pit->isLineSeparator(end - 1))
+		if (end > 0 && pars_[pit].isLineSeparator(end - 1))
 			w -= singleWidth(pit, end - 1);
 		w = max(w, labelEnd(pit));
 	}
 
-	int const fill = workwidth - w - rightMargin(*pit);
-	row.fill(fill);
-	row.width(workwidth - fill);
+	row.width(w + rightMargin(pars_[pit]));
 }
 
 
 // returns the minimum space a manual label needs on the screen in pixel
-int LyXText::labelFill(ParagraphList::iterator pit, Row const & row) const
+int LyXText::labelFill(par_type pit, Row const & row) const
 {
-	pos_type last = pit->beginOfBody();
+	pos_type last = pars_[pit].beginOfBody();
 
 	BOOST_ASSERT(last > 0);
 
@@ -562,14 +864,14 @@ int LyXText::labelFill(ParagraphList::iterator pit, Row const & row) const
 	--last;
 
 	// a separator at this end does not count
-	if (pit->isLineSeparator(last))
+	if (pars_[pit].isLineSeparator(last))
 		--last;
 
 	int w = 0;
 	for (pos_type i = row.pos(); i <= last; ++i)
 		w += singleWidth(pit, i);
 
-	string const & label = pit->params().labelWidthString();
+	string const & label = pars_[pit].params().labelWidthString();
 	if (label.empty())
 		return 0;
 
@@ -583,7 +885,7 @@ LColor_color LyXText::backgroundColor() const
 }
 
 
-void LyXText::setHeightOfRow(ParagraphList::iterator pit, Row & row)
+void LyXText::setHeightOfRow(par_type pit, Row & row)
 {
 	// get the maximum ascent and the maximum descent
 	double layoutasc = 0;
@@ -593,11 +895,12 @@ void LyXText::setHeightOfRow(ParagraphList::iterator pit, Row & row)
 	// 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();
+	LyXLayout_ptr const & layout = pars_[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.
+	// 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);
@@ -607,14 +910,15 @@ void LyXText::setHeightOfRow(ParagraphList::iterator pit, Row & row)
 	LyXFont labelfont = getLabelFont(pit);
 
 	// these are minimum values
-	double const spacing_val = layout->spacing.getValue() * spacing(*pit);
+	double const spacing_val =
+		layout->spacing.getValue() * spacing(pars_[pit]);
 	//lyxerr << "spacing_val = " << spacing_val << endl;
 	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();
+	InsetList::iterator ii = pars_[pit].insetlist.begin();
+	InsetList::iterator iend = pars_[pit].insetlist.end();
 	for ( ; ii != iend; ++ii) {
 		if (ii->pos >= row.pos() && ii->pos < row.endpos()) {
 			maxasc  = max(maxasc,  ii->inset->ascent());
@@ -629,7 +933,7 @@ void LyXText::setHeightOfRow(ParagraphList::iterator pit, Row & row)
 	pos_type const pos_end = row.endpos();
 
 	LyXFont::FONT_SIZE maxsize =
-		pit->highestFontInRange(row.pos(), pos_end, size);
+		pars_[pit].highestFontInRange(row.pos(), pos_end, size);
 	if (maxsize > font.size()) {
 		font.setSize(maxsize);
 		maxasc  = max(maxasc,  font_metrics::maxAscent(font));
@@ -648,22 +952,23 @@ void LyXText::setHeightOfRow(ParagraphList::iterator pit, Row & row)
 		// some parksips VERY EASY IMPLEMENTATION
 		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)))
+			&& pit != 0
+			&& ((layout->isParagraph() && pars_[pit].getDepth() == 0)
+			    || (pars_[pit - 1].layout()->isParagraph()
+			        && pars_[pit - 1].getDepth() == 0)))
 		{
 				maxasc += bufparams.getDefSkip().inPixels(*bv());
 		}
 
-		if (pit->params().startOfAppendix())
+		if (pars_[pit].params().startOfAppendix())
 			maxasc += int(3 * dh);
 
 		// This is special code for the chapter, since the label of this
 		// layout is printed in an extra row
 		if (layout->counter == "chapter" && bufparams.secnumdepth >= 0) {
 			labeladdon = int(font_metrics::maxHeight(labelfont)
-			             * layout->spacing.getValue() * spacing(*pit));
+			             * layout->spacing.getValue()
+			             * spacing(pars_[pit]));
 		}
 
 		// special code for the top label
@@ -671,12 +976,12 @@ void LyXText::setHeightOfRow(ParagraphList::iterator pit, Row & row)
 		     || layout->labeltype == LABEL_BIBLIO
 		     || layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT)
 		    && isFirstInSequence(pit, paragraphs())
-		    && !pit->getLabelstring().empty())
+		    && !pars_[pit].getLabelstring().empty())
 		{
 			labeladdon = int(
 				  font_metrics::maxHeight(labelfont)
 					* layout->spacing.getValue()
-					* spacing(*pit)
+					* spacing(pars_[pit])
 				+ (layout->topsep + layout->labelbottomsep) * dh);
 		}
 
@@ -684,62 +989,60 @@ void LyXText::setHeightOfRow(ParagraphList::iterator pit, Row & row)
 		// a section, or between the items of a itemize or enumerate
 		// environment.
 
-		ParagraphList::iterator prev =
-			depthHook(pit, paragraphs(), pit->getDepth());
+		par_type prev = depthHook(pit, pars_, pars_[pit].getDepth());
 		if (prev != pit
-		    && prev->layout() == layout
-		    && prev->getDepth() == pit->getDepth()
-		    && prev->getLabelWidthString() == pit->getLabelWidthString())
+		    && pars_[prev].layout() == layout
+		    && pars_[prev].getDepth() == pars_[pit].getDepth()
+		    && pars_[prev].getLabelWidthString() == pars_[pit].getLabelWidthString())
 		{
 			layoutasc = layout->itemsep * dh;
-		} else if (pit != paragraphs().begin() || row.pos() != 0) {
+		} else if (pit != 0 || row.pos() != 0) {
 			if (layout->topsep > 0)
 				layoutasc = layout->topsep * dh;
 		}
 
-		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) {
+		prev = outerHook(pit, pars_);
+		if (prev != par_type(pars_.size())) {
+			maxasc += int(pars_[prev].layout()->parsep * dh);
+		} else if (pit != 0) {
+			if (pars_[pit - 1].getDepth() != 0 ||
+					pars_[pit - 1].layout() == layout) {
 				maxasc += int(layout->parsep * dh);
 			}
 		}
 	}
 
 	// is it a bottom line?
-	if (row.endpos() >= pit->size()) {
+	if (row.endpos() >= pars_[pit].size()) {
 		// add the layout spaces, for example before and after
 		// a section, or between the items of a itemize or enumerate
 		// environment
-		ParagraphList::iterator nextpit = boost::next(pit);
-		if (nextpit != paragraphs().end()) {
-			ParagraphList::iterator cpit = pit;
+		par_type nextpit = pit + 1;
+		if (nextpit != par_type(pars_.size())) {
+			par_type 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())
+			if (pars_[cpit].getDepth() > pars_[nextpit].getDepth()) {
+				usual = pars_[cpit].layout()->bottomsep * dh;
+				cpit = depthHook(cpit, paragraphs(), pars_[nextpit].getDepth());
+				if (pars_[cpit].layout() != pars_[nextpit].layout()
+					|| pars_[nextpit].getLabelWidthString() != pars_[cpit].getLabelWidthString())
 				{
-					unusual = cpit->layout()->bottomsep * dh;
+					unusual = pars_[cpit].layout()->bottomsep * dh;
 				}
 				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);
+			} else if (pars_[cpit].getDepth() == pars_[nextpit].getDepth()) {
+				if (pars_[cpit].layout() != pars_[nextpit].layout()
+					|| pars_[nextpit].getLabelWidthString() != pars_[cpit].getLabelWidthString())
+					layoutdesc = int(pars_[cpit].layout()->bottomsep * dh);
 			}
 		}
 	}
 
 	// incalculate the layout spaces
-	maxasc  += int(layoutasc  * 2 / (2 + pit->getDepth()));
-	maxdesc += int(layoutdesc * 2 / (2 + pit->getDepth()));
+	maxasc  += int(layoutasc  * 2 / (2 + pars_[pit].getDepth()));
+	maxdesc += int(layoutdesc * 2 / (2 + pars_[pit].getDepth()));
 
 	row.height(maxasc + maxdesc + labeladdon);
 	row.baseline(maxasc + labeladdon);
@@ -747,31 +1050,33 @@ void LyXText::setHeightOfRow(ParagraphList::iterator pit, Row & row)
 }
 
 
-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
-	ParagraphList::iterator cpit = cursorPar();
-	if (cursor.pos() && cursor.pos() != cpit->size()
-	    && cpit->isChangeEdited(0, cursor.pos()))
+	Paragraph & cpar = cur.paragraph();
+	par_type cpit = 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 = cpit->layout();
+	LyXTextClass const & tclass = cur.buffer().params().getLyXTextClass();
+	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 (cpit->empty() && !cpit->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;
 
-	recUndo(cursor.par());
+	// a layout change may affect also the following paragraph
+	recUndo(cur.par(), undoSpan(cur.par()) - 1);
 
 	// Always break behind a space
-	//
 	// It is better to erase the space (Dekel)
-	if (cursor.pos() < cpit->size() && cpit->isLineSeparator(cursor.pos()))
-	   cpit->erase(cursor.pos());
+	if (cur.pos() != cur.lastpos() && cpar.isLineSeparator(cur.pos()))
+		cpar.erase(cur.pos());
 
 	// break the paragraph
 	if (keep_layout)
@@ -783,40 +1088,35 @@ 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 = cpit->allowEmpty() && cpit->empty();
-	::breakParagraph(bv()->buffer()->params(), paragraphs, cpit,
-			 cursor.pos(), keep_layout);
+	bool const isempty = cpar.allowEmpty() && cpar.empty();
+	::breakParagraph(cur.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)
-	cpit = cursorPar();
-	ParagraphList::iterator next_par = boost::next(cpit);
+	cpit = cur.par();
+	par_type next_par = cpit + 1;
 
 	// 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
-			cpit->applyLayout(tclass.defaultLayout());
+			pars_[cpit].applyLayout(tclass.defaultLayout());
 		else
 			// set to standard-layout
-			next_par->applyLayout(tclass.defaultLayout());
+			pars_[next_par].applyLayout(tclass.defaultLayout());
 	}
 
 	// if the cursor is at the beginning of a row without prior newline,
 	// move one row up!
 	// This touches only the screen-update. Otherwise we would may have
 	// an empty row on the screen
-	RowList::iterator crit = cpit->getRow(cursor.pos());
-	if (cursor.pos() && crit->pos() == cursor.pos()
-	    && !cpit->isNewline(cursor.pos() - 1))
+	if (cur.pos() != 0 && cur.textRow().pos() == cur.pos()
+	    && !pars_[cpit].isNewline(cur.pos() - 1))
 	{
-		cursorLeft(bv());
+		cursorLeft(cur);
 	}
 
-	while (!next_par->empty() && next_par->isNewline(0))
-		next_par->erase(0);
+	while (!pars_[next_par].empty() && pars_[next_par].isNewline(0))
+		pars_[next_par].erase(0);
 
 	updateCounters();
 	redoParagraph(cpit);
@@ -824,33 +1124,38 @@ void LyXText::breakParagraph(ParagraphList & paragraphs, char keep_layout)
 
 	// 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(cpit, 0);
+		setCursor(cur, cur.par(), 0);
 }
 
 
 // convenience function
-void LyXText::redoParagraph()
+void LyXText::redoParagraph(LCursor & cur)
 {
-	clearSelection();
-	redoParagraph(cursorPar());
-	setCursorIntern(cursor.par(), cursor.pos());
+	BOOST_ASSERT(this == cur.text());
+	cur.clearSelection();
+	redoParagraph(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(Undo::INSERT, this, cursor.par(), cursor.par());
+	BOOST_ASSERT(this == cur.text());
+	BOOST_ASSERT(c != Paragraph::META_INSET);
 
-	// When the free-spacing option is set for the current layout,
-	// disable the double-space checking
+	recordUndo(cur, Undo::INSERT);
 
-	bool const freeSpacing = cursorPar()->layout()->free_spacing ||
-		cursorPar()->isFreeSpacing();
+	Paragraph & par = cur.paragraph();
+	// try to remove this
+	par_type pit = cur.par();
+
+	bool const freeSpacing = par.layout()->free_spacing ||
+		par.isFreeSpacing();
 
 	if (lyxrc.auto_number) {
 		static string const number_operators = "+-/*";
@@ -860,36 +1165,28 @@ 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() < cursorPar()->size() &&
-			      getFont(cursorPar(), cursor.pos()).number() == LyXFont::ON &&
-			      getFont(cursorPar(), 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(); // Set current_font.number to OFF
+				number(cur); // Set current_font.number to OFF
 		} else if (IsDigit(c) &&
 			   real_current_font.isVisibleRightToLeft()) {
-			number(); // Set current_font.number to ON
+			number(cur); // Set current_font.number to ON
 
-			if (cursor.pos() > 0) {
-				char const c = cursorPar()->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 ||
-				     cursorPar()->isSeparator(cursor.pos() - 2) ||
-				     cursorPar()->isNewline(cursor.pos() - 2))
+				    (cur.pos() == 1
+				     || par.isSeparator(cur.pos() - 2)
+				     || par.isNewline(cur.pos() - 2))
 				  ) {
-					setCharFont(
-						    cursorPar(),
-						    cursor.pos() - 1,
-						    current_font);
-				} else if (contains(number_seperators, c) &&
-					   cursor.pos() >= 2 &&
-					   getFont(
-						   cursorPar(),
-						   cursor.pos() - 2).number() == LyXFont::ON) {
-					setCharFont(
-						    cursorPar(),
-						    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);
 				}
 			}
 		}
@@ -911,36 +1208,38 @@ 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
-		     && cursorPar()->isLineSeparator(cursor.pos() - 1))
-		    || (cursor.pos() > 0
-			&& cursorPar()->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)
-		cursorPar()->insertChar(cursor.pos(), c);
-
-	setCharFont(cursorPar(), cursor.pos(), rawtmpfont);
+	par.insertChar(cur.pos(), c);
+	setCharFont(pit, cur.pos(), rawtmpfont);
 
 	current_font = rawtmpfont;
 	real_current_font = realtmpfont;
-	redoParagraph(cursorPar());
-	setCursor(cursor.par(), cursor.pos() + 1, false, cursor.boundary());
-
+	redoParagraph(cur);
+	setCursor(cur, cur.par(), cur.pos() + 1, false, cur.boundary());
 	charInserted();
 }
 
@@ -959,297 +1258,311 @@ void LyXText::charInserted()
 }
 
 
-void LyXText::prepareToPrint(ParagraphList::iterator pit, Row & row) const
+RowMetrics LyXText::computeRowMetrics(par_type pit, Row const & row) const
 {
-	double w = row.fill();
-	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());
+	RowMetrics result;
+
+	double w = width_ - row.width();
+
+	bool const is_rtl = isRTL(pars_[pit]);
 	if (is_rtl)
-		x = rightMargin(*pit);
+		result.x = rightMargin(pars_[pit]);
 	else
-		x = leftMargin(pit, row.pos());
+		result.x = leftMargin(pit, row.pos());
 
 	// is there a manual margin with a manual label
-	LyXLayout_ptr const & layout = pit->layout();
+	LyXLayout_ptr const & layout = pars_[pit].layout();
 
 	if (layout->margintype == MARGIN_MANUAL
 	    && layout->labeltype == LABEL_MANUAL) {
 		/// We might have real hfills in the label part
-		int nlh = numberOfLabelHfills(*pit, row);
+		int nlh = numberOfLabelHfills(pars_[pit], row);
 
 		// A manual label par (e.g. List) has an auto-hfill
 		// between the label text and the body of the
 		// paragraph too.
 		// But we don't want to do this auto hfill if the par
 		// is empty.
-		if (!pit->empty())
+		if (!pars_[pit].empty())
 			++nlh;
 
-		if (nlh && !pit->getLabelWidthString().empty())
-			fill_label_hfill = labelFill(pit, row) / double(nlh);
+		if (nlh && !pars_[pit].getLabelWidthString().empty())
+			result.label_hfill = labelFill(pit, row) / double(nlh);
 	}
 
 	// are there any hfills in the row?
-	int const nh = numberOfHfills(*pit, row);
+	int const nh = numberOfHfills(pars_[pit], row);
 
 	if (nh) {
 		if (w > 0)
-			fill_hfill = w / nh;
+			result.hfill = w / nh;
 	// we don't have to look at the alignment if it is ALIGN_LEFT and
 	// if the row is already larger then the permitted width as then
 	// we force the LEFT_ALIGN'edness!
-	} else if (int(row.width()) < textWidth()) {
+	} else if (int(row.width()) < maxwidth_) {
 		// is it block, flushleft or flushright?
 		// set x how you need it
 		int align;
-		if (pit->params().align() == LYX_ALIGN_LAYOUT)
+		if (pars_[pit].params().align() == LYX_ALIGN_LAYOUT)
 			align = layout->align;
 		else
-			align = pit->params().align();
+			align = pars_[pit].params().align();
 
 		// Display-style insets should always be on a centred row
-		// The test on pit->size() is to catch zero-size pars, which
+		// The test on pars_[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())
+		//inset = pars_[pit].size() ? pars_[pit].getInset(row.pos()) : 0;
+		if (!pars_[pit].empty()
+		    && pars_[pit].isInset(row.pos())
+		    && pars_[pit].getInset(row.pos())->display())
 		{
 			align = LYX_ALIGN_CENTER;
 		}
 
 		switch (align) {
-    case LYX_ALIGN_BLOCK: {
-				int const ns = numberOfSeparators(*pit, row);
-				bool disp_inset = false;
-				if (row.endpos() < pit->size()) {
-					InsetOld * 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
-					&& row.endpos() < pit->size()
-					&& !pit->isNewline(row.endpos() - 1)
-					&& !disp_inset
-					) {
-						fill_separator = w / ns;
-				} else if (is_rtl) {
-					x += w;
-				}
-				break;
+		case LYX_ALIGN_BLOCK: {
+			int const ns = numberOfSeparators(pars_[pit], row);
+			bool disp_inset = false;
+			if (row.endpos() < pars_[pit].size()) {
+				InsetBase const * in = pars_[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
+			    && row.endpos() < pars_[pit].size()
+			    && !pars_[pit].isNewline(row.endpos() - 1)
+			    && !disp_inset
+				) {
+				result.separator = w / ns;
+			} else if (is_rtl) {
+				result.x += w;
 			}
-    case LYX_ALIGN_RIGHT:
-			x += w;
 			break;
-    case LYX_ALIGN_CENTER:
-			x += w / 2;
+		}
+		case LYX_ALIGN_RIGHT:
+			result.x += w;
+			break;
+		case LYX_ALIGN_CENTER:
+			result.x += w / 2;
 			break;
 		}
 	}
 
-	bidi.computeTables(*pit, *bv()->buffer(), row);
+	bidi.computeTables(pars_[pit], *bv()->buffer(), row);
 	if (is_rtl) {
-		pos_type body_pos = pit->beginOfBody();
+		pos_type body_pos = pars_[pit].beginOfBody();
 		pos_type end = row.endpos();
 
 		if (body_pos > 0
-		    && (body_pos > end || !pit->isLineSeparator(body_pos - 1)))
+		    && (body_pos > end || !pars_[pit].isLineSeparator(body_pos - 1)))
 		{
-			x += font_metrics::width(layout->labelsep, getLabelFont(pit));
+			result.x += font_metrics::width(layout->labelsep, getLabelFont(pit));
 			if (body_pos <= end)
-				x += fill_label_hfill;
+				result.x += result.label_hfill;
 		}
 	}
 
-	row.fill_hfill(fill_hfill);
-	row.fill_label_hfill(fill_label_hfill);
-	row.fill_separator(fill_separator);
-	row.x(x);
+	return result;
 }
 
 
 // the cursor set functions have a special mechanism. When they
 // realize, that you left an empty paragraph, they will delete it.
 
-void LyXText::cursorRightOneWord()
+void LyXText::cursorRightOneWord(LCursor & cur)
 {
-	cursorRightOneWord(cursor);
-	setCursor(cursorPar(), 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);
-	setCursor(getPar(tmpcursor), 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 = cursor;
+	BOOST_ASSERT(this == cur.text());
+	CursorSlice from = cur.top();
+	CursorSlice to = cur.top();
 	getWord(from, to, loc);
-	if (cursor != from)
-		setCursor(from.par(), from.pos());
+	if (cur.top() != 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() && cursorPar()->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(Undo::INSERT, this, startc.par());
-		getPar(startc)->acceptChange(startc.pos(), endc.pos());
+	CursorSlice const & startc = cur.selBegin();
+	CursorSlice const & endc = cur.selEnd();
+	if (startc.par() == endc.par()) {
+		recordUndoSelection(cur, Undo::INSERT);
+		pars_[startc.par()].acceptChange(startc.pos(), endc.pos());
 		finishUndo();
-		clearSelection();
-		redoParagraph(getPar(startc));
-		setCursorIntern(startc.par(), 0);
+		cur.clearSelection();
+		redoParagraph(startc.par());
+		setCursorIntern(cur, startc.par(), 0);
 	}
+#ifdef WITH_WARNINGS
 #warning handle multi par selection
+#endif
 }
 
 
-void LyXText::rejectChange()
+void LyXText::rejectChange(LCursor & cur)
 {
-	if (!selection.set() && cursorPar()->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(Undo::INSERT, this, startc.par());
-		getPar(startc)->rejectChange(startc.pos(), endc.pos());
+	CursorSlice const & startc = cur.selBegin();
+	CursorSlice const & endc = cur.selEnd();
+	if (startc.par() == endc.par()) {
+		recordUndoSelection(cur, Undo::INSERT);
+		pars_[startc.par()].rejectChange(startc.pos(), endc.pos());
 		finishUndo();
-		clearSelection();
-		redoParagraph(getPar(startc));
-		setCursorIntern(startc.par(), 0);
+		cur.clearSelection();
+		redoParagraph(startc.par());
+		setCursorIntern(cur, startc.par(), 0);
 	}
+#ifdef WITH_WARNINGS
 #warning handle multi par selection
+#endif
 }
 
 
 // Delete from cursor up to the end of the current or next word.
-void LyXText::deleteWordForward()
+void LyXText::deleteWordForward(LCursor & cur)
 {
-	if (cursorPar()->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();
-		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 (cursorPar()->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 (cursorPar()->empty()) {
+	BOOST_ASSERT(this == cur.text());
+	if (cur.lastpos() == 0) {
 		// Paragraph is empty, so we just go to the right
-		cursorRight(bv());
+		cursorRight(cur);
 	} 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();
+		cur.resetAnchor();
+		cur.selection() = true; // to avoid deletion
+		cursorEnd(cur);
+		cur.setSelection();
 		// What is this test for ??? (JMarc)
-		if (!selection.set())
-			deleteWordForward();
+		if (!cur.selection())
+			deleteWordForward(cur);
 		else
-			cutSelection(true, false);
+			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;
+		from = cur.top();
 		getWord(from, to, lyx::PARTIAL_WORD);
-		setCursor(to.par(), to.pos() + 1);
+		setCursor(cur, to.par(), to.pos() + 1);
 	}
 
-	recordUndo(Undo::ATOMIC, this, from.par(), to.par());
+	recordUndoSelection(cur);
 
 	pos_type pos = from.pos();
 	int par = from.par();
 
-	while (par != int(paragraphs().size()) &&
-	       (pos != to.pos() || par != to.par())) {
-		ParagraphList::iterator pit = getPar(par);
-		if (pos == pit->size()) {
+	while (par != int(pars_.size()) && (pos != to.pos() || par != to.par())) {
+		par_type pit = par;
+		if (pos == pars_[pit].size()) {
 			++par;
 			pos = 0;
 			continue;
 		}
-		unsigned char c = pit->getChar(pos);
+		unsigned char c = pars_[pit].getChar(pos);
 		if (c != Paragraph::META_INSET) {
 			switch (action) {
 			case text_lowercase:
@@ -1264,73 +1577,70 @@ void LyXText::changeCase(LyXText::TextCase action)
 				break;
 			}
 		}
+#ifdef WITH_WARNINGS
 #warning changes
-		pit->setChar(pos, c);
+#endif
+		pars_[pit].setChar(pos, c);
 		++pos;
 	}
 }
 
 
-void LyXText::Delete()
+void LyXText::Delete(LCursor & cur)
 {
-	// this is a very easy implementation
-	LyXCursor old_cursor = cursor;
-
-	// just move to the right
-	cursorRight(true);
-
-	// if you had success make a backspace
-	if (old_cursor.par() != cursor.par() || old_cursor.pos() != cursor.pos()) {
-		recordUndo(Undo::DELETE, this, old_cursor.par());
-		backspace();
+	BOOST_ASSERT(this == cur.text());
+	if (cur.pos() != cur.lastpos()) {
+		recordUndo(cur, Undo::DELETE, cur.par());
+		setCursorIntern(cur, cur.par(), cur.pos() + 1, false, cur.boundary());
+		backspace(cur);
 	}
+	// should we do anything in an else branch?
 }
 
 
-void LyXText::backspace()
+void LyXText::backspace(LCursor & cur)
 {
-	// Get the font that is used to calculate the baselineskip
-	ParagraphList::iterator pit = cursorPar();
-	pos_type lastpos = pit->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 (pit->isChangeEdited(0, pit->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 && pit->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()) {
-				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() != 0)
-			recordUndo(Undo::DELETE, this, cursor.par() - 1, cursor.par());
+		if (cur.par() != 0)
+			recordUndo(cur, Undo::DELETE, cur.par() - 1);
 
-		ParagraphList::iterator tmppit = cursorPar();
+		par_type tmppit = 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() != 0) {
+		if (cur.par() != 0) {
 			// steps into the above paragraph.
-			setCursorIntern(cursor.par() - 1,
-					getPar(cursor.par() - 1)->size(),
+			setCursorIntern(cur, cur.par() - 1,
+					pars_[cur.par() - 1].size(),
 					false);
 		}
 
@@ -1338,262 +1648,130 @@ void LyXText::backspace()
 		// layout. I think it is a real bug of all other
 		// word processors to allow it. It confuses the user.
 		// Correction: Pasting is always allowed with standard-layout
-		Buffer & buf = *bv()->buffer();
+		Buffer & buf = cur.buffer();
 		BufferParams const & bufparams = buf.params();
 		LyXTextClass const & tclass = bufparams.getLyXTextClass();
-		ParagraphList::iterator const cpit = cursorPar();
+		par_type const cpit = cur.par();
 
 		if (cpit != tmppit
-		    && (cpit->layout() == tmppit->layout()
-		        || tmppit->layout() == tclass.defaultLayout())
-		    && cpit->getAlign() == tmppit->getAlign()) {
+		    && (pars_[cpit].layout() == pars_[tmppit].layout()
+		        || pars_[tmppit].layout() == tclass.defaultLayout())
+		    && pars_[cpit].getAlign() == pars_[tmppit].getAlign()) {
 			mergeParagraph(bufparams, buf.paragraphs(), cpit);
 
-			if (cursor.pos() && cpit->isSeparator(cursor.pos() - 1))
-				cursor.pos(cursor.pos() - 1);
+			if (cur.pos() != 0 && pars_[cpit].isSeparator(cur.pos() - 1))
+				--cur.pos();
 
 			// 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(Undo::DELETE, this, 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());
-		cursorPar()->erase(cursor.pos());
+		setCursorIntern(cur, cur.par(), cur.pos() - 1,
+				false, cur.boundary());
+		cur.paragraph().erase(cur.pos());
 	}
 
-	lastpos = cursorPar()->size();
-	if (cursor.pos() == lastpos)
-		setCurrentFont();
-
-	redoParagraph();
-	setCursor(cursor.par(), cursor.pos(), false, cursor.boundary());
-}
-
-
-ParagraphList::iterator LyXText::cursorPar() const
-{
-	return getPar(cursor.par());
-}
-
-
-RowList::iterator LyXText::cursorRow() const
-{
-	return cursorPar()->getRow(cursor.pos());
-}
-
+	if (cur.pos() == cur.lastpos())
+		setCurrentFont(cur);
 
-ParagraphList::iterator LyXText::getPar(LyXCursor const & cur) const
-{
-	return getPar(cur.par());
+	redoParagraph(cur);
+	setCursor(cur, cur.par(), cur.pos(), false, cur.boundary());
 }
 
 
-ParagraphList::iterator LyXText::getPar(int par) const
+Paragraph & LyXText::getPar(par_type par) const
 {
+	//lyxerr << "getPar: " << par << " from " << paragraphs().size() << endl;
 	BOOST_ASSERT(par >= 0);
 	BOOST_ASSERT(par < int(paragraphs().size()));
-	ParagraphList::iterator pit = paragraphs().begin();
-	std::advance(pit, par);
-	return pit;
+	return paragraphs()[par];
 }
 
 
-RowList::iterator
-LyXText::getRowNearY(int y, ParagraphList::iterator & pit) const
+// y is relative to this LyXText's top
+Row const & LyXText::getRowNearY(int y, par_type & pit) const
 {
-	//lyxerr << "getRowNearY: y " << y << endl;
-#if 1
-	ParagraphList::iterator const
-		pend = boost::prior(paragraphs().end());
-	pit = paragraphs().begin();
-	while (int(pit->y + pit->height) < y && pit != pend)
+	BOOST_ASSERT(!paragraphs().empty());
+	BOOST_ASSERT(!paragraphs().begin()->rows.empty());
+	par_type const pend = paragraphs().size() - 1;
+	pit = 0;
+	while (int(pars_[pit].y + pars_[pit].height) < y && pit != pend)
 		++pit;
 
-	RowList::iterator rit = pit->rows.end();
-	RowList::iterator const rbegin = pit->rows.begin();
+	RowList::iterator rit = pars_[pit].rows.end();
+	RowList::iterator const rbegin = pars_[pit].rows.begin();
 	do {
 		--rit;
-	} while (rit != rbegin && int(pit->y + rit->y_offset()) > y);
-
-	return rit;
-#else
-	pit = boost::prior(paragraphs().end());
-
-	RowList::iterator rit = lastRow();
-	RowList::iterator rbegin = firstRow();
-
-	while (rit != rbegin && int(pit->y + rit->y_offset()) > y)
-		previousRow(pit, rit);
-
-	return rit;
-#endif
-}
-
-
-int LyXText::getDepth() const
-{
-	return cursorPar()->getDepth();
-}
-
-
-RowList::iterator LyXText::firstRow() const
-{
-	return paragraphs().front().rows.begin();
-}
-
-
-ParagraphList::iterator LyXText::firstPar() const
-{
-	return paragraphs().begin();
-}
-
-
-RowList::iterator LyXText::lastRow() const
-{
-	return boost::prior(endRow());
-}
-
-
-ParagraphList::iterator LyXText::lastPar() const
-{
-	return boost::prior(endPar());
-}
-
-
-RowList::iterator LyXText::endRow() const
-{
-	return paragraphs().back().rows.end();
-}
-
-
-ParagraphList::iterator LyXText::endPar() const
-{
-	return paragraphs().end();
-}
-
-
-void LyXText::nextRow(ParagraphList::iterator & pit,
-	RowList::iterator & rit) const
-{
-	++rit;
-	if (rit == pit->rows.end()) {
-		++pit;
-		if (pit == paragraphs().end())
-			--pit;
-		else
-			rit = pit->rows.begin();
-	}
-}
-
-
-void LyXText::previousRow(ParagraphList::iterator & pit,
-	RowList::iterator & rit) const
-{
-	if (rit != pit->rows.begin())
-		--rit;
-	else {
-		BOOST_ASSERT(pit != paragraphs().begin());
-		--pit;
-		rit = boost::prior(pit->rows.end());
-	}
-}
-
+	} while (rit != rbegin && int(pars_[pit].y + rit->y_offset()) > y);
 
-string LyXText::selectionAsString(Buffer const & buffer, bool label) const
-{
-	if (!selection.set())
-		return string();
-
-	// should be const ...
-	ParagraphList::iterator startpit = getPar(selection.start);
-	ParagraphList::iterator endpit = getPar(selection.end);
-	size_t const startpos = selection.start.pos();
-	size_t const endpos = selection.end.pos();
-
-	if (startpit == endpit)
-		return startpit->asString(buffer, startpos, endpos, label);
-
-	// First paragraph in selection
-	string result =
-		startpit->asString(buffer, startpos, startpit->size(), label) + "\n\n";
-
-	// The paragraphs in between (if any)
-	ParagraphList::iterator pit = startpit;
-	for (++pit; pit != endpit; ++pit)
-		result += pit->asString(buffer, 0, pit->size(), label) + "\n\n";
-
-	// Last paragraph in selection
-	result += endpit->asString(buffer, 0, endpos, label);
-
-	return result;
+	return *rit;
 }
 
 
-int LyXText::parOffset(ParagraphList::iterator pit) const
+Row const & LyXText::firstRow() const
 {
-	return std::distance(paragraphs().begin(), pit);
+	return *paragraphs().front().rows.begin();
 }
 
 
-void LyXText::redoParagraphInternal(ParagraphList::iterator pit)
+void LyXText::redoParagraphInternal(par_type pit)
 {
 	// remove rows of paragraph, keep track of height changes
-	height -= pit->height;
+	height_ -= pars_[pit].height;
 
 	// clear old data
-	pit->rows.clear();
-	pit->height = 0;
-	pit->width = 0;
+	pars_[pit].rows.clear();
+	pars_[pit].height = 0;
+	pars_[pit].width = 0;
 
 	// redo insets
-	InsetList::iterator ii = pit->insetlist.begin();
-	InsetList::iterator iend = pit->insetlist.end();
+	InsetList::iterator ii = pars_[pit].insetlist.begin();
+	InsetList::iterator iend = pars_[pit].insetlist.end();
 	for (; ii != iend; ++ii) {
 		Dimension dim;
-		int const w = textWidth() - leftMargin(pit) - rightMargin(*pit);
+		int const w = maxwidth_ - leftMargin(pit) - rightMargin(pars_[pit]);
 		MetricsInfo mi(bv(), getFont(pit, ii->pos), w);
 		ii->inset->metrics(mi, dim);
 	}
 
 	// rebreak the paragraph
-	pit->setBeginOfBody();
+	pars_[pit].setBeginOfBody();
 	pos_type z = 0;
 	do {
 		Row row(z);
 		rowBreakPoint(pit, row);
-		z = row.endpos();
-		fill(pit, row, textwidth_);
-		prepareToPrint(pit, row);
+		setRowWidth(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();
-	} while (z < pit->size());
-
-	height += pit->height;
-	//lyxerr << "redoParagraph: " << pit->rows.size() << " rows\n";
+		row.y_offset(pars_[pit].height);
+		pars_[pit].rows.push_back(row);
+		pars_[pit].width = std::max(pars_[pit].width, row.width());
+		pars_[pit].height += row.height();
+		z = row.endpos();
+	} while (z < pars_[pit].size());
+
+	height_ += pars_[pit].height;
+	//lyxerr << "redoParagraph: " << pars_[pit].rows.size() << " rows\n";
 }
 
 
-void LyXText::redoParagraphs(ParagraphList::iterator pit,
-  ParagraphList::iterator end)
+void LyXText::redoParagraphs(par_type pit, par_type end)
 {
 	for ( ; pit != end; ++pit)
 		redoParagraphInternal(pit);
 	updateParPositions();
+	updateCounters();
 }
 
 
-void LyXText::redoParagraph(ParagraphList::iterator pit)
+void LyXText::redoParagraph(par_type pit)
 {
 	redoParagraphInternal(pit);
 	updateParPositions();
@@ -1602,9 +1780,8 @@ void LyXText::redoParagraph(ParagraphList::iterator pit)
 
 void LyXText::fullRebreak()
 {
-	redoParagraphs(paragraphs().begin(), paragraphs().end());
-	redoCursor();
-	selection.cursor = cursor;
+	redoParagraphs(0, paragraphs().size());
+	bv()->cursor().resetAnchor();
 }
 
 
@@ -1612,19 +1789,20 @@ void LyXText::metrics(MetricsInfo & mi, Dimension & dim)
 {
 	//BOOST_ASSERT(mi.base.textwidth);
 	if (mi.base.textwidth)
-		textwidth_ = mi.base.textwidth;
+		maxwidth_ = mi.base.textwidth;
 	//lyxerr << "LyXText::metrics: width: " << mi.base.textwidth
-	//	<< " textWidth: " << textWidth() << "\nfont: " << mi.base.font << endl;
+	//<< " maxWidth: " << maxwidth << "\nfont: " << mi.base.font
+	//<< endl;
 
 	// Rebuild row cache. This recomputes height as well.
-	redoParagraphs(paragraphs().begin(), paragraphs().end());
+	redoParagraphs(0, paragraphs().size());
 
-	width = maxParagraphWidth(paragraphs());
+	width_ = maxParagraphWidth(paragraphs());
 
 	// final dimension
-	dim.asc = firstRow()->ascent_of_text();
-	dim.des = height - dim.asc;
-	dim.wid = width;
+	dim.asc = firstRow().ascent_of_text();
+	dim.des = height_ - dim.asc;
+	dim.wid = width_;
 }
 
 
@@ -1633,96 +1811,43 @@ void LyXText::draw(PainterInfo & pi, int x, int y) const
 {
 	xo_ = x;
 	yo_ = y;
-	paintTextInset(*bv(), *this, x, y);
+	paintTextInset(*this, pi);
 }
 
 
-bool LyXText::isLastRow(ParagraphList::iterator pit, Row const & row) const
+// only used for inset right now. should also be used for main text
+void LyXText::drawSelection(PainterInfo &, int, int) const
 {
-	return row.endpos() >= pit->size()
-	       && boost::next(pit) == paragraphs().end();
+	//lyxerr << "LyXText::drawSelection at " << x << " " << y << endl;
 }
 
 
-bool LyXText::isFirstRow(ParagraphList::iterator pit, Row const & row) const
+bool LyXText::isLastRow(par_type pit, Row const & row) const
 {
-	return row.pos() == 0 && pit == paragraphs().begin();
+	return row.endpos() >= pars_[pit].size()
+		&& pit + 1 == par_type(paragraphs().size());
 }
 
 
-void LyXText::cursorLeftOneWord(LyXCursor & cursor)
+bool LyXText::isFirstRow(par_type pit, Row const & row) const
 {
-	// treat HFills, floats and Insets as words
-
-	ParagraphList::iterator pit = cursorPar();
-	size_t pos = cursor.pos();
-
-	while (pos &&
-	       (pit->isSeparator(pos - 1) ||
-	        pit->isKomma(pos - 1) ||
-	        pit->isNewline(pos - 1)) &&
-	       !(pit->isHfill(pos - 1) ||
-		 pit->isInset(pos - 1)))
-		--pos;
-
-	if (pos &&
-	    (pit->isInset(pos - 1) ||
-	     pit->isHfill(pos - 1))) {
-		--pos;
-	} else if (!pos) {
-		if (pit != paragraphs().begin()) {
-			--pit;
-			pos = pit->size();
-		}
-	} else {		// Here, cur != 0
-		while (pos > 0 && pit->isWord(pos - 1))
-			--pos;
-	}
-
-	cursor.par(parOffset(pit));
-	cursor.pos(pos);
+	return row.pos() == 0 && pit == 0;
 }
 
 
-void LyXText::cursorRightOneWord(LyXCursor & cursor)
+void LyXText::getWord(CursorSlice & from, CursorSlice & to,
+	word_location const loc)
 {
-	// treat floats, HFills and Insets as words
-	ParagraphList::iterator pit = cursorPar();
-	pos_type pos = cursor.pos();
-
-	if (pos == pit->size() &&
-		boost::next(pit) != paragraphs().end()) {
-		++pit;
-		pos = 0;
-	} else {
-		// Skip through initial nonword stuff.
-		while (pos < pit->size() && !pit->isWord(pos)) {
-			++pos;
-		}
-		// Advance through word.
-		while (pos < pit->size() && pit->isWord(pos)) {
-			++pos;
-		}
-	}
-
-	cursor.par(parOffset(pit));
-	cursor.pos(pos);
-}
-
-
-void LyXText::getWord(LyXCursor & from, LyXCursor & to, word_location const loc)
-{
-	ParagraphList::iterator from_par = getPar(from);
-	ParagraphList::iterator to_par = getPar(to);
+	Paragraph & from_par = pars_[from.par()];
 	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)) {
+		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;
 		}
@@ -1730,14 +1855,14 @@ void LyXText::getWord(LyXCursor & from, LyXCursor & to, word_location const loc)
 
 	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(from);
+		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(from);
+		cursorLeftOneWord(bv()->cursor());
 		break;
 	case lyx::NEXT_WORD:
 		lyxerr << "LyXText::getWord: NEXT_WORD not implemented yet"
@@ -1747,14 +1872,15 @@ void LyXText::getWord(LyXCursor & from, LyXCursor & to, word_location const loc)
 		break;
 	}
 	to = from;
-	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()))
+	Paragraph & to_par = pars_[to.par()];
+	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(to.pos() + 1);
+		++to.pos();
 	}
 }
 
@@ -1767,3 +1893,279 @@ void LyXText::write(Buffer const & buf, std::ostream & os) const
 	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;
+	Paragraph::depth_type depth = 0;
+
+	while (lex.isOK()) {
+		lex.nextToken();
+		string token = lex.getString();
+
+		if (token.empty())
+			continue;
+
+		if (token == "\\end_inset") {
+			the_end_read = true;
+			break;
+		}
+
+		if (token == "\\end_document") {
+#ifdef WITH_WARNINGS
+#warning Look here!
+#endif
+#if 0
+			lex.printError("\\end_document read in inset! Error in document!");
+#endif
+			return false;
+		}
+
+		// 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();
+			par.setFont(0, LyXFont(LyXFont::ALL_INHERIT, buf.params().language));
+			pars_.push_back(par);
+
+			// FIXME: goddamn InsetTabular makes us pass a Buffer
+			// not BufferParams
+			::readParagraph(buf, pars_.back(), 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
+{
+	par_type pit = cur.par();
+	if (pars_[pit].rows.empty())
+		return xo_;
+
+	Row const & row = *pars_[pit].getRow(cur.pos());
+
+	pos_type pos = cur.pos();
+	pos_type cursor_vpos = 0;
+
+	RowMetrics const m = computeRowMetrics(pit, row);
+	double x = m.x;
+
+	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(pars_[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 = pars_[pit].beginOfBody();
+	if (body_pos > 0 &&
+	    (body_pos > end || !pars_[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 += m.label_hfill
+				+ font_metrics::width(pars_[pit].layout()->labelsep,
+						      getLabelFont(pit));
+			if (pars_[pit].isLineSeparator(body_pos - 1))
+				x -= singleWidth(pit, body_pos - 1);
+		}
+
+		if (hfillExpansion(pars_[pit], row, pos)) {
+			x += singleWidth(pit, pos);
+			if (pos >= body_pos)
+				x += m.hfill;
+			else
+				x += m.label_hfill;
+		} else if (pars_[pit].isSeparator(pos)) {
+			x += singleWidth(pit, pos);
+			if (pos >= body_pos)
+				x += m.separator;
+		} else
+			x += singleWidth(pit, pos);
+	}
+	return xo_ + int(x);
+}
+
+
+int LyXText::cursorY(CursorSlice const & cur) const
+{
+	Paragraph & par = getPar(cur.par());
+	Row & row = *par.getRow(cur.pos());
+	return yo_ + par.y + row.y_offset() + row.baseline();
+}
+
+
+// Returns the current font and depth as a message.
+string LyXText::currentState(LCursor & cur)
+{
+	BOOST_ASSERT(this == cur.text());
+	Buffer & buf = cur.buffer();
+	Paragraph const & par = cur.paragraph();
+	std::ostringstream os;
+
+	bool const show_change = buf.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 = buf.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(buf.params().getLyXTextClass().defaultfont());
+
+	// avoid _(...) re-entrance problem
+	string const s = font.stateText(&buf.params());
+	os << bformat(_("Font: %1$s"), s);
+
+	// os << bformat(_("Font: %1$s"), font.stateText(&buf.params));
+
+	// The paragraph depth
+	int depth = cur.paragraph().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 << _(", Inset: ") << &cur.inset();
+	os << _(", Paragraph: ") << cur.par();
+	os << _(", Id: ") << par.id();
+	os << _(", Position: ") << cur.pos();
+	Row & row = cur.textRow();
+	os << bformat(_(", Row b:%1$d e:%2$d"), row.pos(), row.endpos());
+#endif
+	return os.str();
+}
+
+
+string LyXText::getPossibleLabel(LCursor & cur) const
+{
+	par_type pit = cur.par();
+
+	LyXLayout_ptr layout = pars_[pit].layout();
+
+	if (layout->latextype == LATEX_PARAGRAPH && pit != 0) {
+		LyXLayout_ptr const & layout2 = pars_[pit - 1].layout();
+		if (layout2->latextype != LATEX_PARAGRAPH) {
+			--pit;
+			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 = pars_[pit].asString(cur.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_ + int(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;
+}