]> git.lyx.org Git - lyx.git/blobdiff - src/BufferView.C
make redoParagraph more independent of current cursor
[lyx.git] / src / BufferView.C
index 95c03e8450eb9324ab1c77ffb0acff37f8daf540..8a7bee84b17775a0551cb9843ed534cf10371ba5 100644 (file)
@@ -3,32 +3,31 @@
  * Copyright 1995-2002 the LyX Team
  * Read the file COPYING
  *
- * \author unknown
+ * \author Lars Gullik Bjønnes
  * \author John Levon <moz@compsoc.man.ac.uk>
  */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "BufferView.h"
 #include "BufferView_pimpl.h"
 
-#include "BufferView_pimpl.h"
 #include "LaTeX.h"
+#include "ParagraphParameters.h"
 #include "WordLangTuple.h"
 #include "buffer.h"
 #include "bufferlist.h"
 #include "debug.h"
 #include "gettext.h"
+#include "errorlist.h"
 #include "iterators.h"
 #include "language.h"
 #include "lyxcursor.h"
 #include "lyxlex.h"
 #include "lyxtext.h"
 #include "undo_funcs.h"
+#include "changes.h"
+#include "paragraph_funcs.h"
 
 #include "frontends/Alert.h"
 #include "frontends/Dialogs.h"
 #include "frontends/screen.h"
 
 #include "insets/insetcommand.h" // ChangeRefs
-#include "insets/inseterror.h"
+#include "insets/updatableinset.h"
 
 #include "support/FileInfo.h"
 #include "support/filetools.h"
-#include "support/lyxfunctional.h" // equal_1st_in_pair
 #include "support/types.h"
 #include "support/lyxalgo.h" // lyx_count
 
@@ -50,6 +48,7 @@
 extern BufferList bufferlist;
 
 using lyx::pos_type;
+using namespace lyx::support;
 
 using std::pair;
 using std::endl;
@@ -104,11 +103,30 @@ void BufferView::buffer(Buffer * b)
 }
 
 
+bool BufferView::newFile(string const & fn, string const & tn, bool named)
+{
+       return pimpl_->newFile(fn, tn, named);
+}
+
+
+bool BufferView::loadLyXFile(string const & fn, bool tl)
+{
+       return pimpl_->loadLyXFile(fn, tl);
+}
+
+
+void BufferView::reload()
+{
+       string const fn = buffer()->fileName();
+       if (bufferlist.close(buffer(), false))
+               loadLyXFile(fn);
+}
+
+
 void BufferView::resize()
 {
-       if (pimpl_->buffer_) {
+       if (pimpl_->buffer_)
                pimpl_->resizeCurrentBuffer();
-       }
 }
 
 
@@ -154,6 +172,12 @@ bool BufferView::available() const
 }
 
 
+Change const BufferView::getCurrentChange()
+{
+       return pimpl_->getCurrentChange();
+}
+
+
 void BufferView::beforeChange(LyXText * text)
 {
        pimpl_->beforeChange(text);
@@ -184,6 +208,12 @@ void BufferView::update(LyXText * text, UpdateCodes f)
 }
 
 
+void BufferView::update(UpdateCodes f)
+{
+       pimpl_->update(f);
+}
+
+
 void BufferView::switchKeyMap()
 {
        pimpl_->switchKeyMap();
@@ -202,30 +232,12 @@ int BufferView::workWidth() const
 }
 
 
-void BufferView::showCursor()
-{
-       pimpl_->showCursor();
-}
-
-
-void BufferView::hideCursor()
-{
-       pimpl_->hideCursor();
-}
-
-
 void BufferView::toggleSelection(bool b)
 {
        pimpl_->toggleSelection(b);
 }
 
 
-void BufferView::toggleToggle()
-{
-       pimpl_->toggleToggle();
-}
-
-
 void BufferView::center()
 {
        pimpl_->center();
@@ -264,13 +276,6 @@ void BufferView::scroll(int lines)
 }
 
 
-int BufferView::defaultHeight() const
-{
-       return text->defaultHeight();
-}
-
-
-
 // Inserts a file into current document
 bool BufferView::insertLyXFile(string const & filen)
        //
@@ -290,9 +295,10 @@ bool BufferView::insertLyXFile(string const & filen)
        FileInfo const fi(fname);
 
        if (!fi.readable()) {
-               Alert::alert(_("Error!"),
-                          _("Specified file is unreadable: "),
-                          MakeDisplayPath(fname, 50));
+               string const file = MakeDisplayPath(fname, 50);
+               string const text =
+                       bformat(_("The specified document\n%1$s\ncould not be read."), file);
+               Alert::error(_("Could not read document"), text);
                return false;
        }
 
@@ -300,8 +306,10 @@ bool BufferView::insertLyXFile(string const & filen)
 
        ifstream ifs(fname.c_str());
        if (!ifs) {
-               Alert::err_alert(_("Error! Cannot open specified file:"),
-                          MakeDisplayPath(fname, 50));
+               string const file = MakeDisplayPath(fname, 50);
+               string const text =
+                       bformat(_("Could not open the specified document %1$s\n"), file);
+               Alert::error(_("Could not open file"), text);
                return false;
        }
 
@@ -312,13 +320,16 @@ bool BufferView::insertLyXFile(string const & filen)
 
        bool res = true;
 
+       text->breakParagraph(buffer()->paragraphs);
+
        if (c == '#') {
+               // FIXME: huh ? No we won't !
                lyxerr[Debug::INFO] << "Will insert file with header" << endl;
-               res = buffer()->readFile(lex, fname, text->cursor.par());
+               res = buffer()->readFile(lex, fname, ParagraphList::iterator(text->cursor.par()));
        } else {
                lyxerr[Debug::INFO] << "Will insert file without header"
                                    << endl;
-               res = buffer()->readLyXformat2(lex, text->cursor.par());
+               res = buffer()->readBody(lex, ParagraphList::iterator(text->cursor.par()));
        }
 
        resize();
@@ -326,184 +337,20 @@ bool BufferView::insertLyXFile(string const & filen)
 }
 
 
-bool BufferView::removeAutoInsets()
-{
-       // keep track of which pos and par the cursor was on
-       Paragraph * cursor_par = text->cursor.par();
-       Paragraph * cursor_par_prev = cursor_par ? cursor_par->previous() : 0;
-       Paragraph * cursor_par_next = cursor_par ? cursor_par->next() : 0;
-       pos_type cursor_pos = text->cursor.pos();
-
-       bool found = false;
-
-       // Trap the deletion of the paragraph the cursor is in.
-       // Iterate until we find a paragraph that won't be immediately deleted.
-       // In reality this should mean we only execute the body of the while
-       // loop once at most.  However for safety we iterate rather than just
-       // make this an if () conditional.
-       while ((cursor_par_prev || cursor_par_next)
-              && text->setCursor(this,
-                                 cursor_par_prev ? cursor_par_prev : cursor_par_next,
-                                 0)) {
-               // We just removed cursor_par so have to fix the "cursor"
-               if (cursor_par_prev) {
-                       // '.' = cursor_par
-                       //  a -> a.
-                       // .
-                       cursor_par = cursor_par_prev;
-                       cursor_pos = cursor_par->size();
-               } else {
-                       // .  -> .a
-                       //  a
-                       cursor_par = cursor_par_next;
-                       cursor_pos = 0;
-               }
-               cursor_par_prev = cursor_par->previous();
-               cursor_par_next = cursor_par->next();
-       }
-
-       // Iterate through the paragraphs removing autoDelete insets as we go.
-       // If the paragraph ends up empty after all the autoDelete insets are
-       // removed that paragraph will be removed by the next setCursor() call.
-       ParIterator it = buffer()->par_iterator_begin();
-       ParIterator end = buffer()->par_iterator_end();
-       for (; it != end; ++it) {
-               Paragraph * par = *it;
-               Paragraph * par_prev = par ? par->previous() : 0;
-               bool removed = false;
-
-               if (text->setCursor(this, par, 0)
-                   && cursor_par == par_prev) {
-                       // The previous setCursor line was deleted and that
-                       // was the cursor_par line.  This can only happen if an
-                       // error box was the sole item on cursor_par.
-                       // It is possible for cursor_par_prev to be stray if
-                       // the line it pointed to only had a error box on it
-                       // so we have to set it to a known correct value.
-                       // This is often the same value it already had.
-                       cursor_par_prev = par->previous();
-                       if (cursor_par_prev) {
-                               // '|' = par, '.' = cursor_par, 'E' = error box
-                               // First step below may occur before while{}
-                               //  a    |a      a     a     a.
-                               //  E -> .E -> |.E -> .  -> |b
-                               // .      b      b    |b
-                               //  b
-                               cursor_par = cursor_par_prev;
-                               cursor_pos = cursor_par_prev->size();
-                               cursor_par_prev = cursor_par->previous();
-                               // cursor_par_next remains the same
-                       } else if (cursor_par_next) {
-                               // First step below may occur before while{}
-                               // .
-                               //  E -> |.E -> |.  -> . -> .|a
-                               //  a      a      a    |a
-                               cursor_par = cursor_par_next;
-                               cursor_pos = 0;
-                               // cursor_par_prev remains unset
-                               cursor_par_next = cursor_par->next();
-                       } else {
-                               // I can't find a way to trigger this
-                               // so it should be unreachable code
-                               // unless the buffer is corrupted.
-                               lyxerr << "BufferView::removeAutoInsets() is bad\n";
-                       }
-               }
-
-               InsetList::iterator pit = par->insetlist.begin();
-               InsetList::iterator pend = par->insetlist.end();
-
-               while (pit != pend) {
-                       if (pit.getInset()->autoDelete()) {
-                               removed = true;
-                               pos_type const pos = pit.getPos();
-
-                               par->erase(pos);
-                               // We just invalidated par's inset iterators so
-                               // we get the next valid iterator position
-                               pit = par->insetlist.insetIterator(pos);
-                               // and ensure we have a valid end iterator.
-                               pend = par->insetlist.end();
-
-                               if (cursor_par == par) {
-                                       // update the saved cursor position
-                                       if (cursor_pos > pos)
-                                               --cursor_pos;
-                               }
-                       } else {
-                               ++pit;
-                       }
-               }
-               if (removed) {
-                       found = true;
-                       text->redoParagraph(this);
-               }
-       }
-
-       // It is possible that the last line is empty if it was cursor_par
-       // and/or only had an error inset on it.  So we set the cursor to the
-       // start of the doc to force its removal and ensure a valid saved cursor
-       if (text->setCursor(this, text->ownerParagraph(), 0)
-           && 0 == cursor_par_next) {
-               cursor_par = cursor_par_prev;
-               cursor_pos = cursor_par->size();
-       } else if (cursor_pos > cursor_par->size()) {
-               // Some C-Enter lines were removed by the setCursor call which
-               // then invalidated cursor_pos. It could still be "wrong" because
-               // the cursor may appear to have jumped but since we collapsed
-               // some C-Enter lines this should be a reasonable compromise.
-               cursor_pos = cursor_par->size();
+void BufferView::showErrorList(string const & action) const
+{
+       if (getErrorList().size()) {
+               string const title = bformat(_("LyX: %1$s errors (%2$s)"), action, buffer()->fileName());
+               owner()->getDialogs().show("errorlist", title);
+               pimpl_->errorlist_.clear();
        }
-
-       // restore the original cursor in its corrected location.
-       text->setCursorIntern(this, cursor_par, cursor_pos);
-
-       return found;
 }
 
 
-void BufferView::insertErrors(TeXErrors & terr)
+ErrorList const &
+BufferView::getErrorList() const
 {
-       // Save the cursor position
-       LyXCursor cursor = text->cursor;
-
-       TeXErrors::Errors::const_iterator cit = terr.begin();
-       TeXErrors::Errors::const_iterator end = terr.end();
-       for (; cit != end; ++cit) {
-               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;
-               int tmppos = -1;
-
-               if (buffer()->texrow.getIdFromRow(errorrow, tmpid, tmppos)) {
-                       buffer()->texrow.increasePos(tmpid, tmppos);
-               }
-
-               Paragraph * texrowpar = 0;
-
-               if (tmpid == -1) {
-                       texrowpar = text->ownerParagraph();
-                       tmppos = 0;
-               } else {
-                       texrowpar = buffer()->getParFromID(tmpid);
-               }
-
-               if (texrowpar == 0)
-                       continue;
-
-               freezeUndo();
-               InsetError * new_inset = new InsetError(msgtxt);
-               text->setCursorIntern(this, texrowpar, tmppos);
-               text->insertInset(this, new_inset);
-               text->fullRebreak(this);
-               unFreezeUndo();
-       }
-       // Restore the cursor position
-       text->setCursorIntern(this, cursor.par(), cursor.pos());
+       return pimpl_->errorlist_;
 }
 
 
@@ -514,44 +361,39 @@ void BufferView::setCursorFromRow(int row)
 
        buffer()->texrow.getIdFromRow(row, tmpid, tmppos);
 
-       Paragraph * texrowpar;
+       ParagraphList::iterator texrowpar;
 
        if (tmpid == -1) {
-               texrowpar = text->ownerParagraph();
+               texrowpar = text->ownerParagraphs().begin();
                tmppos = 0;
        } else {
-               texrowpar = buffer()->getParFromID(tmpid);
+               texrowpar = buffer()->getParFromID(tmpid).pit();
        }
-       text->setCursor(this, texrowpar, tmppos);
+       text->setCursor(texrowpar, tmppos);
 }
 
 
-bool BufferView::insertInset(Inset * inset, string const & lout)
+bool BufferView::insertInset(InsetOld * inset, string const & lout)
 {
        return pimpl_->insertInset(inset, lout);
 }
 
 
-// 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 multiwindow/buffer environment, all the
-// cursors in all the views showing this buffer will move. (Lgb)
-// OK, then no cursor action should be allowed in buffer. (ale)
-bool BufferView::gotoLabel(string const & label)
+void 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();
+               vector<string> labels;
+               it->getLabelList(labels);
                if (find(labels.begin(),labels.end(),label)
                     != labels.end()) {
                        beforeChange(text);
-                       text->setCursor(this, it.getPar(), it.getPos());
+                       text->setCursor(it.getPar(), it.getPos());
                        text->selection.cursor = text->cursor;
-                       update(text, BufferView::SELECT|BufferView::FITCUR);
-                       return true;
+                       update(text, BufferView::SELECT);
+                       return;
                }
        }
-       return false;
 }
 
 
@@ -561,13 +403,12 @@ void BufferView::undo()
                return;
 
        owner()->message(_("Undo"));
-       hideCursor();
        beforeChange(text);
-       update(text, BufferView::SELECT|BufferView::FITCUR);
+       update(text, BufferView::SELECT);
        if (!textUndo(this))
                owner()->message(_("No further undo information"));
        else
-               update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+               update(text, BufferView::SELECT);
        switchKeyMap();
 }
 
@@ -578,36 +419,16 @@ void BufferView::redo()
                return;
 
        owner()->message(_("Redo"));
-       hideCursor();
        beforeChange(text);
-       update(text, BufferView::SELECT|BufferView::FITCUR);
+       update(text, BufferView::SELECT);
        if (!textRedo(this))
                owner()->message(_("No further redo information"));
        else
-               update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+               update(text, BufferView::SELECT);
        switchKeyMap();
 }
 
 
-void BufferView::copyEnvironment()
-{
-       if (available()) {
-               text->copyEnvironmentType();
-               owner()->message(_("Paragraph environment type copied"));
-       }
-}
-
-
-void BufferView::pasteEnvironment()
-{
-       if (available()) {
-               text->pasteEnvironmentType(this);
-               owner()->message(_("Paragraph environment type set"));
-               update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-       }
-}
-
-
 // these functions are for the spellchecker
 WordLangTuple const BufferView::nextWord(float & value)
 {
@@ -616,7 +437,7 @@ WordLangTuple const BufferView::nextWord(float & value)
                return WordLangTuple();
        }
 
-       return text->selectNextWordToSpellcheck(this, value);
+       return text->selectNextWordToSpellcheck(value);
 }
 
 
@@ -626,12 +447,11 @@ void BufferView::selectLastWord()
                return;
 
        LyXCursor cur = text->selection.cursor;
-       hideCursor();
        beforeChange(text);
        text->selection.cursor = cur;
-       text->selectSelectedWord(this);
+       text->selectSelectedWord();
        toggleSelection(false);
-       update(text, BufferView::SELECT|BufferView::FITCUR);
+       update(text, BufferView::SELECT);
 }
 
 
@@ -639,11 +459,10 @@ void BufferView::endOfSpellCheck()
 {
        if (!available()) return;
 
-       hideCursor();
        beforeChange(text);
-       text->selectSelectedWord(this);
+       text->selectSelectedWord();
        text->clearSelection();
-       update(text, BufferView::SELECT|BufferView::FITCUR);
+       update(text, BufferView::SELECT);
 }
 
 
@@ -653,24 +472,27 @@ void BufferView::replaceWord(string const & replacestring)
                return;
 
        LyXText * tt = getLyXText();
-       hideCursor();
-       update(tt, BufferView::SELECT|BufferView::FITCUR);
+       update(tt, BufferView::SELECT);
 
        // clear the selection (if there is any)
        toggleSelection(false);
-       update(tt, BufferView::SELECT|BufferView::FITCUR);
+       update(tt, BufferView::SELECT);
 
        // clear the selection (if there is any)
        toggleSelection(false);
-       tt->replaceSelectionWithString(this, replacestring);
+       tt->replaceSelectionWithString(replacestring);
 
-       tt->setSelectionOverString(this, replacestring);
+       tt->setSelectionRange(replacestring.length());
 
        // Go back so that replacement string is also spellchecked
        for (string::size_type i = 0; i < replacestring.length() + 1; ++i) {
                tt->cursorLeft(this);
        }
-       update(tt, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+       update(tt, BufferView::SELECT);
+
+       // FIXME: should be done through LFUN
+       buffer()->markDirty();
+       fitCursor();
 }
 // End of spellchecker stuff
 
@@ -685,9 +507,10 @@ bool BufferView::lockInset(UpdatableInset * inset)
        if (!theLockingInset()) {
                // first check if it's the inset under the cursor we want lock
                // should be most of the time
-               char const c = text->cursor.par()->getChar(text->cursor.pos());
-               if (c == Paragraph::META_INSET) {
-                       Inset * in = text->cursor.par()->getInset(text->cursor.pos());
+               if (text->cursor.pos() < text->cursor.par()->size()
+                   && text->cursor.par()->getChar(text->cursor.pos()) ==
+                   Paragraph::META_INSET) {
+                       InsetOld * in = text->cursor.par()->getInset(text->cursor.pos());
                        if (inset == in) {
                                theLockingInset(inset);
                                return true;
@@ -701,14 +524,15 @@ bool BufferView::lockInset(UpdatableInset * inset)
                        InsetList::iterator it = pit->insetlist.begin();
                        InsetList::iterator end = pit->insetlist.end();
                        for (; it != end; ++it) {
-                               if (it.getInset() == inset) {
-                                       text->setCursorIntern(this, &*pit, it.getPos());
+                               if (it->inset == inset) {
+                                       text->setCursorIntern(pit, it->pos);
                                        theLockingInset(inset);
                                        return true;
                                }
-                               if (it.getInset()->getInsetFromID(id)) {
-                                       text->setCursorIntern(this, &*pit, it.getPos());
-                                       it.getInset()->edit(this);
+                               if (it->inset->getInsetFromID(id)) {
+                                       text->setCursorIntern(pit, it->pos);
+                                       FuncRequest cmd(this, LFUN_INSET_EDIT, "left");
+                                       it->inset->localDispatch(cmd);
                                        return theLockingInset()->lockInsetInInset(this, inset);
                                }
                        }
@@ -719,44 +543,6 @@ bool BufferView::lockInset(UpdatableInset * inset)
 }
 
 
-void BufferView::showLockedInsetCursor(int x, int y, int asc, int desc)
-{
-       if (available() && theLockingInset() && !theLockingInset()->nodraw()) {
-               LyXCursor cursor = text->cursor;
-               Inset * locking_inset = theLockingInset()->getLockingInset();
-
-               if ((cursor.pos() - 1 >= 0) &&
-                   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 (locking_inset->isTextInset() &&
-                   locking_inset->lyxCode() != Inset::ERT_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.iy() + theLockingInset()->insetInInsetY();
-               screen().showManualCursor(text, x, y, asc, desc,
-                                                 shape);
-       }
-}
-
-
-void BufferView::hideLockedInsetCursor()
-{
-       if (theLockingInset() && available()) {
-               screen().hideCursor();
-       }
-}
-
-
 bool BufferView::fitLockedInsetCursor(int x, int y, int asc, int desc)
 {
        if (theLockingInset() && available()) {
@@ -770,6 +556,12 @@ bool BufferView::fitLockedInsetCursor(int x, int y, int asc, int desc)
 }
 
 
+void BufferView::hideCursor()
+{
+       screen().hideCursor();
+}
+
+
 int BufferView::unlockInset(UpdatableInset * inset)
 {
        if (!inset)
@@ -780,40 +572,28 @@ int BufferView::unlockInset(UpdatableInset * inset)
                // make sure we update the combo !
                owner()->setLayout(getLyXText()->cursor.par()->layout()->name());
                // Tell the paragraph dialog that we changed paragraph
-               owner()->getDialogs().updateParagraph();
+               dispatch(FuncRequest(LFUN_PARAGRAPH_UPDATE));
                finishUndo();
                return 0;
        } else if (inset && theLockingInset() &&
                   theLockingInset()->unlockInsetInInset(this, inset)) {
                // Tell the paragraph dialog that we changed paragraph
-               owner()->getDialogs().updateParagraph();
+               dispatch(FuncRequest(LFUN_PARAGRAPH_UPDATE));
                // owner inset has updated the layout combo
                finishUndo();
                return 0;
        }
-       return bufferlist.unlockInset(inset);
+       return 1;
 }
 
 
-void BufferView::lockedInsetStoreUndo(Undo::undo_kind kind)
+void BufferView::updateInset(InsetOld * inset)
 {
-       if (!theLockingInset())
-               return; // shouldn't happen
-       if (kind == Undo::EDIT) // in this case insets would not be stored!
-               kind = Undo::FINISH;
-       setUndo(this, kind,
-               text->cursor.par(),
-               text->cursor.par()->next());
+       pimpl_->updateInset(inset);
 }
 
 
-void BufferView::updateInset(Inset * inset, bool mark_dirty)
-{
-       pimpl_->updateInset(inset, mark_dirty);
-}
-
-
-bool BufferView::ChangeInsets(Inset::Code code,
+bool BufferView::ChangeInsets(InsetOld::Code code,
                              string const & from, string const & to)
 {
        bool need_update = false;
@@ -825,12 +605,11 @@ bool BufferView::ChangeInsets(Inset::Code code,
        ParIterator end = buffer()->par_iterator_end();
        for (ParIterator it = buffer()->par_iterator_begin();
             it != end; ++it) {
-               Paragraph * par = *it;
                bool changed_inset = false;
-               for (InsetList::iterator it2 = par->insetlist.begin();
-                    it2 != par->insetlist.end(); ++it2) {
-                       if (it2.getInset()->lyxCode() == code) {
-                               InsetCommand * inset = static_cast<InsetCommand *>(it2.getInset());
+               for (InsetList::iterator it2 = it->insetlist.begin();
+                    it2 != it->insetlist.end(); ++it2) {
+                       if (it2->inset->lyxCode() == code) {
+                               InsetCommand * inset = static_cast<InsetCommand *>(it2->inset);
                                if (inset->getContents() == from) {
                                        inset->setContents(to);
                                        changed_inset = true;
@@ -845,14 +624,13 @@ bool BufferView::ChangeInsets(Inset::Code code,
                        // 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);
+                               text->setCursorIntern(it.pit(), 0);
+                               text->redoParagraph(text->cursor.par());
+                               text->partialRebreak();
                        }
                }
        }
-       text->setCursorIntern(this, cursor.par(), cursor.pos());
+       text->setCursorIntern(cursor.par(), cursor.pos());
        return need_update;
 }
 
@@ -860,27 +638,13 @@ bool BufferView::ChangeInsets(Inset::Code code,
 bool BufferView::ChangeRefsIfUnique(string const & from, string const & to)
 {
        // Check if the label 'from' appears more than once
-       vector<string> labels = buffer()->getLabelList();
+       vector<string> labels;
+       buffer()->getLabelList(labels);
 
        if (lyx::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)
-{
-       typedef pair<string, string> StringPair;
-
-       vector<StringPair> keys = buffer()->getBibkeyList();
-       if (count_if(keys.begin(), keys.end(),
-                    lyx::equal_1st_in_pair<StringPair>(from))
-           > 1)
-               return false;
-
-       return ChangeInsets(Inset::CITE_CODE, from, to);
+       return ChangeInsets(InsetOld::REF_CODE, from, to);
 }
 
 
@@ -910,7 +674,7 @@ LyXText * BufferView::getLyXText() const
 }
 
 
-LyXText * BufferView::getParentText(Inset * inset) const
+LyXText * BufferView::getParentText(InsetOld * inset) const
 {
        if (inset->owner()) {
                LyXText * txt = inset->getLyXText(this);
@@ -924,7 +688,7 @@ LyXText * BufferView::getParentText(Inset * inset) const
 }
 
 
-Language const * BufferView::getParentLanguage(Inset * inset) const
+Language const * BufferView::getParentLanguage(InsetOld * inset) const
 {
        LyXText * text = getParentText(inset);
        return text->cursor.par()->getFontSettings(buffer()->params,
@@ -938,8 +702,9 @@ Encoding const * BufferView::getEncoding() const
        if (!t)
                return 0;
 
-       LyXCursor const & c= t->cursor;
-       LyXFont const font = c.par()->getFont(buffer()->params, c.pos());
+       LyXCursor const & c = t->cursor;
+       LyXFont const font = c.par()->getFont(buffer()->params, c.pos(),
+                                             outerFont(c.par(), t->ownerParagraphs()));
        return font.language()->encoding();
 }