X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftext2.C;h=f9d2a574d6fa65b3dc144d7cca2d1ea2ca3c0568;hb=d11fd01ce743c4974a96f241a99853f46078c80c;hp=938d9fd3a201fea559db7fc53fa9f8fff6538588;hpb=aae301e9cd06d517457a8dff3102162ef08220bb;p=lyx.git

diff --git a/src/text2.C b/src/text2.C
index 938d9fd3a2..f9d2a574d6 100644
--- a/src/text2.C
+++ b/src/text2.C
@@ -1,8 +1,8 @@
 /* This file is part of
  * ======================================================
- * 
+ *
  *           LyX, The Document Processor
- * 	 
+ *
  *           Copyright 1995 Matthias Ettrich
  *           Copyright 1995-2001 The LyX Team.
  *
@@ -17,19 +17,11 @@
 #include "lyxtext.h"
 #include "LString.h"
 #include "paragraph.h"
-#include "insets/inseterror.h"
-#include "insets/insetbib.h"
-#include "insets/insetspecialchar.h"
-#include "insets/insettext.h"
-#include "insets/insetfloat.h"
-#include "layout.h"
+#include "lyxtextclasslist.h"
 #include "LyXView.h"
-#include "support/textutils.h"
-#include "support/lstrings.h"
 #include "undo_funcs.h"
 #include "buffer.h"
 #include "bufferparams.h"
-#include "lyx_gui_misc.h"
 #include "gettext.h"
 #include "BufferView.h"
 #include "LyXView.h"
@@ -38,34 +30,46 @@
 #include "font.h"
 #include "debug.h"
 #include "lyxrc.h"
+#include "lyxrow.h"
 #include "FloatList.h"
 #include "language.h"
 #include "ParagraphParameters.h"
 
+#include "insets/inseterror.h"
+#include "insets/insetbib.h"
+#include "insets/insetspecialchar.h"
+#include "insets/insettext.h"
+#include "insets/insetfloat.h"
+
+#include "support/LAssert.h"
+#include "support/textutils.h"
+#include "support/lstrings.h"
+
+using std::vector;
 using std::copy;
 using std::find;
 using std::endl;
 using std::find;
 using std::pair;
+using lyx::pos_type;
 
 
 LyXText::LyXText(BufferView * bv)
-	: number_of_rows(0), height(0), width(0), first(0),
+	: number_of_rows(0), height(0), width(0), first_y(0),
 	  bv_owner(bv), inset_owner(0), the_locking_inset(0),
 	  need_break_row(0), refresh_y(0), refresh_row(0),
-	  status_(LyXText::UNCHANGED), firstrow(0), lastrow(0),
-	  copylayouttype(0)
+	  status_(LyXText::UNCHANGED), firstrow(0), lastrow(0)
 {}
 
 
 LyXText::LyXText(InsetText * inset)
-	:  number_of_rows(0),  height(0), width(0), first(0),
+	:  number_of_rows(0),  height(0), width(0), first_y(0),
 	   bv_owner(0), inset_owner(inset), the_locking_inset(0),
 	   need_break_row(0), refresh_y(0), refresh_row(0),
-	   status_(LyXText::UNCHANGED), firstrow(0), lastrow(0),
-	   copylayouttype(0)
+	   status_(LyXText::UNCHANGED), firstrow(0), lastrow(0)
 {}
 
+
 void LyXText::init(BufferView * bview, bool reinit)
 {
 	if (reinit) {
@@ -76,15 +80,20 @@ void LyXText::init(BufferView * bview, bool reinit)
 			delete firstrow;
 			firstrow = tmprow;
 		}
-		lastrow = refresh_row = need_break_row = 0;
-		width = height = copylayouttype = 0;
-		number_of_rows = first = refresh_y = 0;
+
+		lastrow = 0;
+		refresh_row = 0;
+		need_break_row = 0;
+		width = height = 0;
+		copylayouttype.erase();
+		number_of_rows = first_y = refresh_y = 0;
 		status_ = LyXText::UNCHANGED;
 	} else if (firstrow)
 		return;
 
 	Paragraph * par = ownerParagraph();
 	current_font = getFont(bview->buffer(), par, 0);
+
 	while (par) {
 		insertParagraph(bview, par, lastrow);
 		par = par->next();
@@ -106,6 +115,45 @@ LyXText::~LyXText()
 }
 
 
+namespace {
+
+LyXFont const realizeFont(LyXFont const & font,
+			  Buffer const * buf,
+			  Paragraph * par)
+{
+	LyXFont tmpfont(font);
+	Paragraph::depth_type par_depth = par->getDepth();
+
+	// Resolve against environment font information
+	while (par && par_depth && !tmpfont.resolved()) {
+		par = par->outerHook();
+		if (par) {
+#ifndef INHERIT_LANGUAGE
+			tmpfont.realize(textclasslist[buf->params.textclass][
+					      par->layout()].font);
+#else
+			tmpfont.realize(textclasslist.
+					Style(buf->params.textclass,
+					      par->layout()).font,
+					buf->params.language);
+#endif
+			par_depth = par->getDepth();
+		}
+	}
+
+#ifndef INHERIT_LANGUAGE
+	tmpfont.realize(textclasslist[buf->params.textclass].defaultfont());
+#else
+	tmpfont.realize(textclasslist[buf->params.textclass].defaultfont(),
+			buf->params.language);
+#endif
+
+	return tmpfont;
+}
+
+}
+
+
 // Gets the fully instantiated font at a given position in a paragraph
 // Basically the same routine as Paragraph::getFont() in paragraph.C.
 // The difference is that this one is used for displaying, and thus we
@@ -114,147 +162,123 @@ LyXText::~LyXText()
 // If position is -1, we get the layout font of the paragraph.
 // If position is -2, we get the font of the manual label of the paragraph.
 LyXFont const LyXText::getFont(Buffer const * buf, Paragraph * par,
-                               Paragraph::size_type pos) const
+			       pos_type pos) const
 {
-	LyXLayout const & layout = 
-		textclasslist.Style(buf->params.textclass, par->getLayout());
+	lyx::Assert(pos >= 0);
+
+	LyXLayout const & layout =
+		textclasslist[buf->params.textclass][par->layout()];
 
 	Paragraph::depth_type par_depth = par->getDepth();
 	// We specialize the 95% common case:
 	if (!par_depth) {
-		if (pos >= 0){
-			// 95% goes here
-			if (layout.labeltype == LABEL_MANUAL
-			    && pos < beginningOfMainBody(buf, par)) {
-				// 1% goes here
-				LyXFont f = par->getFontSettings(buf->params,
-								 pos);
-				return f.realize(layout.reslabelfont, buf->params.language);
-			} else {
-				LyXFont f = par->getFontSettings(buf->params, pos);
-				return f.realize(layout.resfont, buf->params.language);
-			}
-			
+		if (layout.labeltype == LABEL_MANUAL
+		    && pos < beginningOfMainBody(buf, par)) {
+			// 1% goes here
+			LyXFont f = par->getFontSettings(buf->params, pos);
+			if (par->inInset())
+				par->inInset()->getDrawFont(f);
+#ifndef INHERIT_LANGUAGE
+			return f.realize(layout.reslabelfont);
+#else
+			return f.realize(layout.reslabelfont, buf->params.language);
+#endif
 		} else {
-			// 5% goes here.
-			// process layoutfont for pos == -1 and labelfont for pos < -1
-			if (pos == -1)
-				return layout.resfont;
-			else
-				return layout.reslabelfont;
+			LyXFont f = par->getFontSettings(buf->params, pos);
+			if (par->inInset())
+				par->inInset()->getDrawFont(f);
+#ifndef INHERIT_LANGUAGE
+			return f.realize(layout.resfont);
+#else
+			return f.realize(layout.resfont, buf->params.language);
+#endif
 		}
 	}
 
 	// The uncommon case need not be optimized as much
 
-	LyXFont layoutfont, tmpfont;
+	LyXFont layoutfont;
 
-	if (pos >= 0){
-		// 95% goes here
-		if (pos < beginningOfMainBody(buf, par)) {
-			// 1% goes here
-			layoutfont = layout.labelfont;
-		} else {
-			// 99% goes here
-			layoutfont = layout.font;
-		}
-		tmpfont = par->getFontSettings(buf->params, pos);
-		tmpfont.realize(layoutfont, buf->params.language);
+	if (pos < beginningOfMainBody(buf, par)) {
+		// 1% goes here
+		layoutfont = layout.labelfont;
 	} else {
-		// 5% goes here.
-		// process layoutfont for pos == -1 and labelfont for pos < -1
-		if (pos == -1)
-			tmpfont = layout.font;
-		else
-			tmpfont = layout.labelfont;
+		// 99% goes here
+		layoutfont = layout.font;
 	}
 
-	// Resolve against environment font information
-	while (par && par_depth && !tmpfont.resolved()) {
-		par = par->outerHook();
-		if (par) {
-			tmpfont.realize(textclasslist.
-					Style(buf->params.textclass,
-					      par->getLayout()).font,
-							buf->params.language);
-			par_depth = par->getDepth();
-		}
+	LyXFont tmpfont = par->getFontSettings(buf->params, pos);
+#ifndef INHERIT_LANGUAGE
+	tmpfont.realize(layoutfont);
+#else
+	tmpfont.realize(layoutfont, buf->params.language);
+#endif
+	if (par->inInset())
+		par->inInset()->getDrawFont(tmpfont);
+
+	return realizeFont(tmpfont, buf, par);
+}
+
+
+LyXFont const LyXText::getLayoutFont(Buffer const * buf, Paragraph * par) const
+{
+	LyXLayout const & layout =
+		textclasslist[buf->params.textclass][par->layout()];
+
+	Paragraph::depth_type par_depth = par->getDepth();
+
+	if (!par_depth) {
+		return layout.resfont;
 	}
 
-	tmpfont.realize(textclasslist.TextClass(buf->params.textclass).defaultfont(),
-	                buf->params.language);
+	return realizeFont(layout.font, buf, par);
+}
 
-	return tmpfont;
+
+LyXFont const LyXText::getLabelFont(Buffer const * buf, Paragraph * par) const
+{
+	LyXLayout const & layout =
+		textclasslist[buf->params.textclass][par->layout()];
+
+	Paragraph::depth_type par_depth = par->getDepth();
+
+	if (!par_depth) {
+		return layout.reslabelfont;
+	}
+
+	return realizeFont(layout.labelfont, buf, par);
 }
 
 
 void LyXText::setCharFont(BufferView * bv, Paragraph * par,
-                          Paragraph::size_type pos, LyXFont const & fnt,
-                          bool toggleall)
+			  pos_type pos, LyXFont const & fnt,
+			  bool toggleall)
 {
 	Buffer const * buf = bv->buffer();
 	LyXFont font = getFont(buf, par, pos);
-	font.update(fnt, toggleall);
+	font.update(fnt, buf->params.language, toggleall);
 	// Let the insets convert their font
-	if (par->getChar(pos) == Paragraph::META_INSET) {
+	if (par->isInset(pos)) {
 		Inset * inset = par->getInset(pos);
-		if (inset) {
-			if (inset->editable()==Inset::IS_EDITABLE) {
-				UpdatableInset * uinset =
-					static_cast<UpdatableInset *>(inset);
-				uinset->setFont(bv, fnt, toggleall, true);
-			}
-			font = inset->convertFont(font);
-		}
-	}
-
-	LyXLayout const & layout =
-		textclasslist.Style(buf->params.textclass,
-				    par->getLayout());
-
-	// Get concrete layout font to reduce against
-	LyXFont layoutfont;
-
-	if (pos < beginningOfMainBody(buf, par))
-		layoutfont = layout.labelfont;
-	else
-		layoutfont = layout.font;
-
-	// Realize against environment font information
-	if (par->getDepth()){
-		Paragraph * tp = par;
-		while (!layoutfont.resolved() && tp && tp->getDepth()) {
-			tp = tp->outerHook();
-			if (tp)
-				layoutfont.realize(textclasslist.
-				                   Style(buf->params.textclass,
-				                         tp->getLayout()).font,
-				                   buf->params.language);
+		if (isEditableInset(inset)) {
+			UpdatableInset * uinset =
+				static_cast<UpdatableInset *>(inset);
+			uinset->setFont(bv, fnt, toggleall, true);
 		}
 	}
 
-	layoutfont.realize(textclasslist.TextClass(buf->params.textclass).defaultfont(),
-	                   buf->params.language);
-
-	// Now, reduce font against full layout font
-	font.reduce(layoutfont);
-
-	par->setFont(pos, font);
+	// Plug thru to version below:
+	setCharFont(buf, par, pos, font);
 }
 
 
 void LyXText::setCharFont(Buffer const * buf, Paragraph * par,
-                          Paragraph::size_type pos, LyXFont const & fnt)
+			  pos_type pos, LyXFont const & fnt)
 {
 	LyXFont font(fnt);
-	// Let the insets convert their font
-	if (par->getChar(pos) == Paragraph::META_INSET) {
-		font = par->getInset(pos)->convertFont(font);
-	}
 
-	LyXLayout const & layout =
-		textclasslist.Style(buf->params.textclass,
-				    par->getLayout());
+	LyXTextClass const & tclass = textclasslist[buf->params.textclass];
+	LyXLayout const & layout = tclass[par->layout()];
 
 	// Get concrete layout font to reduce against
 	LyXFont layoutfont;
@@ -265,20 +289,27 @@ void LyXText::setCharFont(Buffer const * buf, Paragraph * par,
 		layoutfont = layout.font;
 
 	// Realize against environment font information
-	if (par->getDepth()){
+	if (par->getDepth()) {
 		Paragraph * tp = par;
 		while (!layoutfont.resolved() && tp && tp->getDepth()) {
 			tp = tp->outerHook();
 			if (tp)
+#ifndef INHERIT_LANGUAGE
+				layoutfont.realize(tclass[tp->layout()].font);
+#else
 				layoutfont.realize(textclasslist.
-				                   Style(buf->params.textclass,
-				                         tp->getLayout()).font,
-				                   buf->params.language);
+						   Style(buf->params.textclass,
+							 tp->layout()).font,
+						   buf->params.language);
+#endif
 		}
 	}
 
-	layoutfont.realize(textclasslist.TextClass(buf->params.textclass).defaultfont(),
-	                   buf->params.language);
+#ifndef INHERIT_LANGUAGE
+	layoutfont.realize(tclass.defaultfont());
+#else
+	layoutfont.realize(tclass.defaultfont(), buf->params.language);
+#endif
 
 	// Now, reduce font against full layout font
 	font.reduce(layoutfont);
@@ -290,7 +321,7 @@ void LyXText::setCharFont(Buffer const * buf, Paragraph * par,
 // inserts a new row behind the specified row, increments
 // the touched counters
 void LyXText::insertRow(Row * row, Paragraph * par,
-                        Paragraph::size_type pos) const
+			pos_type pos) const
 {
 	Row * tmprow = new Row;
 	if (!row) {
@@ -302,14 +333,14 @@ void LyXText::insertRow(Row * row, Paragraph * par,
 		tmprow->next(row->next());
 		row->next(tmprow);
 	}
-   
+
 	if (tmprow->next())
 		tmprow->next()->previous(tmprow);
-   
+
 	if (tmprow->previous())
 		tmprow->previous()->next(tmprow);
-   
-   
+
+
 	tmprow->par(par);
 	tmprow->pos(pos);
 
@@ -322,24 +353,26 @@ void LyXText::insertRow(Row * row, Paragraph * par,
 // removes the row and reset the touched counters
 void LyXText::removeRow(Row * row) const
 {
-	/* this must not happen before the currentrow for clear reasons.
-	   so the trick is just to set the current row onto the previous
-	   row of this row */
-	int unused_y;
-	getRow(row->par(), row->pos(), unused_y);
-   
+	Row * row_prev = row->previous();
 	if (row->next())
-		row->next()->previous(row->previous());
-	if (!row->previous()) {
+		row->next()->previous(row_prev);
+	if (!row_prev) {
 		firstrow = row->next();
+//		lyx::Assert(firstrow);
 	} else  {
-		row->previous()->next(row->next());
+		row_prev->next(row->next());
 	}
-	if (row == lastrow)
-		lastrow = row->previous();
-   
+	if (row == lastrow) {
+		lyx::Assert(!row->next());
+		lastrow = row_prev;
+	}
+	if (refresh_row == row) {
+		refresh_row = row_prev ? row_prev : row->next();
+		// what about refresh_y, refresh_height
+	}
+
 	height -= row->height(); // the text becomes smaller
-   
+
 	delete row;
 	--number_of_rows;	// one row less
 }
@@ -350,7 +383,7 @@ void LyXText::removeParagraph(Row * row) const
 {
 	Paragraph * tmppar = row->par();
 	row = row->next();
-    
+
 	Row * tmprow;
 	while (row && row->par() == tmppar) {
 		tmprow = row->next();
@@ -358,17 +391,17 @@ void LyXText::removeParagraph(Row * row) const
 		row = tmprow;
 	}
 }
-   
+
 
 // insert the specified paragraph behind the specified row
 void LyXText::insertParagraph(BufferView * bview, Paragraph * par,
-                              Row * row) const
+			      Row * row) const
 {
-	insertRow(row, par, 0);            /* insert a new row, starting 
-	                                    * at postition 0 */
+	insertRow(row, par, 0);            /* insert a new row, starting
+					    * at postition 0 */
 
 	setCounter(bview->buffer(), par);  // set the counters
-   
+
 	// and now append the whole paragraph behind the new row
 	if (!row) {
 		firstrow->height(0);
@@ -385,8 +418,8 @@ Inset * LyXText::getInset() const
 	Inset * inset = 0;
 	if (cursor.pos() == 0 && cursor.par()->bibkey) {
 		inset =	cursor.par()->bibkey;
-	} else if (cursor.pos() < cursor.par()->size() 
-		   && cursor.par()->getChar(cursor.pos()) == Paragraph::META_INSET) {
+	} else if (cursor.pos() < cursor.par()->size()
+		   && cursor.par()->isInset(cursor.pos())) {
 		inset = cursor.par()->getInset(cursor.pos());
 	}
 	return inset;
@@ -396,12 +429,20 @@ Inset * LyXText::getInset() const
 void LyXText::toggleInset(BufferView * bview)
 {
 	Inset * inset = getInset();
-	if (!inset->editable())
+	// is there an editable inset at cursor position?
+	if (!isEditableInset(inset)) {
+		// No, try to see if we are inside a collapsable inset
+		if (inset_owner && inset_owner->owner()
+		    && inset_owner->owner()->isOpen()) {
+			bview->unlockInset(static_cast<UpdatableInset *>(inset_owner->owner()));
+			inset_owner->owner()->close(bview);
+		}
 		return;
+	}
 	//bview->owner()->message(inset->editMessage());
 
 	// do we want to keep this?? (JMarc)
-	if (inset->editable() != Inset::HIGHLY_EDITABLE)
+	if (!isHighlyEditableInset(inset))
 		setCursorParUndo(bview);
 
 	if (inset->isOpen()) {
@@ -421,15 +462,15 @@ void LyXText::makeFontEntriesLayoutSpecific(Buffer const * buf,
 					    Paragraph * par)
 {
 	LyXLayout const & layout =
-		textclasslist.Style(buf->params.textclass, par->getLayout());
+		textclasslist[buf->params.textclass][par->layout()];
 
 	LyXFont layoutfont;
-	for (Paragraph::size_type pos = 0; pos < par->size(); ++pos) {
+	for (pos_type pos = 0; pos < par->size(); ++pos) {
 		if (pos < beginningOfMainBody(buf, par))
 			layoutfont = layout.labelfont;
 		else
 			layoutfont = layout.font;
-      
+
 		LyXFont tmpfont = par->getFontSettings(buf->params, pos);
 		tmpfont.reduce(layoutfont);
 		par->setFont(pos, tmpfont);
@@ -440,11 +481,11 @@ void LyXText::makeFontEntriesLayoutSpecific(Buffer const * buf,
 Paragraph * LyXText::setLayout(BufferView * bview,
 			       LyXCursor & cur, LyXCursor & sstart_cur,
 			       LyXCursor & send_cur,
-			       LyXTextClass::size_type layout)
+			       string const & layout)
 {
 	Paragraph * endpar = send_cur.par()->next();
 	Paragraph * undoendpar = endpar;
-	
+
 	if (endpar && endpar->getDepth()) {
 		while (endpar && endpar->getDepth()) {
 			endpar = endpar->next();
@@ -453,25 +494,24 @@ Paragraph * LyXText::setLayout(BufferView * bview,
 	} else if (endpar) {
 		endpar = endpar->next(); // because of parindents etc.
 	}
-	
-	setUndo(bview, Undo::EDIT,
-		sstart_cur.par(), undoendpar);
-	
+
+	setUndo(bview, Undo::EDIT, sstart_cur.par(), undoendpar);
+
 	// ok we have a selection. This is always between sstart_cur
 	// and sel_end cursor
 	cur = sstart_cur;
-	
+
 	LyXLayout const & lyxlayout =
-		textclasslist.Style(bview->buffer()->params.textclass, layout);
-	
-	while (cur.par() != send_cur.par()) {
-		cur.par()->setLayout(layout);
+		textclasslist[bview->buffer()->params.textclass][layout];
+
+	do {
+		cur.par()->applyLayout(layout);
 		makeFontEntriesLayoutSpecific(bview->buffer(), cur.par());
 		Paragraph * fppar = cur.par();
 		fppar->params().spaceTop(lyxlayout.fill_top ?
 					 VSpace(VSpace::VFILL)
 					 : VSpace(VSpace::NONE));
-		fppar->params().spaceBottom(lyxlayout.fill_bottom ? 
+		fppar->params().spaceBottom(lyxlayout.fill_bottom ?
 					    VSpace(VSpace::VFILL)
 					    : VSpace(VSpace::NONE));
 		if (lyxlayout.margintype == MARGIN_MANUAL)
@@ -481,28 +521,16 @@ Paragraph * LyXText::setLayout(BufferView * bview,
 			delete fppar->bibkey;
 			fppar->bibkey = 0;
 		}
-		cur.par(cur.par()->next());
-	}
-	cur.par()->setLayout(layout);
-	makeFontEntriesLayoutSpecific(bview->buffer(), cur.par());
-	Paragraph * fppar = cur.par();
-	fppar->params().spaceTop(lyxlayout.fill_top ?
-				 VSpace(VSpace::VFILL) : VSpace(VSpace::NONE));
-	fppar->params().spaceBottom(lyxlayout.fill_bottom ? 
-				    VSpace(VSpace::VFILL) : VSpace(VSpace::NONE));
-	if (lyxlayout.margintype == MARGIN_MANUAL)
-		cur.par()->setLabelWidthString(lyxlayout.labelstring());
-	if (lyxlayout.labeltype != LABEL_BIBLIO
-	    && fppar->bibkey) {
-		delete fppar->bibkey;
-		fppar->bibkey = 0;
-	}
+		if (cur.par() != send_cur.par())
+			cur.par(cur.par()->next());
+	} while (cur.par() != send_cur.par());
+
 	return endpar;
 }
 
 
 // set layout over selection and make a total rebreak of those paragraphs
-void LyXText::setLayout(BufferView * bview, LyXTextClass::size_type layout)
+void LyXText::setLayout(BufferView * bview, string const & layout)
 {
 	LyXCursor tmpcursor = cursor;  /* store the current cursor  */
 
@@ -515,7 +543,7 @@ void LyXText::setLayout(BufferView * bview, LyXTextClass::size_type layout)
 	Paragraph * endpar = setLayout(bview, cursor, selection.start,
 				       selection.end, layout);
 	redoParagraphs(bview, selection.start, endpar);
-   
+
 	// we have to reset the selection, because the
 	// geometry could have changed
 	setCursor(bview, selection.start.par(),
@@ -552,7 +580,7 @@ void  LyXText::incDepth(BufferView * bview)
 	} else if (endpar) {
 		endpar = endpar->next(); // because of parindents etc.
 	}
-	
+
 	setUndo(bview, Undo::EDIT,
 		selection.start.par(), undoendpar);
 
@@ -561,31 +589,30 @@ void  LyXText::incDepth(BufferView * bview)
 	// ok we have a selection. This is always between sel_start_cursor
 	// and sel_end cursor
 	cursor = selection.start;
-   
+
 	bool anything_changed = false;
-   
+
+	LyXTextClass const & tclass =
+		textclasslist[bview->buffer()->params.textclass];
+
 	while (true) {
 		// NOTE: you can't change the depth of a bibliography entry
-		if (
-			textclasslist.Style(bview->buffer()->params.textclass,
-					    cursor.par()->getLayout()
-				).labeltype != LABEL_BIBLIO) {
+		if (tclass[cursor.par()->layout()].labeltype != LABEL_BIBLIO) {
 			Paragraph * prev = cursor.par()->previous();
 
-			if (prev 
-			    && (prev->getDepth() - cursor.par()->getDepth() > 0
-				|| (prev->getDepth() == cursor.par()->getDepth()
-				    && textclasslist.Style(bview->buffer()->params.textclass,
-							   prev->getLayout()).isEnvironment()))) {
-				cursor.par()->params().depth(cursor.par()->params().depth() + 1);
-				anything_changed = true;
+			if (prev) {
+				if (cursor.par()->getDepth()
+				    < prev->getMaxDepthAfter(bview->buffer())){
+					cursor.par()->params().depth(cursor.par()->getDepth() + 1);
+					anything_changed = true;
+				}
 			}
 		}
 		if (cursor.par() == selection.end.par())
 			break;
 		cursor.par(cursor.par()->next());
 	}
-   
+
 	// if nothing changed set all depth to 0
 	if (!anything_changed) {
 		cursor = selection.start;
@@ -595,9 +622,9 @@ void  LyXText::incDepth(BufferView * bview)
 		}
 		cursor.par()->params().depth(0);
 	}
-   
+
 	redoParagraphs(bview, selection.start, endpar);
-   
+
 	// we have to reset the selection, because the
 	// geometry could have changed
 	setCursor(bview, selection.start.par(), selection.start.pos());
@@ -631,7 +658,7 @@ void  LyXText::decDepth(BufferView * bview)
 	} else if (endpar) {
 		endpar = endpar->next(); // because of parindents etc.
 	}
-   
+
 	setUndo(bview, Undo::EDIT,
 		selection.start.par(), undoendpar);
 
@@ -653,7 +680,7 @@ void  LyXText::decDepth(BufferView * bview)
 	}
 
 	redoParagraphs(bview, selection.start, endpar);
-   
+
 	// we have to reset the selection, because the
 	// geometry could have changed
 	setCursor(bview, selection.start.par(),
@@ -675,34 +702,43 @@ void LyXText::setFont(BufferView * bview, LyXFont const & font, bool toggleall)
 		// Determine basis font
 		LyXFont layoutfont;
 		if (cursor.pos() < beginningOfMainBody(bview->buffer(),
-						       cursor.par()))
-			layoutfont = getFont(bview->buffer(), cursor.par(),-2);
-		else
-			layoutfont = getFont(bview->buffer(), cursor.par(),-1);
+						       cursor.par())) {
+			layoutfont = getLabelFont(bview->buffer(),
+						  cursor.par());
+		} else {
+			layoutfont = getLayoutFont(bview->buffer(),
+						   cursor.par());
+		}
 		// Update current font
-		real_current_font.update(font, toggleall);
+		real_current_font.update(font,
+					 bview->buffer()->params.language,
+					 toggleall);
 
 		// Reduce to implicit settings
 		current_font = real_current_font;
 		current_font.reduce(layoutfont);
 		// And resolve it completely
+#ifndef INHERIT_LANGUAGE
+		real_current_font.realize(layoutfont);
+#else
 		real_current_font.realize(layoutfont,
-		                          bview->buffer()->params.language);
+					  bview->buffer()->params.language);
+#endif
 		return;
 	}
 
 	LyXCursor tmpcursor = cursor; // store the current cursor
-   
+
 	// ok we have a selection. This is always between sel_start_cursor
 	// and sel_end cursor
-   
+
 	setUndo(bview, Undo::EDIT,
-		selection.start.par(),
-		selection.end.par()->next()); 
+		selection.start.par(), selection.end.par()->next());
 	freezeUndo();
 	cursor = selection.start;
 	while (cursor.par() != selection.end.par() ||
-	       (cursor.pos() < selection.end.pos())) {
+	       (cursor.pos() < selection.end.pos()))
+	{
 		if (cursor.pos() < cursor.par()->size()) {
 			// an open footnote should behave
 			// like a closed one
@@ -715,15 +751,15 @@ void LyXText::setFont(BufferView * bview, LyXFont const & font, bool toggleall)
 		}
 	}
 	unFreezeUndo();
-   
+
 	redoParagraphs(bview, selection.start, selection.end.par()->next());
-   
+
 	// we have to reset the selection, because the
-	// geometry could have changed
+	// geometry could have changed, but we keep
+	// it for user convenience
 	setCursor(bview, selection.start.par(), selection.start.pos());
 	selection.cursor = cursor;
 	setCursor(bview, selection.end.par(), selection.end.pos());
-	clearSelection();
 	setSelection(bview);
 	setCursor(bview, tmpcursor.par(), tmpcursor.pos(), true,
 		  tmpcursor.boundary());
@@ -736,14 +772,14 @@ void LyXText::redoHeightOfParagraph(BufferView * bview, LyXCursor const & cur)
 	int y = cur.y() - tmprow->baseline();
 
 	setHeightOfRow(bview, tmprow);
-	
+
 	while (tmprow->previous()
 	       && tmprow->previous()->par() == tmprow->par()) {
 		tmprow = tmprow->previous();
 		y -= tmprow->height();
 		setHeightOfRow(bview, tmprow);
 	}
-	
+
 	// we can set the refreshing parameters now
 	status(bview, LyXText::NEED_MORE_REFRESH);
 	refresh_y = y;
@@ -755,7 +791,7 @@ void LyXText::redoHeightOfParagraph(BufferView * bview, LyXCursor const & cur)
 void LyXText::redoDrawingOfParagraph(BufferView * bview, LyXCursor const & cur)
 {
 	Row * tmprow = cur.row();
-   
+
 	int y = cur.y() - tmprow->baseline();
 	setHeightOfRow(bview, tmprow);
 
@@ -776,24 +812,25 @@ void LyXText::redoDrawingOfParagraph(BufferView * bview, LyXCursor const & cur)
 
 
 // deletes and inserts again all paragaphs between the cursor
-// and the specified par 
+// and the specified par
 // This function is needed after SetLayout and SetFont etc.
 void LyXText::redoParagraphs(BufferView * bview, LyXCursor const & cur,
-                             Paragraph const * endpar) const
+			     Paragraph const * endpar) const
 {
 	Row * tmprow2;
 	Paragraph * tmppar = 0;
 	Paragraph * first_phys_par = 0;
-   
+
 	Row * tmprow = cur.row();
-   
+
 	int y = cur.y() - tmprow->baseline();
 
 	if (!tmprow->previous()) {
 		// a trick/hack for UNDO
-		// Can somebody please tell me _why_ this solves
-		// anything. (Lgb)
-		first_phys_par = firstParagraph();
+		// This is needed because in an UNDO/REDO we could have changed
+		// the ownerParagrah() so the paragraph inside the row is NOT
+		// my really first par anymore. Got it Lars ;) (Jug 20011206)
+		first_phys_par = ownerParagraph();
 	} else {
 		first_phys_par = tmprow->par();
 		while (tmprow->previous()
@@ -803,32 +840,33 @@ void LyXText::redoParagraphs(BufferView * bview, LyXCursor const & cur,
 			y -= tmprow->height();
 		}
 	}
-	
+
 	// we can set the refreshing parameters now
 	status(bview, LyXText::NEED_MORE_REFRESH);
 	refresh_y = y;
 	refresh_row = tmprow->previous();	 /* the real refresh row will
-	                                        be deleted, so I store
-	                                        the previous here */ 
+						be deleted, so I store
+						the previous here */
 	// remove it
 	if (tmprow->next())
 		tmppar = tmprow->next()->par();
 	else
 		tmppar = 0;
-	while (tmppar != endpar) {
+	while (tmprow->next() && tmppar != endpar) {
 		removeRow(tmprow->next());
-		if (tmprow->next())
+		if (tmprow->next()) {
 			tmppar = tmprow->next()->par();
-		else
+		} else {
 			tmppar = 0;
-	}  
-   
+		}
+	}
+
 	// remove the first one
 	tmprow2 = tmprow;     /* this is because tmprow->previous()
-	                         can be 0 */
+				 can be 0 */
 	tmprow = tmprow->previous();
 	removeRow(tmprow2);
-   
+
 	tmppar = first_phys_par;
 
 	do {
@@ -844,17 +882,17 @@ void LyXText::redoParagraphs(BufferView * bview, LyXCursor const & cur,
 			tmppar = tmppar->next();
 		}
 	} while (tmppar && tmppar != endpar);
-   
+
 	// this is because of layout changes
 	if (refresh_row) {
 		refresh_y -= refresh_row->height();
-		setHeightOfRow(bview, refresh_row);   
+		setHeightOfRow(bview, refresh_row);
 	} else {
 		refresh_row = firstrow;
 		refresh_y = 0;
-		setHeightOfRow(bview, refresh_row);   
+		setHeightOfRow(bview, refresh_row);
 	}
-   
+
 	if (tmprow && tmprow->next())
 		setHeightOfRow(bview, tmprow->next());
 }
@@ -881,7 +919,7 @@ bool LyXText::fullRebreak(BufferView * bview)
 /* the cursor set functions have a special mechanism. When they
  * realize, that you left an empty paragraph, they will delete it.
  * They also delete the corresponding row */
-   
+
 // need the selection cursor:
 void LyXText::setSelection(BufferView * bview)
 {
@@ -892,9 +930,9 @@ void LyXText::setSelection(BufferView * bview)
 		selection.start = selection.cursor;
 		selection.end = selection.cursor;
 	}
-   
+
 	selection.set(true);
-   
+
 	// first the toggling area
 	if (cursor.y() < last_sel_cursor.y()
 	    || (cursor.y() == last_sel_cursor.y()
@@ -905,9 +943,9 @@ void LyXText::setSelection(BufferView * bview)
 		toggle_end_cursor = cursor;
 		toggle_cursor = last_sel_cursor;
 	}
-   
+
 	last_sel_cursor = cursor;
-   
+
 	// and now the whole selection
 
 	if (selection.cursor.par() == cursor.par())
@@ -915,7 +953,7 @@ void LyXText::setSelection(BufferView * bview)
 			selection.end = cursor;
 			selection.start = selection.cursor;
 		} else {
-			selection.end = selection.cursor; 
+			selection.end = selection.cursor;
 			selection.start = cursor;
 		}
 	else if (selection.cursor.y() < cursor.y() ||
@@ -925,12 +963,12 @@ void LyXText::setSelection(BufferView * bview)
 		selection.start = selection.cursor;
 	}
 	else {
-		selection.end = selection.cursor; 
+		selection.end = selection.cursor;
 		selection.start = cursor;
 	}
-   
+
 	// a selection with no contents is not a selection
-	if (selection.start.par() == selection.end.par() && 
+	if (selection.start.par() == selection.end.par() &&
 	    selection.start.pos() == selection.end.pos())
 		selection.set(false);
 
@@ -939,40 +977,44 @@ void LyXText::setSelection(BufferView * bview)
 }
 
 
-string const LyXText::selectionAsString(Buffer const * buffer) const
+string const LyXText::selectionAsString(Buffer const * buffer,
+					bool label) const
 {
 	if (!selection.set()) return string();
 	string result;
-	
+
 	// Special handling if the whole selection is within one paragraph
 	if (selection.start.par() == selection.end.par()) {
 		result += selection.start.par()->asString(buffer,
 							  selection.start.pos(),
-							  selection.end.pos());
+							  selection.end.pos(),
+							  label);
 		return result;
 	}
-	
+
 	// The selection spans more than one paragraph
 
 	// First paragraph in selection
 	result += selection.start.par()->asString(buffer,
 						  selection.start.pos(),
-						  selection.start.par()->size())
+						  selection.start.par()->size(),
+						  label)
 		+ "\n\n";
-	
+
 	// The paragraphs in between (if any)
 	LyXCursor tmpcur(selection.start);
 	tmpcur.par(tmpcur.par()->next());
 	while (tmpcur.par() != selection.end.par()) {
 		result += tmpcur.par()->asString(buffer, 0,
-						 tmpcur.par()->size()) +"\n\n";
+						 tmpcur.par()->size(),
+						 label) + "\n\n";
 		tmpcur.par(tmpcur.par()->next());
 	}
 
 	// Last paragraph in selection
 	result += selection.end.par()->asString(buffer, 0,
-						selection.end.pos());
-	
+						selection.end.pos(), label);
+
 	return result;
 }
 
@@ -981,7 +1023,10 @@ void LyXText::clearSelection() const
 {
 	selection.set(false);
 	selection.mark(false);
-	selection.end = selection.start = selection.cursor = cursor;
+	last_sel_cursor = selection.end = selection.start = selection.cursor = cursor;
+	// reset this in the bv_owner!
+	if (bv_owner && bv_owner->text)
+		bv_owner->text->xsel_cache.set(false);
 }
 
 
@@ -1023,10 +1068,10 @@ void LyXText::cursorBottom(BufferView * bview) const
 		cursor.par(cursor.par()->next());
 	setCursor(bview, cursor.par(), cursor.par()->size());
 }
-   
-   
+
+
 void LyXText::toggleFree(BufferView * bview,
-                         LyXFont const & font, bool toggleall)
+			 LyXFont const & font, bool toggleall)
 {
 	// If the mask is completely neutral, tell user
 	if (font == LyXFont(LyXFont::ALL_IGNORE)) {
@@ -1036,11 +1081,11 @@ void LyXText::toggleFree(BufferView * bview,
 	}
 
 	// Try implicit word selection
-	// If there is a change in the language the implicit word selection 
+	// If there is a change in the language the implicit word selection
 	// is disabled.
 	LyXCursor resetCursor = cursor;
 	bool implicitSelection = (font.language() == ignore_language
-	                          && font.number() == LyXFont::IGNORE)
+				  && font.number() == LyXFont::IGNORE)
 		? selectWordWhenUnderCursor(bview, WHOLE_WORD_STRICT) : false;
 
 	// Set font
@@ -1059,13 +1104,12 @@ void LyXText::toggleFree(BufferView * bview,
 }
 
 
-string
-LyXText::getStringToIndex(BufferView * bview)
+string LyXText::getStringToIndex(BufferView * bview)
 {
 	string idxstring;
-	
+
 	// Try implicit word selection
-	// If there is a change in the language the implicit word selection 
+	// If there is a change in the language the implicit word selection
 	// is disabled.
 	LyXCursor resetCursor = cursor;
 	bool implicitSelection = selectWordWhenUnderCursor(bview, PREVIOUS_WORD);
@@ -1079,8 +1123,8 @@ LyXText::getStringToIndex(BufferView * bview)
 		return string();
 	}
 
-	idxstring = selectionAsString(bview->buffer());
-	
+	idxstring = selectionAsString(bview->buffer(), false);
+
 	// Implicit selections are cleared afterwards
 	//and cursor is set to the original position.
 	if (implicitSelection) {
@@ -1092,32 +1136,33 @@ LyXText::getStringToIndex(BufferView * bview)
 	return idxstring;
 }
 
-Paragraph::size_type
-LyXText::beginningOfMainBody(Buffer const * buf,
+
+pos_type LyXText::beginningOfMainBody(Buffer const * buf,
 			     Paragraph const * par) const
 {
-	if (textclasslist.Style(buf->params.textclass,
-				par->getLayout()).labeltype != LABEL_MANUAL)
+	if (textclasslist[buf->params.textclass][
+				par->layout()].labeltype != LABEL_MANUAL)
 		return 0;
 	else
 		return par->beginningOfMainBody();
 }
 
 
-/* the DTP switches for paragraphs. LyX will store them in the 
-* first physicla paragraph. When a paragraph is broken, the top settings 
-* rest, the bottom settings are given to the new one. So I can make shure, 
-* they do not duplicate themself and you cannnot make dirty things with 
-* them!  */ 
+/* the DTP switches for paragraphs. LyX will store them in the
+* first physicla paragraph. When a paragraph is broken, the top settings
+* rest, the bottom settings are given to the new one. So I can make shure,
+* they do not duplicate themself and you cannnot make dirty things with
+* them!  */
 
 void LyXText::setParagraph(BufferView * bview,
 			   bool line_top, bool line_bottom,
 			   bool pagebreak_top, bool pagebreak_bottom,
 			   VSpace const & space_top,
 			   VSpace const & space_bottom,
-			   LyXAlignment align, 
+			   Spacing const & spacing,
+			   LyXAlignment align,
 			   string labelwidthstring,
-			   bool noindent) 
+			   bool noindent)
 {
 	LyXCursor tmpcursor = cursor;
 	if (!selection.set()) {
@@ -1139,11 +1184,14 @@ void LyXText::setParagraph(BufferView * bview,
 		// because of parindents etc.
 		endpar = endpar->next();
 	}
-   
+
 	setUndo(bview, Undo::EDIT, selection.start.par(), undoendpar);
 
-	
+
 	Paragraph * tmppar = selection.end.par();
+	LyXTextClass const & tclass =
+		textclasslist[bview->buffer()->params.textclass];
+
 	while (tmppar != selection.start.par()->previous()) {
 		setCursor(bview, tmppar, 0);
 		status(bview, LyXText::NEED_MORE_REFRESH);
@@ -1155,17 +1203,14 @@ void LyXText::setParagraph(BufferView * bview,
 		cursor.par()->params().pagebreakBottom(pagebreak_bottom);
 		cursor.par()->params().spaceTop(space_top);
 		cursor.par()->params().spaceBottom(space_bottom);
+		cursor.par()->params().spacing(spacing);
 		// does the layout allow the new alignment?
+		LyXLayout const & layout = tclass[cursor.par()->layout()];
+
 		if (align == LYX_ALIGN_LAYOUT)
-			align = textclasslist
-				.Style(bview->buffer()->params.textclass,
-				       cursor.par()->getLayout()).align;
-		if (align & textclasslist
-		    .Style(bview->buffer()->params.textclass,
-			   cursor.par()->getLayout()).alignpossible) {
-			if (align == textclasslist
-			    .Style(bview->buffer()->params.textclass,
-				   cursor.par()->getLayout()).align)
+			align = layout.align;
+		if (align & layout.alignpossible) {
+			if (align == layout.align)
 				cursor.par()->params().align(LYX_ALIGN_LAYOUT);
 			else
 				cursor.par()->params().align(align);
@@ -1174,9 +1219,9 @@ void LyXText::setParagraph(BufferView * bview,
 		cursor.par()->params().noindent(noindent);
 		tmppar = cursor.par()->previous();
 	}
-	
+
 	redoParagraphs(bview, selection.start, endpar);
-	
+
 	clearSelection();
 	setCursor(bview, selection.start.par(), selection.start.pos());
 	selection.cursor = cursor;
@@ -1214,7 +1259,7 @@ char hebrewCounter(int n)
 {
 	static const char hebrew[22] = {
 		'à', 'á', 'â', 'ã', 'ä', 'å', 'æ', 'ç', 'è',
-		'é', 'ë', 'ì', 'î', 'ð', 'ñ', 'ò', 'ô', 'ö', 
+		'é', 'ë', 'ì', 'î', 'ð', 'ñ', 'ò', 'ô', 'ö',
 		'÷', 'ø', 'ù', 'ú'
 	};
 	if (n < 1 || n > 22)
@@ -1245,12 +1290,9 @@ string const romanCounter(int n)
 // set the counter of a paragraph. This includes the labels
 void LyXText::setCounter(Buffer const * buf, Paragraph * par) const
 {
-	LyXLayout const & layout =
-		textclasslist.Style(buf->params.textclass, 
-				    par->getLayout());
+	LyXTextClass const & textclass = textclasslist[buf->params.textclass];
+	LyXLayout const & layout = textclass[par->layout()];
 
-	LyXTextClass const & textclass =
-		textclasslist.TextClass(buf->params.textclass);
 
 	// copy the prev-counters to this one,
 	// unless this is the first paragraph
@@ -1263,14 +1305,14 @@ void LyXText::setCounter(Buffer const * buf, Paragraph * par) const
 			par->params().appendix(true);
 			for (int i = 0; i < 10; ++i) {
 				par->setCounter(i, 0);
-			}  
+			}
 		}
 		par->enumdepth = par->previous()->enumdepth;
 		par->itemdepth = par->previous()->itemdepth;
 	} else {
 		for (int i = 0; i < 10; ++i) {
 			par->setCounter(i, 0);
-		}  
+		}
 		par->params().appendix(par->params().startOfAppendix());
 		par->enumdepth = 0;
 		par->itemdepth = 0;
@@ -1285,9 +1327,7 @@ void LyXText::setCounter(Buffer const * buf, Paragraph * par) const
 	 */
 	if (par->previous()
 	    && par->previous()->getDepth() < par->getDepth()
-	    && textclasslist.Style(buf->params.textclass,
-				   par->previous()->getLayout()
-		    ).labeltype == LABEL_COUNTER_ENUMI
+	    && textclass[par->previous()->layout()].labeltype == LABEL_COUNTER_ENUMI
 	    && par->enumdepth < 3
 	    && layout.labeltype != LABEL_BIBLIO) {
 		par->enumdepth++;
@@ -1306,11 +1346,11 @@ void LyXText::setCounter(Buffer const * buf, Paragraph * par) const
 		for (int i = 6 + par->enumdepth + 1; i < 10; ++i)
 			par->setCounter(i, 0);
 	}
-   
+
 	if (!par->params().labelString().empty()) {
 		par->params().labelString(string());
 	}
-   
+
 	if (layout.margintype == MARGIN_MANUAL) {
 		if (par->params().labelWidthString().empty()) {
 			par->setLabelWidthString(layout.labelstring());
@@ -1318,21 +1358,21 @@ void LyXText::setCounter(Buffer const * buf, Paragraph * par) const
 	} else {
 		par->setLabelWidthString(string());
 	}
-   
+
 	// is it a layout that has an automatic label?
 	if (layout.labeltype >=  LABEL_COUNTER_CHAPTER) {
-      
+
 		int i = layout.labeltype - LABEL_COUNTER_CHAPTER;
 		if (i >= 0 && i<= buf->params.secnumdepth) {
-			par->incCounter(i);	// increment the counter  
-	 
+			par->incCounter(i);	// increment the counter
+
 			// Is there a label? Useful for Chapter layout
 			if (!par->params().appendix()) {
 				if (!layout.labelstring().empty())
 					par->params().labelString(layout.labelstring());
 				else
 					par->params().labelString(string());
-                        } else {
+			} else {
 				if (!layout.labelstring_appendix().empty())
 					par->params().labelString(layout.labelstring_appendix());
 				else
@@ -1361,7 +1401,7 @@ void LyXText::setCounter(Buffer const * buf, Paragraph * par) const
 					  << par->getCounter(i - 2) << '.'
 					  << par->getCounter(i - 1) << '.'
 					  << par->getCounter(i);
-					
+
 					break;
 				case LABEL_COUNTER_PARAGRAPH:
 					s << par->getCounter(i - 4) << '.'
@@ -1384,7 +1424,7 @@ void LyXText::setCounter(Buffer const * buf, Paragraph * par) const
 					// case it is, how can this be correct?
 					// (Lgb)
 					s << par->getCounter(i) << '.';
-                                        break;
+					break;
 				}
 			} else { // appendix
 				switch (2 * LABEL_COUNTER_CHAPTER - textclass.maxcounter() + i) {
@@ -1459,7 +1499,7 @@ void LyXText::setCounter(Buffer const * buf, Paragraph * par) const
 					// case it is, how can this be correct?
 					// (Lgb)
 					s << par->getCounter(i) << '.';
-					
+
 					break;
 				}
 			}
@@ -1467,7 +1507,7 @@ void LyXText::setCounter(Buffer const * buf, Paragraph * par) const
 			par->params().labelString(par->params().labelString() +s.str().c_str());
 			// We really want to remove the c_str as soon as
 			// possible...
-			
+
 			for (i++; i < 10; ++i) {
 				// reset the following counters
 				par->setCounter(i, 0);
@@ -1522,28 +1562,28 @@ void LyXText::setCounter(Buffer const * buf, Paragraph * par) const
 				// reset the following counters
 				par->setCounter(i, 0);
 			}
-			
-		} 
+
+		}
 	} else if (layout.labeltype == LABEL_BIBLIO) {// ale970302
 		int i = LABEL_COUNTER_ENUMI - LABEL_COUNTER_CHAPTER + par->enumdepth;
 		par->incCounter(i);
 		int number = par->getCounter(i);
 		if (!par->bibkey) {
-			InsetCommandParams p( "bibitem" );
+			InsetCommandParams p("bibitem" );
 			par->bibkey = new InsetBibKey(p);
 		}
 		par->bibkey->setCounter(number);
 		par->params().labelString(layout.labelstring());
-		
+
 		// In biblio should't be following counters but...
 	} else {
 		string s = layout.labelstring();
-		
+
 		// the caption hack:
 		if (layout.labeltype == LABEL_SENSITIVE) {
 			bool isOK (par->inInset() && par->inInset()->owner() &&
 				   (par->inInset()->owner()->lyxCode() == Inset::FLOAT_CODE));
-			
+
 			if (isOK) {
 				InsetFloat * tmp = static_cast<InsetFloat*>(par->inInset()->owner());
 				Floating const & fl
@@ -1551,16 +1591,16 @@ void LyXText::setCounter(Buffer const * buf, Paragraph * par) const
 				// We should get the correct number here too.
 				s = fl.name() + " #:";
 			} else {
-				/* par->SetLayout(0); 
+				/* par->SetLayout(0);
 				   s = layout->labelstring;  */
 				s = (par->getParLanguage(buf->params)->lang() == "hebrew")
 					? " :úåòîùî øñç" : "Senseless: ";
 			}
 		}
 		par->params().labelString(s);
-		
+
 		/* reset the enumeration counter. They are always resetted
-		 * when there is any other layout between */ 
+		 * when there is any other layout between */
 		for (int i = 6 + par->enumdepth; i < 10; ++i)
 			par->setCounter(i, 0);
 	}
@@ -1583,16 +1623,17 @@ void LyXText::updateCounters(BufferView * bview, Row * row) const
 	while (par) {
 		while (row->par() != par)
 			row = row->next();
-		
+
 		setCounter(bview->buffer(), par);
-		
+
 		// now check for the headline layouts. remember that they
 		// have a dynamic left margin
-		if ((textclasslist.Style(bview->buffer()->params.textclass,
-					 par->layout).margintype == MARGIN_DYNAMIC
-		     || textclasslist.Style(bview->buffer()->params.textclass,
-					    par->layout).labeltype == LABEL_SENSITIVE)) {
-			
+		LyXTextClass const & tclass =
+			textclasslist[bview->buffer()->params.textclass];
+		LyXLayout const & layout = tclass[par->layout()];
+
+		if (layout.margintype == MARGIN_DYNAMIC
+		    || layout.labeltype == LABEL_SENSITIVE) {
 			// Rebreak the paragraph
 			removeParagraph(row);
 			appendParagraph(bview, row);
@@ -1606,8 +1647,8 @@ void LyXText::insertInset(BufferView * bview, Inset * inset)
 {
 	if (!cursor.par()->insetAllowed(inset->lyxCode()))
 		return;
-	setUndo(bview, Undo::INSERT,
-		cursor.par(), cursor.par()->next());
+	// I don't know if this is necessary here (Jug 20020102)
+	setUndo(bview, Undo::INSERT, cursor.par(), cursor.par()->next());
 	cursor.par()->insertInset(cursor.pos(), inset);
 	// Just to rebreak and refresh correctly.
 	// The character will not be inserted a second time
@@ -1618,7 +1659,7 @@ void LyXText::insertInset(BufferView * bview, Inset * inset)
 	// inset now after the Undo LyX tries to call inset->Edit(...) again
 	// and cannot do this as the cursor is behind the inset and GetInset
 	// does not return the inset!
-	if (inset->editable() == Inset::HIGHLY_EDITABLE) {
+	if (isHighlyEditableInset(inset)) {
 		cursorLeft(bview, true);
 	}
 #endif
@@ -1627,7 +1668,7 @@ void LyXText::insertInset(BufferView * bview, Inset * inset)
 
 void LyXText::copyEnvironmentType()
 {
-	copylayouttype = cursor.par()->getLayout();
+	copylayouttype = cursor.par()->layout();
 }
 
 
@@ -1637,7 +1678,7 @@ void LyXText::pasteEnvironmentType(BufferView * bview)
 }
 
 
-void LyXText::cutSelection(BufferView * bview, bool doclear)
+void LyXText::cutSelection(BufferView * bview, bool doclear, bool realcut)
 {
 	// Stuff what we got on the clipboard. Even if there is no selection.
 
@@ -1647,19 +1688,19 @@ void LyXText::cutSelection(BufferView * bview, bool doclear)
 	// finished. The solution used currently just works, to make it
 	// faster we need to be more clever and probably also have more
 	// calls to stuffClipboard. (Lgb)
-	bview->stuffClipboard(selectionAsString(bview->buffer()));
+	bview->stuffClipboard(selectionAsString(bview->buffer(), true));
 
 	// This doesn't make sense, if there is no selection
 	if (!selection.set())
 		return;
-   
+
 	// OK, we have a selection. This is always between selection.start
 	// and selection.end
 
 	// make sure that the depth behind the selection are restored, too
 	Paragraph * endpar = selection.end.par()->next();
 	Paragraph * undoendpar = endpar;
-    
+
 	if (endpar && endpar->getDepth()) {
 		while (endpar && endpar->getDepth()) {
 			endpar = endpar->next();
@@ -1668,10 +1709,10 @@ void LyXText::cutSelection(BufferView * bview, bool doclear)
 	} else if (endpar) {
 		endpar = endpar->next(); // because of parindents etc.
 	}
-    
+
 	setUndo(bview, Undo::DELETE,
 		selection.start.par(), undoendpar);
-    
+
 	// there are two cases: cut only within one paragraph or
 	// more than one paragraph
 	if (selection.start.par() == selection.end.par()) {
@@ -1680,14 +1721,16 @@ void LyXText::cutSelection(BufferView * bview, bool doclear)
 		int pos = selection.end.pos();
 		CutAndPaste::cutSelection(selection.start.par(), &endpar,
 					  selection.start.pos(), pos,
-					  bview->buffer()->params.textclass, doclear);
+					  bview->buffer()->params.textclass,
+					  doclear, realcut);
 		selection.end.pos(pos);
 	} else {
 		endpar = selection.end.par();
 		int pos = selection.end.pos();
 		CutAndPaste::cutSelection(selection.start.par(), &endpar,
 					  selection.start.pos(), pos,
-					  bview->buffer()->params.textclass, doclear);
+					  bview->buffer()->params.textclass,
+					  doclear, realcut);
 		cursor.par(endpar);
 		selection.end.par(endpar);
 		selection.end.pos(pos);
@@ -1716,15 +1759,8 @@ void LyXText::cutSelection(BufferView * bview, bool doclear)
 
 void LyXText::copySelection(BufferView * bview)
 {
-	// Stuff what we got on the clipboard. Even if there is no selection.
-
-	// There is a problem with having the stuffing here in that the
-	// larger the selection the slower LyX will get. This can be
-	// solved by running the line below only when the selection has
-	// finished. The solution used currently just works, to make it
-	// faster we need to be more clever and probably also have more
-	// calls to stuffClipboard. (Lgb)
-	bview->stuffClipboard(selectionAsString(bview->buffer()));
+	// stuff the selection onto the X clipboard, from an explicit copy request
+	bview->stuffClipboard(selectionAsString(bview->buffer(), true));
 
 	// this doesnt make sense, if there is no selection
 	if (!selection.set())
@@ -1738,11 +1774,11 @@ void LyXText::copySelection(BufferView * bview)
 	       && selection.start.par()->isLineSeparator(selection.start.pos())
 	       && (selection.start.par() != selection.end.par()
 		   || selection.start.pos() < selection.end.pos()))
-		selection.start.pos(selection.start.pos() + 1); 
+		selection.start.pos(selection.start.pos() + 1);
 
 	CutAndPaste::copySelection(selection.start.par(), selection.end.par(),
-	                           selection.start.pos(), selection.end.pos(),
-	                           bview->buffer()->params.textclass);
+				   selection.start.pos(), selection.end.pos(),
+				   bview->buffer()->params.textclass);
 }
 
 
@@ -1753,20 +1789,20 @@ void LyXText::pasteSelection(BufferView * bview)
 		return;
 
 	setUndo(bview, Undo::INSERT,
-		cursor.par(), cursor.par()->next()); 
+		cursor.par(), cursor.par()->next());
 
 	Paragraph * endpar;
 	Paragraph * actpar = cursor.par();
-
 	int pos = cursor.pos();
+
 	CutAndPaste::pasteSelection(&actpar, &endpar, pos,
 				    bview->buffer()->params.textclass);
-    
+
 	redoParagraphs(bview, cursor, endpar);
-	
+
 	setCursor(bview, cursor.par(), cursor.pos());
 	clearSelection();
-   
+
 	selection.cursor = cursor;
 	setCursor(bview, actpar, pos);
 	setSelection(bview);
@@ -1774,19 +1810,12 @@ void LyXText::pasteSelection(BufferView * bview)
 }
 
 
-// returns a pointer to the very first Paragraph
-Paragraph * LyXText::firstParagraph() const
-{
-	return ownerParagraph();
-}
-
-
 // sets the selection over the number of characters of string, no check!!
 void LyXText::setSelectionOverString(BufferView * bview, string const & str)
 {
 	if (str.empty())
 		return;
-	
+
 	selection.cursor = cursor;
 	for (string::size_type i = 0; i < str.length(); ++i)
 		cursorRight(bview);
@@ -1807,7 +1836,7 @@ void LyXText::replaceSelectionWithString(BufferView * bview,
 	}
 
 	// Get font setting before we cut
-	Paragraph::size_type pos = selection.end.pos();
+	pos_type pos = selection.end.pos();
 	LyXFont const font = selection.start.par()
 		->getFontSettings(bview->buffer()->params,
 				  selection.start.pos());
@@ -1817,9 +1846,9 @@ void LyXText::replaceSelectionWithString(BufferView * bview,
 		selection.end.par()->insertChar(pos, (*cit), font);
 		++pos;
 	}
-	
+
 	// Cut the selection
-	cutSelection(bview);
+	cutSelection(bview, true, false);
 
 	unFreezeUndo();
 }
@@ -1829,14 +1858,14 @@ void LyXText::replaceSelectionWithString(BufferView * bview,
 void LyXText::insertStringAsLines(BufferView * bview, string const & str)
 {
 	Paragraph * par = cursor.par();
-	Paragraph::size_type pos = cursor.pos();
+	pos_type pos = cursor.pos();
 	Paragraph * endpar = cursor.par()->next();
-	
+
 	setCursorParUndo(bview);
-	
+
 	// only to be sure, should not be neccessary
 	clearSelection();
-	
+
 	bview->buffer()->insertStringAsLines(par, pos, current_font, str);
 
 	redoParagraphs(bview, cursor, endpar);
@@ -1864,7 +1893,7 @@ void LyXText::insertStringAsParagraphs(BufferView * bview, string const & str)
 			} else {
 				linestr[i] = ' ';
 				newline_inserted = true;
-			} 
+			}
 		} else if (IsPrintable(linestr[i])) {
 			newline_inserted = false;
 		}
@@ -1874,7 +1903,7 @@ void LyXText::insertStringAsParagraphs(BufferView * bview, string const & str)
 
 
 bool LyXText::gotoNextInset(BufferView * bview,
-			    std::vector<Inset::Code> const & codes,
+			    vector<Inset::Code> const & codes,
 			    string const & contents) const
 {
 	LyXCursor res = cursor;
@@ -1886,9 +1915,9 @@ bool LyXText::gotoNextInset(BufferView * bview,
 			res.par(res.par()->next());
 			res.pos(0);
 		}
-      
-	} while (res.par() && 
-		 !(res.par()->getChar(res.pos()) == Paragraph::META_INSET
+
+	} while (res.par() &&
+		 !(res.par()->isInset(res.pos())
 		   && (inset = res.par()->getInset(res.pos())) != 0
 		   && find(codes.begin(), codes.end(), inset->lyxCode())
 		   != codes.end()
@@ -1897,7 +1926,7 @@ bool LyXText::gotoNextInset(BufferView * bview,
 		       == contents)));
 
 	if (res.par()) {
-		setCursor(bview, res.par(), res.pos());
+		setCursor(bview, res.par(), res.pos(), false);
 		return true;
 	}
 	return false;
@@ -1905,14 +1934,14 @@ bool LyXText::gotoNextInset(BufferView * bview,
 
 
 void LyXText::checkParagraph(BufferView * bview, Paragraph * par,
-			     Paragraph::size_type pos)
+			     pos_type pos)
 {
-	LyXCursor tmpcursor;			
+	LyXCursor tmpcursor;
 
 	int y = 0;
-	Paragraph::size_type z;
+	pos_type z;
 	Row * row = getRow(par, pos, y);
-	
+
 	// is there a break one row above
 	if (row->previous() && row->previous()->par() == row->par()) {
 		z = nextBreakPoint(bview, row->previous(), workWidth(bview));
@@ -1922,9 +1951,9 @@ void LyXText::checkParagraph(BufferView * bview, Paragraph * par,
 			refresh_y = y;
 			refresh_row = row->previous();
 			status(bview, LyXText::NEED_MORE_REFRESH);
-			
+
 			breakAgain(bview, row->previous());
-			
+
 			// set the cursor again. Otherwise
 			// dangling pointers are possible
 			setCursor(bview, cursor.par(), cursor.pos(),
@@ -1935,49 +1964,50 @@ void LyXText::checkParagraph(BufferView * bview, Paragraph * par,
 	}
 
 	int const tmpheight = row->height();
-	Paragraph::size_type const tmplast = rowLast(row);
+	pos_type const tmplast = rowLast(row);
 	refresh_y = y;
 	refresh_row = row;
-	
+
 	breakAgain(bview, row);
 	if (row->height() == tmpheight && rowLast(row) == tmplast)
 		status(bview, LyXText::NEED_VERY_LITTLE_REFRESH);
 	else
-		status(bview, LyXText::NEED_MORE_REFRESH); 
-	
+		status(bview, LyXText::NEED_MORE_REFRESH);
+
 	// check the special right address boxes
-	if (textclasslist.Style(bview->buffer()->params.textclass,
-				par->getLayout()).margintype
-	    == MARGIN_RIGHT_ADDRESS_BOX) {
+	if (textclasslist[bview->buffer()->params.textclass][
+				par->layout()].margintype
+	    == MARGIN_RIGHT_ADDRESS_BOX)
+	{
 		tmpcursor.par(par);
 		tmpcursor.row(row);
 		tmpcursor.y(y);
 		tmpcursor.x(0);
 		tmpcursor.x_fix(0);
 		tmpcursor.pos(pos);
-		redoDrawingOfParagraph(bview, tmpcursor); 
+		redoDrawingOfParagraph(bview, tmpcursor);
 	}
 
 	// set the cursor again. Otherwise dangling pointers are possible
 	// also set the selection
-   
+
 	if (selection.set()) {
 		tmpcursor = cursor;
 		setCursorIntern(bview, selection.cursor.par(), selection.cursor.pos(),
 				false, selection.cursor.boundary());
-		selection.cursor = cursor; 
+		selection.cursor = cursor;
 		setCursorIntern(bview, selection.start.par(),
 				selection.start.pos(),
 				false, selection.start.boundary());
-		selection.start = cursor; 
+		selection.start = cursor;
 		setCursorIntern(bview, selection.end.par(),
 				selection.end.pos(),
 				false, selection.end.boundary());
-		selection.end = cursor; 
+		selection.end = cursor;
 		setCursorIntern(bview, last_sel_cursor.par(),
 				last_sel_cursor.pos(),
 				false, last_sel_cursor.boundary());
-		last_sel_cursor = cursor; 
+		last_sel_cursor = cursor;
 		cursor = tmpcursor;
 	}
 	setCursorIntern(bview, cursor.par(), cursor.pos(),
@@ -1990,52 +2020,66 @@ bool LyXText::updateInset(BufferView * bview, Inset * inset)
 {
 	// first check the current paragraph
 	int pos = cursor.par()->getPositionOfInset(inset);
-	if (pos != -1){
+	if (pos != -1) {
 		checkParagraph(bview, cursor.par(), pos);
 		return true;
 	}
-  
+
 	// check every paragraph
-  
-	Paragraph * par = firstParagraph();
+
+	Paragraph * par = ownerParagraph();
 	do {
 		pos = par->getPositionOfInset(inset);
-		if (pos != -1){
+		if (pos != -1) {
 			checkParagraph(bview, par, pos);
 			return true;
 		}
 		par = par->next();
 	} while (par);
-  
+
 	return false;
 }
 
 
-void LyXText::setCursor(BufferView * bview, Paragraph * par,
-			Paragraph::size_type pos, 
+bool LyXText::setCursor(BufferView * bview, Paragraph * par,
+			pos_type pos,
 			bool setfont, bool boundary) const
 {
 	LyXCursor old_cursor = cursor;
 	setCursorIntern(bview, par, pos, setfont, boundary);
-	deleteEmptyParagraphMechanism(bview, old_cursor);
+	return deleteEmptyParagraphMechanism(bview, old_cursor);
 }
 
 
-void LyXText::setCursor(BufferView *bview, LyXCursor & cur, Paragraph * par,
-			Paragraph::size_type pos, bool boundary) const
+void LyXText::setCursor(BufferView * bview, LyXCursor & cur, Paragraph * par,
+			pos_type pos, bool boundary) const
 {
+	lyx::Assert(par);
+	lyx::Assert(bview);
+
 	cur.par(par);
 	cur.pos(pos);
 	cur.boundary(boundary);
 
+#if 0
+	if (pos && par->getChar(pos) == Paragraph::META_INSET &&
+		par->getInset(pos)) {
+		Inset * ins = par->getInset(pos);
+		if (ins->needFullRow() || ins->display()) {
+			--pos;
+			boundary = true;
+		}
+	}
+#endif
+
 	// get the cursor y position in text
 	int y = 0;
 	Row * row = getRow(par, pos, y);
 	// y is now the beginning of the cursor row
 	y += row->baseline();
-	// y is now the cursor baseline 
+	// y is now the cursor baseline
 	cur.y(y);
-   
+
 	// now get the cursors x position
 	float x;
 	float fill_separator;
@@ -2043,19 +2087,23 @@ void LyXText::setCursor(BufferView *bview, LyXCursor & cur, Paragraph * par,
 	float fill_label_hfill;
 	prepareToPrint(bview, row, x, fill_separator, fill_hfill,
 		       fill_label_hfill);
-	Paragraph::size_type cursor_vpos = 0;
-	Paragraph::size_type last = rowLastPrintable(row);
+	pos_type cursor_vpos = 0;
+	pos_type last = rowLastPrintable(row);
 
-	if (pos > last + 1)   // This shouldn't happen.
+	if (pos > last + 1) {
+		// This shouldn't happen.
 		pos = last + 1;
-	else if (pos < row->pos())
+		cur.pos(pos);
+	} else if (pos < row->pos()) {
 		pos = row->pos();
+		cur.pos(pos);
+	}
 
 	if (last < row->pos())
-                cursor_vpos = row->pos();
+		cursor_vpos = row->pos();
 	else if (pos > last && !boundary)
 		cursor_vpos = (row->par()->isRightToLeftPar(bview->buffer()->params))
-			? row->pos() : last + 1; 
+			? row->pos() : last + 1;
 	else if (pos > row->pos() &&
 		 (pos > last || boundary))
 		/// Place cursor after char at (logical) position pos - 1
@@ -2065,24 +2113,23 @@ void LyXText::setCursor(BufferView *bview, LyXCursor & cur, Paragraph * par,
 		/// Place cursor before char at (logical) position pos
 		cursor_vpos = (bidi_level(pos) % 2 == 0)
 			? log2vis(pos) : log2vis(pos) + 1;
-	
-	Paragraph::size_type main_body =
+
+	pos_type main_body =
 		beginningOfMainBody(bview->buffer(), row->par());
 	if ((main_body > 0) &&
-	    ((main_body-1 > last) || 
+	    ((main_body-1 > last) ||
 	     !row->par()->isLineSeparator(main_body-1)))
 		main_body = 0;
-	
-	for (Paragraph::size_type vpos = row->pos();
-	     vpos < cursor_vpos; ++vpos) {
+
+	for (pos_type vpos = row->pos(); vpos < cursor_vpos; ++vpos) {
 		pos = vis2log(vpos);
 		if (main_body > 0 && pos == main_body - 1) {
 			x += fill_label_hfill +
-				lyxfont::width(textclasslist.Style(
-					bview->buffer()->params.textclass,
-					row->par()->getLayout())
+				lyxfont::width(textclasslist[
+						       bview->buffer()->params.textclass][
+					row->par()->layout()]
 					       .labelsep,
-					       getFont(bview->buffer(), row->par(), -2));
+					       getLabelFont(bview->buffer(), row->par()));
 			if (row->par()->isLineSeparator(main_body-1))
 				x -= singleWidth(bview, row->par(),main_body-1);
 		}
@@ -2090,7 +2137,7 @@ void LyXText::setCursor(BufferView *bview, LyXCursor & cur, Paragraph * par,
 			x += singleWidth(bview, row->par(), pos);
 			if (pos >= main_body)
 				x += fill_hfill;
-			else 
+			else
 				x += fill_label_hfill;
 		} else if (row->par()->isSeparator(pos)) {
 			x += singleWidth(bview, row->par(), pos);
@@ -2099,32 +2146,51 @@ void LyXText::setCursor(BufferView *bview, LyXCursor & cur, Paragraph * par,
 		} else
 			x += singleWidth(bview, row->par(), pos);
 	}
-	
+
 	cur.x(int(x));
-   	cur.x_fix(cur.x());
+	cur.x_fix(cur.x());
 	cur.row(row);
 }
 
 
 void LyXText::setCursorIntern(BufferView * bview, Paragraph * par,
-			      Paragraph::size_type pos,
-			      bool setfont, bool boundary) const
+			      pos_type pos, bool setfont, bool boundary) const
 {
 	InsetText * it = static_cast<InsetText *>(par->inInset());
-	if (it && (it != inset_owner)) {
-		it->getLyXText(bview)->setCursorIntern(bview, par, pos, setfont,
-						       boundary);
-	} else {
-		setCursor(bview, cursor, par, pos, boundary);
-		if (setfont)
-			setCurrentFont(bview);
+	if (it) {
+		if (it != inset_owner) {
+			lyxerr[Debug::INSETS] << "InsetText   is " << it
+					      << endl
+					      << "inset_owner is "
+					      << inset_owner << endl;
+#ifdef WITH_WARNINGS
+#warning I believe this code is wrong. (Lgb)
+#warning Jürgen, have a look at this. (Lgb)
+#warning Hmmm, I guess you are right but we
+#warning should verify when this is needed
+#endif
+			// Jürgen, would you like to have a look?
+			// I guess we need to move the outer cursor
+			// and open and lock the inset (bla bla bla)
+			// stuff I don't know... so can you have a look?
+			// (Lgb)
+			// I moved the lyxerr stuff in here so we can see if
+			// this is actually really needed and where!
+			// (Jug)
+			// it->getLyXText(bview)->setCursorIntern(bview, par, pos, setfont, boundary);
+			return;
+		}
 	}
+
+	setCursor(bview, cursor, par, pos, boundary);
+	if (setfont)
+		setCurrentFont(bview);
 }
 
 
 void LyXText::setCurrentFont(BufferView * bview) const
 {
-	Paragraph::size_type pos = cursor.pos();
+	pos_type pos = cursor.pos();
 	if (cursor.boundary() && pos > 0)
 		--pos;
 
@@ -2134,7 +2200,7 @@ void LyXText::setCurrentFont(BufferView * bview) const
 		else // potentional bug... BUG (Lgb)
 			if (cursor.par()->isSeparator(pos)) {
 				if (pos > cursor.row()->pos() &&
-				    bidi_level(pos) % 2 == 
+				    bidi_level(pos) % 2 ==
 				    bidi_level(pos - 1) % 2)
 					--pos;
 				else if (pos + 1 < cursor.par()->size())
@@ -2163,23 +2229,7 @@ void LyXText::setCursorFromCoordinates(BufferView * bview, int x, int y) const
 {
 	LyXCursor old_cursor = cursor;
 
-#if 0
-	// Get the row first. 
-   
-	Row * row = getRowNearY(y);
-
-	bool bound = false;
-	int column = getColumnNearX(bview, row, x, bound);
-
-	cursor.par(row->par());
-	cursor.pos(row->pos() + column);
-	cursor.x(x);
-	cursor.y(y + row->baseline());
-	cursor.row(row);
-	cursor.boundary(bound);
-#else
 	setCursorFromCoordinates(bview, cursor, x, y);
-#endif
 	setCurrentFont(bview);
 	deleteEmptyParagraphMechanism(bview, old_cursor);
 }
@@ -2189,16 +2239,15 @@ void LyXText::setCursorFromCoordinates(BufferView * bview, LyXCursor & cur,
 				       int x, int y) const
 {
 	// Get the row first.
-   
+
 	Row * row = getRowNearY(y);
 	bool bound = false;
-	int const column = getColumnNearX(bview, row, x, bound);
-   
+	pos_type const column = getColumnNearX(bview, row, x, bound);
 	cur.par(row->par());
 	cur.pos(row->pos() + column);
 	cur.x(x);
 	cur.y(y + row->baseline());
-   	cur.row(row);
+	cur.row(row);
 	cur.boundary(bound);
 }
 
@@ -2235,14 +2284,14 @@ void LyXText::cursorRight(BufferView * bview, bool internal) const
 
 void LyXText::cursorUp(BufferView * bview) const
 {
-	setCursorFromCoordinates(bview, cursor.x_fix(), 
+	setCursorFromCoordinates(bview, cursor.x_fix(),
 				 cursor.y() - cursor.row()->baseline() - 1);
 }
 
 
 void LyXText::cursorDown(BufferView * bview) const
 {
-	setCursorFromCoordinates(bview, cursor.x_fix(), 
+	setCursorFromCoordinates(bview, cursor.x_fix(),
 				 cursor.y() - cursor.row()->baseline()
 				 + cursor.row()->height() + 1);
 }
@@ -2268,20 +2317,42 @@ void LyXText::cursorDownParagraph(BufferView * bview) const
 	}
 }
 
+// fix the cursor `cur' after a characters has been deleted at `where'
+// position. Called by deleteEmptyParagraphMechanism
+void LyXText::fixCursorAfterDelete(BufferView * bview,
+				   LyXCursor & cur,
+				   LyXCursor const & where) const
+{
+	// if cursor is not in the paragraph where the delete occured,
+	// do nothing
+	if (cur.par() != where.par())
+		return;
+
+	// if cursor position is after the place where the delete occured,
+	// update it
+	if (cur.pos() > where.pos())
+		cur.pos(cur.pos()-1);
 
-void LyXText::deleteEmptyParagraphMechanism(BufferView * bview,
+	// recompute row et al. for this cursor
+	setCursor(bview, cur, cur.par(), cur.pos(), cur.boundary());
+}
+
+
+bool LyXText::deleteEmptyParagraphMechanism(BufferView * bview,
 					    LyXCursor const & old_cursor) const
 {
 	// Would be wrong to delete anything if we have a selection.
-	if (selection.set()) return;
+	if (selection.set())
+		return false;
 
 	// We allow all kinds of "mumbo-jumbo" when freespacing.
-	if (textclasslist.Style(bview->buffer()->params.textclass,
-				old_cursor.par()->getLayout()).free_spacing)
-		return;
+	if (textclasslist[bview->buffer()->params.textclass][
+				old_cursor.par()->layout()].free_spacing
+	    || old_cursor.par()->isFreeSpacing())
+	{
+		return false;
+	}
 
-	bool deleted = false;
-	
 	/* Ok I'll put some comments here about what is missing.
 	   I have fixed BackSpace (and thus Delete) to not delete
 	   double-spaces automagically. I have also changed Cut,
@@ -2306,135 +2377,151 @@ void LyXText::deleteEmptyParagraphMechanism(BufferView * bview,
 	// MISSING
 
 	// If the pos around the old_cursor were spaces, delete one of them.
-	if (old_cursor.par() != cursor.par() || old_cursor.pos() != cursor.pos()) { 
+	if (old_cursor.par() != cursor.par()
+	    || old_cursor.pos() != cursor.pos()) {
 		// Only if the cursor has really moved
-		
+
 		if (old_cursor.pos() > 0
 		    && old_cursor.pos() < old_cursor.par()->size()
 		    && old_cursor.par()->isLineSeparator(old_cursor.pos())
 		    && old_cursor.par()->isLineSeparator(old_cursor.pos() - 1)) {
 			old_cursor.par()->erase(old_cursor.pos() - 1);
 			redoParagraphs(bview, old_cursor, old_cursor.par()->next());
-			// correct cursor
-			if (old_cursor.par() == cursor.par() &&
-			    cursor.pos() > old_cursor.pos()) {
-				setCursorIntern(bview, cursor.par(),
-						cursor.pos() - 1);
-			} else
-				setCursorIntern(bview, cursor.par(),
-						cursor.pos());
-			return;
+
+#ifdef WITH_WARNINGS
+#warning This will not work anymore when we have multiple views of the same buffer
+// In this case, we will have to correct also the cursors held by
+// other bufferviews. It will probably be easier to do that in a more
+// automated way in LyXCursor code. (JMarc 26/09/2001)
+#endif
+			// correct all cursors held by the LyXText
+			fixCursorAfterDelete(bview, cursor, old_cursor);
+			fixCursorAfterDelete(bview, selection.cursor,
+					     old_cursor);
+			fixCursorAfterDelete(bview, selection.start,
+					     old_cursor);
+			fixCursorAfterDelete(bview, selection.end, old_cursor);
+			fixCursorAfterDelete(bview, last_sel_cursor,
+					     old_cursor);
+			fixCursorAfterDelete(bview, toggle_cursor, old_cursor);
+			fixCursorAfterDelete(bview, toggle_end_cursor,
+					     old_cursor);
+			return false;
 		}
 	}
 
+	// don't delete anything if this is the ONLY paragraph!
+	if (!old_cursor.par()->next() && !old_cursor.par()->previous())
+		return false;
+
 	// Do not delete empty paragraphs with keepempty set.
-	if ((textclasslist.Style(bview->buffer()->params.textclass,
-				 old_cursor.par()->getLayout())).keepempty)
-		return;
+	if (textclasslist
+	    [bview->buffer()->params.textclass]
+	    [old_cursor.par()->layout()].keepempty)
+		return false;
 
-	LyXCursor tmpcursor;
+	// only do our magic if we changed paragraph
+	if (old_cursor.par() == cursor.par())
+		return false;
 
-	if (old_cursor.par() != cursor.par()) {
-		if ((old_cursor.par()->size() == 0
-		     || (old_cursor.par()->size() == 1
-			 && old_cursor.par()->isLineSeparator(0)))) {
-			// ok, we will delete anything
-			
-			// make sure that you do not delete any environments
-			status(bview, LyXText::NEED_MORE_REFRESH);
-			deleted = true;
-				
-			if (old_cursor.row()->previous()) {
-				refresh_row = old_cursor.row()->previous();
-				refresh_y = old_cursor.y() - old_cursor.row()->baseline() - refresh_row->height();
-				tmpcursor = cursor;
-				cursor = old_cursor; // that undo can restore the right cursor position
-				Paragraph * endpar = old_cursor.par()->next();
-				if (endpar && endpar->getDepth()) {
-					while (endpar && endpar->getDepth()) {
-						endpar = endpar->next();
-					}
-				}
-				setUndo(bview, Undo::DELETE,
-					old_cursor.par(),
-					endpar);
-				cursor = tmpcursor;
-
-				// delete old row
-				removeRow(old_cursor.row());
-				if (ownerParagraph() == old_cursor.par()) {
-					ownerParagraph(ownerParagraph()->next());
-				}
-				// delete old par
-				delete old_cursor.par();
-					
-				/* Breakagain the next par. Needed
-				 * because of the parindent that
-				 * can occur or dissappear. The
-				 * next row can change its height,
-				 * if there is another layout before */
-				if (refresh_row->next()) {
-					breakAgain(bview, refresh_row->next());
-					updateCounters(bview, refresh_row);
-				}
-				setHeightOfRow(bview, refresh_row);
-			} else {
-				refresh_row = old_cursor.row()->next();
-				refresh_y = old_cursor.y() - old_cursor.row()->baseline();
-					
-				tmpcursor = cursor;
-				cursor = old_cursor; // that undo can restore the right cursor position
-				Paragraph * endpar = old_cursor.par()->next();
-				if (endpar && endpar->getDepth()) {
-					while (endpar && endpar->getDepth()) {
-						endpar = endpar->next();
-					}
-				}
-				setUndo(bview, Undo::DELETE,
-					old_cursor.par(),
-					endpar);
-				cursor = tmpcursor;
-
-				// delete old row
-				removeRow(old_cursor.row());
-				// delete old par
-				if (ownerParagraph() == old_cursor.par()) {
-					ownerParagraph(ownerParagraph()->next());
+	// record if we have deleted a paragraph
+	// we can't possibly have deleted a paragraph before this point
+	bool deleted = false;
+
+	if ((old_cursor.par()->size() == 0
+	     || (old_cursor.par()->size() == 1
+		 && old_cursor.par()->isLineSeparator(0)))) {
+		// ok, we will delete anything
+		LyXCursor tmpcursor;
+
+		// make sure that you do not delete any environments
+		status(bview, LyXText::NEED_MORE_REFRESH);
+		deleted = true;
+
+		if (old_cursor.row()->previous()) {
+			refresh_row = old_cursor.row()->previous();
+			refresh_y = old_cursor.y() - old_cursor.row()->baseline() - refresh_row->height();
+			tmpcursor = cursor;
+			cursor = old_cursor; // that undo can restore the right cursor position
+			Paragraph * endpar = old_cursor.par()->next();
+			if (endpar && endpar->getDepth()) {
+				while (endpar && endpar->getDepth()) {
+					endpar = endpar->next();
 				}
+			}
+			setUndo(bview, Undo::DELETE, old_cursor.par(), endpar);
+			cursor = tmpcursor;
 
-				delete old_cursor.par();
-					
-				/* Breakagain the next par. Needed
-				   because of the parindent that can
-				   occur or dissappear.
-				   The next row can change its height,
-				   if there is another layout before
-				*/ 
-				if (refresh_row) {
-					breakAgain(bview, refresh_row);
-					updateCounters(bview, refresh_row->previous());
+			// delete old row
+			removeRow(old_cursor.row());
+			if (ownerParagraph() == old_cursor.par()) {
+				ownerParagraph(ownerParagraph()->next());
+			}
+			// delete old par
+			delete old_cursor.par();
+
+			/* Breakagain the next par. Needed because of
+			 * the parindent that can occur or dissappear.
+			 * The next row can change its height, if
+			 * there is another layout before */
+			if (refresh_row->next()) {
+				breakAgain(bview, refresh_row->next());
+				updateCounters(bview, refresh_row);
+			}
+			setHeightOfRow(bview, refresh_row);
+		} else {
+			refresh_row = old_cursor.row()->next();
+			refresh_y = old_cursor.y() - old_cursor.row()->baseline();
+
+			tmpcursor = cursor;
+			cursor = old_cursor; // that undo can restore the right cursor position
+			Paragraph * endpar = old_cursor.par()->next();
+			if (endpar && endpar->getDepth()) {
+				while (endpar && endpar->getDepth()) {
+					endpar = endpar->next();
 				}
 			}
-				
-				// correct cursor y
+			setUndo(bview, Undo::DELETE, old_cursor.par(), endpar);
+			cursor = tmpcursor;
+
+			// delete old row
+			removeRow(old_cursor.row());
+			// delete old par
+			if (ownerParagraph() == old_cursor.par()) {
+				ownerParagraph(ownerParagraph()->next());
+			}
 
-			setCursorIntern(bview, cursor.par(), cursor.pos());
+			delete old_cursor.par();
 
-			if (selection.cursor.par()  == old_cursor.par()
-			    && selection.cursor.pos() == selection.cursor.pos()) {
-				// correct selection
-				selection.cursor = cursor;
+			/* Breakagain the next par. Needed because of
+			   the parindent that can occur or dissappear.
+			   The next row can change its height, if
+			   there is another layout before */
+			if (refresh_row) {
+				breakAgain(bview, refresh_row);
+				updateCounters(bview, refresh_row->previous());
 			}
 		}
-		if (!deleted) {
-			if (old_cursor.par()->stripLeadingSpaces(bview->buffer()->params.textclass)) {
-				redoParagraphs(bview, old_cursor, old_cursor.par()->next());
-				// correct cursor y
-				setCursorIntern(bview, cursor.par(), cursor.pos());
-				selection.cursor = cursor;
-			}
+
+		// correct cursor y
+		setCursorIntern(bview, cursor.par(), cursor.pos());
+
+		if (selection.cursor.par()  == old_cursor.par()
+		    && selection.cursor.pos() == old_cursor.pos()) {
+			// correct selection
+			selection.cursor = cursor;
 		}
 	}
+	if (!deleted) {
+		if (old_cursor.par()->stripLeadingSpaces(bview->buffer()->params.textclass)) {
+			redoParagraphs(bview, old_cursor,
+				       old_cursor.par()->next());
+			// correct cursor y
+			setCursorIntern(bview, cursor.par(), cursor.pos());
+			selection.cursor = cursor;
+		}
+	}
+	return deleted;
 }
 
 
@@ -2444,11 +2531,11 @@ void LyXText::toggleAppendix(BufferView * bview)
 	bool start = !par->params().startOfAppendix();
 
 	// ensure that we have only one start_of_appendix in this document
-	Paragraph * tmp = firstParagraph();
+	Paragraph * tmp = ownerParagraph();
 	for (; tmp; tmp = tmp->next()) {
 		tmp->params().startOfAppendix(false);
 	}
-	
+
 	par->params().startOfAppendix(start);
 
 	// we can set the refreshing parameters now
@@ -2469,29 +2556,24 @@ Paragraph * LyXText::ownerParagraph() const
 }
 
 
-Paragraph * LyXText::ownerParagraph(Paragraph * p) const
+void LyXText::ownerParagraph(Paragraph * p) const
 {
 	if (inset_owner) {
 		inset_owner->paragraph(p);
 	} else {
 		bv_owner->buffer()->paragraph = p;
 	}
-	return 0;
 }
 
-Paragraph * LyXText::ownerParagraph(int id, Paragraph * p) const
+
+void LyXText::ownerParagraph(int id, Paragraph * p) const
 {
 	Paragraph * op = bv_owner->buffer()->getParFromID(id);
 	if (op && op->inInset()) {
 		static_cast<InsetText *>(op->inInset())->paragraph(p);
 	} else {
-		if (inset_owner) {
-			inset_owner->paragraph(p);
-		} else {
-			bv_owner->buffer()->paragraph = p;
-		}
+		ownerParagraph(p);
 	}
-	return 0;
 }
 
 
@@ -2503,20 +2585,6 @@ LyXText::text_status LyXText::status() const
 
 void LyXText::status(BufferView * bview, LyXText::text_status st) const
 {
-#if 0
-	if ((status_ != NEED_MORE_REFRESH)
-	    || (status_ == NEED_MORE_REFRESH)
-	    && (st != NEED_VERY_LITTLE_REFRESH)) {
-		status_ = st;
-		if (inset_owner && st != UNCHANGED) {
-			bview->text->status(bview, NEED_VERY_LITTLE_REFRESH);
-		}
-	}
-#else
-#warning Please tell what the intention is here. (Lgb)
-	// The above does not make any sense, I changed it to what is here,
-	// but it still does not make much sense. (Lgb)
-#warning Sure have a look now! (Jug)
 	// well as much as I know && binds more then || so the above and the
 	// below are identical (this for your known use of parentesis!)
 	// Now some explanation:
@@ -2544,5 +2612,4 @@ void LyXText::status(BufferView * bview, LyXText::text_status st) const
 			}
 		}
 	}
-#endif
 }