X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView2.C;h=7263f0ac85f115fc9af2d98fa42e8f94e4522b9b;hb=664eb7ff45dbb4fabc22ec0b56798031a82335b1;hp=24258b3dfa7cf1e260aceae5930f32d4470e40a6;hpb=53b30ba060d23b7cc5f290d96e8eed64dad34d89;p=lyx.git

diff --git a/src/BufferView2.C b/src/BufferView2.C
index 24258b3dfa..7263f0ac85 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,10 @@
 #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 "lyxfunc.h"
 
 extern BufferList bufferlist;
 
@@ -40,6 +43,7 @@ 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)
@@ -65,7 +69,7 @@ bool BufferView::insertLyXFile(string const & filen)
 		return false;
 	}
 	
-	beforeChange();
+	beforeChange(text);
 
 	ifstream ifs(fname.c_str());
 	if (!ifs) {
@@ -103,29 +107,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;
@@ -215,17 +232,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 =
@@ -248,13 +269,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);
-	update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+	update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 
 	text->UnFreezeUndo();
 	return true;
@@ -264,7 +285,7 @@ bool BufferView::insertInset(Inset * inset, string const & lout,
 // Open and lock an updatable inset
 bool BufferView::open_new_inset(UpdatableInset * new_inset, bool behind)
 {
-	beforeChange();
+	beforeChange(text);
 	text->FinishUndo();
 	if (!insertInset(new_inset)) {
 		delete new_inset;
@@ -291,10 +312,10 @@ bool BufferView::gotoLabel(string const & label)
 		vector<string> labels = (*it)->getLabelList();
 		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;
 		}
 	}
@@ -323,7 +344,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()));
@@ -345,11 +366,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);
 				}
@@ -382,7 +403,7 @@ void BufferView::allFloats(char flag, char figmar)
 				text->CloseFootnote(this);
 			}
 		}
-		par = par->next;
+		par = par->next_;
 	}
 
 	text->SetCursorIntern(this, cursor.par(), cursor.pos());
@@ -404,12 +425,13 @@ void BufferView::insertNote()
 void BufferView::openStuff()
 {
 	if (available()) {
-		owner()->getMiniBuffer()->Set(_("Open/Close..."));
+		owner()->getLyXFunc()->Dispatch(LFUN_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();
 	}
 }
@@ -418,12 +440,13 @@ void BufferView::openStuff()
 void BufferView::toggleFloat()
 {
 	if (available()) {
-		owner()->getMiniBuffer()->Set(_("Open/Close..."));
+		owner()->getLyXFunc()->Dispatch(LFUN_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();
 	}
 }
@@ -432,14 +455,15 @@ void BufferView::toggleFloat()
 void BufferView::menuUndo()
 {
 	if (available()) {
-		owner()->getMiniBuffer()->Set(_("Undo"));
+		owner()->getLyXFunc()->Dispatch(LFUN_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()->getLyXFunc()->Dispatch(LFUN_MESSAGE,
+							_("No forther undo information"));
 		else
-			update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+			update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 		setState();
 	}
 }
@@ -448,19 +472,22 @@ void BufferView::menuUndo()
 void BufferView::menuRedo()
 {
 	if (theLockingInset()) {
-		owner()->getMiniBuffer()->Set(_("Redo not yet supported in math mode"));
+		owner()->getLyXFunc()->Dispatch(LFUN_MESSAGE,
+						_("Redo not yet supported in math mode"));
 		return;
 	}    
    
 	if (available()) {
-		owner()->getMiniBuffer()->Set(_("Redo"));
+		owner()->getLyXFunc()->Dispatch(LFUN_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()->getLyXFunc()->Dispatch(LFUN_MESSAGE,
+							_("No further redo information"));
 		else
-			update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+			update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 		setState();
 	}
 }
@@ -470,7 +497,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);
@@ -482,7 +509,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);
@@ -494,7 +521,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);
@@ -506,7 +533,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);
@@ -518,21 +545,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);
 	}
 }
 
@@ -541,21 +571,23 @@ 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()->getLyXFunc()->Dispatch(LFUN_MESSAGE,
+						_("Paragraph environment type copied"));
 	}
 }
 
@@ -564,8 +596,9 @@ void BufferView::pasteEnvironment()
 {
 	if (available()) {
 		text->pasteEnvironmentType(this);
-		owner()->getMiniBuffer()->Set(_("Paragraph environment type set"));
-		update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+		owner()->getLyXFunc()->Dispatch(LFUN_MESSAGE,
+						_("Paragraph environment type set"));
+		update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 	}
 }
 
@@ -576,9 +609,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()->getLyXFunc()->Dispatch(LFUN_MESSAGE, _("Copy"));
 	}
 }
 
@@ -586,10 +619,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()->getLyXFunc()->Dispatch(LFUN_MESSAGE, _("Cut"));
 	}
 }
 
@@ -597,22 +630,23 @@ void BufferView::cut()
 void BufferView::paste()
 {
 	if (!available()) return;
-	
-	owner()->getMiniBuffer()->Set(_("Paste"));
+
+	owner()->getLyXFunc()->Dispatch(LFUN_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);
 }
 
 
@@ -622,8 +656,8 @@ void BufferView::gotoInset(std::vector<Inset::Code> const & codes,
 	if (!available()) return;
    
 	hideCursor();
-	beforeChange();
-	update(BufferView::SELECT|BufferView::FITCUR);
+	beforeChange(text);
+	update(text, BufferView::SELECT|BufferView::FITCUR);
 
 	string contents;
 	if (same_content &&
@@ -643,13 +677,17 @@ void BufferView::gotoInset(std::vector<Inset::Code> const & codes,
 				text->cursor.pos(0);
 				if (!text->GotoNextInset(this, codes, contents)) {
 					text->cursor = tmp;
-					owner()->getMiniBuffer()->Set(_("No more insets"));
+					owner()->getLyXFunc()
+						->Dispatch(LFUN_MESSAGE,
+							   _("No more insets"));
 				}
 			} else {
-				owner()->getMiniBuffer()->Set(_("No more insets"));
+				owner()->getLyXFunc()
+					->Dispatch(LFUN_MESSAGE,
+						   _("No more insets"));
 			}
 	}
-	update(BufferView::SELECT|BufferView::FITCUR);
+	update(text, BufferView::SELECT|BufferView::FITCUR);
 	text->sel_cursor = text->cursor;
 }
 
@@ -690,10 +728,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);
 }
 
 
@@ -702,10 +740,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);
 }
 
 
@@ -714,11 +752,11 @@ 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);
@@ -730,7 +768,7 @@ void BufferView::replaceWord(string const & replacestring)
 	for (string::size_type i = 0; i < replacestring.length() + 1; ++i) {
 		text->CursorLeft(this);
 	}
-	update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+	update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 }
 // End of spellchecker stuff
 
@@ -816,17 +854,17 @@ 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,
 #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
-		);
 }
 
 
@@ -841,9 +879,6 @@ void BufferView::updateInset(Inset * inset, bool mark_dirty)
 			if (text->UpdateInset(this, inset)) {
 				update();
 				if (mark_dirty) {
-					if (buffer()->isLyxClean())
-						owner()->getMiniBuffer()->
-							setTimer(4);
 					buffer()->markDirty();
 				}
 				updateScrollbar();
@@ -853,9 +888,6 @@ void BufferView::updateInset(Inset * inset, bool mark_dirty)
 			if (text->UpdateInset(this, theLockingInset())) {
 				update();
 				if (mark_dirty){
-					if (buffer()->isLyxClean())
-						owner()->getMiniBuffer()->
-							setTimer(4);
 					buffer()->markDirty();
 				}
 				updateScrollbar();
@@ -867,19 +899,20 @@ void BufferView::updateInset(Inset * inset, bool mark_dirty)
 	// then check the current buffer
 	if (available()) {
 		hideCursor();
-		update(BufferView::UPDATE);
+		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;
@@ -897,7 +930,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);
@@ -905,22 +938,31 @@ 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;
@@ -934,10 +976,22 @@ bool BufferView::ChangeRefsIfUnique(string const & from, string const & to)
 	if (count(labels.begin(), labels.end(), from) > 1)
 		return false;
 
-	return ChangeRefs(from, to);
+	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(), 
+		     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)
@@ -956,7 +1010,7 @@ void BufferView::theLockingInset(UpdatableInset * inset)
 LyXText * BufferView::getLyXText() const
 {
 	if (theLockingInset()) {
-		LyXText * txt = theLockingInset()->getLyXText(this);
+		LyXText * txt = theLockingInset()->getLyXText(this, true);
 		if (txt)
 			return txt;
 	}
@@ -977,6 +1031,7 @@ LyXText * BufferView::getParentText(Inset * inset) const
 	return text;
 }
 
+
 Language const * BufferView::getParentLanguage(Inset * inset) const
 {
 	LyXText * text = getParentText(inset);