X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftext.C;h=5c54cc342bd0b1f5611f04566b6d72d180835172;hb=70c0f419f6402fc7d0856bd7a870f80f5f51e30d;hp=5d9aa6f0578d9087a255eb7dd7959b52f1770024;hpb=2f298af791ee08afd2729e53f11d96cd39ca65d5;p=lyx.git

diff --git a/src/text.C b/src/text.C
index 5d9aa6f057..5c54cc342b 100644
--- a/src/text.C
+++ b/src/text.C
@@ -20,9 +20,11 @@
 
 #include "author.h"
 #include "buffer.h"
+#include "buffer_funcs.h"
 #include "bufferparams.h"
 #include "BufferView.h"
 #include "cursor.h"
+#include "coordcache.h"
 #include "CutAndPaste.h"
 #include "debug.h"
 #include "dispatchresult.h"
@@ -50,6 +52,7 @@
 
 #include "frontends/font_metrics.h"
 #include "frontends/LyXView.h"
+#include "frontends/Painter.h"
 
 #include "insets/insettext.h"
 #include "insets/insetbibitem.h"
@@ -65,11 +68,13 @@
 
 #include "support/lstrings.h"
 #include "support/textutils.h"
-#include "support/tostr.h"
+#include "support/convert.h"
+
+#include <boost/current_function.hpp>
 
 #include <sstream>
 
-using lyx::par_type;
+using lyx::pit_type;
 using lyx::pos_type;
 using lyx::word_location;
 
@@ -105,17 +110,6 @@ int numberOfSeparators(Paragraph const & par, Row const & row)
 }
 
 
-unsigned int maxParagraphWidth(ParagraphList const & plist)
-{
-	unsigned int width = 0;
-	ParagraphList::const_iterator pit = plist.begin();
-	ParagraphList::const_iterator end = plist.end();
-		for (; pit != end; ++pit)
-			width = std::max(width, pit->width);
-	return width;
-}
-
-
 int numberOfLabelHfills(Paragraph const & par, Row const & row)
 {
 	pos_type last = row.endpos() - 1;
@@ -160,17 +154,14 @@ int numberOfHfills(Paragraph const & par, Row const & row)
 
 
 void readParToken(Buffer const & buf, Paragraph & par, LyXLex & lex,
-	string const & token, LyXFont & font)
+	string const & token, LyXFont & font, Change & change)
 {
-	static Change change;
-
 	BufferParams const & bp = buf.params();
 
 	if (token[0] != '\\') {
 		string::const_iterator cit = token.begin();
-		for (; cit != token.end(); ++cit) {
+		for (; cit != token.end(); ++cit)
 			par.insertChar(par.size(), (*cit), font, change);
-		}
 	} else if (token == "\\begin_layout") {
 		lex.eatLine();
 		string layoutname = lex.getString();
@@ -188,7 +179,7 @@ void readParToken(Buffer const & buf, Paragraph & par, LyXLex & lex,
 
 		if (!hasLayout) {
 			buf.error(ErrorItem(_("Unknown layout"),
-			bformat(_("Layout '%1$s' does not exists in textclass '%2$s'\nTrying to use the default instead.\n"),
+			bformat(_("Layout '%1$s' does not exist in textclass '%2$s'\nTrying to use the default instead.\n"),
 				layoutname, tclass.name()), par.id(), 0, par.size()));
 			layoutname = tclass.defaultLayoutName();
 		}
@@ -203,10 +194,14 @@ void readParToken(Buffer const & buf, Paragraph & par, LyXLex & lex,
 		par.params().read(lex);
 
 	} else if (token == "\\end_layout") {
-		lyxerr << "Solitary \\end_layout in line " << lex.getLineNo() << "\n"
+		lyxerr << BOOST_CURRENT_FUNCTION
+                       << ": 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"
+		lyxerr << BOOST_CURRENT_FUNCTION
+                       << ": Solitary \\end_inset in line "
+                       << lex.getLineNo() << "\n"
 		       << "Missing \\begin_inset?.\n";
 	} else if (token == "\\begin_inset") {
 		InsetBase * inset = readInset(lex, buf);
@@ -324,14 +319,14 @@ void 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;
@@ -351,10 +346,11 @@ void readParagraph(Buffer const & buf, Paragraph & par, LyXLex & lex)
 	lex.nextToken();
 	string token = lex.getString();
 	LyXFont font;
+	Change change;
 
 	while (lex.isOK()) {
 
-		readParToken(buf, par, lex, token, font);
+		readParToken(buf, par, lex, token, font, change);
 
 		lex.nextToken();
 		token = lex.getString();
@@ -378,20 +374,15 @@ void readParagraph(Buffer const & buf, Paragraph & par, LyXLex & lex)
 			       << "Missing \\end_layout.\n";
 			break;
 		}
-		lyxerr << "Paragraph token unknown: `" << token << '\'' << endl;
 	}
+	// Initialize begin_of_body_ on load; redoParagraph maintains
+	par.setBeginOfBody();
 }
 
 
 } // namespace anon
 
 
-BufferView * LyXText::bv()
-{
-	BOOST_ASSERT(bv_owner != 0);
-	return bv_owner;
-}
-
 
 BufferView * LyXText::bv() const
 {
@@ -408,26 +399,15 @@ double LyXText::spacing(Paragraph const & par) const
 }
 
 
-void LyXText::updateParPositions()
-{
-	par_type pit = 0;
-	par_type end = pars_.size();
-	for (height_ = 0; pit != end; ++pit) {
-		pars_[pit].y = height_;
-		height_ += pars_[pit].height;
-	}
-}
-
-
 int LyXText::width() const
 {
-	return width_;
+	return dim_.wid;
 }
 
 
 int LyXText::height() const
 {
-	return height_;
+	return dim_.height();
 }
 
 
@@ -440,19 +420,17 @@ int LyXText::singleWidth(Paragraph const & par, pos_type pos) const
 int LyXText::singleWidth(Paragraph const & par,
 			 pos_type pos, char c, LyXFont const & font) const
 {
-	BOOST_ASSERT(pos < par.size());
-
 	// The most common case is handled first (Asger)
 	if (IsPrintable(c)) {
-		if (font.language()->RightToLeft()) {
+		Language const * language = font.language();
+		if (language->RightToLeft()) {
 			if ((lyxrc.font_norm_type == LyXRC::ISO_8859_6_8 ||
 			     lyxrc.font_norm_type == LyXRC::ISO_10646_1)
-			    && font.language()->lang() == "arabic") {
+			    && language->lang() == "arabic") {
 				if (Encodings::IsComposeChar_arabic(c))
 					return 0;
-				else
-					c = par.transformChar(c, pos);
-			} else if (font.language()->lang() == "hebrew" &&
+				c = par.transformChar(c, pos);
+			} else if (language->lang() == "hebrew" &&
 				   Encodings::IsComposeChar_hebrew(c))
 				return 0;
 		}
@@ -462,21 +440,26 @@ int LyXText::singleWidth(Paragraph const & par,
 	if (c == Paragraph::META_INSET)
 		return par.getInset(pos)->width();
 
-	if (IsSeparatorChar(c))
-		c = ' ';
 	return font_metrics::width(c, font);
 }
 
 
-int LyXText::leftMargin(par_type pit) const
+int LyXText::leftMargin(pit_type pit) const
 {
+	BOOST_ASSERT(pit >= 0);
+	BOOST_ASSERT(pit < int(pars_.size()));
 	return leftMargin(pit, pars_[pit].size());
 }
 
 
-int LyXText::leftMargin(par_type const pit, pos_type const pos) const
+int LyXText::leftMargin(pit_type const pit, pos_type const pos) const
 {
+	BOOST_ASSERT(pit >= 0);
+	BOOST_ASSERT(pit < int(pars_.size()));
 	Paragraph const & par = pars_[pit];
+	BOOST_ASSERT(pos >= 0);
+	BOOST_ASSERT(pos <= par.size());
+	//lyxerr << "LyXText::leftMargin: pit: " << pit << " pos: " << pos << endl;
 	LyXTextClass const & tclass =
 		bv()->buffer()->params().getLyXTextClass();
 	LyXLayout_ptr const & layout = par.layout();
@@ -485,15 +468,15 @@ int LyXText::leftMargin(par_type const pit, pos_type const pos) const
 
 	int l_margin = 0;
 
-	if (xo_ == 0)
+	if (isMainText())
 		l_margin += changebarMargin();
 
 	l_margin += font_metrics::signedWidth(tclass.leftmargin(), tclass.defaultfont());
 
 	if (par.getDepth() != 0) {
-	// find the next level paragraph
-	par_type newpar = outerHook(pit, pars_);
-		if (newpar != par_type(pars_.size())) {
+		// 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);
 			}
@@ -506,6 +489,13 @@ int LyXText::leftMargin(par_type const pit, pos_type const pos) const
 		}
 	}
 
+	// This happens after sections in standard classes. The 1.3.x
+	// code compared depths too, but it does not seem necessary
+	// (JMarc)
+	if (par.layout() == tclass.defaultLayout()
+	    && pit > 0 && pars_[pit - 1].layout()->nextnoindent)
+		parindent.erase();
+
 	LyXFont const labelfont = getLabelFont(par);
 	switch (layout->margintype) {
 	case MARGIN_DYNAMIC:
@@ -571,8 +561,8 @@ int LyXText::leftMargin(par_type const pit, pos_type const pos) const
 #if 0
 		// ok, a terrible hack. The left margin depends on the widest
 		// row in this paragraph.
-		RowList::iterator rit = par.rows.begin();
-		RowList::iterator end = par.rows.end();
+		RowList::iterator rit = par.rows().begin();
+		RowList::iterator end = par.rows().end();
 #ifdef WITH_WARNINGS
 #warning This is wrong.
 #endif
@@ -610,9 +600,12 @@ int LyXText::leftMargin(par_type const pit, pos_type const pos) const
 	           && !isFirstInSequence(pit, pars_)))
 	    && align == LYX_ALIGN_BLOCK
 	    && !par.params().noindent()
-	    // in tabulars and ert paragraphs are never indented!
-	    && (par.ownerCode() != InsetBase::TEXT_CODE
-	            && par.ownerCode() != InsetBase::ERT_CODE)
+	    // in some insets, paragraphs are never indented
+	    && !(par.inInset() && par.inInset()->neverIndent())
+	    // display style insets are always centered, omit indentation
+	    && !(!par.empty()
+		    && par.isInset(pos)
+		    && par.getInset(pos)->display())
 	    && (par.layout() != tclass.defaultLayout()
 	        || bv()->buffer()->params().paragraph_separation ==
 	           BufferParams::PARSEP_INDENT))
@@ -626,12 +619,11 @@ int LyXText::leftMargin(par_type const pit, pos_type const pos) const
 
 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;
 
+	LyXTextClass const & tclass = bv()->buffer()->params().getLyXTextClass();
 	int const r_margin =
 		::rightMargin()
 		+ font_metrics::signedWidth(tclass.rightmargin(),
@@ -641,11 +633,10 @@ int LyXText::rightMargin(Paragraph const & par) const
 		* 4 / (par.getDepth() + 4);
 
 	return r_margin;
-
 }
 
 
-int LyXText::labelEnd(par_type const 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)
@@ -672,7 +663,7 @@ pos_type addressBreakPoint(pos_type i, Paragraph const & par)
 };
 
 
-void LyXText::rowBreakPoint(par_type const pit, Row & row) const
+void LyXText::rowBreakPoint(pit_type const pit, Row & row) const
 {
 	Paragraph const & par = pars_[pit];
 	pos_type const end = par.size();
@@ -709,29 +700,26 @@ void LyXText::rowBreakPoint(par_type const pit, Row & row) const
 	// pixel width since last breakpoint
 	int chunkwidth = 0;
 
-	FontIterator fi = FontIterator(*this, pit, pos);
+	FontIterator fi = FontIterator(*this, par, pos);
 	pos_type point = end;
 	pos_type i = pos;
 	for ( ; i < end; ++i, ++fi) {
 		char const c = par.getChar(i);
+		int thiswidth = singleWidth(par, 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(par));
-				if (par.isLineSeparator(i - 1))
-					add -= singleWidth(par, i - 1);
+		// add the auto-hfill from label end to the body
+		if (body_pos && i == body_pos) {
+			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;
-			}
-
-			x += thiswidth;
-			chunkwidth += thiswidth;
+			add = std::max(add, labelEnd(pit) - x);
+			thiswidth += add;
 		}
 
+		x += thiswidth;
+		chunkwidth += thiswidth;
+
 		// break before a character that will fall off
 		// the right of the row
 		if (x >= width) {
@@ -788,20 +776,20 @@ void LyXText::rowBreakPoint(par_type const pit, Row & row) const
 }
 
 
-void LyXText::setRowWidth(par_type const pit, Row & row) const
+void LyXText::setRowWidth(pit_type const pit, Row & row) const
 {
 	// get the pure distance
 	pos_type const end = row.endpos();
 
 	Paragraph const & par = pars_[pit];
-	string labelsep = par.layout()->labelsep;
+	string const & labelsep = par.layout()->labelsep;
 	int w = leftMargin(pit, row.pos());
 
 	pos_type const body_pos = par.beginOfBody();
 	pos_type i = row.pos();
 
 	if (i < end) {
-		FontIterator fi = FontIterator(*this, pit, i);
+		FontIterator fi = FontIterator(*this, par, i);
 		for ( ; i < end; ++i, ++fi) {
 			if (body_pos > 0 && i == body_pos) {
 				w += font_metrics::width(labelsep, getLabelFont(par));
@@ -857,7 +845,7 @@ LColor_color LyXText::backgroundColor() const
 }
 
 
-void LyXText::setHeightOfRow(par_type const 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
@@ -916,7 +904,7 @@ void LyXText::setHeightOfRow(par_type const pit, Row & row)
 	++maxasc;
 	++maxdesc;
 
-	row.ascent_of_text(maxasc);
+	row.ascent(maxasc);
 
 	// is it a top line?
 	if (row.pos() == 0) {
@@ -932,12 +920,13 @@ void LyXText::setHeightOfRow(par_type const pit, Row & row)
 				maxasc += bufparams.getDefSkip().inPixels(*bv());
 		}
 
-		if (pars_[pit].params().startOfAppendix())
+		if (par.params().startOfAppendix())
 			maxasc += int(3 * dh);
 
 		// This is special code for the chapter, since the label of this
 		// layout is printed in an extra row
-		if (layout->counter == "chapter" && bufparams.secnumdepth >= 0) {
+		if (layout->counter == "chapter"
+		    && !par.params().labelString().empty()) {
 			labeladdon = int(font_metrics::maxHeight(labelfont)
 			             * layout->spacing.getValue()
 			             * spacing(par));
@@ -961,7 +950,7 @@ void LyXText::setHeightOfRow(par_type const pit, Row & row)
 		// a section, or between the items of a itemize or enumerate
 		// environment.
 
-		par_type prev = depthHook(pit, pars_, par.getDepth());
+		pit_type prev = depthHook(pit, pars_, par.getDepth());
 		if (prev != pit
 		    && pars_[prev].layout() == layout
 		    && pars_[prev].getDepth() == par.getDepth()
@@ -974,7 +963,7 @@ void LyXText::setHeightOfRow(par_type const pit, Row & row)
 		}
 
 		prev = outerHook(pit, pars_);
-		if (prev != par_type(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 ||
@@ -989,9 +978,9 @@ void LyXText::setHeightOfRow(par_type const pit, Row & row)
 		// 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 != par_type(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;
 
@@ -1016,9 +1005,17 @@ void LyXText::setHeightOfRow(par_type const pit, Row & row)
 	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);
-	row.top_of_text(row.baseline() - font_metrics::maxAscent(font));
+	// Top and bottom margin of the document (only at top-level)
+	if (bv_owner->text() == this) {
+		if (pit == 0 && row.pos() == 0)
+			maxasc += 20;
+		if (pit + 1 == pit_type(pars_.size()) &&
+		    row.endpos() == par.size())
+			maxdesc += 20;
+	}
+
+	row.ascent(maxasc + labeladdon);
+	row.descent(maxdesc);
 }
 
 
@@ -1026,12 +1023,12 @@ namespace {
 
 }
 
-void LyXText::breakParagraph(LCursor & cur, char keep_layout)
+void LyXText::breakParagraph(LCursor & cur, bool 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()))
@@ -1047,32 +1044,37 @@ 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)
 	if (cur.pos() != cur.lastpos() && cpar.isLineSeparator(cur.pos()))
 		cpar.erase(cur.pos());
 
-	// break the paragraph
+	// How should the layout for the new paragraph be?
+	int preserve_layout = 0;
 	if (keep_layout)
-		keep_layout = 2;
+		preserve_layout = 2;
 	else
-		keep_layout = layout->isEnvironment();
+		preserve_layout = layout->isEnvironment();
+
+	// We need to remember this before we break the paragraph, because
+	// that invalidates the layout variable
+	bool sensitive = layout->labeltype == LABEL_SENSITIVE;
 
-	// we need to set this before we insert the paragraph. IMO the
-	// 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)
+	// we need to set this before we insert the paragraph.
 	bool const isempty = cpar.allowEmpty() && cpar.empty();
+
 	::breakParagraph(cur.buffer().params(), paragraphs(), cpit,
-			 cur.pos(), keep_layout);
+			 cur.pos(), preserve_layout);
 
-	cpit = cur.par();
-	par_type next_par = cpit + 1;
+	// After this, neither paragraph contains any rows!
+
+	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 (sensitive) {
 		if (cur.pos() == 0)
 			// set to standard-layout
 			pars_[cpit].applyLayout(tclass.defaultLayout());
@@ -1081,39 +1083,17 @@ void LyXText::breakParagraph(LCursor & cur, char keep_layout)
 			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
-	if (cur.pos() != 0 && cur.textRow().pos() == cur.pos()
-	    && !pars_[cpit].isNewline(cur.pos() - 1))
-	{
-		cursorLeft(cur);
-	}
-
 	while (!pars_[next_par].empty() && pars_[next_par].isNewline(0))
 		pars_[next_par].erase(0);
 
-	updateCounters();
-	redoParagraph(cpit);
-	redoParagraph(next_par);
+	updateCounters(cur.buffer());
 
 	// 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);
-}
-
-
-// convenience function
-void LyXText::redoParagraph(LCursor & cur)
-{
-	BOOST_ASSERT(this == cur.text());
-	cur.clearSelection();
-	redoParagraph(cur.par());
-	setCursorIntern(cur, cur.par(), cur.pos());
+		setCursor(cur, cur.pit(), 0);
 }
 
 
@@ -1128,7 +1108,7 @@ void LyXText::insertChar(LCursor & cur, char c)
 
 	Paragraph & par = cur.paragraph();
 	// try to remove this
-	par_type const pit = cur.par();
+	pit_type const pit = cur.pit();
 
 	bool const freeSpacing = par.layout()->free_spacing ||
 		par.isFreeSpacing();
@@ -1193,12 +1173,13 @@ void LyXText::insertChar(LCursor & cur, char c)
 				cur.message(_("You cannot insert a space at the "
 					"beginning of a paragraph. Please read the Tutorial."));
 				sent_space_message = true;
-				return;
 			}
+			return;
 		}
 		BOOST_ASSERT(cur.pos() > 0);
-		if (par.isLineSeparator(cur.pos() - 1)
-		    || par.isNewline(cur.pos() - 1)) {
+		if ((par.isLineSeparator(cur.pos() - 1)
+		    || par.isNewline(cur.pos() - 1))
+		    && par.lookupChange(cur.pos() - 1) != Change::DELETED) {
 			static bool sent_space_message = false;
 			if (!sent_space_message) {
 				cur.message(_("You cannot type two spaces this way. "
@@ -1213,8 +1194,7 @@ void LyXText::insertChar(LCursor & cur, char c)
 
 	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();
 }
 
@@ -1233,12 +1213,13 @@ void LyXText::charInserted()
 }
 
 
-RowMetrics LyXText::computeRowMetrics(par_type const 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();
+	double w = dim_.wid - row.width();
 
 	bool const is_rtl = isRTL(par);
 	if (is_rtl)
@@ -1348,41 +1329,47 @@ RowMetrics LyXText::computeRowMetrics(par_type const pit, Row const & row) const
 // the cursor set functions have a special mechanism. When they
 // realize, that you left an empty paragraph, they will delete it.
 
-void LyXText::cursorRightOneWord(LCursor & cur)
+bool LyXText::cursorRightOneWord(LCursor & cur)
 {
 	BOOST_ASSERT(this == cur.text());
-	if (cur.pos() == cur.lastpos() && cur.par() != cur.lastpar()) {
-		++cur.par();
-		cur.pos() = 0;
+
+	LCursor old = cur;
+
+	if (old.pos() == old.lastpos() && old.pit() != old.lastpit()) {
+		++old.pit();
+		old.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();
+		while (old.pos() != old.lastpos() && !old.paragraph().isLetter(old.pos()))
+			++old.pos();
 		// Advance through word.
-		while (cur.pos() != cur.lastpos() && cur.paragraph().isWord(cur.pos()))
-			++cur.pos();
+		while (old.pos() != old.lastpos() && old.paragraph().isLetter(old.pos()))
+			++old.pos();
 	}
-	setCursor(cur, cur.par(), cur.pos());
+	return setCursor(cur, old.pit(), old.pos());
 }
 
 
-void LyXText::cursorLeftOneWord(LCursor & cur)
+bool LyXText::cursorLeftOneWord(LCursor & cur)
 {
 	BOOST_ASSERT(this == cur.text());
-	if (cur.pos() == 0 && cur.par() != 0) {
-		--cur.par();
-		cur.pos() = cur.lastpos();
+
+	LCursor old = cur;
+
+	if (old.pos() == 0 && old.pit() != 0) {
+		--old.pit();
+		old.pos() = old.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();
+		while (old.pos() != 0 && !old.paragraph().isLetter(old.pos() - 1))
+			--old.pos();
 		// Advance through word.
-		while (cur.pos() != 0 && cur.paragraph().isWord(cur.pos() - 1))
-			--cur.pos();
+		while (old.pos() != 0 && old.paragraph().isLetter(old.pos() - 1))
+			--old.pos();
 	}
-	setCursor(cur, cur.par(), cur.pos());
+	return setCursor(cur, old.pit(), old.pos());
 }
 
 
@@ -1393,11 +1380,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();
 }
 
@@ -1422,13 +1409,12 @@ 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);
+		setCursorIntern(cur, startc.pit(), 0);
 	}
 #ifdef WITH_WARNINGS
 #warning handle multi par selection
@@ -1444,13 +1430,12 @@ 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);
+		setCursorIntern(cur, startc.pit(), 0);
 	}
 #ifdef WITH_WARNINGS
 #warning handle multi par selection
@@ -1523,16 +1508,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;
@@ -1565,12 +1550,22 @@ void LyXText::changeCase(LCursor & cur, LyXText::TextCase action)
 void LyXText::Delete(LCursor & cur)
 {
 	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());
+		recordUndo(cur, Undo::DELETE, cur.pit());
+		setCursorIntern(cur, cur.pit(), cur.pos() + 1, false, cur.boundary());
 		backspace(cur);
+	} else if (cur.pit() != cur.lastpit()) {
+		LCursor scur = cur;
+
+		setCursorIntern(cur, cur.pit()+1, 0, false, false);
+		if (pars_[cur.pit()].layout() == pars_[scur.pit()].layout()) {
+			recordUndo(scur, Undo::DELETE, scur.pit());
+			backspace(cur);
+		} else {
+			setCursorIntern(scur, scur.pit(), scur.pos(), false, scur.boundary());
+		}
 	}
-	// should we do anything in an else branch?
 }
 
 
@@ -1597,26 +1592,35 @@ 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) {
+                                // For KeepEmpty layouts we need to get
+                                // rid of the keepEmpty setting first.
+                                // And the only way to do this is to
+                                // reset the layout to something
+                                // else: f.ex. the default layout.
+                                if (par.allowEmpty()) {
+                                        Buffer & buf = cur.buffer();
+                                        BufferParams const & bparams = buf.params();
+                                        par.layout(bparams.getLyXTextClass().defaultLayout());
+                                }
+                                
 				cursorLeft(cur);
-				// the layout things can change the height of a row !
-				redoParagraph(cur);
 				return;
 			}
 		}
 
-		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);
 		}
 
@@ -1624,23 +1628,24 @@ 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
+		// Correction (Jug 20050717): Remove check about alignment!
 		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);
+		        || pars_[tmppit].layout() == tclass.defaultLayout()))
+		{
+			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);
+			updateCounters(cur.buffer());
+			setCursor(cur, cur.pit(), cur.pos(), false);
 		}
 	} else {
 		// this is the code for a normal backspace, not pasting
@@ -1650,7 +1655,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());
 	}
@@ -1658,48 +1663,53 @@ void LyXText::backspace(LCursor & cur)
 	if (cur.pos() == cur.lastpos())
 		setCurrentFont(cur);
 
-	redoParagraph(cur);
-	setCursor(cur, cur.par(), cur.pos(), false, cur.boundary());
-}
-
-
-Paragraph & LyXText::getPar(par_type par) const
-{
-	//lyxerr << "getPar: " << par << " from " << paragraphs().size() << endl;
-	BOOST_ASSERT(par >= 0);
-	BOOST_ASSERT(par < int(paragraphs().size()));
-	return paragraphs()[par];
+	setCursor(cur, cur.pit(), cur.pos(), false, cur.boundary());
 }
 
 
 Row const & LyXText::firstRow() const
 {
-	return *paragraphs().front().rows.begin();
+	return *paragraphs().front().rows().begin();
 }
 
 
-void LyXText::redoParagraphInternal(par_type const pit)
+bool LyXText::redoParagraph(pit_type const pit)
 {
 	// remove rows of paragraph, keep track of height changes
 	Paragraph & par = pars_[pit];
-	height_ -= par.height;
 
-	// clear old data
-	par.rows.clear();
-	par.height = 0;
-	par.width = 0;
+	// Add bibitem insets if necessary
+	if (par.layout()->labeltype == LABEL_BIBLIO) {
+		bool hasbibitem(false);
+		if (!par.insetlist.empty()
+			// Insist on it being in pos 0
+			&& par.getChar(0) == Paragraph::META_INSET) {
+			InsetBase * inset = par.insetlist.begin()->inset;
+        	        if (inset->lyxCode() == InsetBase::BIBITEM_CODE)
+				hasbibitem = true;
+		}
+		if (!hasbibitem) {
+			InsetBibitem * inset(new
+				InsetBibitem(InsetCommandParams("bibitem")));
+			par.insertInset(0, static_cast<InsetBase *>(inset));
+			bv()->cursor().posRight();
+		}
+	}
 
 	// redo insets
 	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(par);
+		int const w = maxwidth_ - leftMargin(pit, ii->pos) - rightMargin(par);
 		MetricsInfo mi(bv(), getFont(par, ii->pos), w);
 		ii->inset->metrics(mi, dim);
 	}
 
 	// rebreak the paragraph
+	par.rows().clear();
+	Dimension dim;
+
 	par.setBeginOfBody();
 	pos_type z = 0;
 	do {
@@ -1707,38 +1717,35 @@ void LyXText::redoParagraphInternal(par_type const pit)
 		rowBreakPoint(pit, row);
 		setRowWidth(pit, row);
 		setHeightOfRow(pit, row);
-		row.y_offset(par.height);
-		par.rows.push_back(row);
-		par.width = std::max(par.width, row.width());
-		par.height += row.height();
+		par.rows().push_back(row);
+		dim.wid = std::max(dim.wid, row.width());
+		dim.des += row.height();
 		z = row.endpos();
 	} while (z < par.size());
 
-	height_ += par.height;
-	//lyxerr << "redoParagraph: " << par.rows.size() << " rows\n";
-}
-
-
-void LyXText::redoParagraphs(par_type pit, par_type end)
-{
-	for (; pit != end; ++pit)
-		redoParagraphInternal(pit);
-	updateParPositions();
-	updateCounters();
-}
-
+	// Make sure that if a par ends in newline, there is one more row
+	// under it
+	// FIXME this is a dirty trick. Now the _same_ position in the
+	// paragraph occurs in _two_ different rows, and has two different
+	// display positions, leading to weird behaviour when moving up/down.
+	if (z > 0 && par.isNewline(z - 1)) {
+		Row row(z - 1);
+		row.endpos(z - 1);
+		setRowWidth(pit, row);
+		setHeightOfRow(pit, row);
+		par.rows().push_back(row);
+		dim.des += row.height();
+	}
+	    
+	dim.asc += par.rows()[0].ascent();
+	dim.des -= par.rows()[0].ascent();
 
-void LyXText::redoParagraph(par_type pit)
-{
-	redoParagraphInternal(pit);
-	updateParPositions();
-}
+	bool const same = dim == par.dim();
 
+	par.dim() = dim;
+	//lyxerr << "redoParagraph: " << par.rows().size() << " rows\n";
 
-void LyXText::fullRebreak()
-{
-	redoParagraphs(0, paragraphs().size());
-	bv()->cursor().resetAnchor();
+	return !same;
 }
 
 
@@ -1748,45 +1755,195 @@ void LyXText::metrics(MetricsInfo & mi, Dimension & dim)
 	if (mi.base.textwidth)
 		maxwidth_ = mi.base.textwidth;
 	//lyxerr << "LyXText::metrics: width: " << mi.base.textwidth
-	//<< " maxWidth: " << maxwidth << "\nfont: " << mi.base.font
-	//<< endl;
-
-	// Rebuild row cache. This recomputes height as well.
-	redoParagraphs(0, paragraphs().size());
+	//	<< " maxWidth: " << maxwidth_ << "\nfont: " << mi.base.font << endl;
+	// save the caller's font locally:
+	font_ = mi.base.font;
+
+	unsigned int h = 0;
+	unsigned int w = 0;
+	for (pit_type pit = 0, n = paragraphs().size(); pit != n; ++pit) {
+		redoParagraph(pit);
+		Paragraph & par = paragraphs()[pit];
+		h += par.height();
+		if (w < par.width())
+			w = par.width();
+	}
 
-	width_ = maxParagraphWidth(paragraphs());
+	dim.wid = w;
+	dim.asc = pars_[0].ascent();
+	dim.des = h - dim.asc;
 
-	// final dimension
-	dim.asc = firstRow().ascent_of_text();
-	dim.des = height_ - dim.asc;
-	dim.wid = width_;
+	dim_ = dim;
 }
 
 
 // only used for inset right now. should also be used for main text
 void LyXText::draw(PainterInfo & pi, int x, int y) const
 {
-	xo_ = x;
-	yo_ = y;
-	paintTextInset(*this, pi);
+	paintTextInset(*this, pi, x, y);
 }
 
 
+#if 0
 // only used for inset right now. should also be used for main text
-void LyXText::drawSelection(PainterInfo &, int, int) const
+void LyXText::drawSelection(PainterInfo & pi, int x , int) const
 {
-	//lyxerr << "LyXText::drawSelection at " << x << " " << y << endl;
+	LCursor & cur = pi.base.bv->cursor();
+	if (!cur.selection())
+		return;
+	if (!ptr_cmp(cur.text(), this))
+		return;
+
+	lyxerr << "draw selection at " << x << endl;
+
+	DocIterator beg = cur.selectionBegin();
+	DocIterator end = cur.selectionEnd();
+
+	// the selection doesn't touch the visible screen
+	if (bv_funcs::status(pi.base.bv, beg) == bv_funcs::CUR_BELOW
+	    || bv_funcs::status(pi.base.bv, end) == bv_funcs::CUR_ABOVE)
+		return;
+
+	Paragraph const & par1 = pars_[beg.pit()];
+	Paragraph const & par2 = pars_[end.pit()];
+
+	Row const & row1 = par1.getRow(beg.pos(), beg.boundary());
+	Row const & row2 = par2.getRow(end.pos(), end.boundary());
+
+	int y1,x1,x2;
+	if (bv_funcs::status(pi.base.bv, beg) == bv_funcs::CUR_ABOVE) {
+		y1 = 0;
+		x1 = 0;
+		x2 = 0;
+	} else {
+		y1 = bv_funcs::getPos(beg).y_ - row1.ascent();
+		int const startx = cursorX(beg.top(), begin.boundary());
+		x1 = isRTL(par1) ? startx : 0;
+		x2 = isRTL(par1) ? 0 + dim_.wid : startx;
+	}
+
+	int y2,X1,X2;
+	if (bv_funcs::status(pi.base.bv, end) == bv_funcs::CUR_BELOW) {
+		y2 = pi.base.bv->workHeight();
+		X1 = 0;
+		X2 = 0;
+	} else {
+		y2 = bv_funcs::getPos(end).y_ + row2.descent();
+		int const endx = cursorX(end.top(), end.boundary());
+		X1 = isRTL(par2) ? 0 : endx;
+		X2 = isRTL(par2) ? endx : 0 + dim_.wid;
+	}
+
+	lyxerr << " y1: " << y1 << " y2: " << y2
+		<< " xo: " << xo_ << " wid: " << dim_.wid
+		<< endl;
+
+	// paint big rectangle in one go
+	pi.pain.fillRectangle(x, y1, dim_.wid, y2 - y1, LColor::selection);
+
+	// reset background at begin of first selected line
+	pi.pain.fillRectangle(x + x1, y1, x2 - x1, row1.height(),
+		LColor::background);
+
+	// reset background at end of last selected line
+	pi.pain.fillRectangle(x + X1, y2  - row2.height(),
+		X2 - X1, row2.height(), LColor::background);
 }
 
+#else
+
+void LyXText::drawSelection(PainterInfo & pi, int x, int) const
+{
+	LCursor & cur = pi.base.bv->cursor();
+	if (!cur.selection())
+		return;
+	if (!ptr_cmp(cur.text(), this))
+		return;
+
+	lyxerr[Debug::DEBUG]
+                << BOOST_CURRENT_FUNCTION
+                << "draw selection at " << x
+                << endl;
+
+	DocIterator beg = cur.selectionBegin();
+	DocIterator end = cur.selectionEnd();
 
-bool LyXText::isLastRow(par_type pit, Row const & row) const
+	// the selection doesn't touch the visible screen
+	if (bv_funcs::status(pi.base.bv, beg) == bv_funcs::CUR_BELOW
+	    || bv_funcs::status(pi.base.bv, end) == bv_funcs::CUR_ABOVE)
+		return;
+
+	Paragraph const & par1 = pars_[beg.pit()];
+	Paragraph const & par2 = pars_[end.pit()];
+
+	bool const above = (bv_funcs::status(pi.base.bv, beg)
+			    == bv_funcs::CUR_ABOVE);
+	bool const below = (bv_funcs::status(pi.base.bv, end)
+			    == bv_funcs::CUR_BELOW);
+	int y1,y2,x1,x2;
+	if (above) {
+		y1 = 0;
+		y2 = 0;
+		x1 = 0;
+		x2 = dim_.wid;
+	} else {
+		Row const & row1 = par1.getRow(beg.pos(), beg.boundary());
+		y1 = bv_funcs::getPos(beg, beg.boundary()).y_ - row1.ascent();
+		y2 = y1 + row1.height();
+		int const startx = cursorX(beg.top(), beg.boundary());
+		x1 = !isRTL(par1) ? startx : 0;
+		x2 = !isRTL(par1) ? 0 + dim_.wid : startx;
+	}
+
+	int Y1,Y2,X1,X2;
+	if (below) {
+		Y1 = pi.base.bv->workHeight();
+		Y2 = pi.base.bv->workHeight();
+		X1 = 0;
+		X2 = dim_.wid;
+	} else {
+		Row const & row2 = par2.getRow(end.pos(), end.boundary());
+		Y1 = bv_funcs::getPos(end, end.boundary()).y_ - row2.ascent();
+		Y2 = Y1 + row2.height();
+		int const endx = cursorX(end.top(), end.boundary());
+		X1 = !isRTL(par2) ? 0 : endx;
+		X2 = !isRTL(par2) ? endx : 0 + dim_.wid;
+	}
+
+	if (!above && !below && &par1.getRow(beg.pos(), beg.boundary())
+	    == &par2.getRow(end.pos(), end.boundary()))
+	{
+		// paint only one rectangle
+		int const b( !isRTL(par1) ? x + x1 : x + X1 );
+		int const w( !isRTL(par1) ? X2 - x1 : x2 - X1 );
+		pi.pain.fillRectangle(b, y1, w, y2 - y1, LColor::selection);
+		return;
+	}
+
+	lyxerr[Debug::DEBUG] << " y1: " << y1 << " y2: " << y2
+	       << "X1:" << X1 << " x2: " << X2 << " wid: " << dim_.wid
+		<< endl;
+
+	// paint upper rectangle
+	pi.pain.fillRectangle(x + x1, y1, x2 - x1, y2 - y1,
+				      LColor::selection);
+	// paint bottom rectangle
+	pi.pain.fillRectangle(x + X1, Y1, X2 - X1, Y2 - Y1,
+				      LColor::selection);
+	// paint center rectangle
+	pi.pain.fillRectangle(x, y2, dim_.wid,
+			      Y1 - y2, LColor::selection);
+}
+#endif
+
+bool LyXText::isLastRow(pit_type pit, Row const & row) const
 {
 	return row.endpos() >= pars_[pit].size()
-		&& pit + 1 == par_type(paragraphs().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;
 }
@@ -1795,12 +1952,12 @@ bool LyXText::isFirstRow(par_type pit, Row const & row) const
 void LyXText::getWord(CursorSlice & from, CursorSlice & to,
 	word_location const loc)
 {
-	Paragraph const & 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.isWord(from.pos())
-		    || !from_par.isWord(from.pos() - 1)) {
+		    || !from_par.isLetter(from.pos())
+		    || !from_par.isLetter(from.pos() - 1)) {
 			to = from;
 			return;
 		}
@@ -1808,13 +1965,13 @@ void LyXText::getWord(CursorSlice & from, CursorSlice & to,
 
 	case lyx::WHOLE_WORD:
 		// If we are already at the beginning of a word, do nothing
-		if (!from.pos() || !from_par.isWord(from.pos() - 1))
+		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
-		while (from.pos() && from_par.isWord(from.pos() - 1))
+		while (from.pos() && from_par.isLetter(from.pos() - 1))
 			--from.pos();
 		break;
 	case lyx::NEXT_WORD:
@@ -1826,8 +1983,8 @@ void LyXText::getWord(CursorSlice & from, CursorSlice & to,
 		break;
 	}
 	to = from;
-	Paragraph & to_par = pars_[to.par()];
-	while (to.pos() < to_par.size() && to_par.isWord(to.pos()))
+	Paragraph & to_par = pars_[to.pit()];
+	while (to.pos() < to_par.size() && to_par.isLetter(to.pos()))
 		++to.pos();
 }
 
@@ -1844,8 +2001,6 @@ void LyXText::write(Buffer const & buf, std::ostream & os) const
 
 bool LyXText::read(Buffer const & buf, LyXLex & lex)
 {
-	static Change current_change;
-
 	Paragraph::depth_type depth = 0;
 
 	while (lex.isOK()) {
@@ -1904,26 +2059,31 @@ bool LyXText::read(Buffer const & buf, LyXLex & lex)
 
 int LyXText::ascent() const
 {
-	return firstRow().ascent_of_text();
+	return dim_.asc;
 }
 
 
 int LyXText::descent() const
 {
-	return height_ - firstRow().ascent_of_text();
+	return dim_.des;
 }
 
 
-int LyXText::cursorX(CursorSlice const & cur) const
+int LyXText::cursorX(CursorSlice const & sl, bool boundary) const
 {
-	par_type const pit = cur.par();
+	pit_type const pit = sl.pit();
 	Paragraph const & par = pars_[pit];
-	if (par.rows.empty())
-		return xo_;
+	if (par.rows().empty())
+		return 0;
+
+	pos_type ppos = sl.pos();
+	// Correct position in front of big insets
+	bool const boundary_correction = ppos != 0 && boundary;
+	if (boundary_correction)
+		--ppos;
 
-	Row const & row = *par.getRow(cur.pos());
+	Row const & row = par.getRow(sl.pos(), boundary);
 
-	pos_type pos = cur.pos();
 	pos_type cursor_vpos = 0;
 
 	RowMetrics const m = computeRowMetrics(pit, row);
@@ -1934,22 +2094,26 @@ int LyXText::cursorX(CursorSlice const & cur) const
 
 	if (end <= row_pos)
 		cursor_vpos = row_pos;
-	else if (pos >= end)
+	else if (ppos >= end)
 		cursor_vpos = isRTL(par) ? row_pos : end;
-	else if (pos > row_pos && pos >= end)
+	else if (ppos > row_pos && ppos >= 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);
+		cursor_vpos = (bidi.level(ppos - 1) % 2 == 0)
+			? bidi.log2vis(ppos - 1) + 1 : bidi.log2vis(ppos - 1);
 	else
-		// Place cursor before char at (logical) position pos
-		cursor_vpos = (bidi.level(pos) % 2 == 0)
-			? bidi.log2vis(pos) : bidi.log2vis(pos) + 1;
+		// Place cursor before char at (logical) position ppos
+		cursor_vpos = (bidi.level(ppos) % 2 == 0)
+			? bidi.log2vis(ppos) : bidi.log2vis(ppos) + 1;
 
 	pos_type body_pos = par.beginOfBody();
 	if (body_pos > 0 &&
 	    (body_pos > end || !par.isLineSeparator(body_pos - 1)))
 		body_pos = 0;
 
+	// Use font span to speed things up, see below
+	FontSpan font_span;
+	LyXFont font;
+
 	for (pos_type vpos = row_pos; vpos < cursor_vpos; ++vpos) {
 		pos_type pos = bidi.vis2log(vpos);
 		if (body_pos > 0 && pos == body_pos - 1) {
@@ -1960,28 +2124,55 @@ int LyXText::cursorX(CursorSlice const & cur) const
 				x -= singleWidth(par, body_pos - 1);
 		}
 
-		if (hfillExpansion(par, row, pos)) {
-			x += singleWidth(par, pos);
-			if (pos >= body_pos)
-				x += m.hfill;
-			else
-				x += m.label_hfill;
-		} else if (par.isSeparator(pos)) {
-			x += singleWidth(par, pos);
-			if (pos >= body_pos)
-				x += m.separator;
-		} else
-			x += singleWidth(par, pos);
+		// Use font span to speed things up, see above
+		if (pos < font_span.first || pos > font_span.last) {
+			font_span = par.fontSpan(pos);
+			font = getFont(par, pos);
+		}
+
+		x += singleWidth(par, pos, par.getChar(pos), font);
+
+		if (hfillExpansion(par, row, pos))
+			x += (pos >= body_pos) ? m.hfill : m.label_hfill;
+		else if (par.isSeparator(pos) && pos >= body_pos)
+			x += m.separator;
 	}
-	return xo_ + int(x);
+	
+	// see correction above
+	if (boundary_correction)
+		if (getFont(par, ppos).isVisibleRightToLeft())
+			x -= singleWidth(par, ppos);
+		else
+			x += singleWidth(par, ppos);
+
+	// Make sure inside an inset we always count from the left
+	// edge (bidi!) -- MV
+	if (sl.pos() < par.size()) {
+		font = getFont(par, sl.pos());
+		if (!boundary && font.isVisibleRightToLeft()
+		  && par.isInset(sl.pos()))
+			x -= par.getInset(sl.pos())->width();
+	}	
+	return int(x);
 }
 
 
-int LyXText::cursorY(CursorSlice const & cur) const
+int LyXText::cursorY(CursorSlice const & sl, bool boundary) const
 {
-	Paragraph const & par = getPar(cur.par());
-	Row const & row = *par.getRow(cur.pos());
-	return yo_ + par.y + row.y_offset() + row.baseline();
+	//lyxerr << "LyXText::cursorY: boundary: " << boundary << std::endl;
+	Paragraph const & par = getPar(sl.pit());
+	int h = 0;
+	h -= pars_[0].rows()[0].ascent();
+	for (pit_type pit = 0; pit < sl.pit(); ++pit)
+		h += pars_[pit].height();
+	int pos = sl.pos();
+	if (pos && boundary)
+		--pos;
+	size_t const rend = par.pos2row(pos);
+	for (size_t rit = 0; rit != rend; ++rit)
+		h += par.rows()[rit].height();
+	h += par.rows()[rend].ascent();
+	return h;
 }
 
 
@@ -2022,7 +2213,7 @@ string LyXText::currentState(LCursor & cur)
 	// The paragraph depth
 	int depth = cur.paragraph().getDepth();
 	if (depth > 0)
-		os << bformat(_(", Depth: %1$s"), tostr(depth));
+		os << bformat(_(", Depth: %1$d"), depth);
 
 	// The paragraph spacing, but only if different from
 	// buffer spacing.
@@ -2040,7 +2231,7 @@ string LyXText::currentState(LCursor & cur)
 			os << _("Double");
 			break;
 		case Spacing::Other:
-			os << _("Other (") << spacing.getValue() << ')';
+			os << _("Other (") << spacing.getValueAsString() << ')';
 			break;
 		case Spacing::Default:
 			// should never happen, do nothing
@@ -2050,11 +2241,12 @@ string LyXText::currentState(LCursor & cur)
 
 #ifdef DEVEL_VERSION
 	os << _(", Inset: ") << &cur.inset();
-	os << _(", Paragraph: ") << cur.par();
+	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 << _(", Boundary: ") << cur.boundary();
+//	Row & row = cur.textRow();
+//	os << bformat(_(", Row b:%1$d e:%2$d"), row.pos(), row.endpos());
 #endif
 	return os.str();
 }
@@ -2062,7 +2254,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();
 
@@ -2098,25 +2290,81 @@ string LyXText::getPossibleLabel(LCursor & cur) const
 }
 
 
-// Manhattan distance to nearest corner
-int LyXText::dist(int x, int y) const
+//pos_type LyXText::x2pos(pit_type pit, int row, int x) const
+//{
+//	int lastx = 0;
+//	int currx = 0;
+//	Paragraph const & par = pars_[pit];
+//	Row const & r = par.rows()[row];
+//	int pos = r.pos();
+//	for (; currx < x && pos < r.endpos(); ++pos) {
+//		lastx = currx;
+//		currx += singleWidth(par, pos);
+//	}
+//	if (abs(lastx - x) < abs(currx - x) && pos != r.pos())
+//		--pos;
+//	return pos;
+//}
+
+
+pos_type LyXText::x2pos(pit_type pit, int row, int x) const
+{
+	BOOST_ASSERT(row < int(pars_[pit].rows().size()));
+	bool bound = false;
+	Row const & r = pars_[pit].rows()[row];
+	return r.pos() + getColumnNearX(pit, r, x, bound);
+}
+
+
+//int LyXText::pos2x(pit_type pit, pos_type pos) const
+//{
+//	Paragraph const & par = pars_[pit];
+//	Row const & r = par.rows()[row];
+//	int x = 0;
+//	pos -= r.pos();
+//}
+
+
+// x,y are screen coordinates
+// sets cursor only within this LyXText
+bool LyXText::setCursorFromCoordinates(LCursor & cur, int const x, int const y)
 {
-	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();
-
-	lyxerr << " xo_=" << xo_ << "  yo_=" << yo_ 
-	       << " width_=" << width_ << " ascent=" << ascent()
-	       << " descent=" << descent() 
-	       << " dist=" << xx+yy <<endl;
-	return xx + yy;
+	pit_type pit = getPitNearY(y);
+	int yy = theCoords.get(this, pit).y_ - pars_[pit].ascent();
+	lyxerr[Debug::DEBUG]
+                << BOOST_CURRENT_FUNCTION
+                << ": x: " << x
+                << " y: " << y
+		<< " pit: " << pit
+                << " yy: " << yy << endl;
+
+	Paragraph const & par = pars_[pit];
+	int r = 0;
+	BOOST_ASSERT(par.rows().size());
+	for (; r < int(par.rows().size()) - 1; ++r) {
+		Row const & row = par.rows()[r];
+		if (int(yy + row.height()) > y)
+			break;
+		yy += row.height();
+	}
+
+	Row const & row = par.rows()[r];
+
+	lyxerr[Debug::DEBUG]
+                << BOOST_CURRENT_FUNCTION
+                << ": row " << r
+                << " from pos: " << row.pos()
+                << endl;
+
+	bool bound = false;
+	int xx = x;
+	pos_type const pos = row.pos() + getColumnNearX(pit, row, xx, bound);
+
+        lyxerr[Debug::DEBUG]
+                << BOOST_CURRENT_FUNCTION
+                << ": setting cursor pit: " << pit
+                << " pos: " << pos
+                << endl;
+        
+	return setCursor(cur, pit, pos, true, bound);
 }