Fix small bug in reading \set_color in lyxrc

[lyx.git] / src / lyxfunc.C

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index 8d2ca3f1ed8556e1b63ffe23413839945580960c..01f949df91e99fe43fac748ea13a041cc94fbd63 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -28,6 +28,7 @@ using std::istringstream;
 #pragma implementation
 #endif
 
+#include "version.h"
 #include "lyxlookup.h"
 #include "kbmap.h"
 #include "lyxfunc.h"
@@ -62,8 +63,8 @@ using std::istringstream;
 #include "insets/insetlist.h"
 #include "insets/insettabular.h"
 #include "insets/insettheorem.h"
+#include "insets/insetcaption.h"
 #include "mathed/formulamacro.h"
-#include "toolbar.h"
 #include "spellchecker.h" // RVDK_PATCH_5
 #include "minibuffer.h"
 #include "vspace.h"
@@ -85,9 +86,15 @@ using std::istringstream;
 #include "layout.h"
 #include "WorkArea.h"
 #include "lyxfr1.h"
-#include "menus.h"
 #include "bufferview_funcs.h"
 #include "frontends/Dialogs.h"
+#include "frontends/Toolbar.h"
+#ifdef NEW_MENUBAR
+#include "frontends/Menubar.h"
+#else
+#include "menus.h"
+#endif
+#include "FloatList.h"
 
 using std::pair;
 using std::endl;
@@ -96,10 +103,10 @@ extern bool cursor_follows_scrollbar;
 
 extern void InsertAsciiFile(BufferView *, string const &, bool);
 extern void math_insert_symbol(char const *);
-extern Bool math_insert_greek(char const); // why "Bool"?
+extern bool math_insert_greek(char);
 extern BufferList bufferlist;
 extern LyXServer * lyxserver;
-extern short greek_kb_flag;
+extern int greek_kb_flag;
 extern FD_form_toc * fd_form_toc;
 extern bool selection_possible;
 
@@ -116,6 +123,7 @@ extern void MenuSendto();
 extern void QuitLyX();
 extern void MenuFax(Buffer *);
 extern void MenuExport(Buffer *, string const &);
+extern void show_symbols_form(LyXFunc *);
 
 extern LyXAction lyxaction;
 // (alkis)
@@ -177,7 +185,7 @@ void LyXFunc::moveCursorUpdate(bool selecting)
        
        /* ---> Everytime the cursor is moved, show the current font state. */
        // should this too me moved out of this func?
-       //owner->getMiniBuffer()->Set(CurrentState());
+       //owner->showState();
        owner->view()->setState();
 }
 
@@ -218,7 +226,7 @@ int LyXFunc::processKeyEvent(XEvent * ev)
                        owner->view()->unlockInset(tli);
                        owner->view()->text->CursorRight(owner->view());
                        moveCursorUpdate(false);
-                       owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+                       owner->showState();
                } else {
                        tli->UnlockInsetInInset(owner->view(),
                                                tli->GetLockingInset(),true);
@@ -341,6 +349,7 @@ LyXFunc::func_status LyXFunc::getStatus(int ac) const
                                // no
                                setErrorMessage(N_("Document is read-only"));
                                flag |= LyXFunc::Disabled;
+                               return flag;
                        }
                } else {
                        // no
@@ -350,9 +359,6 @@ LyXFunc::func_status LyXFunc::getStatus(int ac) const
                }
        }
 
-       if (flag & LyXFunc::Disabled)
-               return flag;
-
        // I would really like to avoid having this switch and rather try to
        // encode this in the function itself.
         static bool noLaTeX = lyxrc.latex_command == "none";
@@ -375,20 +381,31 @@ LyXFunc::func_status LyXFunc::getStatus(int ac) const
                disable = noLaTeX || lyxrc.fax_command == "none";
                break;
        case LFUN_IMPORT:
-               if (argument == "latex")
+               if (argument == "latex" || argument == "noweb")
                        disable = lyxrc.relyx_command == "none";
-               if (argument == "linuxdoc")
+               else if (argument == "linuxdoc")
                        disable = lyxrc.linuxdoc_to_lyx_command == "none";
                break;
        case LFUN_EXPORT:
-               if (argument == "dvi" || argument == "postscript")
+               if (argument == "latex")
+                       disable = ! buf->isLatex();
+               else if (argument == "linuxdoc")
+                       disable = ! buf->isLinuxDoc();
+               else if (argument == "docbook")
+                       disable = ! buf->isDocBook();
+               else if (argument == "dvi" || argument == "postscript")
                        disable = noLaTeX;
-               if (argument == "html")
-                       disable = lyxrc.html_command == "none";
-               if (argument == "html-linuxdoc")
-                       disable = lyxrc.linuxdoc_to_html_command == "none";
-               if (argument == "html-docbook")
-                       disable = lyxrc.docbook_to_html_command == "none";
+               else if (argument == "html")
+                       disable = (! buf->isLatex() 
+                                  || lyxrc.html_command == "none");
+               else if (argument == "html-linuxdoc")
+                       disable = (! buf->isLinuxDoc() 
+                                  || lyxrc.linuxdoc_to_html_command == "none");
+               else if (argument == "html-docbook")
+                       disable = (! buf->isDocBook() 
+                                  || lyxrc.docbook_to_html_command == "none");
+               else if (argument == "custom")
+                       disable == ! buf->isLatex();
                break;
        case LFUN_UNDO:
                disable = buf->undostack.empty();
@@ -402,9 +419,28 @@ LyXFunc::func_status LyXFunc::getStatus(int ac) const
        case LFUN_RUNCHKTEX:
                disable = lyxrc.chktex_command == "none";
                break;
+       case LFUN_BUILDPROG:
+               disable = (lyxrc.literate_command == "none" 
+                          || ! buf->isLiterate());
+#ifndef NEW_TABULAR
        case LFUN_LAYOUT_TABLE:
                disable = ! owner->view()->text->cursor.par()->table;
                break;
+#endif
+       case LFUN_VC_REGISTER:
+               disable = buf->lyxvc.inUse();
+               break;
+       case LFUN_VC_CHECKIN:
+               disable = !buf->lyxvc.inUse() || buf->isReadonly();
+               break;
+       case LFUN_VC_CHECKOUT:
+               disable = !buf->lyxvc.inUse() || !buf->isReadonly();
+               break;
+       case LFUN_VC_REVERT:
+       case LFUN_VC_UNDO:
+       case LFUN_VC_HISTORY:
+               disable = !buf->lyxvc.inUse();
+               break;
        default:
                break;
         }
@@ -591,29 +627,26 @@ string LyXFunc::Dispatch(int ac,
                                case LFUN_BREAKLINE:
                                        owner->view()->text->CursorRight(owner->view());
                                        owner->view()->setState();
-                                       owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+                                       owner->showState();
                                        break;
                                case LFUN_RIGHT:
                                        if (!owner->view()->text->cursor.par()->isRightToLeftPar(owner->buffer()->params)) {
                                                owner->view()->text->CursorRight(owner->view());
                                                moveCursorUpdate(false);
-                                               owner->getMiniBuffer()->
-                                                       Set(CurrentState(owner->view()));
+                                               owner->showState();
                                        }
                                        return string();
                                case LFUN_LEFT: 
                                        if (owner->view()->text->cursor.par()->isRightToLeftPar(owner->buffer()->params)) {
                                                owner->view()->text->CursorRight(owner->view());
                                                moveCursorUpdate(false);
-                                               owner->getMiniBuffer()->
-                                                       Set(CurrentState(owner->view()));
+                                               owner->showState();
                                        }
                                        return string();
                                case LFUN_DOWN:
                                        owner->view()->text->CursorDown(owner->view());
                                        moveCursorUpdate(false);
-                                       owner->getMiniBuffer()->
-                                               Set(CurrentState(owner->view()));
+                                       owner->showState();
                                        return string();
                                default:
                                        break;
@@ -869,14 +902,18 @@ string LyXFunc::Dispatch(int ac,
        }
                
        case LFUN_TABLE:
+#ifndef NEW_TABULAR
                Table();
+#else
+               owner->getDialogs()->showTabularCreate();
+#endif
                break;
                
        case LFUN_FIGURE:
                Figure();
                break;
 
-       case LFUN_INSERT_GRAPHICS:
+       case LFUN_INSET_GRAPHICS:
        {
                Inset * new_inset = new InsetGraphics;
                if (!owner->view()->insertInset(new_inset))
@@ -951,10 +988,12 @@ string LyXFunc::Dispatch(int ac,
        case LFUN_GOTONOTE:
                owner->view()->gotoNote();
                break;
-               
+
+#ifndef NEW_INSETS
        case LFUN_OPENSTUFF:
                owner->view()->openStuff();
                break;
+#endif
                
        case LFUN_HYPHENATION:
                owner->view()->hyphenationPoint();
@@ -991,23 +1030,23 @@ string LyXFunc::Dispatch(int ac,
        case LFUN_FREE:
                Free(owner->view());
                owner->view()->setState();
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
                break;
                
        case LFUN_TEX:
                Tex(owner->view());
                owner->view()->setState();
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
                break;
-               
+#ifndef NEW_INSETS             
        case LFUN_MELT:
                Melt(owner->view());
                break;
-               
+#endif
        case LFUN_RECONFIGURE:
                Reconfigure(owner->view());
                break;
-
+#ifndef NEW_INSETS
        case LFUN_FOOTMELT:
                if (owner->view()->available()
                    && !owner->view()->text->selection
@@ -1034,11 +1073,47 @@ string LyXFunc::Dispatch(int ac,
                        Margin(owner->view()); 
                owner->view()->setState();
                break;
-               
+#endif
        case LFUN_HELP_COPYRIGHT:
                owner->getDialogs()->showCopyright();
                break;
 
+       case LFUN_HELP_CREDITS:
+               owner->getDialogs()->showCredits();
+               break;
+
+        case LFUN_HELP_OPEN: {
+               string arg = argument;
+               if (arg.empty()) {
+                       setErrorMessage(N_("Missing argument"));
+                       break;
+               }
+               ProhibitInput(owner->view());
+               string fname = i18nLibFileSearch("doc", arg, "lyx");
+               if (fname.empty()) {
+                       lyxerr << "LyX: unable to find documentation file `"
+                              << arg << "'. Bad installation?" << endl;
+                       AllowInput(owner->view());
+                       break;
+               }
+               owner->getMiniBuffer()->Set(_("Opening help file"),
+                                           MakeDisplayPath(fname),"...");
+               owner->view()->buffer(bufferlist.loadLyXFile(fname,false));
+               AllowInput(owner->view());
+               break;
+        }
+
+       case LFUN_HELP_VERSION: 
+               ProhibitInput(owner->view());
+               fl_show_message((string(_("LyX Version ")) + LYX_VERSION 
+                                + _(" of ") + LYX_RELEASE).c_str(),
+                               (_("Library directory: ")
+                                + MakeDisplayPath(system_lyxdir)).c_str(),
+                               (_("User directory: ") 
+                                + MakeDisplayPath(user_lyxdir)).c_str());
+               AllowInput(owner->view());
+               break;
+
                // --- version control -------------------------------
        case LFUN_VC_REGISTER:
        {
@@ -1083,6 +1158,11 @@ string LyXFunc::Dispatch(int ac,
        
        // --- buffers ----------------------------------------
 
+        case LFUN_SWITCHBUFFER:
+                owner->view()->buffer(bufferlist.getBuffer(argument));
+               break;
+
+
        case LFUN_FILE_INSERT:
        {
                MenuInsertLyXFile(argument);
@@ -1167,10 +1247,7 @@ string LyXFunc::Dispatch(int ac,
                        owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
                        owner->view()->text->
                                SetLayout(owner->view(), layout.second);
-                       owner->getToolbar()->combox->
-                               select(owner->view()->
-                                      text->cursor.par()->
-                                      GetLayout() + 1);
+                       owner->setLayout(layout.second);
                        owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                        owner->view()->setState();
                }
@@ -1214,58 +1291,58 @@ string LyXFunc::Dispatch(int ac,
                break;
                
        case LFUN_DROP_LAYOUTS_CHOICE:
-               owner->getToolbar()->combox->Show();
+               owner->getToolbar()->openLayoutList();
                break;
 
        case LFUN_LANGUAGE:
                Lang(owner->view(), argument);
                owner->view()->setState();
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
                break;
 
        case LFUN_EMPH:
                Emph(owner->view());
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
                break;
 
        case LFUN_BOLD:
                Bold(owner->view());
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
                break;
                
        case LFUN_NOUN:
                Noun(owner->view());
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
                break;
                
        case LFUN_CODE:
                Code(owner->view());
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
                break;
                
        case LFUN_SANS:
                Sans(owner->view());
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
                break;
                
        case LFUN_ROMAN:
                Roman(owner->view());
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
                break;
                
        case LFUN_DEFAULT:
                StyleReset(owner->view());
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
                break;
                
        case LFUN_UNDERLINE:
                Underline(owner->view());
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
                break;
                
        case LFUN_FONT_SIZE:
                FontSize(owner->view(), argument);
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
                break;
                
        case LFUN_FONT_STATE:
@@ -1341,7 +1418,11 @@ string LyXFunc::Dispatch(int ac,
        break;
                
        case LFUN_MENU_OPEN_BY_NAME:
+#ifdef NEW_MENUBAR
+               owner->getMenubar()->openByName(argument);
+#else
                owner->getMenus()->openByName(argument);
+#endif
                break; // RVDK_PATCH_5
                
        case LFUN_SPELLCHECK:
@@ -1373,7 +1454,7 @@ string LyXFunc::Dispatch(int ac,
                        tmptext->CursorRight(owner->view(), false);
                owner->view()->text->FinishUndo();
                moveCursorUpdate(false);
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
        }
        break;
                
@@ -1398,8 +1479,9 @@ string LyXFunc::Dispatch(int ac,
                                                    txt->cursor.par(),
                                                    txt->cursor.pos());
                        tmpinset->Edit(owner->view(),
-                                      tmpinset->x() + tmpinset->width(owner->view()->painter(),font),
-                                      tmpinset->descent(owner->view()->painter(),font),
+                                      tmpinset->x() +
+                                      tmpinset->width(owner->view(),font),
+                                      tmpinset->descent(owner->view(),font),
                                       0);
                        break;
                }
@@ -1408,7 +1490,7 @@ string LyXFunc::Dispatch(int ac,
 
                owner->view()->text->FinishUndo();
                moveCursorUpdate(false);
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
        }
        break;
                
@@ -1418,7 +1500,7 @@ string LyXFunc::Dispatch(int ac,
                owner->view()->text->CursorUp(owner->view());
                owner->view()->text->FinishUndo();
                moveCursorUpdate(false);
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
                break;
                
        case LFUN_DOWN:
@@ -1428,7 +1510,7 @@ string LyXFunc::Dispatch(int ac,
                owner->view()->text->CursorDown(owner->view());
                owner->view()->text->FinishUndo();
                moveCursorUpdate(false);
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
                break;
 
        case LFUN_UP_PARAGRAPH:
@@ -1438,7 +1520,7 @@ string LyXFunc::Dispatch(int ac,
                owner->view()->text->CursorUpParagraph(owner->view());
                owner->view()->text->FinishUndo();
                moveCursorUpdate(false);
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
                break;
                
        case LFUN_DOWN_PARAGRAPH:
@@ -1448,7 +1530,7 @@ string LyXFunc::Dispatch(int ac,
                owner->view()->text->CursorDownParagraph(owner->view());
                owner->view()->text->FinishUndo();
                moveCursorUpdate(false);
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
                break;
                
        case LFUN_PRIOR:
@@ -1458,7 +1540,7 @@ string LyXFunc::Dispatch(int ac,
                owner->view()->cursorPrevious();
                owner->view()->text->FinishUndo();
                moveCursorUpdate(false);
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
                break;
                
        case LFUN_NEXT:
@@ -1468,7 +1550,7 @@ string LyXFunc::Dispatch(int ac,
                owner->view()->cursorNext();
                owner->view()->text->FinishUndo();
                moveCursorUpdate(false);
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
                break;
                
        case LFUN_HOME:
@@ -1478,7 +1560,7 @@ string LyXFunc::Dispatch(int ac,
                owner->view()->text->CursorHome(owner->view());
                owner->view()->text->FinishUndo();
                moveCursorUpdate(false);
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
                break;
                
        case LFUN_END:
@@ -1488,7 +1570,7 @@ string LyXFunc::Dispatch(int ac,
                owner->view()->text->CursorEnd(owner->view());
                owner->view()->text->FinishUndo();
                moveCursorUpdate(false);
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
                break;
                
        case LFUN_SHIFT_TAB:
@@ -1499,7 +1581,7 @@ string LyXFunc::Dispatch(int ac,
                owner->view()->text->CursorTab(owner->view());
                owner->view()->text->FinishUndo();
                moveCursorUpdate(false);
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
                break;
                
        case LFUN_WORDRIGHT:
@@ -1512,7 +1594,7 @@ string LyXFunc::Dispatch(int ac,
                        owner->view()->text->CursorRightOneWord(owner->view());
                owner->view()->text->FinishUndo();
                moveCursorUpdate(false);
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
                break;
                
        case LFUN_WORDLEFT:
@@ -1525,7 +1607,7 @@ string LyXFunc::Dispatch(int ac,
                        owner->view()->text->CursorLeftOneWord(owner->view());
                owner->view()->text->FinishUndo();
                moveCursorUpdate(false);
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
                break;
                
        case LFUN_BEGINNINGBUF:
@@ -1535,7 +1617,7 @@ string LyXFunc::Dispatch(int ac,
                owner->view()->text->CursorTop(owner->view());
                owner->view()->text->FinishUndo();
                moveCursorUpdate(false);
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
                break;
                
        case LFUN_ENDBUF:
@@ -1545,7 +1627,7 @@ string LyXFunc::Dispatch(int ac,
                owner->view()->text->CursorBottom(owner->view());
                owner->view()->text->FinishUndo();
                moveCursorUpdate(false);
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
                break;
 
       
@@ -1558,7 +1640,7 @@ string LyXFunc::Dispatch(int ac,
                        owner->view()->text->CursorRight(owner->view());
                owner->view()->text->FinishUndo();
                moveCursorUpdate(true);
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
                break;
                
        case LFUN_LEFTSEL:
@@ -1569,7 +1651,7 @@ string LyXFunc::Dispatch(int ac,
                        owner->view()->text->CursorLeft(owner->view());
                owner->view()->text->FinishUndo();
                moveCursorUpdate(true);
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
                break;
                
        case LFUN_UPSEL:
@@ -1577,7 +1659,7 @@ string LyXFunc::Dispatch(int ac,
                owner->view()->text->CursorUp(owner->view());
                owner->view()->text->FinishUndo();
                moveCursorUpdate(true);
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
                break;
                
        case LFUN_DOWNSEL:
@@ -1585,7 +1667,7 @@ string LyXFunc::Dispatch(int ac,
                owner->view()->text->CursorDown(owner->view());
                owner->view()->text->FinishUndo();
                moveCursorUpdate(true);
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
                break;
 
        case LFUN_UP_PARAGRAPHSEL:
@@ -1593,7 +1675,7 @@ string LyXFunc::Dispatch(int ac,
                owner->view()->text->CursorUpParagraph(owner->view());
                owner->view()->text->FinishUndo();
                moveCursorUpdate(true);
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
                break;
                
        case LFUN_DOWN_PARAGRAPHSEL:
@@ -1601,7 +1683,7 @@ string LyXFunc::Dispatch(int ac,
                owner->view()->text->CursorDownParagraph(owner->view());
                owner->view()->text->FinishUndo();
                moveCursorUpdate(true);
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
                break;
                
        case LFUN_PRIORSEL:
@@ -1609,7 +1691,7 @@ string LyXFunc::Dispatch(int ac,
                owner->view()->cursorPrevious();
                owner->view()->text->FinishUndo();
                moveCursorUpdate(true);
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
                break;
                
        case LFUN_NEXTSEL:
@@ -1617,7 +1699,7 @@ string LyXFunc::Dispatch(int ac,
                owner->view()->cursorNext();
                owner->view()->text->FinishUndo();
                moveCursorUpdate(true);
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
                break;
                
        case LFUN_HOMESEL:
@@ -1625,7 +1707,7 @@ string LyXFunc::Dispatch(int ac,
                owner->view()->text->CursorHome(owner->view());
                owner->view()->text->FinishUndo();
                moveCursorUpdate(true);
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
                break;
                
        case LFUN_ENDSEL:
@@ -1633,7 +1715,7 @@ string LyXFunc::Dispatch(int ac,
                owner->view()->text->CursorEnd(owner->view());
                owner->view()->text->FinishUndo();
                moveCursorUpdate(true);
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
                break;
                
        case LFUN_WORDRIGHTSEL:
@@ -1644,7 +1726,7 @@ string LyXFunc::Dispatch(int ac,
                        owner->view()->text->CursorRightOneWord(owner->view());
                owner->view()->text->FinishUndo();
                moveCursorUpdate(true);
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
                break;
                
        case LFUN_WORDLEFTSEL:
@@ -1655,7 +1737,7 @@ string LyXFunc::Dispatch(int ac,
                        owner->view()->text->CursorLeftOneWord(owner->view());
                owner->view()->text->FinishUndo();
                moveCursorUpdate(true);
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
                break;
                
        case LFUN_BEGINNINGBUFSEL:
@@ -1663,7 +1745,7 @@ string LyXFunc::Dispatch(int ac,
                owner->view()->text->CursorTop(owner->view());
                owner->view()->text->FinishUndo();
                moveCursorUpdate(true);
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
                break;
                
        case LFUN_ENDBUFSEL:
@@ -1671,7 +1753,7 @@ string LyXFunc::Dispatch(int ac,
                owner->view()->text->CursorBottom(owner->view());
                owner->view()->text->FinishUndo();
                moveCursorUpdate(true);
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
                break;
 
                // --- text changing commands ------------------------
@@ -1726,7 +1808,7 @@ string LyXFunc::Dispatch(int ac,
                        owner->view()->cut();
                }
                moveCursorUpdate(false);
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
                owner->view()->setState();
                break;
 
@@ -1780,7 +1862,7 @@ string LyXFunc::Dispatch(int ac,
                owner->view()->text->DeleteWordForward(owner->view());
                owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                moveCursorUpdate(false);
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
                break;
 
                /* -------> Delete word backward. */
@@ -1789,7 +1871,7 @@ string LyXFunc::Dispatch(int ac,
                owner->view()->text->DeleteWordBackward(owner->view());
                owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                moveCursorUpdate(false);
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
                break;
                
                /* -------> Kill to end of line. */
@@ -1834,7 +1916,7 @@ string LyXFunc::Dispatch(int ac,
                } else {
                        owner->view()->cut();
                }
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
                owner->view()->setState();
        }
        break;
@@ -1878,7 +1960,7 @@ string LyXFunc::Dispatch(int ac,
                owner->view()->text->sel_cursor = 
                        owner->view()->text->cursor;
                owner->view()->setState();
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
                break;
        }
 
@@ -1890,7 +1972,7 @@ string LyXFunc::Dispatch(int ac,
                owner->view()->text->sel_cursor = 
                        owner->view()->text->cursor;
                owner->view()->setState();
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
                break;
        }
        
@@ -1925,7 +2007,7 @@ string LyXFunc::Dispatch(int ac,
                owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                owner->view()->text->sel_cursor = cursor;
                owner->view()->setState();
-               owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+               owner->showState();
        }
        break;
 
@@ -2061,11 +2143,18 @@ string LyXFunc::Dispatch(int ac,
 
        case LFUN_INSET_FLOAT:
        {
-               InsetFloat * new_inset = new InsetFloat;
-               if (owner->view()->insertInset(new_inset))
-                       new_inset->Edit(owner->view(), 0, 0, 0);
-               else
-                       delete new_inset;
+               // check if the float type exist
+               if (floatList.typeExist(argument)) {
+                       InsetFloat * new_inset = new InsetFloat(argument);
+                       if (owner->view()->insertInset(new_inset))
+                               new_inset->Edit(owner->view(), 0, 0, 0);
+                       else
+                               delete new_inset;
+               } else {
+                       lyxerr << "Non-existant float type: "
+                              << argument << endl;
+               }
+               
        }
        break;
 
@@ -2089,12 +2178,32 @@ string LyXFunc::Dispatch(int ac,
        }
        break;
 
+       case LFUN_INSET_CAPTION:
+       {
+               // Do we have a locking inset...
+               if (owner->view()->the_locking_inset) {
+                       lyxerr << "Locking inset code: "
+                              << owner->view()->the_locking_inset->LyxCode();
+                       InsetCaption * new_inset = new InsetCaption;
+                       new_inset->setOwner(owner->view()->the_locking_inset);
+                       new_inset->SetAutoBreakRows(true);
+                       new_inset->SetDrawFrame(0, InsetText::LOCKED);
+                       new_inset->SetFrameColor(0, LColor::footnoteframe);
+                       if (owner->view()->insertInset(new_inset))
+                               new_inset->Edit(owner->view(), 0, 0, 0);
+                       else
+                               delete new_inset;
+               }
+       }
+       break;
+       
        case LFUN_INSET_TABULAR:
        {
                int r = 2, c = 2;
                if (!argument.empty())
-                       sscanf(argument.c_str(),"%d%d",&r,&c);
-               InsetTabular * new_inset = new InsetTabular(owner->buffer(),r,c);
+                       sscanf(argument.c_str(),"%d%d", &r, &c);
+               InsetTabular * new_inset =
+                       new InsetTabular(owner->buffer(), r, c);
                if (owner->view()->insertInset(new_inset))
                        new_inset->Edit(owner->view(), 0, 0, 0);
                else
@@ -2255,15 +2364,7 @@ string LyXFunc::Dispatch(int ac,
        case LFUN_PUSH_TOOLBAR:
        {
                int nth = strToInt(argument);
-               if (lyxerr.debugging(Debug::TOOLBAR)) {
-                       lyxerr << "LFUN_PUSH_TOOLBAR: argument = `"
-                              << argument << "'\n"
-                              << "LFUN_PUSH_TOOLBAR: nth = `"
-                              << nth << "'" << endl;
-               }
-               
                if (nth <= 0) {
-                       LyXBell();
                        setErrorMessage(N_("Push-toolbar needs argument > 0"));
                } else {
                        owner->getToolbar()->push(nth);
@@ -2273,7 +2374,7 @@ string LyXFunc::Dispatch(int ac,
        
        case LFUN_ADD_TO_TOOLBAR:
        {
-               if (lyxerr.debugging(Debug::TOOLBAR)) {
+               if (lyxerr.debugging(Debug::GUI)) {
                        lyxerr << "LFUN_ADD_TO_TOOLBAR:"
                                "argument = `" << argument << '\'' << endl;
                }
@@ -2281,7 +2382,6 @@ string LyXFunc::Dispatch(int ac,
                //lyxerr <<string("Argument: ") + argument);
                //lyxerr <<string("Tmp     : ") + tmp);
                if (tmp.empty()) {
-                       LyXBell();
                        setErrorMessage(N_("Usage: toolbar-add-to <LyX command>"));
                } else {
                        owner->getToolbar()->add(argument, false);
@@ -2362,8 +2462,7 @@ string LyXFunc::Dispatch(int ac,
        break;
 
        case LFUN_MATH_MODE:   // Open or create a math inset
-       {
-               
+       {               
                if (owner->view()->available())
                        owner->view()->open_new_inset(new InsetFormula);
                setMessage(N_("Math editor mode"));
@@ -2374,30 +2473,32 @@ string LyXFunc::Dispatch(int ac,
        case LFUN_MATH_LIMITS:
        {
                setErrorMessage(N_("This is only allowed in math mode!"));
+       
+       }
+       break;
+
+       case LFUN_MATH_PANEL:
+       {
+               show_symbols_form(this);
        }
        break;
        
+       case LFUN_CREATE_CITATION:
+       {
+               owner->getDialogs()->createCitation( argument );
+       }
+       break;
+                   
        case LFUN_INSERT_CITATION:
-       {   
-               InsetCitation * new_inset = new InsetCitation();
-               // ale970405
-               // The note, if any, must be after the key, delimited
-               // by a | so both key and remark can have spaces.
-               if (!argument.empty()) {
-                       string lsarg(argument);
-                       if (contains(lsarg, "|")) {
-                               new_inset->setContents(token(lsarg, '|', 0));
-                               new_inset->setOptions(token(lsarg, '|', 1));
-                       } else
-                               new_inset->setContents(lsarg);
-                       if (!owner->view()->insertInset(new_inset))
-                               delete new_inset;
-               } else {
-                       if (owner->view()->insertInset(new_inset))
-                               new_inset->Edit(owner->view(), 0, 0, 0);
-                       else
-                               delete new_inset;
-               }
+       {
+               string keys = token(argument, '|', 0);
+               string text = token(argument, '|', 1);
+
+               InsetCitation * inset = new InsetCitation( keys, text );
+               if (!owner->view()->insertInset(inset))
+                       delete inset;
+               else
+                       owner->view()->updateInset( inset, true );
        }
        break;
                    
@@ -2550,7 +2651,7 @@ string LyXFunc::Dispatch(int ac,
        case LFUN_INSERT_NOTE:
                owner->view()->insertNote();
                break;
-               
+#ifndef NEW_INSETS
        case LFUN_INSERTFOOTNOTE: 
        {
                LyXParagraph::footnote_kind kind;
@@ -2577,7 +2678,7 @@ string LyXFunc::Dispatch(int ac,
                owner->view()->setState();
        }
        break;
-       
+#endif 
        case LFUN_BUFFERBULLETSSELECT:
                bulletForm();
                break;