]> git.lyx.org Git - lyx.git/blobdiff - src/LyXAction.C
mathed95.diff
[lyx.git] / src / LyXAction.C
index d46ffab334c9c573390c8af8e0b4e35367c5f0bb..753554303552e427eeb2a07b89f6297c8aa290d4 100644 (file)
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *      
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
 #include "debug.h"
 #include "gettext.h"
 #include "support/lstrings.h"
-#if 1
-// only to get access to NEW_INSETS
-#include "lyxparagraph.h"
-#endif
 
 using std::ostream;
 using std::endl;
@@ -42,7 +38,7 @@ using std::endl;
  
      (May 19 1996, 12:04, RvdK)
  */
+
 // These are globals. 
 LyXAction lyxaction;
 
@@ -58,13 +54,6 @@ void LyXAction::newFunc(kb_action action, string const & name,
 }
 
 
-struct lfun_item {
-       kb_action action;
-       char const * name;
-       char const * helpText;
-       unsigned int attrib;
-};
-
 void LyXAction::init()
 {
        // This function was changed to use the array below in initalization
@@ -73,9 +62,16 @@ void LyXAction::init()
        // occupies after the init is completed. It compiles several
        // magnitudes faster.
        
-       static bool init = false;
+       static bool init;
        if (init) return;
 
+       struct lfun_item {
+               kb_action action;
+               char const * name;
+               char const * helpText;
+               unsigned int attrib;
+       };
+
        lfun_item items[] = {
                { LFUN_ACUTE, "accent-acute", "", Noop },
                { LFUN_BREVE, "accent-breve", "", Noop },
@@ -105,6 +101,8 @@ void LyXAction::init()
                { LFUN_INSERT_BIBTEX, "bibtex-insert", N_("Insert bibtex"),
                  Noop },
                { LFUN_BIBTEX_STYLE, "bibtex-style", "", Noop },
+               { LFUN_BOOKMARK_GOTO, "bookmark-goto", "", ReadOnly },
+               { LFUN_BOOKMARK_SAVE, "bookmark-save", "", ReadOnly },
                { LFUN_BREAKLINE, "break-line", "", Noop },
                { LFUN_BREAKPARAGRAPH, "break-paragraph", "", Noop },
                { LFUN_BREAKPARAGRAPHKEEPLAYOUT, "break-paragraph-keep-layout",
@@ -117,7 +115,7 @@ void LyXAction::init()
                  N_("Go to beginning of document"), ReadOnly },
                { LFUN_BEGINNINGBUFSEL, "buffer-begin-select",
                  N_("Select to beginning of document"), ReadOnly },
-               { LFUN_CHILDINSERT, "buffer-child-insert", "", Noop },
+               { LFUN_CHILD_INSERT, "buffer-child-insert", "", Noop },
                { LFUN_CHILDOPEN, "buffer-child-open", "", ReadOnly },
                { LFUN_RUNCHKTEX, "buffer-chktex", N_("Check TeX"), ReadOnly },
                { LFUN_CLOSEBUFFER, "buffer-close", N_("Close"), ReadOnly },
@@ -126,12 +124,6 @@ void LyXAction::init()
                { LFUN_ENDBUFSEL, "buffer-end-select",
                  N_("Select to end of document"), ReadOnly },
                { LFUN_EXPORT, "buffer-export", N_("Export to"), ReadOnly },
-#if 0
-               { LFUN_FAX, "buffer-fax", N_("Fax"), ReadOnly },
-#endif
-#ifndef NEW_INSETS
-               { LFUN_INSERTFOOTNOTE, "buffer-float-insert", "", Noop },
-#endif
                { LFUN_IMPORT, "buffer-import",
                  N_("Import document"), NoBuffer },
                { LFUN_BUFFER_PRINT, "buffer-print-xtl", N_("Print"),
@@ -141,7 +133,6 @@ void LyXAction::init()
                { LFUN_MENUNEW, "buffer-new", N_("New document") , NoBuffer },
                { LFUN_MENUNEWTMPLT,"buffer-new-template",
                  N_("New document from template"), NoBuffer },
-               { LFUN_MENUOPEN, "buffer-open", N_("Open"), NoBuffer },
                { LFUN_MENUPRINT, "buffer-print", N_("Print"), ReadOnly },
                { LFUN_MENURELOAD, "buffer-reload",
                  N_("Revert to saved"), ReadOnly },
@@ -152,7 +143,7 @@ void LyXAction::init()
                { LFUN_UPDATE, "buffer-update", N_("Update"), ReadOnly },
                { LFUN_PREVIEW, "buffer-view", N_("View") , ReadOnly },
                { LFUN_MENUWRITE, "buffer-write", N_("Save"), ReadOnly },
-               { LFUN_MENUWRITEAS, "buffer-write-as", N_("Save As"),
+               { LFUN_WRITEAS, "buffer-write-as", N_("Save As"),
                  ReadOnly },
                { LFUN_CANCEL, "cancel", N_("Cancel"), NoBuffer },
                { LFUN_INSET_CAPTION, "caption-insert", "", Noop },
@@ -194,17 +185,19 @@ void LyXAction::init()
                  N_("Insert a new ERT Inset"), Noop },
                { LFUN_INSET_EXTERNAL, "external-insert",
                  N_("Insert a new external inset"), Noop },
-               { LFUN_FIGURE, "figure-insert", N_("Insert Figure"), Noop },
+               { LFUN_FIGURE, "figure-insert", N_("Insert Graphics"), Noop },
                { LFUN_INSET_GRAPHICS, "graphics-insert",
                  N_("Insert Graphics"), Noop },
                { LFUN_FILE_INSERT, "file-insert", "", Noop },
-               { LFUN_FILE_INSERT_ASCII, "file-insert-ascii", "", Noop },
+               { LFUN_FILE_INSERT_ASCII, "file-insert-ascii", _("Insert ASCII files as lines"), Noop },
+               { LFUN_FILE_INSERT_ASCII_PARA, "file-insert-ascii-para", _("Insert ASCII file as a paragraph"), Noop },
                { LFUN_FILE_NEW, "file-new", "", NoBuffer },
-               { LFUN_FILE_OPEN, "file-open", "", NoBuffer },
+               { LFUN_FILE_OPEN, "file-open", _("Open a file"), NoBuffer },
                { LFUN_MENUSEARCH, "find-replace", N_("Find & Replace"),
                  ReadOnly },
-               { LFUN_INSET_FLOAT, "float-insert", "", Noop },
-               { LFUN_FLOATSOPERATE, "floats-operate", "", ReadOnly },
+               { LFUN_INSET_FLOAT, "float-insert", "Insert a Float", Noop },
+               { LFUN_INSET_WIDE_FLOAT, "float-wide-insert",
+                 "Insert a wide Float", Noop },
                { LFUN_BOLD, "font-bold", N_("Toggle bold"), Noop },
                { LFUN_CODE, "font-code", N_("Toggle code style"), Noop },
                { LFUN_DEFAULT, "font-default", N_("Default font style"),
@@ -221,13 +214,8 @@ void LyXAction::init()
                  ReadOnly },
                { LFUN_UNDERLINE, "font-underline",
                  N_("Toggle font underline"), Noop },
-#ifndef NEW_INSETS
-               { LFUN_FOOTMELT, "footnote-insert", N_("Insert Footnote"),
-                 Noop },
-#else
                { LFUN_INSET_FOOTNOTE, "footnote-insert",
                  N_("Insert Footnote"), Noop },
-#endif
                { LFUN_RIGHTSEL, "forward-select", N_("Select next char"),
                  ReadOnly },
                { LFUN_HFILL, "hfill-insert",
@@ -268,7 +256,7 @@ void LyXAction::init()
                { LFUN_LAYOUT_COPY, "layout-copy",
                  N_("Copy paragraph environment type"), Noop },
                { LFUN_LAYOUT_DOCUMENT, "layout-document", "", ReadOnly },
-               { LFUN_LAYOUTNO, "layout-number", "", Noop }, // internal only
+               { LFUN_LAYOUTNO, "", "internal only", Noop },
                { LFUN_LAYOUT_PARAGRAPH, "layout-paragraph", "", ReadOnly },
                { LFUN_LAYOUT_PASTE, "layout-paste",
                  N_("Paste paragraph environment type"), Noop },
@@ -286,25 +274,9 @@ void LyXAction::init()
                { LFUN_ENDSEL, "line-end-select",
                  N_("Select to end of line"), ReadOnly },
                { LFUN_INSET_LIST, "list-insert", "", Noop },
-               { LFUN_LOA_INSERT, "loa-insert",
-                 N_("Insert list of algorithms"), Noop },
-               { LFUN_LOAVIEW, "loa-view",
-                 N_("View list of algorithms"), ReadOnly },
-               { LFUN_LOF_INSERT, "lof-insert",
-                 N_("Insert list of figures"), Noop },
-               { LFUN_LOFVIEW, "lof-view",
-                 N_("View list of figures"), ReadOnly },
-               { LFUN_LOT_INSERT, "lot-insert",
-                 N_("Insert list of tables"), Noop },
-               { LFUN_LOTVIEW, "lot-view",
-                 N_("View list of tables"), ReadOnly },
                { LFUN_QUIT, "lyx-quit", N_("Exit"), NoBuffer },
                { LFUN_INSET_MARGINAL, "marginalnote-insert",
                  N_("Insert Marginalnote"), Noop },
-#ifndef NEW_INSETS
-               { LFUN_MARGINMELT, "marginpar-insert",
-                 N_("Insert Margin note"), Noop },
-#endif
                { LFUN_MARK_OFF, "mark-off", "", ReadOnly },
                { LFUN_MARK_ON, "mark-on", "", ReadOnly },
                { LFUN_SETMARK, "mark-toggle", "", ReadOnly },
@@ -316,14 +288,22 @@ void LyXAction::init()
                  N_("Insert math symbol"), Noop },
                { LFUN_MATH_LIMITS, "math-limits", "", Noop },
                { LFUN_MATH_MACRO, "math-macro", "", Noop },
+               { LFUN_MATH_MUTATE, "math-mutate", "", Noop },
+               { LFUN_MATH_IMPORT_SELECTION, "math-import-selection", "", Noop },
                { LFUN_MATH_MACROARG, "math-macro-arg", "", Noop },
                { LFUN_INSERT_MATRIX, "math-matrix", "", Noop },
                { LFUN_MATH_MODE, "math-mode", N_("Math mode"), Noop },
                { LFUN_MATH_NONUMBER, "math-nonumber", "", Noop },
                { LFUN_MATH_NUMBER, "math-number", "", Noop },
+               { LFUN_MATH_EXTERN, "math-extern", "", Noop },
+               { LFUN_MATH_VALIGN, "math-valign", "", Noop },
+               { LFUN_MATH_HALIGN, "math-halign", "", Noop },
+               { LFUN_MATH_ROW_INSERT, "math-row-insert", "", Noop },
+               { LFUN_MATH_ROW_DELETE, "math-row-delete", "", Noop },
+               { LFUN_MATH_COLUMN_INSERT, "math-column-insert", "", Noop },
+               { LFUN_MATH_COLUMN_DELETE, "math-column-delete", "", Noop },
                { LFUN_MATH_PANEL, "math-panel", "", Noop },
                { LFUN_MATH_SIZE, "math-size", "", Noop },
-               { LFUN_MELT, "melt", N_("Melt"), Noop },
                { LFUN_MENU_OPEN_BY_NAME, "menu-open", "", NoBuffer },
                { LFUN_MENU_SEPARATOR, "menu-separator-insert", "", Noop },
                { LFUN_META_FAKE, "meta-prefix", "", NoBuffer },
@@ -355,10 +335,10 @@ void LyXAction::init()
                { LFUN_RECONFIGURE, "reconfigure",
                  N_("Reconfigure"), NoBuffer },
                { LFUN_REDO, "redo", N_("Redo"), Noop },
-               { LFUN_REF_BACK, "reference-back", "", ReadOnly },
                { LFUN_REF_GOTO, "reference-goto", "", ReadOnly },
                { LFUN_REF_INSERT, "reference-insert",
                  N_("Insert cross reference"), ReadOnly },
+               { LFUN_REFERENCE_GOTO, "reference-next", "", ReadOnly },
                { LFUN_NEXT, "screen-down", "", ReadOnly },
                { LFUN_NEXTSEL, "screen-down-select", "", ReadOnly },
                { LFUN_SCREEN_FONT_UPDATE, "screen-font-update",
@@ -379,19 +359,20 @@ void LyXAction::init()
                { LFUN_GOTOFILEROW, "server-goto-file-row", "", Noop },
                { LFUN_NOTIFY, "server-notify", "", ReadOnly },
                { LFUN_SETXY, "server-set-xy", "", ReadOnly },
-               { LFUN_SET_COLOR, "set-color", "", Noop },
+               { LFUN_SET_COLOR, "set-color", "", ReadOnly|NoBuffer },
                { LFUN_SPELLCHECK, "spellchecker", "", Noop },
-               { LFUN_INSERT_MATH, "symbol-insert", "", Noop },
                { LFUN_SHIFT_TAB, "tab-backward", "", Noop },
                { LFUN_TAB, "tab-forward", "", Noop },
                { LFUN_TABINSERT, "tab-insert", "", Noop },
                { LFUN_DIALOG_TABULAR_INSERT, "dialog-tabular-insert",
-                 N_("Open Insert Tabular Dialog"), Noop },
+                 N_("Insert Table"), Noop },
                { LFUN_TABULAR_FEATURE, "tabular-feature",
                  N_("Tabular Features"), Noop },
                { LFUN_INSET_TABULAR, "tabular-insert",
                  N_("Insert a new Tabular Inset"), Noop },
+#ifndef NO_LATEX
                { LFUN_TEX, "tex-mode", N_("Toggle TeX style"), Noop },
+#endif
                { LFUN_INSET_TEXT, "text-insert",
                  N_("Insert a new Text Inset"), Noop },
                { LFUN_INSET_THEOREM, "theorem-insert", "", Noop },
@@ -408,7 +389,7 @@ void LyXAction::init()
                { LFUN_UP, "up", "", ReadOnly },
                { LFUN_UPSEL, "up-select", "", ReadOnly },
                { LFUN_URL, "url-insert", "", Noop },
-               { LFUN_INSERT_URL, "", "", Noop },
+               { LFUN_INSERT_URL, "", "internal only", Noop },
                { LFUN_VC_CHECKIN, "vc-check-in", "", ReadOnly },
                { LFUN_VC_CHECKOUT, "vc-check-out", "", ReadOnly },
                { LFUN_VC_HISTORY, "vc-history", "", ReadOnly },
@@ -428,6 +409,17 @@ void LyXAction::init()
                { LFUN_WORDRIGHTSEL, "word-forward-select", "", ReadOnly },
                { LFUN_LOWCASE_WORD, "word-lowcase", "", Noop },
                { LFUN_UPCASE_WORD, "word-upcase", "", Noop },
+               { LFUN_MESSAGE, "message",
+                 N_("Show message in minibuffer"), NoBuffer },
+               { LFUN_MESSAGE_PUSH, "message-push",
+                 N_("Push old message and show this one in minibuffer"),
+                 NoBuffer },
+               { LFUN_MESSAGE_POP, "message-pop",
+                 N_("Pop old message and show it in the minibuffer"),
+                 NoBuffer },
+               { LFUN_TRANSPOSE_CHARS, "chars-transpose", "", Noop },
+               { LFUN_FLOAT_LIST, "float-list", "Insert a float list", Noop },
+               { LFUN_ESCAPE, "escape", "", Noop },
                { LFUN_NOACTION, "", "", Noop }
        };
 
@@ -463,7 +455,7 @@ int LyXAction::searchActionArg(kb_action action, string const & arg) const
                                      << endl;
                return LFUN_UNKNOWN_ACTION;
        }
-       
+
        arg_item::const_iterator aci = (*pit).second.find(arg);
 
        if (aci == (*pit).second.end()) {
@@ -487,7 +479,7 @@ int LyXAction::searchActionArg(kb_action action, string const & arg) const
 // Returns a pseudo-action given an action and its argument.
 int LyXAction::getPseudoAction(kb_action action, string const & arg) const
 {
-       int psdaction = searchActionArg(action, arg);
+       int const psdaction = searchActionArg(action, arg);
 
        if (isPseudoAction(psdaction)) return psdaction;
 
@@ -519,7 +511,7 @@ int LyXAction::getPseudoAction(kb_action action, string const & arg) const
 kb_action LyXAction::retrieveActionArg(int pseudo, string & arg) const
 {
        arg.erase(); // clear it to be sure.
-       
+
        pseudo_map::const_iterator pit = lyx_pseudo_map.find(pseudo);
 
        if (pit != lyx_pseudo_map.end()) {
@@ -542,7 +534,7 @@ int LyXAction::LookupFunc(string const & func) const
 
        // split action and arg
        string actstr;
-       string argstr = split(func, actstr, ' ');
+       string const argstr = split(func, actstr, ' ');
        lyxerr[Debug::ACTION] << "Action: " << actstr << '\n';
        lyxerr[Debug::ACTION] << "Arg   : " << argstr << '\n';
 
@@ -595,7 +587,7 @@ int LyXAction::getApproxFunc(string const & func) const
 
 string const LyXAction::getApproxFuncName(string const & func) const
 {
-       int f = getApproxFunc(func);
+       int const f = getApproxFunc(func);
        // This will return empty string if f isn't an action.
        return getActionName(f);
 }
@@ -674,7 +666,18 @@ bool LyXAction::funcHasFlag(kb_action action,
                        "No info about kb_action: " << action << '\n';
                return false;
        }
+}
 
+
+LyXAction::const_func_iterator LyXAction::func_begin() const 
+{
+       return lyx_func_map.begin();
+}
+
+
+LyXAction::const_func_iterator LyXAction::func_end() const 
+{
+       return lyx_func_map.end();
 }