]> git.lyx.org Git - lyx.git/blobdiff - src/BufferView2.C
projects / lyx.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
mathed31.diff
[lyx.git] / src / BufferView2.C
diff --git a/src/BufferView2.C b/src/BufferView2.C
index 37c6d948b401b52c4828e94ce400ac30c4211590..ebd8774a01e0bcb4f280c40f8c0a30f0d3d77b4b 100644 (file)
--- a/src/BufferView2.C
+++ b/src/BufferView2.C
@@ -67,7 +67,7 @@ bool BufferView::insertLyXFile(string const & filen)
                return false;
        }
        
-       beforeChange();
+       beforeChange(text);
 
        ifstream ifs(fname.c_str());
        if (!ifs) {
@@ -217,17 +217,17 @@ bool BufferView::insertInset(Inset * inset, string const & lout,
        text->SetCursorParUndo(buffer());
        text->FreezeUndo();
        
-       beforeChange();
+       beforeChange(text);
        if (!lout.empty()) {
-               update(BufferView::SELECT|BufferView::FITCUR);
+               update(text, BufferView::SELECT|BufferView::FITCUR);
                text->BreakParagraph(this);
-               update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+               update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                
                if (text->cursor.par()->Last()) {
                        text->CursorLeft(this);
                        
                        text->BreakParagraph(this);
-                       update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+                       update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                }
 
                pair<bool, LyXTextClass::size_type> lres =
@@ -250,13 +250,13 @@ bool BufferView::insertInset(Inset * inset, string const & lout,
                                   LYX_ALIGN_LAYOUT, 
                                   string(),
                                   0);
-               update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+               update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                
                text->current_font.setLatex(LyXFont::OFF);
        }
        
        text->InsertInset(this, inset);
-       update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+       update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 
        text->UnFreezeUndo();
        return true;
@@ -266,7 +266,7 @@ bool BufferView::insertInset(Inset * inset, string const & lout,
 // Open and lock an updatable inset
 bool BufferView::open_new_inset(UpdatableInset * new_inset, bool behind)
 {
-       beforeChange();
+       beforeChange(text);
        text->FinishUndo();
        if (!insertInset(new_inset)) {
                delete new_inset;
@@ -293,10 +293,10 @@ bool BufferView::gotoLabel(string const & label)
                vector<string> labels = (*it)->getLabelList();
                if (find(labels.begin(),labels.end(),label)
                     != labels.end()) {
-                       beforeChange();
+                       beforeChange(text);
                        text->SetCursor(this, it.getPar(), it.getPos());
                        text->sel_cursor = text->cursor;
-                       update(BufferView::SELECT|BufferView::FITCUR);
+                       update(text, BufferView::SELECT|BufferView::FITCUR);
                        return true;
                }
        }
@@ -325,7 +325,7 @@ void BufferView::allFloats(char flag, char figmar)
                    && cursor.par()->footnotekind != LyXParagraph::ALGORITHM)))
                toggleFloat();
        else
-               beforeChange();
+               beforeChange(text);
 
        LyXCursor tmpcursor = cursor;
        cursor.par(tmpcursor.par()->ParFromPos(tmpcursor.pos()));
@@ -408,10 +408,10 @@ void BufferView::openStuff()
        if (available()) {
                owner()->getMiniBuffer()->Set(_("Open/Close..."));
                hideCursor();
-               beforeChange();
-               update(BufferView::SELECT|BufferView::FITCUR);
+               beforeChange(text);
+               update(text, BufferView::SELECT|BufferView::FITCUR);
                text->OpenStuff(this);
-               update(BufferView::SELECT|BufferView::FITCUR);
+               update(text, BufferView::SELECT|BufferView::FITCUR);
                setState();
        }
 }
@@ -422,10 +422,10 @@ void BufferView::toggleFloat()
        if (available()) {
                owner()->getMiniBuffer()->Set(_("Open/Close..."));
                hideCursor();
-               beforeChange();
-               update(BufferView::SELECT|BufferView::FITCUR);
+               beforeChange(text);
+               update(text, BufferView::SELECT|BufferView::FITCUR);
                text->ToggleFootnote(this);
-               update(BufferView::SELECT|BufferView::FITCUR);
+               update(text, BufferView::SELECT|BufferView::FITCUR);
                setState();
        }
 }
@@ -436,12 +436,12 @@ void BufferView::menuUndo()
        if (available()) {
                owner()->getMiniBuffer()->Set(_("Undo"));
                hideCursor();
-               beforeChange();
-               update(BufferView::SELECT|BufferView::FITCUR);
+               beforeChange(text);
+               update(text, BufferView::SELECT|BufferView::FITCUR);
                if (!text->TextUndo(this))
                        owner()->getMiniBuffer()->Set(_("No further undo information"));
                else
-                       update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+                       update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                setState();
        }
 }
@@ -457,12 +457,12 @@ void BufferView::menuRedo()
        if (available()) {
                owner()->getMiniBuffer()->Set(_("Redo"));
                hideCursor();
-               beforeChange();
-               update(BufferView::SELECT|BufferView::FITCUR);
+               beforeChange(text);
+               update(text, BufferView::SELECT|BufferView::FITCUR);
                if (!text->TextRedo(this))
                        owner()->getMiniBuffer()->Set(_("No further redo information"));
                else
-                       update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+                       update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                setState();
        }
 }
@@ -472,7 +472,7 @@ void BufferView::hyphenationPoint()
 {
        if (available()) {
                hideCursor();
-               update(BufferView::SELECT|BufferView::FITCUR);
+               update(text, BufferView::SELECT|BufferView::FITCUR);
                InsetSpecialChar * new_inset = 
                        new InsetSpecialChar(InsetSpecialChar::HYPHENATION);
                insertInset(new_inset);
@@ -484,7 +484,7 @@ void BufferView::ldots()
 {
        if (available())  {
                hideCursor();
-               update(BufferView::SELECT|BufferView::FITCUR);
+               update(text, BufferView::SELECT|BufferView::FITCUR);
                InsetSpecialChar * new_inset = 
                        new InsetSpecialChar(InsetSpecialChar::LDOTS);
                insertInset(new_inset);
@@ -496,7 +496,7 @@ void BufferView::endOfSentenceDot()
 {
        if (available()) {
                hideCursor();
-               update(BufferView::SELECT|BufferView::FITCUR);
+               update(text, BufferView::SELECT|BufferView::FITCUR);
                InsetSpecialChar * new_inset = 
                        new InsetSpecialChar(InsetSpecialChar::END_OF_SENTENCE);
                insertInset(new_inset);
@@ -508,7 +508,7 @@ void BufferView::menuSeparator()
 {
        if (available()) {
                hideCursor();
-               update(BufferView::SELECT|BufferView::FITCUR);
+               update(text, BufferView::SELECT|BufferView::FITCUR);
                InsetSpecialChar * new_inset = 
                        new InsetSpecialChar(InsetSpecialChar::MENU_SEPARATOR);
                insertInset(new_inset);
@@ -520,21 +520,24 @@ void BufferView::newline()
 {
        if (available()) {
                hideCursor();
-               update(BufferView::SELECT|BufferView::FITCUR);
+               update(text, BufferView::SELECT|BufferView::FITCUR);
                text->InsertChar(this, LyXParagraph::META_NEWLINE);
-               update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+               update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
        }
 }
 
 
-void BufferView::protectedBlank()
+void BufferView::protectedBlank(LyXText * lt)
 {
        if (available()) {
                hideCursor();
-               update(BufferView::SELECT|BufferView::FITCUR);
+               update(lt, BufferView::SELECT|BufferView::FITCUR);
                InsetSpecialChar * new_inset =
                        new InsetSpecialChar(InsetSpecialChar::PROTECTED_SEPARATOR);
-               insertInset(new_inset);
+               if (!insertInset(new_inset))
+                       delete new_inset;
+               else
+                       updateInset(new_inset, true);
        }
 }
 
@@ -543,9 +546,9 @@ void BufferView::hfill()
 {
        if (available()) {
                hideCursor();
-               update(BufferView::SELECT|BufferView::FITCUR);
+               update(text, BufferView::SELECT|BufferView::FITCUR);
                text->InsertChar(this, LyXParagraph::META_HFILL);
-               update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+               update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
        }
 }
 
@@ -556,7 +559,7 @@ void BufferView::copyEnvironment()
                // clear the selection, even if mark_set
                toggleSelection();
                text->ClearSelection();
-               update(BufferView::SELECT|BufferView::FITCUR);
+               update(text, BufferView::SELECT|BufferView::FITCUR);
                owner()->getMiniBuffer()->Set(_("Paragraph environment type copied"));
        }
 }
@@ -567,7 +570,7 @@ void BufferView::pasteEnvironment()
        if (available()) {
                text->pasteEnvironmentType(this);
                owner()->getMiniBuffer()->Set(_("Paragraph environment type set"));
-               update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+               update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
        }
 }
 
@@ -579,7 +582,7 @@ void BufferView::copy()
                // clear the selection, even if mark_set
                toggleSelection();
                text->ClearSelection();
-               update(BufferView::SELECT|BufferView::FITCUR);
+               update(text, BufferView::SELECT|BufferView::FITCUR);
                owner()->getMiniBuffer()->Set(_("Copy"));
        }
 }
@@ -588,9 +591,9 @@ void BufferView::cut()
 {
        if (available()) {
                hideCursor();
-               update(BufferView::SELECT|BufferView::FITCUR);
+               update(text, BufferView::SELECT|BufferView::FITCUR);
                text->CutSelection(this);
-               update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+               update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                owner()->getMiniBuffer()->Set(_("Cut"));
        }
 }
@@ -605,16 +608,16 @@ void BufferView::paste()
        // clear the selection
        toggleSelection();
        text->ClearSelection();
-       update(BufferView::SELECT|BufferView::FITCUR);
+       update(text, BufferView::SELECT|BufferView::FITCUR);
        
        // paste
        text->PasteSelection(this);
-       update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+       update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
        
        // clear the selection 
        toggleSelection();
        text->ClearSelection();
-       update(BufferView::SELECT|BufferView::FITCUR);
+       update(text, BufferView::SELECT|BufferView::FITCUR);
 }
 
 
@@ -624,8 +627,8 @@ void BufferView::gotoInset(std::vector<Inset::Code> const & codes,
        if (!available()) return;
    
        hideCursor();
-       beforeChange();
-       update(BufferView::SELECT|BufferView::FITCUR);
+       beforeChange(text);
+       update(text, BufferView::SELECT|BufferView::FITCUR);
 
        string contents;
        if (same_content &&
@@ -651,7 +654,7 @@ void BufferView::gotoInset(std::vector<Inset::Code> const & codes,
                                owner()->getMiniBuffer()->Set(_("No more insets"));
                        }
        }
-       update(BufferView::SELECT|BufferView::FITCUR);
+       update(text, BufferView::SELECT|BufferView::FITCUR);
        text->sel_cursor = text->cursor;
 }
 
@@ -692,10 +695,10 @@ void BufferView::selectLastWord()
        if (!available()) return;
    
        hideCursor();
-       beforeChange();
+       beforeChange(text);
        text->SelectSelectedWord(this);
        toggleSelection(false);
-       update(BufferView::SELECT|BufferView::FITCUR);
+       update(text, BufferView::SELECT|BufferView::FITCUR);
 }
 
 
@@ -704,10 +707,10 @@ void BufferView::endOfSpellCheck()
        if (!available()) return;
    
        hideCursor();
-       beforeChange();
+       beforeChange(text);
        text->SelectSelectedWord(this);
        text->ClearSelection();
-       update(BufferView::SELECT|BufferView::FITCUR);
+       update(text, BufferView::SELECT|BufferView::FITCUR);
 }
 
 
@@ -716,11 +719,11 @@ void BufferView::replaceWord(string const & replacestring)
        if (!available()) return;
 
        hideCursor();
-       update(BufferView::SELECT|BufferView::FITCUR);
+       update(text, BufferView::SELECT|BufferView::FITCUR);
    
        /* clear the selection (if there is any) */ 
        toggleSelection(false);
-       update(BufferView::SELECT|BufferView::FITCUR);
+       update(text, BufferView::SELECT|BufferView::FITCUR);
    
        /* clear the selection (if there is any) */ 
        toggleSelection(false);
@@ -732,7 +735,7 @@ void BufferView::replaceWord(string const & replacestring)
        for (string::size_type i = 0; i < replacestring.length() + 1; ++i) {
                text->CursorLeft(this);
        }
-       update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+       update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 }
 // End of spellchecker stuff
 
@@ -869,12 +872,12 @@ void BufferView::updateInset(Inset * inset, bool mark_dirty)
        // then check the current buffer
        if (available()) {
                hideCursor();
-               update(BufferView::UPDATE);
+               update(text, BufferView::UPDATE);
                if (text->UpdateInset(this, inset)) {
                        if (mark_dirty)
-                               update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+                               update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                        else 
-                               update(SELECT);
+                               update(text, SELECT);
                        return;
                }
        }
The LyX Source Repository