X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXAction.C;h=b035494ff3816b06a9ff33055958d033ff3876de;hb=368f6a53a87eb5997433ecd0f51e854c99360d28;hp=d739cc4ac0bde40a05de4d9183817a65c0e0b8cd;hpb=da7d2bc011ef60be97d73aa778efbde1cea1ecbb;p=lyx.git diff --git a/src/LyXAction.C b/src/LyXAction.C index d739cc4ac0..b035494ff3 100644 --- a/src/LyXAction.C +++ b/src/LyXAction.C @@ -1,25 +1,34 @@ /** * \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 -#ifdef __GNUG__ -#pragma implementation -#endif - #include "LyXAction.h" #include "debug.h" -#include "gettext.h" +#include "funcrequest.h" + #include "support/lstrings.h" -using std::ostream; +#include + +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 @@ -40,25 +49,14 @@ 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, - string const & helpText, unsigned int attrib) + unsigned int attrib) { lyx_func_map[name] = action; func_info tmpinfo; tmpinfo.name = name; tmpinfo.attrib = attrib; - tmpinfo.helpText = helpText; lyx_info_map[action] = tmpinfo; } @@ -77,347 +75,295 @@ void LyXAction::init() struct ev_item { kb_action action; char const * name; - char const * helpText; unsigned int attrib; }; ev_item const items[] = { - { LFUN_ACUTE, "accent-acute", "", Noop }, - { LFUN_BREVE, "accent-breve", "", Noop }, - { LFUN_CARON, "accent-caron", "", Noop }, - { LFUN_CEDILLA, "accent-cedilla", "", Noop }, - { LFUN_CIRCLE, "accent-circle", "", Noop }, - { LFUN_CIRCUMFLEX, "accent-circumflex", "", Noop }, - { LFUN_DOT, "accent-dot", "", Noop }, - { LFUN_GRAVE, "accent-grave", "", Noop }, - { LFUN_HUNG_UMLAUT, "accent-hungarian-umlaut", "", Noop }, - { LFUN_MACRON, "accent-macron", "", Noop }, - { LFUN_OGONEK, "accent-ogonek", "", Noop }, - { LFUN_SPECIAL_CARON, "accent-special-caron", "", Noop }, - { LFUN_TIE, "accent-tie", "", Noop }, - { LFUN_TILDE, "accent-tilde", "", Noop }, - { LFUN_UMLAUT, "accent-umlaut", "", Noop }, - { LFUN_UNDERBAR, "accent-underbar", "", Noop }, - { LFUN_UNDERDOT, "accent-underdot", "", Noop }, - { LFUN_VECTOR, "accent-vector", "", Noop }, - { LFUN_APPENDIX, "appendix", N_("Insert appendix"), Noop }, - { LFUN_APROPOS, "apropos", N_("Describe command"), - NoBuffer|ReadOnly }, - { LFUN_LEFTSEL, "backward-select", - N_("Select previous char"), ReadOnly }, - { LFUN_BIBDB_ADD, "bibtex-database-add", "", Noop }, - { LFUN_BIBDB_DEL, "bibtex-database-del", "", Noop }, - { 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", - "", Noop }, - { LFUN_BREAKPARAGRAPH_SKIP, "break-paragraph-skip", "", Noop }, - { LFUN_BUILDPROG, "build-program", - N_("Build program"), ReadOnly }, - { LFUN_AUTOSAVE, "buffer-auto-save", N_("Autosave"), Noop }, - { LFUN_BEGINNINGBUF, "buffer-begin", - N_("Go to beginning of document"), ReadOnly }, - { LFUN_BEGINNINGBUFSEL, "buffer-begin-select", - N_("Select to beginning of document"), ReadOnly }, - { 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 }, - { LFUN_ENDBUF, "buffer-end", - N_("Go to end of document"), ReadOnly }, - { LFUN_ENDBUFSEL, "buffer-end-select", - N_("Select to end of document"), ReadOnly }, - { LFUN_EXPORT, "buffer-export", N_("Export to"), ReadOnly }, - { LFUN_IMPORT, "buffer-import", - N_("Import document"), NoBuffer }, - { LFUN_MENUNEW, "buffer-new", N_("New document") , NoBuffer }, - { LFUN_MENUNEWTMPLT,"buffer-new-template", - N_("New document from template"), NoBuffer }, - { LFUN_MENUPRINT, "buffer-print", N_("Print"), ReadOnly }, - { LFUN_MENURELOAD, "buffer-reload", - N_("Revert to saved"), ReadOnly }, - { LFUN_SWITCHBUFFER, "buffer-switch", - N_("Switch to an open document"), ReadOnly }, - { LFUN_READ_ONLY_TOGGLE, "buffer-toggle-read-only", - N_("Toggle read-only"), ReadOnly }, - { LFUN_UPDATE, "buffer-update", N_("Update"), ReadOnly }, - { LFUN_PREVIEW, "buffer-view", N_("View") , ReadOnly }, - { LFUN_MENUWRITE, "buffer-write", N_("Save"), ReadOnly }, - { LFUN_WRITEAS, "buffer-write-as", N_("Save As"), - ReadOnly }, - { LFUN_CANCEL, "cancel", N_("Cancel"), NoBuffer }, - { LFUN_INSET_CAPTION, "caption-insert", "", Noop }, - { LFUN_LEFT, "char-backward", N_("Go one char back"), - ReadOnly }, - { LFUN_RIGHT, "char-forward", N_("Go one char forward"), - 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 }, - { LFUN_SEQUENCE, "command-sequence", "", NoBuffer }, - { LFUN_COPY, "copy", N_("Copy"), ReadOnly }, - { LFUN_CUT, "cut", N_("Cut"), Noop }, - { LFUN_DATE_INSERT, "date-insert", "", Noop }, - { LFUN_BACKSPACE, "delete-backward", "", Noop }, - { LFUN_BACKSPACE_SKIP, "delete-backward-skip", "", Noop }, - { LFUN_DELETE, "delete-forward", "", Noop }, - { LFUN_DELETE_SKIP, "delete-forward-skip", "", Noop }, - { LFUN_DEPTH_MIN, "depth-decrement", - N_("Decrement environment depth"), Noop }, - { LFUN_DEPTH_PLUS, "depth-increment", - N_("Increment environment depth"), Noop }, - { LFUN_LDOTS, "dots-insert", N_("Insert ... dots"), Noop }, - { LFUN_DOWN, "down", N_("Go down"), ReadOnly }, - { LFUN_DOWNSEL, "down-select", - N_("Select next line"), ReadOnly }, - { LFUN_DROP_LAYOUTS_CHOICE, "drop-layouts-choice", - N_("Choose Paragraph Environment"), ReadOnly }, - { LFUN_END_OF_SENTENCE, "end-of-sentence-period-insert", - N_("Insert end of sentence period"), Noop }, - { LFUN_GOTOERROR, "error-next", - N_("Go to next error"), ReadOnly }, - { LFUN_REMOVEERRORS, "error-remove-all", - N_("Remove all error boxes"), ReadOnly }, - { LFUN_INSET_ERT, "ert-insert", - N_("Insert a new ERT Inset"), Noop }, - { LFUN_INSET_EXTERNAL, "external-insert", - N_("Insert a new external inset"), Noop }, - { LFUN_INSET_GRAPHICS, "graphics-insert", - N_("Insert Graphics"), Noop }, - { LFUN_FILE_INSERT, "file-insert", "", 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", _("Open a file"), NoBuffer }, - { LFUN_MENUSEARCH, "find-replace", N_("Find & Replace"), - 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"), - Noop }, - { LFUN_EMPH, "font-emph", N_("Toggle emphasize"), Noop }, - { LFUN_FREE, "font-free", N_("Toggle user defined style"), - Noop }, - { LFUN_NOUN, "font-noun", N_("Toggle noun style"), Noop }, - { 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 }, - { LFUN_UNDERLINE, "font-underline", - N_("Toggle font underline"), Noop }, - { LFUN_INSET_FOOTNOTE, "footnote-insert", - N_("Insert Footnote"), Noop }, - { LFUN_RIGHTSEL, "forward-select", N_("Select next char"), - ReadOnly }, - { LFUN_HFILL, "hfill-insert", - N_("Insert horizontal fill"), Noop }, - { LFUN_HELP_OPEN, "help-open", N_("Open a Help file"), - NoBuffer|Argument}, - { 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_INSERT, "index-insert", - N_("Insert index item"), Noop }, - { LFUN_INDEX_PRINT, "index-print", N_("Insert index list"), - Noop }, - { LFUN_KMAP_OFF, "keymap-off", N_("Turn off keymap"), - ReadOnly }, - { LFUN_KMAP_PRIM, "keymap-primary", - N_("Use primary keymap"), ReadOnly }, - { LFUN_KMAP_SEC, "keymap-secondary", - N_("Use secondary keymap"), ReadOnly }, - { LFUN_KMAP_TOGGLE, "keymap-toggle", N_("Toggle keymap"), - ReadOnly }, - { LFUN_INSERT_LABEL, "label-insert", N_("Insert Label"), - Noop }, - { LFUN_INSET_OPTARG, "optional-insert", N_("Insert Optional Argument"), - Noop }, - { LFUN_LANGUAGE, "language", N_("Change language"), Noop }, - { LFUN_LATEX_LOG, "latex-view-log", N_("View LaTeX log"), - ReadOnly }, - { LFUN_LAYOUT, "layout", "", Noop }, - { LFUN_LAYOUT_CHARACTER, "layout-character", "", Noop }, - { LFUN_LAYOUT_COPY, "layout-copy", - N_("Copy paragraph environment type"), Noop }, - { LFUN_LAYOUT_DOCUMENT, "layout-document", "", ReadOnly }, - { 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_TABULAR, "layout-tabular", - N_("Open the tabular layout"), Noop }, - { LFUN_HOME, "line-begin", - N_("Go to beginning of line"), ReadOnly }, - { LFUN_HOMESEL, "line-begin-select", - N_("Select to beginning of line"), ReadOnly }, - { LFUN_DELETE_LINE_FORWARD, "line-delete-forward", "", Noop }, - { LFUN_END, "line-end", N_("Go to end of line"), ReadOnly }, - { LFUN_ENDSEL, "line-end-select", - N_("Select to end of line"), ReadOnly }, + { LFUN_ACCENT_ACUTE, "accent-acute", Noop }, + { LFUN_ACCENT_BREVE, "accent-breve", Noop }, + { LFUN_ACCENT_CARON, "accent-caron", Noop }, + { LFUN_ACCENT_CEDILLA, "accent-cedilla", Noop }, + { LFUN_ACCENT_CIRCLE, "accent-circle", Noop }, + { LFUN_ACCENT_CIRCUMFLEX, "accent-circumflex", Noop }, + { LFUN_ACCENT_DOT, "accent-dot", Noop }, + { LFUN_ACCENT_GRAVE, "accent-grave", Noop }, + { LFUN_ACCENT_HUNGARIAN_UMLAUT, "accent-hungarian-umlaut", Noop }, + { LFUN_ACCENT_MACRON, "accent-macron", Noop }, + { LFUN_ACCENT_OGONEK, "accent-ogonek", Noop }, + { LFUN_ACCENT_SPECIAL_CARON, "accent-special-caron", Noop }, + { LFUN_ACCENT_TIE, "accent-tie", Noop }, + { LFUN_ACCENT_TILDE, "accent-tilde", Noop }, + { LFUN_ACCENT_UMLAUT, "accent-umlaut", Noop }, + { LFUN_ACCENT_UNDERBAR, "accent-underbar", Noop }, + { LFUN_ACCENT_UNDERDOT, "accent-underdot", Noop }, + { LFUN_APPENDIX, "appendix", Noop }, + { LFUN_BOOKMARK_GOTO, "bookmark-goto", ReadOnly }, + { LFUN_BOOKMARK_SAVE, "bookmark-save", ReadOnly }, + { LFUN_BREAK_LINE, "break-line", Noop }, + { LFUN_BREAK_PARAGRAPH, "break-paragraph", Noop }, + { LFUN_BREAK_PARAGRAPH_KEEP_LAYOUT, "break-paragraph-keep-layout", Noop }, + { LFUN_BREAK_PARAGRAPH_SKIP, "break-paragraph-skip", Noop }, + { LFUN_BUILD_PROGRAM, "build-program", ReadOnly }, + { LFUN_BUFFER_AUTO_SAVE, "buffer-auto-save", Noop }, + { LFUN_BUFFER_BEGIN, "buffer-begin", ReadOnly }, + { LFUN_BUFFER_BEGIN_SELECT, "buffer-begin-select", ReadOnly }, + { LFUN_BUFFER_CHILD_OPEN, "buffer-child-open", ReadOnly }, + { LFUN_BUFFER_CHKTEX, "buffer-chktex", ReadOnly }, + { LFUN_BUFFER_TOGGLE_COMPRESSION, "buffer-toggle-compression", Noop}, + { LFUN_BUFFER_CLOSE, "buffer-close", ReadOnly }, + { LFUN_BUFFER_END, "buffer-end", ReadOnly }, + { LFUN_BUFFER_END_SELECT, "buffer-end-select", ReadOnly }, + { LFUN_BUFFER_EXPORT, "buffer-export", ReadOnly }, + { LFUN_BUFFER_EXPORT_CUSTOM, "buffer-export-custom", ReadOnly }, + { LFUN_BUFFER_PRINT, "buffer-print", ReadOnly }, + { LFUN_BUFFER_IMPORT, "buffer-import", NoBuffer }, + { LFUN_BUFFER_NEW, "buffer-new", NoBuffer }, + { LFUN_BUFFER_NEW_TEMPLATE,"buffer-new-template", NoBuffer }, + { LFUN_BUFFER_RELOAD, "buffer-reload", ReadOnly }, + { LFUN_BUFFER_SWITCH, "buffer-switch", ReadOnly }, + { LFUN_BUFFER_TOGGLE_READ_ONLY, "buffer-toggle-read-only", ReadOnly }, + { LFUN_BUFFER_UPDATE, "buffer-update", ReadOnly }, + { LFUN_BUFFER_VIEW, "buffer-view", ReadOnly }, + { LFUN_BUFFER_WRITE, "buffer-write", ReadOnly }, + { LFUN_BUFFER_WRITE_AS, "buffer-write-as", ReadOnly }, + { LFUN_CANCEL, "cancel", NoBuffer }, + { LFUN_CAPTION_INSERT, "caption-insert", Noop }, + { LFUN_CHAR_BACKWARD, "char-backward", ReadOnly | NoUpdate}, + { LFUN_CHAR_BACKWARD_SELECT, "backward-select", ReadOnly | SingleParUpdate }, + { LFUN_CHAR_DELETE_BACKWARD, "delete-backward", SingleParUpdate }, + { LFUN_CHAR_DELETE_FORWARD, "delete-forward", SingleParUpdate }, + { LFUN_CHAR_FORWARD, "char-forward", ReadOnly | NoUpdate}, + { LFUN_CHAR_FORWARD_SELECT, "forward-select", ReadOnly | SingleParUpdate }, + { LFUN_CLIPBOARD_PASTE, "clipboard-paste", Noop }, + { LFUN_COMMAND_EXECUTE, "command-execute", NoBuffer }, + { LFUN_COMMAND_PREFIX, "command-prefix", NoBuffer }, + { LFUN_COMMAND_SEQUENCE, "command-sequence", NoBuffer }, + { LFUN_COPY, "copy", ReadOnly }, + { LFUN_CUT, "cut", Noop }, + { LFUN_DATE_INSERT, "date-insert", Noop }, + { LFUN_DELETE_BACKWARD_SKIP, "delete-backward-skip", Noop }, + { LFUN_DELETE_FORWARD_SKIP, "delete-forward-skip", Noop }, + { LFUN_DEPTH_DECREMENT, "depth-decrement", Noop }, + { LFUN_DEPTH_INCREMENT, "depth-increment", Noop }, + { LFUN_DOTS_INSERT, "dots-insert", Noop }, + { LFUN_DOWN, "down", ReadOnly | NoUpdate }, + { LFUN_DOWN_SELECT, "down-select", ReadOnly | SingleParUpdate }, + { LFUN_DROP_LAYOUTS_CHOICE, "drop-layouts-choice", ReadOnly }, + { LFUN_END_OF_SENTENCE_PERIOD_INSERT, "end-of-sentence-period-insert", Noop }, + { LFUN_ENVIRONMENT_INSERT, "environment-insert", Noop }, + { LFUN_ERROR_NEXT, "error-next", ReadOnly }, + { LFUN_ERT_INSERT, "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_FLOAT_INSERT, "float-insert", Noop }, + { LFUN_FLOAT_WIDE_INSERT, "float-wide-insert", Noop }, + { LFUN_WRAP_INSERT, "wrap-insert", Noop }, + { LFUN_FONT_BOLD, "font-bold", Noop }, + { LFUN_FONT_CODE, "font-code", Noop }, + { LFUN_FONT_DEFAULT, "font-default", Noop }, + { LFUN_FONT_EMPH, "font-emph", Noop }, + { LFUN_FONT_FREE_APPLY, "font-free-apply", Noop }, + { LFUN_FONT_FREE_UPDATE, "font-free-update", Noop }, + { LFUN_FONT_NOUN, "font-noun", Noop }, + { LFUN_FONT_ROMAN, "font-roman", Noop }, + { LFUN_FONT_SANS, "font-sans", Noop }, + { LFUN_FONT_FRAK, "font-frak", Noop }, + { LFUN_FONT_ITAL, "font-ital", Noop }, + { LFUN_FONT_SIZE, "font-size", Noop }, + { LFUN_FONT_STATE, "font-state", ReadOnly }, + { LFUN_FONT_UNDERLINE, "font-underline", Noop }, + { LFUN_FOOTNOTE_INSERT, "footnote-insert", Noop }, + { LFUN_HFILL_INSERT, "hfill-insert", Noop }, + { LFUN_HELP_OPEN, "help-open", NoBuffer | Argument}, + { LFUN_HTML_INSERT, "html-insert", Noop }, + { LFUN_HYPHENATION_POINT_INSERT, "hyphenation-point-insert", Noop }, + { LFUN_LIGATURE_BREAK_INSERT, "ligature-break-insert", Noop }, + { LFUN_INDEX_INSERT, "index-insert", Noop }, + { LFUN_INDEX_PRINT, "index-print", Noop }, + { LFUN_KEYMAP_OFF, "keymap-off", ReadOnly }, + { LFUN_KEYMAP_PRIMARY, "keymap-primary", ReadOnly }, + { LFUN_KEYMAP_SECONDARY, "keymap-secondary", ReadOnly }, + { LFUN_KEYMAP_TOGGLE, "keymap-toggle", ReadOnly }, + { LFUN_LABEL_INSERT, "label-insert", Noop }, + { LFUN_OPTIONAL_INSERT, "optional-insert", Noop }, + { LFUN_BIBITEM_INSERT, "bibitem-insert", Noop }, + { LFUN_CITATION_INSERT, "citation-insert", Noop }, + { LFUN_BIBTEX_DATABASE_ADD, "bibtex-database-add", Noop }, + { LFUN_BIBTEX_DATABASE_DEL, "bibtex-database-del", Noop }, + { LFUN_LINE_INSERT, "line-insert", Noop }, + { LFUN_PAGEBREAK_INSERT, "pagebreak-insert", Noop }, + { LFUN_LANGUAGE, "language", Noop }, + { LFUN_LAYOUT, "layout", Noop }, + { LFUN_LAYOUT_PARAGRAPH, "layout-paragraph", ReadOnly }, + { LFUN_LAYOUT_TABULAR, "layout-tabular", Noop }, + { LFUN_LINE_BEGIN, "line-begin", ReadOnly | NoUpdate}, + { LFUN_LINE_BEGIN_SELECT, "line-begin-select", ReadOnly | SingleParUpdate }, + { LFUN_LINE_DELETE, "line-delete-forward", Noop }, // there is no line-delete-backward + { LFUN_LINE_END, "line-end", ReadOnly | NoUpdate}, + { LFUN_LINE_END_SELECT, "line-end-select", ReadOnly | SingleParUpdate }, #if 0 - { LFUN_INSET_LIST, "list-insert", "", Noop }, + { LFUN_LIST_INSERT, "list-insert", Noop }, #endif - { LFUN_QUIT, "lyx-quit", N_("Exit"), NoBuffer }, - { LFUN_INSET_MARGINAL, "marginalnote-insert", - N_("Insert margin note"), Noop }, - { LFUN_MARK_OFF, "mark-off", "", ReadOnly }, - { LFUN_MARK_ON, "mark-on", "", ReadOnly }, - { LFUN_SETMARK, "mark-toggle", "", ReadOnly }, - { LFUN_MATH_DELIM, "math-delim", "", Noop }, - { LFUN_MATH_DISPLAY, "math-display", "", Noop }, - { LFUN_GREEK, "math-greek", N_("Math Greek"), Noop }, - { 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_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_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_NOTE, "note-insert", "", Noop }, - { LFUN_GOTONOTE, "note-next", "", 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", - N_("Select next paragraph"), ReadOnly }, - { LFUN_GOTO_PARAGRAPH, "paragraph-goto", - N_("Go to paragraph"), ReadOnly }, - { LFUN_PARAGRAPH_SPACING, "paragraph-spacing", "", Noop }, - { LFUN_UP_PARAGRAPH, "paragraph-up", - N_("Go one paragraph up"), ReadOnly }, - { LFUN_UP_PARAGRAPHSEL, "paragraph-up-select", - N_("Select previous paragraph"), ReadOnly }, - { LFUN_PARENTINSERT, "parent-insert", "", Noop }, - { LFUN_PASTE, "paste", N_("Paste") , Noop }, - { LFUN_DIALOG_PREFERENCES, "dialog-preferences", - N_("Edit Preferences"), NoBuffer }, - { LFUN_SAVEPREFERENCES, "preferences-save", - N_("Save Preferences"), NoBuffer }, - { LFUN_PASTESELECTION, "primary-selection-paste", "", Noop }, - { LFUN_PROTECTEDSPACE, "protected-space-insert", - N_("Insert protected space"), Noop }, - { LFUN_QUOTE, "quote-insert", N_("Insert quote"), Noop }, - { LFUN_RECONFIGURE, "reconfigure", - N_("Reconfigure"), NoBuffer }, - { LFUN_REDO, "redo", N_("Redo"), Noop }, - { 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", - "", NoBuffer }, - { LFUN_CENTER, "screen-recenter", "", ReadOnly }, - { LFUN_PRIOR, "screen-up", "", ReadOnly }, - { LFUN_PRIORSEL, "screen-up-select", "", ReadOnly }, - { LFUN_SCROLL_INSET, "inset-scroll", N_("Scroll inset"), - ReadOnly }, - { LFUN_SELFINSERT, "self-insert", "", Noop }, - { LFUN_CHARATCURSOR, "server-char-after", "", ReadOnly }, - { LFUN_GETFONT, "server-get-font", "", ReadOnly }, - { LFUN_GETLAYOUT, "server-get-layout", "", ReadOnly }, - { LFUN_GETNAME, "server-get-name", "", ReadOnly }, - { LFUN_GETTIP, "server-get-tip", "", ReadOnly }, - { LFUN_GETXY, "server-get-xy", "", ReadOnly }, - { LFUN_GOTOFILEROW, "server-goto-file-row", "", Noop }, - { LFUN_NOTIFY, "server-notify", "", ReadOnly }, - { LFUN_SETXY, "server-set-xy", "", ReadOnly }, - { LFUN_SET_COLOR, "set-color", "", ReadOnly|NoBuffer }, - { LFUN_SPELLCHECK, "spellchecker", "", Noop }, - { LFUN_SHIFT_TAB, "tab-backward", "", Noop }, - { LFUN_TAB, "tab-forward", "", Noop }, - { LFUN_TABINSERT, "tab-insert", "", Noop }, - { LFUN_TABULAR_INSERT, "tabular-insert", N_("Insert Table"), Noop }, - { LFUN_TABULAR_FEATURE, "tabular-feature", - N_("Tabular Features"), Noop }, + { LFUN_LYX_QUIT, "lyx-quit", NoBuffer }, + { LFUN_MARGINALNOTE_INSERT, "marginalnote-insert", Noop }, + { LFUN_MARK_OFF, "mark-off", ReadOnly }, + { LFUN_MARK_ON, "mark-on", ReadOnly }, + { LFUN_MARK_TOGGLE, "mark-toggle", ReadOnly }, + { LFUN_MATH_DELIM, "math-delim", Noop }, + { LFUN_MATH_BIGDELIM, "math-bigdelim", Noop }, + { LFUN_MATH_DISPLAY, "math-display", Noop }, + { LFUN_MATH_INSERT, "math-insert", Noop }, + { LFUN_MATH_SUBSCRIPT, "math-subscript", Noop }, + { LFUN_MATH_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_MATRIX, "math-matrix", Noop }, + { LFUN_MATH_MODE, "math-mode", Noop }, + { LFUN_MATH_NONUMBER, "math-nonumber", Noop }, + { LFUN_MATH_NUMBER, "math-number", Noop }, + { LFUN_MATH_EXTERN, "math-extern", Noop }, + { LFUN_MATH_SIZE, "math-size", Noop }, + { LFUN_MENU_OPEN, "menu-open", NoBuffer }, + { LFUN_MENU_SEPARATOR_INSERT, "menu-separator-insert", Noop }, + { LFUN_META_PREFIX, "meta-prefix", NoBuffer }, + { LFUN_BRANCH_INSERT, "branch-insert", Noop }, + { LFUN_CHARSTYLE_INSERT, "charstyle-insert", Noop }, + { LFUN_NOTE_INSERT, "note-insert", Noop }, + { LFUN_BOX_INSERT, "box-insert", Noop }, + { LFUN_NOTE_NEXT, "note-next", ReadOnly }, + { LFUN_INSET_TOGGLE, "", ReadOnly }, + { LFUN_NEXT_INSET_TOGGLE, "next-inset-toggle", ReadOnly }, + { LFUN_ALL_INSETS_TOGGLE, "all-insets-toggle", ReadOnly }, + { LFUN_PARAGRAPH_DOWN, "paragraph-down", ReadOnly | NoUpdate}, + { LFUN_PARAGRAPH_DOWN_SELECT, "paragraph-down-select", ReadOnly }, + { LFUN_PARAGRAPH_GOTO, "paragraph-goto", ReadOnly }, + { LFUN_OUTLINE_UP, "outline-up", Noop }, + { LFUN_OUTLINE_DOWN, "outline-down", Noop }, + { LFUN_OUTLINE_IN, "outline-in", Noop }, + { LFUN_OUTLINE_OUT, "outline-out", Noop }, + { LFUN_PARAGRAPH_SPACING, "paragraph-spacing", Noop }, + { LFUN_PARAGRAPH_UP, "paragraph-up", ReadOnly | NoUpdate}, + { LFUN_PARAGRAPH_UP_SELECT, "paragraph-up-select", ReadOnly }, + { LFUN_PASTE, "paste", Noop }, + { LFUN_PREFERENCES_SAVE, "preferences-save", NoBuffer }, + { LFUN_PRIMARY_SELECTION_PASTE, "primary-selection-paste", Noop }, + { LFUN_QUOTE_INSERT, "quote-insert", Noop }, + { LFUN_RECONFIGURE, "reconfigure", NoBuffer }, + { LFUN_REDO, "redo", Noop }, + { LFUN_LABEL_GOTO, "label-goto", ReadOnly }, + { LFUN_REFERENCE_NEXT, "reference-next", ReadOnly }, + { LFUN_SCREEN_DOWN, "screen-down", ReadOnly | NoUpdate}, + { LFUN_SCREEN_DOWN_SELECT, "screen-down-select", ReadOnly }, + { LFUN_SCREEN_FONT_UPDATE, "screen-font-update", NoBuffer }, + { LFUN_SCREEN_RECENTER, "screen-recenter", ReadOnly }, + { LFUN_SCREEN_UP, "screen-up", ReadOnly | NoUpdate}, + { LFUN_SCREEN_UP_SELECT, "screen-up-select", ReadOnly }, + { LFUN_SELF_INSERT, "self-insert", SingleParUpdate }, + { LFUN_SPACE_INSERT, "space-insert", Noop }, + { LFUN_SERVER_CHAR_AFTER, "server-char-after", ReadOnly }, + { LFUN_SERVER_GET_FONT, "server-get-font", ReadOnly }, + { LFUN_SERVER_GET_LAYOUT, "server-get-layout", ReadOnly }, + { LFUN_SERVER_GET_NAME, "server-get-name", ReadOnly }, + { LFUN_SERVER_GET_XY, "server-get-xy", ReadOnly }, + { LFUN_SERVER_GOTO_FILE_ROW, "server-goto-file-row", Noop }, + { LFUN_SERVER_NOTIFY, "server-notify", ReadOnly }, + { LFUN_SERVER_SET_XY, "server-set-xy", ReadOnly }, + { LFUN_SET_COLOR, "set-color", ReadOnly | NoBuffer }, + { LFUN_CELL_BACKWARD, "cell-backward", Noop }, + { LFUN_CELL_FORWARD, "cell-forward", Noop }, + { LFUN_CELL_SPLIT, "cell-split", Noop }, + { LFUN_TABULAR_INSERT, "tabular-insert", Noop }, + { LFUN_TABULAR_FEATURE, "tabular-feature", Noop }, #if 0 - { LFUN_INSET_THEOREM, "theorem-insert", "", Noop }, + { LFUN_THEOREM_INSERT, "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", - N_("View table of contents"), ReadOnly }, - { LFUN_TOGGLECURSORFOLLOW, "toggle-cursor-follows-scrollbar", - N_("Toggle cursor does/doesn't follow the scrollbar"), - ReadOnly }, - { LFUN_UNDO, "undo", N_("Undo"), Noop }, - { LFUN_UP, "up", "", ReadOnly }, - { LFUN_UPSEL, "up-select", "", ReadOnly }, - { LFUN_URL, "url-insert", "", 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 }, - { LFUN_VC_REGISTER, "vc-register", - N_("Register document under version control"), ReadOnly }, - { LFUN_VC_REVERT, "vc-revert", "", ReadOnly }, - { LFUN_VC_UNDO, "vc-undo-last", "", ReadOnly }, - { LFUN_WORDLEFT, "word-backward", "", ReadOnly }, - { LFUN_WORDLEFTSEL, "word-backward-select", "", ReadOnly }, - { LFUN_CAPITALIZE_WORD, "word-capitalize", "", Noop }, - { LFUN_DELETE_WORD_BACKWARD, "word-delete-backward", - "", Noop }, - { LFUN_DELETE_WORD_FORWARD, "word-delete-forward", "", Noop }, - { LFUN_WORDFINDBACKWARD, "word-find-backward", "", ReadOnly }, - { LFUN_WORDFINDFORWARD, "word-find-forward", "", ReadOnly }, - { LFUN_WORDRIGHT, "word-forward", "", ReadOnly }, - { 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_TRANSPOSE_CHARS, "chars-transpose", "", Noop }, - { LFUN_FLOAT_LIST, "float-list", "Insert a float list", Noop }, - { 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_FORKS_SHOW, "show-forks", - N_("Show the processes forked by LyX"), NoBuffer }, - { LFUN_FORKS_KILL, "kill-forks", - N_("Kill the forked process with this PID"), NoBuffer }, - { LFUN_TOOLTIPS_TOGGLE, "toggle-tooltips", "", NoBuffer }, - { LFUN_NOACTION, "", "", Noop } + { LFUN_THESAURUS_ENTRY, "thesaurus-entry", ReadOnly }, + { LFUN_TOC_INSERT, "toc-insert", Noop }, + { LFUN_TOC_VIEW, "toc-view", ReadOnly }, + { LFUN_TOGGLE_CURSOR_FOLLOWS_SCROLLBAR, "toggle-cursor-follows-scrollbar", ReadOnly }, + { LFUN_UNDO, "undo", Noop }, + { LFUN_UP, "up", ReadOnly | NoUpdate}, + { LFUN_UP_SELECT, "up-select", ReadOnly | SingleParUpdate }, + { LFUN_URL_INSERT, "url-insert", Noop }, + { LFUN_VC_CHECK_IN, "vc-check-in", ReadOnly }, + { LFUN_VC_CHECK_OUT, "vc-check-out", ReadOnly }, + { LFUN_VC_REGISTER, "vc-register", ReadOnly }, + { LFUN_VC_REVERT, "vc-revert", ReadOnly }, + { LFUN_VC_UNDO_LAST, "vc-undo-last", ReadOnly }, + { LFUN_WORD_BACKWARD, "word-backward", ReadOnly | NoUpdate}, + { LFUN_WORD_BACKWARD_SELECT, "word-backward-select", ReadOnly | SingleParUpdate }, + { LFUN_WORD_CAPITALIZE, "word-capitalize", Noop }, + { LFUN_WORD_DELETE_BACKWARD, "word-delete-backward", Noop }, + { LFUN_WORD_DELETE_FORWARD, "word-delete-forward", Noop }, + { LFUN_WORD_FIND_BACKWARD, "word-find-backward", ReadOnly }, + { LFUN_WORD_FIND_FORWARD, "word-find-forward", ReadOnly }, + { LFUN_WORD_FORWARD, "word-forward", ReadOnly | NoUpdate}, + { LFUN_WORD_FORWARD_SELECT, "word-forward-select", ReadOnly | SingleParUpdate }, + { LFUN_WORD_LOWCASE, "word-lowcase", Noop }, + { LFUN_WORD_SELECT, "word-select", ReadOnly }, + { LFUN_WORD_UPCASE, "word-upcase", Noop }, + { LFUN_MESSAGE, "message", NoBuffer }, + { LFUN_CHARS_TRANSPOSE, "chars-transpose", Noop }, + { LFUN_FLOAT_LIST, "float-list", Noop }, + { LFUN_ESCAPE, "escape", ReadOnly }, + { LFUN_TOOLTIPS_TOGGLE, "tooltips-toggle", NoBuffer }, + { LFUN_CHANGES_TRACK, "changes-track", Noop }, + { LFUN_CHANGES_OUTPUT, "changes-output", Noop }, + { LFUN_CHANGES_MERGE, "changes-merge", Noop }, + { LFUN_CHANGE_ACCEPT, "change-accept", Noop }, + { LFUN_CHANGE_REJECT, "change-reject", Noop }, + { LFUN_ALL_CHANGES_ACCEPT, "all-changes-accept", Noop }, + { LFUN_ALL_CHANGES_REJECT, "all-changes-reject", Noop }, + { LFUN_DIALOG_SHOW, "dialog-show", NoBuffer }, + { LFUN_DIALOG_SHOW_NEW_INSET, "dialog-show-new-inset", 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 }, + { LFUN_INSET_DISSOLVE, "inset-dissolve", Noop }, + { LFUN_INSET_INSERT, "inset-insert", Noop }, + { LFUN_INSET_MODIFY, "", Noop }, + { LFUN_INSET_DIALOG_UPDATE, "", Noop }, + { LFUN_INSET_SETTINGS, "inset-settings", ReadOnly }, + { LFUN_PARAGRAPH_PARAMS_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", ReadOnly }, + { LFUN_WORD_REPLACE, "word-replace", Noop }, + { LFUN_BUFFER_LANGUAGE, "buffer-language", Noop }, + { LFUN_TEXTCLASS_APPLY, "textclass-apply", Noop }, + { LFUN_TEXTCLASS_LOAD, "textclass-load", Noop }, + { LFUN_BUFFER_SAVE_AS_DEFAULT, "buffer-save-as-default", Noop }, + { LFUN_BUFFER_PARAMS_APPLY, "buffer-params-apply", Noop }, + { LFUN_LYXRC_APPLY, "lyxrc-apply", NoBuffer }, + { LFUN_INSET_REFRESH, "", Noop }, + { LFUN_BUFFER_NEXT, "buffer-next", ReadOnly }, + { LFUN_BUFFER_PREVIOUS, "buffer-previous", ReadOnly }, + { LFUN_WORDS_COUNT, "words-count", ReadOnly }, + { LFUN_FINISHED_RIGHT, "", ReadOnly }, + { LFUN_FINISHED_LEFT, "", ReadOnly }, + { LFUN_FINISHED_UP, "", ReadOnly }, + { LFUN_FINISHED_DOWN, "", ReadOnly }, + { LFUN_MOUSE_PRESS, "", ReadOnly }, + { LFUN_MOUSE_MOTION, "", ReadOnly | SingleParUpdate }, + { LFUN_MOUSE_RELEASE, "", ReadOnly }, + { LFUN_MOUSE_DOUBLE, "", ReadOnly }, + { LFUN_MOUSE_TRIPLE, "", ReadOnly }, + { LFUN_PARAGRAPH_MOVE_DOWN, "paragraph-move-down", Noop }, + { LFUN_PARAGRAPH_MOVE_UP, "paragraph-move-up", Noop }, + { LFUN_NOACTION, "", Noop } }; for (int i = 0; items[i].action != LFUN_NOACTION; ++i) { - newFunc(items[i].action, items[i].name, - _(items[i].helpText), items[i].attrib); + newFunc(items[i].action, items[i].name, items[i].attrib); } init = true; @@ -430,148 +376,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(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'; - - func_map::const_iterator fit = lyx_func_map.find(actstr); - if (!argstr.empty() && fit != lyx_func_map.end()) { - // might be pseudo (or create one) - return getPseudoAction(fit->second, argstr); + if (func2.empty()) { + return FuncRequest(LFUN_NOACTION); } - return fit != lyx_func_map.end() ? fit->second : LFUN_UNKNOWN_ACTION; -} - - -string const LyXAction::getActionName(int action) const -{ - FuncRequest ev = retrieveActionArg(action); - if (!ev.argument.empty()) - ev.argument.insert(0, " "); + string cmd; + string const arg = split(func2, cmd, ' '); - info_map::const_iterator iit = lyx_info_map.find(ev.action); + func_map::const_iterator fit = lyx_func_map.find(cmd); - if (iit != lyx_info_map.end()) - return iit->second.name + ev.argument; - return string(); + return fit != lyx_func_map.end() ? FuncRequest(fit->second, arg) : FuncRequest(LFUN_UNKNOWN_ACTION); } -string const LyXAction::helpText(int pseudoaction) const +string const LyXAction::getActionName(kb_action action) const { - FuncRequest ev = retrieveActionArg(pseudoaction); - - string help; - - info_map::const_iterator ici = lyx_info_map.find(ev.action); - if (ici != lyx_info_map.end()) { - if (lyxerr.debugging(Debug::ACTION)) { - lyxerr << "Action: " << ev.action << '\n'; - lyxerr << " name: " - << ici->second.name << '\n'; - lyxerr << " attrib: " - << ici->second.attrib << '\n'; - lyxerr << " help: " - << ici->second.helpText << '\n'; - } - help = ici->second.helpText; - // if the is no help text use the name of the func instead. - if (help.empty()) help = ici->second.name; - } - - if (help.empty()) { - help = _("No description available!"); - } else if (!ev.argument.empty()) { - help += ' '; - help += ev.argument; - } - - return help; + info_map::const_iterator const it = lyx_info_map.find(action); + return it != lyx_info_map.end() ? it->second.name : string(); } @@ -580,14 +406,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; }