]> git.lyx.org Git - lyx.git/blobdiff - src/LyXAction.C
Fix the missing "Figure #:" label from the caption of a figure float.
[lyx.git] / src / LyXAction.C
index de47ef4085c99a4c077ac2b1baa76516382c1d67..49617b0621b5e749913b08a6c7f993c2611367e5 100644 (file)
@@ -1,7 +1,14 @@
 /**
  * \file LyXAction.C
- * Copyright 1995-2002 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ * \author John Levon
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 #include "LyXAction.h"
 
 #include "debug.h"
-#include "gettext.h"
+#include "funcrequest.h"
+
 #include "support/lstrings.h"
 
-using std::ostream;
+#include <boost/assert.hpp>
+
+using lyx::support::split;
+using lyx::support::trim;
+
 using std::endl;
-using std::pair;
-using std::make_pair;
+using std::string;
+using std::ostream;
+
 
 /*
      NAMING RULES FOR USER-COMMANDS
@@ -36,16 +49,6 @@ using std::make_pair;
 
 LyXAction lyxaction;
 
-namespace {
-
-/// return true if the given action is a pseudo-action
-inline bool isPseudoAction(int a)
-{
-       return a > int(LFUN_LASTACTION);
-}
-
-}
-
 
 void LyXAction::newFunc(kb_action action, string const & name,
                        unsigned int attrib)
@@ -111,10 +114,11 @@ void LyXAction::init()
                { LFUN_ENDBUF, "buffer-end", ReadOnly },
                { LFUN_ENDBUFSEL, "buffer-end-select", ReadOnly },
                { LFUN_EXPORT, "buffer-export", ReadOnly },
+               { LFUN_EXPORT_CUSTOM, "buffer-export-custom", ReadOnly },
+               { LFUN_PRINT, "buffer-print", ReadOnly },
                { LFUN_IMPORT, "buffer-import", NoBuffer },
                { LFUN_MENUNEW, "buffer-new", NoBuffer },
                { LFUN_MENUNEWTMPLT,"buffer-new-template", NoBuffer },
-               { LFUN_MENUPRINT, "buffer-print", ReadOnly },
                { LFUN_MENURELOAD, "buffer-reload", ReadOnly },
                { LFUN_SWITCHBUFFER, "buffer-switch", ReadOnly },
                { LFUN_READ_ONLY_TOGGLE, "buffer-toggle-read-only", ReadOnly },
@@ -145,14 +149,12 @@ void LyXAction::init()
                { LFUN_END_OF_SENTENCE, "end-of-sentence-period-insert", Noop },
                { LFUN_ENVIRONMENT_INSERT, "environment-insert", Noop },
                { LFUN_GOTOERROR, "error-next", ReadOnly },
-               { LFUN_REMOVEERRORS, "error-remove-all", ReadOnly },
                { LFUN_INSET_ERT, "ert-insert", Noop },
                { LFUN_FILE_INSERT, "file-insert", Noop },
                { LFUN_FILE_INSERT_ASCII, "file-insert-ascii", Noop },
                { LFUN_FILE_INSERT_ASCII_PARA, "file-insert-ascii-para", Noop },
                { LFUN_FILE_NEW, "file-new", NoBuffer },
                { LFUN_FILE_OPEN, "file-open", NoBuffer },
-               { LFUN_MENUSEARCH, "find-replace", ReadOnly },
                { LFUN_INSET_FLOAT, "float-insert", Noop },
                { LFUN_INSET_WIDE_FLOAT, "float-wide-insert", Noop },
                { LFUN_INSET_WRAP, "wrap-insert", Noop },
@@ -186,13 +188,11 @@ void LyXAction::init()
                { LFUN_INSERT_LABEL, "label-insert", Noop },
                { LFUN_INSET_OPTARG, "optional-insert", Noop },
                { LFUN_INSERT_BIBITEM, "bibitem-insert", Noop },
+               { LFUN_INSERT_LINE, "line-insert", Noop },
+               { LFUN_INSERT_PAGEBREAK, "pagebreak-insert", Noop },
                { LFUN_LANGUAGE, "language", Noop },
-               { LFUN_LATEX_LOG, "latex-view-log", ReadOnly },
                { LFUN_LAYOUT, "layout", Noop },
-               { LFUN_LAYOUT_CHARACTER, "layout-character", ReadOnly },
-               { LFUN_LAYOUT_DOCUMENT, "layout-document", ReadOnly },
                { LFUN_LAYOUT_PARAGRAPH, "layout-paragraph", ReadOnly },
-               { LFUN_LAYOUT_PREAMBLE, "layout-preamble", ReadOnly },
                { LFUN_LAYOUT_TABULAR, "layout-tabular", Noop },
                { LFUN_HOME, "line-begin", ReadOnly },
                { LFUN_HOMESEL, "line-begin-select", ReadOnly },
@@ -222,27 +222,27 @@ void LyXAction::init()
                { LFUN_MATH_NONUMBER, "math-nonumber", Noop },
                { LFUN_MATH_NUMBER, "math-number", Noop },
                { LFUN_MATH_EXTERN, "math-extern", Noop },
-               { LFUN_MATH_PANEL, "math-panel", Noop },
                { LFUN_MATH_SIZE, "math-size", Noop },
                { LFUN_MENU_OPEN_BY_NAME, "menu-open", NoBuffer },
                { LFUN_MENU_SEPARATOR, "menu-separator-insert", Noop },
                { LFUN_META_FAKE, "meta-prefix", NoBuffer },
-               { LFUN_INSET_MINIPAGE, "minipage-insert", Noop },
+               { LFUN_INSERT_BRANCH, "branch-insert", Noop },
+               { LFUN_INSERT_CHARSTYLE, "charstyle-insert", Noop },
                { LFUN_INSERT_NOTE, "note-insert", Noop },
+               { LFUN_INSERT_BOX, "box-insert", Noop },
                { LFUN_GOTONOTE, "note-next", ReadOnly },
-               { LFUN_INSET_TOGGLE, "inset-toggle", ReadOnly },
+               { LFUN_INSET_TOGGLE, "", ReadOnly },
+               { LFUN_NEXT_INSET_TOGGLE, "next-inset-toggle", ReadOnly },
+               { LFUN_ALL_INSETS_TOGGLE, "all-insets-toggle", ReadOnly },
                { LFUN_DOWN_PARAGRAPH, "paragraph-down", ReadOnly },
                { LFUN_DOWN_PARAGRAPHSEL, "paragraph-down-select", ReadOnly },
                { LFUN_GOTO_PARAGRAPH, "paragraph-goto", ReadOnly },
                { LFUN_PARAGRAPH_SPACING, "paragraph-spacing", Noop },
                { LFUN_UP_PARAGRAPH, "paragraph-up", ReadOnly },
                { LFUN_UP_PARAGRAPHSEL, "paragraph-up-select", ReadOnly },
-               { LFUN_PARENTINSERT, "parent-insert", Noop },
                { LFUN_PASTE, "paste", Noop },
-               { LFUN_DIALOG_PREFERENCES, "dialog-preferences", NoBuffer },
                { LFUN_SAVEPREFERENCES, "preferences-save", NoBuffer },
                { LFUN_PASTESELECTION, "primary-selection-paste", Noop },
-               { LFUN_PROTECTEDSPACE, "protected-space-insert", Noop },
                { LFUN_QUOTE, "quote-insert", Noop },
                { LFUN_RECONFIGURE, "reconfigure", NoBuffer },
                { LFUN_REDO, "redo", Noop },
@@ -256,6 +256,7 @@ void LyXAction::init()
                { LFUN_PRIORSEL, "screen-up-select", ReadOnly },
                { LFUN_SCROLL_INSET, "inset-scroll", ReadOnly },
                { LFUN_SELFINSERT, "self-insert", Noop },
+               { LFUN_SPACE_INSERT, "space-insert", Noop },
                { LFUN_CHARATCURSOR, "server-char-after", ReadOnly },
                { LFUN_GETFONT, "server-get-font", ReadOnly },
                { LFUN_GETLAYOUT, "server-get-layout", ReadOnly },
@@ -265,7 +266,6 @@ void LyXAction::init()
                { LFUN_NOTIFY, "server-notify", ReadOnly },
                { LFUN_SETXY, "server-set-xy", ReadOnly },
                { LFUN_SET_COLOR, "set-color", ReadOnly | NoBuffer },
-               { LFUN_SPELLCHECK, "spellchecker", Noop },
                { LFUN_CELL_BACKWARD, "cell-backward", Noop },
                { LFUN_CELL_FORWARD, "cell-forward", Noop },
                { LFUN_CELL_SPLIT, "cell-split", Noop },
@@ -284,7 +284,6 @@ void LyXAction::init()
                { LFUN_URL, "url-insert", Noop },
                { LFUN_VC_CHECKIN, "vc-check-in", ReadOnly },
                { LFUN_VC_CHECKOUT, "vc-check-out", ReadOnly },
-               { LFUN_VC_HISTORY, "vc-history", ReadOnly },
                { LFUN_VC_REGISTER, "vc-register", ReadOnly },
                { LFUN_VC_REVERT, "vc-revert", ReadOnly },
                { LFUN_VC_UNDO, "vc-undo-last", ReadOnly },
@@ -303,11 +302,7 @@ void LyXAction::init()
                { LFUN_MESSAGE, "message", NoBuffer },
                { LFUN_TRANSPOSE_CHARS, "chars-transpose", Noop },
                { LFUN_FLOAT_LIST, "float-list", Noop },
-               { LFUN_ESCAPE, "escape", Noop },
-               { LFUN_HELP_ABOUTLYX, "help-aboutlyx", NoBuffer },
-               { LFUN_HELP_TEXINFO, "help-Texinfo", NoBuffer },
-               { LFUN_FORKS_SHOW, "show-forks", NoBuffer },
-               { LFUN_FORKS_KILL, "kill-forks", NoBuffer },
+               { LFUN_ESCAPE, "escape", ReadOnly },
                { LFUN_TOOLTIPS_TOGGLE, "toggle-tooltips", NoBuffer },
                { LFUN_TRACK_CHANGES, "track-changes", Noop },
                { LFUN_MERGE_CHANGES, "merge-changes", Noop },
@@ -315,9 +310,10 @@ void LyXAction::init()
                { LFUN_REJECT_CHANGE, "reject-change", Noop },
                { LFUN_ACCEPT_ALL_CHANGES, "accept-all-changes", Noop },
                { LFUN_REJECT_ALL_CHANGES, "reject-all-changes", Noop },
+               { LFUN_DIALOG_SHOW, "dialog-show", NoBuffer },
                { LFUN_DIALOG_SHOW_NEW_INSET, "dialog-show-new-inset", Noop },
                { LFUN_DIALOG_SHOW_NEXT_INSET, "dialog-show-next-inset", Noop },
-               { LFUN_DIALOG_UPDATE, "dialog-update", Noop },
+               { LFUN_DIALOG_UPDATE, "dialog-update", NoBuffer },
                { LFUN_DIALOG_HIDE, "dialog-hide", Noop },
                { LFUN_DIALOG_DISCONNECT_INSET, "dialog-disconnect-inset", Noop },
                { LFUN_INSET_APPLY, "inset-apply", Noop },
@@ -325,8 +321,21 @@ void LyXAction::init()
                { LFUN_INSET_MODIFY, "", Noop },
                { LFUN_INSET_DIALOG_UPDATE, "", Noop },
                { LFUN_INSET_SETTINGS, "inset-settings", ReadOnly },
+               { LFUN_INSET_DIALOG_SHOW, "inset-dialog-show", Noop },
                { LFUN_PARAGRAPH_APPLY, "paragraph-params-apply", Noop },
                { LFUN_PARAGRAPH_UPDATE, "", Noop },
+               { LFUN_EXTERNAL_EDIT, "external-edit", Noop },
+               { LFUN_GRAPHICS_EDIT, "graphics-edit", Noop },
+               { LFUN_REPEAT, "repeat", NoBuffer },
+               { LFUN_WORD_FIND, "word-find", Noop },
+               { LFUN_WORD_REPLACE, "word-replace", Noop },
+               { LFUN_KEYMAP_TOGGLE, "keymap-toggle", Noop },
+               { LFUN_LANGUAGE_BUFFER, "buffer-language", Noop },
+               { LFUN_TEXTCLASS_APPLY, "textclass-apply", Noop },
+               { LFUN_TEXTCLASS_LOAD, "textclass-load", Noop },
+               { LFUN_SAVE_AS_DEFAULT, "buffer-save-as-default", Noop },
+               { LFUN_BUFFERPARAMS_APPLY, "buffer-params-apply", Noop },
+               { LFUN_LYXRC_APPLY, "lyxrc-apply", NoBuffer },
                { LFUN_NOACTION, "", Noop }
        };
 
@@ -344,115 +353,28 @@ LyXAction::LyXAction()
 }
 
 
-int LyXAction::searchActionArg(kb_action action, string const & arg) const
-{
-       arg_map::const_iterator pit = lyx_arg_map.find(action);
-
-       if (pit == lyx_arg_map.end()) {
-               lyxerr[Debug::ACTION] << "Action " << action
-                                     << " does not have any pseudo actions."
-                                     << endl;
-               return LFUN_UNKNOWN_ACTION;
-       }
-
-       arg_item::const_iterator aci = pit->second.find(arg);
-
-       if (aci == pit->second.end()) {
-               lyxerr[Debug::ACTION]
-                       << "Action " << action
-                       << "does not have any pseudoactions with arg "
-                       << arg << endl;
-               return LFUN_UNKNOWN_ACTION;
-       }
-
-       lyxerr[Debug::ACTION] << "Pseudoaction exists["
-                             << action << '|'
-                             << arg << "] = " << aci->second << endl;
-
-       return aci->second;
-}
-
-
-int LyXAction::getPseudoAction(kb_action action, string const & arg)
-{
-       int const psdaction = searchActionArg(action, arg);
-
-       if (isPseudoAction(psdaction)) return psdaction;
-
-       static unsigned int pseudo_counter = LFUN_LASTACTION;
-
-       // Create new pseudo action.
-       lyx_pseudo_map[++pseudo_counter] = FuncRequest(0, action, arg);
-
-       // First ensure that the action is in lyx_arg_map;
-       lyx_arg_map[action];
-       // get the arg_item map
-       arg_map::iterator ami = lyx_arg_map.find(action);
-       // put the new pseudo function in it
-       ami->second[arg] = pseudo_counter;
-
-       lyxerr[Debug::ACTION] << "Creating new pseudoaction "
-                             << pseudo_counter << " for [" << action
-                             << '|' << arg << "]\n";
-
-       return pseudo_counter;
-}
-
-
-FuncRequest LyXAction::retrieveActionArg(int pseudo) const
-{
-       if (!isPseudoAction(pseudo))
-               return FuncRequest(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.argument << "]\n";
-               return pit->second;
-       } else {
-               lyxerr << "Lyx Error: Unrecognized pseudo-action "
-                       << pseudo << endl;
-               return FuncRequest(LFUN_UNKNOWN_ACTION);
-       }
-}
-
-
 // Returns an action tag from a string.
-int LyXAction::LookupFunc(string const & func)
+FuncRequest LyXAction::lookupFunc(string const & func) const
 {
        string const func2 = trim(func);
-       if (func2.empty()) return LFUN_NOACTION;
 
-       // split action and arg
-       string actstr;
-       string const argstr = split(func2, actstr, ' ');
-       lyxerr[Debug::ACTION] << "Action: " << actstr << '\n';
-       lyxerr[Debug::ACTION] << "Arg   : " << argstr << '\n';
+       if (func2.empty()) {
+               return FuncRequest(LFUN_NOACTION);
+       }
 
-       func_map::const_iterator fit = lyx_func_map.find(actstr);
+       string cmd;
+       string const arg = split(func2, cmd, ' ');
 
-       if (!argstr.empty() && fit != lyx_func_map.end()) {
-               // might be pseudo (or create one)
-               return getPseudoAction(fit->second, argstr);
-       }
+       func_map::const_iterator fit = lyx_func_map.find(cmd);
 
-       return fit != lyx_func_map.end() ? fit->second : LFUN_UNKNOWN_ACTION;
+       return fit != lyx_func_map.end() ? FuncRequest(fit->second, arg) : FuncRequest(LFUN_UNKNOWN_ACTION);
 }
 
 
-string const LyXAction::getActionName(int action) const
+string const LyXAction::getActionName(kb_action action) const
 {
-       FuncRequest ev = retrieveActionArg(action);
-       if (!ev.argument.empty())
-               ev.argument.insert(string::size_type(0), 1, ' ');
-
-       info_map::const_iterator const it = lyx_info_map.find(ev.action);
-
-       if (it != lyx_info_map.end())
-               return it->second.name + ev.argument;
-       return string();
+       info_map::const_iterator const it = lyx_info_map.find(action);
+       return it != lyx_info_map.end() ? it->second.name : string();
 }
 
 
@@ -461,14 +383,12 @@ bool LyXAction::funcHasFlag(kb_action action,
 {
        info_map::const_iterator ici = lyx_info_map.find(action);
 
-       if (ici != lyx_info_map.end()) {
-               return ici->second.attrib & flag;
-       } else {
-               // it really should exist, but...
-               lyxerr << "LyXAction::funcHasFlag: "
-                       "No info about kb_action: " << action << '\n';
-               return false;
+       if (ici == lyx_info_map.end()) {
+               lyxerr << "action: " << action << " is not known." << endl;
+               BOOST_ASSERT(false);
        }
+
+       return ici->second.attrib & flag;
 }