X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView_pimpl.C;h=841ead1254822fbd59bfb9b29100927e9f69d770;hb=ff86a0160192ba7272331034da1510aba7899ff9;hp=d1c70ef4ae3f56d7b4636c8d54aa2232e2ccfa2c;hpb=b17500c1c47d7bdd4508743c27fb72f0e57a5105;p=lyx.git

diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C
index d1c70ef4ae..ae3ee5e487 100644
--- a/src/BufferView_pimpl.C
+++ b/src/BufferView_pimpl.C
@@ -1,10 +1,5 @@
 #include <config.h>
 
-#include <ctime>
-#include <unistd.h>
-#include <sys/wait.h>
-#include <locale.h>
-
 #ifdef __GNUG__
 #pragma implementation
 #endif
@@ -14,33 +9,39 @@
 #include "lyxscreen.h"
 #include "lyxtext.h"
 #include "lyxrow.h"
+#include "paragraph.h"
 #include "LyXView.h"
 #include "commandtags.h"
 #include "lyxfunc.h"
+#include "debug.h"
 #include "font.h"
 #include "bufferview_funcs.h"
 #include "TextCache.h"
 #include "bufferlist.h"
-#include "lyx_gui_misc.h"
 #include "lyxrc.h"
 #include "intl.h"
-#include "support/LAssert.h"
-#include "frontends/Dialogs.h"
-#include "insets/insetbib.h"
-#include "insets/insettext.h"
-/// added for Dispatch functions
+// added for Dispatch functions
 #include "lyx_cb.h"
-#include "frontends/FileDialog.h"
 #include "lyx_main.h"
 #include "FloatList.h"
-#include "support/filetools.h"
-#include "support/lyxfunctional.h"
+#include "gettext.h"
+#include "ParagraphParameters.h"
+#include "undo_funcs.h"
+#include "lyxtextclasslist.h"
+
+#include "frontends/Dialogs.h"
+#include "frontends/Alert.h"
+#include "frontends/FileDialog.h"
+
+#include "insets/insetbib.h"
+#include "insets/insettext.h"
 #include "insets/inseturl.h"
 #include "insets/insetlatexaccent.h"
 #include "insets/insettoc.h"
 #include "insets/insetref.h"
 #include "insets/insetparent.h"
 #include "insets/insetindex.h"
+#include "insets/insetnote.h"
 #include "insets/insetinclude.h"
 #include "insets/insetcite.h"
 #include "insets/insetert.h"
@@ -50,24 +51,42 @@
 #include "insets/insetmarginal.h"
 #include "insets/insetminipage.h"
 #include "insets/insetfloat.h"
-#include "insets/insetlist.h"
 #include "insets/insettabular.h"
+#if 0
 #include "insets/insettheorem.h"
+#include "insets/insetlist.h"
+#endif
 #include "insets/insetcaption.h"
-#include "mathed/formulamacro.h"
-#include "gettext.h"
+#include "insets/insetfloatlist.h"
+#include "insets/insetspecialchar.h"
+
+#include "mathed/formulabase.h"
+
+#include "support/LAssert.h"
+#include "support/lstrings.h"
+#include "support/filetools.h"
+#include "support/lyxfunctional.h"
+
+#include <ctime>
+#include <unistd.h>
+#include <sys/wait.h>
+#include <clocale>
 
-extern LyXTextClass::size_type current_layout;
-extern int greek_kb_flag;
+
+extern string current_layout;
 
 using std::vector;
 using std::find_if;
+using std::find;
 using std::pair;
 using std::endl;
 using std::make_pair;
 using std::min;
 using SigC::slot;
 
+using lyx::pos_type;
+using lyx::textclass_type;
+
 /* the selection possible is needed, that only motion events are 
  * used, where the bottom press event was on the drawing area too */
 bool selection_possible = false;
@@ -75,14 +94,13 @@ bool selection_possible = false;
 extern BufferList bufferlist;
 extern char ascii_type;
 
-extern bool math_insert_greek(BufferView *, char);
-extern void sigchldhandler(pid_t pid, int * status);
 extern int bibitemMaxWidth(BufferView *, LyXFont const &);
 
-const unsigned int saved_positions_num = 20;
 
 namespace {
 
+const unsigned int saved_positions_num = 20;
+
 inline
 void waitForX()
 {
@@ -94,7 +112,7 @@ void SetXtermCursor(Window win)
 {
 	static Cursor cursor;
 	static bool cursor_undefined = true;
-	if (cursor_undefined){
+	if (cursor_undefined) {
 		cursor = XCreateFontCursor(fl_get_display(), XC_xterm);
 		XFlush(fl_get_display());
 		cursor_undefined = false;
@@ -110,7 +128,8 @@ BufferView::Pimpl::Pimpl(BufferView * b, LyXView * o,
 	     int xpos, int ypos, int width, int height)
 	: bv_(b), owner_(o), buffer_(0),
 	  current_scrollbar_value(0), cursor_timeout(400),
-	  workarea_(xpos, ypos, width, height), using_xterm_cursor(false)
+	  workarea_(xpos, ypos, width, height), using_xterm_cursor(false),
+	  inset_slept(false)
 {
 	// Setup the signals
 	workarea_.scrollCB.connect(slot(this, &BufferView::Pimpl::scrollCB));
@@ -133,15 +152,15 @@ BufferView::Pimpl::Pimpl(BufferView * b, LyXView * o,
 		.connect(slot(this, &BufferView::Pimpl::tripleClick));
 	workarea_.workAreaKeyPress
 		.connect(slot(this, &BufferView::Pimpl::workAreaKeyPress));
+	workarea_.selectionRequested
+		.connect(slot(this, &BufferView::Pimpl::selectionRequested)); 
+	workarea_.selectionLost
+		.connect(slot(this, &BufferView::Pimpl::selectionLost));
 	
-	//screen_ = 0;
-
 	cursor_timeout.timeout.connect(slot(this,
 					    &BufferView::Pimpl::cursorToggle));
-	//current_scrollbar_value = 0;
 	cursor_timeout.start();
 	workarea_.setFocus();
-	//using_xterm_cursor = false;
 	saved_positions.resize(saved_positions_num);
 }
 
@@ -157,7 +176,7 @@ void BufferView::Pimpl::buffer(Buffer * b)
 	lyxerr[Debug::INFO] << "Setting buffer in BufferView ("
 			    << b << ")" << endl;
 	if (buffer_) {
-		bv_->insetSleep();
+		insetSleep();
 		buffer_->delUser(bv_);
 
 		// Put the old text into the TextCache, but
@@ -179,8 +198,6 @@ void BufferView::Pimpl::buffer(Buffer * b)
 	// Nuke old image
 	// screen is always deleted when the buffer is changed.
 	screen_.reset(0);
-	//delete screen_;
-	//screen_ = 0;
 
 	// If we are closing the buffer, use the first buffer as current
 	if (!buffer_) {
@@ -197,7 +214,7 @@ void BufferView::Pimpl::buffer(Buffer * b)
 			updateScreen();
 			updateScrollbar();
 		}
-		bv_->text->first = screen_->TopCursorVisible(bv_->text);
+		bv_->text->first_y = screen_->topCursorVisible(bv_->text);
 		owner_->updateMenubar();
 		owner_->updateToolbar();
 		// Similarly, buffer-dependent dialogs should be updated or
@@ -205,7 +222,7 @@ void BufferView::Pimpl::buffer(Buffer * b)
 		// require bv_->text.
 		owner_->getDialogs()->updateBufferDependent(true);
 		redraw();
-		bv_->insetWakeup();
+		insetWakeup();
 	} else {
 		lyxerr[Debug::INFO] << "  No Buffer!" << endl;
 		owner_->updateMenubar();
@@ -250,11 +267,20 @@ void BufferView::Pimpl::redraw()
 }
 
 
-bool BufferView::Pimpl::fitCursor(LyXText * text)
+bool BufferView::Pimpl::fitCursor()
 {
-	Assert(screen_.get());
- 
-	bool ret = screen_->FitCursor(text, bv_);
+	lyx::Assert(screen_.get());
+
+	bool ret;
+
+	if (bv_->theLockingInset()) {
+		bv_->theLockingInset()->fitInsetCursor(bv_);
+		ret = true;
+	} else {
+		ret = screen_->fitCursor(bv_->text, bv_);
+	}
+
+	bv_->owner()->getDialogs()->updateParagraph();
 	if (ret)
 	    updateScrollbar();
 	return ret;
@@ -275,34 +301,35 @@ int BufferView::Pimpl::resizeCurrentBuffer()
 {
 	lyxerr[Debug::INFO] << "resizeCurrentBuffer" << endl;
 	
-	LyXParagraph * par = 0;
-	LyXParagraph * selstartpar = 0;
-	LyXParagraph * selendpar = 0;
+	Paragraph * par = 0;
+	Paragraph * selstartpar = 0;
+	Paragraph * selendpar = 0;
 	UpdatableInset * the_locking_inset = 0;
 	
-	LyXParagraph::size_type pos = 0;
-	LyXParagraph::size_type selstartpos = 0;
-	LyXParagraph::size_type selendpos = 0;
+	pos_type pos = 0;
+	pos_type selstartpos = 0;
+	pos_type selendpos = 0;
 	bool selection = false;
 	bool mark_set  = false;
+	
+	owner_->prohibitInput();
 
-	ProhibitInput(bv_);
-
-	owner_->getLyXFunc()->Dispatch(LFUN_MESSAGE,
-				       _("Formatting document..."));
+	owner_->message(_("Formatting document..."));
 
 	if (bv_->text) {
 		par = bv_->text->cursor.par();
 		pos = bv_->text->cursor.pos();
-		selstartpar = bv_->text->sel_start_cursor.par();
-		selstartpos = bv_->text->sel_start_cursor.pos();
-		selendpar = bv_->text->sel_end_cursor.par();
-		selendpos = bv_->text->sel_end_cursor.pos();
-		selection = bv_->text->selection;
-		mark_set = bv_->text->mark_set;
-		the_locking_inset = bv_->text->the_locking_inset;
+		selstartpar = bv_->text->selection.start.par();
+		selstartpos = bv_->text->selection.start.pos();
+		selendpar = bv_->text->selection.end.par();
+		selendpos = bv_->text->selection.end.pos();
+		selection = bv_->text->selection.set();
+		mark_set = bv_->text->selection.mark();
+		the_locking_inset = bv_->theLockingInset();
 		delete bv_->text;
 		bv_->text = new LyXText(bv_);
+		bv_->text->init(bv_);
+		buffer_->resizeInsets(bv_);
 	} else {
 		// See if we have a text in TextCache that fits
 		// the new buffer_ with the correct width.
@@ -318,41 +345,45 @@ int BufferView::Pimpl::resizeCurrentBuffer()
 				textcache.show(lyxerr, "resizeCurrentBuffer");
 		} else {
 			bv_->text = new LyXText(bv_);
+			bv_->text->init(bv_);
+			//buffer_->resizeInsets(bv_);
 		}
 	}
+
 	updateScreen();
 
 	if (par) {
-		bv_->text->selection = true;
-		/* at this point just to avoid the Delete-Empty-Paragraph
-		 * Mechanism when setting the cursor */
-		bv_->text->mark_set = mark_set;
+		bv_->text->selection.set(true);
+		// At this point just to avoid the Delete-Empty-Paragraph-
+		// Mechanism when setting the cursor.
+		bv_->text->selection.mark(mark_set);
 		if (selection) {
-			bv_->text->SetCursor(bv_, selstartpar, selstartpos);
-			bv_->text->sel_cursor = bv_->text->cursor;
-			bv_->text->SetCursor(bv_, selendpar, selendpos);
-			bv_->text->SetSelection(bv_);
-			bv_->text->SetCursor(bv_, par, pos);
+			bv_->text->setCursor(bv_, selstartpar, selstartpos);
+			bv_->text->selection.cursor = bv_->text->cursor;
+			bv_->text->setCursor(bv_, selendpar, selendpos);
+			bv_->text->setSelection(bv_);
+			bv_->text->setCursor(bv_, par, pos);
 		} else {
-			bv_->text->SetCursor(bv_, par, pos);
-			bv_->text->sel_cursor = bv_->text->cursor;
-			bv_->text->selection = false;
+			bv_->text->setCursor(bv_, par, pos);
+			bv_->text->selection.cursor = bv_->text->cursor;
+			bv_->text->selection.set(false);
 		}
 		// remake the inset locking
-		bv_->text->the_locking_inset = the_locking_inset;
+		bv_->theLockingInset(the_locking_inset);
 	}
-	bv_->text->first = screen_->TopCursorVisible(bv_->text);
-	buffer_->resizeInsets(bv_);
+
+	bv_->text->first_y = screen_->topCursorVisible(bv_->text);
+
 	// this will scroll the screen such that the cursor becomes visible
 	updateScrollbar();
 	redraw();
 
-	bv_->setState();
-	AllowInput(bv_);
+	setState();
+	owner_->allowInput();
+
+	/// clear the "Formatting Document" message 
+	owner_->message("");
 
-	/// get rid of the splash screen if it's not gone already
-	owner_->getDialogs()->destroySplash();
- 
 	return 0;
 }
 
@@ -369,59 +400,44 @@ void BufferView::Pimpl::updateScrollbar()
 	/* If the text is smaller than the working area, the scrollbar
 	 * maximum must be the working area height. No scrolling will 
 	 * be possible */
-
-	if (!buffer_) {
+	if (!bv_->text) {
 		workarea_.setScrollbar(0, 1.0);
 		return;
 	}
-	
-	static unsigned long max2 = 0;
-	static unsigned long height2 = 0;
-
-	unsigned long cbth = 0;
-	long cbsf = 0;
-
-	if (bv_->text) {
-		cbth = bv_->text->height;
-		cbsf = bv_->text->first;
-	}
 
-	// check if anything has changed.
-	if (max2 == cbth &&
-	    height2 == workarea_.height() &&
-	    current_scrollbar_value == cbsf)
-		return; // no
-	max2 = cbth;
-	height2 = workarea_.height();
-	current_scrollbar_value = cbsf;
+	long const text_height = bv_->text->height;
+	long const work_height = workarea_.height();
 
-	if (cbth <= height2) { // text is smaller than screen
-		workarea_.setScrollbar(0, 1.0); // right?
+	if (text_height <= work_height) {
+		workarea_.setScrollbarBounds(0.0, 0.0);
+		current_scrollbar_value = bv_->text->first_y;
+		workarea_.setScrollbar(current_scrollbar_value, 1.0);
 		return;
 	}
+	
+	double const lineh = bv_->text->defaultHeight();
+	double const slider_size =
+		(text_height == 0) ? 1.0 : 1.0 / double(text_height);
+	
+	static long old_text_height;
+	static double old_lineh;
+	static double old_slider_size;
 
-	long maximum_height = workarea_.height() * 3 / 4 + cbth;
-	long value = cbsf;
-
-	// set the scrollbar
-	double hfloat = workarea_.height();
-	double maxfloat = maximum_height;
-
-	float slider_size = 0.0;
-	int slider_value = value;
-
-	workarea_.setScrollbarBounds(0, bv_->text->height - workarea_.height());
-	double const lineh = bv_->text->DefaultHeight();
-	workarea_.setScrollbarIncrements(lineh);
-	if (maxfloat > 0.0) {
-		if ((hfloat / maxfloat) * float(height2) < 3)
-			slider_size = 3.0/float(height2);
-		else
-			slider_size = hfloat / maxfloat;
-	} else
-		slider_size = hfloat;
-
-	workarea_.setScrollbar(slider_value, slider_size / workarea_.height());
+	if (text_height != old_text_height) {
+		workarea_.setScrollbarBounds(0.0,
+					     text_height - work_height);
+		old_text_height = text_height;
+	}
+	if (lineh != old_lineh) {
+		workarea_.setScrollbarIncrements(lineh);
+		old_lineh = lineh;
+	}
+	if (current_scrollbar_value != bv_->text->first_y
+	    || slider_size != old_slider_size) {
+		current_scrollbar_value = bv_->text->first_y;
+		workarea_.setScrollbar(current_scrollbar_value, slider_size);
+		old_slider_size = slider_size;
+	}
 }
 
 
@@ -431,13 +447,14 @@ void BufferView::Pimpl::scrollCB(double value)
 	if (!buffer_) return;
 
 	current_scrollbar_value = long(value);
+
 	if (current_scrollbar_value < 0)
 		current_scrollbar_value = 0;
    
 	if (!screen_.get())
 		return;
 
-	screen_->Draw(bv_->text, bv_, current_scrollbar_value);
+	screen_->draw(bv_->text, bv_, current_scrollbar_value);
 
 	if (!lyxrc.cursor_follows_scrollbar) {
 		waitForX();
@@ -446,14 +463,14 @@ void BufferView::Pimpl::scrollCB(double value)
  
 	LyXText * vbt = bv_->text;
  
-	int const height = vbt->DefaultHeight();
-	int const first = static_cast<int>((bv_->text->first + height));
-	int const last = static_cast<int>((bv_->text->first + workarea_.height() - height));
+	int const height = vbt->defaultHeight();
+	int const first = static_cast<int>((bv_->text->first_y + height));
+	int const last = static_cast<int>((bv_->text->first_y + workarea_.height() - height));
 
 	if (vbt->cursor.y() < first)
-		vbt->SetCursorFromCoordinates(bv_, 0, first);
+		vbt->setCursorFromCoordinates(bv_, 0, first);
 	else if (vbt->cursor.y() > last)
-		vbt->SetCursorFromCoordinates(bv_, 0, last);
+		vbt->setCursorFromCoordinates(bv_, 0, last);
 
 	waitForX();
 }
@@ -468,12 +485,12 @@ int BufferView::Pimpl::scrollUp(long time)
    
 	if (value == 0) return 0;
 
-	float add_value =  (bv_->text->DefaultHeight()
+	float add_value =  (bv_->text->defaultHeight()
 			    + float(time) * float(time) * 0.125);
    
 	if (add_value > workarea_.height())
 		add_value = float(workarea_.height() -
-				  bv_->text->DefaultHeight());
+				  bv_->text->defaultHeight());
    
 	value -= add_value;
 
@@ -494,16 +511,16 @@ int BufferView::Pimpl::scrollDown(long time)
    
 	double value = workarea_.getScrollbarValue();
 	pair<float, float> p = workarea_.getScrollbarBounds();
-	double max = p.second;
+	double const max = p.second;
 	
 	if (value == max) return 0;
 
-	float add_value =  (bv_->text->DefaultHeight()
+	float add_value =  (bv_->text->defaultHeight()
 			    + float(time) * float(time) * 0.125);
    
 	if (add_value > workarea_.height())
 		add_value = float(workarea_.height() -
-				  bv_->text->DefaultHeight());
+				  bv_->text->defaultHeight());
    
 	value += add_value;
    
@@ -534,49 +551,48 @@ void BufferView::Pimpl::workAreaMotionNotify(int x, int y, unsigned int state)
 	// Check for inset locking
 	if (bv_->theLockingInset()) {
 		LyXCursor cursor = bv_->text->cursor;
-		LyXFont font = bv_->text->GetFont(bv_->buffer(),
+		LyXFont font = bv_->text->getFont(buffer_,
 						  cursor.par(), cursor.pos());
 		int width = bv_->theLockingInset()->width(bv_, font);
 		int inset_x = font.isVisibleRightToLeft()
 			? cursor.x() - width : cursor.x();
 		int start_x = inset_x + bv_->theLockingInset()->scroll();
 		bv_->theLockingInset()->
-			InsetMotionNotify(bv_,
+			insetMotionNotify(bv_,
 					  x - start_x,
-					  y - cursor.y() + bv_->text->first,
+					  y - cursor.y() + bv_->text->first_y,
 					  state);
 		return;
 	}
    
-	/* The test for not selection possible is needed, that only motion events are 
-	 * used, where the bottom press event was on the drawing area too */
+	/* The test for not selection possible is needed, that only motion
+	   events are used, where the bottom press event was on
+	   the drawing area too */
 	if (!selection_possible)
 		return;
  
-	screen_->HideCursor();
+	screen_->hideCursor();
 
-	bv_->text->SetCursorFromCoordinates(bv_, x, y + bv_->text->first);
+	bv_->text->setCursorFromCoordinates(bv_, x, y + bv_->text->first_y);
       
-	if (!bv_->text->selection)
+	if (!bv_->text->selection.set())
 		update(bv_->text, BufferView::UPDATE); // Maybe an empty line was deleted
       
-	bv_->text->SetSelection(bv_);
-	screen_->ToggleToggle(bv_->text, bv_);
-	fitCursor(bv_->text);
-	screen_->ShowCursor(bv_->text, bv_);
+	bv_->text->setSelection(bv_);
+	screen_->toggleToggle(bv_->text, bv_);
+	fitCursor();
+	showCursor();
 }
 
 
 // Single-click on work area
 void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos,
-					    unsigned int button)
+                                            unsigned int button)
 {
-	last_click_x = -1;
-	last_click_y = -1;
-
-	if (!buffer_ || !screen_.get()) return;
+	if (!buffer_ || !screen_.get())
+		return;
 
-	Inset * inset_hit = checkInsetHit(bv_->text, xpos, ypos, button);
+	Inset * inset_hit = checkInsetHit(bv_->text, xpos, ypos);
 
 	// ok ok, this is a hack.
 	if (button == 4 || button == 5) {
@@ -590,6 +606,16 @@ void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos,
 		}
 	}
 	
+	// Middle button press pastes if we have a selection
+	// We do this here as if the selection was inside an inset
+	// it could get cleared on the unlocking of the inset so
+	// we have to check this first
+	bool paste_internally = false;
+	if (button == 2 && bv_->getLyXText()->selection.set()) {
+		owner_->getLyXFunc()->dispatch(LFUN_COPY);
+		paste_internally = true;
+	}
+	
 	if (bv_->theLockingInset()) {
 		// We are in inset locking mode
 		
@@ -597,9 +623,7 @@ void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos,
 		   otherwise give the event to the inset */
 		if (inset_hit == bv_->theLockingInset()) {
 			bv_->theLockingInset()->
-				InsetButtonPress(bv_,
-						 xpos, ypos,
-						 button);
+				insetButtonPress(bv_,xpos, ypos,button);
 			return;
 		} else {
 			bv_->unlockInset(bv_->theLockingInset());
@@ -608,36 +632,28 @@ void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos,
 	
 	if (!inset_hit)
 		selection_possible = true;
-	screen_->HideCursor();
+	screen_->hideCursor();
 
-	int const screen_first = bv_->text->first;
-	
-	// Middle button press pastes if we have a selection
-	bool paste_internally = false;
-	if (button == 2
-	    && bv_->text->selection) {
-		owner_->getLyXFunc()->Dispatch(LFUN_COPY);
-		paste_internally = true;
-	}
+	int const screen_first = bv_->text->first_y;
 	
 	// Clear the selection
-	screen_->ToggleSelection(bv_->text, bv_);
-	bv_->text->ClearSelection(bv_);
-	bv_->text->FullRebreak(bv_);
-	screen_->Update(bv_->text, bv_);
+	screen_->toggleSelection(bv_->text, bv_);
+	bv_->text->clearSelection();
+	bv_->text->fullRebreak(bv_);
+	update();
 	updateScrollbar();
 	
 	// Single left click in math inset?
-	if ((inset_hit != 0) &&
-	    (inset_hit->Editable()==Inset::HIGHLY_EDITABLE)) {
+	if (isHighlyEditableInset(inset_hit)) {
 		// Highly editable inset, like math
 		UpdatableInset * inset = static_cast<UpdatableInset *>(inset_hit);
 		selection_possible = false;
 		owner_->updateLayoutChoice();
-		owner_->getLyXFunc()->Dispatch(LFUN_MESSAGE,
-					       inset->EditMessage());
-		inset->InsetButtonPress(bv_, xpos, ypos, button);
-		inset->Edit(bv_, xpos, ypos, button);
+		owner_->message(inset->editMessage());
+		// IMO the inset has to be first in edit-mode and then we send the
+		// button press. (Jug 20020222)
+		inset->edit(bv_); //, xpos, ypos, button);
+		inset->insetButtonPress(bv_, xpos, ypos, button);
 		return;
 	} 
 	
@@ -648,13 +664,13 @@ void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos,
 	}
 	
 	if (!inset_hit) // otherwise it was already set in checkInsetHit(...)
-		bv_->text->SetCursorFromCoordinates(bv_, xpos, ypos + screen_first);
-	bv_->text->FinishUndo();
-	bv_->text->sel_cursor = bv_->text->cursor;
+		bv_->text->setCursorFromCoordinates(bv_, xpos, ypos + screen_first);
+	finishUndo();
+	bv_->text->selection.cursor = bv_->text->cursor;
 	bv_->text->cursor.x_fix(bv_->text->cursor.x());
 	
 	owner_->updateLayoutChoice();
-	if (fitCursor(bv_->text)) {
+	if (fitCursor()) {
 		selection_possible = false;
 	}
 	
@@ -663,10 +679,10 @@ void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos,
 	// insert this
 	if (button == 2) {
 		if (paste_internally)
-			owner_->getLyXFunc()->Dispatch(LFUN_PASTE);
+			owner_->getLyXFunc()->dispatch(LFUN_PASTE);
 		else
-			owner_->getLyXFunc()->Dispatch(LFUN_PASTESELECTION,
-						       "paragraph");
+			owner_->getLyXFunc()->dispatch(LFUN_PASTESELECTION,
+			                               "paragraph");
 		selection_possible = false;
 		return;
 	}
@@ -677,25 +693,25 @@ void BufferView::Pimpl::doubleClick(int /*x*/, int /*y*/, unsigned int button)
 {
 	// select a word
 	if (!buffer_)
-	    return;
+		return;
 
 	LyXText * text = bv_->getLyXText();
 
 	if (text->bv_owner && bv_->theLockingInset())
-	    return;
+		return;
 
 	if (screen_.get() && button == 1) {
-	    if (text->bv_owner) {
-		screen_->HideCursor();
-		screen_->ToggleSelection(text, bv_);
-		text->SelectWord(bv_);
-		screen_->ToggleSelection(text, bv_, false);
-	    } else {
-		text->SelectWord(bv_);
-	    }
-	    /* This will fit the cursor on the screen
-	     * if necessary */
-	    update(text, BufferView::SELECT|BufferView::FITCUR);
+		if (text->bv_owner) {
+			screen_->hideCursor();
+			screen_->toggleSelection(text, bv_);
+			text->selectWord(bv_, LyXText::WHOLE_WORD_STRICT);
+			screen_->toggleSelection(text, bv_, false);
+		} else {
+			text->selectWord(bv_, LyXText::WHOLE_WORD_STRICT);
+		}
+		/* This will fit the cursor on the screen
+		 * if necessary */
+		update(text, BufferView::SELECT|BufferView::FITCUR);
 	}
 }
 
@@ -703,7 +719,7 @@ void BufferView::Pimpl::doubleClick(int /*x*/, int /*y*/, unsigned int button)
 void BufferView::Pimpl::tripleClick(int /*x*/, int /*y*/, unsigned int button)
 {
 	// select a line
-	if (buffer_)
+	if (!buffer_)
 		return;
 
 	LyXText * text = bv_->getLyXText();
@@ -712,13 +728,17 @@ void BufferView::Pimpl::tripleClick(int /*x*/, int /*y*/, unsigned int button)
 	    return;
 
 	if (screen_.get() && (button == 1)) {
-		screen_->HideCursor();
-		screen_->ToggleSelection(text, bv_);
-		text->CursorHome(bv_);
-		text->sel_cursor = text->cursor;
-		text->CursorEnd(bv_);
-		text->SetSelection(bv_);
-		screen_->ToggleSelection(text, bv_, false);
+		if (text->bv_owner) {
+			screen_->hideCursor();
+			screen_->toggleSelection(text, bv_);
+		}
+		text->cursorHome(bv_);
+		text->selection.cursor = text->cursor;
+		text->cursorEnd(bv_);
+		text->setSelection(bv_);
+		if (text->bv_owner) {
+			screen_->toggleSelection(text, bv_, false);
+		}
 		/* This will fit the cursor on the screen
 		 * if necessary */
 		update(text, BufferView::SELECT|BufferView::FITCUR);
@@ -726,6 +746,30 @@ void BufferView::Pimpl::tripleClick(int /*x*/, int /*y*/, unsigned int button)
 }
 
 
+void BufferView::Pimpl::selectionRequested()
+{
+	if (!available())
+		return;
+ 
+	string const sel(bv_->getLyXText()->selectionAsString(bv_->buffer(),
+							      false)); 
+	if (!sel.empty()) {
+		workarea_.putClipboard(sel);
+	}
+}
+
+ 
+void BufferView::Pimpl::selectionLost()
+{
+	if (active() && available()) { 
+		hideCursor();
+		toggleSelection();
+		bv_->getLyXText()->clearSelection();
+		showCursor(); 
+	}
+}
+
+ 
 void BufferView::Pimpl::enterView()
 {
 	if (active() && available()) {
@@ -752,16 +796,16 @@ void BufferView::Pimpl::workAreaButtonRelease(int x, int y,
 	// If we hit an inset, we have the inset coordinates in these
 	// and inset_hit points to the inset.  If we do not hit an
 	// inset, inset_hit is 0, and inset_x == x, inset_y == y.
-	Inset * inset_hit = checkInsetHit(bv_->text, x, y, button);
+	Inset * inset_hit = checkInsetHit(bv_->text, x, y);
 
 	if (bv_->theLockingInset()) {
 		// We are in inset locking mode.
 
 		/* LyX does a kind of work-area grabbing for insets.
 		   Only a ButtonPress Event outside the inset will 
-		   force a InsetUnlock. */
+		   force a insetUnlock. */
 		bv_->theLockingInset()->
-			InsetButtonRelease(bv_, x, y, button);
+			insetButtonRelease(bv_, x, y, button);
 		return;
 	}
 	
@@ -770,15 +814,35 @@ void BufferView::Pimpl::workAreaButtonRelease(int x, int y,
 	if (button == 2)
 		return;
 
-	bv_->setState();
+	// finish selection
+	if (button == 1) {
+		workarea_.haveSelection(bv_->getLyXText()->selection.set());
+	}
+ 
+	setState();
 	owner_->showState();
+	owner_->updateMenubar();
+	owner_->updateToolbar();
 
 	// Did we hit an editable inset?
 	if (inset_hit) {
-		// Inset like error, notes and figures
 		selection_possible = false;
 
+		// if we reach this point with a selection, it
+		// must mean we are currently selecting.
+		// But we don't want to open the inset
+		// because that is annoying for the user. 
+		// So just pretend we didn't hit it.
+		// this is OK because a "kosher" ButtonRelease
+		// will follow a ButtonPress that clears
+		// the selection.
+		// Note this also fixes selection drawing
+		// problems if we end up opening an inset
+		if (bv_->getLyXText()->selection.set())
+			return;
+ 
 		// CHECK fix this proper in 0.13
+		// well, maybe 13.0 !!!!!!!!!
 
 		// Following a ref shouldn't issue
 		// a push on the undo-stack
@@ -793,204 +857,130 @@ void BufferView::Pimpl::workAreaButtonRelease(int x, int y,
 		// (Joacim)
 		// ...or maybe the SetCursorParUndo()
 		// below isn't necessary at all anylonger?
-		if (inset_hit->LyxCode() == Inset::REF_CODE) {
-			bv_->text->SetCursorParUndo(bv_->buffer());
+		if (inset_hit->lyxCode() == Inset::REF_CODE) {
+			setCursorParUndo(bv_);
 		}
 
-		owner_->getLyXFunc()->Dispatch(LFUN_MESSAGE,
-					       inset_hit->EditMessage());
+		owner_->message(inset_hit->editMessage());
 
-		if (inset_hit->Editable()==Inset::HIGHLY_EDITABLE) {
+		if (isHighlyEditableInset(inset_hit)) {
 			// Highly editable inset, like math
 			UpdatableInset *inset = (UpdatableInset *)inset_hit;
-			inset->InsetButtonRelease(bv_, x, y, button);
+			inset->insetButtonRelease(bv_, x, y, button);
 		} else {
-			inset_hit->InsetButtonRelease(bv_, x, y, button);
-			inset_hit->Edit(bv_, x, y, button);
+			inset_hit->insetButtonRelease(bv_, x, y, button);
+			inset_hit->edit(bv_, x, y, button);
 		}
 		return;
 	}
 
-#ifndef NEW_INSETS
-	// check whether we want to open a float
-	if (bv_->text) {
-		bool hit = false;
-		char c = ' ';
-		if (bv_->text->cursor.pos() <
-		    bv_->text->cursor.par()->Last()) {
-			c = bv_->text->cursor.par()->
-				GetChar(bv_->text->cursor.pos());
-		}
-	       if(!bv_->text->selection)
-		if (c == LyXParagraph::META_FOOTNOTE
-		    || c == LyXParagraph::META_MARGIN
-		    || c == LyXParagraph::META_FIG
-		    || c == LyXParagraph::META_TAB
-		    || c == LyXParagraph::META_WIDE_FIG
-		    || c == LyXParagraph::META_WIDE_TAB
-                    || c == LyXParagraph::META_ALGORITHM){
-			hit = true;
-		} else
-			if (bv_->text->cursor.pos() - 1 >= 0) {
-			c = bv_->text->cursor.par()->
-				GetChar(bv_->text->cursor.pos() - 1);
-			if (c == LyXParagraph::META_FOOTNOTE
-			    || c == LyXParagraph::META_MARGIN
-			    || c == LyXParagraph::META_FIG
-			    || c == LyXParagraph::META_TAB
-			    || c == LyXParagraph::META_WIDE_FIG 
-			    || c == LyXParagraph::META_WIDE_TAB
-			    || c == LyXParagraph::META_ALGORITHM){
-				// We are one step too far to the right
-				bv_->text->CursorLeft(bv_);
-				hit = true;
-			}
-		}
-		if (hit == true) {
-			bv_->toggleFloat();
-			selection_possible = false;
-			return;
-		}
-	}
-	// Do we want to close a float? (click on the float-label)
-	if (bv_->text->cursor.row()->par()->footnoteflag == 
-	    LyXParagraph::OPEN_FOOTNOTE
-	    && bv_->text->cursor.row()->previous() &&
-	    bv_->text->cursor.row()->previous()->par()->
-	    footnoteflag != LyXParagraph::OPEN_FOOTNOTE){
-		LyXFont font(LyXFont::ALL_SANE);
-		font.setSize(LyXFont::SIZE_FOOTNOTE);
-
-		int box_x = 20; // LYX_PAPER_MARGIN;
-		box_x += lyxfont::width(" wide-tab ", font);
-
-		unsigned int screen_first = bv_->text->first;
-
-		if (x < box_x
-		    && y + screen_first > bv_->text->cursor.y() -
-		    bv_->text->cursor.row()->baseline()
-		    && y + screen_first < bv_->text->cursor.y() -
-		    bv_->text->cursor.row()->baseline()
-		    + lyxfont::maxAscent(font) * 1.2 + lyxfont::maxDescent(font) * 1.2) {
-			bv_->toggleFloat();
-			selection_possible = false;
-			return;
-		}
-	}
-#else
-	// check whether we want to open a float
-	if (bv_->text) {
-		bool hit = false;
-		char c = ' ';
-		if (bv_->text->cursor.pos() <
-		    bv_->text->cursor.par()->size()) {
-			c = bv_->text->cursor.par()->
-				GetChar(bv_->text->cursor.pos());
-		}
-			if (bv_->text->cursor.pos() - 1 >= 0) {
-			c = bv_->text->cursor.par()->
-				GetChar(bv_->text->cursor.pos() - 1);
-		}
-		if (hit == true) {
-			selection_possible = false;
-			return;
-		}
-	}
-#endif
 	// Maybe we want to edit a bibitem ale970302
 	if (bv_->text->cursor.par()->bibkey && x < 20 + 
-	    bibitemMaxWidth(bv_, textclasslist.
-			    TextClass(buffer_->
-				      params.textclass).defaultfont())) {
-		bv_->text->cursor.par()->bibkey->Edit(bv_, 0, 0, 0);
+	    bibitemMaxWidth(bv_, textclasslist[buffer_->params.textclass].defaultfont())) {
+		bv_->text->cursor.par()->bibkey->edit(bv_, 0, 0, 0);
 	}
 
 	return;
 }
 
 
-/* 
- * Returns an inset if inset was hit. 0 otherwise.
- * If hit, the coordinates are changed relative to the inset. 
- * Otherwise coordinates are not changed, and false is returned.
- */
-Inset * BufferView::Pimpl::checkInsetHit(LyXText * text, int & x, int & y,
-					 unsigned int /* button */)
+Box BufferView::Pimpl::insetDimensions(LyXText const & text,
+				       LyXCursor const & cursor) const
 {
-	if (!screen_.get())
+	Paragraph /*const*/ & par = *cursor.par();
+	pos_type const pos = cursor.pos();
+
+	lyx::Assert(par.getInset(pos));
+ 
+	Inset const & inset(*par.getInset(pos));
+
+	LyXFont const & font = text.getFont(buffer_, &par, pos);
+ 
+	int const width = inset.width(bv_, font);
+	int const inset_x = font.isVisibleRightToLeft()
+		? (cursor.x() - width) : cursor.x();
+ 
+	return Box(
+		inset_x + inset.scroll(),
+		inset_x + width,
+		cursor.y() - inset.ascent(bv_, font),
+		cursor.y() + inset.descent(bv_, font));
+}
+ 
+ 
+Inset * BufferView::Pimpl::checkInset(LyXText const & text,
+				      LyXCursor const & cursor,
+				      int & x, int & y) const
+{
+	pos_type const pos(cursor.pos());
+	Paragraph /*const*/ & par(*cursor.par());
+
+	if (pos >= par.size() || !par.isInset(pos)) {
+		return 0;
+	}
+
+	Inset /*const*/ * inset = par.getInset(pos);
+ 
+	if (!isEditableInset(inset)) {
+		return 0;
+	}
+
+	Box b(insetDimensions(text, cursor));
+
+	if (!b.contained(x, y)) {
+		lyxerr[Debug::GUI] << "Missed inset at x,y " << x << "," << y 
+			<< " box " << b << endl;
 		return 0;
+	}
+ 
+	text.setCursor(bv_, &par, pos, true);
+ 
+	x -= b.x1;
+	// The origin of an inset is on the baseline
+	y -= (text.cursor.y());
   
-	int y_tmp = y + text->first;
+	return inset;
+}
+
+ 
+Inset * BufferView::Pimpl::checkInsetHit(LyXText * text, int & x, int & y)
+{
+	if (!screen_.get())
+		return 0;
   
+	int y_tmp = y + text->first_y;
+ 
 	LyXCursor cursor;
-	text->SetCursorFromCoordinates(bv_, cursor, x, y_tmp);
-	text->SetCursor(bv_, cursor, cursor.par(),cursor.pos(),true);
-
-
-#ifndef NEW_INSETS
-	if (cursor.pos() < cursor.par()->Last()
-#else
-	if (cursor.pos() < cursor.par()->size()
-#endif
-	    && cursor.par()->GetChar(cursor.pos()) == LyXParagraph::META_INSET
-	    && cursor.par()->GetInset(cursor.pos())
-	    && cursor.par()->GetInset(cursor.pos())->Editable()) {
+	text->setCursorFromCoordinates(bv_, cursor, x, y_tmp);
+ 
+	Inset * inset(checkInset(*text, cursor, x, y_tmp));
 
-		// Check whether the inset really was hit
-		Inset * tmpinset = cursor.par()->GetInset(cursor.pos());
-		LyXFont font = text->GetFont(bv_->buffer(),
-						  cursor.par(), cursor.pos());
-		int const width = tmpinset->width(bv_, font);
-		int const inset_x = font.isVisibleRightToLeft()
-			? cursor.x() - width : cursor.x();
-		int const start_x = inset_x + tmpinset->scroll();
-		int const end_x = inset_x + width;
-
-		if (x > start_x && x < end_x
-		    && y_tmp > cursor.y() - tmpinset->ascent(bv_, font)
-		    && y_tmp < cursor.y() + tmpinset->descent(bv_, font)) {
-			text->SetCursor(bv_, cursor.par(),cursor.pos(), true);
-			x = x - start_x;
-			// The origin of an inset is on the baseline
-			y = y_tmp - (text->cursor.y()); 
-			return tmpinset;
-		}
+	if (inset) {
+		y = y_tmp;
+		return inset;
+	}
+ 
+	// look at previous position
+ 
+	if (cursor.pos() == 0) {
+		return 0;
 	}
 
-	if ((cursor.pos() - 1 >= 0) &&
-	    (cursor.par()->GetChar(cursor.pos()-1) == LyXParagraph::META_INSET) &&
-	    (cursor.par()->GetInset(cursor.pos() - 1)) &&
-	    (cursor.par()->GetInset(cursor.pos() - 1)->Editable())) {
-		Inset * tmpinset = cursor.par()->GetInset(cursor.pos()-1);
-		LyXFont font = text->GetFont(bv_->buffer(), cursor.par(),
-						  cursor.pos()-1);
-		int const width = tmpinset->width(bv_, font);
-		int const inset_x = font.isVisibleRightToLeft()
-			? cursor.x() : cursor.x() - width;
-		int const start_x = inset_x + tmpinset->scroll();
-		int const end_x = inset_x + width;
-
-		if (x > start_x && x < end_x
-		    && y_tmp > cursor.y() - tmpinset->ascent(bv_, font)
-		    && y_tmp < cursor.y() + tmpinset->descent(bv_, font)) {
-#if 0
-			if (move_cursor && (tmpinset != bv_->theLockingInset()))
-#endif
-				text->SetCursor(bv_, cursor.par(),cursor.pos()-1,true);
-			x = x - start_x;
-			// The origin of an inset is on the baseline
-			y = y_tmp - (text->cursor.y()); 
-			return tmpinset;
-		}
+	// move back one
+	text->setCursor(bv_, cursor, cursor.par(), cursor.pos() - 1, true);
+
+	inset = checkInset(*text, cursor, x, y_tmp);
+	if (inset) {
+		y = y_tmp;
 	}
-	return 0;
+	return inset;
 }
 
 
 void BufferView::Pimpl::workAreaExpose()
 {
-	static int work_area_width = 0;
-	static unsigned int work_area_height = 0;
+	static int work_area_width;
+	static unsigned int work_area_height;
 
 	bool const widthChange = workarea_.workWidth() != work_area_width;
 	bool const heightChange = workarea_.height() != work_area_height;
@@ -1000,8 +990,8 @@ void BufferView::Pimpl::workAreaExpose()
 	work_area_height = workarea_.height();
 	if (buffer_ != 0) {
 		if (widthChange) {
-			// All buffers need a resize
-			bufferlist.resize();
+			// The visible LyXView need a resize
+			owner_->resize();
 
 			// Remove all texts from the textcache
 			// This is not _really_ what we want to do. What
@@ -1012,18 +1002,19 @@ void BufferView::Pimpl::workAreaExpose()
 			if (lyxerr.debugging())
 				textcache.show(lyxerr, "Expose delete all");
 			textcache.clear();
+			buffer_->resizeInsets(bv_);
 		} else if (heightChange) {
 			// Rebuild image of current screen
 			updateScreen();
 			// fitCursor() ensures we don't jump back
 			// to the start of the document on vertical
 			// resize
-			fitCursor(bv_->text);
+			fitCursor();
 
 			// The main window size has changed, repaint most stuff
 			redraw();
 		} else if (screen_.get())
-		    screen_->Redraw(bv_->text, bv_);
+		    screen_->redraw(bv_->text, bv_);
 	} else {
 		// Grey box when we don't have a buffer
 		workarea_.greyOut();
@@ -1038,7 +1029,28 @@ void BufferView::Pimpl::workAreaExpose()
 
 void BufferView::Pimpl::update()
 {
-	if (screen_.get()) screen_->Update(bv_->text, bv_);
+	if (screen_.get() &&
+		(!bv_->theLockingInset() || !bv_->theLockingInset()->nodraw()))
+	{
+		LyXText::text_status st = bv_->text->status();
+		screen_->update(bv_->text, bv_);
+		bool fitc = false;
+		while (bv_->text->status() == LyXText::CHANGED_IN_DRAW) {
+			if (bv_->text->fullRebreak(bv_)) {
+				st = LyXText::NEED_MORE_REFRESH;
+				bv_->text->setCursor(bv_, bv_->text->cursor.par(),
+									 bv_->text->cursor.pos());
+				fitc = true;
+			}
+			bv_->text->status(bv_, st);
+			screen_->update(bv_->text, bv_);
+		}
+		// do this here instead of in the screen::update because of
+		// the above loop!
+		bv_->text->status(bv_, LyXText::UNCHANGED);
+		if (fitc)
+			fitCursor();
+	}
 }
 
 // Values used when calling update:
@@ -1083,21 +1095,22 @@ void BufferView::Pimpl::update(LyXText * text, BufferView::UpdateCodes f)
 {
 	owner_->updateLayoutChoice();
 
-	if (!text->selection && (f & SELECT)) {
-		text->sel_cursor = text->cursor;
+	if (!text->selection.set() && (f & SELECT)) {
+		text->selection.cursor = text->cursor;
 	}
 
-	text->FullRebreak(bv_);
+	text->fullRebreak(bv_);
 
 	if (text->inset_owner) {
-	    text->inset_owner->SetUpdateStatus(bv_, InsetText::NONE);
-	    bv_->updateInset(text->inset_owner, true);
-	} else
+		text->inset_owner->setUpdateStatus(bv_, InsetText::NONE);
+	    updateInset(text->inset_owner, false);
+	} else {
 	    update();
-
+	}
+		
 	if ((f & FITCUR)) {
-		fitCursor(text);
-      	}
+		fitCursor();
+	}
 
 	if ((f & CHANGE)) {
 		buffer_->markDirty();
@@ -1108,31 +1121,24 @@ void BufferView::Pimpl::update(LyXText * text, BufferView::UpdateCodes f)
 // Callback for cursor timer
 void BufferView::Pimpl::cursorToggle()
 {
-	// Quite a nice place for asyncron Inset updating, isn't it?
-	// Actually no! This is run even if no buffer exist... so (Lgb)
 	if (!buffer_) {
 		cursor_timeout.restart();
 		return;
 	}
  
-	int status = 1;
-	int pid = waitpid(static_cast<pid_t>(0), &status, WNOHANG);
-	if (pid == -1) // error find out what is wrong
-		; // ignore it for now.
-	else if (pid > 0)
-		sigchldhandler(pid, &status);
-
-	updatelist.update(bv_);
-	
 	if (!screen_.get()) {
 		cursor_timeout.restart();
 		return;
 	}
 
+	/* FIXME */
+	extern void reapSpellchecker(void);
+	reapSpellchecker();
+	 
 	if (!bv_->theLockingInset()) {
-		screen_->CursorToggle(bv_->text, bv_);
+		screen_->cursorToggle(bv_);
 	} else {
-		bv_->theLockingInset()->ToggleInsetCursor(bv_);
+		bv_->theLockingInset()->toggleInsetCursor(bv_);
 	}
 	
 	cursor_timeout.restart();
@@ -1144,23 +1150,22 @@ void BufferView::Pimpl::cursorPrevious(LyXText * text)
 	if (!text->cursor.row()->previous())
 		return;
 	
-	int y = text->first;
-	if (text->inset_owner)
-		y += bv_->text->first;
+	int y = text->first_y;
 	Row * cursorrow = text->cursor.row();
-	text->SetCursorFromCoordinates(bv_, bv_->text->cursor.x_fix(), y);
-	bv_->text->FinishUndo();
+	
+	text->setCursorFromCoordinates(bv_, bv_->text->cursor.x_fix(), y);
+	finishUndo();
 	// This is to allow jumping over large insets
 	if ((cursorrow == text->cursor.row()))
-		text->CursorUp(bv_);
+		text->cursorUp(bv_);
 	
   	if (text->inset_owner ||
 	    text->cursor.row()->height() < workarea_.height())
-		screen_->Draw(bv_->text, bv_,
+		screen_->draw(bv_->text, bv_,
 			      text->cursor.y()
 			      - text->cursor.row()->baseline()
 			      + text->cursor.row()->height()
-			      - workarea_.height() + 1 );
+			      - workarea_.height() + 1);
 	updateScrollbar();
 }
 
@@ -1170,21 +1175,21 @@ void BufferView::Pimpl::cursorNext(LyXText * text)
 	if (!text->cursor.row()->next())
 		return;
 	
-	int y = text->first + workarea_.height();
+	int y = text->first_y + workarea_.height();
 //	if (text->inset_owner)
 //		y += bv_->text->first;
-	text->GetRowNearY(y);
+	text->getRowNearY(y);
     
 	Row * cursorrow = text->cursor.row();
-	text->SetCursorFromCoordinates(bv_, text->cursor.x_fix(), y); // + workarea_->height());
-	bv_->text->FinishUndo();
+	text->setCursorFromCoordinates(bv_, text->cursor.x_fix(), y); // + workarea_->height());
+	finishUndo();
 	// This is to allow jumping over large insets
 	if ((cursorrow == bv_->text->cursor.row()))
-		text->CursorDown(bv_);
+		text->cursorDown(bv_);
 	
  	if (text->inset_owner ||
 	    text->cursor.row()->height() < workarea_.height())
-		screen_->Draw(bv_->text, bv_, text->cursor.y() -
+		screen_->draw(bv_->text, bv_, text->cursor.y() -
 			      text->cursor.row()->baseline());
 	updateScrollbar();
 }
@@ -1192,7 +1197,8 @@ void BufferView::Pimpl::cursorNext(LyXText * text)
 
 bool BufferView::Pimpl::available() const
 {
-	if (buffer_ && bv_->text) return true;
+	if (buffer_ && bv_->text)
+		return true;
 	return false;
 }
 
@@ -1200,7 +1206,7 @@ bool BufferView::Pimpl::available() const
 void BufferView::Pimpl::beforeChange(LyXText * text)
 {
 	toggleSelection();
-	text->ClearSelection(bv_);
+	text->clearSelection();
 }
 
 
@@ -1212,8 +1218,9 @@ void BufferView::Pimpl::savePosition(unsigned int i)
 				      bv_->text->cursor.par()->id(),
 				      bv_->text->cursor.pos());
 	if (i > 0) {
-		string const str = _("Saved bookmark") + ' ' + tostr(i);
-		owner_->getLyXFunc()->Dispatch(LFUN_MESSAGE, str);
+		ostringstream str;
+		str << _("Saved bookmark") << ' ' << i;
+		owner_->message(str.str().c_str());
 	}
 }
 
@@ -1223,7 +1230,7 @@ void BufferView::Pimpl::restorePosition(unsigned int i)
 	if (i >= saved_positions_num)
 		return;
 
-	string fname = saved_positions[i].filename;
+	string const fname = saved_positions[i].filename;
 
 	beforeChange(bv_->text);
 
@@ -1231,24 +1238,21 @@ void BufferView::Pimpl::restorePosition(unsigned int i)
 		Buffer * b = bufferlist.exists(fname) ?
 	 		bufferlist.getBuffer(fname) :
 			bufferlist.loadLyXFile(fname); // don't ask, just load it
-		if (b != 0 ) buffer(b);
+		if (b != 0) buffer(b);
 	}
 
-	LyXParagraph * par = bv_->text->GetParFromID(saved_positions[i].par_id);
+	Paragraph * par = buffer_->getParFromID(saved_positions[i].par_id);
 	if (!par)
 		return;
 
-#ifndef NEW_INSETS
-	bv_->text->SetCursor(bv_, par,
-			     min(par->Last(), saved_positions[i].par_pos));
-#else
-	bv_->text->SetCursor(bv_, par,
+	bv_->text->setCursor(bv_, par,
 			     min(par->size(), saved_positions[i].par_pos));
-#endif
+
 	update(bv_->text, BufferView::SELECT|BufferView::FITCUR);
 	if (i > 0) {
-		string const str = _("Moved to bookmark") + ' ' + tostr(i);
-		owner_->getLyXFunc()->Dispatch(LFUN_MESSAGE, str);
+		ostringstream str;
+		str << _("Moved to bookmark") << ' ' << i;
+		owner_->message(str.str().c_str());
 	}
 }
 
@@ -1268,8 +1272,7 @@ void BufferView::Pimpl::setState()
 		return;
 
 	LyXText * text = bv_->getLyXText();
-	if (text->real_current_font.isRightToLeft() &&
-	    text->real_current_font.latex() != LyXFont::ON) {
+	if (text->real_current_font.isRightToLeft()) {
 		if (owner_->getIntl()->keymap == Intl::PRIMARY)
 			owner_->getIntl()->KeyMapSec();
 	} else {
@@ -1281,19 +1284,19 @@ void BufferView::Pimpl::setState()
 
 void BufferView::Pimpl::insetSleep()
 {
-	if (bv_->theLockingInset() && !bv_->inset_slept) {
-		bv_->theLockingInset()->GetCursorPos(bv_, bv_->slx, bv_->sly);
-		bv_->theLockingInset()->InsetUnlock(bv_);
-		bv_->inset_slept = true;
+	if (bv_->theLockingInset() && !inset_slept) {
+		bv_->theLockingInset()->getCursorPos(bv_, bv_->slx, bv_->sly);
+		bv_->theLockingInset()->insetUnlock(bv_);
+		inset_slept = true;
 	}
 }
 
 
 void BufferView::Pimpl::insetWakeup()
 {
-	if (bv_->theLockingInset() && bv_->inset_slept) {
-		bv_->theLockingInset()->Edit(bv_, bv_->slx, bv_->sly, 0);
-		bv_->inset_slept = false;
+	if (bv_->theLockingInset() && inset_slept) {
+		bv_->theLockingInset()->edit(bv_, bv_->slx, bv_->sly, 0);
+		inset_slept = false;
 	}
 }
 
@@ -1301,11 +1304,11 @@ void BufferView::Pimpl::insetWakeup()
 void BufferView::Pimpl::insetUnlock()
 {
 	if (bv_->theLockingInset()) {
-		if (!bv_->inset_slept)
-			bv_->theLockingInset()->InsetUnlock(bv_);
+		if (!inset_slept)
+			bv_->theLockingInset()->insetUnlock(bv_);
 		bv_->theLockingInset(0);
-		bv_->text->FinishUndo();
-		bv_->inset_slept = false;
+		finishUndo();
+		inset_slept = false;
 	}
 }
 
@@ -1336,29 +1339,40 @@ bool BufferView::Pimpl::belowMouse() const
 
 void BufferView::Pimpl::showCursor()
 {
-	if (screen_.get())
-		screen_->ShowCursor(bv_->text, bv_);
+	if (screen_.get()) {
+		if (bv_->theLockingInset())
+			bv_->theLockingInset()->showInsetCursor(bv_);
+		else
+			screen_->showCursor(bv_->text, bv_);
+	}
 }
 
 
 void BufferView::Pimpl::hideCursor()
 {
-	if (screen_.get())
-		screen_->HideCursor();
+	if (screen_.get()) {
+		if (!bv_->theLockingInset())
+//			bv_->theLockingInset()->hideInsetCursor(bv_);
+//		else
+			screen_->hideCursor();
+	}
 }
 
 
 void BufferView::Pimpl::toggleSelection(bool b)
 {
-	if (screen_.get())
-		screen_->ToggleSelection(bv_->text, bv_, b);
+	if (screen_.get()) {
+		if (bv_->theLockingInset())
+			bv_->theLockingInset()->toggleSelection(bv_, b);
+		screen_->toggleSelection(bv_->text, bv_, b);
+	}
 }
 
 
 void BufferView::Pimpl::toggleToggle()
 {
 	if (screen_.get())
-		screen_->ToggleToggle(bv_->text, bv_);
+		screen_->toggleToggle(bv_->text, bv_);
 }
 
 
@@ -1366,9 +1380,9 @@ void BufferView::Pimpl::center()
 {
 	beforeChange(bv_->text);
 	if (bv_->text->cursor.y() > static_cast<int>((workarea_.height() / 2))) {
-		screen_->Draw(bv_->text, bv_, bv_->text->cursor.y() - workarea_.height() / 2);
+		screen_->draw(bv_->text, bv_, bv_->text->cursor.y() - workarea_.height() / 2);
 	} else {
-		screen_->Draw(bv_->text, bv_, 0);
+		screen_->draw(bv_->text, bv_, 0);
 	}
 	update(bv_->text, BufferView::SELECT|BufferView::FITCUR);
 	redraw();
@@ -1377,19 +1391,21 @@ void BufferView::Pimpl::center()
 
 void BufferView::Pimpl::pasteClipboard(bool asPara) 
 {
-	if (!buffer_) return;
+	if (!buffer_)
+		return;
 
-	screen_->HideCursor();
+	screen_->hideCursor();
 	beforeChange(bv_->text);
 	
 	string const clip(workarea_.getClipboard());
 	
-	if (clip.empty()) return;
+	if (clip.empty())
+		return;
 
 	if (asPara) {
-		bv_->text->InsertStringB(bv_, clip);
+		bv_->getLyXText()->insertStringAsParagraphs(bv_, clip);
 	} else {
-		bv_->text->InsertStringA(bv_, clip);
+		bv_->getLyXText()->insertStringAsLines(bv_, clip);
 	}
 	update(bv_->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 }
@@ -1405,35 +1421,40 @@ void BufferView::Pimpl::stuffClipboard(string const & stuff) const
  * Dispatch functions for actions which can be valid for BufferView->text
  * and/or InsetText->text!!!
  */
-static LyXText * TEXT(BufferView * bv) { return bv->getLyXText(); }
+
 
 inline
 void BufferView::Pimpl::moveCursorUpdate(bool selecting)
 {
-	if (selecting || TEXT(bv_)->mark_set) {
-		TEXT(bv_)->SetSelection(bv_);
-		if (TEXT(bv_)->bv_owner)
-			bv_->toggleToggle();
+	LyXText * lt = bv_->getLyXText();
+	
+	if (selecting || lt->selection.mark()) {
+		lt->setSelection(bv_);
+		if (lt->bv_owner)
+			toggleToggle();
+		else
+			updateInset(lt->inset_owner, false);
+	}
+	if (lt->bv_owner) {
+		update(lt, BufferView::SELECT|BufferView::FITCUR);
+		showCursor();
 	}
-	update(TEXT(bv_), BufferView::SELECT|BufferView::FITCUR);
-	showCursor();
 	
 	/* ---> Everytime the cursor is moved, show the current font state. */
 	// should this too me moved out of this func?
 	//owner->showState();
-	bv_->setState();
+	setState();
 }
 
 
 Inset * BufferView::Pimpl::getInsetByCode(Inset::Code code)
 {
-	LyXCursor cursor = TEXT(bv_)->cursor;
+	LyXCursor cursor = bv_->getLyXText()->cursor;
 	Buffer::inset_iterator it =
 		find_if(Buffer::inset_iterator(
 			cursor.par(), cursor.pos()),
 			buffer_->inset_iterator_end(),
-			compare_memfun(&Inset::LyxCode, code)
-			);
+			lyx::compare_memfun(&Inset::lyxCode, code));
 	return it != buffer_->inset_iterator_end() ? (*it) : 0;
 }
 
@@ -1447,18 +1468,23 @@ void BufferView::Pimpl::MenuInsertLyXFile(string const & filen)
 		string initpath = lyxrc.document_path;
 
 		if (available()) {
-			string const trypath = owner_->buffer()->filepath;
+			string const trypath = owner_->buffer()->filePath();
 			// If directory is writeable, use this as default.
-			if (IsDirWriteable(trypath) == 1)
+			if (IsDirWriteable(trypath))
 				initpath = trypath;
 		}
 
-		FileDialog fileDlg(bv_->owner(), _("Select LyX document to insert"),
+		FileDialog fileDlg(bv_->owner(),
+				   _("Select LyX document to insert"),
 			LFUN_FILE_INSERT,
-			make_pair(string(_("Documents")), string(lyxrc.document_path)),
-			make_pair(string(_("Examples")), string(AddPath(system_lyxdir, "examples"))));
-
-		FileDialog::Result result = fileDlg.Select(initpath, _("*.lyx| LyX Documents (*.lyx)"));
+			make_pair(string(_("Documents|#o#O")),
+				  string(lyxrc.document_path)),
+			make_pair(string(_("Examples|#E#e")),
+				  string(AddPath(system_lyxdir, "examples"))));
+
+		FileDialog::Result result =
+			fileDlg.Select(initpath,
+				       _("*.lyx| LyX Documents (*.lyx)"));
  
 		if (result.first == FileDialog::Later)
 			return;
@@ -1467,69 +1493,66 @@ void BufferView::Pimpl::MenuInsertLyXFile(string const & filen)
 
 		// check selected filename
 		if (filename.empty()) {
-			owner_->getLyXFunc()->Dispatch(LFUN_MESSAGE,
-						       _("Canceled."));
+			owner_->message(_("Canceled."));
 			return;
 		}
 	}
 
-	// get absolute path of file and make sure the filename ends
-	// with .lyx
-	filename = MakeAbsPath(filename);
-	if (!IsLyXFilename(filename))
-		filename += ".lyx";
+	// get absolute path of file and add ".lyx" to the filename if
+	// necessary
+	filename = FileSearch(string(), filename, "lyx");
 
-	// Inserts document
-	string const s1 = _("Inserting document") + ' '
-		+ MakeDisplayPath(filename) + " ...";
-	owner_->getLyXFunc()->Dispatch(LFUN_MESSAGE, s1);
+	string const disp_fn(MakeDisplayPath(filename));
+	
+	ostringstream s1;
+	s1 << _("Inserting document") << ' '
+	   << disp_fn << " ...";
+	owner_->message(s1.str().c_str());
 	bool const res = bv_->insertLyXFile(filename);
 	if (res) {
-		string const str = _("Document") + ' '
-			+ MakeDisplayPath(filename) + ' ' + _("inserted.");
-		owner_->getLyXFunc()->Dispatch(LFUN_MESSAGE, str);
+		ostringstream str;
+		str << _("Document") << ' ' << disp_fn
+		    << ' ' << _("inserted.");
+		owner_->message(str.str().c_str());
 	} else {
-		string const str = _("Could not insert document") + ' '
-			+ MakeDisplayPath(filename);
-		owner_->getLyXFunc()->Dispatch(LFUN_MESSAGE, str);
+		ostringstream str;
+		str << _("Could not insert document") << ' '
+		    << disp_fn;
+		owner_->message(str.str().c_str());
 	}
 }
 
 
 bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 {
+	lyxerr[Debug::ACTION] << "BufferView::Pimpl::Dispatch: action["
+			      << action <<"] arg[" << argument << "]" << endl;
+	
 	switch (action) {
 		// --- Misc -------------------------------------------
 	case LFUN_APPENDIX:
+	{
 		if (available()) {
-			TEXT(bv_)->toggleAppendix(bv_);
-			update(TEXT(bv_), BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+			LyXText * lt = bv_->getLyXText();
+			lt->toggleAppendix(bv_);
+			update(lt,
+			       BufferView::SELECT
+			       | BufferView::FITCUR
+			       | BufferView::CHANGE);
 		}
-		break;
+	}
+	break;
 
 	case LFUN_TOC_INSERT:
-	case LFUN_LOA_INSERT:
-	case LFUN_LOF_INSERT:
-	case LFUN_LOT_INSERT:
 	{
 		InsetCommandParams p;
-		
-		if (action == LFUN_TOC_INSERT )
-			p.setCmdName( "tableofcontents" );
-		else if (action == LFUN_LOA_INSERT )
-			p.setCmdName( "listofalgorithms" );
-		else if (action == LFUN_LOF_INSERT )
-			p.setCmdName( "listoffigures" );
-		else
-			p.setCmdName( "listoftables" );
-
-		Inset * inset = new InsetTOC( p );
-		if (!bv_->insertInset( inset, "Standard", true ) )
+		p.setCmdName("tableofcontents");
+		Inset * inset = new InsetTOC(p);
+		if (!insertInset(inset, "Standard"))
 			delete inset;
 		break;
 	}
 		
-	case LFUN_TABULAR_FEATURE:
 	case LFUN_SCROLL_INSET:
 		// this is not handled here as this funktion is only aktive
 		// if we have a locking_inset and that one is (or contains)
@@ -1539,12 +1562,12 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	case LFUN_INSET_GRAPHICS:
 	{
 		Inset * new_inset = new InsetGraphics;
-		if (!bv_->insertInset(new_inset)) {
+		if (!insertInset(new_inset)) {
 			delete new_inset;
 		} else {
 			// this is need because you don't use a inset->Edit()
-			bv_->updateInset(new_inset, true);
-			new_inset->Edit(bv_, 0, 0, 0);
+			updateInset(new_inset, true);
+			new_inset->edit(bv_);
 		}
 		break;
 	}
@@ -1556,8 +1579,9 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		
 	case LFUN_PASTESELECTION:
 	{
-	        bool asPara = false;
-		if (argument == "paragraph") asPara = true;
+		bool asPara = false;
+		if (argument == "paragraph")
+			asPara = true;
 		pasteClipboard(asPara);
 	}
 	break;
@@ -1580,11 +1604,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		break;
 		
 	case LFUN_GOTOERROR:
-		bv_->gotoInset(Inset::ERROR_CODE, false);
+		gotoInset(Inset::ERROR_CODE, false);
 		break;
 		
 	case LFUN_GOTONOTE:
-		bv_->gotoInset(Inset::IGNORE_CODE, false);
+		gotoInset(Inset::IGNORE_CODE, false);
 		break;
 
 	case LFUN_REFERENCE_GOTO:
@@ -1592,57 +1616,49 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		vector<Inset::Code> tmp;
 		tmp.push_back(Inset::LABEL_CODE);
 		tmp.push_back(Inset::REF_CODE);
-		bv_->gotoInset(tmp, true);
+		gotoInset(tmp, true);
 		break;
 	}
 
 	case LFUN_HYPHENATION:
-		bv_->hyphenationPoint();
+		specialChar(InsetSpecialChar::HYPHENATION);
+		break;
+		
+	case LFUN_LIGATURE_BREAK:
+		specialChar(InsetSpecialChar::LIGATURE_BREAK);
 		break;
 		
 	case LFUN_LDOTS:
-		bv_->ldots();
+		specialChar(InsetSpecialChar::LDOTS);
 		break;
 		
 	case LFUN_END_OF_SENTENCE:
-		bv_->endOfSentenceDot();
+		specialChar(InsetSpecialChar::END_OF_SENTENCE);
 		break;
 
 	case LFUN_MENU_SEPARATOR:
-		bv_->menuSeparator();
+		specialChar(InsetSpecialChar::MENU_SEPARATOR);
 		break;
 		
 	case LFUN_HFILL:
-		bv_->hfill();
-		break;
-		
-	case LFUN_DEPTH:
-		changeDepth(bv_, TEXT(bv_), 0);
+		hfill();
 		break;
 		
 	case LFUN_DEPTH_MIN:
-		changeDepth(bv_, TEXT(bv_), -1);
+		changeDepth(bv_, bv_->getLyXText(), -1);
 		break;
 		
 	case LFUN_DEPTH_PLUS:
-		changeDepth(bv_, TEXT(bv_), 1);
+		changeDepth(bv_, bv_->getLyXText(), 1);
 		break;
 		
 	case LFUN_FREE:
 		owner_->getDialogs()->setUserFreeFont();
 		break;
-		
-	case LFUN_TEX:
-		Tex(bv_);
-		setState();
-		owner_->showState();
-		break;
 
 	case LFUN_FILE_INSERT:
-	{
 		MenuInsertLyXFile(argument);
-	}
-	break;
+		break;
 	
 	case LFUN_FILE_INSERT_ASCII_PARA:
 		InsertAsciiFile(bv_, argument, true);
@@ -1654,131 +1670,171 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		
 	case LFUN_LAYOUT:
 	{
-		lyxerr.debug() << "LFUN_LAYOUT: (arg) "
-			       << argument << endl;
+		lyxerr[Debug::INFO] << "LFUN_LAYOUT: (arg) "
+				    << argument << endl;
 		
 		// Derive layout number from given argument (string)
 		// and current buffer's textclass (number). */    
-		LyXTextClassList::ClassList::size_type tclass =
-			buffer_->params.textclass;
-		pair <bool, LyXTextClass::size_type> layout = 
-			textclasslist.NumberOfLayout(tclass, argument);
+		textclass_type tclass = buffer_->params.textclass;
+		bool hasLayout =
+			textclasslist[tclass].hasLayout(argument);
+		string layout = argument;
 
 		// If the entry is obsolete, use the new one instead.
-		if (layout.first) {
-			string obs = textclasslist.Style(tclass,layout.second)
+		if (hasLayout) {
+			string const & obs = textclasslist[tclass][layout]
 				.obsoleted_by();
 			if (!obs.empty()) 
-				layout = 
-					textclasslist.NumberOfLayout(tclass, obs);
+				layout = obs;
 		}
 
-		// see if we found the layout number:
-		if (!layout.first) {
+		if (!hasLayout) {
 			owner_->getLyXFunc()->setErrorMessage(
 				string(N_("Layout ")) + argument +
 				N_(" not known"));
 			break;
 		}
 
-		if (current_layout != layout.second) {
+		if (current_layout != layout) {
+			LyXText * lt = bv_->getLyXText();
 			hideCursor();
-			current_layout = layout.second;
-			update(TEXT(bv_),
-			       BufferView::SELECT|BufferView::FITCUR);
-			TEXT(bv_)->SetLayout(bv_, layout.second);
-			owner_->setLayout(layout.second);
-			update(TEXT(bv_),
-			       BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+			current_layout = layout;
+			update(lt,
+			       BufferView::SELECT
+			       | BufferView::FITCUR);
+			lt->setLayout(bv_, layout);
+			owner_->setLayout(layout);
+			update(lt,
+			       BufferView::SELECT
+			       | BufferView::FITCUR
+			       | BufferView::CHANGE);
 			setState();
 		}
 	}
 	break;
 
 	case LFUN_LANGUAGE:
-		Lang(bv_, argument);
+		lang(bv_, argument);
 		setState();
 		owner_->showState();
 		break;
 
 	case LFUN_EMPH:
-		Emph(bv_);
+		emph(bv_);
 		owner_->showState();
 		break;
 
 	case LFUN_BOLD:
-		Bold(bv_);
+		bold(bv_);
 		owner_->showState();
 		break;
 		
 	case LFUN_NOUN:
-		Noun(bv_);
+		noun(bv_);
 		owner_->showState();
 		break;
 		
 	case LFUN_CODE:
-		Code(bv_);
+		code(bv_);
 		owner_->showState();
 		break;
 		
 	case LFUN_SANS:
-		Sans(bv_);
+		sans(bv_);
 		owner_->showState();
 		break;
 		
 	case LFUN_ROMAN:
-		Roman(bv_);
+		roman(bv_);
 		owner_->showState();
 		break;
 		
 	case LFUN_DEFAULT:
-		StyleReset(bv_);
+		styleReset(bv_);
 		owner_->showState();
 		break;
 		
 	case LFUN_UNDERLINE:
-		Underline(bv_);
+		underline(bv_);
 		owner_->showState();
 		break;
 		
 	case LFUN_FONT_SIZE:
-		FontSize(bv_, argument);
+		fontSize(bv_, argument);
 		owner_->showState();
 		break;
 		
 	case LFUN_FONT_STATE:
-		owner_->getLyXFunc()->setMessage(CurrentState(bv_));
+		owner_->getLyXFunc()->setMessage(currentState(bv_));
 		break;
 		
 	case LFUN_UPCASE_WORD:
-		update(TEXT(bv_), BufferView::SELECT|BufferView::FITCUR);
-		TEXT(bv_)->ChangeWordCase(bv_, LyXText::text_uppercase);
-		if (TEXT(bv_)->inset_owner)
-			bv_->updateInset(TEXT(bv_)->inset_owner, true);
-		update(TEXT(bv_), BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-		break;
+	{
+		LyXText * lt = bv_->getLyXText();
+		
+		update(lt,
+		       BufferView::SELECT
+		       | BufferView::FITCUR);
+		lt->changeCase(bv_, LyXText::text_uppercase);
+		if (lt->inset_owner)
+			updateInset(lt->inset_owner, true);
+		update(lt,
+		       BufferView::SELECT
+		       | BufferView::FITCUR
+		       | BufferView::CHANGE);
+	}
+	break;
 		
 	case LFUN_LOWCASE_WORD:
-		update(TEXT(bv_), BufferView::SELECT|BufferView::FITCUR);
-		TEXT(bv_)->ChangeWordCase(bv_, LyXText::text_lowercase);
-		if (TEXT(bv_)->inset_owner)
-			bv_->updateInset(TEXT(bv_)->inset_owner, true);
-		update(TEXT(bv_), BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-		break;
+	{
+		LyXText * lt = bv_->getLyXText();
+		
+		update(lt, BufferView::SELECT|BufferView::FITCUR);
+		lt->changeCase(bv_, LyXText::text_lowercase);
+		if (lt->inset_owner)
+			updateInset(lt->inset_owner, true);
+		update(lt,
+		       BufferView::SELECT
+		       | BufferView::FITCUR
+		       | BufferView::CHANGE);
+	}
+	break;
 		
 	case LFUN_CAPITALIZE_WORD:
-		update(TEXT(bv_), BufferView::SELECT|BufferView::FITCUR);
-		TEXT(bv_)->ChangeWordCase(bv_,
-					     LyXText::text_capitalization);
-		if (TEXT(bv_)->inset_owner)
-			bv_->updateInset(TEXT(bv_)->inset_owner, true);
-		update(TEXT(bv_), BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-		break;
+	{
+		LyXText * lt = bv_->getLyXText();
 		
+		update(lt, BufferView::SELECT|BufferView::FITCUR);
+		lt->changeCase(bv_, LyXText::text_capitalization);
+		if (lt->inset_owner)
+			updateInset(lt->inset_owner, true);
+		update(lt,
+		       BufferView::SELECT
+		       | BufferView::FITCUR
+		       | BufferView::CHANGE);
+	}
+	break;
+
+	case LFUN_TRANSPOSE_CHARS:
+	{
+		LyXText * lt = bv_->getLyXText();
+		
+		update(lt, BufferView::SELECT|BufferView::FITCUR);
+		lt->transposeChars(*bv_);
+		if (lt->inset_owner)
+			updateInset(lt->inset_owner, true);
+		update(lt,
+		       BufferView::SELECT
+		       | BufferView::FITCUR
+		       | BufferView::CHANGE);
+	}
+	break;
+		
+					  
 	case LFUN_INSERT_LABEL:
 		MenuInsertLabel(bv_, argument);
 		break;
-		
+
 	case LFUN_REF_INSERT:
 		if (argument.empty()) {
 			InsetCommandParams p("ref");
@@ -1788,10 +1844,10 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 			p.setFromString(argument);
 
 			InsetRef * inset = new InsetRef(p, *buffer_);
-			if (!bv_->insertInset(inset))
+			if (!insertInset(inset))
 				delete inset;
 			else
-				bv_->updateInset(inset, true);
+				updateInset(inset, true);
 		}
 		break;
 
@@ -1818,7 +1874,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		if (!label.empty()) {
 			//bv_->savePosition(0);
 			if (!bv_->gotoLabel(label))
-				WriteAlert(_("Error"), 
+				Alert::alert(_("Error"), 
 					   _("Couldn't find this label"), 
 					   _("in current document."));
 		}
@@ -1828,37 +1884,28 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		// --- Cursor Movements -----------------------------
 	case LFUN_RIGHT:
 	{
-		bool is_rtl = TEXT(bv_)->cursor.par()->isRightToLeftPar(buffer_->params);
-		if (!TEXT(bv_)->mark_set)
-			beforeChange(TEXT(bv_));
-		update(TEXT(bv_), BufferView::SELECT|BufferView::FITCUR);
+		LyXText * lt = bv_->getLyXText();
+		
+		bool is_rtl = lt->cursor.par()->isRightToLeftPar(buffer_->params);
+		if (!lt->selection.mark())
+			beforeChange(lt);
+		update(lt, BufferView::SELECT|BufferView::FITCUR);
 		if (is_rtl)
-			TEXT(bv_)->CursorLeft(bv_, false);
-#ifndef NEW_INSETS
-		if (TEXT(bv_)->cursor.pos() < TEXT(bv_)->cursor.par()->Last()
-#else
-		if (TEXT(bv_)->cursor.pos() < TEXT(bv_)->cursor.par()->size()
-#endif
-		    && TEXT(bv_)->cursor.par()->GetChar(TEXT(bv_)->cursor.pos())
-		    == LyXParagraph::META_INSET
-		    && TEXT(bv_)->cursor.par()->GetInset(TEXT(bv_)->cursor.pos())
-		    && TEXT(bv_)->cursor.par()->GetInset(TEXT(bv_)->cursor.pos())->Editable() == Inset::HIGHLY_EDITABLE){
-			Inset * tmpinset = TEXT(bv_)->cursor.par()->GetInset(TEXT(bv_)->cursor.pos());
-			owner_->getLyXFunc()->setMessage(tmpinset->EditMessage());
-			int y = 0;
-			if (is_rtl) {
-				LyXFont font = 
-					TEXT(bv_)->GetFont(buffer_,
-							      TEXT(bv_)->cursor.par(),
-							      TEXT(bv_)->cursor.pos());	
-				y = tmpinset->descent(bv_,font);
-			}
-			tmpinset->Edit(bv_, 0, y, 0);
+			lt->cursorLeft(bv_, false);
+		if (lt->cursor.pos() < lt->cursor.par()->size()
+		    && lt->cursor.par()->isInset(lt->cursor.pos())
+		    && isHighlyEditableInset(lt->cursor.par()->getInset(lt->cursor.pos()))) {
+			Inset * tmpinset = lt->cursor.par()->getInset(lt->cursor.pos());
+			owner_->getLyXFunc()->setMessage(tmpinset->editMessage());
+			if (is_rtl)
+				tmpinset->edit(bv_, false);
+			else
+				tmpinset->edit(bv_);
 			break;
 		}
 		if (!is_rtl)
-			TEXT(bv_)->CursorRight(bv_, false);
-		TEXT(bv_)->FinishUndo();
+			lt->cursorRight(bv_, false);
+		finishUndo();
 		moveCursorUpdate(false);
 		owner_->showState();
 	}
@@ -1868,491 +1915,636 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	{
 		// This is soooo ugly. Isn`t it possible to make
 		// it simpler? (Lgb)
-		bool is_rtl = TEXT(bv_)->cursor.par()->isRightToLeftPar(buffer_->params);
-		if (!TEXT(bv_)->mark_set)
-			beforeChange(TEXT(bv_));
-		update(TEXT(bv_), BufferView::SELECT|BufferView::FITCUR);
-		LyXCursor cur = TEXT(bv_)->cursor;
+		LyXText * lt = bv_->getLyXText();
+		bool is_rtl = lt->cursor.par()->isRightToLeftPar(buffer_->params);
+		if (!lt->selection.mark())
+			beforeChange(lt);
+		update(lt, BufferView::SELECT|BufferView::FITCUR);
+		LyXCursor const cur = lt->cursor;
 		if (!is_rtl)
-			TEXT(bv_)->CursorLeft(bv_, false);
-		if ((is_rtl || cur != TEXT(bv_)->cursor) && // only if really moved!
-#ifndef NEW_INSETS
-		    TEXT(bv_)->cursor.pos() < TEXT(bv_)->cursor.par()->Last() &&
-#else
-		    TEXT(bv_)->cursor.pos() < TEXT(bv_)->cursor.par()->size() &&
-#endif
-		    (TEXT(bv_)->cursor.par()->GetChar(TEXT(bv_)->cursor.pos()) ==
-		     LyXParagraph::META_INSET) &&
-		    TEXT(bv_)->cursor.par()->GetInset(TEXT(bv_)->cursor.pos()) &&
-		    (TEXT(bv_)->cursor.par()->GetInset(TEXT(bv_)->cursor.pos())->Editable()
-		     == Inset::HIGHLY_EDITABLE))
-		{
-			Inset * tmpinset = TEXT(bv_)->cursor.par()->GetInset(TEXT(bv_)->cursor.pos());
-			owner_->getLyXFunc()->setMessage(tmpinset->EditMessage());
-			LyXFont font = TEXT(bv_)->GetFont(buffer_,
-							     TEXT(bv_)->cursor.par(),
-							     TEXT(bv_)->cursor.pos());
-			int y = is_rtl ? 0 
-				: tmpinset->descent(bv_,font);
-			tmpinset->Edit(bv_,
-				       tmpinset->x() +
-				       tmpinset->width(bv_,font),
-				       y, 0);
+			lt->cursorLeft(bv_, false);
+		if ((is_rtl || cur != lt->cursor) && // only if really moved!
+		    lt->cursor.pos() < lt->cursor.par()->size() &&
+		    lt->cursor.par()->isInset(lt->cursor.pos()) &&
+		    isHighlyEditableInset(lt->cursor.par()->getInset(lt->cursor.pos()))) {
+			Inset * tmpinset = lt->cursor.par()->getInset(lt->cursor.pos());
+			owner_->getLyXFunc()->setMessage(tmpinset->editMessage());
+			if (is_rtl)
+				tmpinset->edit(bv_);
+			else
+				tmpinset->edit(bv_, false);
 			break;
 		}
 		if  (is_rtl)
-			TEXT(bv_)->CursorRight(bv_, false);
+			lt->cursorRight(bv_, false);
 
-		TEXT(bv_)->FinishUndo();
+		finishUndo();
 		moveCursorUpdate(false);
 		owner_->showState();
 	}
 	break;
 		
 	case LFUN_UP:
-		if (!TEXT(bv_)->mark_set)
-			beforeChange(TEXT(bv_));
-		update(TEXT(bv_), BufferView::UPDATE);
-		TEXT(bv_)->CursorUp(bv_);
-		TEXT(bv_)->FinishUndo();
+	{
+		LyXText * lt = bv_->getLyXText();
+		
+		if (!lt->selection.mark())
+			beforeChange(lt);
+		update(lt, BufferView::UPDATE);
+		lt->cursorUp(bv_);
+		finishUndo();
 		moveCursorUpdate(false);
 		owner_->showState();
-		break;
+	}
+	break;
 		
 	case LFUN_DOWN:
-		if (!TEXT(bv_)->mark_set)
-			beforeChange(TEXT(bv_));
-		update(TEXT(bv_), BufferView::UPDATE);
-		TEXT(bv_)->CursorDown(bv_);
-		TEXT(bv_)->FinishUndo();
+	{
+		LyXText * lt = bv_->getLyXText();
+		
+		if (!lt->selection.mark())
+			beforeChange(lt);
+		update(lt, BufferView::UPDATE);
+		lt->cursorDown(bv_);
+		finishUndo();
 		moveCursorUpdate(false);
 		owner_->showState();
-		break;
+	}
+	break;
 
 	case LFUN_UP_PARAGRAPH:
-		if (!TEXT(bv_)->mark_set)
-			beforeChange(TEXT(bv_));
-		update(TEXT(bv_), BufferView::UPDATE);
-		TEXT(bv_)->CursorUpParagraph(bv_);
-		TEXT(bv_)->FinishUndo();
+	{
+		LyXText * lt = bv_->getLyXText();
+		
+		if (!lt->selection.mark())
+			beforeChange(lt);
+		update(lt, BufferView::UPDATE);
+		lt->cursorUpParagraph(bv_);
+		finishUndo();
 		moveCursorUpdate(false);
 		owner_->showState();
-		break;
+	}
+	break;
 		
 	case LFUN_DOWN_PARAGRAPH:
-		if (!TEXT(bv_)->mark_set)
-			beforeChange(TEXT(bv_));
-		update(TEXT(bv_), BufferView::UPDATE);
-		TEXT(bv_)->CursorDownParagraph(bv_);
-		TEXT(bv_)->FinishUndo();
+	{
+		LyXText * lt = bv_->getLyXText();
+		
+		if (!lt->selection.mark())
+			beforeChange(lt);
+		update(lt, BufferView::UPDATE);
+		lt->cursorDownParagraph(bv_);
+		finishUndo();
 		moveCursorUpdate(false);
 		owner_->showState();
-		break;
+	}
+	break;
 		
 	case LFUN_PRIOR:
-		if (!TEXT(bv_)->mark_set)
-			beforeChange(TEXT(bv_));
-		update(TEXT(bv_), BufferView::UPDATE);
-		cursorPrevious(TEXT(bv_));
-		TEXT(bv_)->FinishUndo();
+	{
+		LyXText * lt = bv_->getLyXText();
+		
+		if (!lt->selection.mark())
+			beforeChange(lt);
+		update(lt, BufferView::UPDATE);
+		cursorPrevious(lt);
+		finishUndo();
 		moveCursorUpdate(false);
 		owner_->showState();
-		break;
+	}
+	break;
 		
 	case LFUN_NEXT:
-		if (!TEXT(bv_)->mark_set)
-			beforeChange(TEXT(bv_));
-		update(TEXT(bv_), BufferView::UPDATE);
-		cursorNext(TEXT(bv_));
-		TEXT(bv_)->FinishUndo();
+	{
+		LyXText * lt = bv_->getLyXText();
+		
+		if (!lt->selection.mark())
+			beforeChange(lt);
+		update(lt, BufferView::UPDATE);
+		cursorNext(lt);
+		finishUndo();
 		moveCursorUpdate(false);
 		owner_->showState();
-		break;
+	}
+	break;
 		
 	case LFUN_HOME:
-		if (!TEXT(bv_)->mark_set)
-			beforeChange(TEXT(bv_));
-		update(TEXT(bv_), BufferView::SELECT|BufferView::FITCUR);
-		TEXT(bv_)->CursorHome(bv_);
-		TEXT(bv_)->FinishUndo();
+	{
+		LyXText * lt = bv_->getLyXText();
+		
+		if (!lt->selection.mark())
+			beforeChange(lt);
+		update(lt, BufferView::SELECT|BufferView::FITCUR);
+		lt->cursorHome(bv_);
+		finishUndo();
 		moveCursorUpdate(false);
 		owner_->showState();
-		break;
+	}
+	break;
 		
 	case LFUN_END:
-		if (!TEXT(bv_)->mark_set)
-			beforeChange(TEXT(bv_));
-		update(TEXT(bv_),
+	{
+		LyXText * lt = bv_->getLyXText();
+		
+		if (!lt->selection.mark())
+			beforeChange(lt);
+		update(lt,
 		       BufferView::SELECT|BufferView::FITCUR);
-		TEXT(bv_)->CursorEnd(bv_);
-		TEXT(bv_)->FinishUndo();
+		lt->cursorEnd(bv_);
+		finishUndo();
 		moveCursorUpdate(false);
 		owner_->showState();
-		break;
+	}
+	break;
 		
 	case LFUN_SHIFT_TAB:
 	case LFUN_TAB:
-		if (!TEXT(bv_)->mark_set)
-			beforeChange(TEXT(bv_));
-		update(TEXT(bv_),
+	{
+		LyXText * lt = bv_->getLyXText();
+		
+		if (!lt->selection.mark())
+			beforeChange(lt);
+		update(lt,
 		       BufferView::SELECT|BufferView::FITCUR);
-		TEXT(bv_)->CursorTab(bv_);
-		TEXT(bv_)->FinishUndo();
+		lt->cursorTab(bv_);
+		finishUndo();
 		moveCursorUpdate(false);
 		owner_->showState();
-		break;
+	}
+	break;
 		
 	case LFUN_WORDRIGHT:
-		if (!TEXT(bv_)->mark_set)
-			beforeChange(TEXT(bv_));
-		update(TEXT(bv_), BufferView::SELECT|BufferView::FITCUR);
-		if (TEXT(bv_)->cursor.par()->isRightToLeftPar(buffer_->params))
-			TEXT(bv_)->CursorLeftOneWord(bv_);
+	{
+		LyXText * lt = bv_->getLyXText();
+		
+		if (!lt->selection.mark())
+			beforeChange(lt);
+		update(lt, BufferView::SELECT|BufferView::FITCUR);
+		if (lt->cursor.par()->isRightToLeftPar(buffer_->params))
+			lt->cursorLeftOneWord(bv_);
 		else
-			TEXT(bv_)->CursorRightOneWord(bv_);
-		TEXT(bv_)->FinishUndo();
+			lt->cursorRightOneWord(bv_);
+		finishUndo();
 		moveCursorUpdate(false);
 		owner_->showState();
-		break;
+	}
+	break;
 		
 	case LFUN_WORDLEFT:
-		if (!TEXT(bv_)->mark_set)
-			beforeChange(TEXT(bv_));
-		update(TEXT(bv_), BufferView::SELECT|BufferView::FITCUR);
-		if (TEXT(bv_)->cursor.par()->isRightToLeftPar(buffer_->params))
-			TEXT(bv_)->CursorRightOneWord(bv_);
+	{
+		LyXText * lt = bv_->getLyXText();
+		
+		if (!lt->selection.mark())
+			beforeChange(lt);
+		update(lt, BufferView::SELECT|BufferView::FITCUR);
+		if (lt->cursor.par()->isRightToLeftPar(buffer_->params))
+			lt->cursorRightOneWord(bv_);
 		else
-			TEXT(bv_)->CursorLeftOneWord(bv_);
-		TEXT(bv_)->FinishUndo();
+			lt->cursorLeftOneWord(bv_);
+		finishUndo();
 		moveCursorUpdate(false);
 		owner_->showState();
-		break;
+	}
+	break;
 		
 	case LFUN_BEGINNINGBUF:
-		if (!TEXT(bv_)->mark_set)
-			beforeChange(TEXT(bv_));
-		update(TEXT(bv_),
+	{
+		LyXText * lt = bv_->getLyXText();
+		
+		if (!lt->selection.mark())
+			beforeChange(lt);
+		update(lt,
 		       BufferView::SELECT|BufferView::FITCUR);
-		TEXT(bv_)->CursorTop(bv_);
-		TEXT(bv_)->FinishUndo();
+		lt->cursorTop(bv_);
+		finishUndo();
 		moveCursorUpdate(false);
 		owner_->showState();
-		break;
+	}
+	break;
 		
 	case LFUN_ENDBUF:
-		if (!TEXT(bv_)->mark_set)
-			beforeChange(TEXT(bv_));
-		update(TEXT(bv_),
+	{
+		LyXText * lt = bv_->getLyXText();
+		
+		if (!lt->selection.mark())
+			beforeChange(lt);
+		update(lt,
 		       BufferView::SELECT|BufferView::FITCUR);
-		TEXT(bv_)->CursorBottom(bv_);
-		TEXT(bv_)->FinishUndo();
+		lt->cursorBottom(bv_);
+		finishUndo();
 		moveCursorUpdate(false);
 		owner_->showState();
-		break;
-
+	}
+	break;
       
 		/* cursor selection ---------------------------- */
 	case LFUN_RIGHTSEL:
-		update(TEXT(bv_),
+	{
+		LyXText * lt = bv_->getLyXText();
+		
+		update(lt,
 		       BufferView::SELECT|BufferView::FITCUR);
-		if (TEXT(bv_)->cursor.par()->isRightToLeftPar(buffer_->params))
-			TEXT(bv_)->CursorLeft(bv_);
+		if (lt->cursor.par()->isRightToLeftPar(buffer_->params))
+			lt->cursorLeft(bv_);
 		else
-			TEXT(bv_)->CursorRight(bv_);
-		TEXT(bv_)->FinishUndo();
+			lt->cursorRight(bv_);
+		finishUndo();
 		moveCursorUpdate(true);
 		owner_->showState();
-		break;
+	}
+	break;
 		
 	case LFUN_LEFTSEL:
-		update(TEXT(bv_),
+	{
+		LyXText * lt = bv_->getLyXText();
+		
+		update(lt,
 		       BufferView::SELECT|BufferView::FITCUR);
-		if (TEXT(bv_)->cursor.par()->isRightToLeftPar(buffer_->params))
-			TEXT(bv_)->CursorRight(bv_);
+		if (lt->cursor.par()->isRightToLeftPar(buffer_->params))
+			lt->cursorRight(bv_);
 		else
-			TEXT(bv_)->CursorLeft(bv_);
-		TEXT(bv_)->FinishUndo();
+			lt->cursorLeft(bv_);
+		finishUndo();
 		moveCursorUpdate(true);
 		owner_->showState();
-		break;
+	}
+	break;
 		
 	case LFUN_UPSEL:
-		update(TEXT(bv_),
+	{
+		LyXText * lt = bv_->getLyXText();
+		
+		update(lt,
 		       BufferView::SELECT|BufferView::FITCUR);
-		TEXT(bv_)->CursorUp(bv_);
-		TEXT(bv_)->FinishUndo();
+		lt->cursorUp(bv_);
+		finishUndo();
 		moveCursorUpdate(true);
 		owner_->showState();
-		break;
+	}
+	break;
 		
 	case LFUN_DOWNSEL:
-		update(TEXT(bv_),
+	{
+		LyXText * lt = bv_->getLyXText();
+		
+		update(lt,
 		       BufferView::SELECT|BufferView::FITCUR);
-		TEXT(bv_)->CursorDown(bv_);
-		TEXT(bv_)->FinishUndo();
+		lt->cursorDown(bv_);
+		finishUndo();
 		moveCursorUpdate(true);
 		owner_->showState();
-		break;
+	}
+	break;
 
 	case LFUN_UP_PARAGRAPHSEL:
-		update(TEXT(bv_),
+	{
+		LyXText * lt = bv_->getLyXText();
+		
+		update(lt,
 		       BufferView::SELECT|BufferView::FITCUR);
-		TEXT(bv_)->CursorUpParagraph(bv_);
-		TEXT(bv_)->FinishUndo();
+		lt->cursorUpParagraph(bv_);
+		finishUndo();
 		moveCursorUpdate(true);
 		owner_->showState();
-		break;
+	}
+	break;
 		
 	case LFUN_DOWN_PARAGRAPHSEL:
-		update(TEXT(bv_),
+	{
+		LyXText * lt = bv_->getLyXText();
+		
+		update(lt,
 		       BufferView::SELECT|BufferView::FITCUR);
-		TEXT(bv_)->CursorDownParagraph(bv_);
-		TEXT(bv_)->FinishUndo();
+		lt->cursorDownParagraph(bv_);
+		finishUndo();
 		moveCursorUpdate(true);
 		owner_->showState();
-		break;
+	}
+	break;
 		
 	case LFUN_PRIORSEL:
-		update(TEXT(bv_), BufferView::SELECT|BufferView::FITCUR);
-		cursorPrevious(TEXT(bv_));
-		TEXT(bv_)->FinishUndo();
+	{
+		LyXText * lt = bv_->getLyXText();
+		
+		update(lt, BufferView::SELECT|BufferView::FITCUR);
+		cursorPrevious(lt);
+		finishUndo();
 		moveCursorUpdate(true);
 		owner_->showState();
-		break;
+	}
+	break;
 		
 	case LFUN_NEXTSEL:
-		update(TEXT(bv_), BufferView::SELECT|BufferView::FITCUR);
-		cursorNext(TEXT(bv_));
-		TEXT(bv_)->FinishUndo();
+	{
+		LyXText * lt = bv_->getLyXText();
+		
+		update(lt, BufferView::SELECT|BufferView::FITCUR);
+		cursorNext(lt);
+		finishUndo();
 		moveCursorUpdate(true);
 		owner_->showState();
-		break;
+	}
+	break;
 		
 	case LFUN_HOMESEL:
-		update(TEXT(bv_), BufferView::SELECT|BufferView::FITCUR);
-		TEXT(bv_)->CursorHome(bv_);
-		TEXT(bv_)->FinishUndo();
+	{
+		LyXText * lt = bv_->getLyXText();
+		
+		update(lt, BufferView::SELECT|BufferView::FITCUR);
+		lt->cursorHome(bv_);
+		finishUndo();
 		moveCursorUpdate(true);
 		owner_->showState();
-		break;
+	}
+	break;
 		
 	case LFUN_ENDSEL:
-		update(TEXT(bv_), BufferView::SELECT|BufferView::FITCUR);
-		TEXT(bv_)->CursorEnd(bv_);
-		TEXT(bv_)->FinishUndo();
+	{
+		LyXText * lt = bv_->getLyXText();
+
+		update(lt, BufferView::SELECT|BufferView::FITCUR);
+		lt->cursorEnd(bv_);
+		finishUndo();
 		moveCursorUpdate(true);
 		owner_->showState();
-		break;
+	}
+	break;
 		
 	case LFUN_WORDRIGHTSEL:
-		update(TEXT(bv_), BufferView::SELECT|BufferView::FITCUR);
-		if (TEXT(bv_)->cursor.par()->isRightToLeftPar(buffer_->params))
-			TEXT(bv_)->CursorLeftOneWord(bv_);
+	{
+		LyXText * lt = bv_->getLyXText();
+		
+		update(lt, BufferView::SELECT|BufferView::FITCUR);
+		if (lt->cursor.par()->isRightToLeftPar(buffer_->params))
+			lt->cursorLeftOneWord(bv_);
 		else
-			TEXT(bv_)->CursorRightOneWord(bv_);
-		TEXT(bv_)->FinishUndo();
+			lt->cursorRightOneWord(bv_);
+		finishUndo();
 		moveCursorUpdate(true);
 		owner_->showState();
-		break;
+	}
+	break;
 		
 	case LFUN_WORDLEFTSEL:
-		update(TEXT(bv_), BufferView::SELECT|BufferView::FITCUR);
-		if (TEXT(bv_)->cursor.par()->isRightToLeftPar(buffer_->params))
-			TEXT(bv_)->CursorRightOneWord(bv_);
+	{
+		LyXText * lt = bv_->getLyXText();
+		
+		update(lt, BufferView::SELECT|BufferView::FITCUR);
+		if (lt->cursor.par()->isRightToLeftPar(buffer_->params))
+			lt->cursorRightOneWord(bv_);
 		else
-			TEXT(bv_)->CursorLeftOneWord(bv_);
-		TEXT(bv_)->FinishUndo();
+			lt->cursorLeftOneWord(bv_);
+		finishUndo();
 		moveCursorUpdate(true);
 		owner_->showState();
-		break;
+	}
+	break;
 		
 	case LFUN_BEGINNINGBUFSEL:
-		if (TEXT(bv_)->inset_owner)
+	{
+		LyXText * lt = bv_->getLyXText();
+		
+		if (lt->inset_owner)
 			break;
-		update(TEXT(bv_), BufferView::SELECT|BufferView::FITCUR);
-		TEXT(bv_)->CursorTop(bv_);
-		TEXT(bv_)->FinishUndo();
+		update(lt, BufferView::SELECT|BufferView::FITCUR);
+		lt->cursorTop(bv_);
+		finishUndo();
 		moveCursorUpdate(true);
 		owner_->showState();
-		break;
+	}
+	break;
 		
 	case LFUN_ENDBUFSEL:
-		if (TEXT(bv_)->inset_owner)
+	{
+		LyXText * lt = bv_->getLyXText();
+		
+		if (lt->inset_owner)
 			break;
-		update(TEXT(bv_),
+		update(lt,
 		       BufferView::SELECT|BufferView::FITCUR);
-		TEXT(bv_)->CursorBottom(bv_);
-		TEXT(bv_)->FinishUndo();
+		lt->cursorBottom(bv_);
+		finishUndo();
 		moveCursorUpdate(true);
 		owner_->showState();
-		break;
+	}
+	break;
 
 		// --- text changing commands ------------------------
 	case LFUN_BREAKLINE:
-		beforeChange(TEXT(bv_));
-		TEXT(bv_)->InsertChar(bv_, LyXParagraph::META_NEWLINE);
-		update(TEXT(bv_),
-		       BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+	{
+		LyXText * lt = bv_->getLyXText();
+
+		beforeChange(lt);
+		lt->insertChar(bv_, Paragraph::META_NEWLINE);
+		update(lt,
+		       BufferView::SELECT
+		       | BufferView::FITCUR
+		       | BufferView::CHANGE);
 		moveCursorUpdate(false);
-		break;
+	}
+	break;
 		
 	case LFUN_PROTECTEDSPACE:
 	{
-		LyXLayout const & style =
-			textclasslist.Style(buffer_->params.textclass,
-					    TEXT(bv_)->cursor.par()->GetLayout());
+		LyXText * lt = bv_->getLyXText();
+
+		LyXLayout const & style = textclasslist[buffer_->params.textclass][lt->cursor.par()->layout()];
 
 		if (style.free_spacing) {
-			TEXT(bv_)->InsertChar(bv_, ' ');
-			update(TEXT(bv_), BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+			lt->insertChar(bv_, ' ');
+			update(lt,
+			       BufferView::SELECT
+			       | BufferView::FITCUR
+			       | BufferView::CHANGE);
 		} else {
-			bv_->protectedBlank(TEXT(bv_));
+			specialChar(InsetSpecialChar::PROTECTED_SEPARATOR);
 		}
 		moveCursorUpdate(false);
 	}
 	break;
 		
 	case LFUN_SETMARK:
-		if (TEXT(bv_)->mark_set) {
-			beforeChange(TEXT(bv_));
-			update(TEXT(bv_), BufferView::SELECT|BufferView::FITCUR);
+	{
+		LyXText * lt = bv_->getLyXText();
+
+		if (lt->selection.mark()) {
+			beforeChange(lt);
+			update(lt,
+			       BufferView::SELECT
+			       | BufferView::FITCUR);
 			owner_->getLyXFunc()->setMessage(N_("Mark removed"));
 		} else {
-			beforeChange(TEXT(bv_));
-			TEXT(bv_)->mark_set = 1;
-			update(TEXT(bv_), BufferView::SELECT|BufferView::FITCUR);
+			beforeChange(lt);
+			lt->selection.mark(true);
+			update(lt,
+			       BufferView::SELECT
+			       | BufferView::FITCUR);
 			owner_->getLyXFunc()->setMessage(N_("Mark set"));
 		}
-		TEXT(bv_)->sel_cursor = TEXT(bv_)->cursor;
-		break;
+		lt->selection.cursor = lt->cursor;
+	}
+	break;
 		
 	case LFUN_DELETE:
-		if (!TEXT(bv_)->selection) {
-			TEXT(bv_)->Delete(bv_);
-			TEXT(bv_)->sel_cursor = 
-				TEXT(bv_)->cursor;
-			update(TEXT(bv_),
-			       BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+	{
+		LyXText * lt = bv_->getLyXText();
+
+		if (!lt->selection.set()) {
+			lt->Delete(bv_);
+			lt->selection.cursor = lt->cursor;
+			update(lt,
+			       BufferView::SELECT
+			       | BufferView::FITCUR
+			       | BufferView::CHANGE);
 			// It is possible to make it a lot faster still
 			// just comment out the line below...
 			showCursor();
 		} else {
-			bv_->cut();
+			bv_->cut(false);
 		}
 		moveCursorUpdate(false);
 		owner_->showState();
 		setState();
-		break;
+	}
+	break;
 
 	case LFUN_DELETE_SKIP:
 	{
+		LyXText * lt = bv_->getLyXText();
+
 		// Reverse the effect of LFUN_BREAKPARAGRAPH_SKIP.
 		
-		LyXCursor cursor = TEXT(bv_)->cursor;
+		LyXCursor cursor = lt->cursor;
 
-		if (!TEXT(bv_)->selection) {
-#ifndef NEW_INSETS
-			if (cursor.pos() == cursor.par()->Last()) {
-#else
+		if (!lt->selection.set()) {
 			if (cursor.pos() == cursor.par()->size()) {
-#endif
-				TEXT(bv_)->CursorRight(bv_);
-				cursor = TEXT(bv_)->cursor;
+				lt->cursorRight(bv_);
+				cursor = lt->cursor;
 				if (cursor.pos() == 0
-				    && !(cursor.par()->params.spaceTop()
+				    && !(cursor.par()->params().spaceTop()
 					 == VSpace (VSpace::NONE))) {
-					TEXT(bv_)->SetParagraph
+					lt->setParagraph
 						(bv_,
-						 cursor.par()->params.lineTop(),
-						 cursor.par()->params.lineBottom(),
-						 cursor.par()->params.pagebreakTop(), 
-						 cursor.par()->params.pagebreakBottom(),
+						 cursor.par()->params().lineTop(),
+						 cursor.par()->params().lineBottom(),
+						 cursor.par()->params().pagebreakTop(), 
+						 cursor.par()->params().pagebreakBottom(),
 						 VSpace(VSpace::NONE), 
-						 cursor.par()->params.spaceBottom(),
-						 cursor.par()->params.align(), 
-						 cursor.par()->params.labelWidthString(), 0);
-					TEXT(bv_)->CursorLeft(bv_);
-					update(TEXT(bv_), 
-					       BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+						 cursor.par()->params().spaceBottom(),
+						 cursor.par()->params().spacing(), 
+						 cursor.par()->params().align(), 
+						 cursor.par()->params().labelWidthString(), 0);
+					lt->cursorLeft(bv_);
+					update(lt, 
+					       BufferView::SELECT
+					       | BufferView::FITCUR
+					       | BufferView::CHANGE);
 				} else {
-					TEXT(bv_)->CursorLeft(bv_);
-					TEXT(bv_)->Delete(bv_);
-					TEXT(bv_)->sel_cursor = 
-						TEXT(bv_)->cursor;
-					update(TEXT(bv_),
-					       BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+					lt->cursorLeft(bv_);
+					lt->Delete(bv_);
+					lt->selection.cursor = lt->cursor;
+					update(lt,
+					       BufferView::SELECT
+					       | BufferView::FITCUR
+					       | BufferView::CHANGE);
 				}
 			} else {
-				TEXT(bv_)->Delete(bv_);
-				TEXT(bv_)->sel_cursor = 
-					TEXT(bv_)->cursor;
-				update(TEXT(bv_),
-				       BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+				lt->Delete(bv_);
+				lt->selection.cursor = lt->cursor;
+				update(lt,
+				       BufferView::SELECT
+				       | BufferView::FITCUR
+				       | BufferView::CHANGE);
 			}
 		} else {
-			bv_->cut();
+			bv_->cut(false);
 		}
 	}
 	break;
 
 	/* -------> Delete word forward. */
 	case LFUN_DELETE_WORD_FORWARD:
-		update(TEXT(bv_), BufferView::SELECT|BufferView::FITCUR);
-		TEXT(bv_)->DeleteWordForward(bv_);
-		update(TEXT(bv_), BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+		update(bv_->getLyXText(), BufferView::SELECT|BufferView::FITCUR);
+		bv_->getLyXText()->deleteWordForward(bv_);
+		update(bv_->getLyXText(), BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 		moveCursorUpdate(false);
 		owner_->showState();
 		break;
 
 		/* -------> Delete word backward. */
 	case LFUN_DELETE_WORD_BACKWARD:
-		update(TEXT(bv_), BufferView::SELECT|BufferView::FITCUR);
-		TEXT(bv_)->DeleteWordBackward(bv_);
-		update(TEXT(bv_), BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+	{
+		LyXText * lt = bv_->getLyXText();
+		
+		update(lt, BufferView::SELECT|BufferView::FITCUR);
+		lt->deleteWordBackward(bv_);
+		update(lt,
+		       BufferView::SELECT
+		       | BufferView::FITCUR
+		       | BufferView::CHANGE);
 		moveCursorUpdate(false);
 		owner_->showState();
-		break;
+	}
+	break;
 		
 		/* -------> Kill to end of line. */
 	case LFUN_DELETE_LINE_FORWARD:
-		update(TEXT(bv_), BufferView::SELECT|BufferView::FITCUR);
-		TEXT(bv_)->DeleteLineForward(bv_);
-		update(TEXT(bv_), BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+	{
+		LyXText * lt = bv_->getLyXText();
+		
+		update(lt, BufferView::SELECT|BufferView::FITCUR);
+		lt->deleteLineForward(bv_);
+		update(lt,
+		       BufferView::SELECT
+		       | BufferView::FITCUR
+		       | BufferView::CHANGE);
 		moveCursorUpdate(false);
-		break;
+	}
+	break;
 		
 		/* -------> Set mark off. */
 	case LFUN_MARK_OFF:
-		beforeChange(TEXT(bv_));
-		update(TEXT(bv_), BufferView::SELECT|BufferView::FITCUR);
-		TEXT(bv_)->sel_cursor = TEXT(bv_)->cursor;
+	{
+		LyXText * lt = bv_->getLyXText();
+		
+		beforeChange(lt);
+		update(lt, BufferView::SELECT|BufferView::FITCUR);
+		lt->selection.cursor = lt->cursor;
 		owner_->getLyXFunc()->setMessage(N_("Mark off"));
-		break;
+	}
+	break;
 
 		/* -------> Set mark on. */
 	case LFUN_MARK_ON:
-		beforeChange(TEXT(bv_));
-		TEXT(bv_)->mark_set = 1;
-		update(TEXT(bv_), BufferView::SELECT|BufferView::FITCUR);
-		TEXT(bv_)->sel_cursor = TEXT(bv_)->cursor;
+	{
+		LyXText * lt = bv_->getLyXText();
+		
+		beforeChange(lt);
+		lt->selection.mark(true);
+		update(lt, BufferView::SELECT|BufferView::FITCUR);
+		lt->selection.cursor = lt->cursor;
 		owner_->getLyXFunc()->setMessage(N_("Mark on"));
-		break;
+	}
+	break;
 		
 	case LFUN_BACKSPACE:
 	{
-		if (!TEXT(bv_)->selection) {
+		LyXText * lt = bv_->getLyXText();
+		
+		if (!lt->selection.set()) {
 			if (owner_->getIntl()->getTrans().backspace()) {
-				TEXT(bv_)->Backspace(bv_);
-				TEXT(bv_)->sel_cursor = 
-					TEXT(bv_)->cursor;
-				update(TEXT(bv_),
-				       BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+				lt->backspace(bv_);
+				lt->selection.cursor = lt->cursor;
+				update(lt,
+				       BufferView::SELECT
+				       | BufferView::FITCUR
+				       | BufferView::CHANGE);
 				// It is possible to make it a lot faster still
 				// just comment out the line below...
 				showCursor();
 			}
 		} else {
-			bv_->cut();
+			bv_->cut(false);
 		}
 		owner_->showState();
 		setState();
@@ -2362,43 +2554,52 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	case LFUN_BACKSPACE_SKIP:
 	{
 		// Reverse the effect of LFUN_BREAKPARAGRAPH_SKIP.
+		LyXText * lt = bv_->getLyXText();
 		
-		LyXCursor cursor = TEXT(bv_)->cursor;
+		LyXCursor cursor = lt->cursor;
 		
-		if (!TEXT(bv_)->selection) {
+		if (!lt->selection.set()) {
 			if (cursor.pos() == 0 
-			    && !(cursor.par()->params.spaceTop() 
+			    && !(cursor.par()->params().spaceTop() 
 				 == VSpace (VSpace::NONE))) {
-				TEXT(bv_)->SetParagraph 
+				lt->setParagraph 
 					(bv_,
-					 cursor.par()->params.lineTop(),      
-					 cursor.par()->params.lineBottom(),
-					 cursor.par()->params.pagebreakTop(), 
-					 cursor.par()->params.pagebreakBottom(),
-					 VSpace(VSpace::NONE), cursor.par()->params.spaceBottom(),
-					 cursor.par()->params.align(), 
-					 cursor.par()->params.labelWidthString(), 0);
-				update(TEXT(bv_),
-				       BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+					 cursor.par()->params().lineTop(),      
+					 cursor.par()->params().lineBottom(),
+					 cursor.par()->params().pagebreakTop(), 
+					 cursor.par()->params().pagebreakBottom(),
+					 VSpace(VSpace::NONE), cursor.par()->params().spaceBottom(),
+					 cursor.par()->params().spacing(), 
+					 cursor.par()->params().align(), 
+					 cursor.par()->params().labelWidthString(), 0);
+				update(lt,
+				       BufferView::SELECT
+				       | BufferView::FITCUR
+				       | BufferView::CHANGE);
 			} else {
-				TEXT(bv_)->Backspace(bv_);
-				TEXT(bv_)->sel_cursor 
-					= cursor;
-				update(TEXT(bv_),
-				       BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+				lt->backspace(bv_);
+				lt->selection.cursor = cursor;
+				update(lt,
+				       BufferView::SELECT
+				       | BufferView::FITCUR
+				       | BufferView::CHANGE);
 			}
 		} else
-			bv_->cut();
+			bv_->cut(false);
 	}
 	break;
 
 	case LFUN_BREAKPARAGRAPH:
 	{
-		beforeChange(TEXT(bv_));
-		TEXT(bv_)->BreakParagraph(bv_, 0);
-		update(TEXT(bv_),
-		       BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-		TEXT(bv_)->sel_cursor = TEXT(bv_)->cursor;
+		LyXText * lt = bv_->getLyXText();
+		
+		beforeChange(lt);
+		lt->breakParagraph(bv_, 0);
+		update(lt,
+		       BufferView::SELECT
+		       | BufferView::FITCUR
+		       | BufferView::CHANGE);
+		lt->selection.cursor = lt->cursor;
 		setState();
 		owner_->showState();
 		break;
@@ -2406,11 +2607,15 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 
 	case LFUN_BREAKPARAGRAPHKEEPLAYOUT:
 	{
-		beforeChange(TEXT(bv_));
-		TEXT(bv_)->BreakParagraph(bv_, 1);
-		update(TEXT(bv_),
-		       BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-		TEXT(bv_)->sel_cursor = TEXT(bv_)->cursor;
+		LyXText * lt = bv_->getLyXText();
+		
+		beforeChange(lt);
+		lt->breakParagraph(bv_, 1);
+		update(lt,
+		       BufferView::SELECT
+		       | BufferView::FITCUR
+		       | BufferView::CHANGE);
+		lt->selection.cursor = lt->cursor;
 		setState();
 		owner_->showState();
 		break;
@@ -2421,32 +2626,36 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		// When at the beginning of a paragraph, remove
 		// indentation and add a "defskip" at the top.
 		// Otherwise, do the same as LFUN_BREAKPARAGRAPH.
+		LyXText * lt = bv_->getLyXText();
 		
-		LyXCursor cursor = TEXT(bv_)->cursor;
+		LyXCursor cursor = lt->cursor;
 		
-		beforeChange(TEXT(bv_));
+		beforeChange(lt);
 		if (cursor.pos() == 0) {
-			if (cursor.par()->params.spaceTop() == VSpace(VSpace::NONE)) {
-				TEXT(bv_)->SetParagraph
+			if (cursor.par()->params().spaceTop() == VSpace(VSpace::NONE)) {
+				lt->setParagraph
 					(bv_,
-					 cursor.par()->params.lineTop(),      
-					 cursor.par()->params.lineBottom(),
-					 cursor.par()->params.pagebreakTop(), 
-					 cursor.par()->params.pagebreakBottom(),
-					 VSpace(VSpace::DEFSKIP), cursor.par()->params.spaceBottom(),
-					 cursor.par()->params.align(), 
-					 cursor.par()->params.labelWidthString(), 1);
+					 cursor.par()->params().lineTop(),
+					 cursor.par()->params().lineBottom(),
+					 cursor.par()->params().pagebreakTop(),
+					 cursor.par()->params().pagebreakBottom(),
+					 VSpace(VSpace::DEFSKIP), cursor.par()->params().spaceBottom(),
+					 cursor.par()->params().spacing(),
+					 cursor.par()->params().align(),
+					 cursor.par()->params().labelWidthString(), 1);
 				//update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 			} 
 		}
 		else {
-			TEXT(bv_)->BreakParagraph(bv_, 0);
+			lt->breakParagraph(bv_, 0);
 			//update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 		}
 
-		update(TEXT(bv_),
-		       BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-		TEXT(bv_)->sel_cursor = cursor;
+		update(lt,
+		       BufferView::SELECT
+		       | BufferView::FITCUR
+		       | BufferView::CHANGE);
+		lt->selection.cursor = cursor;
 		setState();
 		owner_->showState();
 	}
@@ -2454,11 +2663,13 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 
 	case LFUN_PARAGRAPH_SPACING:
 	{
-		LyXParagraph * par = TEXT(bv_)->cursor.par();
-		Spacing::Space cur_spacing = par->params.spacing().getSpace();
+		LyXText * lt = bv_->getLyXText();
+		
+		Paragraph * par = lt->cursor.par();
+		Spacing::Space cur_spacing = par->params().spacing().getSpace();
 		float cur_value = 1.0;
 		if (cur_spacing == Spacing::Other) {
-			cur_value = par->params.spacing().getValue();
+			cur_value = par->params().spacing().getValue();
 		}
 		
 		istringstream istr(argument.c_str());
@@ -2490,19 +2701,30 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 			       << argument << endl;
 		}
 		if (cur_spacing != new_spacing || cur_value != new_value) {
-			par->params.spacing(Spacing(new_spacing, new_value));
-			TEXT(bv_)->RedoParagraph(bv_);
-			update(TEXT(bv_),
-			       BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+			par->params().spacing(Spacing(new_spacing, new_value));
+			lt->redoParagraph(bv_);
+			update(lt,
+			       BufferView::SELECT
+			       | BufferView::FITCUR
+			       | BufferView::CHANGE);
 		}
 	}
 	break;
 	
+	case LFUN_INSET_TOGGLE:
+	{
+		LyXText * lt = bv_->getLyXText();
+		hideCursor();
+		beforeChange(lt);
+		update(lt, BufferView::SELECT|BufferView::FITCUR);
+		lt->toggleInset(bv_);
+		update(lt, BufferView::SELECT|BufferView::FITCUR);
+		setState();
+	}	
+		break;
+
 	case LFUN_QUOTE:
-		beforeChange(TEXT(bv_));
-		TEXT(bv_)->InsertChar(bv_, '\"');  // This " matches the single quote in the code
-		update(TEXT(bv_), BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-                moveCursorUpdate(false);
+		smartQuote();
 		break;
 
 	case LFUN_HTMLURL:
@@ -2513,133 +2735,101 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 			p.setCmdName("htmlurl");
 		else
 			p.setCmdName("url");
-		owner_->getDialogs()->createUrl( p.getAsString() );
+		owner_->getDialogs()->createUrl(p.getAsString());
 	}
 	break;
-		    
+	
 	case LFUN_INSERT_URL:
 	{
 		InsetCommandParams p;
-		p.setFromString( argument );
+		p.setFromString(argument);
 
-		InsetUrl * inset = new InsetUrl( p );
-		if (!bv_->insertInset(inset))
+		InsetUrl * inset = new InsetUrl(p);
+		if (!insertInset(inset))
 			delete inset;
 		else
-			bv_->updateInset( inset, true );
-	}
-	break;
-		    
-	case LFUN_INSET_TEXT:
-	{
-		InsetText * new_inset = new InsetText;
-		if (bv_->insertInset(new_inset))
-			new_inset->Edit(bv_, 0, 0, 0);
-		else
-			delete new_inset;
+			updateInset(inset, true);
 	}
 	break;
 	
 	case LFUN_INSET_ERT:
-	{
-		InsetERT * new_inset = new InsetERT;
-		if (bv_->insertInset(new_inset))
-			new_inset->Edit(bv_, 0, 0, 0);
-		else
-			delete new_inset;
-	}
-	break;
+		insertAndEditInset(new InsetERT(buffer_->params));
+		break;
 	
 	case LFUN_INSET_EXTERNAL:
-	{
-		InsetExternal * new_inset = new InsetExternal;
-		if (bv_->insertInset(new_inset))
-			new_inset->Edit(bv_, 0, 0, 0);
-		else
-			delete new_inset;
-	}
-	break;
+		insertAndEditInset(new InsetExternal);
+		break;
 	
 	case LFUN_INSET_FOOTNOTE:
-	{
-		InsetFoot * new_inset = new InsetFoot;
-		if (bv_->insertInset(new_inset))
-			new_inset->Edit(bv_, 0, 0, 0);
-		else
-			delete new_inset;
-	}
-	break;
+		insertAndEditInset(new InsetFoot(buffer_->params));
+		break;
 
 	case LFUN_INSET_MARGINAL:
-	{
-		InsetMarginal * new_inset = new InsetMarginal;
-		if (bv_->insertInset(new_inset))
-			new_inset->Edit(bv_, 0, 0, 0);
-		else
-			delete new_inset;
-	}
-	break;
+		insertAndEditInset(new InsetMarginal(buffer_->params));
+		break;
 
 	case LFUN_INSET_MINIPAGE:
-	{
-		InsetMinipage * new_inset = new InsetMinipage;
-		if (bv_->insertInset(new_inset))
-			new_inset->Edit(bv_, 0, 0, 0);
-		else
-			delete new_inset;
-	}
-	break;
+		insertAndEditInset(new InsetMinipage(buffer_->params));
+		break;
+
+	case LFUN_INSERT_NOTE:
+		insertAndEditInset(new InsetNote(buffer_->params));
+		break;
 
 	case LFUN_INSET_FLOAT:
+		// check if the float type exist
+		if (floatList.typeExist(argument)) {
+			insertAndEditInset(new InsetFloat(buffer_->params,
+							  argument));
+		} else {
+			lyxerr << "Non-existent float type: "
+			       << argument << endl;
+		}
+		break;
+
+	case LFUN_INSET_WIDE_FLOAT:
 	{
 		// check if the float type exist
 		if (floatList.typeExist(argument)) {
-			InsetFloat * new_inset = new InsetFloat(argument);
-			if (bv_->insertInset(new_inset))
-				new_inset->Edit(bv_, 0, 0, 0);
+			InsetFloat * new_inset =
+				new InsetFloat(buffer_->params, argument);
+			new_inset->wide(true);
+			if (insertInset(new_inset))
+				new_inset->edit(bv_);
 			else
 				delete new_inset;
 		} else {
-			lyxerr << "Non-existant float type: "
+			lyxerr << "Non-existent float type: "
 			       << argument << endl;
 		}
 		
 	}
 	break;
 
+#if 0
 	case LFUN_INSET_LIST:
-	{
-		InsetList * new_inset = new InsetList;
-		if (bv_->insertInset(new_inset))
-			new_inset->Edit(bv_, 0, 0, 0);
-		else
-			delete new_inset;
-	}
-	break;
+		insertAndEditInset(new InsetList);
+		break;
 
 	case LFUN_INSET_THEOREM:
-	{
-		InsetTheorem * new_inset = new InsetTheorem;
-		if (bv_->insertInset(new_inset))
-			new_inset->Edit(bv_, 0, 0, 0);
-		else
-			delete new_inset;
-	}
-	break;
-
+		insertAndEditInset(new InsetTheorem);
+		break;
+#endif
+		
 	case LFUN_INSET_CAPTION:
 	{
 		// Do we have a locking inset...
 		if (bv_->theLockingInset()) {
 			lyxerr << "Locking inset code: "
-			       << static_cast<int>(bv_->theLockingInset()->LyxCode());
-			InsetCaption * new_inset = new InsetCaption;
+			       << static_cast<int>(bv_->theLockingInset()->lyxCode());
+			InsetCaption * new_inset =
+				new InsetCaption(buffer_->params);
 			new_inset->setOwner(bv_->theLockingInset());
-			new_inset->SetAutoBreakRows(true);
-			new_inset->SetDrawFrame(0, InsetText::LOCKED);
-			new_inset->SetFrameColor(0, LColor::footnoteframe);
-			if (bv_->insertInset(new_inset))
-				new_inset->Edit(bv_, 0, 0, 0);
+			new_inset->setAutoBreakRows(true);
+			new_inset->setDrawFrame(0, InsetText::LOCKED);
+			new_inset->setFrameColor(0, LColor::captionframe);
+			if (insertInset(new_inset))
+				new_inset->edit(bv_);
 			else
 				delete new_inset;
 		}
@@ -2648,14 +2838,15 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	
 	case LFUN_INSET_TABULAR:
 	{
-		int r = 2, c = 2;
+		int r = 2;
+		int c = 2;
 		if (!argument.empty())
 			::sscanf(argument.c_str(),"%d%d", &r, &c);
 		InsetTabular * new_inset =
 			new InsetTabular(*buffer_, r, c);
-		bool rtl =
-			TEXT(bv_)->real_current_font.isRightToLeft();
-		if (!bv_->open_new_inset(new_inset, rtl))
+		bool const rtl =
+			bv_->getLyXText()->real_current_font.isRightToLeft();
+		if (!open_new_inset(new_inset, rtl))
 			delete new_inset;
 	}
 	break;
@@ -2664,37 +2855,40 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 
 	case LFUN_CHARATCURSOR:
 	{
-		LyXParagraph::size_type pos = TEXT(bv_)->cursor.pos();
-		if (pos < TEXT(bv_)->cursor.par()->size())
+		pos_type pos = bv_->getLyXText()->cursor.pos();
+		if (pos < bv_->getLyXText()->cursor.par()->size())
 			owner_->getLyXFunc()->setMessage(
-				tostr(TEXT(bv_)->cursor.par()->GetChar(pos)));
+				tostr(bv_->getLyXText()->cursor.par()->getChar(pos)));
 		else
 			owner_->getLyXFunc()->setMessage("EOF");
 	}
 	break;
 	
 	case LFUN_GETXY:
-		owner_->getLyXFunc()->setMessage(tostr(TEXT(bv_)->cursor.x())
+		owner_->getLyXFunc()->setMessage(tostr(bv_->getLyXText()->cursor.x())
 						 + ' '
-						 + tostr(TEXT(bv_)->cursor.y()));
+						 + tostr(bv_->getLyXText()->cursor.y()));
 		break;
 		
 	case LFUN_SETXY:
 	{
-		int x;
-		int y;
-		::sscanf(argument.c_str(), " %d %d", &x, &y);
-		TEXT(bv_)->SetCursorFromCoordinates(bv_, x, y);
+		int x = 0;
+		int y = 0;
+		if (::sscanf(argument.c_str(), " %d %d", &x, &y) != 2) {
+			lyxerr << "SETXY: Could not parse coordinates in '"
+			       << argument << std::endl;
+		}
+		bv_->getLyXText()->setCursorFromCoordinates(bv_, x, y);
 	}
 	break;
 	
 	case LFUN_GETLAYOUT:
-		owner_->getLyXFunc()->setMessage(tostr(TEXT(bv_)->cursor.par()->layout));
+		owner_->getLyXFunc()->setMessage(tostr(bv_->getLyXText()->cursor.par()->layout()));
 		break;
 			
 	case LFUN_GETFONT:
 	{
-		LyXFont & font = TEXT(bv_)->current_font;
+		LyXFont & font = bv_->getLyXText()->current_font;
                 if (font.shape() == LyXFont::ITALIC_SHAPE)
 			owner_->getLyXFunc()->setMessage("E");
                 else if (font.shape() == LyXFont::SMALLCAPS_SHAPE)
@@ -2705,16 +2899,6 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	}
 	break;
 
-	case LFUN_GETLATEX:
-	{
-		LyXFont & font = TEXT(bv_)->current_font;
-                if (font.latex() == LyXFont::ON)
-			owner_->getLyXFunc()->setMessage("L");
-                else
-			owner_->getLyXFunc()->setMessage("0");
-	}
-	break;
-
 	// --- accented characters ---------------------------
 		
 	case LFUN_UMLAUT:
@@ -2734,75 +2918,62 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	case LFUN_HUNG_UMLAUT:
 	case LFUN_CIRCLE:
 	case LFUN_OGONEK:
-		owner_->getLyXFunc()->handleKeyFunc(action);
+		if (argument.empty()) {
+			// As always...
+			owner_->getLyXFunc()->handleKeyFunc(action);
+		} else {
+			owner_->getLyXFunc()->handleKeyFunc(action);
+			owner_->getIntl()->getTrans()
+				.TranslateAndInsert(argument[0], bv_->getLyXText());
+			update(bv_->getLyXText(),
+			       BufferView::SELECT
+			       | BufferView::FITCUR
+			       | BufferView::CHANGE);
+		}
 		break;
 	
-	// --- insert characters ----------------------------------------
-	
+	case LFUN_MATH_MACRO:
+		mathDispatchMathMacro(bv_, argument);
+		break;
+
 	case LFUN_MATH_DELIM:     
+		mathDispatchMathDelim(bv_, argument);
+		break;
+
 	case LFUN_INSERT_MATRIX:
-	{ 	   
-		if (available()) { 
-			if (bv_->open_new_inset(new InsetFormula(false)))
-			{
-				bv_->theLockingInset()
-					->LocalDispatch(bv_, action, argument);
-			}
-		}
-	}	   
-	break;
-	       
+		mathDispatchInsertMatrix(bv_, argument);
+		break;
+
 	case LFUN_INSERT_MATH:
-	{
-		if (!available())
-			break;
- 
-		InsetFormula * f = new InsetFormula(true);
-		bv_->open_new_inset(f);
-		f->LocalDispatch(bv_, LFUN_INSERT_MATH, argument);
-	}
-	break;
-	
-	case LFUN_MATH_DISPLAY:
-	{
-		if (available())
-			bv_->open_new_inset(new InsetFormula(true));
+		mathDispatchInsertMath(bv_, argument);
 		break;
-	}
-		    
-	case LFUN_MATH_MACRO:
-	{
-		if (available()) {
-			string s(argument);
-		        if (s.empty())
-				owner_->getLyXFunc()->setErrorMessage(N_("Missing argument"));
-		        else {
-				string const s1 = token(s, ' ', 1);
-				int const na = s1.empty() ? 0 : lyx::atoi(s1);
-				bv_->open_new_inset(new InsetFormulaMacro(token(s, ' ', 0), na));
-			}
-		}
-	}
-	break;
 
-	case LFUN_MATH_MODE:   // Open or create a math inset
-	{		
-		if (available())
-			bv_->open_new_inset(new InsetFormula);
-		owner_->getLyXFunc()->setMessage(N_("Math editor mode"));
-	}
-	break;
-	  
+	case LFUN_MATH_IMPORT_SELECTION: // Imports LaTeX from the X selection
+		mathDispatchMathImportSelection(bv_, argument);
+		break;
+
+	case LFUN_MATH_DISPLAY:          // Open or create a displayed math inset
+		mathDispatchMathDisplay(bv_, argument);
+		break;
+
+	case LFUN_MATH_MODE:             // Open or create an inlined math inset 
+		mathDispatchMathMode(bv_, argument);
+		break;
+		
+	case LFUN_GREEK:                 // Insert a single greek letter
+		mathDispatchGreek(bv_, argument);
+		break;
+		
 	case LFUN_CITATION_INSERT:
 	{
 		InsetCommandParams p;
-		p.setFromString( argument );
+		p.setFromString(argument);
 
-		InsetCitation * inset = new InsetCitation( p );
-		if (!bv_->insertInset(inset))
+		InsetCitation * inset = new InsetCitation(p);
+		if (!insertInset(inset))
 			delete inset;
 		else
-			bv_->updateInset( inset, true );
+			updateInset(inset, true);
 	}
 	break;
 		    
@@ -2812,16 +2983,14 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		// The argument can be up to two tokens separated 
 		// by a space. The first one is the bibstyle.
 		string const db       = token(argument, ' ', 0);
-		string bibstyle = token(argument, ' ', 1);
-		if (bibstyle.empty())
-			bibstyle = "plain";
+		string const bibstyle = token(argument, ' ', 1);
 
-		InsetCommandParams p( "BibTeX", db, bibstyle );
+		InsetCommandParams p("BibTeX", db, bibstyle);
 		InsetBibtex * inset = new InsetBibtex(p);
 		
-		if (bv_->insertInset(inset)) {
+		if (insertInset(inset)) {
 			if (argument.empty())
-				inset->Edit(bv_, 0, 0, 0);
+				inset->edit(bv_);
 		} else
 			delete inset;
 	}
@@ -2860,24 +3029,15 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		
 	case LFUN_INDEX_CREATE:
 	{
-		InsetCommandParams p( "index" );
-		
+		InsetCommandParams p("index");
 		if (argument.empty()) {
-			// Get the word immediately preceding the cursor
-			LyXParagraph::size_type curpos = 
-				TEXT(bv_)->cursor.pos() - 1;
-
-			string curstring;
-			if (curpos >= 0 )
-				curstring = TEXT(bv_)
-					->cursor.par()->GetWord(curpos);
-
-			p.setContents( curstring );
+			string const idxstring(bv_->getLyXText()->getStringToIndex(bv_));
+			p.setContents(idxstring);
 		} else {
-			p.setContents( argument );
+			p.setContents(argument);
 		}
 
-		owner_->getDialogs()->createIndex( p.getAsString() );
+		owner_->getDialogs()->createIndex(p.getAsString());
 	}
 	break;
 		    
@@ -2887,31 +3047,27 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		p.setFromString(argument);
 		InsetIndex * inset = new InsetIndex(p);
 
-		if (!bv_->insertInset(inset))
+		if (!insertInset(inset))
 			delete inset;
 		else
-			bv_->updateInset(inset, true);
+			updateInset(inset, true);
 	}
 	break;
 		    
 	case LFUN_INDEX_INSERT_LAST:
 	{
-		// Get word immediately preceding the cursor
-		LyXParagraph::size_type curpos = 
-			TEXT(bv_)->cursor.pos() - 1;
-	  	// Can't do that at the beginning of a paragraph
-	  	if (curpos < 0) break;
-
-		string const curstring(TEXT(bv_)
-				       ->cursor.par()->GetWord(curpos));
-
-		InsetCommandParams p("index", curstring);
-		InsetIndex * inset = new InsetIndex(p);
-
-		if (!bv_->insertInset(inset))
-			delete inset;
-		else
-			bv_->updateInset(inset, true);
+		string const idxstring(bv_->getLyXText()->getStringToIndex(bv_));
+		if (!idxstring.empty()) {
+			owner_->message(_("Word `")
+					+ idxstring + _(("' indexed.")));
+			InsetCommandParams p("index", idxstring);
+			InsetIndex * inset = new InsetIndex(p);
+			
+			if (!insertInset(inset))
+				delete inset;
+			else
+				updateInset(inset, true);
+		}
 	}
 	break;
 
@@ -2919,7 +3075,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	{
 		InsetCommandParams p("printindex");
 		Inset * inset = new InsetPrintIndex(p);
-		if (!bv_->insertInset(inset, "Standard", true))
+		if (!insertInset(inset, "Standard"))
 			delete inset;
 	}
 	break;
@@ -2927,9 +3083,9 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	case LFUN_PARENTINSERT:
 	{
 		lyxerr << "arg " << argument << endl;
-		InsetCommandParams p( "lyxparent", argument );
+		InsetCommandParams p("lyxparent", argument);
 		Inset * inset = new InsetParent(p, *buffer_);
-		if (!bv_->insertInset(inset, "Standard", true))
+		if (!insertInset(inset, "Standard"))
 			delete inset;
 	}
 		 
@@ -2942,45 +3098,96 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		p.masterFilename_ = buffer_->fileName();
 
 		InsetInclude * inset = new InsetInclude(p);
-		if (!bv_->insertInset(inset))
+		if (!insertInset(inset))
 			delete inset;
 		else {
-			bv_->updateInset(inset, true);
+			updateInset(inset, true);
 			bv_->owner()->getDialogs()->showInclude(inset);
 		}
 	}
 	break; 
 
-	case LFUN_INSERT_NOTE:
-		bv_->insertNote();
-		break;
+	case LFUN_FLOAT_LIST:
+	{
+		// We should check the argument for validity. (Lgb)
+		Inset * inset = new InsetFloatList(argument);
+		if (!insertInset(inset, "Standard"))
+			delete inset;
+	}
+	break;
+	
+	case LFUN_THESAURUS_ENTRY:
+	{
+		string arg = argument;
 
+		if (arg.empty()) {
+			arg = bv_->getLyXText()->selectionAsString(buffer_,
+								   false);
+ 
+			// FIXME
+			if (arg.size() > 100 || arg.empty()) {
+				// Get word or selection
+				bv_->getLyXText()->selectWordWhenUnderCursor(bv_, LyXText::WHOLE_WORD);
+				arg = bv_->getLyXText()->selectionAsString(buffer_, false);
+				// FIXME: where is getLyXText()->unselect(bv_) ?
+			}
+		}
+
+		bv_->owner()->getDialogs()->showThesaurus(arg);
+	}
+		break;
+ 
 	case LFUN_SELFINSERT:
 	{
-		LyXFont const old_font(TEXT(bv_)->real_current_font);
-		for (string::size_type i = 0; i < argument.length(); ++i) {
-			TEXT(bv_)->InsertChar(bv_, argument[i]);
-			// This needs to be in the loop, or else we
-			// won't break lines correctly. (Asger)
-			update(TEXT(bv_),
-			       BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+		if (argument.empty()) break;
+		
+		/* Automatically delete the currently selected
+		 * text and replace it with what is being
+		 * typed in now. Depends on lyxrc settings
+		 * "auto_region_delete", which defaults to
+		 * true (on). */
+
+		LyXText * lt = bv_->getLyXText();
+		
+		if (lyxrc.auto_region_delete) {
+			if (lt->selection.set()) {
+				lt->cutSelection(bv_, false, false);
+				bv_->update(lt,
+					    BufferView::SELECT
+					    | BufferView::FITCUR
+					    | BufferView::CHANGE);
+			}
 		}
-		TEXT(bv_)->sel_cursor = TEXT(bv_)->cursor;
+		
+		beforeChange(lt);
+		LyXFont const old_font(lt->real_current_font);
+		
+		string::const_iterator cit = argument.begin();
+		string::const_iterator end = argument.end();
+		for (; cit != end; ++cit) {
+			owner_->getIntl()->getTrans().TranslateAndInsert(*cit, lt);
+		}
+		
+		bv_->update(lt,
+			    BufferView::SELECT
+			    | BufferView::FITCUR
+			    | BufferView::CHANGE);
+		
+		lt->selection.cursor = lt->cursor;
 		moveCursorUpdate(false);
-
-		// real_current_font.number can change so we need to 
+		
+		// real_current_font.number can change so we need to
 		// update the minibuffer
-		if (old_font != TEXT(bv_)->real_current_font)
+		if (old_font != lt->real_current_font)
 			owner_->showState();
+		//return string();
 	}
 	break;
 
 	case LFUN_DATE_INSERT:  // jdblair: date-insert cmd
 	{
-		struct tm * now_tm;
-		
 		time_t now_time_t = time(NULL);
-		now_tm = localtime(&now_time_t);
+		struct tm * now_tm = localtime(&now_time_t);
 		setlocale(LC_TIME, "");
 		string arg;
 		if (!argument.empty())
@@ -2990,73 +3197,298 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		char datetmp[32];
 		int const datetmp_len =
 			::strftime(datetmp, 32, arg.c_str(), now_tm);
+
+		LyXText * lt = bv_->getLyXText();
+		
 		for (int i = 0; i < datetmp_len; i++) {
-			TEXT(bv_)->InsertChar(bv_, datetmp[i]);
-			update(TEXT(bv_),
-			       BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+			lt->insertChar(bv_, datetmp[i]);
+			update(lt,
+			       BufferView::SELECT
+			       | BufferView::FITCUR
+			       | BufferView::CHANGE);
 		}
 
-		TEXT(bv_)->sel_cursor = TEXT(bv_)->cursor;
+		lt->selection.cursor = lt->cursor;
 		moveCursorUpdate(false);
 	}
 	break;
 
 	case LFUN_UNKNOWN_ACTION:
-	{
-		if (!buffer_) {
-			owner_->getLyXFunc()->setErrorMessage(N_("No document open"));
-			break;
+		owner_->getLyXFunc()->setErrorMessage(N_("Unknown function!"));
+		break;
+	
+	default:
+		return false;
+	} // end of switch
+
+	return true;
+}
+
+
+void BufferView::Pimpl::newline()
+{
+	if (available()) {
+		LyXText * lt = bv_->getLyXText();
+		hideCursor();
+		update(lt,
+		       BufferView::SELECT
+		       | BufferView::FITCUR);
+		lt->insertChar(bv_, Paragraph::META_NEWLINE);
+		update(lt,
+		       BufferView::SELECT
+		       | BufferView::FITCUR
+		       | BufferView::CHANGE);
+	}
+}
+
+
+void BufferView::Pimpl::hfill()
+{
+	if (available()) {
+		LyXText * lt = bv_->getLyXText();
+		hideCursor();
+		update(lt,
+		       BufferView::SELECT
+		       | BufferView::FITCUR);
+		lt->insertChar(bv_, Paragraph::META_HFILL);
+		update(lt,
+		       BufferView::SELECT
+		       | BufferView::FITCUR
+		       | BufferView::CHANGE);
+	}
+}
+
+
+void BufferView::Pimpl::specialChar(InsetSpecialChar::Kind kind)
+{
+	if (available()) {
+		LyXText * lt = bv_->getLyXText();
+		
+		hideCursor();
+		update(lt, BufferView::SELECT|BufferView::FITCUR);
+		InsetSpecialChar * new_inset = 
+			new InsetSpecialChar(kind);
+		if (!insertInset(new_inset))
+			delete new_inset;
+		else
+			updateInset(new_inset, true);
+	}
+}
+
+
+void BufferView::Pimpl::smartQuote()
+{
+	LyXText const * lt = bv_->getLyXText();
+	Paragraph const * par = lt->cursor.par();
+	pos_type pos = lt->cursor.pos();
+	char c;
+
+	if (!pos
+	    || (par->isInset(pos - 1)
+		&& par->getInset(pos - 1)->isSpace()))
+		c = ' ';
+	else
+		c = par->getChar(pos - 1);
+		
+
+	hideCursor();
+
+	LyXLayout const & style =
+		textclasslist[bv_->buffer()->params.textclass][par->layout()];
+	
+	if (style.pass_thru ||
+		(!insertInset(new InsetQuotes(c, bv_->buffer()->params))))
+		bv_->owner()->getLyXFunc()->dispatch(LFUN_SELFINSERT, "\"");
+}
+
+
+void BufferView::Pimpl::insertAndEditInset(Inset * inset)
+{
+	if (insertInset(inset))
+		inset->edit(bv_);
+	else
+		delete inset;
+}
+
+ 
+// Open and lock an updatable inset
+bool BufferView::Pimpl::open_new_inset(UpdatableInset * new_inset, bool behind)
+{
+	LyXText * lt = bv_->getLyXText();
+	
+	beforeChange(lt);
+	finishUndo();
+	if (!insertInset(new_inset)) {
+		delete new_inset;
+		return false;
+	}
+	new_inset->edit(bv_, !behind);
+	return true;
+}
+
+
+bool BufferView::Pimpl::insertInset(Inset * inset, string const & lout)
+{
+	// if we are in a locking inset we should try to insert the
+	// inset there otherwise this is a illegal function now
+	if (bv_->theLockingInset()) {
+		if (bv_->theLockingInset()->insetAllowed(inset))
+		    return bv_->theLockingInset()->insertInset(bv_, inset);
+		return false;
+	}
+
+	// not quite sure if we want this...
+	setCursorParUndo(bv_);
+	freezeUndo();
+	
+	beforeChange(bv_->text);
+	if (!lout.empty()) {
+		update(bv_->text, BufferView::SELECT|BufferView::FITCUR);
+		bv_->text->breakParagraph(bv_);
+		update(bv_->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+
+		if (bv_->text->cursor.par()->size()) {
+			bv_->text->cursorLeft(bv_);
+			
+			bv_->text->breakParagraph(bv_);
+			update(bv_->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 		}
 
-		if (buffer_->isReadonly()) {
-			owner_->getLyXFunc()->setErrorMessage(N_("Document is read only"));
-			break;
+		string lres = lout;
+		LyXTextClass const & tclass =
+			textclasslist[buffer_->params.textclass];
+		bool hasLayout = tclass.hasLayout(lres);
+		string lay = tclass.defaultLayoutName();
+
+		if (hasLayout != false) {
+			// layout found
+			lay = lres;
+		} else {
+			// layout not fount using default
+			lay = tclass.defaultLayoutName();
 		}
-		if (!argument.empty()) {
-			/* Automatically delete the currently selected
-			 * text and replace it with what is being
-			 * typed in now. Depends on lyxrc settings
-			 * "auto_region_delete", which defaults to
-			 * true (on). */
-		
-			if (lyxrc.auto_region_delete) {
-				if (TEXT(bv_)->selection){
-					TEXT(bv_)->CutSelection(bv_, false);
-					update(TEXT(bv_),
-					       BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+
+		bv_->text->setLayout(bv_, lay);
+		
+		bv_->text->setParagraph(bv_, 0, 0,
+				   0, 0,
+				   VSpace(VSpace::NONE), VSpace(VSpace::NONE),
+				   Spacing(),
+				   LYX_ALIGN_LAYOUT, 
+				   string(),
+				   0);
+		update(bv_->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+	}
+	
+	bv_->text->insertInset(bv_, inset);
+	update(bv_->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+
+	unFreezeUndo();
+	return true;
+}
+
+
+void BufferView::Pimpl::updateInset(Inset * inset, bool mark_dirty)
+{
+	if (!inset || !available())
+		return;
+
+	// first check for locking insets
+	if (bv_->theLockingInset()) {
+		if (bv_->theLockingInset() == inset) {
+			if (bv_->text->updateInset(bv_, inset)) {
+				update();
+				if (mark_dirty) {
+					buffer_->markDirty();
 				}
+				updateScrollbar();
+				return;
 			}
-			
-			beforeChange(TEXT(bv_));
-			LyXFont const old_font(TEXT(bv_)->real_current_font);
-			for (string::size_type i = 0;
-			     i < argument.length(); ++i) {
-				if (greek_kb_flag) {
-					if (!math_insert_greek(bv_, argument[i]))
-						owner_->getIntl()->getTrans().TranslateAndInsert(argument[i], TEXT(bv_));
-				} else
-					owner_->getIntl()->getTrans().TranslateAndInsert(argument[i], TEXT(bv_));
+		} else if (bv_->theLockingInset()->updateInsetInInset(bv_, inset)) {
+			if (bv_->text->updateInset(bv_,  bv_->theLockingInset())) {
+				update();
+				if (mark_dirty) {
+					buffer_->markDirty();
+				}
+				updateScrollbar();
+				return;
 			}
+		}
+	}
+  
+	// then check if the inset is a top_level inset (has no owner)
+	// if yes do the update as always otherwise we have to update the
+	// toplevel inset where this inset is inside
+	Inset * tl_inset = inset;
+	while(tl_inset->owner())
+		tl_inset = tl_inset->owner();
+	hideCursor();
+	if (tl_inset == inset) {
+		update(bv_->text, BufferView::UPDATE);
+		if (bv_->text->updateInset(bv_, inset)) {
+			if (mark_dirty) {
+				update(bv_->text,
+				       BufferView::SELECT
+				       | BufferView::FITCUR
+				       | BufferView::CHANGE);
+			} else {
+				update(bv_->text, SELECT);
+			}
+			return;
+		}
+	} else if (static_cast<UpdatableInset *>(tl_inset)
+			   ->updateInsetInInset(bv_, inset))
+	{
+			if (bv_->text->updateInset(bv_,  tl_inset)) {
+				update();
+				updateScrollbar();
+			}
+	}
+}
 
-			update(TEXT(bv_),BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-
-			TEXT(bv_)->sel_cursor = TEXT(bv_)->cursor;
-			moveCursorUpdate(false);
 
-			// real_current_font.number can change so we need to
-			// update the minibuffer
-			if (old_font != TEXT(bv_)->real_current_font)
-				owner_->showState();
+void BufferView::Pimpl::gotoInset(vector<Inset::Code> const & codes,
+				  bool same_content)
+{
+	if (!available()) return;
+	
+	hideCursor();
+	beforeChange(bv_->text);
+	update(bv_->text, BufferView::SELECT|BufferView::FITCUR);
+	
+	LyXCursor const & cursor = bv_->text->cursor;
+ 
+	string contents;
+	if (same_content &&
+	    cursor.par()->isInset(cursor.pos())) {
+		Inset const * inset = cursor.par()->getInset(cursor.pos());
+		if (find(codes.begin(), codes.end(), inset->lyxCode())
+		    != codes.end())
+			contents =
+				static_cast<InsetCommand const *>(inset)->getContents();
+	}
+	
+ 
+	if (!bv_->text->gotoNextInset(bv_, codes, contents)) {
+		if (bv_->text->cursor.pos() 
+		    || bv_->text->cursor.par() != bv_->text->ownerParagraph()) {
+			LyXCursor tmp = bv_->text->cursor;
+			bv_->text->cursor.par(bv_->text->ownerParagraph());
+			bv_->text->cursor.pos(0);
+			if (!bv_->text->gotoNextInset(bv_, codes, contents)) {
+				bv_->text->cursor = tmp;
+				bv_->owner()->message(_("No more insets"));
+			}
 		} else {
-			// if we don't have an argument there was something
-			// strange going on so we just tell this to someone!
-			owner_->getLyXFunc()->setErrorMessage(N_("No argument given"));
+			bv_->owner()->message(_("No more insets"));
 		}
-		break;
 	}
-	default:
-		return false;
-	} // end of switch
+	update(bv_->text, BufferView::SELECT|BufferView::FITCUR);
+	bv_->text->selection.cursor = bv_->text->cursor;
+}
 
-	return true;
+
+void BufferView::Pimpl::gotoInset(Inset::Code code, bool same_content)
+{
+	gotoInset(vector<Inset::Code>(1, code), same_content);
 }