X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftext.C;h=8f920328c2f021143a0ccd3b847f46c763dcefd4;hb=10ba1b8918e7da14334bb5573ce2a707671c8b51;hp=e52f14da972225d31a561f56cf356b17908b35fc;hpb=0d43ba149a41e8860dde316ccbd4336d6b0bbdfa;p=lyx.git

diff --git a/src/text.C b/src/text.C
index e52f14da97..8f920328c2 100644
--- a/src/text.C
+++ b/src/text.C
@@ -66,9 +66,10 @@
 #include "support/lstrings.h"
 #include "support/textutils.h"
 #include "support/tostr.h"
-#include "support/std_sstream.h"
 
-using lyx::par_type;
+#include <sstream>
+
+using lyx::pit_type;
 using lyx::pos_type;
 using lyx::word_location;
 
@@ -89,14 +90,6 @@ using std::endl;
 using std::string;
 
 
-/// some space for drawing the 'nested' markers (in pixel)
-extern int const NEST_MARGIN = 20;
-/// margin for changebar
-extern int const CHANGEBAR_MARGIN = 10;
-/// right margin
-extern int const RIGHT_MARGIN = 10;
-
-
 namespace {
 
 int numberOfSeparators(Paragraph const & par, Row const & row)
@@ -166,10 +159,9 @@ int numberOfHfills(Paragraph const & par, Row const & row)
 }
 
 
-int readParToken(Buffer const & buf, Paragraph & par, LyXLex & lex,
-	string const & token)
+void readParToken(Buffer const & buf, Paragraph & par, LyXLex & lex,
+	string const & token, LyXFont & font)
 {
-	static LyXFont font;
 	static Change change;
 
 	BufferParams const & bp = buf.params();
@@ -195,11 +187,9 @@ int readParToken(Buffer const & buf, Paragraph & par, LyXLex & lex,
 		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;
+			buf.error(ErrorItem(_("Unknown layout"),
+			bformat(_("Layout '%1$s' does not exists in textclass '%2$s'\nTrying to use the default instead.\n"),
+				layoutname, tclass.name()), par.id(), 0, par.size()));
 			layoutname = tclass.defaultLayoutName();
 		}
 
@@ -227,7 +217,6 @@ int readParToken(Buffer const & buf, Paragraph & par, LyXLex & lex,
 			string line = lex.getString();
 			buf.error(ErrorItem(_("Unknown Inset"), line,
 					    par.id(), 0, par.size()));
-			return 1;
 		}
 	} else if (token == "\\family") {
 		lex.next();
@@ -335,14 +324,14 @@ int readParToken(Buffer const & buf, Paragraph & par, LyXLex & lex,
 			par.cleanChanges();
 		change = Change(Change::UNCHANGED);
 	} else if (token == "\\change_inserted") {
-		lex.nextToken();
+		lex.eatLine();
 		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();
+		lex.eatLine();
 		std::istringstream is(lex.getString());
 		int aid;
 		lyx::time_type ct;
@@ -353,22 +342,19 @@ int readParToken(Buffer const & buf, Paragraph & par, LyXLex & lex,
 		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)
+void readParagraph(Buffer const & buf, Paragraph & par, LyXLex & lex)
 {
-	int unknown = 0;
-
 	lex.nextToken();
 	string token = lex.getString();
+	LyXFont font;
 
 	while (lex.isOK()) {
 
-		unknown += readParToken(buf, par, lex, token);
+		readParToken(buf, par, lex, token, font);
 
 		lex.nextToken();
 		token = lex.getString();
@@ -393,8 +379,6 @@ int readParagraph(Buffer const & buf, Paragraph & par, LyXLex & lex)
 			break;
 		}
 	}
-
-	return unknown;
 }
 
 
@@ -408,25 +392,25 @@ BufferView * LyXText::bv()
 }
 
 
-double LyXText::spacing(Paragraph const & par) const
+BufferView * LyXText::bv() const
 {
-	if (par.params().spacing().isDefault())
-		return bv()->buffer()->params().spacing().getValue();
-	return par.params().spacing().getValue();
+	BOOST_ASSERT(bv_owner != 0);
+	return bv_owner;
 }
 
 
-BufferView * LyXText::bv() const
+double LyXText::spacing(Paragraph const & par) const
 {
-	BOOST_ASSERT(bv_owner != 0);
-	return bv_owner;
+	if (par.params().spacing().isDefault())
+		return bv()->buffer()->params().spacing().getValue();
+	return par.params().spacing().getValue();
 }
 
 
 void LyXText::updateParPositions()
 {
-	par_type pit = 0;
-	par_type end = pars_.size();
+	pit_type pit = 0;
+	pit_type end = pars_.size();
 	for (height_ = 0; pit != end; ++pit) {
 		pars_[pit].y = height_;
 		height_ += pars_[pit].height;
@@ -446,44 +430,36 @@ int LyXText::height() const
 }
 
 
-int LyXText::singleWidth(par_type par, pos_type pos) const
+int LyXText::singleWidth(Paragraph const & par, pos_type pos) const
 {
-	if (pos >= pars_[par].size())
-		return 0;
-
-	char const c = pars_[par].getChar(pos);
-	return singleWidth(par, pos, c, getFont(par, pos));
+	return singleWidth(par, pos, par.getChar(pos), getFont(par, pos));
 }
 
 
-int LyXText::singleWidth(par_type pit,
+int LyXText::singleWidth(Paragraph const & par,
 			 pos_type pos, char c, LyXFont const & font) const
 {
-	if (pos >= pars_[pit].size()) {
-		lyxerr << "in singleWidth(), pos: " << pos << endl;
-		BOOST_ASSERT(false);
-		return 0;
-	}
+	BOOST_ASSERT(pos < par.size());
 
 	// 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 = pars_[pit].transformChar(c, pos);
+					c = par.transformChar(c, pos);
 			} else if (font.language()->lang() == "hebrew" &&
-				 Encodings::IsComposeChar_hebrew(c))
+				   Encodings::IsComposeChar_hebrew(c))
 				return 0;
 		}
 		return font_metrics::width(c, font);
 	}
 
 	if (c == Paragraph::META_INSET)
-		return pars_[pit].getInset(pos)->width();
+		return par.getInset(pos)->width();
 
 	if (IsSeparatorChar(c))
 		c = ' ';
@@ -491,96 +467,83 @@ int LyXText::singleWidth(par_type pit,
 }
 
 
-int LyXText::leftMargin(par_type pit) const
+int LyXText::leftMargin(pit_type pit) const
 {
 	return leftMargin(pit, pars_[pit].size());
 }
 
 
-int LyXText::leftMargin(par_type pit, pos_type pos) const
+int LyXText::leftMargin(pit_type const pit, pos_type const pos) const
 {
+	Paragraph const & par = pars_[pit];
 	LyXTextClass const & tclass =
 		bv()->buffer()->params().getLyXTextClass();
-	LyXLayout_ptr const & layout = pars_[pit].layout();
+	LyXLayout_ptr const & layout = par.layout();
 
 	string parindent = layout->parindent;
 
-	int x = NEST_MARGIN + CHANGEBAR_MARGIN;
+	int l_margin = 0;
+
+	if (xo_ == 0)
+		l_margin += changebarMargin();
 
-	x += font_metrics::signedWidth(tclass.leftmargin(), tclass.defaultfont());
+	l_margin += font_metrics::signedWidth(tclass.leftmargin(), tclass.defaultfont());
 
-	// 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 (pars_[pit].getDepth() == 0) {
-		if (pars_[pit].layout() == tclass.defaultLayout()) {
-			// find the previous same level paragraph
-			if (pit != 0) {
-				par_type newpit =
-					depthHook(pit, paragraphs(), pars_[pit].getDepth());
-				if (newpit == pit && pars_[newpit].layout()->nextnoindent)
+	if (par.getDepth() != 0) {
+	// find the next level paragraph
+	pit_type newpar = outerHook(pit, pars_);
+		if (newpar != pit_type(pars_.size())) {
+			if (pars_[newpar].layout()->isEnvironment()) {
+				l_margin = leftMargin(newpar);
+			}
+			if (par.layout() == tclass.defaultLayout()) {
+				if (pars_[newpar].params().noindent())
 					parindent.erase();
+				else
+					parindent = pars_[newpar].layout()->parindent;
 			}
 		}
-	} else {
-		// find the next level paragraph
-		par_type newpar = outerHook(pit, pars_);
-
-		// Make a corresponding row. Need to call leftMargin()
-		// to check whether it is a sufficent paragraph.
-		if (newpar != pars_.size()
-		    && pars_[newpar].layout()->isEnvironment()) {
-			x = leftMargin(newpar);
-		}
-
-		if (newpar != paragraphs().size()
-		    && pars_[pit].layout() == tclass.defaultLayout()) {
-			if (pars_[newpar].params().noindent())
-				parindent.erase();
-			else
-				parindent = pars_[newpar].layout()->parindent;
-		}
 	}
 
-	LyXFont const labelfont = getLabelFont(pit);
+	LyXFont const labelfont = getLabelFont(par);
 	switch (layout->margintype) {
 	case MARGIN_DYNAMIC:
 		if (!layout->leftmargin.empty())
-			x += font_metrics::signedWidth(layout->leftmargin,
+			l_margin += font_metrics::signedWidth(layout->leftmargin,
 						  tclass.defaultfont());
-		if (!pars_[pit].getLabelstring().empty()) {
-			x += font_metrics::signedWidth(layout->labelindent,
+		if (!par.getLabelstring().empty()) {
+			l_margin += font_metrics::signedWidth(layout->labelindent,
 						  labelfont);
-			x += font_metrics::width(pars_[pit].getLabelstring(),
+			l_margin += font_metrics::width(par.getLabelstring(),
 					    labelfont);
-			x += font_metrics::width(layout->labelsep, labelfont);
+			l_margin += font_metrics::width(layout->labelsep, labelfont);
 		}
 		break;
 
 	case MARGIN_MANUAL:
-		x += font_metrics::signedWidth(layout->labelindent, labelfont);
+		l_margin += font_metrics::signedWidth(layout->labelindent, labelfont);
 		// The width of an empty par, even with manual label, should be 0
-		if (!pars_[pit].empty() && pos >= pars_[pit].beginOfBody()) {
-			if (!pars_[pit].getLabelWidthString().empty()) {
-				x += font_metrics::width(pars_[pit].getLabelWidthString(),
+		if (!par.empty() && pos >= par.beginOfBody()) {
+			if (!par.getLabelWidthString().empty()) {
+				l_margin += font_metrics::width(par.getLabelWidthString(),
 					       labelfont);
-				x += font_metrics::width(layout->labelsep, labelfont);
+				l_margin += font_metrics::width(layout->labelsep, labelfont);
 			}
 		}
 		break;
 
 	case MARGIN_STATIC:
-		x += font_metrics::signedWidth(layout->leftmargin, tclass.defaultfont()) * 4
-			/ (pars_[pit].getDepth() + 4);
+		l_margin += font_metrics::signedWidth(layout->leftmargin, tclass.defaultfont()) * 4
+			/ (par.getDepth() + 4);
 		break;
 
 	case MARGIN_FIRST_DYNAMIC:
 		if (layout->labeltype == LABEL_MANUAL) {
-			if (pos >= pars_[pit].beginOfBody()) {
-				x += font_metrics::signedWidth(layout->leftmargin,
+			if (pos >= par.beginOfBody()) {
+				l_margin += font_metrics::signedWidth(layout->leftmargin,
 							  labelfont);
 			} else {
-				x += font_metrics::signedWidth(layout->labelindent,
+				l_margin += font_metrics::signedWidth(layout->labelindent,
 							  labelfont);
 			}
 		} else if (pos != 0
@@ -588,17 +551,17 @@ int LyXText::leftMargin(par_type pit, pos_type pos) const
 			   // theorems (JMarc)
 			   || (layout->labeltype == LABEL_STATIC
 			       && layout->latextype == LATEX_ENVIRONMENT
-			       && !isFirstInSequence(pit, paragraphs()))) {
-			x += font_metrics::signedWidth(layout->leftmargin,
+			       && !isFirstInSequence(pit, pars_))) {
+			l_margin += font_metrics::signedWidth(layout->leftmargin,
 						  labelfont);
 		} else if (layout->labeltype != LABEL_TOP_ENVIRONMENT
 			   && layout->labeltype != LABEL_BIBLIO
 			   && layout->labeltype !=
 			   LABEL_CENTERED_TOP_ENVIRONMENT) {
-			x += font_metrics::signedWidth(layout->labelindent,
+			l_margin += font_metrics::signedWidth(layout->labelindent,
 						  labelfont);
-			x += font_metrics::width(layout->labelsep, labelfont);
-			x += font_metrics::width(pars_[pit].getLabelstring(),
+			l_margin += font_metrics::width(layout->labelsep, labelfont);
+			l_margin += font_metrics::width(par.getLabelstring(),
 					    labelfont);
 		}
 		break;
@@ -607,33 +570,34 @@ int LyXText::leftMargin(par_type 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 = pars_[pit].rows.begin();
-		RowList::iterator end = pars_[pit].rows.end();
+		RowList::iterator rit = par.rows.begin();
+		RowList::iterator end = par.rows.end();
+#ifdef WITH_WARNINGS
 #warning This is wrong.
+#endif
 		int minfill = maxwidth_;
 		for ( ; rit != end; ++rit)
 			if (rit->fill() < minfill)
 				minfill = rit->fill();
-		x += font_metrics::signedWidth(layout->leftmargin,
+		l_margin += font_metrics::signedWidth(layout->leftmargin,
 			tclass.defaultfont());
-		x += minfill;
+		l_margin += minfill;
 #endif
 		// also wrong, but much shorter.
-		x += maxwidth_ / 2;
+		l_margin += maxwidth_ / 2;
 		break;
 	}
 	}
-	
 
-	if (!pars_[pit].params().leftIndent().zero())
-		x += pars_[pit].params().leftIndent().inPixels(maxwidth_);
+	if (!par.params().leftIndent().zero())
+		l_margin += par.params().leftIndent().inPixels(maxwidth_);
 
 	LyXAlignment align;
 
-	if (pars_[pit].params().align() == LYX_ALIGN_LAYOUT)
+	if (par.params().align() == LYX_ALIGN_LAYOUT)
 		align = layout->align;
 	else
-		align = pars_[pit].params().align();
+		align = par.params().align();
 
 	// set the correct parindent
 	if (pos == 0
@@ -642,39 +606,44 @@ int LyXText::leftMargin(par_type pit, pos_type pos) const
 	       || layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT
 	       || (layout->labeltype == LABEL_STATIC
 	           && layout->latextype == LATEX_ENVIRONMENT
-	           && !isFirstInSequence(pit, paragraphs())))
+	           && !isFirstInSequence(pit, pars_)))
 	    && align == LYX_ALIGN_BLOCK
-	    && !pars_[pit].params().noindent()
-	    // in tabulars and ert paragraphs are never indented!
-	    && (!pars_[pit].inInset()
-	        || (pars_[pit].inInset()->lyxCode() != InsetOld::TABULAR_CODE
-	            && pars_[pit].inInset()->lyxCode() != InsetOld::ERT_CODE))
-	    && (pars_[pit].layout() != tclass.defaultLayout()
+	    && !par.params().noindent()
+	    // in charstyles, tabulars and ert paragraphs are never indented!
+	    && (par.ownerCode() != InsetBase::TEXT_CODE
+	            && par.ownerCode() != InsetBase::ERT_CODE
+		    && par.ownerCode() != InsetBase::CHARSTYLE_CODE)
+	    && (par.layout() != tclass.defaultLayout()
 	        || bv()->buffer()->params().paragraph_separation ==
 	           BufferParams::PARSEP_INDENT))
 	{
-		x += font_metrics::signedWidth(parindent, tclass.defaultfont());
+		l_margin += font_metrics::signedWidth(parindent, tclass.defaultfont());
 	}
 
-	return x;
+	return l_margin;
 }
 
 
 int LyXText::rightMargin(Paragraph const & par) const
 {
-	LyXTextClass const & tclass = bv()->buffer()->params().getLyXTextClass();
+	// We do not want rightmargins on inner texts.
+	if (bv()->text() != this)
+		return 0;
 
-	return
-		RIGHT_MARGIN
+	LyXTextClass const & tclass = bv()->buffer()->params().getLyXTextClass();
+	int const r_margin =
+		::rightMargin()
 		+ font_metrics::signedWidth(tclass.rightmargin(),
-				       tclass.defaultfont())
+					    tclass.defaultfont())
 		+ font_metrics::signedWidth(par.layout()->rightmargin,
-				       tclass.defaultfont())
+					    tclass.defaultfont())
 		* 4 / (par.getDepth() + 4);
+
+	return r_margin;
 }
 
 
-int LyXText::labelEnd(par_type pit) const
+int LyXText::labelEnd(pit_type const pit) const
 {
 	// labelEnd is only needed if the layout fills a flushleft label.
 	if (pars_[pit].layout()->margintype != MARGIN_MANUAL)
@@ -701,9 +670,10 @@ pos_type addressBreakPoint(pos_type i, Paragraph const & par)
 };
 
 
-void LyXText::rowBreakPoint(par_type pit, Row & row) const
+void LyXText::rowBreakPoint(pit_type const pit, Row & row) const
 {
-	pos_type const end = pars_[pit].size();
+	Paragraph const & par = pars_[pit];
+	pos_type const end = par.size();
 	pos_type const pos = row.pos();
 	if (pos == end) {
 		row.endpos(end);
@@ -711,20 +681,20 @@ void LyXText::rowBreakPoint(par_type pit, Row & row) const
 	}
 
 	// maximum pixel width of a row
-	int width = maxwidth_ - rightMargin(pars_[pit]); // - leftMargin(pit, row);
+	int width = maxwidth_ - rightMargin(par); // - leftMargin(pit, row);
 	if (width < 0) {
 		row.endpos(end);
 		return;
 	}
 
-	LyXLayout_ptr const & layout = pars_[pit].layout();
+	LyXLayout_ptr const & layout = par.layout();
 
 	if (layout->margintype == MARGIN_RIGHT_ADDRESS_BOX) {
-		row.endpos(addressBreakPoint(pos, pars_[pit]));
+		row.endpos(addressBreakPoint(pos, par));
 		return;
 	}
 
-	pos_type const body_pos = pars_[pit].beginOfBody();
+	pos_type const body_pos = par.beginOfBody();
 
 
 	// Now we iterate through until we reach the right margin
@@ -741,16 +711,16 @@ void LyXText::rowBreakPoint(par_type pit, Row & row) const
 	pos_type point = end;
 	pos_type i = pos;
 	for ( ; i < end; ++i, ++fi) {
-		char const c = pars_[pit].getChar(i);
+		char const c = par.getChar(i);
 
 		{
-			int thiswidth = singleWidth(pit, i, c, *fi);
+			int thiswidth = singleWidth(par, 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 (pars_[pit].isLineSeparator(i - 1))
-					add -= singleWidth(pit, i - 1);
+				int add = font_metrics::width(layout->labelsep, getLabelFont(par));
+				if (par.isLineSeparator(i - 1))
+					add -= singleWidth(par, i - 1);
 
 				add = std::max(add, labelEnd(pit) - x);
 				thiswidth += add;
@@ -775,26 +745,26 @@ void LyXText::rowBreakPoint(par_type pit, Row & row) const
 			break;
 		}
 
-		if (pars_[pit].isNewline(i)) {
+		if (par.isNewline(i)) {
 			point = i + 1;
 			break;
 		}
 		// Break before...
 		if (i + 1 < end) {
-			if (pars_[pit].isInset(i + 1) && pars_[pit].getInset(i + 1)->display()) {
+			if (par.isInset(i + 1) && par.getInset(i + 1)->display()) {
 				point = i + 1;
 				break;
 			}
 			// ...and after.
-			if (pars_[pit].isInset(i) && pars_[pit].getInset(i)->display()) {
+			if (par.isInset(i) && par.getInset(i)->display()) {
 				point = i + 1;
 				break;
 			}
 		}
-		
-		if (!pars_[pit].isInset(i) || pars_[pit].getInset(i)->isChar()) {
+
+		if (!par.isInset(i) || par.getInset(i)->isChar()) {
 			// some insets are line separators too
-			if (pars_[pit].isLineSeparator(i)) {
+			if (par.isLineSeparator(i)) {
 				// register breakpoint:
 				point = i + 1;
 				chunkwidth = 0;
@@ -816,46 +786,47 @@ void LyXText::rowBreakPoint(par_type pit, Row & row) const
 }
 
 
-void LyXText::setRowWidth(par_type pit, Row & row) const
+void LyXText::setRowWidth(pit_type const pit, Row & row) const
 {
 	// get the pure distance
 	pos_type const end = row.endpos();
 
-	string labelsep = pars_[pit].layout()->labelsep;
+	Paragraph const & par = pars_[pit];
+	string labelsep = par.layout()->labelsep;
 	int w = leftMargin(pit, row.pos());
 
-	pos_type const body_pos = pars_[pit].beginOfBody();
+	pos_type const body_pos = par.beginOfBody();
 	pos_type i = row.pos();
 
 	if (i < end) {
 		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 (pars_[pit].isLineSeparator(i - 1))
-					w -= singleWidth(pit, i - 1);
+				w += font_metrics::width(labelsep, getLabelFont(par));
+				if (par.isLineSeparator(i - 1))
+					w -= singleWidth(par, i - 1);
 				w = max(w, labelEnd(pit));
 			}
-			char const c = pars_[pit].getChar(i);
-			w += singleWidth(pit, i, c, *fi);
+			char const c = par.getChar(i);
+			w += singleWidth(par, i, c, *fi);
 		}
 	}
 
 	if (body_pos > 0 && body_pos >= end) {
-		w += font_metrics::width(labelsep, getLabelFont(pit));
-		if (end > 0 && pars_[pit].isLineSeparator(end - 1))
-			w -= singleWidth(pit, end - 1);
+		w += font_metrics::width(labelsep, getLabelFont(par));
+		if (end > 0 && par.isLineSeparator(end - 1))
+			w -= singleWidth(par, end - 1);
 		w = max(w, labelEnd(pit));
 	}
 
-	row.width(w + rightMargin(pars_[pit]));
+	row.width(w + rightMargin(par));
 }
 
 
 // returns the minimum space a manual label needs on the screen in pixel
-int LyXText::labelFill(par_type pit, Row const & row) const
+int LyXText::labelFill(Paragraph const & par, Row const & row) const
 {
-	pos_type last = pars_[pit].beginOfBody();
+	pos_type last = par.beginOfBody();
 
 	BOOST_ASSERT(last > 0);
 
@@ -863,18 +834,18 @@ int LyXText::labelFill(par_type pit, Row const & row) const
 	--last;
 
 	// a separator at this end does not count
-	if (pars_[pit].isLineSeparator(last))
+	if (par.isLineSeparator(last))
 		--last;
 
 	int w = 0;
 	for (pos_type i = row.pos(); i <= last; ++i)
-		w += singleWidth(pit, i);
+		w += singleWidth(par, i);
 
-	string const & label = pars_[pit].params().labelWidthString();
+	string const & label = par.params().labelWidthString();
 	if (label.empty())
 		return 0;
 
-	return max(0, font_metrics::width(label, getLabelFont(pit)) - w);
+	return max(0, font_metrics::width(label, getLabelFont(par)) - w);
 }
 
 
@@ -884,8 +855,9 @@ LColor_color LyXText::backgroundColor() const
 }
 
 
-void LyXText::setHeightOfRow(par_type pit, Row & row)
+void LyXText::setHeightOfRow(pit_type const pit, Row & row)
 {
+	Paragraph const & par = pars_[pit];
 	// get the maximum ascent and the maximum descent
 	double layoutasc = 0;
 	double layoutdesc = 0;
@@ -894,30 +866,29 @@ void LyXText::setHeightOfRow(par_type 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 = pars_[pit].layout();
+	LyXLayout_ptr const & layout = par.layout();
 
 	// as max get the first character of this row then it can
 	// increase but not decrease the height. Just some point to
 	// start with so we don't have to do the assignment below too
 	// often.
-	LyXFont font = getFont(pit, row.pos());
+	LyXFont font = getFont(par, row.pos());
 	LyXFont::FONT_SIZE const tmpsize = font.size();
 	font = getLayoutFont(pit);
 	LyXFont::FONT_SIZE const size = font.size();
 	font.setSize(tmpsize);
 
-	LyXFont labelfont = getLabelFont(pit);
+	LyXFont labelfont = getLabelFont(par);
 
 	// these are minimum values
-	double const spacing_val =
-		layout->spacing.getValue() * spacing(pars_[pit]);
+	double const spacing_val = layout->spacing.getValue() * spacing(par);
 	//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 = pars_[pit].insetlist.begin();
-	InsetList::iterator iend = pars_[pit].insetlist.end();
+	InsetList::const_iterator ii = par.insetlist.begin();
+	InsetList::const_iterator iend = par.insetlist.end();
 	for ( ; ii != iend; ++ii) {
 		if (ii->pos >= row.pos() && ii->pos < row.endpos()) {
 			maxasc  = max(maxasc,  ii->inset->ascent());
@@ -932,7 +903,7 @@ void LyXText::setHeightOfRow(par_type pit, Row & row)
 	pos_type const pos_end = row.endpos();
 
 	LyXFont::FONT_SIZE maxsize =
-		pars_[pit].highestFontInRange(row.pos(), pos_end, size);
+		par.highestFontInRange(row.pos(), pos_end, size);
 	if (maxsize > font.size()) {
 		font.setSize(maxsize);
 		maxasc  = max(maxasc,  font_metrics::maxAscent(font));
@@ -952,7 +923,7 @@ void LyXText::setHeightOfRow(par_type pit, Row & row)
 		if (bv()->buffer()->params().paragraph_separation
 		    == BufferParams::PARSEP_SKIP
 			&& pit != 0
-			&& ((layout->isParagraph() && pars_[pit].getDepth() == 0)
+			&& ((layout->isParagraph() && par.getDepth() == 0)
 			    || (pars_[pit - 1].layout()->isParagraph()
 			        && pars_[pit - 1].getDepth() == 0)))
 		{
@@ -967,7 +938,7 @@ void LyXText::setHeightOfRow(par_type pit, Row & row)
 		if (layout->counter == "chapter" && bufparams.secnumdepth >= 0) {
 			labeladdon = int(font_metrics::maxHeight(labelfont)
 			             * layout->spacing.getValue()
-			             * spacing(pars_[pit]));
+			             * spacing(par));
 		}
 
 		// special code for the top label
@@ -975,12 +946,12 @@ void LyXText::setHeightOfRow(par_type pit, Row & row)
 		     || layout->labeltype == LABEL_BIBLIO
 		     || layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT)
 		    && isFirstInSequence(pit, paragraphs())
-		    && !pars_[pit].getLabelstring().empty())
+		    && !par.getLabelstring().empty())
 		{
 			labeladdon = int(
 				  font_metrics::maxHeight(labelfont)
 					* layout->spacing.getValue()
-					* spacing(pars_[pit])
+					* spacing(par)
 				+ (layout->topsep + layout->labelbottomsep) * dh);
 		}
 
@@ -988,11 +959,11 @@ void LyXText::setHeightOfRow(par_type pit, Row & row)
 		// a section, or between the items of a itemize or enumerate
 		// environment.
 
-		par_type prev = depthHook(pit, pars_, pars_[pit].getDepth());
+		pit_type prev = depthHook(pit, pars_, par.getDepth());
 		if (prev != pit
 		    && pars_[prev].layout() == layout
-		    && pars_[prev].getDepth() == pars_[pit].getDepth()
-		    && pars_[prev].getLabelWidthString() == pars_[pit].getLabelWidthString())
+		    && pars_[prev].getDepth() == par.getDepth()
+		    && pars_[prev].getLabelWidthString() == par.getLabelWidthString())
 		{
 			layoutasc = layout->itemsep * dh;
 		} else if (pit != 0 || row.pos() != 0) {
@@ -1001,7 +972,7 @@ void LyXText::setHeightOfRow(par_type pit, Row & row)
 		}
 
 		prev = outerHook(pit, pars_);
-		if (prev != pars_.size()) {
+		if (prev != pit_type(pars_.size())) {
 			maxasc += int(pars_[prev].layout()->parsep * dh);
 		} else if (pit != 0) {
 			if (pars_[pit - 1].getDepth() != 0 ||
@@ -1012,13 +983,13 @@ void LyXText::setHeightOfRow(par_type pit, Row & row)
 	}
 
 	// is it a bottom line?
-	if (row.endpos() >= pars_[pit].size()) {
+	if (row.endpos() >= par.size()) {
 		// add the layout spaces, for example before and after
 		// a section, or between the items of a itemize or enumerate
 		// environment
-		par_type nextpit = pit + 1;
-		if (nextpit != pars_.size()) {
-			par_type cpit = pit;
+		pit_type nextpit = pit + 1;
+		if (nextpit != pit_type(pars_.size())) {
+			pit_type cpit = pit;
 			double usual = 0;
 			double unusual = 0;
 
@@ -1049,19 +1020,22 @@ void LyXText::setHeightOfRow(par_type pit, Row & row)
 }
 
 
+namespace {
+
+}
+
 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
 	Paragraph & cpar = cur.paragraph();
-	par_type cpit = cur.par();
+	pit_type cpit = cur.pit();
 
 	if (cur.pos() != 0 && cur.pos() != cur.lastpos()
 	    && cpar.isChangeEdited(0, cur.pos()))
 		return;
 
-	LyXTextClass const & tclass =
-		bv()->buffer()->params().getLyXTextClass();
+	LyXTextClass const & tclass = cur.buffer().params().getLyXTextClass();
 	LyXLayout_ptr const & layout = cpar.layout();
 
 	// this is only allowed, if the current paragraph is not empty
@@ -1071,7 +1045,7 @@ void LyXText::breakParagraph(LCursor & cur, char keep_layout)
 		return;
 
 	// a layout change may affect also the following paragraph
-	recUndo(cur.par(), undoSpan(cur.par()) - 1);
+	recUndo(cur.pit(), undoSpan(cur.pit()) - 1);
 
 	// Always break behind a space
 	// It is better to erase the space (Dekel)
@@ -1089,15 +1063,15 @@ void LyXText::breakParagraph(LCursor & cur, char keep_layout)
 	// 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 = cpar.allowEmpty() && cpar.empty();
-	::breakParagraph(bv()->buffer()->params(), paragraphs(), cpit,
+	::breakParagraph(cur.buffer().params(), paragraphs(), cpit,
 			 cur.pos(), keep_layout);
 
-	cpit = cur.par();
-	par_type next_par = cpit + 1;
+	cpit = cur.pit();
+	pit_type next_par = cpit + 1;
 
 	// well this is the caption hack since one caption is really enough
 	if (layout->labeltype == LABEL_SENSITIVE) {
-		if (!cur.pos())
+		if (cur.pos() == 0)
 			// set to standard-layout
 			pars_[cpit].applyLayout(tclass.defaultLayout());
 		else
@@ -1125,9 +1099,9 @@ void LyXText::breakParagraph(LCursor & cur, 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 (cur.pos() != 0 || isempty)
-		setCursor(cur, cur.par() + 1, 0);
+		setCursor(cur, cur.pit() + 1, 0);
 	else
-		setCursor(cur, cur.par(), 0);
+		setCursor(cur, cur.pit(), 0);
 }
 
 
@@ -1136,8 +1110,8 @@ void LyXText::redoParagraph(LCursor & cur)
 {
 	BOOST_ASSERT(this == cur.text());
 	cur.clearSelection();
-	redoParagraph(cur.par());
-	setCursorIntern(cur, cur.par(), cur.pos());
+	redoParagraph(cur.pit());
+	setCursorIntern(cur, cur.pit(), cur.pos());
 }
 
 
@@ -1152,7 +1126,7 @@ void LyXText::insertChar(LCursor & cur, char c)
 
 	Paragraph & par = cur.paragraph();
 	// try to remove this
-	par_type pit = cur.par();
+	pit_type const pit = cur.pit();
 
 	bool const freeSpacing = par.layout()->free_spacing ||
 		par.isFreeSpacing();
@@ -1167,8 +1141,8 @@ void LyXText::insertChar(LCursor & cur, char c)
 			    !(contains(number_seperators, c) &&
 			      cur.pos() != 0 &&
 			      cur.pos() != cur.lastpos() &&
-			      getFont(pit, cur.pos()).number() == LyXFont::ON &&
-			      getFont(pit, cur.pos() - 1).number() == LyXFont::ON)
+			      getFont(par, cur.pos()).number() == LyXFont::ON &&
+			      getFont(par, cur.pos() - 1).number() == LyXFont::ON)
 			   )
 				number(cur); // Set current_font.number to OFF
 		} else if (IsDigit(c) &&
@@ -1185,7 +1159,7 @@ void LyXText::insertChar(LCursor & cur, char c)
 					setCharFont(pit, cur.pos() - 1, current_font);
 				} else if (contains(number_seperators, c)
 				     && cur.pos() >= 2
-				     && getFont(pit, cur.pos() - 2).number() == LyXFont::ON) {
+				     && getFont(par, cur.pos() - 2).number() == LyXFont::ON) {
 					setCharFont(pit, cur.pos() - 1, current_font);
 				}
 			}
@@ -1233,13 +1207,12 @@ void LyXText::insertChar(LCursor & cur, char c)
 		}
 	}
 
-	par.insertChar(cur.pos(), c);
-	setCharFont(pit, cur.pos(), rawtmpfont);
+	par.insertChar(cur.pos(), c, rawtmpfont);
 
 	current_font = rawtmpfont;
 	real_current_font = realtmpfont;
 	redoParagraph(cur);
-	setCursor(cur, cur.par(), cur.pos() + 1, false, cur.boundary());
+	setCursor(cur, cur.pit(), cur.pos() + 1, false, cur.boundary());
 	charInserted();
 }
 
@@ -1258,40 +1231,41 @@ void LyXText::charInserted()
 }
 
 
-RowMetrics LyXText::computeRowMetrics(par_type pit, Row const & row) const
+RowMetrics LyXText::computeRowMetrics(pit_type const pit, Row const & row) const
 {
 	RowMetrics result;
+	Paragraph const & par = pars_[pit];
 
 	double w = width_ - row.width();
 
-	bool const is_rtl = isRTL(pars_[pit]);
+	bool const is_rtl = isRTL(par);
 	if (is_rtl)
-		result.x = rightMargin(pars_[pit]);
+		result.x = rightMargin(par);
 	else
 		result.x = leftMargin(pit, row.pos());
 
 	// is there a manual margin with a manual label
-	LyXLayout_ptr const & layout = pars_[pit].layout();
+	LyXLayout_ptr const & layout = par.layout();
 
 	if (layout->margintype == MARGIN_MANUAL
 	    && layout->labeltype == LABEL_MANUAL) {
 		/// We might have real hfills in the label part
-		int nlh = numberOfLabelHfills(pars_[pit], row);
+		int nlh = numberOfLabelHfills(par, row);
 
 		// A manual label par (e.g. List) has an auto-hfill
 		// between the label text and the body of the
 		// paragraph too.
 		// But we don't want to do this auto hfill if the par
 		// is empty.
-		if (!pars_[pit].empty())
+		if (!par.empty())
 			++nlh;
 
-		if (nlh && !pars_[pit].getLabelWidthString().empty())
-			result.label_hfill = labelFill(pit, row) / double(nlh);
+		if (nlh && !par.getLabelWidthString().empty())
+			result.label_hfill = labelFill(par, row) / double(nlh);
 	}
 
 	// are there any hfills in the row?
-	int const nh = numberOfHfills(pars_[pit], row);
+	int const nh = numberOfHfills(par, row);
 
 	if (nh) {
 		if (w > 0)
@@ -1303,28 +1277,28 @@ RowMetrics LyXText::computeRowMetrics(par_type pit, Row const & row) const
 		// is it block, flushleft or flushright?
 		// set x how you need it
 		int align;
-		if (pars_[pit].params().align() == LYX_ALIGN_LAYOUT)
+		if (par.params().align() == LYX_ALIGN_LAYOUT)
 			align = layout->align;
 		else
-			align = pars_[pit].params().align();
+			align = par.params().align();
 
 		// Display-style insets should always be on a centred row
-		// The test on pars_[pit].size() is to catch zero-size pars, which
+		// The test on par.size() is to catch zero-size pars, which
 		// would trigger the assert in Paragraph::getInset().
-		//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())
+		//inset = par.size() ? par.getInset(row.pos()) : 0;
+		if (!par.empty()
+		    && par.isInset(row.pos())
+		    && par.getInset(row.pos())->display())
 		{
 			align = LYX_ALIGN_CENTER;
 		}
 
 		switch (align) {
 		case LYX_ALIGN_BLOCK: {
-			int const ns = numberOfSeparators(pars_[pit], row);
+			int const ns = numberOfSeparators(par, row);
 			bool disp_inset = false;
-			if (row.endpos() < pars_[pit].size()) {
-				InsetBase const * in = pars_[pit].getInset(row.endpos());
+			if (row.endpos() < par.size()) {
+				InsetBase const * in = par.getInset(row.endpos());
 				if (in)
 					disp_inset = in->display();
 			}
@@ -1332,8 +1306,8 @@ RowMetrics LyXText::computeRowMetrics(par_type pit, Row const & row) const
 			// 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)
+			    && row.endpos() < par.size()
+			    && !par.isNewline(row.endpos() - 1)
 			    && !disp_inset
 				) {
 				result.separator = w / ns;
@@ -1351,15 +1325,15 @@ RowMetrics LyXText::computeRowMetrics(par_type pit, Row const & row) const
 		}
 	}
 
-	bidi.computeTables(pars_[pit], *bv()->buffer(), row);
+	bidi.computeTables(par, *bv()->buffer(), row);
 	if (is_rtl) {
-		pos_type body_pos = pars_[pit].beginOfBody();
+		pos_type body_pos = par.beginOfBody();
 		pos_type end = row.endpos();
 
 		if (body_pos > 0
-		    && (body_pos > end || !pars_[pit].isLineSeparator(body_pos - 1)))
+		    && (body_pos > end || !par.isLineSeparator(body_pos - 1)))
 		{
-			result.x += font_metrics::width(layout->labelsep, getLabelFont(pit));
+			result.x += font_metrics::width(layout->labelsep, getLabelFont(par));
 			if (body_pos <= end)
 				result.x += result.label_hfill;
 		}
@@ -1375,38 +1349,38 @@ RowMetrics LyXText::computeRowMetrics(par_type pit, Row const & row) const
 void LyXText::cursorRightOneWord(LCursor & cur)
 {
 	BOOST_ASSERT(this == cur.text());
-	if (cur.pos() == cur.lastpos() && cur.par() != cur.lastpar()) {
-		++cur.par();
+	if (cur.pos() == cur.lastpos() && cur.pit() != cur.lastpit()) {
+		++cur.pit();
 		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()))
+		while (cur.pos() != cur.lastpos() && !cur.paragraph().isLetter(cur.pos()))
 			++cur.pos();
 		// Advance through word.
-		while (cur.pos() != cur.lastpos() && cur.paragraph().isWord(cur.pos()))
+		while (cur.pos() != cur.lastpos() && cur.paragraph().isLetter(cur.pos()))
 			++cur.pos();
 	}
-	setCursor(cur, cur.par(), cur.pos());
+	setCursor(cur, cur.pit(), cur.pos());
 }
 
 
 void LyXText::cursorLeftOneWord(LCursor & cur)
 {
 	BOOST_ASSERT(this == cur.text());
-	if (cur.pos() == 0 && cur.par() != 0) {
-		--cur.par();
+	if (cur.pos() == 0 && cur.pit() != 0) {
+		--cur.pit();
 		cur.pos() = cur.lastpos();
-	} else { 
+	} else {
 		// Skip through initial nonword stuff.
 		// Treat floats and insets as words.
-		while (cur.pos() != 0 && !cur.paragraph().isWord(cur.pos() - 1))
+		while (cur.pos() != 0 && !cur.paragraph().isLetter(cur.pos() - 1))
 			--cur.pos();
 		// Advance through word.
-		while (cur.pos() != 0 && cur.paragraph().isWord(cur.pos() - 1))
+		while (cur.pos() != 0 && cur.paragraph().isLetter(cur.pos() - 1))
 			--cur.pos();
 	}
-	setCursor(cur, cur.par(), cur.pos());
+	setCursor(cur, cur.pit(), cur.pos());
 }
 
 
@@ -1417,11 +1391,11 @@ void LyXText::selectWord(LCursor & cur, word_location loc)
 	CursorSlice to = cur.top();
 	getWord(from, to, loc);
 	if (cur.top() != from)
-		setCursor(cur, from.par(), from.pos());
+		setCursor(cur, from.pit(), from.pos());
 	if (to == from)
 		return;
 	cur.resetAnchor();
-	setCursor(cur, to.par(), to.pos());
+	setCursor(cur, to.pit(), to.pos());
 	cur.setSelection();
 }
 
@@ -1446,15 +1420,17 @@ void LyXText::acceptChange(LCursor & cur)
 
 	CursorSlice const & startc = cur.selBegin();
 	CursorSlice const & endc = cur.selEnd();
-	if (startc.par() == endc.par()) {
+	if (startc.pit() == endc.pit()) {
 		recordUndoSelection(cur, Undo::INSERT);
-		pars_[startc.par()].acceptChange(startc.pos(), endc.pos());
+		pars_[startc.pit()].acceptChange(startc.pos(), endc.pos());
 		finishUndo();
 		cur.clearSelection();
-		redoParagraph(startc.par());
-		setCursorIntern(cur, startc.par(), 0);
+		redoParagraph(startc.pit());
+		setCursorIntern(cur, startc.pit(), 0);
 	}
+#ifdef WITH_WARNINGS
 #warning handle multi par selection
+#endif
 }
 
 
@@ -1466,15 +1442,17 @@ void LyXText::rejectChange(LCursor & cur)
 
 	CursorSlice const & startc = cur.selBegin();
 	CursorSlice const & endc = cur.selEnd();
-	if (startc.par() == endc.par()) {
+	if (startc.pit() == endc.pit()) {
 		recordUndoSelection(cur, Undo::INSERT);
-		pars_[startc.par()].rejectChange(startc.pos(), endc.pos());
+		pars_[startc.pit()].rejectChange(startc.pos(), endc.pos());
 		finishUndo();
 		cur.clearSelection();
-		redoParagraph(startc.par());
-		setCursorIntern(cur, startc.par(), 0);
+		redoParagraph(startc.pit());
+		setCursorIntern(cur, startc.pit(), 0);
 	}
+#ifdef WITH_WARNINGS
 #warning handle multi par selection
+#endif
 }
 
 
@@ -1543,16 +1521,16 @@ void LyXText::changeCase(LCursor & cur, LyXText::TextCase action)
 	} else {
 		from = cur.top();
 		getWord(from, to, lyx::PARTIAL_WORD);
-		setCursor(cur, to.par(), to.pos() + 1);
+		setCursor(cur, to.pit(), to.pos() + 1);
 	}
 
 	recordUndoSelection(cur);
 
 	pos_type pos = from.pos();
-	int par = from.par();
+	int par = from.pit();
 
-	while (par != int(pars_.size()) && (pos != to.pos() || par != to.par())) {
-		par_type pit = par;
+	while (par != int(pars_.size()) && (pos != to.pos() || par != to.pit())) {
+		pit_type pit = par;
 		if (pos == pars_[pit].size()) {
 			++par;
 			pos = 0;
@@ -1573,7 +1551,9 @@ void LyXText::changeCase(LCursor & cur, LyXText::TextCase action)
 				break;
 			}
 		}
+#ifdef WITH_WARNINGS
 #warning changes
+#endif
 		pars_[pit].setChar(pos, c);
 		++pos;
 	}
@@ -1583,14 +1563,12 @@ void LyXText::changeCase(LCursor & cur, LyXText::TextCase action)
 void LyXText::Delete(LCursor & cur)
 {
 	BOOST_ASSERT(this == cur.text());
-	// just move to the right, if we had success make a backspace
-	CursorSlice sl = cur.top();
-	cursorRight(cur);
-	if (sl != cur.top()) {
-		recordUndo(cur, Undo::DELETE, cur.par(), 
-		           max(par_type(0), cur.par() - 1));
+	if (cur.pos() != cur.lastpos()) {
+		recordUndo(cur, Undo::DELETE, cur.pit());
+		setCursorIntern(cur, cur.pit(), cur.pos() + 1, false, cur.boundary());
 		backspace(cur);
 	}
+	// should we do anything in an else branch?
 }
 
 
@@ -1617,7 +1595,7 @@ void LyXText::backspace(LCursor & cur)
 			// left and let the DeleteEmptyParagraphMechanism
 			// handle the actual deletion of the paragraph.
 
-			if (cur.par() != 0) {
+			if (cur.pit() != 0) {
 				cursorLeft(cur);
 				// the layout things can change the height of a row !
 				redoParagraph(cur);
@@ -1625,18 +1603,18 @@ void LyXText::backspace(LCursor & cur)
 			}
 		}
 
-		if (cur.par() != 0)
-			recordUndo(cur, Undo::DELETE, cur.par() - 1);
+		if (cur.pit() != 0)
+			recordUndo(cur, Undo::DELETE, cur.pit() - 1);
 
-		par_type tmppit = cur.par();
+		pit_type tmppit = cur.pit();
 		// 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 (cur.par() != 0) {
+		if (cur.pit() != 0) {
 			// steps into the above paragraph.
-			setCursorIntern(cur, cur.par() - 1,
-					pars_[cur.par() - 1].size(),
+			setCursorIntern(cur, cur.pit() - 1,
+					pars_[cur.pit() - 1].size(),
 					false);
 		}
 
@@ -1644,23 +1622,23 @@ void LyXText::backspace(LCursor & cur)
 		// 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();
-		par_type const cpit = cur.par();
+		pit_type const cpit = cur.pit();
 
 		if (cpit != tmppit
 		    && (pars_[cpit].layout() == pars_[tmppit].layout()
 		        || pars_[tmppit].layout() == tclass.defaultLayout())
 		    && pars_[cpit].getAlign() == pars_[tmppit].getAlign()) {
-			mergeParagraph(bufparams, buf.paragraphs(), cpit);
+			mergeParagraph(bufparams, pars_, cpit);
 
 			if (cur.pos() != 0 && pars_[cpit].isSeparator(cur.pos() - 1))
 				--cur.pos();
 
 			// the counters may have changed
 			updateCounters();
-			setCursor(cur, cur.par(), cur.pos(), false);
+			setCursor(cur, cur.pit(), cur.pos(), false);
 		}
 	} else {
 		// this is the code for a normal backspace, not pasting
@@ -1670,7 +1648,7 @@ void LyXText::backspace(LCursor & cur)
 		// not a good idea since it triggers the auto-delete
 		// mechanism. So we do a cursorLeftIntern()-lite,
 		// without the dreaded mechanism. (JMarc)
-		setCursorIntern(cur, cur.par(), cur.pos() - 1,
+		setCursorIntern(cur, cur.pit(), cur.pos() - 1,
 				false, cur.boundary());
 		cur.paragraph().erase(cur.pos());
 	}
@@ -1679,11 +1657,11 @@ void LyXText::backspace(LCursor & cur)
 		setCurrentFont(cur);
 
 	redoParagraph(cur);
-	setCursor(cur, cur.par(), cur.pos(), false, cur.boundary());
+	setCursor(cur, cur.pit(), cur.pos(), false, cur.boundary());
 }
 
 
-Paragraph & LyXText::getPar(par_type par) const
+Paragraph & LyXText::getPar(pit_type par) const
 {
 	//lyxerr << "getPar: " << par << " from " << paragraphs().size() << endl;
 	BOOST_ASSERT(par >= 0);
@@ -1692,130 +1670,63 @@ Paragraph & LyXText::getPar(par_type par) const
 }
 
 
-// y is relative to this LyXText's top
-RowList::iterator LyXText::getRowNearY(int y, par_type & pit) const
+Row const & LyXText::firstRow() const
 {
-	BOOST_ASSERT(!paragraphs().empty());
-	BOOST_ASSERT(!paragraphs().begin()->rows.empty());
-#if 1
-	par_type const pend = paragraphs().size() - 1;
-	pit = 0;
-	while (int(pars_[pit].y + pars_[pit].height) < y && pit != pend)
-		++pit;
-
-	RowList::iterator rit = pars_[pit].rows.end();
-	RowList::iterator const rbegin = pars_[pit].rows.begin();
-	do {
-		--rit;
-	} while (rit != rbegin && int(pars_[pit].y + rit->y_offset()) > y);
-
-	return rit;
-#else
-	pit = paragraphs().size() - 1;
-
-	RowList::iterator rit = lastRow();
-	RowList::iterator rbegin = firstRow();
-
-	while (rit != rbegin && int(pars_[pit].y + rit->y_offset()) > y)
-		previousRow(pit, rit);
-
-	return rit;
-#endif
-}
-
-
-RowList::iterator LyXText::firstRow() const
-{
-	return paragraphs().front().rows.begin();
-}
-
-
-RowList::iterator LyXText::lastRow() const
-{
-	return boost::prior(endRow());
+	return *paragraphs().front().rows.begin();
 }
 
 
-RowList::iterator LyXText::endRow() const
-{
-	return paragraphs().back().rows.end();
-}
-
-
-void LyXText::nextRow(par_type & pit, RowList::iterator & rit) const
-{
-	++rit;
-	if (rit == pars_[pit].rows.end()) {
-		++pit;
-		if (pit == paragraphs().size())
-			--pit;
-		else
-			rit = pars_[pit].rows.begin();
-	}
-}
-
-
-void LyXText::previousRow(par_type & pit, RowList::iterator & rit) const
-{
-	if (rit != pars_[pit].rows.begin())
-		--rit;
-	else {
-		BOOST_ASSERT(pit != 0);
-		--pit;
-		rit = boost::prior(pars_[pit].rows.end());
-	}
-}
-
-
-void LyXText::redoParagraphInternal(par_type pit)
+void LyXText::redoParagraphInternal(pit_type const pit)
 {
 	// remove rows of paragraph, keep track of height changes
-	height_ -= pars_[pit].height;
+	Paragraph & par = pars_[pit];
+	height_ -= par.height;
 
 	// clear old data
-	pars_[pit].rows.clear();
-	pars_[pit].height = 0;
-	pars_[pit].width = 0;
+	par.rows.clear();
+	par.height = 0;
+	par.width = 0;
 
 	// redo insets
-	InsetList::iterator ii = pars_[pit].insetlist.begin();
-	InsetList::iterator iend = pars_[pit].insetlist.end();
+	InsetList::iterator ii = par.insetlist.begin();
+	InsetList::iterator iend = par.insetlist.end();
 	for (; ii != iend; ++ii) {
 		Dimension dim;
-		int const w = maxwidth_ - leftMargin(pit) - rightMargin(pars_[pit]);
-		MetricsInfo mi(bv(), getFont(pit, ii->pos), w);
+		int const w = maxwidth_ - leftMargin(pit) - rightMargin(par);
+		MetricsInfo mi(bv(), getFont(par, ii->pos), w);
 		ii->inset->metrics(mi, dim);
 	}
 
 	// rebreak the paragraph
-	pars_[pit].setBeginOfBody();
+	par.setBeginOfBody();
 	pos_type z = 0;
 	do {
 		Row row(z);
 		rowBreakPoint(pit, row);
 		setRowWidth(pit, row);
 		setHeightOfRow(pit, row);
-		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();
+		row.y_offset(par.height);
+		par.rows.push_back(row);
+		par.width = std::max(par.width, row.width());
+		par.height += row.height();
 		z = row.endpos();
-	} while (z < pars_[pit].size());
+	} while (z < par.size());
 
-	height_ += pars_[pit].height;
-	//lyxerr << "redoParagraph: " << pars_[pit].rows.size() << " rows\n";
+	height_ += par.height;
+	//lyxerr << "redoParagraph: " << par.rows.size() << " rows\n";
 }
 
 
-void LyXText::redoParagraphs(par_type pit, par_type end)
+void LyXText::redoParagraphs(pit_type pit, pit_type end)
 {
-	for ( ; pit != end; ++pit)
+	for (; pit != end; ++pit)
 		redoParagraphInternal(pit);
 	updateParPositions();
+	updateCounters();
 }
 
 
-void LyXText::redoParagraph(par_type pit)
+void LyXText::redoParagraph(pit_type pit)
 {
 	redoParagraphInternal(pit);
 	updateParPositions();
@@ -1844,7 +1755,7 @@ void LyXText::metrics(MetricsInfo & mi, Dimension & dim)
 	width_ = maxParagraphWidth(paragraphs());
 
 	// final dimension
-	dim.asc = firstRow()->ascent_of_text();
+	dim.asc = firstRow().ascent_of_text();
 	dim.des = height_ - dim.asc;
 	dim.wid = width_;
 }
@@ -1855,7 +1766,7 @@ void LyXText::draw(PainterInfo & pi, int x, int y) const
 {
 	xo_ = x;
 	yo_ = y;
-	paintTextInset(*this, pi, x, y);
+	paintTextInset(*this, pi);
 }
 
 
@@ -1866,13 +1777,14 @@ void LyXText::drawSelection(PainterInfo &, int, int) const
 }
 
 
-bool LyXText::isLastRow(par_type pit, Row const & row) const
+bool LyXText::isLastRow(pit_type pit, Row const & row) const
 {
-	return row.endpos() >= pars_[pit].size() && pit + 1 == paragraphs().size();
+	return row.endpos() >= pars_[pit].size()
+		&& pit + 1 == pit_type(paragraphs().size());
 }
 
 
-bool LyXText::isFirstRow(par_type pit, Row const & row) const
+bool LyXText::isFirstRow(pit_type pit, Row const & row) const
 {
 	return row.pos() == 0 && pit == 0;
 }
@@ -1881,50 +1793,40 @@ bool LyXText::isFirstRow(par_type pit, Row const & row) const
 void LyXText::getWord(CursorSlice & from, CursorSlice & to,
 	word_location const loc)
 {
-	Paragraph & from_par = pars_[from.par()];
+	Paragraph const & from_par = pars_[from.pit()];
 	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)) {
+		    || !from_par.isLetter(from.pos())
+		    || !from_par.isLetter(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;
+		// If we are already at the beginning of a word, do nothing
+		if (!from.pos() || !from_par.isLetter(from.pos() - 1))
+			break;
+		// no break here, we go to the next
+
 	case lyx::PREVIOUS_WORD:
 		// always move the cursor to the beginning of previous word
-		cursorLeftOneWord(bv()->cursor());
+		while (from.pos() && from_par.isLetter(from.pos() - 1))
+			--from.pos();
 		break;
 	case lyx::NEXT_WORD:
 		lyxerr << "LyXText::getWord: NEXT_WORD not implemented yet"
 		       << endl;
 		break;
 	case lyx::PARTIAL_WORD:
+		// no need to move the 'from' cursor
 		break;
 	}
 	to = from;
-	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()))
-	{
+	Paragraph & to_par = pars_[to.pit()];
+	while (to.pos() < to_par.size() && to_par.isLetter(to.pos()))
 		++to.pos();
-	}
 }
 
 
@@ -1942,32 +1844,31 @@ 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();
+		string const token = lex.getString();
 
 		if (token.empty())
 			continue;
 
 		if (token == "\\end_inset") {
-			the_end_read = true;
 			break;
 		}
 
+		if (token == "\\end_body") {
+			continue;
+		}
+
+		if (token == "\\begin_body") {
+			continue;
+		}
+
 		if (token == "\\end_document") {
-#warning Look here!
-#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);
 
@@ -1991,34 +1892,35 @@ bool LyXText::read(Buffer const & buf, LyXLex & lex)
 				--depth;
 			}
 		} else {
-			++unknown;
+			lyxerr << "Handling unknown body token: `"
+			       << token << '\'' << endl;
 		}
-
 	}
-	return the_end_read;
+	return true;
 }
 
 
 int LyXText::ascent() const
 {
-	return firstRow()->ascent_of_text();
+	return firstRow().ascent_of_text();
 }
 
 
 int LyXText::descent() const
 {
-	return height_ - firstRow()->ascent_of_text();
+	return height_ - firstRow().ascent_of_text();
 }
 
 
 int LyXText::cursorX(CursorSlice const & cur) const
 {
-	par_type pit = cur.par();
-	if (pars_[pit].rows.empty())
+	pit_type const pit = cur.pit();
+	Paragraph const & par = pars_[pit];
+	if (par.rows.empty())
 		return xo_;
 
-	Row const & row = *pars_[pit].getRow(cur.pos());
-	
+	Row const & row = *par.getRow(cur.pos());
+
 	pos_type pos = cur.pos();
 	pos_type cursor_vpos = 0;
 
@@ -2031,7 +1933,7 @@ int LyXText::cursorX(CursorSlice const & cur) const
 	if (end <= row_pos)
 		cursor_vpos = row_pos;
 	else if (pos >= end)
-		cursor_vpos = isRTL(pars_[pit]) ? row_pos : end;
+		cursor_vpos = isRTL(par) ? 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)
@@ -2041,33 +1943,33 @@ int LyXText::cursorX(CursorSlice const & cur) const
 		cursor_vpos = (bidi.level(pos) % 2 == 0)
 			? bidi.log2vis(pos) : bidi.log2vis(pos) + 1;
 
-	pos_type body_pos = pars_[pit].beginOfBody();
+	pos_type body_pos = par.beginOfBody();
 	if (body_pos > 0 &&
-	    (body_pos > end || !pars_[pit].isLineSeparator(body_pos - 1)))
+	    (body_pos > end || !par.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);
+				+ font_metrics::width(par.layout()->labelsep,
+						      getLabelFont(par));
+			if (par.isLineSeparator(body_pos - 1))
+				x -= singleWidth(par, body_pos - 1);
 		}
 
-		if (hfillExpansion(pars_[pit], row, pos)) {
-			x += singleWidth(pit, pos);
+		if (hfillExpansion(par, row, pos)) {
+			x += singleWidth(par, pos);
 			if (pos >= body_pos)
 				x += m.hfill;
 			else
 				x += m.label_hfill;
-		} else if (pars_[pit].isSeparator(pos)) {
-			x += singleWidth(pit, pos);
+		} else if (par.isSeparator(pos)) {
+			x += singleWidth(par, pos);
 			if (pos >= body_pos)
 				x += m.separator;
 		} else
-			x += singleWidth(pit, pos);
+			x += singleWidth(par, pos);
 	}
 	return xo_ + int(x);
 }
@@ -2075,8 +1977,8 @@ int LyXText::cursorX(CursorSlice const & cur) const
 
 int LyXText::cursorY(CursorSlice const & cur) const
 {
-	Paragraph & par = getPar(cur.par());
-	Row & row = *par.getRow(cur.pos());
+	Paragraph const & par = getPar(cur.pit());
+	Row const & row = *par.getRow(cur.pos());
 	return yo_ + par.y + row.y_offset() + row.baseline();
 }
 
@@ -2085,17 +1987,17 @@ int LyXText::cursorY(CursorSlice const & cur) const
 string LyXText::currentState(LCursor & cur)
 {
 	BOOST_ASSERT(this == cur.text());
-	Buffer * buffer = bv()->buffer();
+	Buffer & buf = cur.buffer();
 	Paragraph const & par = cur.paragraph();
 	std::ostringstream os;
 
-	bool const show_change = buffer->params().tracking_changes
+	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 = buffer->params().authors().get(change.author);
+		Author const & a = buf.params().authors().get(change.author);
 		os << _("Change: ") << a.name();
 		if (!a.email().empty())
 			os << " (" << a.email() << ")";
@@ -2107,13 +2009,13 @@ string LyXText::currentState(LCursor & cur)
 	// I think we should only show changes from the default
 	// font. (Asger)
 	LyXFont font = real_current_font;
-	font.reduce(buffer->params().getLyXTextClass().defaultfont());
+	font.reduce(buf.params().getLyXTextClass().defaultfont());
 
 	// avoid _(...) re-entrance problem
-	string const s = font.stateText(&buffer->params());
+	string const s = font.stateText(&buf.params());
 	os << bformat(_("Font: %1$s"), s);
 
-	// os << bformat(_("Font: %1$s"), font.stateText(&buffer->params));
+	// os << bformat(_("Font: %1$s"), font.stateText(&buf.params));
 
 	// The paragraph depth
 	int depth = cur.paragraph().getDepth();
@@ -2143,12 +2045,14 @@ string LyXText::currentState(LCursor & cur)
 			break;
 		}
 	}
+
 #ifdef DEVEL_VERSION
-	os << _(", Paragraph: ") << par.id();
+	os << _(", Inset: ") << &cur.inset();
+	os << _(", Paragraph: ") << cur.pit();
+	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());
-	os << _(", Inset: ") << par.inInset();
 #endif
 	return os.str();
 }
@@ -2156,7 +2060,7 @@ string LyXText::currentState(LCursor & cur)
 
 string LyXText::getPossibleLabel(LCursor & cur) const
 {
-	par_type pit = cur.par();
+	pit_type pit = cur.pit();
 
 	LyXLayout_ptr layout = pars_[pit].layout();
 
@@ -2176,7 +2080,7 @@ string LyXText::getPossibleLabel(LCursor & cur) const
 	if (layout->latextype == LATEX_PARAGRAPH || lyxrc.label_init_length < 0)
 		text.erase();
 
-	string par_text = pars_[pit].asString(*cur.bv().buffer(), false);
+	string par_text = pars_[pit].asString(cur.buffer(), false);
 	for (int i = 0; i < lyxrc.label_init_length; ++i) {
 		if (par_text.empty())
 			break;
@@ -2192,6 +2096,7 @@ string LyXText::getPossibleLabel(LCursor & cur) const
 }
 
 
+// Manhattan distance to nearest corner
 int LyXText::dist(int x, int y) const
 {
 	int xx = 0;
@@ -2199,7 +2104,7 @@ int LyXText::dist(int x, int y) const
 
 	if (x < xo_)
 		xx = xo_ - x;
-	else if (x > xo_ + width_)
+	else if (x > xo_ + int(width_))
 		xx = x - xo_ - width_;
 
 	if (y < yo_ - ascent())
@@ -2207,5 +2112,9 @@ int LyXText::dist(int x, int y) const
 	else if (y > yo_ + descent())
 		yy = y - yo_ - descent();
 
+	lyxerr << " xo_=" << xo_ << "  yo_=" << yo_
+	       << " width_=" << width_ << " ascent=" << ascent()
+	       << " descent=" << descent()
+	       << " dist=" << xx+yy <<endl;
 	return xx + yy;
 }