X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fbind%2Fmath.bind;h=0e775f1db0aded545430525972e2fe92d34609cb;hb=ba496b94acc56d41595d266bfdc4cce669006e4b;hp=5fbf736488301dcc1cb639d0a4cae6b514804033;hpb=1adfa0a4028ada985a63f270f5cef559bb98183d;p=lyx.git

diff --git a/lib/bind/math.bind b/lib/bind/math.bind
index 5fbf736488..0e775f1db0 100644
--- a/lib/bind/math.bind
+++ b/lib/bind/math.bind
@@ -1,20 +1,22 @@
+# -*- text -*-
+
 # file math.bind
 # This file is part of LyX, the document processor.
 # Licence details can be found in the file COPYING.
 
 # author John Weiss
 # author Alejandro Aguilar Sierra
-# author Lars Gullik Bjønnes
+# author Lars Gullik Bjønnes
 # author Jean-Marc Lasgouttes
 # author John Levon
-# author André Pönitz
-# author Michael Schmitt
+# author André Pönitz
+# author Michael Gerz
 # author Martin Vermeer
 
 # Full author contact details are available in file CREDITS.
 
-# This file provides math mode keys.  Most were suggested by John Weiss 
-# and modified by Alejandro Aguilar Sierra to be used with different 
+# This file provides math mode keys.  Most were suggested by John Weiss
+# and modified by Alejandro Aguilar Sierra to be used with different
 # keyboard layouts.
 #
 # This file is automatically included from the main bind file.
@@ -37,10 +39,10 @@
 
 \bind "M-m u"			"math-insert \sum"
 \bind "M-m i"			"math-insert \int"
-\bind "M-m m"			"math-mode"
+\bind "M-m m"			"math-mode" # produces mathematical text
 \bind "M-m d"			"math-display"
 
-#\bind "M-m o"			"math-insert \oint"
+\bind "M-m y"			"math-insert \oint"
 \bind "M-m p"			"math-insert \partial"
 \bind "M-m r"			"math-insert \root"
 \bind "M-m l"			"math-limits"
@@ -49,8 +51,8 @@
 \bind "M-m S-L space"		"math-limits empty"
 
 
-\bind "M-m n"			"math-number"
-\bind "M-m S-N"			"math-nonumber"
+\bind "M-m n"			"math-number-toggle"
+\bind "M-m S-N"			"math-number-line-toggle"
 \bind "M-m 8"			"math-insert \infty"
 
 \bind "M-m o 1"   "self-insert \#1"
@@ -75,11 +77,19 @@
 \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 c a"   "tabular-feature add-vline-left"
+\bind "M-m c e"   "tabular-feature delete-vline-left"
+\bind "M-m c z"   "tabular-feature add-vline-right"
+\bind "M-m c x"   "tabular-feature delete-vline-right"
 
 \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"
+\bind "M-m w a"   "tabular-feature add-hline-above"
+\bind "M-m w e"   "tabular-feature delete-hline-above"
+\bind "M-m w z"   "tabular-feature add-hline-below"
+\bind "M-m w x"   "tabular-feature delete-hline-below"
 
 \bind "M-m w t"   "tabular-feature valign-top"
 \bind "M-m w m"   "tabular-feature valign-middle"
@@ -95,9 +105,9 @@
 
 \bind "M-m ~S-quotedbl"		"math-insert \ddot"
 \bind "M-m h"				"math-insert \hat"
-\bind "M-m ~S-backslash"	"math-insert \grave"
+\bind "M-m ~C-~M-~S-backslash"	"math-insert \grave"
 \bind "M-m ~S-slash"		"math-insert \acute"
-\bind "M-m ~S-ampersand"	"math-insert \tilde"
+\bind "M-m ~C-~M-~S-ampersand"	"math-insert \tilde"
 \bind "M-m ~S-minus"		"math-insert \bar"
 \bind "M-m ~S-period"		"math-insert \dot"
 \bind "M-m S-V"				"math-insert \check"
@@ -111,22 +121,28 @@
 # These do pairs of: () {} [] <> ||
 
 \bind "M-m ~S-parenleft"	"math-delim ( )"
-\bind "M-m ~S-bracketleft"	"math-delim [ ]"
-\bind "M-m ~S-braceleft"	"math-delim { }"
-\bind "M-m ~S-less"		"math-delim langle rangle"  
-\bind "M-m ~S-greater"		"math-delim rangle langle"
-\bind "M-m ~S-bar"		"math-delim | |"
+\bind "M-m ~C-~M-~S-bracketleft" "math-delim [ ]"
+\bind "M-m ~C-~M-~S-braceleft"	"math-delim { }"
+\bind "M-m ~S-less"		"math-delim langle rangle" # produces < >
+\bind "M-m ~S-greater"		"math-delim rangle langle" # produces > <
+\bind "M-m ~C-~M-~S-bar"	"math-delim | |"
 
 
-# Note: it's easy to insert binary relations like \pm, \mp, \neq, \geq, 
+# Note: it's easy to insert binary relations like \pm, \mp, \neq, \geq,
 # and \leq just by typing them. However it's easier to remember these:
 
-\bind "M-m ~S-plus"    "math-insert \pm" 
+\bind "M-m ~S-plus"    "math-insert \pm"
 \bind "M-m ~S-equal"   "math-insert \neq"
 
 \bind "Escape"         "escape"
-\bind "C-Tab"          "cell-split"
 \bind "M-m space"      "math-space"
+# FIXME: find another shortcut for cell-split as C-Tab is used for buffer-next
+# in 'cua.bind'.
+#\bind "C-Tab"          "cell-split"
+
+# 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