From 9b3a4dc5fdcb3ba469f5244ae8971d28bedf1054 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20P=C3=B6nitz?= Date: Wed, 13 Mar 2002 13:36:36 +0000 Subject: [PATCH] remove unneeded LFUN_MATH_MACROARG git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3745 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/bind/math.bind | 20 +++++++++----------- src/ChangeLog | 8 ++++++-- src/LyXAction.C | 1 - src/commandtags.h | 3 +-- src/mathed/formulamacro.C | 32 -------------------------------- src/mathed/formulamacro.h | 2 -- 6 files changed, 16 insertions(+), 50 deletions(-) diff --git a/lib/bind/math.bind b/lib/bind/math.bind index af514b0807..6a8abd56c7 100644 --- a/lib/bind/math.bind +++ b/lib/bind/math.bind @@ -50,15 +50,15 @@ \bind "M-m S-N" "math-nonumber" \bind "M-m 8" "math-insert \infty" -\bind "M-m o 1" "math-macro-arg 1" -\bind "M-m o 2" "math-macro-arg 2" -\bind "M-m o 3" "math-macro-arg 3" -\bind "M-m o 4" "math-macro-arg 4" -\bind "M-m o 5" "math-macro-arg 5" -\bind "M-m o 6" "math-macro-arg 6" -\bind "M-m o 7" "math-macro-arg 7" -\bind "M-m o 8" "math-macro-arg 8" -\bind "M-m o 9" "math-macro-arg 9" +\bind "M-m o 1" "self-insert \#1" +\bind "M-m o 2" "self-insert \#2" +\bind "M-m o 3" "self-insert \#3" +\bind "M-m o 4" "self-insert \#4" +\bind "M-m o 5" "self-insert \#5" +\bind "M-m o 6" "self-insert \#6" +\bind "M-m o 7" "self-insert \#7" +\bind "M-m o 8" "self-insert \#8" +\bind "M-m o 9" "self-insert \#9" \bind "M-m t t" "math-mutate dump" \bind "M-m t a" "math-mutate align" @@ -166,5 +166,3 @@ \bind "M-m g S-W" "math-insert \Omega" \bind "M-m g S-X" "math-insert \Xi" \bind "M-m g S-Y" "math-insert \Varphi" - - diff --git a/src/ChangeLog b/src/ChangeLog index a6233d3363..661fba0266 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,10 +1,14 @@ +2002-03-13 André Pönitz + + * commandtags.h: + * LyXAction.C: remove unused LFUN_MATH_MACROARG + 2002-03-06 John Levon * commandtags.h: * LyXAction.C: * lyxfunc.C: - * BufferView_pimpl.C: remove unused LFUN_CORE, - LFUN_TEXT_INSET + * BufferView_pimpl.C: remove unused LFUN_CORE, LFUN_TEXT_INSET 2002-03-13 Lars Gullik Bjønnes diff --git a/src/LyXAction.C b/src/LyXAction.C index 093a630691..62f974547a 100644 --- a/src/LyXAction.C +++ b/src/LyXAction.C @@ -299,7 +299,6 @@ void LyXAction::init() { LFUN_MATH_MUTATE, "math-mutate", "", Noop }, { LFUN_MATH_SPACE, "math-space", "", Noop }, { LFUN_MATH_IMPORT_SELECTION, "math-import-selection", "", Noop }, - { LFUN_MATH_MACROARG, "math-macro-arg", "", Noop }, { LFUN_INSERT_MATRIX, "math-matrix", "", Noop }, { LFUN_MATH_MODE, "math-mode", N_("Math mode"), Noop }, { LFUN_MATH_NONUMBER, "math-nonumber", "", Noop }, diff --git a/src/commandtags.h b/src/commandtags.h index 5134ccb2b1..09f4d19fbe 100644 --- a/src/commandtags.h +++ b/src/commandtags.h @@ -143,8 +143,7 @@ enum kb_action { LFUN_MATH_NONUMBER, // Alejandro 180696 LFUN_MATH_SIZE, // Alejandro 150896 LFUN_MATH_MACRO, // ale970510 - LFUN_MATH_MACROARG, // 120 // ale970510 - LFUN_MATH_EXTERN, // Andre' 20010424 + LFUN_MATH_EXTERN, // 120 // Andre' 20010424 LFUN_MATH_PANEL, // Andre' 20010522 LFUN_MATH_VALIGN, // Andre' 20010522 LFUN_MATH_HALIGN, // Andre' 20010522 diff --git a/src/mathed/formulamacro.C b/src/mathed/formulamacro.C index 39b91c9cdc..814bfca680 100644 --- a/src/mathed/formulamacro.C +++ b/src/mathed/formulamacro.C @@ -140,38 +140,6 @@ int InsetFormulaMacro::width(BufferView * bv, LyXFont const & f) const } - -UpdatableInset::RESULT -InsetFormulaMacro::localDispatch(BufferView * bv, - kb_action action, string const & arg) -{ - RESULT result = DISPATCHED; - switch (action) { - case LFUN_MATH_MACROARG: { - int const i = lyx::atoi(arg); - lyxerr << "inserting macro arg " << i << "\n"; - //if (i > 0 && i <= par()->numargs()) { - mathcursor->insert(MathAtom(new MathMacroArgument(i))); - updateLocal(bv, true); - //} else { - // lyxerr << "not in range 0.." << par()->numargs() << "\n"; - //} - break; - } - - default: { - result = InsetFormulaBase::localDispatch(bv, action, arg); - // force redraw if anything happened - if (result != UNDISPATCHED) { - bv->text->status(bv, LyXText::NEED_MORE_REFRESH); - bv->updateInset(this, false); - } - } - } - return result; -} - - MathAtom const & InsetFormulaMacro::par() const { return MathMacroTable::provide(getInsetName()); diff --git a/src/mathed/formulamacro.h b/src/mathed/formulamacro.h index 19734215f2..407ba74135 100644 --- a/src/mathed/formulamacro.h +++ b/src/mathed/formulamacro.h @@ -64,8 +64,6 @@ public: /// Inset::Code lyxCode() const; /// - RESULT localDispatch(BufferView *, kb_action, string const &); - /// MathInsetTypes getType() const; /// MathAtom const & par() const; -- 2.39.5