X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftext2.C;h=d0e6bd231e73aa04da8d46e2305bf204da596d49;hb=eb6a0ad551e44d23f9bc3a346e3484b2f89720ef;hp=a33a829bac268b1821963c2ce114c21500955c4b;hpb=b33a63e177780199ed93c0417db41ae2fa7c9a36;p=lyx.git

diff --git a/src/text2.C b/src/text2.C
index a33a829bac..d0e6bd231e 100644
--- a/src/text2.C
+++ b/src/text2.C
@@ -17,18 +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 "undo_funcs.h"
 #include "buffer.h"
 #include "bufferparams.h"
-#include "lyx_gui_misc.h"
 #include "gettext.h"
 #include "BufferView.h"
 #include "LyXView.h"
@@ -37,15 +30,28 @@
 #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)
@@ -65,9 +71,21 @@ LyXText::LyXText(InsetText * inset)
 	   copylayouttype(0)
 {}
 
-void LyXText::init(BufferView * bview)
+void LyXText::init(BufferView * bview, bool reinit)
 {
-	if (firstrow)
+	if (reinit) {
+		// Delete all rows, this does not touch the paragraphs!
+		Row * tmprow = firstrow;
+		while (firstrow) {
+			tmprow = firstrow->next();
+			delete firstrow;
+			firstrow = tmprow;
+		}
+		lastrow = refresh_row = need_break_row = 0;
+		width = height = copylayouttype = 0;
+		number_of_rows = first = refresh_y = 0;
+		status_ = LyXText::UNCHANGED;
+	} else if (firstrow)
 		return;
 
 	Paragraph * par = ownerParagraph();
@@ -93,6 +111,46 @@ 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.
+					Style(buf->params.textclass,
+					      par->getLayout()).font);
+#else
+			tmpfont.realize(textclasslist.
+					Style(buf->params.textclass,
+					      par->getLayout()).font,
+					buf->params.language);
+#endif
+			par_depth = par->getDepth();
+		}
+	}
+
+#ifndef INHERIT_LANGUAGE
+	tmpfont.realize(textclasslist.TextClass(buf->params.textclass).defaultfont());
+#else
+	tmpfont.realize(textclasslist.TextClass(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
@@ -101,95 +159,108 @@ 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
 {
+	lyx::Assert(pos >= 0);
+	
 	LyXLayout const & layout = 
 		textclasslist.Style(buf->params.textclass, par->getLayout());
-
+	
 	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);
-			} else {
-				LyXFont f = par->getFontSettings(buf->params, pos);
-				return f.realize(layout.resfont);
-			}
-			
+		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;
-
-	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);
+	
+	LyXFont layoutfont;
+	
+	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);
-			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.Style(buf->params.textclass, par->getLayout());
+
+	Paragraph::depth_type par_depth = par->getDepth();
+
+	if (!par_depth) {
+		return layout.resfont;
 	}
 
-	tmpfont.realize(textclasslist.TextClass(buf->params.textclass).defaultfont());
+	return realizeFont(layout.font, buf, par);
+}
 
-	return tmpfont;
+
+LyXFont const LyXText::getLabelFont(Buffer const * buf, Paragraph * par) const
+{
+	LyXLayout const & layout = 
+		textclasslist.Style(buf->params.textclass, par->getLayout());
+
+	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,
+                          pos_type pos, LyXFont const & fnt,
                           bool toggleall)
 {
 	Buffer const * buf = bv->buffer();
 	LyXFont font = getFont(buf, par, pos);
 	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::HIGHLY_EDITABLE) {
-				UpdatableInset * uinset =
-					static_cast<UpdatableInset *>(inset);
-				uinset->setFont(bv, fnt, toggleall, true);
-			}
-			font = inset->convertFont(font);
+		if (isEditableInset(inset)) {
+			UpdatableInset * uinset =
+				static_cast<UpdatableInset *>(inset);
+			uinset->setFont(bv, fnt, toggleall, true);
 		}
 	}
 
@@ -206,18 +277,30 @@ void LyXText::setCharFont(BufferView * bv, 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(textclasslist.
-						   Style(buf->params.textclass,
+				                   Style(buf->params.textclass,
 							 tp->getLayout()).font);
+#else
+				layoutfont.realize(textclasslist.
+				                   Style(buf->params.textclass,
+				                         tp->getLayout()).font,
+				                   buf->params.language);
+#endif
 		}
 	}
 
+#ifndef INHERIT_LANGUAGE
 	layoutfont.realize(textclasslist.TextClass(buf->params.textclass).defaultfont());
+#else
+	layoutfont.realize(textclasslist.TextClass(buf->params.textclass).defaultfont(),
+	                   buf->params.language);
+#endif
 
 	// Now, reduce font against full layout font
 	font.reduce(layoutfont);
@@ -227,13 +310,9 @@ void LyXText::setCharFont(BufferView * bv, Paragraph * par,
 
 
 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,
@@ -248,18 +327,30 @@ 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(textclasslist.
-						   Style(buf->params.textclass,
+				                   Style(buf->params.textclass,
 							 tp->getLayout()).font);
+#else
+				layoutfont.realize(textclasslist.
+				                   Style(buf->params.textclass,
+				                         tp->getLayout()).font,
+				                   buf->params.language);
+#endif
 		}
 	}
 
+#ifndef INHERIT_LANGUAGE
 	layoutfont.realize(textclasslist.TextClass(buf->params.textclass).defaultfont());
+#else
+	layoutfont.realize(textclasslist.TextClass(buf->params.textclass).defaultfont(),
+	                   buf->params.language);
+#endif
 
 	// Now, reduce font against full layout font
 	font.reduce(layoutfont);
@@ -271,7 +362,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) {
@@ -303,22 +394,24 @@ 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;
@@ -343,10 +436,10 @@ void LyXText::removeParagraph(Row * row) const
 
 // 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
    
@@ -360,20 +453,47 @@ void LyXText::insertParagraph(BufferView * bview, Paragraph * par,
 	}
 }
 
-void LyXText::openStuff(BufferView * bview)
+
+Inset * LyXText::getInset() const
 {
-     	if (cursor.pos() == 0 && cursor.par()->bibkey){
-		cursor.par()->bibkey->edit(bview, 0, 0, 0);
+	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) {
-		Inset * inset = cursor.par()->getInset(cursor.pos());
-		if (!inset->editable())
-			return;
-		bview->owner()->message(inset->editMessage());
-		if (inset->editable() != Inset::HIGHLY_EDITABLE)
-			setCursorParUndo(bview);
-		inset->edit(bview, 0, 0, 0);
+		   && cursor.par()->isInset(cursor.pos())) {
+		inset = cursor.par()->getInset(cursor.pos());
 	}
+	return inset;
+}
+
+
+void LyXText::toggleInset(BufferView * bview)
+{
+	Inset * inset = getInset();
+	// 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 (!isHighlyEditableInset(inset))
+		setCursorParUndo(bview);
+
+	if (inset->isOpen()) {
+		inset->close(bview);
+	} else {
+		inset->open(bview);
+	}
+#if 0
+	inset->open(bview, !inset->isOpen());
+#endif
 }
 
 
@@ -385,15 +505,14 @@ void LyXText::makeFontEntriesLayoutSpecific(Buffer const * buf,
 	LyXLayout const & layout =
 		textclasslist.Style(buf->params.textclass, par->getLayout());
 
-	LyXFont layoutfont, tmpfont;
-	for (Paragraph::size_type pos = 0;
-	     pos < par->size(); ++pos) {
+	LyXFont layoutfont;
+	for (pos_type pos = 0; pos < par->size(); ++pos) {
 		if (pos < beginningOfMainBody(buf, par))
 			layoutfont = layout.labelfont;
 		else
 			layoutfont = layout.font;
       
-		tmpfont = par->getFontSettings(buf->params, pos);
+		LyXFont tmpfont = par->getFontSettings(buf->params, pos);
 		tmpfont.reduce(layoutfont);
 		par->setFont(pos, tmpfont);
 	}
@@ -403,7 +522,7 @@ void LyXText::makeFontEntriesLayoutSpecific(Buffer const * buf,
 Paragraph * LyXText::setLayout(BufferView * bview,
 			       LyXCursor & cur, LyXCursor & sstart_cur,
 			       LyXCursor & send_cur,
-			       LyXTextClass::size_type layout)
+			       lyx::layout_type layout)
 {
 	Paragraph * endpar = send_cur.par()->next();
 	Paragraph * undoendpar = endpar;
@@ -427,7 +546,7 @@ Paragraph * LyXText::setLayout(BufferView * bview,
 	LyXLayout const & lyxlayout =
 		textclasslist.Style(bview->buffer()->params.textclass, layout);
 	
-	while (cur.par() != send_cur.par()) {
+	do {
 		cur.par()->setLayout(layout);
 		makeFontEntriesLayoutSpecific(bview->buffer(), cur.par());
 		Paragraph * fppar = cur.par();
@@ -444,28 +563,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, lyx::layout_type layout)
 {
 	LyXCursor tmpcursor = cursor;  /* store the current cursor  */
 
@@ -486,7 +593,7 @@ void LyXText::setLayout(BufferView * bview, LyXTextClass::size_type layout)
 	selection.cursor = cursor;
 	setCursor(bview, selection.end.par(), selection.end.pos(), false);
 	updateCounters(bview, cursor.row());
-	clearSelection(bview);
+	clearSelection();
 	setSelection(bview);
 	setCursor(bview, tmpcursor.par(), tmpcursor.pos(), true);
 }
@@ -529,19 +636,16 @@ void  LyXText::incDepth(BufferView * bview)
    
 	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 (textclasslist.Style(bview->buffer()->params.textclass,
+					cursor.par()->getLayout()).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())
@@ -567,7 +671,7 @@ void  LyXText::incDepth(BufferView * bview)
 	selection.cursor = cursor;
 	setCursor(bview, selection.end.par(), selection.end.pos());
 	updateCounters(bview, cursor.row());
-	clearSelection(bview);
+	clearSelection();
 	setSelection(bview);
 	setCursor(bview, tmpcursor.par(), tmpcursor.pos());
 }
@@ -624,7 +728,7 @@ void  LyXText::decDepth(BufferView * bview)
 	selection.cursor = cursor;
 	setCursor(bview, selection.end.par(), selection.end.pos());
 	updateCounters(bview, cursor.row());
-	clearSelection(bview);
+	clearSelection();
 	setSelection(bview);
 	setCursor(bview, tmpcursor.par(), tmpcursor.pos());
 }
@@ -638,12 +742,15 @@ 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,
+		real_current_font.update(font, 
 					 bview->buffer()->params.language,
 					 toggleall);
 
@@ -651,7 +758,12 @@ void LyXText::setFont(BufferView * bview, LyXFont const & font, bool toggleall)
 		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);
+#endif
 		return;
 	}
 
@@ -661,12 +773,12 @@ void LyXText::setFont(BufferView * bview, LyXFont const & font, bool toggleall)
 	// 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
@@ -683,14 +795,14 @@ void LyXText::setFont(BufferView * bview, LyXFont const & font, bool toggleall)
 	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(bview);
 	setSelection(bview);
 	setCursor(bview, tmpcursor.par(), tmpcursor.pos(), true,
-		  tmpcursor.boundary());
+	          tmpcursor.boundary());
 }
 
 
@@ -743,7 +855,7 @@ void LyXText::redoDrawingOfParagraph(BufferView * bview, LyXCursor const & cur)
 // 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;
@@ -755,40 +867,43 @@ void LyXText::redoParagraphs(BufferView * bview, LyXCursor const & cur,
 
 	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()
-		       && tmprow->previous()->par() == first_phys_par) {
+		       && tmprow->previous()->par() == first_phys_par)
+		{
 			tmprow = tmprow->previous();
 			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);
    
@@ -902,7 +1017,8 @@ 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;
@@ -911,7 +1027,8 @@ string const LyXText::selectionAsString(Buffer const * buffer) const
 	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;
 	}
 	
@@ -920,7 +1037,8 @@ string const LyXText::selectionAsString(Buffer const * buffer) const
 	// 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)
@@ -928,23 +1046,24 @@ string const LyXText::selectionAsString(Buffer const * buffer) const
 	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;
 }
 
 
-void LyXText::clearSelection(BufferView * /*bview*/) const
+void LyXText::clearSelection() const
 {
 	selection.set(false);
 	selection.mark(false);
-	selection.end = selection.start = cursor;
+	last_sel_cursor = selection.end = selection.start = selection.cursor = cursor;
 }
 
 
@@ -1003,8 +1122,8 @@ void LyXText::toggleFree(BufferView * bview,
 	// is disabled.
 	LyXCursor resetCursor = cursor;
 	bool implicitSelection = (font.language() == ignore_language
-				  && font.number() == LyXFont::IGNORE)
-		? selectWordWhenUnderCursor(bview) : false;
+	                          && font.number() == LyXFont::IGNORE)
+		? selectWordWhenUnderCursor(bview, WHOLE_WORD_STRICT) : false;
 
 	// Set font
 	setFont(bview, font, toggleall);
@@ -1012,7 +1131,7 @@ void LyXText::toggleFree(BufferView * bview,
 	// Implicit selections are cleared afterwards
 	//and cursor is set to the original position.
 	if (implicitSelection) {
-		clearSelection(bview);
+		clearSelection();
 		cursor = resetCursor;
 		setCursor(bview, cursor.par(), cursor.pos());
 		selection.cursor = cursor;
@@ -1022,8 +1141,40 @@ void LyXText::toggleFree(BufferView * bview,
 }
 
 
-Paragraph::size_type
-LyXText::beginningOfMainBody(Buffer const * buf,
+string LyXText::getStringToIndex(BufferView * bview)
+{
+	string idxstring;
+	
+	// Try 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);
+
+	if (!selection.set()) {
+		bview->owner()->message(_("Nothing to index!"));
+		return string();
+	}
+	if (selection.start.par() != selection.end.par()) {
+		bview->owner()->message(_("Cannot index more than one paragraph!"));
+		return string();
+	}
+
+	idxstring = selectionAsString(bview->buffer(), false);
+	
+	// Implicit selections are cleared afterwards
+	//and cursor is set to the original position.
+	if (implicitSelection) {
+		clearSelection();
+		cursor = resetCursor;
+		setCursor(bview, cursor.par(), cursor.pos());
+		selection.cursor = cursor;
+	}
+	return idxstring;
+}
+
+
+pos_type LyXText::beginningOfMainBody(Buffer const * buf,
 			     Paragraph const * par) const
 {
 	if (textclasslist.Style(buf->params.textclass,
@@ -1045,6 +1196,7 @@ void LyXText::setParagraph(BufferView * bview,
 			   bool pagebreak_top, bool pagebreak_bottom,
 			   VSpace const & space_top,
 			   VSpace const & space_bottom,
+			   Spacing const & spacing,
 			   LyXAlignment align, 
 			   string labelwidthstring,
 			   bool noindent) 
@@ -1085,6 +1237,7 @@ 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?
 		if (align == LYX_ALIGN_LAYOUT)
 			align = textclasslist
@@ -1107,7 +1260,7 @@ void LyXText::setParagraph(BufferView * bview,
 	
 	redoParagraphs(bview, selection.start, endpar);
 	
-	clearSelection(bview);
+	clearSelection();
 	setCursor(bview, selection.start.par(), selection.start.pos());
 	selection.cursor = cursor;
 	setCursor(bview, selection.end.par(), selection.end.pos());
@@ -1269,7 +1422,7 @@ void LyXText::setCounter(Buffer const * buf, Paragraph * par) const
 					par->params().labelString(string());
 			}
 
-			std::ostringstream s;
+			ostringstream s;
 
 			if (!par->params().appendix()) {
 				switch (2 * LABEL_COUNTER_CHAPTER -
@@ -1411,7 +1564,7 @@ void LyXText::setCounter(Buffer const * buf, Paragraph * par) const
 			par->incCounter(i + par->enumdepth);
 			int number = par->getCounter(i + par->enumdepth);
 
-			std::ostringstream s;
+			ostringstream s;
 
 			switch (par->enumdepth) {
 			case 1:
@@ -1459,7 +1612,7 @@ void LyXText::setCounter(Buffer const * buf, Paragraph * par) const
 		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);
@@ -1534,10 +1687,10 @@ void LyXText::updateCounters(BufferView * bview, Row * row) const
 
 void LyXText::insertInset(BufferView * bview, Inset * inset)
 {
-	if (!cursor.par()->insertInsetAllowed(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
@@ -1548,7 +1701,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
@@ -1567,7 +1720,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.
 
@@ -1577,7 +1730,7 @@ 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())
@@ -1609,15 +1762,17 @@ void LyXText::cutSelection(BufferView * bview, bool doclear)
 		endpar = selection.end.par();
 		int pos = selection.end.pos();
 		CutAndPaste::cutSelection(selection.start.par(), &endpar,
-					  selection.start.pos(), pos,
-					  bview->buffer()->params.textclass, doclear);
+		                          selection.start.pos(), pos,
+		                          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);
+		                          selection.start.pos(), pos,
+		                          bview->buffer()->params.textclass,
+					  doclear, realcut);
 		cursor.par(endpar);
 		selection.end.par(endpar);
 		selection.end.pos(pos);
@@ -1636,7 +1791,7 @@ void LyXText::cutSelection(BufferView * bview, bool doclear)
 	cursor = selection.start;
 
 	// need a valid cursor. (Lgb)
-	clearSelection(bview);
+	clearSelection();
 
 	setCursor(bview, cursor.par(), cursor.pos());
 	selection.cursor = cursor;
@@ -1646,15 +1801,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())
@@ -1687,30 +1835,21 @@ void LyXText::pasteSelection(BufferView * bview)
 
 	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(bview);
+	clearSelection();
    
-	selection.cursor = cursor;
 	setCursor(bview, actpar, pos);
-	setSelection(bview);
 	updateCounters(bview, cursor.row());
 }
 
 
-// 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)
 {
@@ -1737,7 +1876,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());
@@ -1749,7 +1888,7 @@ void LyXText::replaceSelectionWithString(BufferView * bview,
 	}
 	
 	// Cut the selection
-	cutSelection(bview);
+	cutSelection(bview, true, false);
 
 	unFreezeUndo();
 }
@@ -1759,70 +1898,15 @@ 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);
 	
-	bool isEnvironment =
-		textclasslist.Style(bview->buffer()->params.textclass, 
-				    cursor.par()->getLayout()).isEnvironment();
-	bool free_spacing =
-		textclasslist.Style(bview->buffer()->params.textclass, 
-				    cursor.par()->getLayout()).free_spacing;
-	bool keepempty =
-		textclasslist.Style(bview->buffer()->params.textclass, 
-				    cursor.par()->getLayout()).keepempty;
-
 	// only to be sure, should not be neccessary
-	clearSelection(bview);
+	clearSelection();
 	
-	// insert the string, don't insert doublespace
-	bool space_inserted = true;
-	for(string::const_iterator cit = str.begin(); 
-	    cit != str.end(); ++cit) {
-		if (*cit == '\n') {
-			if (par->size() || keepempty) { 
-				par->breakParagraph(bview->buffer()->params, 
-						    pos, isEnvironment);
-				par = par->next();
-				pos = 0;
-				space_inserted = true;
-			} else {
-				continue;
-			}
-			// do not insert consecutive spaces if !free_spacing
-		} else if ((*cit == ' ' || *cit == '\t')
-			   && space_inserted && !free_spacing) {
-			continue;
-		} else if (*cit == '\t') {
-			if (!free_spacing) {
-				// tabs are like spaces here
-				par->insertChar(pos, ' ', 
-						current_font);
-				++pos;
-				space_inserted = true;
-			} else {
-				const Paragraph::value_type nb = 8 - pos % 8;
-				for (Paragraph::size_type a = 0; 
-				     a < nb ; ++a) {
-					par->insertChar(pos, ' ', 
-							current_font);
-					++pos;
-				}
-				space_inserted = true;
-			}
-		} else if (!IsPrintable(*cit)) {
-			// Ignore unprintables
-			continue;
-		} else {
-			// just insert the character
-			par->insertChar(pos, *cit, current_font);
-			++pos;
-			space_inserted = (*cit == ' ');
-		}
-
-	}	
+	bview->buffer()->insertStringAsLines(par, pos, current_font, str);
 
 	redoParagraphs(bview, cursor, endpar);
 	setCursor(bview, cursor.par(), cursor.pos());
@@ -1859,7 +1943,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;
@@ -1873,7 +1957,7 @@ bool LyXText::gotoNextInset(BufferView * bview,
 		}
       
 	} while (res.par() && 
-		 !(res.par()->getChar(res.pos()) == Paragraph::META_INSET
+		 !(res.par()->isInset(res.pos())
 		   && (inset = res.par()->getInset(res.pos())) != 0
 		   && find(codes.begin(), codes.end(), inset->lyxCode())
 		   != codes.end()
@@ -1882,7 +1966,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;
@@ -1890,12 +1974,12 @@ bool LyXText::gotoNextInset(BufferView * bview,
 
 
 void LyXText::checkParagraph(BufferView * bview, Paragraph * par,
-			     Paragraph::size_type pos)
+                             pos_type pos)
 {
 	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
@@ -1920,7 +2004,7 @@ 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;
 	
@@ -1933,7 +2017,8 @@ void LyXText::checkParagraph(BufferView * bview, Paragraph * par,
 	// check the special right address boxes
 	if (textclasslist.Style(bview->buffer()->params.textclass,
 				par->getLayout()).margintype
-	    == MARGIN_RIGHT_ADDRESS_BOX) {
+	    == MARGIN_RIGHT_ADDRESS_BOX)
+	{
 		tmpcursor.par(par);
 		tmpcursor.row(row);
 		tmpcursor.y(y);
@@ -1975,17 +2060,17 @@ 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;
 		}
@@ -1996,19 +2081,22 @@ bool LyXText::updateInset(BufferView * bview, Inset * inset)
 }
 
 
-void LyXText::setCursor(BufferView * bview, Paragraph * par,
-			Paragraph::size_type pos, 
-			bool setfont, bool boundary) const
+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);
@@ -2020,22 +2108,26 @@ void LyXText::setCursor(BufferView *bview, LyXCursor & cur, Paragraph * par,
 	y += row->baseline();
 	// y is now the cursor baseline 
 	cur.y(y);
-   
+
 	// now get the cursors x position
 	float x;
 	float fill_separator;
 	float fill_hfill;
 	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);
+	               fill_label_hfill);
+	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();
 	else if (pos > last && !boundary)
@@ -2051,14 +2143,14 @@ void LyXText::setCursor(BufferView *bview, LyXCursor & cur, Paragraph * par,
 		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) || 
 	     !row->par()->isLineSeparator(main_body-1)))
 		main_body = 0;
 	
-	for (Paragraph::size_type vpos = row->pos();
+	for (pos_type vpos = row->pos();
 	     vpos < cursor_vpos; ++vpos) {
 		pos = vis2log(vpos);
 		if (main_body > 0 && pos == main_body - 1) {
@@ -2067,7 +2159,7 @@ void LyXText::setCursor(BufferView *bview, LyXCursor & cur, Paragraph * par,
 					bview->buffer()->params.textclass,
 					row->par()->getLayout())
 					       .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);
 		}
@@ -2086,30 +2178,47 @@ void LyXText::setCursor(BufferView *bview, LyXCursor & cur, Paragraph * par,
 	}
 	
 	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 << "InsetText   is " << it << endl;
+			lyxerr << "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;
 
@@ -2147,19 +2256,8 @@ void LyXText::setCurrentFont(BufferView * bview) const
 void LyXText::setCursorFromCoordinates(BufferView * bview, int x, int y) const
 {
 	LyXCursor old_cursor = cursor;
-   
-	// Get the row first. 
-   
-	Row * row = getRowNearY(y);
-	cursor.par(row->par());
 
-	bool bound = false;
-	int column = getColumnNearX(bview, row, x, bound);
-	cursor.pos(row->pos() + column);
-	cursor.x(x);
-	cursor.y(y + row->baseline());
-	cursor.row(row);
-	cursor.boundary(bound);
+	setCursorFromCoordinates(bview, cursor, x, y);
 	setCurrentFont(bview);
 	deleteEmptyParagraphMechanism(bview, old_cursor);
 }
@@ -2172,8 +2270,7 @@ void LyXText::setCursorFromCoordinates(BufferView * bview, LyXCursor & cur,
    
 	Row * row = getRowNearY(y);
 	bool bound = false;
-	int 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);
@@ -2248,19 +2345,40 @@ 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;
 
-void LyXText::deleteEmptyParagraphMechanism(BufferView * bview,
+	// if cursor position is after the place where the delete occured,
+	// update it
+	if (cur.pos() > where.pos())
+		cur.pos(cur.pos()-1);
+
+	// 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;
-
-	bool deleted = false;
+				old_cursor.par()->getLayout()).free_spacing
+	    || old_cursor.par()->isFreeSpacing())
+	{
+		return false;
+	}
 	
 	/* Ok I'll put some comments here about what is missing.
 	   I have fixed BackSpace (and thus Delete) to not delete
@@ -2286,7 +2404,8 @@ 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
@@ -2295,126 +2414,140 @@ void LyXText::deleteEmptyParagraphMechanism(BufferView * bview,
 		    && 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;
+		return false;
 
-	LyXCursor tmpcursor;
+	// only do our magic if we changed paragraph
+	if (old_cursor.par() == cursor.par()) 
+		return false;
+	
+	// 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() != 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.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();
-					}
+		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();
+			}
+			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();
+			/* 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());
+			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());
+			}
 
-				delete old_cursor.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) {
-					breakAgain(bview, refresh_row);
-					updateCounters(bview, refresh_row->previous());
-				}
+			/* 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());
 			}
+		}
 				
-				// correct cursor y
+		// correct cursor y
+		setCursorIntern(bview, cursor.par(), cursor.pos());
 
-			setCursorIntern(bview, cursor.par(), cursor.pos());
-
-			if (selection.cursor.par()  == old_cursor.par()
-			    && selection.cursor.pos() == selection.cursor.pos()) {
-				// correct selection
-				selection.cursor = cursor;
-			}
+		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;
-			}
+	}
+	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;
 }
 
 
@@ -2424,7 +2557,7 @@ 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);
 	}
@@ -2449,29 +2582,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;
 }
 
 
@@ -2483,26 +2611,31 @@ 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.
-	// The above does not make any sense, I changed it to what is here,
-	// but it still does not make much sense. (Lgb)
+	// 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:
+	// We should only go up with refreshing code so this means that if
+	// we have a MORE refresh we should never set it to LITTLE if we still
+	// didn't handle it (and then it will be UNCHANGED. Now as long as
+	// we stay inside one LyXText this may work but we need to tell the
+	// outermost LyXText that it should REALLY draw us if there is some
+	// change in a Inset::LyXText. So you see that when we are inside a
+	// inset's LyXText we give the LITTLE to the outermost LyXText to
+	// tell'em that it should redraw the actual row (where the inset
+	// resides! Capito?!
+
 	if ((status_ != NEED_MORE_REFRESH)
 	    || (status_ == NEED_MORE_REFRESH
-		&& st != NEED_VERY_LITTLE_REFRESH)) {
+		&& st != NEED_VERY_LITTLE_REFRESH))
+	{
 		status_ = st;
 		if (inset_owner && st != UNCHANGED) {
 			bview->text->status(bview, NEED_VERY_LITTLE_REFRESH);
+			if (!bview->text->refresh_row) {
+				bview->text->refresh_row = bview->text->cursor.row();
+				bview->text->refresh_y = bview->text->cursor.y() -
+					bview->text->cursor.row()->baseline();
+			}
 		}
 	}
-#endif
 }