X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FBufferView2.C;h=2fad793b7bab3817cda0e9e9499d4b671c6bcb04;hb=7aebbe6e10b3b4cf1f110b98c73a0a27059da6d8;hp=aabf472270b703def3c35f52b9d3931201dda065;hpb=4c6091b63f6ac4dae69ddcee26bf22e4f35a3cdf;p=lyx.git

diff --git a/src/BufferView2.C b/src/BufferView2.C
index aabf472270..2fad793b7b 100644
--- a/src/BufferView2.C
+++ b/src/BufferView2.C
@@ -1,38 +1,41 @@
-// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  * 
  *           LyX, The Document Processor
  *        
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
 #include <config.h>
 
-#include <fstream>
-#include <algorithm>
-
 #include "BufferView.h"
 #include "buffer.h"
 #include "lyxcursor.h"
 #include "lyxtext.h"
-#include "insets/inseterror.h"
-#include "insets/insetinfo.h"
-#include "insets/insetspecialchar.h"
 #include "LyXView.h"
 #include "bufferlist.h"
-#include "support/FileInfo.h"
 #include "lyxscreen.h"
-#include "support/filetools.h"
-#include "lyx_gui_misc.h"
 #include "LaTeX.h"
 #include "BufferView_pimpl.h"
-#include "insets/insetcommand.h" //ChangeRefs
-#include "support/lyxfunctional.h" //equal_1st_in_pair
 #include "language.h"
 #include "gettext.h"
+#include "undo_funcs.h"
+#include "debug.h"
+#include "iterators.h"
+
+#include "frontends/Alert.h"
+
+#include "insets/insetcommand.h" //ChangeRefs
+#include "insets/inseterror.h"
+
+#include "support/FileInfo.h"
+#include "support/filetools.h"
+#include "support/lyxfunctional.h" //equal_1st_in_pair
+
+#include <fstream>
+#include <algorithm>
 
 extern BufferList bufferlist;
 
@@ -44,6 +47,7 @@ using std::find;
 using std::count;
 using std::count_if;
 
+
 // Inserts a file into current document
 bool BufferView::insertLyXFile(string const & filen)
 	//
@@ -62,7 +66,7 @@ bool BufferView::insertLyXFile(string const & filen)
 	FileInfo const fi(fname);
 
 	if (!fi.readable()) {
-		WriteAlert(_("Error!"),
+		Alert::alert(_("Error!"),
 			   _("Specified file is unreadable: "),
 			   MakeDisplayPath(fname, 50));
 		return false;
@@ -72,13 +76,13 @@ bool BufferView::insertLyXFile(string const & filen)
 
 	ifstream ifs(fname.c_str());
 	if (!ifs) {
-		WriteAlert(_("Error!"),
+		Alert::alert(_("Error!"),
 			   _("Cannot open specified file: "),
 			   MakeDisplayPath(fname, 50));
 		return false;
 	}
 	
-	char const c = ifs.peek();
+	int const c = ifs.peek();
        
 	LyXLex lex(0, 0);
 	lex.setStream(ifs);
@@ -86,10 +90,11 @@ bool BufferView::insertLyXFile(string const & filen)
 	bool res = true;
 
 	if (c == '#') {
-		lyxerr.debug() << "Will insert file with header" << endl;
+		lyxerr[Debug::INFO] << "Will insert file with header" << endl;
 		res = buffer()->readFile(lex, text->cursor.par());
 	} else {
-		lyxerr.debug() << "Will insert file without header" << endl;
+		lyxerr[Debug::INFO] << "Will insert file without header" 
+				    << endl;
 		res = buffer()->readLyXformat2(lex, text->cursor.par());
 	}
 
@@ -100,32 +105,37 @@ bool BufferView::insertLyXFile(string const & filen)
 
 bool BufferView::removeAutoInsets()
 {
-	LyXParagraph * par = buffer()->paragraph;
-
 	LyXCursor tmpcursor = text->cursor;
 	LyXCursor cursor;
+	bool found = false;
 
-	bool a = false;
-
-	while (par) {
+	ParIterator end = buffer()->par_iterator_end();
+	for (ParIterator it = buffer()->par_iterator_begin();
+	     it != end; ++it) {
+		Paragraph * par = *it;
 		// this has to be done before the delete
-		text->SetCursor(this, cursor, par, 0);
-		if (par->AutoDeleteInsets()){
-			a = true;
-			text->RedoParagraphs(this, cursor,
-					     cursor.par()->next());
-			text->FullRebreak(this);
+		if (par->autoDeleteInsets()) {
+			found = true;
+#ifdef WITH_WARNINGS
+#warning FIXME
+#endif
+			// The test it.size()==1 was needed to prevent crashes.
+			if (it.size() == 1) {
+				text->setCursor(this, cursor, par, 0);
+				text->redoParagraphs(this, cursor,
+						     cursor.par()->next());
+				text->fullRebreak(this);
+			}
 		}
-		par = par->next();
 	}
 
 	// avoid forbidden cursor positions caused by error removing
 	if (tmpcursor.pos() > tmpcursor.par()->size())
 		tmpcursor.pos(tmpcursor.par()->size());
 
-	text->SetCursorIntern(this, tmpcursor.par(), tmpcursor.pos());
+	text->setCursorIntern(this, tmpcursor.par(), tmpcursor.pos());
 
-	return a;
+	return found;
 }
 
 
@@ -137,10 +147,10 @@ void BufferView::insertErrors(TeXErrors & terr)
 	for (TeXErrors::Errors::const_iterator cit = terr.begin();
 	     cit != terr.end();
 	     ++cit) {
-		string const desctext((*cit).error_desc);
-		string const errortext((*cit).error_text);
+		string const desctext(cit->error_desc);
+		string const errortext(cit->error_text);
 		string const msgtxt = desctext + '\n' + errortext;
-		int const errorrow = (*cit).error_in_line;
+		int const errorrow = cit->error_in_line;
 
 		// Insert error string for row number
 		int tmpid = -1; 
@@ -150,25 +160,25 @@ void BufferView::insertErrors(TeXErrors & terr)
 			buffer()->texrow.increasePos(tmpid, tmppos);
 		}
 		
-		LyXParagraph * texrowpar = 0;
+		Paragraph * texrowpar = 0;
 
 		if (tmpid == -1) {
-			texrowpar = text->FirstParagraph();
+			texrowpar = text->firstParagraph();
 			tmppos = 0;
 		} else {
-			texrowpar = text->GetParFromID(tmpid);
+			texrowpar = buffer()->getParFromID(tmpid);
 		}
 
 		if (texrowpar == 0)
 			continue;
 
 		InsetError * new_inset = new InsetError(msgtxt);
-		text->SetCursorIntern(this, texrowpar, tmppos);
-		text->InsertInset(this, new_inset);
-		text->FullRebreak(this);
+		text->setCursorIntern(this, texrowpar, tmppos);
+		text->insertInset(this, new_inset);
+		text->fullRebreak(this);
 	}
 	// Restore the cursor position
-	text->SetCursorIntern(this, cursor.par(), cursor.pos());
+	text->setCursorIntern(this, cursor.par(), cursor.pos());
 }
 
 
@@ -179,96 +189,24 @@ void BufferView::setCursorFromRow(int row)
 
 	buffer()->texrow.getIdFromRow(row, tmpid, tmppos);
 
-	LyXParagraph * texrowpar;
+	Paragraph * texrowpar;
 
 	if (tmpid == -1) {
-		texrowpar = text->FirstParagraph();
+		texrowpar = text->firstParagraph();
 		tmppos = 0;
 	} else {
-		texrowpar = text->GetParFromID(tmpid);
+		texrowpar = buffer()->getParFromID(tmpid);
 	}
-	text->SetCursor(this, texrowpar, tmppos);
+	text->setCursor(this, texrowpar, tmppos);
 }
 
 
-bool BufferView::insertInset(Inset * inset, string const & lout,
-			     bool /*no_table*/)
+bool BufferView::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 (theLockingInset()) {
-		if (theLockingInset()->InsertInsetAllowed(inset))
-		    return theLockingInset()->InsertInset(this, inset);
-		return false;
-	}
-
-	// not quite sure if we want this...
-	text->SetCursorParUndo(buffer());
-	text->FreezeUndo();
-	
-	beforeChange(text);
-	if (!lout.empty()) {
-		update(text, BufferView::SELECT|BufferView::FITCUR);
-		text->BreakParagraph(this);
-		update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-
-		if (text->cursor.par()->size()) {
-			text->CursorLeft(this);
-			
-			text->BreakParagraph(this);
-			update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-		}
-
-		pair<bool, LyXTextClass::size_type> lres =
-			textclasslist.NumberOfLayout(buffer()->params
-						     .textclass, lout);
-		LyXTextClass::size_type lay;
-		if (lres.first != false) {
-			// layout found
-			lay = lres.second;
-		} else {
-			// layout not fount using default "Standard" (0)
-			lay = 0;
-		}
-		 
-		text->SetLayout(this, lay);
-		
-		text->SetParagraph(this, 0, 0,
-				   0, 0,
-				   VSpace(VSpace::NONE), VSpace(VSpace::NONE),
-				   LYX_ALIGN_LAYOUT, 
-				   string(),
-				   0);
-		update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-		
-		text->current_font.setLatex(LyXFont::OFF);
-	}
-	
-	text->InsertInset(this, inset);
-	update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-
-	text->UnFreezeUndo();
-	return true;
+	return pimpl_->insertInset(inset, lout);
 }
 
 
-// Open and lock an updatable inset
-bool BufferView::open_new_inset(UpdatableInset * new_inset, bool behind)
-{
-	beforeChange(text);
-	text->FinishUndo();
-	if (!insertInset(new_inset)) {
-		delete new_inset;
-		return false;
-	}
-	if (behind) {
-		LyXFont & font = getLyXText()->real_current_font;
-		new_inset->Edit(this, new_inset->width(this, font), 0, 0);
-	} else
-		new_inset->Edit(this, 0, 0, 0);
-	return true;
-}
-
 /* This is also a buffer property (ale) */
 // Not so sure about that. a goto Label function can not be buffer local, just
 // think how this will work in a multiwindo/buffer environment, all the
@@ -283,8 +221,8 @@ bool BufferView::gotoLabel(string const & label)
 		if (find(labels.begin(),labels.end(),label)
 		     != labels.end()) {
 			beforeChange(text);
-			text->SetCursor(this, it.getPar(), it.getPos());
-			text->sel_cursor = text->cursor;
+			text->setCursor(this, it.getPar(), it.getPos());
+			text->selection.cursor = text->cursor;
 			update(text, BufferView::SELECT|BufferView::FITCUR);
 			return true;
 		}
@@ -293,14 +231,6 @@ bool BufferView::gotoLabel(string const & label)
 }
 
 
-void BufferView::insertNote()
-{
-	InsetInfo * new_inset = new InsetInfo();
-	insertInset(new_inset);
-	new_inset->Edit(this, 0, 0, 0);
-}
-
-
 void BufferView::menuUndo()
 {
 	if (available()) {
@@ -308,8 +238,8 @@ void BufferView::menuUndo()
 		hideCursor();
 		beforeChange(text);
 		update(text, BufferView::SELECT|BufferView::FITCUR);
-		if (!text->TextUndo(this))
-			owner()->message(_("No forther undo information"));
+		if (!textUndo(this))
+			owner()->message(_("No further undo information"));
 		else
 			update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 		setState();
@@ -329,7 +259,7 @@ void BufferView::menuRedo()
 		hideCursor();
 		beforeChange(text);
 		update(text, BufferView::SELECT|BufferView::FITCUR);
-		if (!text->TextRedo(this))
+		if (!textRedo(this))
 			owner()->message(_("No further redo information"));
 		else
 			update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
@@ -338,99 +268,10 @@ void BufferView::menuRedo()
 }
 
 
-void BufferView::hyphenationPoint()
-{
-	if (available()) {
-		hideCursor();
-		update(text, BufferView::SELECT|BufferView::FITCUR);
-		InsetSpecialChar * new_inset = 
-			new InsetSpecialChar(InsetSpecialChar::HYPHENATION);
-		insertInset(new_inset);
-	}
-}
-
-
-void BufferView::ldots()
-{
-	if (available())  {
-		hideCursor();
-		update(text, BufferView::SELECT|BufferView::FITCUR);
-		InsetSpecialChar * new_inset = 
-			new InsetSpecialChar(InsetSpecialChar::LDOTS);
-		insertInset(new_inset);
-	}
-}
-
-
-void BufferView::endOfSentenceDot()
-{
-	if (available()) {
-		hideCursor();
-		update(text, BufferView::SELECT|BufferView::FITCUR);
-		InsetSpecialChar * new_inset = 
-			new InsetSpecialChar(InsetSpecialChar::END_OF_SENTENCE);
-		insertInset(new_inset);
-	}
-}
-
-
-void BufferView::menuSeparator()
-{
-	if (available()) {
-		hideCursor();
-		update(text, BufferView::SELECT|BufferView::FITCUR);
-		InsetSpecialChar * new_inset = 
-			new InsetSpecialChar(InsetSpecialChar::MENU_SEPARATOR);
-		insertInset(new_inset);
-	}
-}
-
-
-void BufferView::newline()
-{
-	if (available()) {
-		hideCursor();
-		update(text, BufferView::SELECT|BufferView::FITCUR);
-		text->InsertChar(this, LyXParagraph::META_NEWLINE);
-		update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-	}
-}
-
-
-void BufferView::protectedBlank(LyXText * lt)
-{
-	if (available()) {
-		hideCursor();
-		update(lt, BufferView::SELECT|BufferView::FITCUR);
-		InsetSpecialChar * new_inset =
-			new InsetSpecialChar(InsetSpecialChar::PROTECTED_SEPARATOR);
-		if (!insertInset(new_inset))
-			delete new_inset;
-		else
-			updateInset(new_inset, true);
-	}
-}
-
-
-void BufferView::hfill()
-{
-	if (available()) {
-		hideCursor();
-		update(text, BufferView::SELECT|BufferView::FITCUR);
-		text->InsertChar(this, LyXParagraph::META_HFILL);
-		update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-	}
-}
-
-
 void BufferView::copyEnvironment()
 {
 	if (available()) {
 		text->copyEnvironmentType();
-		// clear the selection, even if mark_set
-		toggleSelection();
-		text->ClearSelection(this);
-		update(text, BufferView::SELECT|BufferView::FITCUR);
 		owner()->message(_("Paragraph environment type copied"));
 	}
 }
@@ -449,21 +290,18 @@ void BufferView::pasteEnvironment()
 void BufferView::copy()
 {
 	if (available()) {
-		text->CopySelection(this);
-		// clear the selection, even if mark_set
-		toggleSelection();
-		text->ClearSelection(this);
-		update(text, BufferView::SELECT|BufferView::FITCUR);
+		text->copySelection(this);
 		owner()->message(_("Copy"));
 	}
 }
 
-void BufferView::cut()
+
+void BufferView::cut(bool realcut)
 {
 	if (available()) {
 		hideCursor();
 		update(text, BufferView::SELECT|BufferView::FITCUR);
-		text->CutSelection(this);
+		text->cutSelection(this, true, realcut);
 		update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 		owner()->message(_("Cut"));
 	}
@@ -479,77 +317,20 @@ void BufferView::paste()
 	hideCursor();
 	// clear the selection
 	toggleSelection();
-	text->ClearSelection(this);
+	text->clearSelection();
 	update(text, BufferView::SELECT|BufferView::FITCUR);
 	
 	// paste
-	text->PasteSelection(this);
+	text->pasteSelection(this);
 	update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 	
 	// clear the selection 
 	toggleSelection();
-	text->ClearSelection(this);
+	text->clearSelection();
 	update(text, BufferView::SELECT|BufferView::FITCUR);
 }
 
 
-void BufferView::gotoInset(std::vector<Inset::Code> const & codes,
-			   bool same_content)
-{
-	if (!available()) return;
-   
-	hideCursor();
-	beforeChange(text);
-	update(text, BufferView::SELECT|BufferView::FITCUR);
-
-	string contents;
-	if (same_content &&
-	    text->cursor.par()->GetChar(text->cursor.pos()) == LyXParagraph::META_INSET) {
-		Inset const * inset = text->cursor.par()->GetInset(text->cursor.pos());
-		if (find(codes.begin(), codes.end(), inset->LyxCode())
-		    != codes.end())
-			contents =
-				static_cast<InsetCommand const *>(inset)->getContents();
-	}
-	
-	if (!text->GotoNextInset(this, codes, contents)) {
-		if (text->cursor.pos() 
-		    || text->cursor.par() != text->FirstParagraph()) {
-				LyXCursor tmp = text->cursor;
-				text->cursor.par(text->FirstParagraph());
-				text->cursor.pos(0);
-				if (!text->GotoNextInset(this, codes, contents)) {
-					text->cursor = tmp;
-					owner()->message(_("No more insets"));
-				}
-			} else {
-				owner()->message(_("No more insets"));
-			}
-	}
-	update(text, BufferView::SELECT|BufferView::FITCUR);
-	text->sel_cursor = text->cursor;
-}
-
-
-void BufferView::gotoInset(Inset::Code code, bool same_content)
-{
-	gotoInset(vector<Inset::Code>(1, code), same_content);
-}
-
-
-void BufferView::insertCorrectQuote()
-{
-	char c;
-
-	if (text->cursor.pos())
-		c = text->cursor.par()->GetChar(text->cursor.pos() - 1);
-	else 
-		c = ' ';
-
-	insertInset(new InsetQuotes(c, buffer()->params));
-}
-
-
 /* these functions are for the spellchecker */ 
 string const BufferView::nextWord(float & value)
 {
@@ -558,7 +339,7 @@ string const BufferView::nextWord(float & value)
 		return string();
 	}
 
-	return text->SelectNextWord(this, value);
+	return text->selectNextWordToSpellcheck(this, value);
 }
 
   
@@ -566,9 +347,11 @@ void BufferView::selectLastWord()
 {
 	if (!available()) return;
    
+	LyXCursor cur = text->selection.cursor;
 	hideCursor();
 	beforeChange(text);
-	text->SelectSelectedWord(this);
+	text->selection.cursor = cur;
+	text->selectSelectedWord(this);
 	toggleSelection(false);
 	update(text, BufferView::SELECT|BufferView::FITCUR);
 }
@@ -580,8 +363,8 @@ void BufferView::endOfSpellCheck()
    
 	hideCursor();
 	beforeChange(text);
-	text->SelectSelectedWord(this);
-	text->ClearSelection(this);
+	text->selectSelectedWord(this);
+	text->clearSelection();
 	update(text, BufferView::SELECT|BufferView::FITCUR);
 }
 
@@ -590,35 +373,39 @@ void BufferView::replaceWord(string const & replacestring)
 {
 	if (!available()) return;
 
+	LyXText * tt = getLyXText();
 	hideCursor();
-	update(text, BufferView::SELECT|BufferView::FITCUR);
+	update(tt, BufferView::SELECT|BufferView::FITCUR);
    
 	/* clear the selection (if there is any) */ 
 	toggleSelection(false);
-	update(text, BufferView::SELECT|BufferView::FITCUR);
+	update(tt, BufferView::SELECT|BufferView::FITCUR);
    
 	/* clear the selection (if there is any) */ 
 	toggleSelection(false);
-	text->ReplaceSelectionWithString(this, replacestring);
+	tt->replaceSelectionWithString(this, replacestring);
    
-	text->SetSelectionOverString(this, replacestring);
+	tt->setSelectionOverString(this, replacestring);
 
 	// Go back so that replacement string is also spellchecked
 	for (string::size_type i = 0; i < replacestring.length() + 1; ++i) {
-		text->CursorLeft(this);
+		tt->cursorLeft(this);
 	}
-	update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+	update(tt, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 }
 // End of spellchecker stuff
 
 
 bool BufferView::lockInset(UpdatableInset * inset)
 {
+	// don't relock if we're already locked
+	if (theLockingInset() == inset)
+		return true;
 	if (!theLockingInset() && inset) {
 		theLockingInset(inset);
 		return true;
 	} else if (inset) {
-	    return theLockingInset()->LockInsetInInset(this, inset);
+	    return theLockingInset()->lockInsetInInset(this, inset);
 	}
 	return false;
 }
@@ -626,19 +413,20 @@ bool BufferView::lockInset(UpdatableInset * inset)
 
 void BufferView::showLockedInsetCursor(int x, int y, int asc, int desc)
 {
-	if (theLockingInset() && available()) {
+	if (available() && theLockingInset()) {
 		LyXCursor cursor = text->cursor;
+		Inset * locking_inset = theLockingInset()->getLockingInset();
+
 		if ((cursor.pos() - 1 >= 0) &&
-		    (cursor.par()->GetChar(cursor.pos() - 1) ==
-		     LyXParagraph::META_INSET) &&
-		    (cursor.par()->GetInset(cursor.pos() - 1) ==
-		     theLockingInset()->GetLockingInset()))
-			text->SetCursor(this, cursor,
-					cursor.par(), cursor.pos() - 1);
+		    cursor.par()->isInset(cursor.pos() - 1) &&
+		    (cursor.par()->getInset(cursor.pos() - 1) ==
+		     locking_inset))
+			text->setCursor(this, cursor,
+			                cursor.par(), cursor.pos() - 1);
 		LyXScreen::Cursor_Shape shape = LyXScreen::BAR_SHAPE;
 		LyXText * txt = getLyXText();
-		if (theLockingInset()->GetLockingInset()->LyxCode() ==
-		    Inset::TEXT_CODE &&
+		if (locking_inset->isTextInset() &&
+		    locking_inset->lyxCode() != Inset::ERT_CODE &&
 		    (txt->real_current_font.language() !=
 		     buffer()->params.language
 		     || txt->real_current_font.isVisibleRightToLeft()
@@ -646,8 +434,8 @@ void BufferView::showLockedInsetCursor(int x, int y, int asc, int desc)
 			shape = (txt->real_current_font.isVisibleRightToLeft())
 				? LyXScreen::REVERSED_L_SHAPE
 				: LyXScreen::L_SHAPE;
-		y += cursor.y() + theLockingInset()->InsetInInsetY();
-		pimpl_->screen_->ShowManualCursor(text, x, y, asc, desc,
+		y += cursor.y() + theLockingInset()->insetInInsetY();
+		pimpl_->screen_->showManualCursor(text, x, y, asc, desc,
 						  shape);
 	}
 }
@@ -656,7 +444,7 @@ void BufferView::showLockedInsetCursor(int x, int y, int asc, int desc)
 void BufferView::hideLockedInsetCursor()
 {
 	if (theLockingInset() && available()) {
-		pimpl_->screen_->HideCursor();
+		pimpl_->screen_->hideCursor();
 	}
 }
 
@@ -664,8 +452,8 @@ void BufferView::hideLockedInsetCursor()
 void BufferView::fitLockedInsetCursor(int x, int y, int asc, int desc)
 {
 	if (theLockingInset() && available()) {
-		y += text->cursor.y() + theLockingInset()->InsetInInsetY();
-		if (pimpl_->screen_->FitManualCursor(text, this, x, y, asc, desc))
+		y += text->cursor.y() + theLockingInset()->insetInInsetY();
+		if (pimpl_->screen_->fitManualCursor(text, this, x, y, asc, desc))
 			updateScrollbar();
 	}
 }
@@ -674,13 +462,16 @@ void BufferView::fitLockedInsetCursor(int x, int y, int asc, int desc)
 int BufferView::unlockInset(UpdatableInset * inset)
 {
 	if (inset && theLockingInset() == inset) {
-		inset->InsetUnlock(this);
+		inset->insetUnlock(this);
 		theLockingInset(0);
-		text->FinishUndo();
+		// make sure we update the combo !
+		owner()->setLayout(getLyXText()->cursor.par()->getLayout());
+		finishUndo();
 		return 0;
 	} else if (inset && theLockingInset() &&
-		   theLockingInset()->UnlockInsetInInset(this, inset)) {
-		text->FinishUndo();
+		   theLockingInset()->unlockInsetInInset(this, inset)) {
+		// owner inset has updated the layout combo 
+		finishUndo();
 		return 0;
 	}
 	return bufferlist.unlockInset(inset);
@@ -693,90 +484,59 @@ void BufferView::lockedInsetStoreUndo(Undo::undo_kind kind)
 		return; // shouldn't happen
 	if (kind == Undo::EDIT) // in this case insets would not be stored!
 		kind = Undo::FINISH;
-	text->SetUndo(buffer(), kind,
-		      text->cursor.par()->previous(), 
-		      text->cursor.par()->next());
+	setUndo(this, kind,
+	        text->cursor.par(),
+	        text->cursor.par()->next());
 }
 
 
 void BufferView::updateInset(Inset * inset, bool mark_dirty)
 {
-	if (!inset)
-		return;
-
-	// first check for locking insets
-	if (theLockingInset()) {
-		if (theLockingInset() == inset) {
-			if (text->UpdateInset(this, inset)) {
-				update();
-				if (mark_dirty) {
-					buffer()->markDirty();
-				}
-				updateScrollbar();
-				return;
-			}
-		} else if (theLockingInset()->UpdateInsetInInset(this,inset)) {
-			if (text->UpdateInset(this, theLockingInset())) {
-				update();
-				if (mark_dirty){
-					buffer()->markDirty();
-				}
-				updateScrollbar();
-				return;
-			}
-		}
-	}
-  
-	// then check the current buffer
-	if (available()) {
-		hideCursor();
-		update(text, BufferView::UPDATE);
-		if (text->UpdateInset(this, inset)) {
-			if (mark_dirty)
-				update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-			else 
-				update(text, SELECT);
-			return;
-		}
-	}
+	pimpl_->updateInset(inset, mark_dirty);
 }
 
 
 bool BufferView::ChangeInsets(Inset::Code code,
 			      string const & from, string const & to)
 {
-	bool flag = false;
-	LyXParagraph * par = buffer()->paragraph;
+	bool need_update = false;
 	LyXCursor cursor = text->cursor;
 	LyXCursor tmpcursor = cursor;
 	cursor.par(tmpcursor.par());
 	cursor.pos(tmpcursor.pos());
 
-	while (par) {
-		bool flag2 = false;
-		for (LyXParagraph::inset_iterator it = par->inset_iterator_begin();
-		     it != par->inset_iterator_end(); ++it) {
-			if ((*it)->LyxCode() == code) {
-				InsetCommand * inset = static_cast<InsetCommand *>(*it);
+	ParIterator end = buffer()->par_iterator_end();
+	for (ParIterator it = buffer()->par_iterator_begin();
+	     it != end; ++it) {
+		Paragraph * par = *it;
+		bool changed_inset = false;
+		for (Paragraph::inset_iterator it2 = par->inset_iterator_begin();
+		     it2 != par->inset_iterator_end(); ++it2) {
+			if ((*it2)->lyxCode() == code) {
+				InsetCommand * inset = static_cast<InsetCommand *>(*it2);
 				if (inset->getContents() == from) {
 					inset->setContents(to);
-					flag2 = true;
+					changed_inset = true;
 				}
 			}
 		}
-		if (flag2) {
-			flag = true;
-			// this is possible now, since SetCursor takes
-			// care about footnotes
-			text->SetCursorIntern(this, par, 0);
-			text->RedoParagraphs(this, text->cursor,
-					     text->cursor.par()->next());
-			text->FullRebreak(this);
+		if (changed_inset) {
+			need_update = true;
+#ifdef WITH_WARNINGS
+#warning FIXME
+#endif
+			// The test it.size()==1 was needed to prevent crashes.
+			// How to set the cursor corretly when it.size()>1 ??
+			if (it.size() == 1) {
+				text->setCursorIntern(this, par, 0);
+				text->redoParagraphs(this, text->cursor,
+						     text->cursor.par()->next());
+				text->fullRebreak(this);
+			}
 		}
-		par = par->next();
 	}
-	text->SetCursorIntern(this, cursor.par(), cursor.pos());
-	return flag;
+	text->setCursorIntern(this, cursor.par(), cursor.pos());
+	return need_update;
 }
 
 
@@ -803,6 +563,7 @@ bool BufferView::ChangeCitationsIfUnique(string const & from, string const & to)
 	return ChangeInsets(Inset::CITE_CODE, from, to);
 }
 
+
 UpdatableInset * BufferView::theLockingInset() const
 {
 	// If NULL is not allowed we should put an Assert here. (Lgb)
@@ -846,6 +607,6 @@ LyXText * BufferView::getParentText(Inset * inset) const
 Language const * BufferView::getParentLanguage(Inset * inset) const
 {
 	LyXText * text = getParentText(inset);
-	return text->cursor.par()->GetFontSettings(buffer()->params,
+	return text->cursor.par()->getFontSettings(buffer()->params,
 						   text->cursor.pos()).language();
 }