X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fbind%2Fmath.bind;h=ea791b841e1339632b7ad380459e30efdbba048c;hb=32a5a06db5ac4f5cb21f59c47fa906ed81d09d9a;hp=4166b1da6aa4ca22766d82ed5d72323a6599309c;hpb=608f5d2d3e7158eff0391eb79c2c822862b32db8;p=lyx.git

diff --git a/lib/bind/math.bind b/lib/bind/math.bind
index 4166b1da6a..ea791b841e 100644
--- a/lib/bind/math.bind
+++ b/lib/bind/math.bind
@@ -6,11 +6,11 @@
 
 # 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.
@@ -32,10 +32,12 @@
 
 # These are defined for the math menu:
 
+Format 1
+
 \bind "M-m f"			"math-insert \frac"
 \bind "M-m s"			"math-insert \sqrt"
-\bind "M-m e"			"math-superscript"
 \bind "M-m x"			"math-subscript"
+\bind "M-m e"			"math-superscript"
 
 \bind "M-m u"			"math-insert \sum"
 \bind "M-m i"			"math-insert \int"
@@ -51,8 +53,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"
@@ -73,22 +75,30 @@
 \bind "M-m t e"   "math-mutate eqnarray"
 \bind "M-m t m"   "math-mutate multline"
 
-\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 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 t"   "tabular-feature valign-top"
-\bind "M-m w m"   "tabular-feature valign-middle"
-\bind "M-m w b"   "tabular-feature valign-bottom"
-\bind "M-m c l"   "tabular-feature align-left"
-\bind "M-m c m"   "tabular-feature align-center"
-\bind "M-m c r"   "tabular-feature align-right"
+\bind "M-m c i"   "inset-modify tabular append-column"
+\bind "M-m c d"   "inset-modify tabular delete-column"
+\bind "M-m c c"   "inset-modify tabular copy-column"
+\bind "M-m c s"   "inset-modify tabular swap-column"
+\bind "M-m c a"   "inset-modify tabular add-vline-left"
+\bind "M-m c e"   "inset-modify tabular delete-vline-left"
+\bind "M-m c z"   "inset-modify tabular add-vline-right"
+\bind "M-m c x"   "inset-modify tabular delete-vline-right"
+
+\bind "M-m w i"   "inset-modify tabular append-row"
+\bind "M-m w d"   "inset-modify tabular delete-row"
+\bind "M-m w c"   "inset-modify tabular copy-row"
+\bind "M-m w s"   "inset-modify tabular swap-row"
+\bind "M-m w a"   "inset-modify tabular add-hline-above"
+\bind "M-m w e"   "inset-modify tabular delete-hline-above"
+\bind "M-m w z"   "inset-modify tabular add-hline-below"
+\bind "M-m w x"   "inset-modify tabular delete-hline-below"
+
+\bind "M-m w t"   "inset-modify tabular valign-top"
+\bind "M-m w m"   "inset-modify tabular valign-middle"
+\bind "M-m w b"   "inset-modify tabular valign-bottom"
+\bind "M-m c l"   "inset-modify tabular align-left"
+\bind "M-m c m"   "inset-modify tabular align-center"
+\bind "M-m c r"   "inset-modify tabular align-right"
 
 # Decoration accents
 
@@ -127,8 +137,15 @@
 \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-S-asterisk"         "math-macro-unfold"
+# Defined in cua.bind as command-alternative to specialchar-insert hyphenation
+#\bind "C-minus"        "math-macro-fold"
 
 # This should be handled properly by some "get the next key" method