]> git.lyx.org Git - lyx.git/blobdiff - src/BufferView2.C
include shuffling and a mathed compile fix
[lyx.git] / src / BufferView2.C
index 7f75d306c7fbab8e78ae0ade0f102caa9e450ff9..2fad793b7bab3817cda0e9e9499d4b671c6bcb04 100644 (file)
@@ -1,36 +1,41 @@
-// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  * 
  *           LyX, The Document Processor
  *        
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
 #include <config.h>
 
-#include <fstream>
-#include <algorithm>
-
 #include "BufferView.h"
 #include "buffer.h"
 #include "lyxcursor.h"
 #include "lyxtext.h"
-#include "insets/inseterror.h"
-#include "insets/insetinfo.h"
-#include "insets/insetspecialchar.h"
 #include "LyXView.h"
-#include "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;
 
@@ -39,6 +44,9 @@ 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,29 +60,29 @@ 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;
        }
        
-       char c = ifs.peek();
+       int const c = ifs.peek();
        
        LyXLex lex(0, 0);
        lex.setStream(ifs);
@@ -82,10 +90,11 @@ bool BufferView::insertLyXFile(string const & filen)
        bool res = true;
 
        if (c == '#') {
-               lyxerr.debug() << "Will insert file with header" << endl;
+               lyxerr[Debug::INFO] << "Will insert file with header" << endl;
                res = buffer()->readFile(lex, text->cursor.par());
        } else {
-               lyxerr.debug() << "Will insert file without header" << endl;
+               lyxerr[Debug::INFO] << "Will insert file without header" 
+                                   << endl;
                res = buffer()->readLyXformat2(lex, text->cursor.par());
        }
 
@@ -93,40 +102,40 @@ bool BufferView::insertLyXFile(string const & filen)
        return res;
 }
 
+
 bool BufferView::removeAutoInsets()
 {
-       LyXParagraph * par = buffer()->paragraph;
-
        LyXCursor tmpcursor = text->cursor;
        LyXCursor cursor;
+       bool found = false;
 
-       bool a = false;
-       while (par) {
+       ParIterator end = buffer()->par_iterator_end();
+       for (ParIterator it = buffer()->par_iterator_begin();
+            it != end; ++it) {
+               Paragraph * par = *it;
                // this has to be done before the delete
-#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){
+               if (par->autoDeleteInsets()) {
+                       found = true;
+#ifdef WITH_WARNINGS
+#warning FIXME
 #endif
-                               text->RedoParagraphs(this, cursor,
-                                                    cursor.par()->Next());
-                               text->FullRebreak(this);
-#ifndef NEW_INSETS
+                       // 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);
                        }
-#endif
                }
-               par = par->next;
        }
+
        // avoid forbidden cursor positions caused by error removing
-       if (tmpcursor.pos() > tmpcursor.par()->Last())
-               tmpcursor.pos(tmpcursor.par()->Last());
-       text->SetCursorIntern(this, tmpcursor.par(), tmpcursor.pos());
+       if (tmpcursor.pos() > tmpcursor.par()->size())
+               tmpcursor.pos(tmpcursor.par()->size());
+
+       text->setCursorIntern(this, tmpcursor.par(), tmpcursor.pos());
 
-       return a;
+       return found;
 }
 
 
@@ -135,19 +144,13 @@ void BufferView::insertErrors(TeXErrors & terr)
        // Save the cursor position
        LyXCursor cursor = text->cursor;
 
-#ifndef NEW_INSETS
-       // This is drastic, but it's the only fix, I could find. (Asger)
-       allFloats(1, 0);
-       allFloats(1, 1);
-#endif
-
        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; 
@@ -157,25 +160,25 @@ void BufferView::insertErrors(TeXErrors & terr)
                        buffer()->texrow.increasePos(tmpid, tmppos);
                }
                
-               LyXParagraph * texrowpar = 0;
+               Paragraph * texrowpar = 0;
 
                if (tmpid == -1) {
-                       texrowpar = text->FirstParagraph();
+                       texrowpar = text->firstParagraph();
                        tmppos = 0;
                } else {
-                       texrowpar = text->GetParFromID(tmpid);
+                       texrowpar = buffer()->getParFromID(tmpid);
                }
 
                if (texrowpar == 0)
                        continue;
 
                InsetError * new_inset = new InsetError(msgtxt);
-               text->SetCursorIntern(this, texrowpar, tmppos);
-               text->InsertInset(this, new_inset);
-               text->FullRebreak(this);
+               text->setCursorIntern(this, texrowpar, tmppos);
+               text->insertInset(this, new_inset);
+               text->fullRebreak(this);
        }
        // Restore the cursor position
-       text->SetCursorIntern(this, cursor.par(), cursor.pos());
+       text->setCursorIntern(this, cursor.par(), cursor.pos());
 }
 
 
@@ -186,92 +189,24 @@ void BufferView::setCursorFromRow(int row)
 
        buffer()->texrow.getIdFromRow(row, tmpid, tmppos);
 
-       LyXParagraph * texrowpar;
+       Paragraph * texrowpar;
 
        if (tmpid == -1) {
-               texrowpar = text->FirstParagraph();
+               texrowpar = text->firstParagraph();
                tmppos = 0;
        } else {
-               texrowpar = text->GetParFromID(tmpid);
+               texrowpar = buffer()->getParFromID(tmpid);
        }
-       text->SetCursor(this, texrowpar, tmppos);
+       text->setCursor(this, texrowpar, tmppos);
 }
 
 
-bool BufferView::insertInset(Inset * inset, string const & lout,
-                            bool /*no_table*/)
+bool BufferView::insertInset(Inset * inset, string const & lout)
 {
-       // if we are in a locking inset we should try to insert the
-       // inset there otherwise this is a illegal function now
-       if (theLockingInset()) {
-               if (theLockingInset()->InsertInsetAllowed(inset))
-                   return theLockingInset()->InsertInset(this, inset);
-               return false;
-       }
-
-       // not quite sure if we want this...
-       text->SetCursorParUndo(buffer());
-       text->FreezeUndo();
-       
-       beforeChange();
-       if (!lout.empty()) {
-               update(BufferView::SELECT|BufferView::FITCUR);
-               text->BreakParagraph(this);
-               update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-               
-               if (text->cursor.par()->Last()) {
-                       text->CursorLeft(this);
-                       
-                       text->BreakParagraph(this);
-                       update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-               }
-
-               pair<bool, LyXTextClass::size_type> lres =
-                       textclasslist.NumberOfLayout(buffer()->params
-                                                    .textclass, lout);
-               LyXTextClass::size_type lay;
-               if (lres.first != false) {
-                       // layout found
-                       lay = lres.second;
-               } else {
-                       // layout not fount using default "Standard" (0)
-                       lay = 0;
-               }
-                
-               text->SetLayout(this, lay);
-               
-               text->SetParagraph(this, 0, 0,
-                                  0, 0,
-                                  VSpace(VSpace::NONE), VSpace(VSpace::NONE),
-                                  LYX_ALIGN_LAYOUT, 
-                                  string(),
-                                  0);
-               update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-               
-               text->current_font.setLatex(LyXFont::OFF);
-       }
-       
-       text->InsertInset(this, inset);
-       update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-
-       text->UnFreezeUndo();
-       return true;
+       return pimpl_->insertInset(inset, lout);
 }
 
 
-// Open and lock an updatable inset
-bool BufferView::open_new_inset(UpdatableInset * new_inset)
-{
-       beforeChange();
-       text->FinishUndo();
-       if (!insertInset(new_inset))
-               return false;
-       text->CursorLeft(this);
-       update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-       new_inset->Edit(this, 0, 0, 0);
-       return true;
-}
-
 /* This is also a buffer property (ale) */
 // Not so sure about that. a goto Label function can not be buffer local, just
 // think how this will work in a multiwindo/buffer environment, all the
@@ -283,12 +218,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();
-                       text->SetCursor(this, it.getPar(), it.getPos());
-                       text->sel_cursor = text->cursor;
-                       update(BufferView::SELECT|BufferView::FITCUR);
+                       beforeChange(text);
+                       text->setCursor(this, it.getPar(), it.getPos());
+                       text->selection.cursor = text->cursor;
+                       update(text, BufferView::SELECT|BufferView::FITCUR);
                        return true;
                }
        }
@@ -296,144 +231,17 @@ bool BufferView::gotoLabel(string const & label)
 }
 
 
-#ifndef NEW_INSETS
-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(this, 
-                                                             par->previous,
-                                                             0);
-                                       text->OpenFootnote(this);
-                               }
-                       }
-               } 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(this, par, 0);
-                               text->CloseFootnote(this);
-                       }
-               }
-               par = par->next;
-       }
-
-       text->SetCursorIntern(this, cursor.par(), cursor.pos());
-       redraw();
-       fitCursor(text);
-}
-#endif
-
-
-void BufferView::insertNote()
-{
-       InsetInfo * new_inset = new InsetInfo();
-       insertInset(new_inset);
-       new_inset->Edit(this, 0, 0, 0);
-}
-
-
-#ifndef NEW_INSETS
-void BufferView::openStuff()
-{
-       if (available()) {
-               owner()->getMiniBuffer()->Set(_("Open/Close..."));
-               hideCursor();
-               beforeChange();
-               update(BufferView::SELECT|BufferView::FITCUR);
-               text->OpenStuff(this);
-               update(BufferView::SELECT|BufferView::FITCUR);
-               setState();
-       }
-}
-
-
-void BufferView::toggleFloat()
-{
-       if (available()) {
-               owner()->getMiniBuffer()->Set(_("Open/Close..."));
-               hideCursor();
-               beforeChange();
-               update(BufferView::SELECT|BufferView::FITCUR);
-               text->ToggleFootnote(this);
-               update(BufferView::SELECT|BufferView::FITCUR);
-               setState();
-       }
-}
-#endif
-
 void BufferView::menuUndo()
 {
        if (available()) {
-               owner()->getMiniBuffer()->Set(_("Undo"));
+               owner()->message(_("Undo"));
                hideCursor();
-               beforeChange();
-               update(BufferView::SELECT|BufferView::FITCUR);
-               if (!text->TextUndo(this))
-                       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(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+                       update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                setState();
        }
 }
@@ -442,114 +250,29 @@ void BufferView::menuUndo()
 void BufferView::menuRedo()
 {
        if (theLockingInset()) {
-               owner()->getMiniBuffer()->Set(_("Redo not yet supported in math mode"));
+               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);
-               if (!text->TextRedo(this))
-                       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(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+                       update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                setState();
        }
 }
 
 
-void BufferView::hyphenationPoint()
-{
-       if (available()) {
-               hideCursor();
-               update(BufferView::SELECT|BufferView::FITCUR);
-               InsetSpecialChar * new_inset = 
-                       new InsetSpecialChar(InsetSpecialChar::HYPHENATION);
-               insertInset(new_inset);
-       }
-}
-
-
-void BufferView::ldots()
-{
-       if (available())  {
-               hideCursor();
-               update(BufferView::SELECT|BufferView::FITCUR);
-               InsetSpecialChar * new_inset = 
-                       new InsetSpecialChar(InsetSpecialChar::LDOTS);
-               insertInset(new_inset);
-       }
-}
-
-
-void BufferView::endOfSentenceDot()
-{
-       if (available()) {
-               hideCursor();
-               update(BufferView::SELECT|BufferView::FITCUR);
-               InsetSpecialChar * new_inset = 
-                       new InsetSpecialChar(InsetSpecialChar::END_OF_SENTENCE);
-               insertInset(new_inset);
-       }
-}
-
-
-void BufferView::menuSeparator()
-{
-       if (available()) {
-               hideCursor();
-               update(BufferView::SELECT|BufferView::FITCUR);
-               InsetSpecialChar * new_inset = 
-                       new InsetSpecialChar(InsetSpecialChar::MENU_SEPARATOR);
-               insertInset(new_inset);
-       }
-}
-
-
-void BufferView::newline()
-{
-       if (available()) {
-               hideCursor();
-               update(BufferView::SELECT|BufferView::FITCUR);
-               text->InsertChar(this, LyXParagraph::META_NEWLINE);
-               update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-       }
-}
-
-
-void BufferView::protectedBlank()
-{
-       if (available()) {
-               hideCursor();
-               update(BufferView::SELECT|BufferView::FITCUR);
-               InsetSpecialChar * new_inset =
-                       new InsetSpecialChar(InsetSpecialChar::PROTECTED_SEPARATOR);
-               insertInset(new_inset);
-       }
-}
-
-
-void BufferView::hfill()
-{
-       if (available()) {
-               hideCursor();
-               update(BufferView::SELECT|BufferView::FITCUR);
-               text->InsertChar(this, LyXParagraph::META_HFILL);
-               update(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"));
+               owner()->message(_("Paragraph environment type copied"));
        }
 }
 
@@ -558,8 +281,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);
        }
 }
 
@@ -567,23 +290,20 @@ void BufferView::pasteEnvironment()
 void BufferView::copy()
 {
        if (available()) {
-               text->CopySelection(this);
-               // clear the selection, even if mark_set
-               toggleSelection();
-               text->ClearSelection();
-               update(BufferView::SELECT|BufferView::FITCUR);
-               owner()->getMiniBuffer()->Set(_("Copy"));
+               text->copySelection(this);
+               owner()->message(_("Copy"));
        }
 }
 
-void BufferView::cut()
+
+void BufferView::cut(bool realcut)
 {
        if (available()) {
                hideCursor();
-               update(BufferView::SELECT|BufferView::FITCUR);
-               text->CutSelection(this);
-               update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-               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"));
        }
 }
 
@@ -591,65 +311,23 @@ 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();
+       update(text, BufferView::SELECT|BufferView::FITCUR);
        
        // paste
-       text->PasteSelection(this);
-       update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+       text->pasteSelection(this);
+       update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
        
        // clear the selection 
        toggleSelection();
-       text->ClearSelection();
-       update(BufferView::SELECT|BufferView::FITCUR);
-}
-
-
-void BufferView::gotoNote()
-{
-       if (!available()) return;
-   
-       hideCursor();
-       beforeChange();
-       update(BufferView::SELECT|BufferView::FITCUR);
-       LyXCursor tmp;
-   
-       if (!text->GotoNextNote(this)) {
-               if (text->cursor.pos() 
-                   || text->cursor.par() != text->FirstParagraph()) {
-                               tmp = text->cursor;
-                               text->cursor.par(text->FirstParagraph());
-                               text->cursor.pos(0);
-                               if (!text->GotoNextNote(this)) {
-                                       text->cursor = tmp;
-                                       owner()->getMiniBuffer()->Set(_("No more notes"));
-                                       LyXBell();
-                               }
-                       } else {
-                               owner()->getMiniBuffer()->Set(_("No more notes"));
-                               LyXBell();
-                       }
-       }
-       update(BufferView::SELECT|BufferView::FITCUR);
-       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);
 }
 
 
@@ -658,10 +336,10 @@ string const BufferView::nextWord(float & value)
 {
        if (!available()) {
                value = 1;
-               return 0;
+               return string();
        }
 
-       return text->SelectNextWord(this, value);
+       return text->selectNextWordToSpellcheck(this, value);
 }
 
   
@@ -669,11 +347,13 @@ void BufferView::selectLastWord()
 {
        if (!available()) return;
    
+       LyXCursor cur = text->selection.cursor;
        hideCursor();
-       beforeChange();
-       text->SelectSelectedWord(this);
+       beforeChange(text);
+       text->selection.cursor = cur;
+       text->selectSelectedWord(this);
        toggleSelection(false);
-       update(BufferView::SELECT|BufferView::FITCUR);
+       update(text, BufferView::SELECT|BufferView::FITCUR);
 }
 
 
@@ -682,10 +362,10 @@ void BufferView::endOfSpellCheck()
        if (!available()) return;
    
        hideCursor();
-       beforeChange();
-       text->SelectSelectedWord(this);
-       text->ClearSelection();
-       update(BufferView::SELECT|BufferView::FITCUR);
+       beforeChange(text);
+       text->selectSelectedWord(this);
+       text->clearSelection();
+       update(text, BufferView::SELECT|BufferView::FITCUR);
 }
 
 
@@ -693,35 +373,39 @@ void BufferView::replaceWord(string const & replacestring)
 {
        if (!available()) return;
 
+       LyXText * tt = getLyXText();
        hideCursor();
-       update(BufferView::SELECT|BufferView::FITCUR);
+       update(tt, BufferView::SELECT|BufferView::FITCUR);
    
        /* clear the selection (if there is any) */ 
        toggleSelection(false);
-       update(BufferView::SELECT|BufferView::FITCUR);
+       update(tt, BufferView::SELECT|BufferView::FITCUR);
    
        /* clear the selection (if there is any) */ 
        toggleSelection(false);
-       text->ReplaceSelectionWithString(this, replacestring);
+       tt->replaceSelectionWithString(this, replacestring);
    
-       text->SetSelectionOverString(this, replacestring);
+       tt->setSelectionOverString(this, replacestring);
 
        // Go back so that replacement string is also spellchecked
        for (string::size_type i = 0; i < replacestring.length() + 1; ++i) {
-               text->CursorLeft(this);
+               tt->cursorLeft(this);
        }
-       update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+       update(tt, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 }
 // End of spellchecker stuff
 
 
 bool BufferView::lockInset(UpdatableInset * inset)
 {
+       // don't relock if we're already locked
+       if (theLockingInset() == inset)
+               return true;
        if (!theLockingInset() && inset) {
                theLockingInset(inset);
                return true;
        } else if (inset) {
-           return theLockingInset()->LockInsetInInset(this, inset);
+           return theLockingInset()->lockInsetInInset(this, inset);
        }
        return false;
 }
@@ -729,18 +413,30 @@ bool BufferView::lockInset(UpdatableInset * inset)
 
 void BufferView::showLockedInsetCursor(int x, int y, int asc, int desc)
 {
-       if (theLockingInset() && available()) {
+       if (available() && theLockingInset()) {
                LyXCursor cursor = text->cursor;
+               Inset * locking_inset = theLockingInset()->getLockingInset();
+
                if ((cursor.pos() - 1 >= 0) &&
-                   (cursor.par()->GetChar(cursor.pos() - 1) ==
-                    LyXParagraph::META_INSET) &&
-                   (cursor.par()->GetInset(cursor.pos() - 1) ==
-                    theLockingInset()->GetLockingInset()))
-                       text->SetCursor(this, cursor,
-                                       cursor.par(), cursor.pos() - 1);
-               y += cursor.y() + theLockingInset()->InsetInInsetY();
-               pimpl_->screen_->ShowManualCursor(text, x, y, asc, desc,
-                                                 LyXScreen::BAR_SHAPE);
+                   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);
        }
 }
 
@@ -748,16 +444,16 @@ void BufferView::showLockedInsetCursor(int x, int y, int asc, int desc)
 void BufferView::hideLockedInsetCursor()
 {
        if (theLockingInset() && available()) {
-               pimpl_->screen_->HideCursor();
+               pimpl_->screen_->hideCursor();
        }
 }
 
 
 void BufferView::fitLockedInsetCursor(int x, int y, int asc, int desc)
 {
-       if (theLockingInset() && available()){
-               y += text->cursor.y() + theLockingInset()->InsetInInsetY();
-               if (pimpl_->screen_->FitManualCursor(text, x, y, asc, desc))
+       if (theLockingInset() && available()) {
+               y += text->cursor.y() + theLockingInset()->insetInInsetY();
+               if (pimpl_->screen_->fitManualCursor(text, this, x, y, asc, desc))
                        updateScrollbar();
        }
 }
@@ -766,13 +462,16 @@ void BufferView::fitLockedInsetCursor(int x, int y, int asc, int desc)
 int BufferView::unlockInset(UpdatableInset * inset)
 {
        if (inset && theLockingInset() == inset) {
-               inset->InsetUnlock(this);
+               inset->insetUnlock(this);
                theLockingInset(0);
-               text->FinishUndo();
+               // make sure we update the combo !
+               owner()->setLayout(getLyXText()->cursor.par()->getLayout());
+               finishUndo();
                return 0;
        } else if (inset && theLockingInset() &&
-                  theLockingInset()->UnlockInsetInInset(this, inset)) {
-               text->FinishUndo();
+                  theLockingInset()->unlockInsetInInset(this, inset)) {
+               // owner inset has updated the layout combo 
+               finishUndo();
                return 0;
        }
        return bufferlist.unlockInset(inset);
@@ -785,123 +484,129 @@ 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->cursor.par()->
-                     ParFromPos(text->cursor.pos())->previous, 
-                     text->cursor.par()->
-                     ParFromPos(text->cursor.pos())->next
-#else
-                     text->cursor.par()->previous, 
-                     text->cursor.par()->next
-#endif
-               );
+       setUndo(this, kind,
+               text->cursor.par(),
+               text->cursor.par()->next());
 }
 
 
 void BufferView::updateInset(Inset * inset, bool mark_dirty)
 {
-       if (!inset)
-               return;
-
-       // first check for locking insets
-       if (theLockingInset()) {
-               if (theLockingInset() == inset) {
-                       if (text->UpdateInset(this, inset)){
-                               update();
-                               if (mark_dirty){
-                                       if (buffer()->isLyxClean())
-                                               owner()->getMiniBuffer()->
-                                                       setTimer(4);
-                                       buffer()->markDirty();
-                               }
-                               updateScrollbar();
-                               return;
-                       }
-               } 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();
-                               return;
-                       }
-               }
-       }
-  
-       // then check the current buffer
-       if (available()) {
-               hideCursor();
-               update(BufferView::UPDATE);
-               if (text->UpdateInset(this, inset)){
-                       if (mark_dirty)
-                               update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-                       else 
-                               update(SELECT);
-                       return;
-               }
-       }
+       pimpl_->updateInset(inset, mark_dirty);
 }
 
-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;
+       bool need_update = false;
        LyXCursor cursor = text->cursor;
        LyXCursor tmpcursor = cursor;
-#ifndef NEW_INSETS
-       cursor.par(tmpcursor.par()->ParFromPos(tmpcursor.pos()));
-       cursor.pos(tmpcursor.par()->PositionInParFromPos(tmpcursor.pos()));
-#else
        cursor.par(tmpcursor.par());
        cursor.pos(tmpcursor.pos());
-#endif
 
-       while (par) {
-               bool flag2 = false;
-               for (LyXParagraph::inset_iterator it = par->inset_iterator_begin();
-                    it != par->inset_iterator_end(); ++it) {
-                       if ((*it)->LyxCode() == Inset::REF_CODE) {
-                               InsetCommand * inset = static_cast<InsetCommand *>(*it);
+       ParIterator end = buffer()->par_iterator_end();
+       for (ParIterator it = buffer()->par_iterator_begin();
+            it != end; ++it) {
+               Paragraph * par = *it;
+               bool changed_inset = false;
+               for (Paragraph::inset_iterator it2 = par->inset_iterator_begin();
+                    it2 != par->inset_iterator_end(); ++it2) {
+                       if ((*it2)->lyxCode() == code) {
+                               InsetCommand * inset = static_cast<InsetCommand *>(*it2);
                                if (inset->getContents() == from) {
                                        inset->setContents(to);
-                                       flag2 = true;
+                                       changed_inset = true;
                                }
                        }
                }
-               if (flag2) {
-                       flag = true;
-#ifndef NEW_INSETS
-                       if (par->footnoteflag != LyXParagraph::CLOSED_FOOTNOTE){
+               if (changed_inset) {
+                       need_update = true;
+#ifdef WITH_WARNINGS
+#warning FIXME
 #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->FullRebreak(this);
-#ifndef NEW_INSETS
+                       // 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);
                        }
-#endif
                }
-               par = par->next;
        }
-       text->SetCursorIntern(this, cursor.par(), cursor.pos());
-       return flag;
+       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
 {
-    return text->the_locking_inset;
+       // 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;
+       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();
 }