/* This file is part of
* ======================================================
- *
+ *
* 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 and NEW_TABULAR
-#include "lyxparagraph.h"
-#endif
using std::ostream;
using std::endl;
-/*
+/*
NAMING RULES FOR USER-COMMANDS
Here's the set of rules to apply when a new command name is introduced:
-
+
1) Use the object.event order. That is, use `word-forward'
- instead of `forward-word'.
+ instead of `forward-word'.
2) Don't introduce an alias for an already named object. Same for events.
3) Forward movement or focus is called `forward' (not `right').
4) Backward movement or focus is called `backward' (not `left').
6) Downward movement is called `down'.
7) The begin of an object is called `begin' (not `start').
8) The end of an object is called `end'.
-
+
(May 19 1996, 12:04, RvdK)
*/
-
-// These are globals.
+
+// 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)
{
}
-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
// times. Since the array is not static we get back the memory it
// 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 },
{ 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",
+ { 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_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 },
{ LFUN_ENDBUFSEL, "buffer-end-select",
N_("Select to end of document"), ReadOnly },
{ LFUN_EXPORT, "buffer-export", N_("Export to"), ReadOnly },
- { LFUN_FAX, "buffer-fax", N_("Fax"), ReadOnly },
-#ifndef NEW_INSETS
- { LFUN_INSERTFOOTNOTE, "buffer-float-insert", "", Noop },
-#endif
{ LFUN_IMPORT, "buffer-import",
N_("Import document"), NoBuffer },
- { LFUN_BUFFERBULLETSSELECT, "buffer-itemize-bullets-select",
- "", Noop },
{ LFUN_BUFFER_PRINT, "buffer-print-xtl", N_("Print"),
ReadOnly },
{ LFUN_PRINTER_PARAMS_GET, "printer-params-get",
{ 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 },
- { LFUN_SWITCHBUFFER, "buffer-switch",
+ { 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_RUNLATEX, "buffer-typeset", N_("Update DVI"),
- ReadOnly },
- { LFUN_RUNDVIPS, "buffer-typeset-ps",
- N_("Update PostScript"), ReadOnly },
- { LFUN_PREVIEW, "buffer-view", N_("View DVI") , ReadOnly },
- { LFUN_PREVIEWPS, "buffer-view-ps",
- N_("View PostScript") , ReadOnly },
+ { 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 },
{ LFUN_LEFT, "char-backward", N_("Go one char back"),
ReadOnly },
{ LFUN_RIGHT, "char-forward", N_("Go one char forward"),
ReadOnly },
- { LFUN_CREATE_CITATION, "citation-insert",
+ { 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", "", Noop },
{ 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 },
N_("Decrement environment depth"), Noop },
{ LFUN_DEPTH_PLUS, "depth-increment",
N_("Increment environment depth"), Noop },
- { LFUN_DEPTH, "depth-next",
- N_("Change environment depth"), Noop },
{ LFUN_LDOTS, "dots-insert", N_("Insert ... dots"), Noop },
{ LFUN_DOWN, "down", N_("Go down"), ReadOnly },
{ LFUN_DOWNSEL, "down-select",
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"), 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_FIGURE, "figure-insert", N_("Insert Figure"), 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", "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"),
{ 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 },
-#ifndef NEW_INSETS
- { LFUN_FOOTMELT, "footnote-insert", N_("Insert Footnote"),
- Noop },
-#else
{ LFUN_INSET_FOOTNOTE, "footnote-insert",
N_("Insert Footnote"), Noop },
-#endif
- { LFUN_INSET_MARGINAL, "marginalnote-insert",
- N_("Insert Marginalnote"), Noop },
{ LFUN_RIGHTSEL, "forward-select", N_("Select next char"),
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"),
+ { 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_INDEX_INSERT, "index-insert",
+ { 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",
N_("Insert last index item"), Noop },
{ 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_LAYOUT_PARAGRAPH, "layout-paragraph", "", ReadOnly },
- { LFUN_LAYOUT_PAPER, "layout-paper", "", ReadOnly },
{ LFUN_LAYOUT_PASTE, "layout-paste",
N_("Paste paragraph environment type"), Noop },
{ LFUN_LAYOUT_PREAMBLE, "layout-preamble", "", ReadOnly },
- { LFUN_LAYOUT_QUOTES, "layout-quotes", "", ReadOnly },
- { LFUN_LAYOUT_SAVE_DEFAULT, "layout-save-default", "",
- ReadOnly },
- { LFUN_LAYOUT_TABLE, "layout-table", "", Noop },
+ { 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",
{ LFUN_END, "line-end", N_("Go to end of line"), ReadOnly },
{ LFUN_ENDSEL, "line-end-select",
N_("Select to end of line"), ReadOnly },
- { 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 },
-#ifndef NEW_INSETS
- { LFUN_MARGINMELT, "marginpar-insert",
- N_("Insert Margin note"), Noop },
+#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 },
{ LFUN_MARK_OFF, "mark-off", "", ReadOnly },
{ LFUN_MARK_ON, "mark-on", "", ReadOnly },
{ LFUN_SETMARK, "mark-toggle", "", ReadOnly },
{ 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_MACROARG, "math-macro-arg", "", 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_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 },
+ { 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",
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",
{ LFUN_RECONFIGURE, "reconfigure",
N_("Reconfigure"), NoBuffer },
{ LFUN_REDO, "redo", N_("Redo"), Noop },
- { LFUN_REFBACK, "reference-back", "", ReadOnly },
- { LFUN_REFGOTO, "reference-goto", "", ReadOnly },
- { LFUN_INSERT_REF, "reference-insert",
+ { LFUN_REF_GOTO, "reference-goto", "", ReadOnly },
+ { LFUN_REF_INSERT, "reference-insert",
N_("Insert cross reference"), ReadOnly },
- { LFUN_REFTOGGLE, "reference-toggle", "", Noop },
+ { 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_GETLATEX, "server-get-latex", "", ReadOnly },
{ LFUN_GETLAYOUT, "server-get-layout", "", ReadOnly },
{ LFUN_GETNAME, "server-get-name", "", ReadOnly },
{ LFUN_GETTIP, "server-get-tip", "", 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_INSERT_MATH, "symbol-insert", "", Noop },
{ LFUN_SHIFT_TAB, "tab-backward", "", Noop },
{ LFUN_TAB, "tab-forward", "", Noop },
{ LFUN_TABINSERT, "tab-insert", "", Noop },
-#ifndef NEW_TABULAR
- { LFUN_TABLE, "table-insert", N_("Insert Table"), Noop },
-#endif
+ { LFUN_DIALOG_TABULAR_INSERT, "dialog-tabular-insert",
+ 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 },
- { LFUN_TEX, "tex-mode", N_("Toggle TeX style"), Noop },
- { 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",
{ 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_WORDRIGHTSEL, "word-forward-select", "", ReadOnly },
{ LFUN_LOWCASE_WORD, "word-lowcase", "", Noop },
{ LFUN_UPCASE_WORD, "word-upcase", "", Noop },
- { LFUN_DATE_INSERT, "date-insert", "", Noop },
- { LFUN_PARAGRAPH_SPACING, "paragraph-spacing", "", Noop },
- { LFUN_SET_COLOR, "set-color", "", Noop },
- { LFUN_INSET_MINIPAGE, "minipage-insert", "", Noop },
- { LFUN_INSET_FLOAT, "float-insert", "", Noop },
- { LFUN_INSET_LIST, "list-insert", "", Noop },
- { LFUN_INSET_THEOREM, "theorem-insert", "", Noop },
- { LFUN_INSET_CAPTION, "caption-insert", "", 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_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 }
};
<< endl;
return LFUN_UNKNOWN_ACTION;
}
-
- arg_item::const_iterator aci = (*pit).second.find(arg);
- if (aci == (*pit).second.end()) {
+ arg_item::const_iterator aci = pit->second.find(arg);
+
+ if (aci == pit->second.end()) {
// the action does not have any pseudoactions with this arg
- lyxerr[Debug::ACTION]
+ lyxerr[Debug::ACTION]
<< "Action " << action
<< "does not have any pseudoactions with arg "
<< arg << endl;
}
// pseudo action exist
- lyxerr[Debug::ACTION] << "Pseudoaction exist["
- << action << '|'
- << arg << "] = " << (*aci).second << endl;
+ lyxerr[Debug::ACTION] << "Pseudoaction exist["
+ << action << '|'
+ << arg << "] = " << aci->second << endl;
- return (*aci).second;
+ return aci->second;
}
// 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;
// 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;
+ ami->second[arg] = pseudo_counter;
lyxerr[Debug::ACTION] << "Creating new pseudoaction "
<< pseudo_counter << " for [" << action
<< '|' << arg << "]\n";
-
+
return pseudo_counter;
}
// perhaps a pair<kb_action, string> should be returned?
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';
- arg = (*pit).second.arg;
- return (*pit).second.action;
+ << pit->second.action << '|'
+ << pit->second.arg << "]\n";
+ arg = pit->second.arg;
+ return pit->second.action;
} else {
lyxerr << "Lyx Error: Unrecognized pseudo-action\n";
return LFUN_UNKNOWN_ACTION;
}
-
}
// 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';
if (!argstr.empty() && fit != lyx_func_map.end()) {
// might be pseudo (or create one)
- return getPseudoAction((*fit).second, argstr);
+ return getPseudoAction(fit->second, argstr);
}
- return fit != lyx_func_map.end() ? (*fit).second : LFUN_UNKNOWN_ACTION;
+ return fit != lyx_func_map.end() ? fit->second : LFUN_UNKNOWN_ACTION;
}
// Checking for prefix is not so simple, but
// using a simple bounding function gives
// a similar result. [ale 19981103]
- func_map::const_iterator fit =
- lyx_func_map.lower_bound(func);
-
- if (fit != lyx_func_map.end()) {
- action = (*fit).second;
+ func_map::const_iterator fit =
+ lyx_func_map.lower_bound(func);
+
+ if (fit != lyx_func_map.end()) {
+ action = fit->second;
}
} else { // Go get the next function
- func_map::const_iterator fit =
- lyx_func_map.upper_bound(func);
-
- if (fit != lyx_func_map.end()) {
- action = (*fit).second;
+ func_map::const_iterator fit =
+ lyx_func_map.upper_bound(func);
+
+ if (fit != lyx_func_map.end()) {
+ action = fit->second;
}
}
-
+
return action;
}
-string LyXAction::getApproxFuncName(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);
}
-string LyXAction::getActionName(int action) const
+string const LyXAction::getActionName(int action) const
{
kb_action ac;
string arg;
- if (isPseudoAction(action)) {
- ac = retrieveActionArg(action, arg);
- arg = " " +arg;
- }
- 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())
- return (*iit).second.name + arg;
- else
+ if (iit != lyx_info_map.end()) {
+ string ret(iit->second.name);
+ ret += arg;
+ return ret;
+ } else
return string();
}
// Returns one line help associated with a (pseudo)action, i.e. appends
// the argument of the action if necessary
-string LyXAction::helpText(int pseudoaction) const
+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()) {
if (lyxerr.debugging(Debug::ACTION)) {
lyxerr << "Action: " << action << '\n';
lyxerr << " name: "
- << (*ici).second.name << '\n';
+ << ici->second.name << '\n';
lyxerr << " attrib: "
- << (*ici).second.attrib << '\n';
+ << ici->second.attrib << '\n';
lyxerr << " help: "
- << (*ici).second.helpText << '\n';
+ << ici->second.helpText << '\n';
}
- help = (*ici).second.helpText;
+ 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 = ici->second.name;
}
if (help.empty()) {
}
-bool LyXAction::funcHasFlag(kb_action action,
- LyXAction::func_attrib flag) const
+bool LyXAction::funcHasFlag(kb_action action,
+ LyXAction::func_attrib flag) const
{
info_map::const_iterator ici = lyx_info_map.find(action);
if (ici != lyx_info_map.end()) {
- return (*ici).second.attrib & flag;
+ return ici->second.attrib & flag;
} else {
// it really should exist, but...
lyxerr << "LyXAction::funcHasFlag: "
"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();
}
projects / lyx.git / blobdiff