From 2ad61c03667bcab78a2be6cf6c8ff3c39baf72a0 Mon Sep 17 00:00:00 2001 From: Stefan Schimanski Date: Thu, 1 Nov 2007 11:08:04 +0000 Subject: [PATCH] * LFUNs for math macros and menu integration git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21327 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/bind/math.bind | 4 ++++ lib/ui/stdmenus.inc | 20 ++++++++++++++++++++ src/LyXAction.cpp | 11 +++++++++++ src/lfuns.h | 13 +++++++++++++ 4 files changed, 48 insertions(+) diff --git a/lib/bind/math.bind b/lib/bind/math.bind index aa1a08fca2..5fcf352417 100644 --- a/lib/bind/math.bind +++ b/lib/bind/math.bind @@ -138,6 +138,10 @@ \bind "C-Tab" "cell-split" \bind "M-m space" "math-space" +# math-macros +\bind "C-plus" "math-macro-unfold" +\bind "C-minus" "math-macro-fold" + # This should be handled properly by some "get the next key" method \bind "M-m g a" "math-insert \alpha" diff --git a/lib/ui/stdmenus.inc b/lib/ui/stdmenus.inc index a3eebddb07..9dea68e732 100644 --- a/lib/ui/stdmenus.inc +++ b/lib/ui/stdmenus.inc @@ -186,6 +186,7 @@ Menuset Item "Toggle Numbering|N" "math-number" Item "Toggle Numbering of Line|u" "math-nonumber" Submenu "Change Limits Type|L" "edit_math_limits" + Submenu "Macro Definition" "edit_math_macro_definition" Separator Submenu "Change Formula Type|F" "edit_math_mutate" Separator @@ -206,6 +207,21 @@ Menuset Item "Delete Line to Right" "tabular-feature delete-vline-right" End + Menu "edit_math_macro_definition" + Item "Append Parameter" "math-macro-add-param" + Item "Remove Last Parameter" "math-macro-remove-param" + Separator + Item "Make First Non-Optional into Optional Parameter" "math-macro-make-optional" + Item "Make Last Optional into Non-Optional Parameter" "math-macro-make-nonoptional" + Item "Insert Optional Parameter" "math-macro-add-optional-param" + Item "Remove Optional Parameter" "math-macro-remove-optional-param" + Separator + Item "Append Parameter Eating From The Right" "math-macro-append-greedy-param" + Item "Append Optional Parameter Eating From The Right" "math-macro-add-greedy-optional-param" + Item "Remove Last Parameter Spitting Out To The Right" "math-macro-remove-greedy-param" + Separator + End + Menu "edit_math_limits" Item "Default|t" "math-limits empty" Item "Display|D" "math-limits limits" @@ -267,6 +283,9 @@ Menuset Item "Open All Insets|O" "all-insets-toggle open" Item "Close All Insets|C" "all-insets-toggle close" Separator + Item "Unfold Math Macro" "math-macro-unfold" + Item "Fold Math Macro" "math-macro-fold" + Separator Item "View Source|S" "dialog-toggle view-source" Submenu "Update|U" "view_update" ViewFormats @@ -368,6 +387,7 @@ Menuset Separator Item "Delimiters|r" "dialog-show mathdelimiter" Item "Matrix|x" "dialog-show mathmatrix" + Item "Macro|o" "math-macro newmacroname newcommand" Separator Item "Toggle Math Panels" "toolbar-toggle math_panels" End diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp index f3b6f797a5..9551e8abe1 100644 --- a/src/LyXAction.cpp +++ b/src/LyXAction.cpp @@ -241,6 +241,17 @@ void LyXAction::init() { LFUN_MATH_NUMBER, "math-number", Noop, Math }, { LFUN_MATH_EXTERN, "math-extern", Noop, Math }, { LFUN_MATH_SIZE, "math-size", Noop, Math }, + { LFUN_MATH_MACRO_UNFOLD, "math-macro-unfold", ReadOnly | SingleParUpdate, Math }, + { LFUN_MATH_MACRO_FOLD, "math-macro-fold", ReadOnly | SingleParUpdate, Math }, + { LFUN_MATH_MACRO_ADD_PARAM, "math-macro-add-param", Noop, Math }, + { LFUN_MATH_MACRO_REMOVE_PARAM, "math-macro-remove-param", Noop, Math }, + { LFUN_MATH_MACRO_APPEND_GREEDY_PARAM, "math-macro-append-greedy-param", Noop, Math }, + { LFUN_MATH_MACRO_REMOVE_GREEDY_PARAM, "math-macro-remove-greedy-param", Noop, Math }, + { LFUN_MATH_MACRO_MAKE_OPTIONAL, "math-macro-make-optional", Noop, Math }, + { LFUN_MATH_MACRO_MAKE_NONOPTIONAL, "math-macro-make-nonoptional", Noop, Math }, + { LFUN_MATH_MACRO_ADD_OPTIONAL_PARAM, "math-macro-add-optional-param", Noop, Math }, + { LFUN_MATH_MACRO_REMOVE_OPTIONAL_PARAM, "math-macro-remove-optional-param", Noop, Math }, + { LFUN_MATH_MACRO_ADD_GREEDY_OPTIONAL_PARAM, "math-macro-add-greedy-optional-param", Noop, Math }, { LFUN_MENU_OPEN, "menu-open", NoBuffer, Buffer }, { LFUN_MENU_SEPARATOR_INSERT, "menu-separator-insert", Noop, Edit }, { LFUN_META_PREFIX, "meta-prefix", NoBuffer, System }, diff --git a/src/lfuns.h b/src/lfuns.h index 56e9b94f21..2ca33d7338 100644 --- a/src/lfuns.h +++ b/src/lfuns.h @@ -419,6 +419,19 @@ enum kb_action { // 305 LFUN_WORD_RIGHT, // dov, 20071028 LFUN_WORD_RIGHT_SELECT, // dov, 20071028 + LFUN_MATH_MACRO_FOLD, + LFUN_MATH_MACRO_UNFOLD, + LFUN_MATH_MACRO_ADD_PARAM, + // 310 + LFUN_MATH_MACRO_REMOVE_PARAM, + LFUN_MATH_MACRO_APPEND_GREEDY_PARAM, + LFUN_MATH_MACRO_REMOVE_GREEDY_PARAM, + LFUN_MATH_MACRO_MAKE_OPTIONAL, + LFUN_MATH_MACRO_MAKE_NONOPTIONAL, + // 315 + LFUN_MATH_MACRO_ADD_OPTIONAL_PARAM, + LFUN_MATH_MACRO_REMOVE_OPTIONAL_PARAM, + LFUN_MATH_MACRO_ADD_GREEDY_OPTIONAL_PARAM, LFUN_LASTACTION // end of the table }; -- 2.39.5