fix some C++ parsing bugs

[lyx.git] / src / LyXAction.C

diff --git a/src/LyXAction.C b/src/LyXAction.C
index db96a61f2aca246685c48d345c564f857d9cdcd0..25a5e76552c50c7607bc4d0241691cca80d9746c 100644 (file)
--- a/src/LyXAction.C
+++ b/src/LyXAction.C
@@ -114,7 +114,6 @@ void LyXAction::init()
                  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 },
@@ -169,14 +168,13 @@ void LyXAction::init()
                  N_("Choose Paragraph Environment"), ReadOnly },
                { LFUN_END_OF_SENTENCE, "end-of-sentence-period-insert",
                  N_("Insert end of sentence period"), Noop },
+               { LFUN_ENVIRONMENT_INSERT, "environment-insert", "", 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_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 },
@@ -193,8 +191,9 @@ void LyXAction::init()
                { 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_FREEFONT_APPLY, "font-free-apply",
+                 N_("Toggle user defined style"), Noop },
+               { LFUN_FREEFONT_UPDATE, "font-free-update", "", Noop },
                { LFUN_NOUN, "font-noun", N_("Toggle noun style"), Noop },
                { LFUN_ROMAN, "font-roman", N_("Toggle roman font style"),
                  Noop },
@@ -241,7 +240,7 @@ void LyXAction::init()
                { LFUN_LATEX_LOG, "latex-view-log", N_("View LaTeX log"),
                  ReadOnly },
                { LFUN_LAYOUT, "layout", "", Noop },
-               { LFUN_LAYOUT_CHARACTER, "layout-character", "", Noop },
+               { LFUN_LAYOUT_CHARACTER, "layout-character", "", ReadOnly },
                { LFUN_LAYOUT_COPY, "layout-copy",
                  N_("Copy paragraph environment type"), Noop },
                { LFUN_LAYOUT_DOCUMENT, "layout-document", "", ReadOnly },
@@ -321,8 +320,6 @@ void LyXAction::init()
                  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 },
@@ -409,7 +406,7 @@ void LyXAction::init()
 
                { LFUN_DIALOG_SHOW_NEW_INSET, "dialog-show-new-inset",
                  N_("Show the inset's dialog"), Noop },
-               { LFUN_DIALOG_SHOW_NEW_INSET, "dialog-show-next-inset",
+               { LFUN_DIALOG_SHOW_NEXT_INSET, "dialog-show-next-inset",
                  N_("Show the inset's dialog"), Noop },
                { LFUN_DIALOG_UPDATE, "dialog-update",
                  N_("Update the dialog"), Noop },
@@ -418,7 +415,12 @@ void LyXAction::init()
                { LFUN_DIALOG_DISCONNECT_INSET, "dialog-disconnect-inset",
                  N_("Disconnect the dialog from the current inset"), Noop },
                { LFUN_INSET_APPLY, "inset-apply", "", Noop },
+               { LFUN_INSET_INSERT, "inset-insert", "", Noop },
                { LFUN_INSET_MODIFY, "", "internal only", Noop },
+               { LFUN_INSET_DIALOG_UPDATE, "", "internal only", Noop },
+               { LFUN_PARAGRAPH_APPLY, "paragraph-params-apply",
+                  N_("Apply these params to the paragraph"), Noop },
+               { LFUN_PARAGRAPH_UPDATE, "", "internal only", Noop },
                { LFUN_NOACTION, "", "", Noop }
        };