mathed31.diff

[lyx.git] / src / BufferView2.C

diff --git a/src/BufferView2.C b/src/BufferView2.C
index b1a13b1097ade11635499792fdeda31724c6e368..ebd8774a01e0bcb4f280c40f8c0a30f0d3d77b4b 100644 (file)
--- a/src/BufferView2.C
+++ b/src/BufferView2.C
@@ -31,6 +31,7 @@
 #include "LaTeX.h"
 #include "BufferView_pimpl.h"
 #include "insets/insetcommand.h" //ChangeRefs
+#include "support/lyxfunctional.h" //equal_1st_in_pair
 
 extern BufferList bufferlist;
 
@@ -40,6 +41,7 @@ using std::ifstream;
 using std::vector;
 using std::find;
 using std::count;
+using std::count_if;
 
 // Inserts a file into current document
 bool BufferView::insertLyXFile(string const & filen)
@@ -53,10 +55,10 @@ 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!"),
@@ -65,7 +67,7 @@ bool BufferView::insertLyXFile(string const & filen)
                return false;
        }
        
-       beforeChange();
+       beforeChange(text);
 
        ifstream ifs(fname.c_str());
        if (!ifs) {
@@ -75,7 +77,7 @@ bool BufferView::insertLyXFile(string const & filen)
                return false;
        }
        
-       char c = ifs.peek();
+       char const c = ifs.peek();
        
        LyXLex lex(0, 0);
        lex.setStream(ifs);
@@ -94,6 +96,7 @@ bool BufferView::insertLyXFile(string const & filen)
        return res;
 }
 
+
 bool BufferView::removeAutoInsets()
 {
        LyXParagraph * par = buffer()->paragraph;
@@ -145,10 +148,10 @@ void BufferView::insertErrors(TeXErrors & terr)
        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; 
@@ -214,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 =
@@ -247,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;
@@ -261,17 +264,19 @@ bool BufferView::insertInset(Inset * inset, string const & lout,
 
 
 // Open and lock an updatable inset
-bool BufferView::open_new_inset(UpdatableInset * new_inset)
+bool BufferView::open_new_inset(UpdatableInset * new_inset, bool behind)
 {
-       beforeChange();
+       beforeChange(text);
        text->FinishUndo();
        if (!insertInset(new_inset)) {
                delete new_inset;
                return false;
        }
-//     text->CursorLeft(this);
-//     update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-       new_inset->Edit(this, 0, 0, 0);
+       if (behind) {
+               LyXFont & font = getLyXText()->real_current_font;
+               new_inset->Edit(this, new_inset->width(this, font), 0, 0);
+       } else
+               new_inset->Edit(this, 0, 0, 0);
        return true;
 }
 
@@ -288,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;
                }
        }
@@ -320,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()));
@@ -403,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();
        }
 }
@@ -417,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();
        }
 }
@@ -431,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();
        }
 }
@@ -452,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();
        }
 }
@@ -467,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);
@@ -479,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);
@@ -491,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);
@@ -503,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);
@@ -515,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);
        }
 }
 
@@ -538,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);
        }
 }
 
@@ -551,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"));
        }
 }
@@ -562,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);
        }
 }
 
@@ -574,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"));
        }
 }
@@ -583,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"));
        }
 }
@@ -600,49 +608,63 @@ 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);
 }
 
 
-void BufferView::gotoNote()
+void BufferView::gotoInset(std::vector<Inset::Code> const & codes,
+                          bool same_content)
 {
        if (!available()) return;
    
        hideCursor();
-       beforeChange();
-       update(BufferView::SELECT|BufferView::FITCUR);
-       LyXCursor tmp;
-   
-       if (!text->GotoNextNote(this)) {
+       beforeChange(text);
+       update(text, BufferView::SELECT|BufferView::FITCUR);
+
+       string contents;
+       if (same_content &&
+           text->cursor.par()->GetChar(text->cursor.pos()) == LyXParagraph::META_INSET) {
+               Inset const * inset = text->cursor.par()->GetInset(text->cursor.pos());
+               if (find(codes.begin(), codes.end(), inset->LyxCode())
+                   != codes.end())
+                       contents =
+                               static_cast<InsetCommand const *>(inset)->getContents();
+       }
+       
+       if (!text->GotoNextInset(this, codes, contents)) {
                if (text->cursor.pos() 
                    || text->cursor.par() != text->FirstParagraph()) {
-                               tmp = text->cursor;
+                               LyXCursor tmp = text->cursor;
                                text->cursor.par(text->FirstParagraph());
                                text->cursor.pos(0);
-                               if (!text->GotoNextNote(this)) {
+                               if (!text->GotoNextInset(this, codes, contents)) {
                                        text->cursor = tmp;
-                                       owner()->getMiniBuffer()->Set(_("No more notes"));
-                                       LyXBell();
+                                       owner()->getMiniBuffer()->Set(_("No more insets"));
                                }
                        } else {
-                               owner()->getMiniBuffer()->Set(_("No more notes"));
-                               LyXBell();
+                               owner()->getMiniBuffer()->Set(_("No more insets"));
                        }
        }
-       update(BufferView::SELECT|BufferView::FITCUR);
+       update(text, BufferView::SELECT|BufferView::FITCUR);
        text->sel_cursor = text->cursor;
 }
 
 
+void BufferView::gotoInset(Inset::Code code, bool same_content)
+{
+       gotoInset(vector<Inset::Code>(1, code), same_content);
+}
+
+
 void BufferView::insertCorrectQuote()
 {
        char c;
@@ -673,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);
 }
 
 
@@ -685,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);
 }
 
 
@@ -697,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);
@@ -713,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
 
@@ -769,9 +791,9 @@ void BufferView::hideLockedInsetCursor()
 
 void BufferView::fitLockedInsetCursor(int x, int y, int asc, int desc)
 {
-       if (theLockingInset() && available()){
+       if (theLockingInset() && available()) {
                y += text->cursor.y() + theLockingInset()->InsetInInsetY();
-               if (pimpl_->screen_->FitManualCursor(text, x, y, asc, desc))
+               if (pimpl_->screen_->FitManualCursor(text, this, x, y, asc, desc))
                        updateScrollbar();
        }
 }
@@ -821,9 +843,9 @@ void BufferView::updateInset(Inset * inset, bool mark_dirty)
        // first check for locking insets
        if (theLockingInset()) {
                if (theLockingInset() == inset) {
-                       if (text->UpdateInset(this, inset)){
+                       if (text->UpdateInset(this, inset)) {
                                update();
-                               if (mark_dirty){
+                               if (mark_dirty) {
                                        if (buffer()->isLyxClean())
                                                owner()->getMiniBuffer()->
                                                        setTimer(4);
@@ -850,18 +872,19 @@ void BufferView::updateInset(Inset * inset, bool mark_dirty)
        // then check the current buffer
        if (available()) {
                hideCursor();
-               update(BufferView::UPDATE);
-               if (text->UpdateInset(this, inset)){
+               update(text, BufferView::UPDATE);
+               if (text->UpdateInset(this, inset)) {
                        if (mark_dirty)
-                               update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+                               update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                        else 
-                               update(SELECT);
+                               update(text, SELECT);
                        return;
                }
        }
 }
 
-bool BufferView::ChangeRefs(string const & from, string const & to)
+
+bool BufferView::ChangeInsets(Inset::Code code, string const & from, string const & to)
 {
        bool flag = false;
        LyXParagraph * par = buffer()->paragraph;
@@ -879,7 +902,7 @@ bool BufferView::ChangeRefs(string const & from, string const & to)
                bool flag2 = false;
                for (LyXParagraph::inset_iterator it = par->inset_iterator_begin();
                     it != par->inset_iterator_end(); ++it) {
-                       if ((*it)->LyxCode() == Inset::REF_CODE) {
+                       if ((*it)->LyxCode() == code) {
                                InsetCommand * inset = static_cast<InsetCommand *>(*it);
                                if (inset->getContents() == from) {
                                        inset->setContents(to);
@@ -916,7 +939,20 @@ bool BufferView::ChangeRefsIfUnique(string const & from, string const & to)
        if (count(labels.begin(), labels.end(), from) > 1)
                return false;
 
-       return ChangeRefs(from, to);
+       return ChangeInsets(Inset::REF_CODE, from, to);
+}
+
+
+bool BufferView::ChangeCitationsIfUnique(string const & from, string const & to)
+{
+
+       vector<pair<string,string> > keys = buffer()->getBibkeyList();  
+       if (count_if(keys.begin(), keys.end(), 
+                    equal_1st_in_pair<string,string>(from)) 
+           > 1)
+               return false;
+
+       return ChangeInsets(Inset::CITE_CODE, from, to);
 }
 
 UpdatableInset * BufferView::theLockingInset() const
@@ -944,3 +980,23 @@ LyXText * BufferView::getLyXText() const
        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();
+}