correct typo

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5065 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/bind/math.bind b/lib/bind/math.bind
index ffcf7162f17d47b0eb49ad8bdb90c9dec2cca0f8..72b69da6f0a0335ed6aa677e5fa25975a0ac5605 100644 (file)
--- a/lib/bind/math.bind
+++ b/lib/bind/math.bind
@@ -63,12 +63,12 @@
 \bind "M-m t e"   "math-mutate eqnarray"
 \bind "M-m t m"   "math-mutate multline"
 
-\bind "M-m c i"   "tabular-feature insert-column"
+\bind "M-m c i"   "tabular-feature append-column"
 \bind "M-m c d"   "tabular-feature delete-column"
 \bind "M-m c c"   "tabular-feature copy-column"
 \bind "M-m c s"   "tabular-feature swap-column"
 
-\bind "M-m w i"   "tabular-feature insert-row"
+\bind "M-m w i"   "tabular-feature append-row"
 \bind "M-m w d"   "tabular-feature delete-row"
 \bind "M-m w c"   "tabular-feature copy-row"
 \bind "M-m w s"   "tabular-feature swap-row"

diff --git a/src/mathed/formulabase.C b/src/mathed/formulabase.C
index 495e9a257f0a39770e5c2cc10dac0edb0ad1f366..1a767ee4a8996878293e2f22441b111289f76d44 100644 (file)
--- a/src/mathed/formulabase.C
+++ b/src/mathed/formulabase.C
@@ -423,6 +423,7 @@ Inset::RESULT InsetFormulaBase::localDispatch(FuncRequest const & cmd)
        case LFUN_INSERT_LABEL:
        case LFUN_MATH_EXTERN:
        case LFUN_TABULAR_FEATURE:
+       case LFUN_PASTESELECTION:
                bv->lockedInsetStoreUndo(Undo::EDIT);
                mathcursor->dispatch(cmd);
                updateLocal(bv, true);
@@ -527,15 +528,6 @@ Inset::RESULT InsetFormulaBase::localDispatch(FuncRequest const & cmd)
                break;
        }
 
-/*
-       case LFUN_PASTESELECTION: {
-               string const clip = bv->getClipboard();
-               if (!clip.empty())
-                       mathed_parse_normal(par_, clip);
-               break;
-       }
-*/
-
        case LFUN_PASTE:
                if (was_macro)
                        mathcursor->macroModeClose();

diff --git a/src/mathed/math_nestinset.C b/src/mathed/math_nestinset.C
index 41f124b34f4139dd273d4e72c5104227afb91af3..c07486227617032cb4d6a5fb4f4aad899553b077 100644 (file)
--- a/src/mathed/math_nestinset.C
+++ b/src/mathed/math_nestinset.C
@@ -8,6 +8,7 @@
 #include "math_parser.h"
 #include "funcrequest.h"
 #include "debug.h"
+#include "BufferView.h"
 #include "frontends/Painter.h"
 
 
@@ -315,6 +316,8 @@ void MathNestInset::notifyCursorLeaves()
 MathInset::result_type MathNestInset::dispatch
        (FuncRequest const & cmd, idx_type & idx, pos_type & pos)
 {
+       BufferView * bv = cmd.view();
+
        switch (cmd.action) {
 
                case LFUN_PASTE: {
@@ -328,6 +331,15 @@ MathInset::result_type MathNestInset::dispatch
                        return DISPATCHED;
                }
 
+               case LFUN_PASTESELECTION:
+                       return
+                               dispatch(FuncRequest(bv, LFUN_PASTE, bv->getClipboard()), idx, pos);
+                       
+               case LFUN_MOUSE_PRESS:
+                       if (cmd.button() == mouse_button::button2)
+                               return dispatch(FuncRequest(bv, LFUN_PASTESELECTION), idx, pos);
+                       return UNDISPATCHED;
+
                default:        
                        return MathInset::dispatch(cmd, idx, pos);
        }