]> git.lyx.org Git - lyx.git/blobdiff - src/BufferView2.C
include shuffling and a mathed compile fix
[lyx.git] / src / BufferView2.C
index bd3c8e42012b8cc4164c1c8e5c5afbfbbe7c2bd9..2fad793b7bab3817cda0e9e9499d4b671c6bcb04 100644 (file)
@@ -1,40 +1,52 @@
-// -*- 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 "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 "minibuffer.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 "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;
 
 using std::pair;
 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)
@@ -48,76 +60,82 @@ 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!"),
+               Alert::alert(_("Error!"),
                           _("Specified file is unreadable: "),
                           MakeDisplayPath(fname, 50));
                return false;
        }
        
-       beforeChange();
+       beforeChange(text);
 
        ifstream ifs(fname.c_str());
        if (!ifs) {
-               WriteAlert(_("Error!"),
+               Alert::alert(_("Error!"),
                           _("Cannot open specified file: "),
                           MakeDisplayPath(fname, 50));
                return false;
        }
+       
+       int const c = ifs.peek();
+       
        LyXLex lex(0, 0);
        lex.setStream(ifs);
-       char c; ifs.get(c);
-       ifs.putback(c);
 
        bool res = true;
 
        if (c == '#') {
-               lyxerr.debug() << "Will insert file with header" << endl;
-               res = buffer()->readFile(lex, text->cursor.par);
+               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;
-               res = buffer()->readLyXformat2(lex, text->cursor.par);
+               lyxerr[Debug::INFO] << "Will insert file without header" 
+                                   << endl;
+               res = buffer()->readLyXformat2(lex, text->cursor.par());
        }
 
        resize();
        return res;
 }
 
+
 bool BufferView::removeAutoInsets()
 {
-       LyXParagraph * par = buffer()->paragraph;
-
-       LyXCursor cursor = text->cursor;
-       LyXCursor tmpcursor = cursor;
-       cursor.par = tmpcursor.par->ParFromPos(tmpcursor.pos);
-       cursor.pos = tmpcursor.par->PositionInParFromPos(tmpcursor.pos);
-
-       bool a = false;
-       while (par) {
-               if (par->AutoDeleteInsets()){
-                       a = true;
-                       if (par->footnoteflag != LyXParagraph::CLOSED_FOOTNOTE){
-                               // this is possible now, since SetCursor takes
-                               // care about footnotes
-                               text->SetCursorIntern(par, 0);
-                               text->RedoParagraphs(text->cursor,
-                                                    text->cursor.par->Next());
-                               text->FullRebreak();
+       LyXCursor tmpcursor = text->cursor;
+       LyXCursor cursor;
+       bool found = false;
+
+       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
+               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 (cursor.pos > cursor.par->Last())
-               cursor.pos = cursor.par->Last();
-       text->SetCursorIntern(cursor.par, cursor.pos);
+       if (tmpcursor.pos() > tmpcursor.par()->size())
+               tmpcursor.pos(tmpcursor.par()->size());
+
+       text->setCursorIntern(this, tmpcursor.par(), tmpcursor.pos());
 
-       return a;
+       return found;
 }
 
 
@@ -126,43 +144,41 @@ void BufferView::insertErrors(TeXErrors & terr)
        // Save the cursor position
        LyXCursor cursor = text->cursor;
 
-       // This is drastic, but it's the only fix, I could find. (Asger)
-       allFloats(1, 0);
-       allFloats(1, 1);
-
        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; 
                int tmppos = -1;
 
-               buffer()->texrow.getIdFromRow(errorrow, tmpid, tmppos);
-
-               LyXParagraph * texrowpar = 0;
+               if (buffer()->texrow.getIdFromRow(errorrow, tmpid, tmppos)) {
+                       buffer()->texrow.increasePos(tmpid, tmppos);
+               }
+               
+               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(texrowpar, tmppos);
-               text->InsertInset(new_inset);
-               text->FullRebreak();
+               text->setCursorIntern(this, texrowpar, tmppos);
+               text->insertInset(this, new_inset);
+               text->fullRebreak(this);
        }
        // Restore the cursor position
-       text->SetCursorIntern(cursor.par, cursor.pos);
+       text->setCursorIntern(this, cursor.par(), cursor.pos());
 }
 
 
@@ -173,100 +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(texrowpar, tmppos);
+       text->setCursor(this, texrowpar, tmppos);
 }
 
-void BufferView::insertInset(Inset * inset, string const & lout,
-                        bool no_table)
-{
-       // check for table/list in tables
-       if (no_table && text->cursor.par->table){
-               WriteAlert(_("Impossible Operation!"),
-                          _("Cannot insert table/list in table."),
-                          _("Sorry."));
-               return;
-       }
-       // not quite sure if we want this...
-       text->SetCursorParUndo();
-       text->FreezeUndo();
-       
-       beforeChange();
-       if (!lout.empty()) {
-               update(-2);
-               text->BreakParagraph();
-               update(-1);
-               
-               if (text->cursor.par->Last()) {
-                       text->CursorLeft();
-                       
-                       text->BreakParagraph();
-                       update(-1);
-               }
-
-               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(lay);
-               
-               text->SetParagraph(0, 0,
-                                  0, 0,
-                                  VSpace(VSpace::NONE), VSpace(VSpace::NONE),
-                                  LYX_ALIGN_LAYOUT, 
-                                  string(),
-                                  0);
-               update(-1);
-               
-               text->current_font.setLatex(LyXFont::OFF);
-       }
-       
-       text->InsertInset(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())
-                       text->CursorRight();
-               else
-                       text->CursorLeft();
-       }
-#endif
-       update(-1);
 
-       text->UnFreezeUndo();   
-}
-
-
-// Open and lock an updatable inset
-void BufferView::open_new_inset(UpdatableInset * new_inset)
+bool BufferView::insertInset(Inset * inset, string const & lout)
 {
-       beforeChange();
-       text->FinishUndo();
-       insertInset(new_inset);
-       text->CursorLeft();
-       update(1);
-       new_inset->Edit(this, 0, 0, 0);
+       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 multiwindo/buffer environment, all the
@@ -275,160 +215,33 @@ void BufferView::open_new_inset(UpdatableInset * new_inset)
 bool BufferView::gotoLabel(string const & label)
 
 {
-        LyXParagraph * par = buffer()->paragraph;
-        LyXParagraph::size_type pos;
-        Inset * inset;
-        while (par) {
-                pos = -1;
-                while ((inset = par->ReturnNextInsetPointer(pos))){     
-                        for (int i = 0; i < inset->GetNumberOfLabels(); ++i) {
-                               if (label == inset->getLabel(i)) {
-                                       beforeChange();
-                                       text->SetCursor(par, pos);
-                                       text->sel_cursor = text->cursor;
-                                       update(0);
-                                       return true;
-                               }
-                       }
-                        ++pos;
-                } 
-                par = par->next;
-       }
-       return false;
-}
-
-void BufferView::allFloats(char flag, char figmar)
-{
-       if (!available()) return;
-
-       LyXCursor cursor = text->cursor;
-
-       if (!flag && cursor.par->footnoteflag != LyXParagraph::NO_FOOTNOTE
-           && ((figmar 
-                && cursor.par->footnotekind != LyXParagraph::FOOTNOTE 
-                && cursor.par->footnotekind != LyXParagraph::MARGIN)
-               || (!figmar
-                   && cursor.par->footnotekind != LyXParagraph::FIG 
-                   && cursor.par->footnotekind != LyXParagraph::TAB
-                   && cursor.par->footnotekind != LyXParagraph::WIDE_FIG 
-                   && cursor.par->footnotekind != LyXParagraph::WIDE_TAB
-                   && cursor.par->footnotekind != LyXParagraph::ALGORITHM)))
-               toggleFloat();
-       else
-               beforeChange();
-
-       LyXCursor tmpcursor = cursor;
-       cursor.par = tmpcursor.par->ParFromPos(tmpcursor.pos);
-       cursor.pos = tmpcursor.par->PositionInParFromPos(tmpcursor.pos);
-
-       LyXParagraph *par = buffer()->paragraph;
-       while (par) {
-               if (flag) {
-                       if (par->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE
-                           && ((figmar 
-                                && par->footnotekind != LyXParagraph::FOOTNOTE 
-                                && par->footnotekind !=  LyXParagraph::MARGIN)
-                               || (!figmar
-                                   && par->footnotekind != LyXParagraph::FIG 
-                                   && par->footnotekind != LyXParagraph::TAB
-                                   && par->footnotekind != LyXParagraph::WIDE_FIG 
-                                   && par->footnotekind != LyXParagraph::WIDE_TAB
-                                   && par->footnotekind != LyXParagraph::ALGORITHM
-                                       )
-                                   )
-                               ) {
-                               if (par->previous
-                                   && par->previous->footnoteflag != 
-                                   LyXParagraph::CLOSED_FOOTNOTE){ /* should be */ 
-                                       text->SetCursorIntern(par->previous,
-                                                             0);
-                                       text->OpenFootnote();
-                               }
-                       }
-               } else {
-                       if (par->footnoteflag == LyXParagraph::OPEN_FOOTNOTE
-                           && (
-                                   (figmar 
-                                    &&
-                                    par->footnotekind != LyXParagraph::FOOTNOTE 
-                                    &&
-                                    par->footnotekind !=  LyXParagraph::MARGIN
-                                           )
-                                   ||
-                                   (!figmar
-                                    &&
-                                    par->footnotekind != LyXParagraph::FIG 
-                                    &&
-                                    par->footnotekind != LyXParagraph::TAB
-                                    &&
-                                    par->footnotekind != LyXParagraph::WIDE_FIG 
-                                    &&
-                                    par->footnotekind != LyXParagraph::WIDE_TAB
-                                    &&
-                                    par->footnotekind != LyXParagraph::ALGORITHM
-                                           )
-                                   )
-                               ) {
-                               text->SetCursorIntern(par, 0);
-                               text->CloseFootnote();
-                       }
+       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)
+                    != labels.end()) {
+                       beforeChange(text);
+                       text->setCursor(this, it.getPar(), it.getPos());
+                       text->selection.cursor = text->cursor;
+                       update(text, BufferView::SELECT|BufferView::FITCUR);
+                       return true;
                }
-               par = par->next;
-       }
-
-       text->SetCursorIntern(cursor.par, cursor.pos);
-       redraw();
-       fitCursor();
-       updateScrollbar();
-}
-
-
-void BufferView::insertNote()
-{
-       InsetInfo * new_inset = new InsetInfo();
-       insertInset(new_inset);
-       new_inset->Edit(this, 0, 0, 0);
-}
-
-
-void BufferView::openStuff()
-{
-       if (available()) {
-               owner()->getMiniBuffer()->Set(_("Open/Close..."));
-               hideCursor();
-               beforeChange();
-               update(-2);
-               text->OpenStuff();
-               update(0);
-               setState();
        }
+       return false;
 }
 
 
-void BufferView::toggleFloat()
-{
-       if (available()) {
-               owner()->getMiniBuffer()->Set(_("Open/Close..."));
-               hideCursor();
-               beforeChange();
-               update(-2);
-               text->ToggleFootnote();
-               update(0);
-               setState();
-       }
-}
-
 void BufferView::menuUndo()
 {
        if (available()) {
-               owner()->getMiniBuffer()->Set(_("Undo"));
+               owner()->message(_("Undo"));
                hideCursor();
-               beforeChange();
-               update(-2);
-               if (!text->TextUndo())
-                       owner()->getMiniBuffer()->Set(_("No further undo information"));
+               beforeChange(text);
+               update(text, BufferView::SELECT|BufferView::FITCUR);
+               if (!textUndo(this))
+                       owner()->message(_("No further undo information"));
                else
-                       update(-1);
+                       update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                setState();
        }
 }
@@ -436,126 +249,30 @@ 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(-2);
-               if (!text->TextRedo())
-                       owner()->getMiniBuffer()->Set(_("No further redo information"));
+               beforeChange(text);
+               update(text, BufferView::SELECT|BufferView::FITCUR);
+               if (!textRedo(this))
+                       owner()->message(_("No further redo information"));
                else
-                       update(-1);
+                       update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                setState();
        }
 }
 
 
-void BufferView::hyphenationPoint()
-{
-       if (available()) {
-               hideCursor();
-               update(-2);
-               InsetSpecialChar * new_inset = 
-                       new InsetSpecialChar(InsetSpecialChar::HYPHENATION);
-               insertInset(new_inset);
-       }
-}
-
-
-void BufferView::ldots()
-{
-       if (available())  {
-               hideCursor();
-               update(-2);
-               InsetSpecialChar * new_inset = 
-                       new InsetSpecialChar(InsetSpecialChar::LDOTS);
-               insertInset(new_inset);
-       }
-}
-
-
-void BufferView::endOfSentenceDot()
-{
-       if (available()) {
-               hideCursor();
-               update(-2);
-               InsetSpecialChar * new_inset = 
-                       new InsetSpecialChar(InsetSpecialChar::END_OF_SENTENCE);
-               insertInset(new_inset);
-       }
-}
-
-
-void BufferView::menuSeparator()
-{
-       if (available()) {
-               hideCursor();
-               update(-2);
-               InsetSpecialChar * new_inset = 
-                       new InsetSpecialChar(InsetSpecialChar::MENU_SEPARATOR);
-               insertInset(new_inset);
-       }
-}
-
-
-void BufferView::newline()
-{
-       if (available()) {
-               hideCursor();
-               update(-2);
-#if 0
-               InsetSpecialChar * new_inset =
-                       new InsetSpecialChar(InsetSpecialChar::NEWLINE);
-               insertInset(new_inset);
-#else
-               text->InsertChar(LyXParagraph::META_NEWLINE);
-               update(-1);
-#endif
-       }
-}
-
-
-void BufferView::protectedBlank()
-{
-       if (available()) {
-               hideCursor();
-               update(-2);
-#if 1
-               InsetSpecialChar * new_inset =
-                       new InsetSpecialChar(InsetSpecialChar::PROTECTED_SEPARATOR);
-               insertInset(new_inset);
-#else
-               text->InsertChar(LyXParagraph::META_PROTECTED_SEPARATOR);
-               update(-1);
-#endif
-       }
-}
-
-
-void BufferView::hfill()
-{
-       if (available()) {
-               hideCursor();
-               update(-2);
-               text->InsertChar(LyXParagraph::META_HFILL);
-               update(-1);
-       }
-}
-
 void BufferView::copyEnvironment()
 {
        if (available()) {
                text->copyEnvironmentType();
-               // clear the selection, even if mark_set
-               toggleSelection();
-               text->ClearSelection();
-               update(-2);
-               owner()->getMiniBuffer()->Set(_("Paragraph environment type copied"));
+               owner()->message(_("Paragraph environment type copied"));
        }
 }
 
@@ -563,9 +280,9 @@ void BufferView::copyEnvironment()
 void BufferView::pasteEnvironment()
 {
        if (available()) {
-               text->pasteEnvironmentType();
-               owner()->getMiniBuffer()->Set(_("Paragraph environment type set"));
-               update(1);
+               text->pasteEnvironmentType(this);
+               owner()->message(_("Paragraph environment type set"));
+               update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
        }
 }
 
@@ -573,23 +290,20 @@ void BufferView::pasteEnvironment()
 void BufferView::copy()
 {
        if (available()) {
-               text->CopySelection();
-               // clear the selection, even if mark_set
-               toggleSelection();
-               text->ClearSelection();
-               update(-2);
-               owner()->getMiniBuffer()->Set(_("Copy"));
+               text->copySelection(this);
+               owner()->message(_("Copy"));
        }
 }
 
-void BufferView::cut()
+
+void BufferView::cut(bool realcut)
 {
        if (available()) {
                hideCursor();
-               update(-2);
-               text->CutSelection();
-               update(1);
-               owner()->getMiniBuffer()->Set(_("Cut"));
+               update(text, BufferView::SELECT|BufferView::FITCUR);
+               text->cutSelection(this, true, realcut);
+               update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+               owner()->message(_("Cut"));
        }
 }
 
@@ -597,79 +311,35 @@ void BufferView::cut()
 void BufferView::paste()
 {
        if (!available()) return;
-       
-       owner()->getMiniBuffer()->Set(_("Paste"));
+
+       owner()->message(_("Paste"));
+
        hideCursor();
        // clear the selection
        toggleSelection();
-       text->ClearSelection();
-       update(-2);
+       text->clearSelection();
+       update(text, BufferView::SELECT|BufferView::FITCUR);
        
        // paste
-       text->PasteSelection();
-       update(1);
+       text->pasteSelection(this);
+       update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
        
        // clear the selection 
        toggleSelection();
-       text->ClearSelection();
-       update(-2);
-}
-
-
-void BufferView::gotoNote()
-{
-       if (!available()) return;
-   
-       hideCursor();
-       beforeChange();
-       update(-2);
-       LyXCursor tmp;
-   
-       if (!text->GotoNextNote()) {
-               if (text->cursor.pos 
-                   || text->cursor.par != text->FirstParagraph()) {
-                               tmp = text->cursor;
-                               text->cursor.par = text->FirstParagraph();
-                               text->cursor.pos = 0;
-                               if (!text->GotoNextNote()) {
-                                       text->cursor = tmp;
-                                       owner()->getMiniBuffer()->Set(_("No more notes"));
-                                       LyXBell();
-                               }
-                       } else {
-                               owner()->getMiniBuffer()->Set(_("No more notes"));
-                               LyXBell();
-                       }
-       }
-       update(0);
-       text->sel_cursor = text->cursor;
-}
-
-
-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));
+       text->clearSelection();
+       update(text, BufferView::SELECT|BufferView::FITCUR);
 }
 
 
 /* these functions are for the spellchecker */ 
-char * BufferView::nextWord(float & value)
+string const BufferView::nextWord(float & value)
 {
        if (!available()) {
                value = 1;
-               return 0;
+               return string();
        }
 
-       char * string = text->SelectNextWord(value);
-
-       return string;
+       return text->selectNextWordToSpellcheck(this, value);
 }
 
   
@@ -677,11 +347,13 @@ void BufferView::selectLastWord()
 {
        if (!available()) return;
    
+       LyXCursor cur = text->selection.cursor;
        hideCursor();
-       beforeChange();
-       text->SelectSelectedWord();
+       beforeChange(text);
+       text->selection.cursor = cur;
+       text->selectSelectedWord(this);
        toggleSelection(false);
-       update(0);
+       update(text, BufferView::SELECT|BufferView::FITCUR);
 }
 
 
@@ -690,10 +362,10 @@ void BufferView::endOfSpellCheck()
        if (!available()) return;
    
        hideCursor();
-       beforeChange();
-       text->SelectSelectedWord();
-       text->ClearSelection();
-       update(0);
+       beforeChange(text);
+       text->selectSelectedWord(this);
+       text->clearSelection();
+       update(text, BufferView::SELECT|BufferView::FITCUR);
 }
 
 
@@ -701,65 +373,87 @@ void BufferView::replaceWord(string const & replacestring)
 {
        if (!available()) return;
 
+       LyXText * tt = getLyXText();
        hideCursor();
-       update(-2);
+       update(tt, BufferView::SELECT|BufferView::FITCUR);
    
        /* clear the selection (if there is any) */ 
        toggleSelection(false);
-       update(-2);
+       update(tt, BufferView::SELECT|BufferView::FITCUR);
    
        /* clear the selection (if there is any) */ 
        toggleSelection(false);
-       text->ReplaceSelectionWithString(replacestring.c_str());
+       tt->replaceSelectionWithString(this, replacestring);
    
-       text->SetSelectionOverString(replacestring.c_str());
+       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->CursorLeftIntern();
+               tt->cursorLeft(this);
        }
-       update(1);
+       update(tt, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 }
 // End of spellchecker stuff
 
 
-
-/* these functions return 1 if an error occured, 
-   otherwise 0 */
-int BufferView::lockInset(UpdatableInset * inset)
+bool BufferView::lockInset(UpdatableInset * inset)
 {
-       if (!the_locking_inset && inset){
-               the_locking_inset = inset;
-               return 0;
+       // 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 1;
+       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()) {
-               y += text->cursor.y +
-                   the_locking_inset->InsetInInsetY();
-               pimpl_->screen->ShowManualCursor(x, y, asc, desc,
-                                        LyXScreen::BAR_SHAPE);
+       if (available() && theLockingInset()) {
+               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.y() + theLockingInset()->insetInInsetY();
+               pimpl_->screen_->showManualCursor(text, x, y, asc, desc,
+                                                 shape);
        }
 }
 
 
 void BufferView::hideLockedInsetCursor()
 {
-       if (the_locking_inset && available()) {
-               pimpl_->screen->HideCursor();
+       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;
-               if (pimpl_->screen->FitManualCursor(x, y, asc, desc))
+       if (theLockingInset() && available()) {
+               y += text->cursor.y() + theLockingInset()->insetInInsetY();
+               if (pimpl_->screen_->fitManualCursor(text, this, x, y, asc, desc))
                        updateScrollbar();
        }
 }
@@ -767,14 +461,17 @@ void BufferView::fitLockedInsetCursor(long x, long y, int asc, int desc)
 
 int BufferView::unlockInset(UpdatableInset * inset)
 {
-       if (inset && the_locking_inset == inset) {
-               inset->InsetUnlock(this);
-               the_locking_inset = 0;
-               text->FinishUndo();
+       if (inset && theLockingInset() == inset) {
+               inset->insetUnlock(this);
+               theLockingInset(0);
+               // make sure we update the combo !
+               owner()->setLayout(getLyXText()->cursor.par()->getLayout());
+               finishUndo();
                return 0;
-       } else if (inset && the_locking_inset &&
-                  the_locking_inset->UnlockInsetInInset(this, inset)) {
-               text->FinishUndo();
+       } else if (inset && theLockingInset() &&
+                  theLockingInset()->unlockInsetInInset(this, inset)) {
+               // owner inset has updated the layout combo 
+               finishUndo();
                return 0;
        }
        return bufferlist.unlockInset(inset);
@@ -783,62 +480,133 @@ 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(kind,
-                     text->cursor.par->
-                     ParFromPos(text->cursor.pos)->previous, 
-                     text->cursor.par->
-                     ParFromPos(text->cursor.pos)->next);
+       setUndo(this, kind,
+               text->cursor.par(),
+               text->cursor.par()->next());
 }
 
 
 void BufferView::updateInset(Inset * inset, bool mark_dirty)
 {
-       if (!inset)
-               return;
+       pimpl_->updateInset(inset, mark_dirty);
+}
+
 
-       // first check for locking insets
-       if (the_locking_inset) {
-               if (the_locking_inset == inset) {
-                       if (text->UpdateInset(inset)){
-                               update();
-                               if (mark_dirty){
-                                       if (buffer()->isLyxClean())
-                                               owner()->getMiniBuffer()->
-                                                       setTimer(4);
-                                       buffer()->markDirty();
+bool BufferView::ChangeInsets(Inset::Code code,
+                             string const & from, string const & to)
+{
+       bool need_update = false;
+       LyXCursor cursor = text->cursor;
+       LyXCursor tmpcursor = cursor;
+       cursor.par(tmpcursor.par());
+       cursor.pos(tmpcursor.pos());
+
+       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);
+                                       changed_inset = true;
                                }
-                               updateScrollbar();
-                               return;
                        }
-               } else if (the_locking_inset->UpdateInsetInInset(this,inset)) {
-                       if (text->UpdateInset(the_locking_inset)) {
-                               update();
-                               if (mark_dirty){
-                                       if (buffer()->isLyxClean())
-                                               owner()->getMiniBuffer()->
-                                                       setTimer(4);
-                                       buffer()->markDirty();
-                               }
-                               updateScrollbar();
-                               return;
+               }
+               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);
                        }
                }
        }
-  
-       // then check the current buffer
-       if (available()) {
-               hideCursor();
-               update(-3);
-               if (text->UpdateInset(inset)){
-                       if (mark_dirty)
-                               update(1);
-                       else 
-                               update(3);
-                       return;
-               }
+       text->setCursorIntern(this, cursor.par(), cursor.pos());
+       return need_update;
+}
+
+
+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();
 }