X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView_pimpl.C;h=56548fbca349b941f8de85ff871ed97aeb767be3;hb=b45d1b31f5fe09e879648d3b115900ca2cdb87dc;hp=1efca6de2f60ea1bf17e1c460137c80d3a86da9d;hpb=8b8741cd5d7e960c5663911f8b69972419f6d37b;p=lyx.git

diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C
index 1efca6de2f..56548fbca3 100644
--- a/src/BufferView_pimpl.C
+++ b/src/BufferView_pimpl.C
@@ -18,7 +18,6 @@
 #include "bufferview_funcs.h"
 #include "TextCache.h"
 #include "bufferlist.h"
-#include "lyx_gui_misc.h"
 #include "lyxrc.h"
 #include "intl.h"
 // added for Dispatch functions
@@ -74,7 +73,7 @@
 #include <clocale>
 
 
-extern lyx::layout_type current_layout;
+extern string current_layout;
 
 using std::vector;
 using std::find_if;
@@ -86,17 +85,15 @@ using std::min;
 using SigC::slot;
 
 using lyx::pos_type;
-using lyx::layout_type;
 using lyx::textclass_type;
 
-/* the selection possible is needed, that only motion events are 
+/* 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;
 
 extern BufferList bufferlist;
 extern char ascii_type;
 
-extern void sigchldchecker(pid_t pid, int * status);
 extern int bibitemMaxWidth(BufferView *, LyXFont const &);
 
 
@@ -115,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;
@@ -155,7 +152,11 @@ 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));
+
 	cursor_timeout.timeout.connect(slot(this,
 					    &BufferView::Pimpl::cursorToggle));
 	cursor_timeout.start();
@@ -164,7 +165,7 @@ BufferView::Pimpl::Pimpl(BufferView * b, LyXView * o,
 }
 
 
-Painter & BufferView::Pimpl::painter() 
+Painter & BufferView::Pimpl::painter()
 {
 	return workarea_.getPainter();
 }
@@ -185,7 +186,7 @@ void BufferView::Pimpl::buffer(Buffer * b)
 		textcache.add(buffer_, workarea_.workWidth(), bv_->text);
 		if (lyxerr.debugging())
 			textcache.show(lyxerr, "BufferView::buffer");
-		
+
 		bv_->text = 0;
 	}
 
@@ -193,7 +194,7 @@ void BufferView::Pimpl::buffer(Buffer * b)
 	buffer_ = b;
 
 	if (bufferlist.getState() == BufferList::CLOSING) return;
-	
+
 	// Nuke old image
 	// screen is always deleted when the buffer is changed.
 	screen_.reset(0);
@@ -213,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
@@ -299,12 +300,12 @@ void BufferView::Pimpl::redoCurrentBuffer()
 int BufferView::Pimpl::resizeCurrentBuffer()
 {
 	lyxerr[Debug::INFO] << "resizeCurrentBuffer" << endl;
-	
+
 	Paragraph * par = 0;
 	Paragraph * selstartpar = 0;
 	Paragraph * selendpar = 0;
 	UpdatableInset * the_locking_inset = 0;
-	
+
 	pos_type pos = 0;
 	pos_type selstartpos = 0;
 	pos_type selendpos = 0;
@@ -328,6 +329,7 @@ int BufferView::Pimpl::resizeCurrentBuffer()
 		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.
@@ -344,14 +346,16 @@ int BufferView::Pimpl::resizeCurrentBuffer()
 		} else {
 			bv_->text = new LyXText(bv_);
 			bv_->text->init(bv_);
+			//buffer_->resizeInsets(bv_);
 		}
 	}
+
 	updateScreen();
 
 	if (par) {
 		bv_->text->selection.set(true);
-		/* at this point just to avoid the Delete-Empty-Paragraph
-		 * Mechanism when setting the cursor */
+		// 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);
@@ -367,10 +371,9 @@ int BufferView::Pimpl::resizeCurrentBuffer()
 		// remake the inset locking
 		bv_->theLockingInset(the_locking_inset);
 	}
-	bv_->text->first = screen_->topCursorVisible(bv_->text);
-#if 0
-	buffer_->resizeInsets(bv_);
-#endif
+
+	bv_->text->first_y = screen_->topCursorVisible(bv_->text);
+
 	// this will scroll the screen such that the cursor becomes visible
 	updateScrollbar();
 	redraw();
@@ -378,7 +381,7 @@ int BufferView::Pimpl::resizeCurrentBuffer()
 	setState();
 	owner_->allowInput();
 
-	/// clear the "Formatting Document" message 
+	/// clear the "Formatting Document" message
 	owner_->message("");
 
 	return 0;
@@ -394,50 +397,52 @@ void BufferView::Pimpl::updateScreen()
 
 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 (!bv_->text) {
+		lyxerr[Debug::GUI] << "no text in updateScrollbar" << endl;
 		workarea_.setScrollbar(0, 1.0);
 		return;
 	}
 
 	long const text_height = bv_->text->height;
+	long const work_height = workarea_.height();
 
 	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 = 0;
-	static double old_lineh = 0;
-	static double old_slider_size = 0;
-
-	if (text_height != old_text_height) {
-		workarea_.setScrollbarBounds(0, text_height - workarea_.height());
-		old_text_height = text_height;
-	}
-	if (lineh != old_lineh) {
-		workarea_.setScrollbarIncrements(lineh);
-		old_lineh = lineh;
-	}
-	if (current_scrollbar_value != bv_->text->first
-	    || slider_size != old_slider_size) {
-		current_scrollbar_value = bv_->text->first;
-		workarea_.setScrollbar(current_scrollbar_value, slider_size);
-		old_slider_size = slider_size;
+	lyxerr[Debug::GUI] << "text_height now " << text_height << endl;
+	lyxerr[Debug::GUI] << "work_height " << work_height << endl;
+ 
+	/* If the text is smaller than the working area, the scrollbar
+	 * maximum must be the working area height. No scrolling will
+	 * be possible */
+	if (text_height <= work_height) {
+		lyxerr[Debug::GUI] << "doc smaller than workarea !" << endl;
+		workarea_.setScrollbarBounds(0.0, 0.0);
+		current_scrollbar_value = bv_->text->first_y;
+		workarea_.setScrollbar(current_scrollbar_value, 1.0);
+		return;
 	}
+
+	workarea_.setScrollbarBounds(0.0, text_height - work_height);
+	workarea_.setScrollbarIncrements(lineh);
+	current_scrollbar_value = bv_->text->first_y;
+	workarea_.setScrollbar(current_scrollbar_value, slider_size);
 }
 
 
 // Callback for scrollbar slider
 void BufferView::Pimpl::scrollCB(double value)
 {
+	lyxerr[Debug::GUI] << "scrollCB of " << value << endl;
+ 
 	if (!buffer_) return;
 
 	current_scrollbar_value = long(value);
+
 	if (current_scrollbar_value < 0)
 		current_scrollbar_value = 0;
-   
+
 	if (!screen_.get())
 		return;
 
@@ -447,12 +452,12 @@ void BufferView::Pimpl::scrollCB(double value)
 		waitForX();
 		return;
 	}
- 
+
 	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 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);
@@ -467,26 +472,26 @@ int BufferView::Pimpl::scrollUp(long time)
 {
 	if (!buffer_) return 0;
 	if (!screen_.get()) return 0;
-   
+
 	double value = workarea_.getScrollbarValue();
-   
+
 	if (value == 0) return 0;
 
 	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());
-   
+
 	value -= add_value;
 
 	if (value < 0)
 		value = 0;
-   
+
 	workarea_.setScrollbarValue(value);
-   
-	scrollCB(value); 
+
+	scrollCB(value);
 	return 0;
 }
 
@@ -495,28 +500,28 @@ int BufferView::Pimpl::scrollDown(long time)
 {
 	if (!buffer_) return 0;
 	if (!screen_.get()) return 0;
-   
+
 	double value = workarea_.getScrollbarValue();
 	pair<float, float> p = workarea_.getScrollbarBounds();
 	double const max = p.second;
-	
+
 	if (value == max) return 0;
 
 	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());
-   
+
 	value += add_value;
-   
+
 	if (value > max)
 		value = max;
 
 	workarea_.setScrollbarValue(value);
-	
-	scrollCB(value); 
+
+	scrollCB(value);
 	return 0;
 }
 
@@ -547,40 +552,37 @@ void BufferView::Pimpl::workAreaMotionNotify(int x, int y, unsigned int state)
 		bv_->theLockingInset()->
 			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 */
 	if (!selection_possible)
 		return;
- 
+
 	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.set())
 		update(bv_->text, BufferView::UPDATE); // Maybe an empty line was deleted
-      
+
 	bv_->text->setSelection(bv_);
 	screen_->toggleToggle(bv_->text, bv_);
 	fitCursor();
-#if 0
-	screen_->showCursor(bv_->text, bv_);
-#else
 	showCursor();
-#endif
 }
 
 
 // Single-click on work area
 void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos,
-                                            unsigned int button)
+					    unsigned int button)
 {
-	if (!buffer_ || !screen_.get()) return;
+	if (!buffer_ || !screen_.get())
+		return;
 
 	Inset * inset_hit = checkInsetHit(bv_->text, xpos, ypos);
 
@@ -595,10 +597,22 @@ void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos,
 			break;
 		}
 	}
-	
+
+	// 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;
+	}
+
+	int const screen_first = bv_->text->first_y;
+
 	if (bv_->theLockingInset()) {
 		// We are in inset locking mode
-		
+
 		/* Check whether the inset was hit. If not reset mode,
 		   otherwise give the event to the inset */
 		if (inset_hit == bv_->theLockingInset()) {
@@ -609,32 +623,18 @@ void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos,
 			bv_->unlockInset(bv_->theLockingInset());
 		}
 	}
-	
+
 	if (!inset_hit)
 		selection_possible = true;
 	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.set()) {
-		owner_->getLyXFunc()->dispatch(LFUN_COPY);
-		paste_internally = true;
-	}
-	
 	// Clear the selection
 	screen_->toggleSelection(bv_->text, bv_);
 	bv_->text->clearSelection();
 	bv_->text->fullRebreak(bv_);
-#if 0
-	screen_->update(bv_->text, bv_);
-#else
 	update();
-#endif
 	updateScrollbar();
-	
+
 	// Single left click in math inset?
 	if (isHighlyEditableInset(inset_hit)) {
 		// Highly editable inset, like math
@@ -642,28 +642,33 @@ void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos,
 		selection_possible = false;
 		owner_->updateLayoutChoice();
 		owner_->message(inset->editMessage());
+		//inset->edit(bv_, xpos, ypos, button);
+		// We just have to lock the inset before calling a PressEvent on it!
+		// we don't need the edit() call here! (Jug20020329)
+		if (!bv_->lockInset(inset)) {
+			lyxerr[Debug::INSETS] << "Cannot lock inset" << endl;
+		}
 		inset->insetButtonPress(bv_, xpos, ypos, button);
-		inset->edit(bv_, xpos, ypos, button);
 		return;
-	} 
-	
+	}
+
 	// Right click on a footnote flag opens float menu
-	if (button == 3) { 
+	if (button == 3) {
 		selection_possible = false;
 		return;
 	}
-	
+
 	if (!inset_hit) // otherwise it was already set in checkInsetHit(...)
 		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()) {
 		selection_possible = false;
 	}
-	
+
 	// Insert primary selection with middle mouse
 	// if there is a local selection in the current buffer,
 	// insert this
@@ -679,7 +684,7 @@ void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos,
 }
 
 
-void BufferView::Pimpl::doubleClick(int /*x*/, int /*y*/, unsigned int button) 
+void BufferView::Pimpl::doubleClick(int /*x*/, int /*y*/, unsigned int button)
 {
 	// select a word
 	if (!buffer_)
@@ -736,6 +741,44 @@ void BufferView::Pimpl::tripleClick(int /*x*/, int /*y*/, unsigned int button)
 }
 
 
+void BufferView::Pimpl::selectionRequested()
+{
+	static string sel;
+
+	if (!available())
+		return;
+
+	LyXText * text = bv_->getLyXText();
+
+	if (text->selection.set() &&
+		(!bv_->text->xsel_cache.set() ||
+		 text->selection.start != bv_->text->xsel_cache.start ||
+		 text->selection.end != bv_->text->xsel_cache.end))
+	{
+		bv_->text->xsel_cache = text->selection;
+		sel = text->selectionAsString(bv_->buffer(), false);
+	} else if (!text->selection.set()) {
+		sel = string();
+		bv_->text->xsel_cache.set(false);
+	}
+	if (!sel.empty()) {
+		workarea_.putClipboard(sel);
+	}
+}
+
+
+void BufferView::Pimpl::selectionLost()
+{
+	if (active() && available()) {
+		hideCursor();
+		toggleSelection();
+		bv_->getLyXText()->clearSelection();
+		showCursor();
+		bv_->text->xsel_cache.set(false);
+	}
+}
+
+
 void BufferView::Pimpl::enterView()
 {
 	if (active() && available()) {
@@ -768,30 +811,36 @@ void BufferView::Pimpl::workAreaButtonRelease(int x, int y,
 		// We are in inset locking mode.
 
 		/* LyX does a kind of work-area grabbing for insets.
-		   Only a ButtonPress Event outside the inset will 
+		   Only a ButtonPress Event outside the inset will
 		   force a insetUnlock. */
 		bv_->theLockingInset()->
 			insetButtonRelease(bv_, x, y, button);
 		return;
 	}
-	
+
 	selection_possible = false;
-	
+
 	if (button == 2)
 		return;
 
+	// 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. 
+		// 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
@@ -800,7 +849,7 @@ void BufferView::Pimpl::workAreaButtonRelease(int x, int y,
 		// 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 !!!!!!!!!
 
@@ -829,39 +878,18 @@ void BufferView::Pimpl::workAreaButtonRelease(int x, int y,
 			inset->insetButtonRelease(bv_, x, y, button);
 		} else {
 			inset_hit->insetButtonRelease(bv_, x, y, button);
+			// IMO this is a grosshack! Inset's should be changed so that
+			// they call the actions they have to do with the insetButtonRel.
+			// function and not in the edit(). This should be changed
+			// (Jug 20020329)
 			inset_hit->edit(bv_, x, y, button);
 		}
 		return;
 	}
 
-#ifdef WITH_WARNINGS
-#warning variable c is set but never used. What is it good for?? (JMarc)
-#warning isnt this code dead ?? "open a float" ??? (jbl)
-#endif
-	// 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;
-		}
-	}
-
 	// Maybe we want to edit a bibitem ale970302
-	if (bv_->text->cursor.par()->bibkey && x < 20 + 
-	    bibitemMaxWidth(bv_, textclasslist.
-			    TextClass(buffer_->
-				      params.textclass).defaultfont())) {
+	if (bv_->text->cursor.par()->bibkey && x < 20 +
+	    bibitemMaxWidth(bv_, textclasslist[buffer_->params.textclass].defaultfont())) {
 		bv_->text->cursor.par()->bibkey->edit(bv_, 0, 0, 0);
 	}
 
@@ -869,30 +897,33 @@ void BufferView::Pimpl::workAreaButtonRelease(int x, int y,
 }
 
 
-Box BufferView::Pimpl::insetDimensions(LyXText const & text, LyXCursor const & cursor) const
+Box BufferView::Pimpl::insetDimensions(LyXText const & text,
+				       LyXCursor const & cursor) const
 {
 	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
+
+
+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());
@@ -902,7 +933,7 @@ Inset * BufferView::Pimpl::checkInset(LyXText const & text, LyXCursor const & cu
 	}
 
 	Inset /*const*/ * inset = par.getInset(pos);
- 
+
 	if (!isEditableInset(inset)) {
 		return 0;
 	}
@@ -910,40 +941,40 @@ Inset * BufferView::Pimpl::checkInset(LyXText const & text, LyXCursor const & cu
 	Box b(insetDimensions(text, cursor));
 
 	if (!b.contained(x, y)) {
-		lyxerr[Debug::GUI] << "Missed inset at x,y " << 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());
-  
+
 	return inset;
 }
 
- 
+
 Inset * BufferView::Pimpl::checkInsetHit(LyXText * text, int & x, int & y)
 {
 	if (!screen_.get())
 		return 0;
-  
-	int y_tmp = y + text->first;
- 
+
+	int y_tmp = y + text->first_y;
+
 	LyXCursor cursor;
 	text->setCursorFromCoordinates(bv_, cursor, x, y_tmp);
- 
+
 	Inset * inset(checkInset(*text, cursor, x, y_tmp));
 
 	if (inset) {
 		y = y_tmp;
 		return inset;
 	}
- 
+
 	// look at previous position
- 
+
 	if (cursor.pos() == 0) {
 		return 0;
 	}
@@ -984,6 +1015,7 @@ 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();
@@ -1038,7 +1070,7 @@ void BufferView::Pimpl::update()
 // -3 - update
 // -2 - update, move sel_cursor if selection, fitcursor
 // -1 - update, move sel_cursor if selection, fitcursor, mark dirty
-//  0 - update, move sel_cursor if selection, fitcursor 
+//  0 - update, move sel_cursor if selection, fitcursor
 //  1 - update, move sel_cursor if selection, fitcursor, mark dirty
 //  3 - update, move sel_cursor if selection
 //
@@ -1058,7 +1090,7 @@ void BufferView::Pimpl::update()
 //       UPDATE = 0,
 //       SELECT = 1,
 //       FITCUR = 2,
-//       CHANGE = 4 
+//       CHANGE = 4
 // };
 //
 // UPDATE_ONLY = UPDATE;
@@ -1088,7 +1120,7 @@ void BufferView::Pimpl::update(LyXText * text, BufferView::UpdateCodes f)
 	} else {
 	    update();
 	}
-		
+
 	if ((f & FITCUR)) {
 		fitCursor();
 	}
@@ -1102,33 +1134,26 @@ 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 const 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)
-		sigchldchecker(pid, &status);
-
-	updatelist.update(bv_);
-	
+
 	if (!screen_.get()) {
 		cursor_timeout.restart();
 		return;
 	}
 
+	/* FIXME */
+	extern void reapSpellchecker(void);
+	reapSpellchecker();
+
 	if (!bv_->theLockingInset()) {
 		screen_->cursorToggle(bv_);
 	} else {
 		bv_->theLockingInset()->toggleInsetCursor(bv_);
 	}
-	
+
 	cursor_timeout.restart();
 }
 
@@ -1137,24 +1162,23 @@ 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);
 	finishUndo();
 	// This is to allow jumping over large insets
 	if ((cursorrow == text->cursor.row()))
 		text->cursorUp(bv_);
-	
-  	if (text->inset_owner ||
+
+	if (text->inset_owner ||
 	    text->cursor.row()->height() < workarea_.height())
 		screen_->draw(bv_->text, bv_,
 			      text->cursor.y()
 			      - text->cursor.row()->baseline()
 			      + text->cursor.row()->height()
-			      - workarea_.height() + 1 );
+			      - workarea_.height() + 1);
 	updateScrollbar();
 }
 
@@ -1163,20 +1187,20 @@ 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);
-    
+
 	Row * cursorrow = text->cursor.row();
 	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_);
-	
- 	if (text->inset_owner ||
+
+	if (text->inset_owner ||
 	    text->cursor.row()->height() < workarea_.height())
 		screen_->draw(bv_->text, bv_, text->cursor.y() -
 			      text->cursor.row()->baseline());
@@ -1186,7 +1210,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;
 }
 
@@ -1224,9 +1249,9 @@ void BufferView::Pimpl::restorePosition(unsigned int i)
 
 	if (fname != buffer_->fileName()) {
 		Buffer * b = bufferlist.exists(fname) ?
-	 		bufferlist.getBuffer(fname) :
+			bufferlist.getBuffer(fname) :
 			bufferlist.loadLyXFile(fname); // don't ask, just load it
-		if (b != 0 ) buffer(b);
+		if (b != 0) buffer(b);
 	}
 
 	Paragraph * par = buffer_->getParFromID(saved_positions[i].par_id);
@@ -1319,7 +1344,7 @@ bool BufferView::Pimpl::active() const
 }
 
 
-bool BufferView::Pimpl::belowMouse() const 
+bool BufferView::Pimpl::belowMouse() const
 {
 	return workarea_.belowMouse();
 }
@@ -1364,7 +1389,7 @@ void BufferView::Pimpl::toggleToggle()
 }
 
 
-void BufferView::Pimpl::center() 
+void BufferView::Pimpl::center()
 {
 	beforeChange(bv_->text);
 	if (bv_->text->cursor.y() > static_cast<int>((workarea_.height() / 2))) {
@@ -1377,16 +1402,18 @@ void BufferView::Pimpl::center()
 }
 
 
-void BufferView::Pimpl::pasteClipboard(bool asPara) 
+void BufferView::Pimpl::pasteClipboard(bool asPara)
 {
-	if (!buffer_) return;
+	if (!buffer_)
+		return;
 
 	screen_->hideCursor();
 	beforeChange(bv_->text);
-	
+
 	string const clip(workarea_.getClipboard());
-	
-	if (clip.empty()) return;
+
+	if (clip.empty())
+		return;
 
 	if (asPara) {
 		bv_->getLyXText()->insertStringAsParagraphs(bv_, clip);
@@ -1413,15 +1440,22 @@ inline
 void BufferView::Pimpl::moveCursorUpdate(bool selecting)
 {
 	LyXText * lt = bv_->getLyXText();
-	
+
 	if (selecting || lt->selection.mark()) {
 		lt->setSelection(bv_);
 		if (lt->bv_owner)
 			toggleToggle();
+		else
+			updateInset(lt->inset_owner, false);
 	}
-	update(lt, BufferView::SELECT|BufferView::FITCUR);
-	showCursor();
-	
+	if (lt->bv_owner) {
+		update(lt, BufferView::SELECT|BufferView::FITCUR);
+		showCursor();
+	}
+
+	if (!lt->selection.set())
+		workarea_.haveSelection(false);
+
 	/* ---> Everytime the cursor is moved, show the current font state. */
 	// should this too me moved out of this func?
 	//owner->showState();
@@ -1450,7 +1484,7 @@ 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))
 				initpath = trypath;
@@ -1459,15 +1493,15 @@ void BufferView::Pimpl::MenuInsertLyXFile(string const & filen)
 		FileDialog fileDlg(bv_->owner(),
 				   _("Select LyX document to insert"),
 			LFUN_FILE_INSERT,
-			make_pair(string(_("Documents")),
+			make_pair(string(_("Documents|#o#O")),
 				  string(lyxrc.document_path)),
-			make_pair(string(_("Examples")),
+			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;
 
@@ -1485,7 +1519,7 @@ void BufferView::Pimpl::MenuInsertLyXFile(string const & filen)
 	filename = FileSearch(string(), filename, "lyx");
 
 	string const disp_fn(MakeDisplayPath(filename));
-	
+
 	ostringstream s1;
 	s1 << _("Inserting document") << ' '
 	   << disp_fn << " ...";
@@ -1509,7 +1543,7 @@ 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:
@@ -1534,8 +1568,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 			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)
@@ -1554,42 +1587,42 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		}
 		break;
 	}
-		
+
 	case LFUN_PASTE:
 		bv_->paste();
 		setState();
 		break;
-		
+
 	case LFUN_PASTESELECTION:
 	{
-	        bool asPara = false;
+		bool asPara = false;
 		if (argument == "paragraph")
 			asPara = true;
 		pasteClipboard(asPara);
 	}
 	break;
-	
+
 	case LFUN_CUT:
 		bv_->cut();
 		break;
-		
+
 	case LFUN_COPY:
 		bv_->copy();
 		break;
-		
+
 	case LFUN_LAYOUT_COPY:
 		bv_->copyEnvironment();
 		break;
-		
+
 	case LFUN_LAYOUT_PASTE:
 		bv_->pasteEnvironment();
 		setState();
 		break;
-		
+
 	case LFUN_GOTOERROR:
 		gotoInset(Inset::ERROR_CODE, false);
 		break;
-		
+
 	case LFUN_GOTONOTE:
 		gotoInset(Inset::IGNORE_CODE, false);
 		break;
@@ -1606,15 +1639,15 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	case LFUN_HYPHENATION:
 		specialChar(InsetSpecialChar::HYPHENATION);
 		break;
-		
+
 	case LFUN_LIGATURE_BREAK:
 		specialChar(InsetSpecialChar::LIGATURE_BREAK);
 		break;
-		
+
 	case LFUN_LDOTS:
 		specialChar(InsetSpecialChar::LDOTS);
 		break;
-		
+
 	case LFUN_END_OF_SENTENCE:
 		specialChar(InsetSpecialChar::END_OF_SENTENCE);
 		break;
@@ -1622,23 +1655,19 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	case LFUN_MENU_SEPARATOR:
 		specialChar(InsetSpecialChar::MENU_SEPARATOR);
 		break;
-		
+
 	case LFUN_HFILL:
 		hfill();
 		break;
-		
-	case LFUN_DEPTH:
-		changeDepth(bv_, bv_->getLyXText(), 0);
-		break;
-		
+
 	case LFUN_DEPTH_MIN:
 		changeDepth(bv_, bv_->getLyXText(), -1);
 		break;
-		
+
 	case LFUN_DEPTH_PLUS:
 		changeDepth(bv_, bv_->getLyXText(), 1);
 		break;
-		
+
 	case LFUN_FREE:
 		owner_->getDialogs()->setUserFreeFont();
 		break;
@@ -1646,7 +1675,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	case LFUN_FILE_INSERT:
 		MenuInsertLyXFile(argument);
 		break;
-	
+
 	case LFUN_FILE_INSERT_ASCII_PARA:
 		InsertAsciiFile(bv_, argument, true);
 		break;
@@ -1654,43 +1683,43 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	case LFUN_FILE_INSERT_ASCII:
 		InsertAsciiFile(bv_, argument, false);
 		break;
-		
+
 	case LFUN_LAYOUT:
 	{
 		lyxerr[Debug::INFO] << "LFUN_LAYOUT: (arg) "
 				    << argument << endl;
-		
+
 		// Derive layout number from given argument (string)
-		// and current buffer's textclass (number). */    
+		// and current buffer's textclass (number). */
 		textclass_type tclass = buffer_->params.textclass;
-		pair <bool, layout_type> layout = 
-			textclasslist.NumberOfLayout(tclass, argument);
+		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);
+			if (!obs.empty())
+				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;
+			current_layout = layout;
 			update(lt,
 			       BufferView::SELECT
 			       | BufferView::FITCUR);
-			lt->setLayout(bv_, layout.second);
-			owner_->setLayout(layout.second);
+			lt->setLayout(bv_, layout);
+			owner_->setLayout(layout);
 			update(lt,
 			       BufferView::SELECT
 			       | BufferView::FITCUR
@@ -1715,50 +1744,50 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		bold(bv_);
 		owner_->showState();
 		break;
-		
+
 	case LFUN_NOUN:
 		noun(bv_);
 		owner_->showState();
 		break;
-		
+
 	case LFUN_CODE:
 		code(bv_);
 		owner_->showState();
 		break;
-		
+
 	case LFUN_SANS:
 		sans(bv_);
 		owner_->showState();
 		break;
-		
+
 	case LFUN_ROMAN:
 		roman(bv_);
 		owner_->showState();
 		break;
-		
+
 	case LFUN_DEFAULT:
 		styleReset(bv_);
 		owner_->showState();
 		break;
-		
+
 	case LFUN_UNDERLINE:
 		underline(bv_);
 		owner_->showState();
 		break;
-		
+
 	case LFUN_FONT_SIZE:
 		fontSize(bv_, argument);
 		owner_->showState();
 		break;
-		
+
 	case LFUN_FONT_STATE:
 		owner_->getLyXFunc()->setMessage(currentState(bv_));
 		break;
-		
+
 	case LFUN_UPCASE_WORD:
 	{
 		LyXText * lt = bv_->getLyXText();
-		
+
 		update(lt,
 		       BufferView::SELECT
 		       | BufferView::FITCUR);
@@ -1771,11 +1800,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		       | BufferView::CHANGE);
 	}
 	break;
-		
+
 	case LFUN_LOWCASE_WORD:
 	{
 		LyXText * lt = bv_->getLyXText();
-		
+
 		update(lt, BufferView::SELECT|BufferView::FITCUR);
 		lt->changeCase(bv_, LyXText::text_lowercase);
 		if (lt->inset_owner)
@@ -1786,11 +1815,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		       | BufferView::CHANGE);
 	}
 	break;
-		
+
 	case LFUN_CAPITALIZE_WORD:
 	{
 		LyXText * lt = bv_->getLyXText();
-		
+
 		update(lt, BufferView::SELECT|BufferView::FITCUR);
 		lt->changeCase(bv_, LyXText::text_capitalization);
 		if (lt->inset_owner)
@@ -1805,7 +1834,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	case LFUN_TRANSPOSE_CHARS:
 	{
 		LyXText * lt = bv_->getLyXText();
-		
+
 		update(lt, BufferView::SELECT|BufferView::FITCUR);
 		lt->transposeChars(*bv_);
 		if (lt->inset_owner)
@@ -1816,8 +1845,8 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		       | BufferView::CHANGE);
 	}
 	break;
-		
-					  
+
+
 	case LFUN_INSERT_LABEL:
 		MenuInsertLabel(bv_, argument);
 		break;
@@ -1850,29 +1879,29 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	{
 		string label(argument);
 		if (label.empty()) {
-			InsetRef * inset = 
+			InsetRef * inset =
 				static_cast<InsetRef*>(getInsetByCode(Inset::REF_CODE));
 			if (inset) {
-                                label = inset->getContents();
+				label = inset->getContents();
 				savePosition(0);
 			}
 		}
-		
+
 		if (!label.empty()) {
 			//bv_->savePosition(0);
 			if (!bv_->gotoLabel(label))
-				Alert::alert(_("Error"), 
-					   _("Couldn't find this label"), 
+				Alert::alert(_("Error"),
+					   _("Couldn't find this label"),
 					   _("in current document."));
 		}
 	}
 	break;
-		
+
 		// --- Cursor Movements -----------------------------
 	case LFUN_RIGHT:
 	{
 		LyXText * lt = bv_->getLyXText();
-		
+
 		bool is_rtl = lt->cursor.par()->isRightToLeftPar(buffer_->params);
 		if (!lt->selection.mark())
 			beforeChange(lt);
@@ -1897,7 +1926,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		owner_->showState();
 	}
 	break;
-		
+
 	case LFUN_LEFT:
 	{
 		// This is soooo ugly. Isn`t it possible to make
@@ -1930,11 +1959,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		owner_->showState();
 	}
 	break;
-		
+
 	case LFUN_UP:
 	{
 		LyXText * lt = bv_->getLyXText();
-		
+
 		if (!lt->selection.mark())
 			beforeChange(lt);
 		update(lt, BufferView::UPDATE);
@@ -1944,11 +1973,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		owner_->showState();
 	}
 	break;
-		
+
 	case LFUN_DOWN:
 	{
 		LyXText * lt = bv_->getLyXText();
-		
+
 		if (!lt->selection.mark())
 			beforeChange(lt);
 		update(lt, BufferView::UPDATE);
@@ -1962,7 +1991,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	case LFUN_UP_PARAGRAPH:
 	{
 		LyXText * lt = bv_->getLyXText();
-		
+
 		if (!lt->selection.mark())
 			beforeChange(lt);
 		update(lt, BufferView::UPDATE);
@@ -1972,11 +2001,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		owner_->showState();
 	}
 	break;
-		
+
 	case LFUN_DOWN_PARAGRAPH:
 	{
 		LyXText * lt = bv_->getLyXText();
-		
+
 		if (!lt->selection.mark())
 			beforeChange(lt);
 		update(lt, BufferView::UPDATE);
@@ -1986,11 +2015,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		owner_->showState();
 	}
 	break;
-		
+
 	case LFUN_PRIOR:
 	{
 		LyXText * lt = bv_->getLyXText();
-		
+
 		if (!lt->selection.mark())
 			beforeChange(lt);
 		update(lt, BufferView::UPDATE);
@@ -2000,11 +2029,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		owner_->showState();
 	}
 	break;
-		
+
 	case LFUN_NEXT:
 	{
 		LyXText * lt = bv_->getLyXText();
-		
+
 		if (!lt->selection.mark())
 			beforeChange(lt);
 		update(lt, BufferView::UPDATE);
@@ -2014,11 +2043,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		owner_->showState();
 	}
 	break;
-		
+
 	case LFUN_HOME:
 	{
 		LyXText * lt = bv_->getLyXText();
-		
+
 		if (!lt->selection.mark())
 			beforeChange(lt);
 		update(lt, BufferView::SELECT|BufferView::FITCUR);
@@ -2028,11 +2057,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		owner_->showState();
 	}
 	break;
-		
+
 	case LFUN_END:
 	{
 		LyXText * lt = bv_->getLyXText();
-		
+
 		if (!lt->selection.mark())
 			beforeChange(lt);
 		update(lt,
@@ -2043,12 +2072,12 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		owner_->showState();
 	}
 	break;
-		
+
 	case LFUN_SHIFT_TAB:
 	case LFUN_TAB:
 	{
 		LyXText * lt = bv_->getLyXText();
-		
+
 		if (!lt->selection.mark())
 			beforeChange(lt);
 		update(lt,
@@ -2059,11 +2088,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		owner_->showState();
 	}
 	break;
-		
+
 	case LFUN_WORDRIGHT:
 	{
 		LyXText * lt = bv_->getLyXText();
-		
+
 		if (!lt->selection.mark())
 			beforeChange(lt);
 		update(lt, BufferView::SELECT|BufferView::FITCUR);
@@ -2076,11 +2105,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		owner_->showState();
 	}
 	break;
-		
+
 	case LFUN_WORDLEFT:
 	{
 		LyXText * lt = bv_->getLyXText();
-		
+
 		if (!lt->selection.mark())
 			beforeChange(lt);
 		update(lt, BufferView::SELECT|BufferView::FITCUR);
@@ -2093,11 +2122,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		owner_->showState();
 	}
 	break;
-		
+
 	case LFUN_BEGINNINGBUF:
 	{
 		LyXText * lt = bv_->getLyXText();
-		
+
 		if (!lt->selection.mark())
 			beforeChange(lt);
 		update(lt,
@@ -2108,11 +2137,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		owner_->showState();
 	}
 	break;
-		
+
 	case LFUN_ENDBUF:
 	{
 		LyXText * lt = bv_->getLyXText();
-		
+
 		if (!lt->selection.mark())
 			beforeChange(lt);
 		update(lt,
@@ -2123,12 +2152,12 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		owner_->showState();
 	}
 	break;
-      
+
 		/* cursor selection ---------------------------- */
 	case LFUN_RIGHTSEL:
 	{
 		LyXText * lt = bv_->getLyXText();
-		
+
 		update(lt,
 		       BufferView::SELECT|BufferView::FITCUR);
 		if (lt->cursor.par()->isRightToLeftPar(buffer_->params))
@@ -2140,11 +2169,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		owner_->showState();
 	}
 	break;
-		
+
 	case LFUN_LEFTSEL:
 	{
 		LyXText * lt = bv_->getLyXText();
-		
+
 		update(lt,
 		       BufferView::SELECT|BufferView::FITCUR);
 		if (lt->cursor.par()->isRightToLeftPar(buffer_->params))
@@ -2156,11 +2185,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		owner_->showState();
 	}
 	break;
-		
+
 	case LFUN_UPSEL:
 	{
 		LyXText * lt = bv_->getLyXText();
-		
+
 		update(lt,
 		       BufferView::SELECT|BufferView::FITCUR);
 		lt->cursorUp(bv_);
@@ -2169,11 +2198,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		owner_->showState();
 	}
 	break;
-		
+
 	case LFUN_DOWNSEL:
 	{
 		LyXText * lt = bv_->getLyXText();
-		
+
 		update(lt,
 		       BufferView::SELECT|BufferView::FITCUR);
 		lt->cursorDown(bv_);
@@ -2186,7 +2215,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	case LFUN_UP_PARAGRAPHSEL:
 	{
 		LyXText * lt = bv_->getLyXText();
-		
+
 		update(lt,
 		       BufferView::SELECT|BufferView::FITCUR);
 		lt->cursorUpParagraph(bv_);
@@ -2195,11 +2224,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		owner_->showState();
 	}
 	break;
-		
+
 	case LFUN_DOWN_PARAGRAPHSEL:
 	{
 		LyXText * lt = bv_->getLyXText();
-		
+
 		update(lt,
 		       BufferView::SELECT|BufferView::FITCUR);
 		lt->cursorDownParagraph(bv_);
@@ -2208,11 +2237,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		owner_->showState();
 	}
 	break;
-		
+
 	case LFUN_PRIORSEL:
 	{
 		LyXText * lt = bv_->getLyXText();
-		
+
 		update(lt, BufferView::SELECT|BufferView::FITCUR);
 		cursorPrevious(lt);
 		finishUndo();
@@ -2220,11 +2249,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		owner_->showState();
 	}
 	break;
-		
+
 	case LFUN_NEXTSEL:
 	{
 		LyXText * lt = bv_->getLyXText();
-		
+
 		update(lt, BufferView::SELECT|BufferView::FITCUR);
 		cursorNext(lt);
 		finishUndo();
@@ -2232,11 +2261,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		owner_->showState();
 	}
 	break;
-		
+
 	case LFUN_HOMESEL:
 	{
 		LyXText * lt = bv_->getLyXText();
-		
+
 		update(lt, BufferView::SELECT|BufferView::FITCUR);
 		lt->cursorHome(bv_);
 		finishUndo();
@@ -2244,11 +2273,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		owner_->showState();
 	}
 	break;
-		
+
 	case LFUN_ENDSEL:
 	{
 		LyXText * lt = bv_->getLyXText();
-		
+
 		update(lt, BufferView::SELECT|BufferView::FITCUR);
 		lt->cursorEnd(bv_);
 		finishUndo();
@@ -2256,11 +2285,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		owner_->showState();
 	}
 	break;
-		
+
 	case LFUN_WORDRIGHTSEL:
 	{
 		LyXText * lt = bv_->getLyXText();
-		
+
 		update(lt, BufferView::SELECT|BufferView::FITCUR);
 		if (lt->cursor.par()->isRightToLeftPar(buffer_->params))
 			lt->cursorLeftOneWord(bv_);
@@ -2271,11 +2300,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		owner_->showState();
 	}
 	break;
-		
+
 	case LFUN_WORDLEFTSEL:
 	{
 		LyXText * lt = bv_->getLyXText();
-		
+
 		update(lt, BufferView::SELECT|BufferView::FITCUR);
 		if (lt->cursor.par()->isRightToLeftPar(buffer_->params))
 			lt->cursorRightOneWord(bv_);
@@ -2286,11 +2315,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		owner_->showState();
 	}
 	break;
-		
+
 	case LFUN_BEGINNINGBUFSEL:
 	{
 		LyXText * lt = bv_->getLyXText();
-		
+
 		if (lt->inset_owner)
 			break;
 		update(lt, BufferView::SELECT|BufferView::FITCUR);
@@ -2300,11 +2329,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		owner_->showState();
 	}
 	break;
-		
+
 	case LFUN_ENDBUFSEL:
 	{
 		LyXText * lt = bv_->getLyXText();
-		
+
 		if (lt->inset_owner)
 			break;
 		update(lt,
@@ -2330,14 +2359,12 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		moveCursorUpdate(false);
 	}
 	break;
-		
+
 	case LFUN_PROTECTEDSPACE:
 	{
 		LyXText * lt = bv_->getLyXText();
 
-		LyXLayout const & style = textclasslist
-			.Style(buffer_->params.textclass,
-			       lt->cursor.par()->getLayout());
+		LyXLayout const & style = textclasslist[buffer_->params.textclass][lt->cursor.par()->layout()];
 
 		if (style.free_spacing) {
 			lt->insertChar(bv_, ' ');
@@ -2346,12 +2373,12 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 			       | BufferView::FITCUR
 			       | BufferView::CHANGE);
 		} else {
-			protectedBlank(lt);
+			specialChar(InsetSpecialChar::PROTECTED_SEPARATOR);
 		}
 		moveCursorUpdate(false);
 	}
 	break;
-		
+
 	case LFUN_SETMARK:
 	{
 		LyXText * lt = bv_->getLyXText();
@@ -2373,7 +2400,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		lt->selection.cursor = lt->cursor;
 	}
 	break;
-		
+
 	case LFUN_DELETE:
 	{
 		LyXText * lt = bv_->getLyXText();
@@ -2402,7 +2429,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		LyXText * lt = bv_->getLyXText();
 
 		// Reverse the effect of LFUN_BREAKPARAGRAPH_SKIP.
-		
+
 		LyXCursor cursor = lt->cursor;
 
 		if (!lt->selection.set()) {
@@ -2416,15 +2443,15 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 						(bv_,
 						 cursor.par()->params().lineTop(),
 						 cursor.par()->params().lineBottom(),
-						 cursor.par()->params().pagebreakTop(), 
+						 cursor.par()->params().pagebreakTop(),
 						 cursor.par()->params().pagebreakBottom(),
-						 VSpace(VSpace::NONE), 
+						 VSpace(VSpace::NONE),
 						 cursor.par()->params().spaceBottom(),
-						 cursor.par()->params().spacing(), 
-						 cursor.par()->params().align(), 
+						 cursor.par()->params().spacing(),
+						 cursor.par()->params().align(),
 						 cursor.par()->params().labelWidthString(), 0);
 					lt->cursorLeft(bv_);
-					update(lt, 
+					update(lt,
 					       BufferView::SELECT
 					       | BufferView::FITCUR
 					       | BufferView::CHANGE);
@@ -2464,7 +2491,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	case LFUN_DELETE_WORD_BACKWARD:
 	{
 		LyXText * lt = bv_->getLyXText();
-		
+
 		update(lt, BufferView::SELECT|BufferView::FITCUR);
 		lt->deleteWordBackward(bv_);
 		update(lt,
@@ -2475,12 +2502,12 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		owner_->showState();
 	}
 	break;
-		
+
 		/* -------> Kill to end of line. */
 	case LFUN_DELETE_LINE_FORWARD:
 	{
 		LyXText * lt = bv_->getLyXText();
-		
+
 		update(lt, BufferView::SELECT|BufferView::FITCUR);
 		lt->deleteLineForward(bv_);
 		update(lt,
@@ -2490,12 +2517,12 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		moveCursorUpdate(false);
 	}
 	break;
-		
+
 		/* -------> Set mark off. */
 	case LFUN_MARK_OFF:
 	{
 		LyXText * lt = bv_->getLyXText();
-		
+
 		beforeChange(lt);
 		update(lt, BufferView::SELECT|BufferView::FITCUR);
 		lt->selection.cursor = lt->cursor;
@@ -2507,7 +2534,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	case LFUN_MARK_ON:
 	{
 		LyXText * lt = bv_->getLyXText();
-		
+
 		beforeChange(lt);
 		lt->selection.mark(true);
 		update(lt, BufferView::SELECT|BufferView::FITCUR);
@@ -2515,11 +2542,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		owner_->getLyXFunc()->setMessage(N_("Mark on"));
 	}
 	break;
-		
+
 	case LFUN_BACKSPACE:
 	{
 		LyXText * lt = bv_->getLyXText();
-		
+
 		if (!lt->selection.set()) {
 			if (owner_->getIntl()->getTrans().backspace()) {
 				lt->backspace(bv_);
@@ -2544,22 +2571,22 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	{
 		// Reverse the effect of LFUN_BREAKPARAGRAPH_SKIP.
 		LyXText * lt = bv_->getLyXText();
-		
+
 		LyXCursor cursor = lt->cursor;
-		
+
 		if (!lt->selection.set()) {
-			if (cursor.pos() == 0 
-			    && !(cursor.par()->params().spaceTop() 
+			if (cursor.pos() == 0
+			    && !(cursor.par()->params().spaceTop()
 				 == VSpace (VSpace::NONE))) {
-				lt->setParagraph 
+				lt->setParagraph
 					(bv_,
-					 cursor.par()->params().lineTop(),      
+					 cursor.par()->params().lineTop(),
 					 cursor.par()->params().lineBottom(),
-					 cursor.par()->params().pagebreakTop(), 
+					 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().spacing(),
+					 cursor.par()->params().align(),
 					 cursor.par()->params().labelWidthString(), 0);
 				update(lt,
 				       BufferView::SELECT
@@ -2581,7 +2608,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	case LFUN_BREAKPARAGRAPH:
 	{
 		LyXText * lt = bv_->getLyXText();
-		
+
 		beforeChange(lt);
 		lt->breakParagraph(bv_, 0);
 		update(lt,
@@ -2597,7 +2624,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	case LFUN_BREAKPARAGRAPHKEEPLAYOUT:
 	{
 		LyXText * lt = bv_->getLyXText();
-		
+
 		beforeChange(lt);
 		lt->breakParagraph(bv_, 1);
 		update(lt,
@@ -2609,16 +2636,16 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		owner_->showState();
 		break;
 	}
-	
+
 	case LFUN_BREAKPARAGRAPH_SKIP:
 	{
 		// 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 = lt->cursor;
-		
+
 		beforeChange(lt);
 		if (cursor.pos() == 0) {
 			if (cursor.par()->params().spaceTop() == VSpace(VSpace::NONE)) {
@@ -2633,7 +2660,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 					 cursor.par()->params().align(),
 					 cursor.par()->params().labelWidthString(), 1);
 				//update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-			} 
+			}
 		}
 		else {
 			lt->breakParagraph(bv_, 0);
@@ -2653,14 +2680,14 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	case LFUN_PARAGRAPH_SPACING:
 	{
 		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();
 		}
-		
+
 		istringstream istr(argument.c_str());
 
 		string tmp;
@@ -2699,7 +2726,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		}
 	}
 	break;
-	
+
 	case LFUN_INSET_TOGGLE:
 	{
 		LyXText * lt = bv_->getLyXText();
@@ -2709,7 +2736,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		lt->toggleInset(bv_);
 		update(lt, BufferView::SELECT|BufferView::FITCUR);
 		setState();
-	}	
+	}
 		break;
 
 	case LFUN_QUOTE:
@@ -2727,7 +2754,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		owner_->getDialogs()->createUrl(p.getAsString());
 	}
 	break;
-	
+
 	case LFUN_INSERT_URL:
 	{
 		InsetCommandParams p;
@@ -2740,39 +2767,36 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 			updateInset(inset, true);
 	}
 	break;
-	
-	case LFUN_INSET_TEXT:
-		insertAndEditInset(new InsetText);
-		break;
-	
+
 	case LFUN_INSET_ERT:
-		insertAndEditInset(new InsetERT);
+		insertAndEditInset(new InsetERT(buffer_->params));
 		break;
-	
+
 	case LFUN_INSET_EXTERNAL:
 		insertAndEditInset(new InsetExternal);
 		break;
-	
+
 	case LFUN_INSET_FOOTNOTE:
-		insertAndEditInset(new InsetFoot);
+		insertAndEditInset(new InsetFoot(buffer_->params));
 		break;
 
 	case LFUN_INSET_MARGINAL:
-		insertAndEditInset(new InsetMarginal);
+		insertAndEditInset(new InsetMarginal(buffer_->params));
 		break;
 
 	case LFUN_INSET_MINIPAGE:
-		insertAndEditInset(new InsetMinipage);
+		insertAndEditInset(new InsetMinipage(buffer_->params));
 		break;
 
 	case LFUN_INSERT_NOTE:
-		insertAndEditInset(new InsetNote);
+		insertAndEditInset(new InsetNote(buffer_->params));
 		break;
 
 	case LFUN_INSET_FLOAT:
 		// check if the float type exist
 		if (floatList.typeExist(argument)) {
-			insertAndEditInset(new InsetFloat(argument));
+			insertAndEditInset(new InsetFloat(buffer_->params,
+							  argument));
 		} else {
 			lyxerr << "Non-existent float type: "
 			       << argument << endl;
@@ -2783,7 +2807,8 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	{
 		// check if the float type exist
 		if (floatList.typeExist(argument)) {
-			InsetFloat * new_inset = new InsetFloat(argument);
+			InsetFloat * new_inset =
+				new InsetFloat(buffer_->params, argument);
 			new_inset->wide(true);
 			if (insertInset(new_inset))
 				new_inset->edit(bv_);
@@ -2793,7 +2818,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 			lyxerr << "Non-existent float type: "
 			       << argument << endl;
 		}
-		
+
 	}
 	break;
 
@@ -2806,14 +2831,15 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		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;
+			InsetCaption * new_inset =
+				new InsetCaption(buffer_->params);
 			new_inset->setOwner(bv_->theLockingInset());
 			new_inset->setAutoBreakRows(true);
 			new_inset->setDrawFrame(0, InsetText::LOCKED);
@@ -2825,7 +2851,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		}
 	}
 	break;
-	
+
 	case LFUN_INSET_TABULAR:
 	{
 		int r = 2;
@@ -2853,13 +2879,13 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 			owner_->getLyXFunc()->setMessage("EOF");
 	}
 	break;
-	
+
 	case LFUN_GETXY:
 		owner_->getLyXFunc()->setMessage(tostr(bv_->getLyXText()->cursor.x())
 						 + ' '
 						 + tostr(bv_->getLyXText()->cursor.y()));
 		break;
-		
+
 	case LFUN_SETXY:
 	{
 		int x = 0;
@@ -2871,26 +2897,26 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		bv_->getLyXText()->setCursorFromCoordinates(bv_, x, y);
 	}
 	break;
-	
+
 	case LFUN_GETLAYOUT:
-		owner_->getLyXFunc()->setMessage(tostr(bv_->getLyXText()->cursor.par()->layout));
+		owner_->getLyXFunc()->setMessage(tostr(bv_->getLyXText()->cursor.par()->layout()));
 		break;
-			
+
 	case LFUN_GETFONT:
 	{
 		LyXFont & font = bv_->getLyXText()->current_font;
-                if (font.shape() == LyXFont::ITALIC_SHAPE)
+		if (font.shape() == LyXFont::ITALIC_SHAPE)
 			owner_->getLyXFunc()->setMessage("E");
-                else if (font.shape() == LyXFont::SMALLCAPS_SHAPE)
+		else if (font.shape() == LyXFont::SMALLCAPS_SHAPE)
 			owner_->getLyXFunc()->setMessage("N");
-                else
+		else
 			owner_->getLyXFunc()->setMessage("0");
 
 	}
 	break;
 
 	// --- accented characters ---------------------------
-		
+
 	case LFUN_UMLAUT:
 	case LFUN_CIRCUMFLEX:
 	case LFUN_GRAVE:
@@ -2921,12 +2947,12 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 			       | BufferView::CHANGE);
 		}
 		break;
-	
+
 	case LFUN_MATH_MACRO:
 		mathDispatchMathMacro(bv_, argument);
 		break;
 
-	case LFUN_MATH_DELIM:     
+	case LFUN_MATH_DELIM:
 		mathDispatchMathDelim(bv_, argument);
 		break;
 
@@ -2946,38 +2972,38 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		mathDispatchMathDisplay(bv_, argument);
 		break;
 
-	case LFUN_MATH_MODE:             // Open or create an inlined math inset 
+	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 );
+		InsetCitation * inset = new InsetCitation(p);
 		if (!insertInset(inset))
 			delete inset;
 		else
-			updateInset( inset, true );
+			updateInset(inset, true);
 	}
 	break;
-		    
+
 	case LFUN_INSERT_BIBTEX:
-	{   
+	{
 		// ale970405+lasgoutt970425
-		// The argument can be up to two tokens separated 
+		// 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 const bibstyle = token(argument, ' ', 1);
 
-		InsetCommandParams p( "BibTeX", db, bibstyle );
+		InsetCommandParams p("BibTeX", db, bibstyle);
 		InsetBibtex * inset = new InsetBibtex(p);
-		
+
 		if (insertInset(inset)) {
 			if (argument.empty())
 				inset->edit(bv_);
@@ -2985,38 +3011,38 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 			delete inset;
 	}
 	break;
-		
+
 	// BibTeX data bases
 	case LFUN_BIBDB_ADD:
 	{
-		InsetBibtex * inset = 
+		InsetBibtex * inset =
 			static_cast<InsetBibtex*>(getInsetByCode(Inset::BIBTEX_CODE));
 		if (inset) {
 			inset->addDatabase(argument);
 		}
 	}
 	break;
-		    
+
 	case LFUN_BIBDB_DEL:
 	{
-		InsetBibtex * inset = 
+		InsetBibtex * inset =
 			static_cast<InsetBibtex*>(getInsetByCode(Inset::BIBTEX_CODE));
 		if (inset) {
 			inset->delDatabase(argument);
 		}
 	}
 	break;
-	
+
 	case LFUN_BIBTEX_STYLE:
 	{
-		InsetBibtex * inset = 
+		InsetBibtex * inset =
 			static_cast<InsetBibtex*>(getInsetByCode(Inset::BIBTEX_CODE));
 		if (inset) {
 			inset->setOptions(argument);
 		}
 	}
 	break;
-		
+
 	case LFUN_INDEX_CREATE:
 	{
 		InsetCommandParams p("index");
@@ -3030,7 +3056,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		owner_->getDialogs()->createIndex(p.getAsString());
 	}
 	break;
-		    
+
 	case LFUN_INDEX_INSERT:
 	{
 		InsetCommandParams p;
@@ -3043,7 +3069,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 			updateInset(inset, true);
 	}
 	break;
-		    
+
 	case LFUN_INDEX_INSERT_LAST:
 	{
 		string const idxstring(bv_->getLyXText()->getStringToIndex(bv_));
@@ -3052,7 +3078,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 					+ idxstring + _(("' indexed.")));
 			InsetCommandParams p("index", idxstring);
 			InsetIndex * inset = new InsetIndex(p);
-			
+
 			if (!insertInset(inset))
 				delete inset;
 			else
@@ -3072,13 +3098,12 @@ 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 (!insertInset(inset, "Standard"))
 			delete inset;
 	}
-		 
+
 	break;
 
 	case LFUN_CHILD_INSERT:
@@ -3095,7 +3120,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 			bv_->owner()->getDialogs()->showInclude(inset);
 		}
 	}
-	break; 
+	break;
 
 	case LFUN_FLOAT_LIST:
 	{
@@ -3105,7 +3130,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 			delete inset;
 	}
 	break;
-	
+
 	case LFUN_THESAURUS_ENTRY:
 	{
 		string arg = argument;
@@ -3113,7 +3138,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		if (arg.empty()) {
 			arg = bv_->getLyXText()->selectionAsString(buffer_,
 								   false);
- 
+
 			// FIXME
 			if (arg.size() > 100 || arg.empty()) {
 				// Get word or selection
@@ -3126,11 +3151,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		bv_->owner()->getDialogs()->showThesaurus(arg);
 	}
 		break;
- 
+
 	case LFUN_SELFINSERT:
 	{
 		if (argument.empty()) break;
-		
+
 		/* Automatically delete the currently selected
 		 * text and replace it with what is being
 		 * typed in now. Depends on lyxrc settings
@@ -3138,7 +3163,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		 * true (on). */
 
 		LyXText * lt = bv_->getLyXText();
-		
+
 		if (lyxrc.auto_region_delete) {
 			if (lt->selection.set()) {
 				lt->cutSelection(bv_, false, false);
@@ -3147,25 +3172,26 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 					    | BufferView::FITCUR
 					    | BufferView::CHANGE);
 			}
+			workarea_.haveSelection(false);
 		}
-		
+
 		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
 		// update the minibuffer
 		if (old_font != lt->real_current_font)
@@ -3182,14 +3208,14 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		string arg;
 		if (!argument.empty())
 			arg = argument;
-		else 
+		else
 			arg = lyxrc.date_insert_format;
 		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++) {
 			lt->insertChar(bv_, datetmp[i]);
 			update(lt,
@@ -3206,7 +3232,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	case LFUN_UNKNOWN_ACTION:
 		owner_->getLyXFunc()->setErrorMessage(N_("Unknown function!"));
 		break;
-	
+
 	default:
 		return false;
 	} // end of switch
@@ -3249,38 +3275,19 @@ void BufferView::Pimpl::hfill()
 }
 
 
-void BufferView::Pimpl::protectedBlank(LyXText * lt)
-{
-	if (available()) {
-		hideCursor();
-		update(lt, BufferView::SELECT|BufferView::FITCUR);
-		InsetSpecialChar * new_inset =
-			new InsetSpecialChar(InsetSpecialChar::PROTECTED_SEPARATOR);
-#ifdef WITH_WARNINGS
-#warning Why is this code different from specialChar() below? (JMarc)
-// the code in specialChar is a generic version of what used to exist
-// for other special chars. I did not merge this case because of the
-// call to updateInset(), but what does it do?
-#endif
-		if (!insertInset(new_inset))
-			delete new_inset;
-		else
-			updateInset(new_inset, true);
-	}
-}
-
-
 void BufferView::Pimpl::specialChar(InsetSpecialChar::Kind kind)
 {
 	if (available()) {
 		LyXText * lt = bv_->getLyXText();
-		
+
 		hideCursor();
 		update(lt, BufferView::SELECT|BufferView::FITCUR);
-		InsetSpecialChar * new_inset = 
+		InsetSpecialChar * new_inset =
 			new InsetSpecialChar(kind);
 		if (!insertInset(new_inset))
 			delete new_inset;
+		else
+			updateInset(new_inset, true);
 	}
 }
 
@@ -3298,16 +3305,16 @@ void BufferView::Pimpl::smartQuote()
 		c = ' ';
 	else
 		c = par->getChar(pos - 1);
-		
+
 
 	hideCursor();
 
-	LyXLayout const & style = textclasslist.Style(
-		bv_->buffer()->params.textclass, par->getLayout());
-	
+	LyXLayout const & style =
+		textclasslist[bv_->buffer()->params.textclass][par->layout()];
+
 	if (style.pass_thru ||
 		(!insertInset(new InsetQuotes(c, bv_->buffer()->params))))
-		Dispatch(LFUN_SELFINSERT, "\"");
+		bv_->owner()->getLyXFunc()->dispatch(LFUN_SELFINSERT, "\"");
 }
 
 
@@ -3319,12 +3326,12 @@ void BufferView::Pimpl::insertAndEditInset(Inset * inset)
 		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)) {
@@ -3349,7 +3356,7 @@ bool BufferView::Pimpl::insertInset(Inset * inset, string const & lout)
 	// not quite sure if we want this...
 	setCursorParUndo(bv_);
 	freezeUndo();
-	
+
 	beforeChange(bv_->text);
 	if (!lout.empty()) {
 		update(bv_->text, BufferView::SELECT|BufferView::FITCUR);
@@ -3358,34 +3365,37 @@ bool BufferView::Pimpl::insertInset(Inset * inset, string const & lout)
 
 		if (bv_->text->cursor.par()->size()) {
 			bv_->text->cursorLeft(bv_);
-			
+
 			bv_->text->breakParagraph(bv_);
 			update(bv_->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 		}
 
-		pair<bool, layout_type> lres =
-			textclasslist.NumberOfLayout(buffer_->params .textclass, lout);
-		layout_type lay = 0;
-		if (lres.first != false) {
+		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.second;
+			lay = lres;
 		} else {
-			// layout not fount using default "Standard" (0)
-			lay = 0;
+			// layout not fount using default
+			lay = tclass.defaultLayoutName();
 		}
-		 
+
 		bv_->text->setLayout(bv_, lay);
-		
+
 		bv_->text->setParagraph(bv_, 0, 0,
 				   0, 0,
 				   VSpace(VSpace::NONE), VSpace(VSpace::NONE),
 				   Spacing(),
-				   LYX_ALIGN_LAYOUT, 
+				   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);
 
@@ -3396,7 +3406,7 @@ bool BufferView::Pimpl::insertInset(Inset * inset, string const & lout)
 
 void BufferView::Pimpl::updateInset(Inset * inset, bool mark_dirty)
 {
-	if (!inset)
+	if (!inset || !available())
 		return;
 
 	// first check for locking insets
@@ -3413,7 +3423,7 @@ void BufferView::Pimpl::updateInset(Inset * inset, bool mark_dirty)
 		} else if (bv_->theLockingInset()->updateInsetInInset(bv_, inset)) {
 			if (bv_->text->updateInset(bv_,  bv_->theLockingInset())) {
 				update();
-				if (mark_dirty){
+				if (mark_dirty) {
 					buffer_->markDirty();
 				}
 				updateScrollbar();
@@ -3421,10 +3431,15 @@ void BufferView::Pimpl::updateInset(Inset * inset, bool mark_dirty)
 			}
 		}
 	}
-  
-	// then check the current buffer
-	if (available()) {
-		hideCursor();
+
+	// 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) {
@@ -3437,6 +3452,13 @@ void BufferView::Pimpl::updateInset(Inset * inset, bool mark_dirty)
 			}
 			return;
 		}
+	} else if (static_cast<UpdatableInset *>(tl_inset)
+			   ->updateInsetInInset(bv_, inset))
+	{
+			if (bv_->text->updateInset(bv_,  tl_inset)) {
+				update();
+				updateScrollbar();
+			}
 	}
 }
 
@@ -3445,13 +3467,13 @@ 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())) {
@@ -3461,13 +3483,13 @@ void BufferView::Pimpl::gotoInset(vector<Inset::Code> const & codes,
 			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->firstParagraph()) {
+		if (bv_->text->cursor.pos()
+		    || bv_->text->cursor.par() != bv_->text->ownerParagraph()) {
 			LyXCursor tmp = bv_->text->cursor;
-			bv_->text->cursor.par(bv_->text->firstParagraph());
+			bv_->text->cursor.par(bv_->text->ownerParagraph());
 			bv_->text->cursor.pos(0);
 			if (!bv_->text->gotoNextInset(bv_, codes, contents)) {
 				bv_->text->cursor = tmp;