X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftext.C;h=da326879c5cc2c15f1fddf8e00f71e23b5337bc0;hb=ae348f8af96100a154b3792d27732d621d44ec89;hp=dc94664fe5ef81e5b1d0e57c58d60299217ab794;hpb=6a55be9506b112110826cf63bc21786044569f1d;p=lyx.git

diff --git a/src/text.C b/src/text.C
index dc94664fe5..da326879c5 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 "pariterator.h"
 #include "coordcache.h"
 #include "CutAndPaste.h"
 #include "debug.h"
@@ -67,10 +69,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::char_type;
 using lyx::pit_type;
 using lyx::pos_type;
 using lyx::word_location;
@@ -130,7 +135,7 @@ int numberOfLabelHfills(Paragraph const & par, Row const & row)
 
 int numberOfHfills(Paragraph const & par, Row const & row)
 {
-	pos_type const last = row.endpos() - 1;
+	pos_type const last = row.endpos();
 	pos_type first = row.pos();
 
 	// hfill *DO* count at the beginning of paragraphs!
@@ -151,17 +156,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();
@@ -179,7 +181,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();
 		}
@@ -194,10 +196,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);
@@ -311,23 +317,39 @@ void readParToken(Buffer const & buf, Paragraph & par, LyXLex & lex,
 	} else if (token == "\\change_unchanged") {
 		// Hack ! Needed for empty paragraphs :/
 		// FIXME: is it still ??
+		/*
 		if (!par.size())
 			par.cleanChanges();
+		*/
 		change = Change(Change::UNCHANGED);
 	} else if (token == "\\change_inserted") {
 		lex.eatLine();
 		std::istringstream is(lex.getString());
-		int aid;
+		unsigned int aid;
 		lyx::time_type ct;
 		is >> aid >> ct;
-		change = Change(Change::INSERTED, bp.author_map[aid], ct);
+		if (aid >= bp.author_map.size()) {
+			buf.error(ErrorItem(_("Change tracking error"),
+					    bformat(_("Unknown author index for insertion: %1$d\n"), aid),
+					    par.id(), 0, par.size()));
+
+			change = Change(Change::UNCHANGED);
+		} else
+			change = Change(Change::INSERTED, bp.author_map[aid], ct);
 	} else if (token == "\\change_deleted") {
 		lex.eatLine();
 		std::istringstream is(lex.getString());
-		int aid;
+		unsigned int aid;
 		lyx::time_type ct;
 		is >> aid >> ct;
-		change = Change(Change::DELETED, bp.author_map[aid], ct);
+		if (aid >= bp.author_map.size()) {
+			buf.error(ErrorItem(_("Change tracking error"),
+					    bformat(_("Unknown author index for deletion: %1$d\n"), aid),
+					    par.id(), 0, par.size()));
+
+			change = Change(Change::UNCHANGED);
+		} else
+			change = Change(Change::DELETED, bp.author_map[aid], ct);
 	} else {
 		lex.eatLine();
 		buf.error(ErrorItem(_("Unknown token"),
@@ -342,10 +364,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();
@@ -370,18 +393,17 @@ void readParagraph(Buffer const & buf, Paragraph & par, LyXLex & lex)
 			break;
 		}
 	}
+	// Final change goes to paragraph break:
+	par.setChange(par.size(), change);
+
+	// 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
 {
@@ -417,21 +439,20 @@ 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
+			 pos_type pos, char_type 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()) {
+	if (isPrintable(c)) {
+		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") {
-				if (Encodings::IsComposeChar_arabic(c))
+			    && language->lang() == "arabic") {
+				if (Encodings::isComposeChar_arabic(c))
 					return 0;
 				c = par.transformChar(c, pos);
-			} else if (font.language()->lang() == "hebrew" &&
-				   Encodings::IsComposeChar_hebrew(c))
+			} else if (language->lang() == "hebrew" &&
+				   Encodings::isComposeChar_hebrew(c))
 				return 0;
 		}
 		return font_metrics::width(c, font);
@@ -440,8 +461,6 @@ 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);
 }
 
@@ -462,8 +481,8 @@ int LyXText::leftMargin(pit_type const pit, pos_type const pos) const
 	BOOST_ASSERT(pos >= 0);
 	BOOST_ASSERT(pos <= par.size());
 	//lyxerr << "LyXText::leftMargin: pit: " << pit << " pos: " << pos << endl;
-	LyXTextClass const & tclass =
-		bv()->buffer()->params().getLyXTextClass();
+	BufferParams const & params = bv()->buffer()->params();
+	LyXTextClass const & tclass = params.getLyXTextClass();
 	LyXLayout_ptr const & layout = par.layout();
 
 	string parindent = layout->parindent;
@@ -473,11 +492,11 @@ int LyXText::leftMargin(pit_type const pit, pos_type const pos) const
 	if (isMainText())
 		l_margin += changebarMargin();
 
-	l_margin += font_metrics::signedWidth(tclass.leftmargin(), tclass.defaultfont());
+	l_margin += font_metrics::signedWidth(tclass.leftmargin(), params.getFont());
 
 	if (par.getDepth() != 0) {
-	// find the next level paragraph
-	pit_type newpar = outerHook(pit, pars_);
+		// 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);
@@ -491,12 +510,19 @@ int LyXText::leftMargin(pit_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:
 		if (!layout->leftmargin.empty())
 			l_margin += font_metrics::signedWidth(layout->leftmargin,
-						  tclass.defaultfont());
+					params.getFont());
 		if (!par.getLabelstring().empty()) {
 			l_margin += font_metrics::signedWidth(layout->labelindent,
 						  labelfont);
@@ -519,7 +545,7 @@ int LyXText::leftMargin(pit_type const pit, pos_type const pos) const
 		break;
 
 	case MARGIN_STATIC:
-		l_margin += font_metrics::signedWidth(layout->leftmargin, tclass.defaultfont()) * 4
+		l_margin += font_metrics::signedWidth(layout->leftmargin, params.getFont()) * 4
 			/ (par.getDepth() + 4);
 		break;
 
@@ -566,7 +592,7 @@ int LyXText::leftMargin(pit_type const pit, pos_type const pos) const
 			if (rit->fill() < minfill)
 				minfill = rit->fill();
 		l_margin += font_metrics::signedWidth(layout->leftmargin,
-			tclass.defaultfont());
+			params.getFont());
 		l_margin += minfill;
 #endif
 		// also wrong, but much shorter.
@@ -591,19 +617,21 @@ int LyXText::leftMargin(pit_type const pit, pos_type const pos) const
 	       || layout->labeltype == LABEL_TOP_ENVIRONMENT
 	       || layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT
 	       || (layout->labeltype == LABEL_STATIC
-	           && layout->latextype == LATEX_ENVIRONMENT
-	           && !isFirstInSequence(pit, pars_)))
+		   && layout->latextype == LATEX_ENVIRONMENT
+		   && !isFirstInSequence(pit, pars_)))
 	    && align == LYX_ALIGN_BLOCK
 	    && !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)
+	    // 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))
+		|| bv()->buffer()->params().paragraph_separation ==
+		   BufferParams::PARSEP_INDENT))
 	{
-		l_margin += font_metrics::signedWidth(parindent, tclass.defaultfont());
+		l_margin += font_metrics::signedWidth(parindent, params.getFont());
 	}
 
 	return l_margin;
@@ -616,13 +644,14 @@ int LyXText::rightMargin(Paragraph const & par) const
 	if (bv()->text() != this)
 		return 0;
 
-	LyXTextClass const & tclass = bv()->buffer()->params().getLyXTextClass();
+	BufferParams const & params = bv()->buffer()->params();
+	LyXTextClass const & tclass = params.getLyXTextClass();
 	int const r_margin =
 		::rightMargin()
 		+ font_metrics::signedWidth(tclass.rightmargin(),
-					    tclass.defaultfont())
+					    params.getFont())
 		+ font_metrics::signedWidth(par.layout()->rightmargin,
-					    tclass.defaultfont())
+					    params.getFont())
 		* 4 / (par.getDepth() + 4);
 
 	return r_margin;
@@ -697,25 +726,22 @@ void LyXText::rowBreakPoint(pit_type const pit, Row & row) const
 	pos_type point = end;
 	pos_type i = pos;
 	for ( ; i < end; ++i, ++fi) {
-		char const c = par.getChar(i);
+		char_type 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) {
@@ -778,7 +804,7 @@ void LyXText::setRowWidth(pit_type const pit, Row & row) const
 	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();
@@ -793,7 +819,7 @@ void LyXText::setRowWidth(pit_type const pit, Row & row) const
 					w -= singleWidth(par, i - 1);
 				w = max(w, labelEnd(pit));
 			}
-			char const c = par.getChar(i);
+			char_type const c = par.getChar(i);
 			w += singleWidth(par, i, c, *fi);
 		}
 	}
@@ -911,20 +937,21 @@ void LyXText::setHeightOfRow(pit_type const pit, Row & row)
 			&& pit != 0
 			&& ((layout->isParagraph() && par.getDepth() == 0)
 			    || (pars_[pit - 1].layout()->isParagraph()
-			        && pars_[pit - 1].getDepth() == 0)))
+				&& pars_[pit - 1].getDepth() == 0)))
 		{
 				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));
+				     * layout->spacing.getValue()
+				     * spacing(par));
 		}
 
 		// special code for the top label
@@ -1000,6 +1027,15 @@ void LyXText::setHeightOfRow(pit_type const pit, Row & row)
 	maxasc  += int(layoutasc  * 2 / (2 + pars_[pit].getDepth()));
 	maxdesc += int(layoutdesc * 2 / (2 + pars_[pit].getDepth()));
 
+	// 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);
 }
@@ -1009,17 +1045,13 @@ 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();
 	pit_type cpit = cur.pit();
 
-	if (cur.pos() != 0 && cur.pos() != cur.lastpos()
-	    && cpar.isChangeEdited(0, cur.pos()))
-		return;
-
 	LyXTextClass const & tclass = cur.buffer().params().getLyXTextClass();
 	LyXLayout_ptr const & layout = cpar.layout();
 
@@ -1037,25 +1069,30 @@ void LyXText::breakParagraph(LCursor & cur, char keep_layout)
 	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 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 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.
 	bool const isempty = cpar.allowEmpty() && cpar.empty();
+
 	::breakParagraph(cur.buffer().params(), paragraphs(), cpit,
-			 cur.pos(), keep_layout);
+			 cur.pos(), preserve_layout);
+
+	// 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());
@@ -1064,20 +1101,21 @@ 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();
+	ParIterator current_it(cur);
+	ParIterator last_it(cur);
+	++last_it;
+	++last_it;
+
+	updateLabels(cur.buffer(), current_it, last_it);
+
+	// Mark "carriage return" as inserted if change tracking:
+	if (cur.buffer().params().tracking_changes) {
+		cur.paragraph().setChange(cur.paragraph().size(),
+			Change::INSERTED);
+	}
 
 	// This check is necessary. Otherwise the new empty paragraph will
 	// be deleted automatically. And it is more friendly for the user!
@@ -1090,7 +1128,7 @@ void LyXText::breakParagraph(LCursor & cur, char keep_layout)
 
 // insert a character, moves all the following breaks in the
 // same Paragraph one to the right and make a rebreak
-void LyXText::insertChar(LCursor & cur, char c)
+void LyXText::insertChar(LCursor & cur, char_type c)
 {
 	BOOST_ASSERT(this == cur.text());
 	BOOST_ASSERT(c != Paragraph::META_INSET);
@@ -1110,7 +1148,7 @@ void LyXText::insertChar(LCursor & cur, char c)
 		static string const number_seperators = ".,:";
 
 		if (current_font.number() == LyXFont::ON) {
-			if (!IsDigit(c) && !contains(number_operators, c) &&
+			if (!isDigit(c) && !contains(number_operators, c) &&
 			    !(contains(number_seperators, c) &&
 			      cur.pos() != 0 &&
 			      cur.pos() != cur.lastpos() &&
@@ -1118,12 +1156,12 @@ void LyXText::insertChar(LCursor & cur, char c)
 			      getFont(par, cur.pos() - 1).number() == LyXFont::ON)
 			   )
 				number(cur); // Set current_font.number to OFF
-		} else if (IsDigit(c) &&
+		} else if (isDigit(c) &&
 			   real_current_font.isVisibleRightToLeft()) {
 			number(cur); // Set current_font.number to ON
 
 			if (cur.pos() != 0) {
-				char const c = par.getChar(cur.pos() - 1);
+				char_type const c = par.getChar(cur.pos() - 1);
 				if (contains(number_unary_operators, c) &&
 				    (cur.pos() == 1
 				     || par.isSeparator(cur.pos() - 2)
@@ -1145,31 +1183,22 @@ void LyXText::insertChar(LCursor & cur, char c)
 	// difference are the special checks when calculating the row.fill
 	// (blank does not count at the end of a row) and the check here
 
-	// The bug is triggered when we type in a description environment:
-	// The current_font is not changed when we go from label to main text
-	// and it should (along with realtmpfont) when we type the space.
-	// CHECK There is a bug here! (Asger)
-
-	// store the current font.  This is because of the use of cursor
-	// movements. The moving cursor would refresh the current font
-	LyXFont realtmpfont = real_current_font;
-	LyXFont rawtmpfont = current_font;
-
 	// When the free-spacing option is set for the current layout,
 	// disable the double-space checking
-	if (!freeSpacing && IsLineSeparatorChar(c)) {
+	if (!freeSpacing && isLineSeparatorChar(c)) {
 		if (cur.pos() == 0) {
 			static bool sent_space_message = false;
 			if (!sent_space_message) {
 				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. "
@@ -1180,10 +1209,7 @@ void LyXText::insertChar(LCursor & cur, char c)
 		}
 	}
 
-	par.insertChar(cur.pos(), c, rawtmpfont);
-
-	current_font = rawtmpfont;
-	real_current_font = realtmpfont;
+	par.insertChar(cur.pos(), c, current_font);
 	setCursor(cur, cur.pit(), cur.pos() + 1, false, cur.boundary());
 	charInserted();
 }
@@ -1319,41 +1345,45 @@ LyXText::computeRowMetrics(pit_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.pit() != cur.lastpit()) {
-		++cur.pit();
-		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().isLetter(cur.pos()))
-			++cur.pos();
 		// Advance through word.
-		while (cur.pos() != cur.lastpos() && cur.paragraph().isLetter(cur.pos()))
-			++cur.pos();
+		while (old.pos() != old.lastpos() && old.paragraph().isLetter(old.pos()))
+			++old.pos();
+		// Skip through trailing nonword stuff.
+		while (old.pos() != old.lastpos() && !old.paragraph().isLetter(old.pos()))
+			++old.pos();
 	}
-	setCursor(cur, cur.pit(), 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.pit() != 0) {
-		--cur.pit();
-		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().isLetter(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().isLetter(cur.pos() - 1))
-			--cur.pos();
+		while (old.pos() != 0 && old.paragraph().isLetter(old.pos() - 1))
+			--old.pos();
 	}
-	setCursor(cur, cur.pit(), cur.pos());
+	return setCursor(cur, old.pit(), old.pos());
 }
 
 
@@ -1391,18 +1421,34 @@ void LyXText::acceptChange(LCursor & cur)
 	if (!cur.selection() && cur.lastpos() != 0)
 		return;
 
-	CursorSlice const & startc = cur.selBegin();
-	CursorSlice const & endc = cur.selEnd();
-	if (startc.pit() == endc.pit()) {
-		recordUndoSelection(cur, Undo::INSERT);
-		pars_[startc.pit()].acceptChange(startc.pos(), endc.pos());
-		finishUndo();
-		cur.clearSelection();
-		setCursorIntern(cur, startc.pit(), 0);
+	recordUndoSelection(cur, Undo::INSERT);
+
+	DocIterator it = cur.selectionBegin();
+	DocIterator et = cur.selectionEnd();
+	pit_type pit = it.pit();
+	Change::Type const type = pars_[pit].lookupChange(it.pos()).type;
+	for (; pit <= et.pit(); ++pit) {
+		pos_type left  = ( pit == it.pit() ? it.pos() : 0 );
+		pos_type right =
+		    ( pit == et.pit() ? et.pos() : pars_[pit].size() + 1 );
+		pars_[pit].acceptChange(left, right);
 	}
-#ifdef WITH_WARNINGS
-#warning handle multi par selection
-#endif
+	if (type == Change::DELETED) {
+		ParagraphList & plist = paragraphs();
+		if (it.pit() + 1 < et.pit())
+			pars_.erase(boost::next(plist.begin(), it.pit() + 1),
+				    boost::next(plist.begin(), et.pit()));
+
+		// Paragraph merge if appropriate:
+		if (pars_[it.pit()].lookupChange(pars_[it.pit()].size())
+			== Change::DELETED) {
+			setCursorIntern(cur, it.pit() + 1, 0);
+			backspacePos0(cur);
+		}
+	}
+	finishUndo();
+	cur.clearSelection();
+	setCursorIntern(cur, it.pit(), 0);
 }
 
 
@@ -1412,18 +1458,33 @@ void LyXText::rejectChange(LCursor & cur)
 	if (!cur.selection() && cur.lastpos() != 0)
 		return;
 
-	CursorSlice const & startc = cur.selBegin();
-	CursorSlice const & endc = cur.selEnd();
-	if (startc.pit() == endc.pit()) {
-		recordUndoSelection(cur, Undo::INSERT);
-		pars_[startc.pit()].rejectChange(startc.pos(), endc.pos());
-		finishUndo();
-		cur.clearSelection();
-		setCursorIntern(cur, startc.pit(), 0);
+	recordUndoSelection(cur, Undo::INSERT);
+
+	DocIterator it = cur.selectionBegin();
+	DocIterator et = cur.selectionEnd();
+	pit_type pit = it.pit();
+	Change::Type const type = pars_[pit].lookupChange(it.pos()).type;
+	for (; pit <= et.pit(); ++pit) {
+		pos_type left  = ( pit == it.pit() ? it.pos() : 0 );
+		pos_type right =
+		    ( pit == et.pit() ? et.pos() : pars_[pit].size() + 1 );
+		pars_[pit].rejectChange(left, right);
 	}
-#ifdef WITH_WARNINGS
-#warning handle multi par selection
-#endif
+	if (type == Change::INSERTED) {
+		ParagraphList & plist = paragraphs();
+		if (it.pit() + 1 < et.pit())
+			pars_.erase(boost::next(plist.begin(), it.pit() + 1),
+				    boost::next(plist.begin(), et.pit()));
+		// Paragraph merge if appropriate:
+		if (pars_[it.pit()].lookupChange(pars_[it.pit()].size())
+			== Change::INSERTED) {
+			setCursorIntern(cur, it.pit() + 1, 0);
+			backspacePos0(cur);
+		}
+	}
+	finishUndo();
+	cur.clearSelection();
+	setCursorIntern(cur, it.pit(), 0);
 }
 
 
@@ -1492,7 +1553,7 @@ void LyXText::changeCase(LCursor & cur, LyXText::TextCase action)
 	} else {
 		from = cur.top();
 		getWord(from, to, lyx::PARTIAL_WORD);
-		setCursor(cur, to.pit(), to.pos() + 1);
+		cursorRightOneWord(cur);
 	}
 
 	recordUndoSelection(cur);
@@ -1507,7 +1568,7 @@ void LyXText::changeCase(LCursor & cur, LyXText::TextCase action)
 			pos = 0;
 			continue;
 		}
-		unsigned char c = pars_[pit].getChar(pos);
+		char_type c = pars_[pit].getChar(pos);
 		if (c != Paragraph::META_INSET) {
 			switch (action) {
 			case text_lowercase:
@@ -1531,84 +1592,137 @@ void LyXText::changeCase(LCursor & cur, LyXText::TextCase action)
 }
 
 
-void LyXText::Delete(LCursor & cur)
+bool LyXText::erase(LCursor & cur)
 {
 	BOOST_ASSERT(this == cur.text());
+	bool needsUpdate = false;
+
 	if (cur.pos() != cur.lastpos()) {
 		recordUndo(cur, Undo::DELETE, cur.pit());
 		setCursorIntern(cur, cur.pit(), cur.pos() + 1, false, cur.boundary());
-		backspace(cur);
+		needsUpdate = backspace(cur);
+		if (cur.paragraph().lookupChange(cur.pos()) == Change::DELETED)
+			cur.posRight();
+	} 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());
+			needsUpdate = backspace(cur);
+			if (cur.buffer().params().tracking_changes) {
+				// move forward after the paragraph break is DELETED
+				Paragraph & par = cur.paragraph();
+				if (par.lookupChange(par.size()) == Change::DELETED)
+					setCursorIntern(cur, cur.pit() + 1, 0);
+				}
+		} else {
+			setCursorIntern(scur, scur.pit(), scur.pos(), false, scur.boundary());
+		}
 	}
-	// should we do anything in an else branch?
+	return needsUpdate;
 }
 
 
-void LyXText::backspace(LCursor & cur)
+bool LyXText::backspacePos0(LCursor & cur)
 {
 	BOOST_ASSERT(this == cur.text());
-	if (cur.pos() == 0) {
-		// The cursor is at the beginning of a paragraph, so
-		// the the backspace will collapse two paragraphs into
-		// one.
+	bool needsUpdate = false;
 
-		// but it's not allowed unless it's new
-		Paragraph & par = cur.paragraph();
-		if (par.isChangeEdited(0, par.size()))
-			return;
-
-		// we may paste some paragraphs
-
-		// is it an empty paragraph?
-		pos_type lastpos = cur.lastpos();
-		if (lastpos == 0 || (lastpos == 1 && par.isSeparator(0))) {
-			// This is an empty paragraph and we delete it just
-			// by moving the cursor one step
-			// left and let the DeleteEmptyParagraphMechanism
-			// handle the actual deletion of the paragraph.
+	Paragraph & par = cur.paragraph();
+	// is it an empty paragraph?
+	pos_type lastpos = cur.lastpos();
+	if (lastpos == 0 || (lastpos == 1 && par.isSeparator(0))) {
+		// This is an empty paragraph and we delete it just
+		// by moving the cursor one step
+		// left and let the DeleteEmptyParagraphMechanism
+		// handle the actual deletion of the paragraph.
 
-			if (cur.pit() != 0) {
-				cursorLeft(cur);
-				return;
+		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);
+			return true;
 		}
+	}
 
-		if (cur.pit() != 0)
-			recordUndo(cur, Undo::DELETE, cur.pit() - 1);
+	if (cur.pit() != 0)
+		recordUndo(cur, Undo::DELETE, cur.pit() - 1);
+
+	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.pit() != 0) {
+		// steps into the above paragraph.
+		setCursorIntern(cur, cur.pit() - 1,
+				pars_[cur.pit() - 1].size(),
+				false);
+	}
 
-		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.pit() != 0) {
-			// steps into the above paragraph.
-			setCursorIntern(cur, cur.pit() - 1,
-					pars_[cur.pit() - 1].size(),
-					false);
-		}
+	// Pasting is not allowed, if the paragraphs have different
+	// 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();
+	pit_type const cpit = cur.pit();
+
+	if (cpit != tmppit
+	    && (pars_[cpit].layout() == pars_[tmppit].layout()
+		|| pars_[tmppit].layout() == tclass.defaultLayout()))
+	{
+		mergeParagraph(bufparams, pars_, cpit);
+		needsUpdate = true;
 
-		// Pasting is not allowed, if the paragraphs have different
-		// 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 = cur.buffer();
-		BufferParams const & bufparams = buf.params();
-		LyXTextClass const & tclass = bufparams.getLyXTextClass();
-		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, pars_, cpit);
-
-			if (cur.pos() != 0 && pars_[cpit].isSeparator(cur.pos() - 1))
+		if (cur.pos() != 0 && pars_[cpit].isSeparator(cur.pos() - 1))
 				--cur.pos();
 
-			// the counters may have changed
-			updateCounters();
-			setCursor(cur, cur.pit(), cur.pos(), false);
+		// the counters may have changed
+		ParIterator par_it(cur);
+		updateLabels(cur.buffer(), par_it);
+
+		setCursor(cur, cur.pit(), cur.pos(), false);
+	}
+	return needsUpdate;
+}
+
+
+bool LyXText::backspace(LCursor & cur)
+{
+	BOOST_ASSERT(this == cur.text());
+	bool needsUpdate = false;
+	if (cur.pos() == 0) {
+		// The cursor is at the beginning of a paragraph, so
+		// the the backspace will collapse two paragraphs into
+		// one.
+
+		if (cur.pit() != 0 && cur.buffer().params().tracking_changes) {
+			// Previous paragraph, mark "carriage return" as
+			// deleted:
+			Paragraph & par = pars_[cur.pit() - 1];
+			// Take care of a just inserted para break:
+			if (par.lookupChange(par.size()) != Change::INSERTED) {
+				par.setChange(par.size(), Change::DELETED);
+				setCursorIntern(cur, cur.pit() - 1, par.size());
+				return true;
+			}
 		}
+
+		needsUpdate = backspacePos0(cur);
+
 	} else {
 		// this is the code for a normal backspace, not pasting
 		// any paragraphs
@@ -1626,15 +1740,8 @@ void LyXText::backspace(LCursor & cur)
 		setCurrentFont(cur);
 
 	setCursor(cur, cur.pit(), cur.pos(), false, cur.boundary());
-}
-
 
-Paragraph & LyXText::getPar(pit_type par) const
-{
-	//lyxerr << "getPar: " << par << " from " << paragraphs().size() << endl;
-	BOOST_ASSERT(par >= 0);
-	BOOST_ASSERT(par < int(paragraphs().size()));
-	return paragraphs()[par];
+	return needsUpdate;
 }
 
 
@@ -1644,18 +1751,42 @@ Row const & LyXText::firstRow() const
 }
 
 
-void LyXText::redoParagraph(pit_type const pit)
+bool LyXText::redoParagraph(pit_type const pit)
 {
 	// remove rows of paragraph, keep track of height changes
 	Paragraph & par = pars_[pit];
 
+	// 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
+	// FIXME: We should always use getFont(), see documentation of
+	// noFontChange() in insetbase.h.
+	LyXFont const bufferfont = bv()->buffer()->params().getFont();
 	InsetList::iterator ii = par.insetlist.begin();
 	InsetList::iterator iend = par.insetlist.end();
 	for (; ii != iend; ++ii) {
 		Dimension dim;
-		int const w = maxwidth_ - leftMargin(pit) - rightMargin(par);
-		MetricsInfo mi(bv(), getFont(par, ii->pos), w);
+		int const w = maxwidth_ - leftMargin(pit, ii->pos) - rightMargin(par);
+		LyXFont const & font = ii->inset->noFontChange() ?
+			bufferfont :
+			getFont(par, ii->pos);
+		MetricsInfo mi(bv(), font, w);
 		ii->inset->metrics(mi, dim);
 	}
 
@@ -1676,10 +1807,29 @@ void LyXText::redoParagraph(pit_type const pit)
 		z = row.endpos();
 	} while (z < par.size());
 
+	// Make sure that if a par ends in newline, there is one more row
+	// under it
+	// FIXME this is a dirty trick. Now the _same_ position in the
+	// paragraph occurs in _two_ different rows, and has two different
+	// display positions, leading to weird behaviour when moving up/down.
+	if (z > 0 && par.isNewline(z - 1)) {
+		Row row(z - 1);
+		row.endpos(z - 1);
+		setRowWidth(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();
-	par.dim_ = dim;
+
+	bool const same = dim == par.dim();
+
+	par.dim() = dim;
 	//lyxerr << "redoParagraph: " << par.rows().size() << " rows\n";
+
+	return !same;
 }
 
 
@@ -1690,6 +1840,8 @@ void LyXText::metrics(MetricsInfo & mi, Dimension & dim)
 		maxwidth_ = mi.base.textwidth;
 	//lyxerr << "LyXText::metrics: width: " << mi.base.textwidth
 	//	<< " maxWidth: " << maxwidth_ << "\nfont: " << mi.base.font << endl;
+	// save the caller's font locally:
+	font_ = mi.base.font;
 
 	unsigned int h = 0;
 	unsigned int w = 0;
@@ -1716,7 +1868,7 @@ void LyXText::draw(PainterInfo & pi, int x, int y) const
 }
 
 
-/*
+#if 0
 // only used for inset right now. should also be used for main text
 void LyXText::drawSelection(PainterInfo & pi, int x , int) const
 {
@@ -1728,12 +1880,8 @@ void LyXText::drawSelection(PainterInfo & pi, int x , int) const
 
 	lyxerr << "draw selection at " << x << endl;
 
-	// is there a better way of getting these two iterators?
-	DocIterator beg = cur;
-	DocIterator end = cur;
-
-	beg.top() = cur.selBegin();
-	end.top() = cur.selEnd();
+	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
@@ -1743,8 +1891,8 @@ void LyXText::drawSelection(PainterInfo & pi, int x , int) const
 	Paragraph const & par1 = pars_[beg.pit()];
 	Paragraph const & par2 = pars_[end.pit()];
 
-	Row const & row1 = par1.getRow(beg.pos());
-	Row const & row2 = par2.getRow(end.pos());
+	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) {
@@ -1753,7 +1901,7 @@ void LyXText::drawSelection(PainterInfo & pi, int x , int) const
 		x2 = 0;
 	} else {
 		y1 = bv_funcs::getPos(beg).y_ - row1.ascent();
-		int const startx = cursorX(beg.top());
+		int const startx = cursorX(beg.top(), begin.boundary());
 		x1 = isRTL(par1) ? startx : 0;
 		x2 = isRTL(par1) ? 0 + dim_.wid : startx;
 	}
@@ -1765,7 +1913,7 @@ void LyXText::drawSelection(PainterInfo & pi, int x , int) const
 		X2 = 0;
 	} else {
 		y2 = bv_funcs::getPos(end).y_ + row2.descent();
-		int const endx = cursorX(end.top());
+		int const endx = cursorX(end.top(), end.boundary());
 		X1 = isRTL(par2) ? 0 : endx;
 		X2 = isRTL(par2) ? endx : 0 + dim_.wid;
 	}
@@ -1785,8 +1933,8 @@ void LyXText::drawSelection(PainterInfo & pi, int x , int) const
 	pi.pain.fillRectangle(x + X1, y2  - row2.height(),
 		X2 - X1, row2.height(), LColor::background);
 }
-*/
 
+#else
 
 void LyXText::drawSelection(PainterInfo & pi, int x, int) const
 {
@@ -1796,14 +1944,13 @@ void LyXText::drawSelection(PainterInfo & pi, int x, int) const
 	if (!ptr_cmp(cur.text(), this))
 		return;
 
-	lyxerr << "draw selection at " << x << endl;
-
-	// is there a better way of getting these two iterators?
-	DocIterator beg = cur;
-	DocIterator end = cur;
+	lyxerr[Debug::DEBUG]
+		<< BOOST_CURRENT_FUNCTION
+		<< "draw selection at " << x
+		<< endl;
 
-	beg.top() = cur.selBegin();
-	end.top() = cur.selEnd();
+	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
@@ -1824,10 +1971,10 @@ void LyXText::drawSelection(PainterInfo & pi, int x, int) const
 		x1 = 0;
 		x2 = dim_.wid;
 	} else {
-		Row const & row1 = par1.getRow(beg.pos());
-		y1 = bv_funcs::getPos(beg).y_ - row1.ascent();
+		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());
+		int const startx = cursorX(beg.top(), beg.boundary());
 		x1 = !isRTL(par1) ? startx : 0;
 		x2 = !isRTL(par1) ? 0 + dim_.wid : startx;
 	}
@@ -1839,23 +1986,28 @@ void LyXText::drawSelection(PainterInfo & pi, int x, int) const
 		X1 = 0;
 		X2 = dim_.wid;
 	} else {
-		Row const & row2 = par2.getRow(end.pos());
-		Y1 = bv_funcs::getPos(end).y_ - row2.ascent();
+		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());
+		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())
-	    == &par2.getRow(end.pos()))
+	if (!above && !below && &par1.getRow(beg.pos(), beg.boundary())
+	    == &par2.getRow(end.pos(), end.boundary()))
 	{
 		// paint only one rectangle
-		pi.pain.fillRectangle(x + x1, y1, X2 - x1, y2 - y1,
-				      LColor::selection);
+		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);
@@ -1866,6 +2018,7 @@ void LyXText::drawSelection(PainterInfo & pi, int x, int) const
 	pi.pain.fillRectangle(x, y2, dim_.wid,
 			      Y1 - y2, LColor::selection);
 }
+#endif
 
 bool LyXText::isLastRow(pit_type pit, Row const & row) const
 {
@@ -1932,8 +2085,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()) {
@@ -2002,16 +2153,21 @@ int LyXText::descent() const
 }
 
 
-int LyXText::cursorX(CursorSlice const & cur) const
+int LyXText::cursorX(CursorSlice const & sl, bool boundary) const
 {
-	pit_type const pit = cur.pit();
+	pit_type const pit = sl.pit();
 	Paragraph const & par = pars_[pit];
 	if (par.rows().empty())
 		return 0;
 
-	Row const & row = par.getRow(cur.pos());
+	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(sl.pos(), boundary);
 
-	pos_type pos = cur.pos();
 	pos_type cursor_vpos = 0;
 
 	RowMetrics const m = computeRowMetrics(pit, row);
@@ -2022,22 +2178,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) {
@@ -2048,33 +2208,57 @@ 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;
+	}
+
+	// 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.pit());
+	//lyxerr << "LyXText::cursorY: boundary: " << boundary << std::endl;
+	Paragraph const & par = getPar(sl.pit());
+	if (par.rows().empty())
+		return 0;
+
 	int h = 0;
 	h -= pars_[0].rows()[0].ascent();
-	for (pit_type pit = 0; pit < cur.pit(); ++pit)
+	for (pit_type pit = 0; pit < sl.pit(); ++pit)
 		h += pars_[pit].height();
-	for (size_t rit = 0, rend = par.pos2row(cur.pos()); rit != rend; ++rit)
+	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()[par.pos2row(cur.pos())].ascent();
+	h += par.rows()[rend].ascent();
 	return h;
 }
 
@@ -2088,11 +2272,13 @@ string LyXText::currentState(LCursor & cur)
 	std::ostringstream os;
 
 	bool const show_change = buf.params().tracking_changes
-		&& cur.pos() != cur.lastpos()
 		&& par.lookupChange(cur.pos()) != Change::UNCHANGED;
 
+	if (buf.params().tracking_changes)
+		os << "[C] ";
+
 	if (show_change) {
-		Change change = par.lookupChangeFull(cur.pos());
+		Change change = par.lookupChange(cur.pos());
 		Author const & a = buf.params().authors().get(change.author);
 		os << _("Change: ") << a.name();
 		if (!a.email().empty())
@@ -2104,8 +2290,9 @@ string LyXText::currentState(LCursor & cur)
 
 	// I think we should only show changes from the default
 	// font. (Asger)
+	// No, from the document font (MV)
 	LyXFont font = real_current_font;
-	font.reduce(buf.params().getLyXTextClass().defaultfont());
+	font.reduce(buf.params().getFont());
 
 	// avoid _(...) re-entrance problem
 	string const s = font.stateText(&buf.params());
@@ -2147,6 +2334,7 @@ string LyXText::currentState(LCursor & cur)
 	os << _(", Paragraph: ") << cur.pit();
 	os << _(", Id: ") << par.id();
 	os << _(", Position: ") << cur.pos();
+	os << _(", Boundary: ") << cur.boundary();
 //	Row & row = cur.textRow();
 //	os << bformat(_(", Row b:%1$d e:%2$d"), row.pos(), row.endpos());
 #endif
@@ -2168,8 +2356,25 @@ string LyXText::getPossibleLabel(LCursor & cur) const
 		}
 	}
 
-	string text = layout->latexname().substr(0, 3);
-	if (layout->latexname() == "theorem")
+	string name = layout->latexname();
+
+	// for captions, we want the abbreviation of the float type
+	if (layout->labeltype == LABEL_SENSITIVE) {
+		// Search for the first float or wrap inset in the iterator
+		size_t i = cur.depth();
+		while (i > 0) {
+			--i;
+			InsetBase * const in = &cur[i].inset();
+			if (in->lyxCode() == InsetBase::FLOAT_CODE
+			    || in->lyxCode() == InsetBase::WRAP_CODE) {
+				name = in->getInsetName();
+				break;
+			}
+		}
+	}
+
+	string text = name.substr(0, 3);
+	if (name == "theorem")
 		text = "thm"; // Create a correct prefix for prettyref
 
 	text += ':';
@@ -2211,6 +2416,7 @@ string LyXText::getPossibleLabel(LCursor & cur) const
 
 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);
@@ -2228,12 +2434,16 @@ pos_type LyXText::x2pos(pit_type pit, int row, int x) const
 
 // x,y are screen coordinates
 // sets cursor only within this LyXText
-void LyXText::setCursorFromCoordinates(LCursor & cur, int const x, int const y)
+bool LyXText::setCursorFromCoordinates(LCursor & cur, int const x, int const y)
 {
 	pit_type pit = getPitNearY(y);
 	int yy = theCoords.get(this, pit).y_ - pars_[pit].ascent();
-	lyxerr << "setCursorFromCoordinates: x: " << x << " y: " << y
-		<< " pit: " << pit << " yy: " << yy << endl;
+	lyxerr[Debug::DEBUG]
+		<< BOOST_CURRENT_FUNCTION
+		<< ": x: " << x
+		<< " y: " << y
+		<< " pit: " << pit
+		<< " yy: " << yy << endl;
 
 	Paragraph const & par = pars_[pit];
 	int r = 0;
@@ -2247,11 +2457,21 @@ void LyXText::setCursorFromCoordinates(LCursor & cur, int const x, int const y)
 
 	Row const & row = par.rows()[r];
 
-	lyxerr << "setCursorFromCoordinates:  row " << r
-	       << " from pos: " << row.pos() << endl;
+	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);
-	setCursor(cur, pit, pos, true, bound);
+
+	lyxerr[Debug::DEBUG]
+		<< BOOST_CURRENT_FUNCTION
+		<< ": setting cursor pit: " << pit
+		<< " pos: " << pos
+		<< endl;
+
+	return setCursor(cur, pit, pos, true, bound);
 }