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

diff --git a/lib/bind/math.bind b/lib/bind/math.bind
index 440009ce5b..0e775f1db0 100644
--- a/lib/bind/math.bind
+++ b/lib/bind/math.bind
@@ -1,16 +1,22 @@
-# This file is part of
-# ==================================================================
-#
-#                   LyX, the Document Processor
-#
-#               Copyright (C) 1997 LyX Team
-#
-#                      Version 0.1, May 28 1997
-#
-# ==================================================================
+# -*- 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 Jean-Marc Lasgouttes
+# author John Levon
+# 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.
@@ -31,22 +37,22 @@
 \bind "M-m e"			"math-superscript"
 \bind "M-m x"			"math-subscript"
 
-\bind "M-m S-A"		"command-sequence math-mode; font-roman; math-insert Å;"
-\bind "M-m S-O"		"command-sequence math-mode; font-roman; math-insert Ø;"
-\bind "M-m S-T"		"command-sequence math-mode; math-insert \mathrm; math-insert T;"
-
 \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"
+\bind "M-m S-L l"		"math-limits limits"
+\bind "M-m S-L n"		"math-limits nolimits"
+\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"
@@ -59,24 +65,38 @@
 \bind "M-m o 8"   "self-insert \#8"
 \bind "M-m o 9"   "self-insert \#9"
 
+\bind "M-m t n"   "math-mutate none"
 \bind "M-m t t"   "math-mutate dump"
 \bind "M-m t a"   "math-mutate align"
-\bind "M-m t i"   "math-mutate inline"
-\bind "M-m t d"   "math-mutate display"
+\bind "M-m t i"   "math-mutate simple"
+\bind "M-m t d"   "math-mutate equation"
 \bind "M-m t e"   "math-mutate eqnarray"
-
-\bind "M-m c i"   "math-column-insert"
-\bind "M-m c d"   "math-column-delete"
-
-\bind "M-m w i"   "math-row-insert"
-\bind "M-m w d"   "math-row-delete"
-
-\bind "M-m a v t"   "math-valign top"
-\bind "M-m a v c"   "math-valign center"
-\bind "M-m a v b"   "math-valign bottom"
-\bind "M-m a h l"   "math-halign left"
-\bind "M-m a h c"   "math-halign center"
-\bind "M-m a h r"   "math-halign right"
+\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 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"
+\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"
 
 # Decoration accents
 
@@ -85,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"
@@ -101,23 +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"          "tab-insert"
 \bind "M-m space"      "math-space"
-\bind "M-m S-G"        "math-greek-toggle"
+# 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
 
@@ -154,6 +179,7 @@
 \bind "M-m g S-G"    "math-insert \Gamma"
 \bind "M-m g S-I"    "math-insert \iota"
 \bind "M-m g S-J"    "math-insert \epsilon"
+\bind "M-m g S-L"    "math-insert \Lambda"
 \bind "M-m g S-O"    "math-insert \Omega"
 \bind "M-m g S-P"    "math-insert \Pi"
 \bind "M-m g S-Q"    "math-insert \vartheta"
@@ -164,4 +190,4 @@
 \bind "M-m g S-V"    "math-insert \Theta"
 \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"
+\bind "M-m g S-Y"    "math-insert \Psi"