X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView2.C;h=2e32c7cc787024e4444886f003e4c65cd3285bca;hb=e7ae04343eeb55d92b52c979c2fd5f5ea54ccf38;hp=55e1a8a33546f240f584a9a9d69b514fae75c30f;hpb=3ff3b95d3c7fdc814cb774221370964da4e283ce;p=lyx.git

diff --git a/src/BufferView2.C b/src/BufferView2.C
index 55e1a8a335..2e32c7cc78 100644
--- a/src/BufferView2.C
+++ b/src/BufferView2.C
@@ -22,7 +22,6 @@
 #include "insets/insetinfo.h"
 #include "insets/insetspecialchar.h"
 #include "LyXView.h"
-#include "minibuffer.h"
 #include "bufferlist.h"
 #include "support/FileInfo.h"
 #include "lyxscreen.h"
@@ -31,6 +30,9 @@
 #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"
 
 extern BufferList bufferlist;
 
@@ -39,6 +41,8 @@ using std::endl;
 using std::ifstream;
 using std::vector;
 using std::find;
+using std::count;
+using std::count_if;
 
 // Inserts a file into current document
 bool BufferView::insertLyXFile(string const & filen)
@@ -52,10 +56,10 @@ bool BufferView::insertLyXFile(string const & filen)
 {
 	if (filen.empty()) return false;
 
-	string fname = MakeAbsPath(filen);
+	string const fname = MakeAbsPath(filen);
 
 	// check if file exist
-	FileInfo fi(fname);
+	FileInfo const fi(fname);
 
 	if (!fi.readable()) {
 		WriteAlert(_("Error!"),
@@ -64,7 +68,7 @@ bool BufferView::insertLyXFile(string const & filen)
 		return false;
 	}
 	
-	beforeChange();
+	beforeChange(text);
 
 	ifstream ifs(fname.c_str());
 	if (!ifs) {
@@ -74,7 +78,7 @@ bool BufferView::insertLyXFile(string const & filen)
 		return false;
 	}
 	
-	char c = ifs.peek();
+	char const c = ifs.peek();
        
 	LyXLex lex(0, 0);
 	lex.setStream(ifs);
@@ -93,6 +97,7 @@ bool BufferView::insertLyXFile(string const & filen)
 	return res;
 }
 
+
 bool BufferView::removeAutoInsets()
 {
 	LyXParagraph * par = buffer()->paragraph;
@@ -101,29 +106,42 @@ bool BufferView::removeAutoInsets()
 	LyXCursor cursor;
 
 	bool a = false;
+#ifndef NEW_INSETS
 	while (par) {
 		// this has to be done before the delete
-#ifndef NEW_INSETS
 		if (par->footnoteflag != LyXParagraph::CLOSED_FOOTNOTE)
-#endif
 			text->SetCursor(this, cursor, par, 0);
 		if (par->AutoDeleteInsets()){
 			a = true;
-#ifndef NEW_INSETS
 			if (par->footnoteflag != LyXParagraph::CLOSED_FOOTNOTE){
-#endif
 				text->RedoParagraphs(this, cursor,
-						     cursor.par()->Next());
+						     cursor.par()->next());
 				text->FullRebreak(this);
-#ifndef NEW_INSETS
 			}
-#endif
 		}
-		par = par->next;
+		par = par->next_;
 	}
+
 	// avoid forbidden cursor positions caused by error removing
 	if (tmpcursor.pos() > tmpcursor.par()->Last())
 		tmpcursor.pos(tmpcursor.par()->Last());
+#else
+	while (par) {
+		// 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);
+		}
+		par = par->next();
+	}
+
+	// avoid forbidden cursor positions caused by error removing
+	if (tmpcursor.pos() > tmpcursor.par()->size())
+		tmpcursor.pos(tmpcursor.par()->size());
+#endif
 	text->SetCursorIntern(this, tmpcursor.par(), tmpcursor.pos());
 
 	return a;
@@ -144,10 +162,10 @@ void BufferView::insertErrors(TeXErrors & terr)
 	for (TeXErrors::Errors::const_iterator cit = terr.begin();
 	     cit != terr.end();
 	     ++cit) {
-		string desctext((*cit).error_desc);
-		string errortext((*cit).error_text);
-		string msgtxt = desctext + '\n' + errortext;
-		int errorrow = (*cit).error_in_line;
+		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;
 
 		// Insert error string for row number
 		int tmpid = -1; 
@@ -197,15 +215,15 @@ void BufferView::setCursorFromRow(int row)
 	text->SetCursor(this, texrowpar, tmppos);
 }
 
+
 bool BufferView::insertInset(Inset * inset, string const & lout,
-			 bool no_table)
+			     bool /*no_table*/)
 {
 	// if we are in a locking inset we should try to insert the
 	// inset there otherwise this is a illegal function now
-	if (the_locking_inset) {
-		if (the_locking_inset->InsertInsetAllowed(inset) &&
-		    the_locking_inset->InsertInset(this, inset))
-			return true;
+	if (theLockingInset()) {
+		if (theLockingInset()->InsertInsetAllowed(inset))
+		    return theLockingInset()->InsertInset(this, inset);
 		return false;
 	}
 
@@ -213,17 +231,21 @@ bool BufferView::insertInset(Inset * inset, string const & lout,
 	text->SetCursorParUndo(buffer());
 	text->FreezeUndo();
 	
-	beforeChange();
+	beforeChange(text);
 	if (!lout.empty()) {
-		update(BufferView::SELECT|BufferView::FITCUR);
+		update(text, BufferView::SELECT|BufferView::FITCUR);
 		text->BreakParagraph(this);
-		update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-		
+		update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+
+#ifndef NEW_INSETS
 		if (text->cursor.par()->Last()) {
+#else
+		if (text->cursor.par()->size()) {
+#endif
 			text->CursorLeft(this);
 			
 			text->BreakParagraph(this);
-			update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+			update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 		}
 
 		pair<bool, LyXTextClass::size_type> lres =
@@ -246,26 +268,13 @@ bool BufferView::insertInset(Inset * inset, string const & lout,
 				   LYX_ALIGN_LAYOUT, 
 				   string(),
 				   0);
-		update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+		update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 		
 		text->current_font.setLatex(LyXFont::OFF);
 	}
 	
 	text->InsertInset(this, inset);
-#if 1
-	// if we enter a text-inset the cursor should be to the left side
-	// of it! This couldn't happen before as Undo was not handled inside
-	// inset now after the Undo LyX tries to call inset->Edit(...) again
-	// and cannot do this as the cursor is behind the inset and GetInset
-	// does not return the inset!
-	if (inset->IsTextInset()) {
-		if (text->cursor.par()->isRightToLeftPar(buffer()->params))
-			text->CursorRight(this);
-		else
-			text->CursorLeft(this);
-	}
-#endif
-	update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+	update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 
 	text->UnFreezeUndo();
 	return true;
@@ -273,15 +282,19 @@ bool BufferView::insertInset(Inset * inset, string const & lout,
 
 
 // Open and lock an updatable inset
-bool BufferView::open_new_inset(UpdatableInset * new_inset)
+bool BufferView::open_new_inset(UpdatableInset * new_inset, bool behind)
 {
-	beforeChange();
+	beforeChange(text);
 	text->FinishUndo();
-	if (!insertInset(new_inset))
+	if (!insertInset(new_inset)) {
+		delete new_inset;
 		return false;
-	text->CursorLeft(this);
-	update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-    	new_inset->Edit(this, 0, 0, 0);
+	}
+	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;
 }
 
@@ -296,12 +309,12 @@ bool BufferView::gotoLabel(string const & label)
 	for (Buffer::inset_iterator it = buffer()->inset_iterator_begin();
 	     it != buffer()->inset_iterator_end(); ++it) {
 		vector<string> labels = (*it)->getLabelList();
-		if ( find(labels.begin(),labels.end(),label)
+		if (find(labels.begin(),labels.end(),label)
 		     != labels.end()) {
-			beforeChange();
+			beforeChange(text);
 			text->SetCursor(this, it.getPar(), it.getPos());
 			text->sel_cursor = text->cursor;
-			update(BufferView::SELECT|BufferView::FITCUR);
+			update(text, BufferView::SELECT|BufferView::FITCUR);
 			return true;
 		}
 	}
@@ -330,7 +343,7 @@ void BufferView::allFloats(char flag, char figmar)
 		    && cursor.par()->footnotekind != LyXParagraph::ALGORITHM)))
 		toggleFloat();
 	else
-		beforeChange();
+		beforeChange(text);
 
 	LyXCursor tmpcursor = cursor;
 	cursor.par(tmpcursor.par()->ParFromPos(tmpcursor.pos()));
@@ -352,11 +365,11 @@ void BufferView::allFloats(char flag, char figmar)
 					)
 				    )
 				) {
-				if (par->previous
-				    && par->previous->footnoteflag != 
+				if (par->previous_
+				    && par->previous_->footnoteflag != 
 				    LyXParagraph::CLOSED_FOOTNOTE){ /* should be */ 
 					text->SetCursorIntern(this, 
-							      par->previous,
+							      par->previous_,
 							      0);
 					text->OpenFootnote(this);
 				}
@@ -389,13 +402,12 @@ void BufferView::allFloats(char flag, char figmar)
 				text->CloseFootnote(this);
 			}
 		}
-		par = par->next;
+		par = par->next_;
 	}
 
 	text->SetCursorIntern(this, cursor.par(), cursor.pos());
 	redraw();
-	fitCursor();
-	//updateScrollbar();
+	fitCursor(text);
 }
 #endif
 
@@ -412,12 +424,12 @@ void BufferView::insertNote()
 void BufferView::openStuff()
 {
 	if (available()) {
-		owner()->getMiniBuffer()->Set(_("Open/Close..."));
+		owner()->message(_("Open/Close..."));
 		hideCursor();
-		beforeChange();
-		update(BufferView::SELECT|BufferView::FITCUR);
+		beforeChange(text);
+		update(text, BufferView::SELECT|BufferView::FITCUR);
 		text->OpenStuff(this);
-		update(BufferView::SELECT|BufferView::FITCUR);
+		update(text, BufferView::SELECT|BufferView::FITCUR);
 		setState();
 	}
 }
@@ -426,12 +438,12 @@ void BufferView::openStuff()
 void BufferView::toggleFloat()
 {
 	if (available()) {
-		owner()->getMiniBuffer()->Set(_("Open/Close..."));
+		owner()->message(_("Open/Close..."));
 		hideCursor();
-		beforeChange();
-		update(BufferView::SELECT|BufferView::FITCUR);
+		beforeChange(text);
+		update(text, BufferView::SELECT|BufferView::FITCUR);
 		text->ToggleFootnote(this);
-		update(BufferView::SELECT|BufferView::FITCUR);
+		update(text, BufferView::SELECT|BufferView::FITCUR);
 		setState();
 	}
 }
@@ -440,14 +452,14 @@ void BufferView::toggleFloat()
 void BufferView::menuUndo()
 {
 	if (available()) {
-		owner()->getMiniBuffer()->Set(_("Undo"));
+		owner()->message(_("Undo"));
 		hideCursor();
-		beforeChange();
-		update(BufferView::SELECT|BufferView::FITCUR);
+		beforeChange(text);
+		update(text, BufferView::SELECT|BufferView::FITCUR);
 		if (!text->TextUndo(this))
-			owner()->getMiniBuffer()->Set(_("No further undo information"));
+			owner()->message(_("No forther undo information"));
 		else
-			update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+			update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 		setState();
 	}
 }
@@ -455,20 +467,20 @@ void BufferView::menuUndo()
 
 void BufferView::menuRedo()
 {
-	if (the_locking_inset) {
-		owner()->getMiniBuffer()->Set(_("Redo not yet supported in math mode"));
+	if (theLockingInset()) {
+		owner()->message(_("Redo not yet supported in math mode"));
 		return;
 	}    
    
 	if (available()) {
-		owner()->getMiniBuffer()->Set(_("Redo"));
+		owner()->message(_("Redo"));
 		hideCursor();
-		beforeChange();
-		update(BufferView::SELECT|BufferView::FITCUR);
+		beforeChange(text);
+		update(text, BufferView::SELECT|BufferView::FITCUR);
 		if (!text->TextRedo(this))
-			owner()->getMiniBuffer()->Set(_("No further redo information"));
+			owner()->message(_("No further redo information"));
 		else
-			update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+			update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 		setState();
 	}
 }
@@ -478,7 +490,7 @@ void BufferView::hyphenationPoint()
 {
 	if (available()) {
 		hideCursor();
-		update(BufferView::SELECT|BufferView::FITCUR);
+		update(text, BufferView::SELECT|BufferView::FITCUR);
 		InsetSpecialChar * new_inset = 
 			new InsetSpecialChar(InsetSpecialChar::HYPHENATION);
 		insertInset(new_inset);
@@ -490,7 +502,7 @@ void BufferView::ldots()
 {
 	if (available())  {
 		hideCursor();
-		update(BufferView::SELECT|BufferView::FITCUR);
+		update(text, BufferView::SELECT|BufferView::FITCUR);
 		InsetSpecialChar * new_inset = 
 			new InsetSpecialChar(InsetSpecialChar::LDOTS);
 		insertInset(new_inset);
@@ -502,7 +514,7 @@ void BufferView::endOfSentenceDot()
 {
 	if (available()) {
 		hideCursor();
-		update(BufferView::SELECT|BufferView::FITCUR);
+		update(text, BufferView::SELECT|BufferView::FITCUR);
 		InsetSpecialChar * new_inset = 
 			new InsetSpecialChar(InsetSpecialChar::END_OF_SENTENCE);
 		insertInset(new_inset);
@@ -514,7 +526,7 @@ void BufferView::menuSeparator()
 {
 	if (available()) {
 		hideCursor();
-		update(BufferView::SELECT|BufferView::FITCUR);
+		update(text, BufferView::SELECT|BufferView::FITCUR);
 		InsetSpecialChar * new_inset = 
 			new InsetSpecialChar(InsetSpecialChar::MENU_SEPARATOR);
 		insertInset(new_inset);
@@ -526,21 +538,24 @@ void BufferView::newline()
 {
 	if (available()) {
 		hideCursor();
-		update(BufferView::SELECT|BufferView::FITCUR);
+		update(text, BufferView::SELECT|BufferView::FITCUR);
 		text->InsertChar(this, LyXParagraph::META_NEWLINE);
-		update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+		update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 	}
 }
 
 
-void BufferView::protectedBlank()
+void BufferView::protectedBlank(LyXText * lt)
 {
 	if (available()) {
 		hideCursor();
-		update(BufferView::SELECT|BufferView::FITCUR);
+		update(lt, BufferView::SELECT|BufferView::FITCUR);
 		InsetSpecialChar * new_inset =
 			new InsetSpecialChar(InsetSpecialChar::PROTECTED_SEPARATOR);
-		insertInset(new_inset);
+		if (!insertInset(new_inset))
+			delete new_inset;
+		else
+			updateInset(new_inset, true);
 	}
 }
 
@@ -549,21 +564,22 @@ void BufferView::hfill()
 {
 	if (available()) {
 		hideCursor();
-		update(BufferView::SELECT|BufferView::FITCUR);
+		update(text, BufferView::SELECT|BufferView::FITCUR);
 		text->InsertChar(this, LyXParagraph::META_HFILL);
-		update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+		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();
-		update(BufferView::SELECT|BufferView::FITCUR);
-		owner()->getMiniBuffer()->Set(_("Paragraph environment type copied"));
+		text->ClearSelection(this);
+		update(text, BufferView::SELECT|BufferView::FITCUR);
+		owner()->message(_("Paragraph environment type copied"));
 	}
 }
 
@@ -572,8 +588,8 @@ void BufferView::pasteEnvironment()
 {
 	if (available()) {
 		text->pasteEnvironmentType(this);
-		owner()->getMiniBuffer()->Set(_("Paragraph environment type set"));
-		update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+		owner()->message(_("Paragraph environment type set"));
+		update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 	}
 }
 
@@ -584,9 +600,9 @@ void BufferView::copy()
 		text->CopySelection(this);
 		// clear the selection, even if mark_set
 		toggleSelection();
-		text->ClearSelection();
-		update(BufferView::SELECT|BufferView::FITCUR);
-		owner()->getMiniBuffer()->Set(_("Copy"));
+		text->ClearSelection(this);
+		update(text, BufferView::SELECT|BufferView::FITCUR);
+		owner()->message(_("Copy"));
 	}
 }
 
@@ -594,10 +610,10 @@ void BufferView::cut()
 {
 	if (available()) {
 		hideCursor();
-		update(BufferView::SELECT|BufferView::FITCUR);
+		update(text, BufferView::SELECT|BufferView::FITCUR);
 		text->CutSelection(this);
-		update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-		owner()->getMiniBuffer()->Set(_("Cut"));
+		update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+		owner()->message(_("Cut"));
 	}
 }
 
@@ -605,55 +621,70 @@ void BufferView::cut()
 void BufferView::paste()
 {
 	if (!available()) return;
-	
-	owner()->getMiniBuffer()->Set(_("Paste"));
+
+	owner()->message(_("Paste"));
+
 	hideCursor();
 	// clear the selection
 	toggleSelection();
-	text->ClearSelection();
-	update(BufferView::SELECT|BufferView::FITCUR);
+	text->ClearSelection(this);
+	update(text, BufferView::SELECT|BufferView::FITCUR);
 	
 	// paste
 	text->PasteSelection(this);
-	update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+	update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 	
 	// clear the selection 
 	toggleSelection();
-	text->ClearSelection();
-	update(BufferView::SELECT|BufferView::FITCUR);
+	text->ClearSelection(this);
+	update(text, BufferView::SELECT|BufferView::FITCUR);
 }
 
 
-void BufferView::gotoNote()
+void BufferView::gotoInset(std::vector<Inset::Code> const & codes,
+			   bool same_content)
 {
 	if (!available()) return;
    
 	hideCursor();
-	beforeChange();
-	update(BufferView::SELECT|BufferView::FITCUR);
-	LyXCursor tmp;
-   
-	if (!text->GotoNextNote(this)) {
+	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()) {
-				tmp = text->cursor;
+				LyXCursor tmp = text->cursor;
 				text->cursor.par(text->FirstParagraph());
 				text->cursor.pos(0);
-				if (!text->GotoNextNote(this)) {
+				if (!text->GotoNextInset(this, codes, contents)) {
 					text->cursor = tmp;
-					owner()->getMiniBuffer()->Set(_("No more notes"));
-					LyXBell();
+					owner()->message(_("No more insets"));
 				}
 			} else {
-				owner()->getMiniBuffer()->Set(_("No more notes"));
-				LyXBell();
+				owner()->message(_("No more insets"));
 			}
 	}
-	update(BufferView::SELECT|BufferView::FITCUR);
+	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;
@@ -672,7 +703,7 @@ string const BufferView::nextWord(float & value)
 {
 	if (!available()) {
 		value = 1;
-		return 0;
+		return string();
 	}
 
 	return text->SelectNextWord(this, value);
@@ -684,10 +715,10 @@ void BufferView::selectLastWord()
 	if (!available()) return;
    
 	hideCursor();
-	beforeChange();
+	beforeChange(text);
 	text->SelectSelectedWord(this);
 	toggleSelection(false);
-	update(BufferView::SELECT|BufferView::FITCUR);
+	update(text, BufferView::SELECT|BufferView::FITCUR);
 }
 
 
@@ -696,10 +727,10 @@ void BufferView::endOfSpellCheck()
 	if (!available()) return;
    
 	hideCursor();
-	beforeChange();
+	beforeChange(text);
 	text->SelectSelectedWord(this);
-	text->ClearSelection();
-	update(BufferView::SELECT|BufferView::FITCUR);
+	text->ClearSelection(this);
+	update(text, BufferView::SELECT|BufferView::FITCUR);
 }
 
 
@@ -708,70 +739,81 @@ void BufferView::replaceWord(string const & replacestring)
 	if (!available()) return;
 
 	hideCursor();
-	update(BufferView::SELECT|BufferView::FITCUR);
+	update(text, BufferView::SELECT|BufferView::FITCUR);
    
 	/* clear the selection (if there is any) */ 
 	toggleSelection(false);
-	update(BufferView::SELECT|BufferView::FITCUR);
+	update(text, BufferView::SELECT|BufferView::FITCUR);
    
 	/* clear the selection (if there is any) */ 
 	toggleSelection(false);
-	text->ReplaceSelectionWithString(this, replacestring.c_str());
+	text->ReplaceSelectionWithString(this, replacestring);
    
-	text->SetSelectionOverString(this, replacestring.c_str());
+	text->SetSelectionOverString(this, replacestring);
 
 	// Go back so that replacement string is also spellchecked
 	for (string::size_type i = 0; i < replacestring.length() + 1; ++i) {
-		text->CursorLeftIntern(this);
+		text->CursorLeft(this);
 	}
-	update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+	update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 }
 // End of spellchecker stuff
 
 
 bool BufferView::lockInset(UpdatableInset * inset)
 {
-	if (!the_locking_inset && inset) {
-		the_locking_inset = inset;
+	if (!theLockingInset() && inset) {
+		theLockingInset(inset);
 		return true;
 	} else if (inset) {
-	    return the_locking_inset->LockInsetInInset(this, inset);
+	    return theLockingInset()->LockInsetInInset(this, inset);
 	}
 	return false;
 }
 
 
-void BufferView::showLockedInsetCursor(long x, long y, int asc, int desc)
+void BufferView::showLockedInsetCursor(int x, int y, int asc, int desc)
 {
-	if (the_locking_inset && available()) {
+	if (theLockingInset() && available()) {
 		LyXCursor cursor = text->cursor;
 		if ((cursor.pos() - 1 >= 0) &&
 		    (cursor.par()->GetChar(cursor.pos() - 1) ==
 		     LyXParagraph::META_INSET) &&
 		    (cursor.par()->GetInset(cursor.pos() - 1) ==
-		     the_locking_inset->GetLockingInset()))
+		     theLockingInset()->GetLockingInset()))
 			text->SetCursor(this, cursor,
 					cursor.par(), cursor.pos() - 1);
-		y += cursor.y() + the_locking_inset->InsetInInsetY();
+		LyXScreen::Cursor_Shape shape = LyXScreen::BAR_SHAPE;
+		LyXText * txt = getLyXText();
+		if (theLockingInset()->GetLockingInset()->LyxCode() ==
+		    Inset::TEXT_CODE &&
+		    (txt->real_current_font.language() !=
+		     buffer()->params.language
+		     || txt->real_current_font.isVisibleRightToLeft()
+		     != buffer()->params.language->RightToLeft()))
+			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,
-						  LyXScreen::BAR_SHAPE);
+						  shape);
 	}
 }
 
 
 void BufferView::hideLockedInsetCursor()
 {
-	if (the_locking_inset && available()) {
+	if (theLockingInset() && available()) {
 		pimpl_->screen_->HideCursor();
 	}
 }
 
 
-void BufferView::fitLockedInsetCursor(long x, long y, int asc, int desc)
+void BufferView::fitLockedInsetCursor(int x, int y, int asc, int desc)
 {
-	if (the_locking_inset && available()){
-		y += text->cursor.y() + the_locking_inset->InsetInInsetY();
-		if (pimpl_->screen_->FitManualCursor(text, x, y, asc, desc))
+	if (theLockingInset() && available()) {
+		y += text->cursor.y() + theLockingInset()->InsetInInsetY();
+		if (pimpl_->screen_->FitManualCursor(text, this, x, y, asc, desc))
 			updateScrollbar();
 	}
 }
@@ -779,13 +821,13 @@ void BufferView::fitLockedInsetCursor(long x, long y, int asc, int desc)
 
 int BufferView::unlockInset(UpdatableInset * inset)
 {
-	if (inset && the_locking_inset == inset) {
+	if (inset && theLockingInset() == inset) {
 		inset->InsetUnlock(this);
-		the_locking_inset = 0;
+		theLockingInset(0);
 		text->FinishUndo();
 		return 0;
-	} else if (inset && the_locking_inset &&
-		   the_locking_inset->UnlockInsetInInset(this, inset)) {
+	} else if (inset && theLockingInset() &&
+		   theLockingInset()->UnlockInsetInInset(this, inset)) {
 		text->FinishUndo();
 		return 0;
 	}
@@ -795,21 +837,21 @@ int BufferView::unlockInset(UpdatableInset * inset)
 
 void BufferView::lockedInsetStoreUndo(Undo::undo_kind kind)
 {
-	if (!the_locking_inset)
+	if (!theLockingInset())
 		return; // shouldn't happen
 	if (kind == Undo::EDIT) // in this case insets would not be stored!
 		kind = Undo::FINISH;
-	text->SetUndo(buffer(), kind,
 #ifndef NEW_INSETS
+	text->SetUndo(buffer(), kind,
 		      text->cursor.par()->
-		      ParFromPos(text->cursor.pos())->previous, 
+		      ParFromPos(text->cursor.pos())->previous_, 
 		      text->cursor.par()->
-		      ParFromPos(text->cursor.pos())->next
+		      ParFromPos(text->cursor.pos())->next_);
 #else
-		      text->cursor.par()->previous, 
-		      text->cursor.par()->next
+	text->SetUndo(buffer(), kind,
+		      text->cursor.par()->previous(), 
+		      text->cursor.par()->next());
 #endif
-		);
 }
 
 
@@ -819,26 +861,20 @@ void BufferView::updateInset(Inset * inset, bool mark_dirty)
 		return;
 
 	// first check for locking insets
-	if (the_locking_inset) {
-		if (the_locking_inset == inset) {
-			if (text->UpdateInset(this, inset)){
+	if (theLockingInset()) {
+		if (theLockingInset() == inset) {
+			if (text->UpdateInset(this, inset)) {
 				update();
-				if (mark_dirty){
-					if (buffer()->isLyxClean())
-						owner()->getMiniBuffer()->
-							setTimer(4);
+				if (mark_dirty) {
 					buffer()->markDirty();
 				}
 				updateScrollbar();
 				return;
 			}
-		} else if (the_locking_inset->UpdateInsetInInset(this,inset)) {
-			if (text->UpdateInset(this, the_locking_inset)) {
+		} else if (theLockingInset()->UpdateInsetInInset(this,inset)) {
+			if (text->UpdateInset(this, theLockingInset())) {
 				update();
 				if (mark_dirty){
-					if (buffer()->isLyxClean())
-						owner()->getMiniBuffer()->
-							setTimer(4);
 					buffer()->markDirty();
 				}
 				updateScrollbar();
@@ -850,18 +886,20 @@ void BufferView::updateInset(Inset * inset, bool mark_dirty)
 	// then check the current buffer
 	if (available()) {
 		hideCursor();
-		update(BufferView::UPDATE);
-		if (text->UpdateInset(this, inset)){
+		update(text, BufferView::UPDATE);
+		if (text->UpdateInset(this, inset)) {
 			if (mark_dirty)
-				update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+				update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 			else 
-				update(SELECT);
+				update(text, SELECT);
 			return;
 		}
 	}
 }
 
-bool BufferView::ChangeRefs(string const & from, string const & to)
+
+bool BufferView::ChangeInsets(Inset::Code code,
+			      string const & from, string const & to)
 {
 	bool flag = false;
 	LyXParagraph * par = buffer()->paragraph;
@@ -879,7 +917,7 @@ bool BufferView::ChangeRefs(string const & from, string const & to)
 		bool flag2 = false;
 		for (LyXParagraph::inset_iterator it = par->inset_iterator_begin();
 		     it != par->inset_iterator_end(); ++it) {
-			if ((*it)->LyxCode() == Inset::REF_CODE) {
+			if ((*it)->LyxCode() == code) {
 				InsetCommand * inset = static_cast<InsetCommand *>(*it);
 				if (inset->getContents() == from) {
 					inset->setContents(to);
@@ -887,23 +925,103 @@ bool BufferView::ChangeRefs(string const & from, string const & to)
 				}
 			}
 		}
+#ifndef NEW_INSETS
 		if (flag2) {
 			flag = true;
-#ifndef NEW_INSETS
 			if (par->footnoteflag != LyXParagraph::CLOSED_FOOTNOTE){
-#endif
 				// 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->cursor.par()->next());
 				text->FullRebreak(this);
-#ifndef NEW_INSETS
 			}
-#endif
 		}
-		par = par->next;
+		par = par->next_;
+#else
+		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);
+		}
+		par = par->next();
+#endif
 	}
 	text->SetCursorIntern(this, cursor.par(), cursor.pos());
 	return flag;
 }
+
+
+bool BufferView::ChangeRefsIfUnique(string const & from, string const & to)
+{
+	// Check if the label 'from' appears more than once
+	vector<string> labels = buffer()->getLabelList();
+	if (count(labels.begin(), labels.end(), from) > 1)
+		return false;
+
+	return ChangeInsets(Inset::REF_CODE, from, to);
+}
+
+
+bool BufferView::ChangeCitationsIfUnique(string const & from, string const & to)
+{
+
+	vector<pair<string,string> > keys = buffer()->getBibkeyList();	
+	if (count_if(keys.begin(), keys.end(), 
+		     lyx::equal_1st_in_pair<string,string>(from)) 
+	    > 1)
+		return false;
+
+	return ChangeInsets(Inset::CITE_CODE, from, to);
+}
+
+UpdatableInset * BufferView::theLockingInset() const
+{
+	// If NULL is not allowed we should put an Assert here. (Lgb)
+	if (text)
+		return text->the_locking_inset;
+	return 0;
+}
+
+
+void BufferView::theLockingInset(UpdatableInset * inset)
+{
+	text->the_locking_inset = inset;
+}
+
+
+LyXText * BufferView::getLyXText() const
+{
+	if (theLockingInset()) {
+		LyXText * txt = theLockingInset()->getLyXText(this, true);
+		if (txt)
+			return txt;
+	}
+	return text;
+}
+
+
+LyXText * BufferView::getParentText(Inset * inset) const
+{
+	if (inset->owner()) {
+		LyXText * txt = inset->getLyXText(this);
+		inset = inset->owner();
+		while (inset && inset->getLyXText(this) == txt)
+			inset = inset->owner();
+		if (inset)
+			return inset->getLyXText(this);
+	}
+	return text;
+}
+
+
+Language const * BufferView::getParentLanguage(Inset * inset) const
+{
+	LyXText * text = getParentText(inset);
+	return text->cursor.par()->GetFontSettings(buffer()->params,
+						   text->cursor.pos()).language();
+}