mathed31.diff

[lyx.git] / src / lyxfunc.C

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index b5c65e7f39a3f36a05a9b0fce88dcbdbfbff1096..8a3e757772b4d97e2dfb78401ea28609e17b7204 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -100,9 +100,6 @@ extern bool selection_possible;
 
 extern kb_keymap * toplevel_keymap;
 
-#if 0
-extern void MenuFax(Buffer *);
-#endif
 extern void show_symbols_form(LyXFunc *);
 
 extern LyXAction lyxaction;
@@ -137,7 +134,7 @@ inline
 void LyXFunc::moveCursorUpdate(LyXText * text, bool selecting)
 {
        if (selecting || text->mark_set) {
-               text->SetSelection();
+               text->SetSelection(owner->view());
                if (text->bv_owner)
                    owner->view()->toggleToggle();
        }
@@ -359,17 +356,10 @@ LyXFunc::func_status LyXFunc::getStatus(int ac) const
                disable = !Exporter::IsExportable(buf, "dvi")
                        || lyxrc.print_command == "none";
                break;
-#if 0
-       case LFUN_FAX:
-               disable = !Exporter::IsExportable(buf, "ps")
-                       || lyxrc.fax_command == "none";
-               break;
-#else
        case LFUN_EXPORT:
                disable = argument == "fax" &&
                        !Exporter::IsExportable(buf, argument);
                break;
-#endif
        case LFUN_UNDO:
                disable = buf->undostack.empty();
                break;
@@ -835,12 +825,6 @@ string const LyXFunc::Dispatch(int ac,
                owner->getDialogs()->showPrint();
                break;
 
-#if 0
-       case LFUN_FAX:
-               MenuFax(owner->buffer());
-               break;
-#endif
-               
        case LFUN_EXPORT:
                Exporter::Export(owner->buffer(), argument, false);
                break;
@@ -1472,7 +1456,7 @@ string const LyXFunc::Dispatch(int ac,
                LyXText * tmptext = owner->view()->text;
                bool is_rtl = tmptext->cursor.par()->isRightToLeftPar(owner->buffer()->params);
                if (!tmptext->mark_set)
-                       owner->view()->beforeChange();
+                       owner->view()->beforeChange(owner->view()->text);
                owner->view()->update(owner->view()->text, BufferView::SELECT|BufferView::FITCUR);
                if (is_rtl)
                        tmptext->CursorLeft(owner->view(), false);
@@ -1508,7 +1492,8 @@ string const LyXFunc::Dispatch(int ac,
                // it simpler? (Lgb)
                LyXText * txt = owner->view()->text;
                bool is_rtl = txt->cursor.par()->isRightToLeftPar(owner->buffer()->params);
-               if (!txt->mark_set) owner->view()->beforeChange();
+               if (!txt->mark_set)
+                       owner->view()->beforeChange(txt);
                owner->view()->update(owner->view()->text, BufferView::SELECT|BufferView::FITCUR);
                LyXCursor cur = txt->cursor;
                if (!is_rtl)
@@ -1545,7 +1530,7 @@ string const LyXFunc::Dispatch(int ac,
                
        case LFUN_UP:
                if (!owner->view()->text->mark_set)
-                       owner->view()->beforeChange();
+                       owner->view()->beforeChange(owner->view()->text);
                owner->view()->update(owner->view()->text, BufferView::UPDATE);
                owner->view()->text->CursorUp(owner->view());
                owner->view()->text->FinishUndo();
@@ -1555,7 +1540,7 @@ string const LyXFunc::Dispatch(int ac,
                
        case LFUN_DOWN:
                if (!owner->view()->text->mark_set)
-                       owner->view()->beforeChange();
+                       owner->view()->beforeChange(owner->view()->text);
                owner->view()->update(owner->view()->text, BufferView::UPDATE);
                owner->view()->text->CursorDown(owner->view());
                owner->view()->text->FinishUndo();
@@ -1565,7 +1550,7 @@ string const LyXFunc::Dispatch(int ac,
 
        case LFUN_UP_PARAGRAPH:
                if (!owner->view()->text->mark_set)
-                       owner->view()->beforeChange();
+                       owner->view()->beforeChange(owner->view()->text);
                owner->view()->update(owner->view()->text, BufferView::UPDATE);
                owner->view()->text->CursorUpParagraph(owner->view());
                owner->view()->text->FinishUndo();
@@ -1575,7 +1560,7 @@ string const LyXFunc::Dispatch(int ac,
                
        case LFUN_DOWN_PARAGRAPH:
                if (!owner->view()->text->mark_set)
-                       owner->view()->beforeChange();
+                       owner->view()->beforeChange(owner->view()->text);
                owner->view()->update(owner->view()->text, BufferView::UPDATE);
                owner->view()->text->CursorDownParagraph(owner->view());
                owner->view()->text->FinishUndo();
@@ -1585,37 +1570,27 @@ string const LyXFunc::Dispatch(int ac,
                
        case LFUN_PRIOR:
                if (!text->mark_set)
-                   owner->view()->beforeChange();
+                   owner->view()->beforeChange(owner->view()->text);
                owner->view()->update(owner->view()->text, BufferView::UPDATE);
                owner->view()->cursorPrevious(text);
                owner->view()->text->FinishUndo();
-#if 0
-               if (text->inset_owner)
-                   owner->view()->updateInset(text->inset_owner, false);
-               else
-#endif
-                   moveCursorUpdate(text, false);
+               moveCursorUpdate(text, false);
                owner->showState();
                break;
                
        case LFUN_NEXT:
                if (!text->mark_set)
-                       owner->view()->beforeChange();
+                       owner->view()->beforeChange(owner->view()->text);
                owner->view()->update(owner->view()->text, BufferView::UPDATE);
                owner->view()->cursorNext(text);
                owner->view()->text->FinishUndo();
-#if 0
-               if (text->inset_owner)
-                   owner->view()->updateInset(text->inset_owner, false);
-               else
-#endif
-                   moveCursorUpdate(text, false);
+               moveCursorUpdate(text, false);
                owner->showState();
                break;
                
        case LFUN_HOME:
                if (!owner->view()->text->mark_set)
-                       owner->view()->beforeChange();
+                       owner->view()->beforeChange(owner->view()->text);
                owner->view()->update(owner->view()->text, BufferView::SELECT|BufferView::FITCUR);
                owner->view()->text->CursorHome(owner->view());
                owner->view()->text->FinishUndo();
@@ -1625,7 +1600,7 @@ string const LyXFunc::Dispatch(int ac,
                
        case LFUN_END:
                if (!owner->view()->text->mark_set)
-                       owner->view()->beforeChange();
+                       owner->view()->beforeChange(owner->view()->text);
                owner->view()->update(owner->view()->text,
                                      BufferView::SELECT|BufferView::FITCUR);
                owner->view()->text->CursorEnd(owner->view());
@@ -1637,7 +1612,7 @@ string const LyXFunc::Dispatch(int ac,
        case LFUN_SHIFT_TAB:
        case LFUN_TAB:
                if (!owner->view()->text->mark_set)
-                       owner->view()->beforeChange();
+                       owner->view()->beforeChange(owner->view()->text);
                owner->view()->update(owner->view()->text,
                                      BufferView::SELECT|BufferView::FITCUR);
                owner->view()->text->CursorTab(owner->view());
@@ -1648,41 +1623,33 @@ string const LyXFunc::Dispatch(int ac,
                
        case LFUN_WORDRIGHT:
                if (!text->mark_set)
-                       owner->view()->beforeChange();
+                       owner->view()->beforeChange(text);
                owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
                if (text->cursor.par()->isRightToLeftPar(owner->buffer()->params))
                        text->CursorLeftOneWord(owner->view());
                else
                        text->CursorRightOneWord(owner->view());
                owner->view()->text->FinishUndo();
-#if 0
-               if (text->inset_owner)
-                   owner->view()->updateInset(text->inset_owner, true);
-#endif
                moveCursorUpdate(text, false);
                owner->showState();
                break;
                
        case LFUN_WORDLEFT:
                if (!text->mark_set)
-                       owner->view()->beforeChange();
+                       owner->view()->beforeChange(text);
                owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
                if (text->cursor.par()->isRightToLeftPar(owner->buffer()->params))
                        text->CursorRightOneWord(owner->view());
                else
                        text->CursorLeftOneWord(owner->view());
                owner->view()->text->FinishUndo();
-#if 0
-               if (text->inset_owner)
-                   owner->view()->updateInset(text->inset_owner, true);
-#endif
                moveCursorUpdate(text, false);
                owner->showState();
                break;
                
        case LFUN_BEGINNINGBUF:
                if (!owner->view()->text->mark_set)
-                       owner->view()->beforeChange();
+                       owner->view()->beforeChange(owner->view()->text);
                owner->view()->update(owner->view()->text,
                                      BufferView::SELECT|BufferView::FITCUR);
                owner->view()->text->CursorTop(owner->view());
@@ -1693,7 +1660,7 @@ string const LyXFunc::Dispatch(int ac,
                
        case LFUN_ENDBUF:
                if (!owner->view()->text->mark_set)
-                       owner->view()->beforeChange();
+                       owner->view()->beforeChange(owner->view()->text);
                owner->view()->update(owner->view()->text,
                                      BufferView::SELECT|BufferView::FITCUR);
                owner->view()->text->CursorBottom(owner->view());
@@ -1768,13 +1735,7 @@ string const LyXFunc::Dispatch(int ac,
                owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
                owner->view()->cursorPrevious(text);
                owner->view()->text->FinishUndo();
-#if 0
-               if (text->inset_owner) {
-                   text->SetSelection();
-                   owner->view()->updateInset(text->inset_owner, false);
-               } else
-#endif
-                   moveCursorUpdate(text, true);
+               moveCursorUpdate(text, true);
                owner->showState();
                break;
                
@@ -1782,12 +1743,7 @@ string const LyXFunc::Dispatch(int ac,
                owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
                owner->view()->cursorNext(text);
                owner->view()->text->FinishUndo();
-#if 0
-               if (text->inset_owner)
-                   owner->view()->updateInset(text->inset_owner, false);
-               else
-#endif
-                   moveCursorUpdate(text, true);
+               moveCursorUpdate(text, true);
                owner->showState();
                break;
                
@@ -1795,13 +1751,7 @@ string const LyXFunc::Dispatch(int ac,
                owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
                text->CursorHome(owner->view());
                owner->view()->text->FinishUndo();
-#if 0
-               if (text->inset_owner) {
-                   text->SetSelection();
-                   owner->view()->updateInset(text->inset_owner, false);
-               } else
-#endif
-                   moveCursorUpdate(text, true);
+               moveCursorUpdate(text, true);
                owner->showState();
                break;
                
@@ -1809,13 +1759,7 @@ string const LyXFunc::Dispatch(int ac,
                owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
                text->CursorEnd(owner->view());
                owner->view()->text->FinishUndo();
-#if 0
-               if (text->inset_owner) {
-                   text->SetSelection();
-                   owner->view()->updateInset(text->inset_owner, false);
-               } else
-#endif
-                   moveCursorUpdate(text, true);
+               moveCursorUpdate(text, true);
                owner->showState();
                break;
                
@@ -1826,13 +1770,7 @@ string const LyXFunc::Dispatch(int ac,
                else
                        text->CursorRightOneWord(owner->view());
                owner->view()->text->FinishUndo();
-#if 0
-               if (text->inset_owner) {
-                   text->SetSelection();
-                   owner->view()->updateInset(text->inset_owner, false);
-               } else
-#endif
-                   moveCursorUpdate(text, true);
+               moveCursorUpdate(text, true);
                owner->showState();
                break;
                
@@ -1843,13 +1781,7 @@ string const LyXFunc::Dispatch(int ac,
                else
                        text->CursorLeftOneWord(owner->view());
                owner->view()->text->FinishUndo();
-#if 0
-               if (text->inset_owner) {
-                   text->SetSelection();
-                   owner->view()->updateInset(text->inset_owner, false);
-               } else
-#endif
-                   moveCursorUpdate(text, true);
+               moveCursorUpdate(text, true);
                owner->showState();
                break;
                
@@ -1876,7 +1808,7 @@ string const LyXFunc::Dispatch(int ac,
 
                // --- text changing commands ------------------------
        case LFUN_BREAKLINE:
-               owner->view()->beforeChange();
+               owner->view()->beforeChange(owner->view()->text);
                owner->view()->text->InsertChar(owner->view(), LyXParagraph::META_NEWLINE);
                owner->view()->update(owner->view()->text,
                                      BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
@@ -1901,20 +1833,16 @@ string const LyXFunc::Dispatch(int ac,
                
        case LFUN_SETMARK:
                if (text->mark_set) {
-                       owner->view()->beforeChange();
+                       owner->view()->beforeChange(text);
                        owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
                        setMessage(N_("Mark removed"));
                } else {
-                       owner->view()->beforeChange();
+                       owner->view()->beforeChange(text);
                        text->mark_set = 1;
                        owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
                        setMessage(N_("Mark set"));
                }
                text->sel_cursor = text->cursor;
-#if 0
-               if (text->inset_owner)
-                   owner->view()->updateInset(text->inset_owner, true);
-#endif
                break;
                
        case LFUN_DELETE:
@@ -1986,10 +1914,6 @@ string const LyXFunc::Dispatch(int ac,
        case LFUN_DELETE_WORD_FORWARD:
                owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
                text->DeleteWordForward(owner->view());
-#if 0
-               if (text->inset_owner)
-                   owner->view()->updateInset(text->inset_owner, true);
-#endif
                owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                moveCursorUpdate(text, false);
                owner->showState();
@@ -1999,10 +1923,6 @@ string const LyXFunc::Dispatch(int ac,
        case LFUN_DELETE_WORD_BACKWARD:
                owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
                text->DeleteWordBackward(owner->view());
-#if 0
-               if (text->inset_owner)
-                   owner->view()->updateInset(text->inset_owner, true);
-#endif
                owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                moveCursorUpdate(text, false);
                owner->showState();
@@ -2012,36 +1932,24 @@ string const LyXFunc::Dispatch(int ac,
        case LFUN_DELETE_LINE_FORWARD:
                owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
                text->DeleteLineForward(owner->view());
-#if 0
-               if (text->inset_owner)
-                   owner->view()->updateInset(text->inset_owner, true);
-#endif
                owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                moveCursorUpdate(text, false);
                break;
                
                /* -------> Set mark off. */
        case LFUN_MARK_OFF:
-               owner->view()->beforeChange();
+               owner->view()->beforeChange(text);
                owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
                text->sel_cursor = text->cursor;
                setMessage(N_("Mark off"));
-#if 0
-               if (text->inset_owner)
-                   owner->view()->updateInset(text->inset_owner, true);
-#endif
                break;
 
                /* -------> Set mark on. */
        case LFUN_MARK_ON:
-               owner->view()->beforeChange();
+               owner->view()->beforeChange(text);
                text->mark_set = 1;
                owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
                text->sel_cursor = text->cursor;
-#if 0
-               if (text->inset_owner)
-                   owner->view()->updateInset(text->inset_owner, true);
-#endif
                setMessage(N_("Mark on"));
                break;
                
@@ -2101,7 +2009,7 @@ string const LyXFunc::Dispatch(int ac,
 
        case LFUN_BREAKPARAGRAPH:
        {
-               owner->view()->beforeChange();
+               owner->view()->beforeChange(owner->view()->text);
                owner->view()->text->BreakParagraph(owner->view(), 0);
                owner->view()->update(owner->view()->text,
                                      BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
@@ -2114,7 +2022,7 @@ string const LyXFunc::Dispatch(int ac,
 
        case LFUN_BREAKPARAGRAPHKEEPLAYOUT:
        {
-               owner->view()->beforeChange();
+               owner->view()->beforeChange(owner->view()->text);
                owner->view()->text->BreakParagraph(owner->view(), 1);
                owner->view()->update(owner->view()->text,
                                      BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
@@ -2133,7 +2041,7 @@ string const LyXFunc::Dispatch(int ac,
                
                LyXCursor cursor = owner->view()->text->cursor;
                
-               owner->view()->beforeChange();
+               owner->view()->beforeChange(owner->view()->text);
                if (cursor.pos() == 0) {
                        if (cursor.par()->added_space_top == VSpace(VSpace::NONE)) {
                                owner->view()->text->SetParagraph
@@ -2208,11 +2116,10 @@ string const LyXFunc::Dispatch(int ac,
        break;
        
        case LFUN_QUOTE:
-               owner->view()->beforeChange();
-               owner->view()->text->InsertChar(owner->view(), '\"');  // This " matches the single quote in the code
-               owner->view()->update(owner->view()->text,
-                                     BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-                moveCursorUpdate(owner->view()->text, false);
+               owner->view()->beforeChange(text);
+               text->InsertChar(owner->view(), '\"');  // This " matches the single quote in the code
+               owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+                moveCursorUpdate(text, false);
                break;
 
        case LFUN_HTMLURL:
@@ -3057,24 +2964,16 @@ string const LyXFunc::Dispatch(int ac,
                                }
                        }
                        
-                       owner->view()->beforeChange();
+                       owner->view()->beforeChange(owner->view()->text);
                        LyXFont const old_font(owner->view()->text->real_current_font);
                        for (string::size_type i = 0;
                             i < argument.length(); ++i) {
                                if (greek_kb_flag) {
                                        if (!math_insert_greek(owner->view(),
                                                               argument[i]))
-#if 0
-                                               owner->getIntl()->getTrans()->TranslateAndInsert(argument[i], owner->view()->text);
-#else
                                                owner->getIntl()->getTrans().TranslateAndInsert(argument[i], owner->view()->text);
-#endif
                                } else
-#if 0
-                                       owner->getIntl()->getTrans()->TranslateAndInsert(argument[i], owner->view()->text);
-#else
                                        owner->getIntl()->getTrans().TranslateAndInsert(argument[i], owner->view()->text);
-#endif
                        }
 
                        owner->view()->update(owner->view()->text,