X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXAction.C;h=b3b12158f9819b04b22d100547048c1aa11f04bd;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=b20282585551a84ddf7884186fb4bfdde1d020a3;hpb=da65e2b7fbe29c5bca2812a56d5bbdb7efb702e5;p=lyx.git

diff --git a/src/LyXAction.C b/src/LyXAction.C
index b202825855..b3b12158f9 100644
--- a/src/LyXAction.C
+++ b/src/LyXAction.C
@@ -22,8 +22,11 @@
 
 #include <boost/assert.hpp>
 
-using lyx::support::split;
-using lyx::support::trim;
+
+namespace lyx {
+
+using support::split;
+using support::trim;
 
 using std::endl;
 using std::string;
@@ -97,29 +100,29 @@ void LyXAction::init()
 		{ LFUN_ACCENT_UNDERBAR, "accent-underbar", Noop },
 		{ LFUN_ACCENT_UNDERDOT, "accent-underdot", Noop },
 		{ LFUN_APPENDIX, "appendix", Noop },
-		{ LFUN_BACKWARD_SELECT, "backward-select", ReadOnly | SingleParUpdate },
 		{ LFUN_BOOKMARK_GOTO, "bookmark-goto", ReadOnly },
 		{ LFUN_BOOKMARK_SAVE, "bookmark-save", ReadOnly },
+		{ LFUN_BOOKMARK_CLEAR, "bookmark-clear", ReadOnly },
 		{ LFUN_BREAK_LINE, "break-line", Noop },
 		{ LFUN_BREAK_PARAGRAPH, "break-paragraph", Noop },
-		{ LFUN_BREAK_PARAGRAPHKEEPLAYOUT, "break-paragraph-keep-layout", 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_BEGINSEL, "buffer-begin-select", 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_ENDSEL, "buffer-end-select", 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_NEWTMPLT,"buffer-new-template", 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 },
@@ -130,16 +133,19 @@ void LyXAction::init()
 		{ 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_FORWARD_BACKWARD, "delete-backward", SingleParUpdate },
-		{ LFUN_DELETE_FORWARD_BACKWARD_SKIP, "delete-backward-skip", Noop },
-		{ LFUN_DELETE_FORWARD, "delete-forward", SingleParUpdate },
+		{ 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 },
@@ -147,7 +153,7 @@ void LyXAction::init()
 		{ LFUN_DOWN, "down", ReadOnly | NoUpdate },
 		{ LFUN_DOWN_SELECT, "down-select", ReadOnly | SingleParUpdate },
 		{ LFUN_DROP_LAYOUTS_CHOICE, "drop-layouts-choice", ReadOnly },
-		{ LFUN_LINE_END_OF_SENTENCE_PERIOD_INSERT, "end-of-sentence-period-insert", Noop },
+		{ 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 },
@@ -174,7 +180,6 @@ void LyXAction::init()
 		{ LFUN_FONT_STATE, "font-state", ReadOnly },
 		{ LFUN_FONT_UNDERLINE, "font-underline", Noop },
 		{ LFUN_FOOTNOTE_INSERT, "footnote-insert", Noop },
-		{ LFUN_CHAR_FORWARDSEL, "forward-select", ReadOnly | SingleParUpdate },
 		{ LFUN_HFILL_INSERT, "hfill-insert", Noop },
 		{ LFUN_HELP_OPEN, "help-open", NoBuffer | Argument},
 		{ LFUN_HTML_INSERT, "html-insert", Noop },
@@ -199,10 +204,10 @@ void LyXAction::init()
 		{ LFUN_LAYOUT_PARAGRAPH, "layout-paragraph", ReadOnly },
 		{ LFUN_LAYOUT_TABULAR, "layout-tabular", Noop },
 		{ LFUN_LINE_BEGIN, "line-begin", ReadOnly | NoUpdate},
-		{ LFUN_LINE_BEGINSEL, "line-begin-select", ReadOnly | SingleParUpdate },
-		{ LFUN_DELETE_FORWARD_LINE_FORWARD, "line-delete-forward", Noop },
+		{ 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_ENDSEL, "line-end-select", ReadOnly | SingleParUpdate },
+		{ LFUN_LINE_END_SELECT, "line-end-select", ReadOnly | SingleParUpdate },
 #if 0
 		{ LFUN_LIST_INSERT, "list-insert", Noop },
 #endif
@@ -212,6 +217,7 @@ void LyXAction::init()
 		{ 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 },
@@ -236,10 +242,10 @@ void LyXAction::init()
 		{ LFUN_BOX_INSERT, "box-insert", Noop },
 		{ LFUN_NOTE_NEXT, "note-next", ReadOnly },
 		{ LFUN_INSET_TOGGLE, "", ReadOnly },
-		{ LFUN_SCREEN_DOWN_INSET_TOGGLE, "next-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_DOWNSEL, "paragraph-down-select", ReadOnly },
+		{ 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 },
@@ -247,7 +253,7 @@ void LyXAction::init()
 		{ LFUN_OUTLINE_OUT, "outline-out", Noop },
 		{ LFUN_PARAGRAPH_SPACING, "paragraph-spacing", Noop },
 		{ LFUN_PARAGRAPH_UP, "paragraph-up", ReadOnly | NoUpdate},
-		{ LFUN_PARAGRAPH_UPSEL, "paragraph-up-select", ReadOnly },
+		{ 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 },
@@ -256,13 +262,12 @@ void LyXAction::init()
 		{ 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_DOWNSEL, "screen-down-select", ReadOnly },
+		{ LFUN_SCREEN_DOWN, "screen-down", ReadOnly },
+		{ 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_UPSEL, "screen-up-select", ReadOnly },
-		{ LFUN_INSET_SCROLL, "inset-scroll", ReadOnly },
+		{ LFUN_SCREEN_UP, "screen-up", ReadOnly },
+		{ 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 },
@@ -296,14 +301,14 @@ void LyXAction::init()
 		{ LFUN_VC_REVERT, "vc-revert", ReadOnly },
 		{ LFUN_VC_UNDO_LAST, "vc-undo-last", ReadOnly },
 		{ LFUN_WORD_BACKWARD, "word-backward", ReadOnly | NoUpdate},
-		{ LFUN_WORD_BACKWARDSEL, "word-backward-select", ReadOnly | SingleParUpdate },
+		{ LFUN_WORD_BACKWARD_SELECT, "word-backward-select", ReadOnly | SingleParUpdate },
 		{ LFUN_WORD_CAPITALIZE, "word-capitalize", Noop },
-		{ LFUN_DELETE_FORWARD_WORD_BACKWARD, "word-delete-backward", Noop },
-		{ LFUN_DELETE_FORWARD_WORD_FORWARD, "word-delete-forward", 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_FORWARDSEL, "word-forward-select", ReadOnly | SingleParUpdate },
+		{ 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 },
@@ -311,26 +316,25 @@ void LyXAction::init()
 		{ LFUN_CHARS_TRANSPOSE, "chars-transpose", Noop },
 		{ LFUN_FLOAT_LIST, "float-list", Noop },
 		{ LFUN_ESCAPE, "escape", ReadOnly },
-		{ LFUN_TOGGLE_TOOLTIPS, "toggle-tooltips", NoBuffer },
-		{ LFUN_TRACK_CHANGES, "track-changes", Noop },
-		{ LFUN_OUTPUT_CHANGES, "output-changes", Noop },
-		{ LFUN_MERGE_CHANGES, "merge-changes", Noop },
-		{ LFUN_ACCEPT_CHANGE, "accept-change", Noop },
-		{ LFUN_REJECT_CHANGE, "reject-change", Noop },
-		{ LFUN_ACCEPT_ALL_CHANGES, "accept-all-changes", Noop },
-		{ LFUN_REJECT_ALL_CHANGES, "reject-all-changes", Noop },
+		{ LFUN_CHANGES_TRACK, "changes-track", Noop },
+		{ LFUN_CHANGES_OUTPUT, "changes-output", Noop },
+		{ LFUN_CHANGE_NEXT, "change-next", ReadOnly },
+		{ 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_SHOW_NEXT_INSET, "dialog-show-next-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_INSET_DIALOG_SHOW, "inset-dialog-show", Noop },
 		{ LFUN_PARAGRAPH_PARAMS_APPLY, "paragraph-params-apply", Noop },
 		{ LFUN_PARAGRAPH_UPDATE, "", Noop },
 		{ LFUN_EXTERNAL_EDIT, "external-edit", Noop },
@@ -345,7 +349,7 @@ void LyXAction::init()
 		{ LFUN_BUFFER_PARAMS_APPLY, "buffer-params-apply", Noop },
 		{ LFUN_LYXRC_APPLY, "lyxrc-apply", NoBuffer },
 		{ LFUN_INSET_REFRESH, "", Noop },
-		{ LFUN_SCREEN_DOWNBUFFER, "buffer-next", ReadOnly },
+		{ LFUN_BUFFER_NEXT, "buffer-next", ReadOnly },
 		{ LFUN_BUFFER_PREVIOUS, "buffer-previous", ReadOnly },
 		{ LFUN_WORDS_COUNT, "words-count", ReadOnly },
 		{ LFUN_FINISHED_RIGHT, "", ReadOnly },
@@ -359,6 +363,13 @@ void LyXAction::init()
 		{ LFUN_MOUSE_TRIPLE, "", ReadOnly },
 		{ LFUN_PARAGRAPH_MOVE_DOWN, "paragraph-move-down", Noop },
 		{ LFUN_PARAGRAPH_MOVE_UP, "paragraph-move-up", Noop },
+		{ LFUN_WINDOW_NEW, "window-new", NoBuffer },
+		{ LFUN_WINDOW_CLOSE, "window-close", NoBuffer },
+		{ LFUN_UNICODE_INSERT, "unicode-insert", Noop },
+		{ LFUN_TOOLBAR_TOGGLE_STATE, "", NoBuffer },
+		{ LFUN_NOMENCL_INSERT, "nomencl-insert", Noop },
+		{ LFUN_NOMENCL_PRINT, "nomencl-print", Noop },
+
 		{ LFUN_NOACTION, "", Noop }
 	};
 
@@ -431,3 +442,6 @@ ostream & operator<<(ostream & o, kb_action action)
 {
 	return o << int(action);
 }
+
+
+} // namespace lyx