]> git.lyx.org Git - lyx.git/blobdiff - src/LyXAction.C
bug 183
[lyx.git] / src / LyXAction.C
index e2d123d13c7782a52a41266f9457015d42001c4e..1762e55c645554f74b840ec31fdb30fc89441df3 100644 (file)
@@ -42,6 +42,15 @@ using std::endl;
 // These are globals. 
 LyXAction lyxaction;
 
+// Small helper function
+inline
+bool isPseudoAction(int a)
+{ 
+       return a > int(LFUN_LASTACTION); 
+}
+     
+
+
 void LyXAction::newFunc(kb_action action, string const & name,
                        string const & helpText, unsigned int attrib)
 {
@@ -153,6 +162,7 @@ void LyXAction::init()
                  ReadOnly },
                { LFUN_CITATION_CREATE, "citation-insert",
                  N_("Insert citation"), Noop },
+               { LFUN_CITATION_INSERT, "", "internal only", Noop },
                { LFUN_EXEC_COMMAND, "command-execute", "", NoBuffer },
                { LFUN_PREFIX, "command-prefix",
                  N_("Execute command"), NoBuffer },
@@ -209,6 +219,8 @@ void LyXAction::init()
                { LFUN_ROMAN, "font-roman", N_("Toggle roman font style"),
                  Noop },
                { LFUN_SANS, "font-sans", N_("Toggle sans font style"), Noop },
+               { LFUN_FRAK, "font-frak", N_("Toggle fraktur font style"), Noop },
+               { LFUN_ITAL, "font-ital", N_("Toggle italic font style"), Noop },
                { LFUN_FONT_SIZE, "font-size", N_("Set font size"), Noop },
                { LFUN_FONT_STATE, "font-state", N_("Show font state"),
                  ReadOnly },
@@ -220,18 +232,13 @@ void LyXAction::init()
                  ReadOnly },
                { LFUN_HFILL, "hfill-insert",
                  N_("Insert horizontal fill"), Noop },
-               { LFUN_HELP_COPYRIGHT, "help-copyright",
-                 N_("Display copyright information"), NoBuffer },
-               { LFUN_HELP_CREDITS, "help-credits",
-                 N_("Show the list of people who helped writing LyX"), 
-                 NoBuffer},
                { LFUN_HELP_OPEN, "help-open", N_("Open a Help file"), 
                  NoBuffer|Argument},
-               { LFUN_HELP_VERSION, "help-version",
-                 N_("Show the actual LyX version"), NoBuffer},
                { LFUN_HTMLURL, "html-insert", "", Noop },
                { LFUN_HYPHENATION, "hyphenation-point-insert",
                  N_("Insert hyphenation point"), Noop },
+               { LFUN_LIGATURE_BREAK, "ligature-break-insert",
+                 N_("Insert ligature break"), Noop },
                { LFUN_INDEX_CREATE, "index-insert",
                  N_("Insert index item"), Noop },
                { LFUN_INDEX_INSERT_LAST, "index-insert-last",
@@ -256,13 +263,10 @@ void LyXAction::init()
                { LFUN_LAYOUT_COPY, "layout-copy",
                  N_("Copy paragraph environment type"), Noop },
                { LFUN_LAYOUT_DOCUMENT, "layout-document", "", ReadOnly },
-               { LFUN_LAYOUTNO, "", "internal only", Noop },
                { LFUN_LAYOUT_PARAGRAPH, "layout-paragraph", "", ReadOnly },
                { LFUN_LAYOUT_PASTE, "layout-paste",
                  N_("Paste paragraph environment type"), Noop },
                { LFUN_LAYOUT_PREAMBLE, "layout-preamble", "", ReadOnly },
-               { LFUN_LAYOUT_SAVE_DEFAULT, "layout-save-default", "",
-                 ReadOnly },
                { LFUN_LAYOUT_TABULAR, "layout-tabular",
                  N_("Open the tabular layout"), Noop },
                { LFUN_HOME, "line-begin",
@@ -273,7 +277,9 @@ void LyXAction::init()
                { LFUN_END, "line-end", N_("Go to end of line"), ReadOnly },
                { LFUN_ENDSEL, "line-end-select",
                  N_("Select to end of line"), ReadOnly },
+#if 0
                { LFUN_INSET_LIST, "list-insert", "", Noop },
+#endif
                { LFUN_QUIT, "lyx-quit", N_("Exit"), NoBuffer },
                { LFUN_INSET_MARGINAL, "marginalnote-insert",
                  N_("Insert Marginalnote"), Noop },
@@ -286,9 +292,12 @@ void LyXAction::init()
                { LFUN_GREEK_TOGGLE, "math-greek-toggle", "", Noop },
                { LFUN_INSERT_MATH, "math-insert",
                  N_("Insert math symbol"), Noop },
+               { LFUN_SUBSCRIPT, "math-subscript", "", Noop },
+               { LFUN_SUPERSCRIPT, "math-superscript", "", Noop },
                { LFUN_MATH_LIMITS, "math-limits", "", Noop },
                { LFUN_MATH_MACRO, "math-macro", "", Noop },
                { LFUN_MATH_MUTATE, "math-mutate", "", Noop },
+               { LFUN_MATH_SPACE, "math-space", "", Noop },
                { LFUN_MATH_IMPORT_SELECTION, "math-import-selection", "", Noop },
                { LFUN_MATH_MACROARG, "math-macro-arg", "", Noop },
                { LFUN_INSERT_MATRIX, "math-matrix", "", Noop },
@@ -310,7 +319,8 @@ void LyXAction::init()
                { LFUN_INSET_MINIPAGE, "minipage-insert", "", Noop },
                { LFUN_INSERT_NOTE, "note-insert", "", Noop },
                { LFUN_GOTONOTE, "note-next", "", ReadOnly },
-               { LFUN_OPENSTUFF, "open-stuff", "", ReadOnly },
+               { LFUN_INSET_TOGGLE, "inset-toggle", 
+                 N_("toggle inset"), ReadOnly },
                { LFUN_DOWN_PARAGRAPH, "paragraph-down",
                  N_("Go one paragraph down"), ReadOnly },
                { LFUN_DOWN_PARAGRAPHSEL, "paragraph-down-select",
@@ -351,7 +361,6 @@ void LyXAction::init()
                { LFUN_SELFINSERT, "self-insert", "", Noop },
                { LFUN_CHARATCURSOR, "server-char-after", "", ReadOnly },
                { LFUN_GETFONT, "server-get-font", "", ReadOnly },
-               { LFUN_GETLATEX, "server-get-latex", "", ReadOnly },
                { LFUN_GETLAYOUT, "server-get-layout", "", ReadOnly },
                { LFUN_GETNAME, "server-get-name", "", ReadOnly },
                { LFUN_GETTIP, "server-get-tip", "", ReadOnly },
@@ -370,12 +379,12 @@ void LyXAction::init()
                  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 },
+#if 0
                { LFUN_INSET_THEOREM, "theorem-insert", "", Noop },
+#endif
+               { LFUN_THESAURUS_ENTRY, "thesaurus-entry", N_("Open thesaurus"), ReadOnly },
                { LFUN_TOC_INSERT, "toc-insert",
                  N_("Insert table of contents"), Noop },
                { LFUN_TOCVIEW, "toc-view",
@@ -422,6 +431,8 @@ void LyXAction::init()
                { LFUN_ESCAPE, "escape", "", Noop },
                { LFUN_HELP_ABOUTLYX, "help-aboutlyx",
                  N_("Display information about LyX"), NoBuffer },
+               { LFUN_HELP_TEXINFO, "help-Texinfo",
+                 N_("Display information about the TeX installation"), NoBuffer },
                { LFUN_NOACTION, "", "", Noop }
        };
 
@@ -514,12 +525,15 @@ kb_action LyXAction::retrieveActionArg(int pseudo, string & arg) const
 {
        arg.erase(); // clear it to be sure.
 
+       if (!isPseudoAction(pseudo)) 
+               return static_cast<kb_action>(pseudo);
+       
        pseudo_map::const_iterator pit = lyx_pseudo_map.find(pseudo);
 
        if (pit != lyx_pseudo_map.end()) {
                lyxerr[Debug::ACTION] << "Found the pseudoaction: ["
                                      << pit->second.action << '|'
-                                     << pit->second.arg << '\n';
+                                     << pit->second.arg << "]\n";
                arg = pit->second.arg;
                return pit->second.action;
        } else {
@@ -599,12 +613,11 @@ string const LyXAction::getActionName(int action) const
 {
        kb_action ac;
        string arg;
-       if (isPseudoAction(action)) {
-               ac = retrieveActionArg(action, arg);
-               arg.insert(0, " ");
-       } else
-               ac = static_cast<kb_action>(action);
 
+       ac = retrieveActionArg(action, arg);
+       if (!arg.empty())
+               arg.insert(0, " ");
+       
        info_map::const_iterator iit = lyx_info_map.find(ac);
 
        if (iit != lyx_info_map.end()) {
@@ -623,10 +636,7 @@ string const LyXAction::helpText(int pseudoaction) const
        string help, arg;
        kb_action action;
 
-       if (isPseudoAction(pseudoaction)) 
-               action = retrieveActionArg(pseudoaction, arg);
-       else 
-               action = static_cast<kb_action>(pseudoaction);
+       action = retrieveActionArg(pseudoaction, arg);
 
        info_map::const_iterator ici = lyx_info_map.find(action);
        if (ici != lyx_info_map.end()) {