X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fbind%2Fsciword.bind;h=55a146bc9b43410a0d45d47674a4a9f3cb802fdd;hb=f34db97500d279bba22e35c22edc7f4e9fed3e3f;hp=3c5bc0b37eb3d9f7a2a34c732e90c891db700cd9;hpb=e22e28f6d6c0351e03d4702484679f082f84bd84;p=lyx.git

diff --git a/lib/bind/sciword.bind b/lib/bind/sciword.bind
index 3c5bc0b37e..55a146bc9b 100644
--- a/lib/bind/sciword.bind
+++ b/lib/bind/sciword.bind
@@ -10,10 +10,11 @@
 
 # LyX keyboard definitions similar to those of Scientific Word.
 
-#\bind "C-a"                    "------"
 #\bind "C-b"                    "font-bold"
 
 # Copy, paste, etc.: more familiar keys
+Format 5
+
 \bind "C-c"	"copy"
 
 # Display equation toggle: type it in a displayed equation to convert it
@@ -35,8 +36,8 @@
 \bind "C-g C-e" "math-insert \epsilon"
 \bind "C-g z" "math-insert \zeta"
 \bind "C-g h" "math-insert \eta"
-\bind "C-g q" "math-insert \theta"
-\bind "C-g C-q" "math-insert \vartheta"
+\bind "C-g y" "math-insert \theta"
+\bind "C-g S-z" "math-insert \vartheta"
 \bind "C-g i" "math-insert \iota"
 \bind "C-g k" "math-insert \kappa"
 \bind "C-g l" "math-insert \lambda"
@@ -49,28 +50,28 @@
 \bind "C-g s" "math-insert \sigma"
 \bind "C-g C-s" "math-insert \varsigma"
 \bind "C-g t" "math-insert \tau"
-\bind "C-g v" "math-insert \upsilon"
+\bind "C-g u" "math-insert \upsilon"
 \bind "C-g f" "math-insert \phi"
-\bind "C-g c" "math-insert \chi"
-\bind "C-g y" "math-insert \psi"
+\bind "C-g q" "math-insert \chi"
+\bind "C-g c" "math-insert \psi"
 \bind "C-g w" "math-insert \omega"
 
 # uppercase math Greek
 \bind "C-g S-G" "math-insert \Gamma"
 \bind "C-g S-D" "math-insert \Delta"
-\bind "C-g S-Q" "math-insert \Theta"
+\bind "C-g S-Y" "math-insert \Theta"
 \bind "C-g S-L" "math-insert \Lambda"
 \bind "C-g S-X" "math-insert \Xi"
 \bind "C-g S-P" "math-insert \Pi"
 \bind "C-g S-S" "math-insert \Sigma"
-\bind "C-g S-V" "math-insert \Upsilon"
+\bind "C-g S-U" "math-insert \Upsilon"
 \bind "C-g S-F" "math-insert \Phi"
-\bind "C-g S-Y" "math-insert \Psi"
+\bind "C-g S-C" "math-insert \Psi"
 \bind "C-g S-W" "math-insert \Omega"
 
 
 # Do we need this?
-#\bind "C-h"	"hyphenation-point-insert"
+#\bind "C-h"	"specialchar-insert hyphenation"
 
 # Sciword mnemonic.
 \bind "C-i"	"math-insert \int"
@@ -78,14 +79,14 @@
 #\bind "C-j"	"------"
 
 \bind "C-k"	"line-delete-forward"
-\bind "C-l"	"screen-recenter"
+\bind "C-j"			"screen-recenter"
+\bind "C-S-I"			"info-insert"
 
 # Toggle: in text mode, switch to math, and vice versa. Also C-t.
 \bind "C-m"	"math-mode"
-# C-n is numbering equations now. Sciword had "C-Tab" mnemonic which conflicts with many things.
-# Numbering equations. Should perhaps simplify math-number and math-nonumber into one command since they are used in very different contexts. This and also math-macro stuff should be available in the Lyx menus!
-\bind "C-n"	"math-number"
-\bind "S-C-N" "math-nonumber"
+\bind "Insert"  "math-mode"
+\bind "C-n"	"math-number-toggle"
+\bind "S-C-N"	"math-number-line-toggle"
 
 \bind "C-o"	"file-open"
 
@@ -105,24 +106,31 @@
 
 \bind "C-u"	"font-underline"
 \bind "C-v"	"paste"
+\bind "C-S-v"	"clipboard-paste"
 \bind "C-M-v"	"primary-selection-paste"
-\bind "C-S-v"	"primary-selection-paste paragraph"
 \bind "C-w"	"buffer-close"
+\bind "C-n"	"buffer-new"
 \bind "C-x"	"cut"
 \bind "C-z"	"undo"
 \bind "S-C-Z"	"redo"
+\bind "C-a"	"inset-select-all"
+\bind "C-M-a"	"command-sequence buffer-begin ; buffer-end-select"   # select all
 
 
 # This combination makes an umlaut accent now.
 #\bind "S-C-quotedbl"           "quote-insert"
-\bind "S-M-quotedbl"           "quote-insert single"
+\bind "S-M-quotedbl"           "quote-insert inner"
 
 # Bracket delimiters. Sciword mnemonic is to press Control-<bracket key>
+# On U.S. keyboard with Windows Ctrl+Shift definition must refer to
+# unshifted character -- Fixed by Michael
 
 \bind "C-9"	"math-delim ( )"
 \bind "S-C-parenleft"	"math-delim ( )"
+\bind "S-C-9"	"math-delim ( )"
 \bind "C-0"	"math-delim ( )"
 \bind "S-C-parenright"	"math-delim ( )"
+\bind "S-C-0"	"math-delim ( )"
 
 \bind "C-bracketleft"		"math-delim [ ]"
 \bind "C-bracketright"	"math-delim [ ]"
@@ -135,8 +143,12 @@
 \bind "C-S-brokenbar"	"math-delim | |"
 \bind "C-M-bar"		"math-delim | |"
 
+# On U.S. keyboard with Windows Ctrl+Shift definition must refer to
+# unshifted character -- Fixed by Michael
 \bind "S-C-braceleft"		"math-delim { }"
 \bind "S-C-braceright"		"math-delim { }"
+\bind "S-C-bracketleft"		"math-delim { }"
+\bind "S-C-bracketright"	"math-delim { }"
 
 # Accents by Sciword mnemonics. Mostly press Ctrl-<accent key>
 # e.g. Ctrl-. for overdot, Ctrl-' for acute accent, Ctrl-~ for tilde etc.
@@ -171,7 +183,7 @@
 \bind "F4"                     "font-default"
 \bind "F5"                     "font-bold"
 \bind "F6"                     "font-emph"
-\bind "F7"                     "font-code"
+\bind "F7"                     "font-typewriter"
 \bind "F8"                     "font-noun"
 # F9 bound below as meta-prefix (useful e.g. if the keyboard doesn't have a working ALT).
 #\bind "F9"                     "------"
@@ -182,7 +194,11 @@
 
 \bind "M-apostrophe"	"math-insert \prime"
 \bind "C-Up"		"math-superscript"
+\bind "C-h"		"math-superscript"
+\bind "C-3"		"math-superscript"
 \bind "C-Down"		"math-subscript"
+\bind "C-l"		"math-subscript"
+\bind "C-4"		"math-subscript"
 \bind "C-s d"		"math-insert \partial"
 \bind "C-s e"		"math-insert \sum"
 \bind "C-s p"		"math-insert \prod"
@@ -216,12 +232,18 @@
 \bind_file greekkeys.bind
 
 
-\bind "S-KP_Right"  			"forward-select"
-\bind "S-KP_Left"				"backward-select"
+\bind "M-Up"			"command-alternatives outline-up; paragraph-move-up; tabular-feature move-row-up"
+\bind "M-Down"			"command-alternatives outline-down; paragraph-move-down; tabular-feature move-row-down"
+\bind "M-Right"			"tabular-feature move-column-right"
+\bind "M-Left"			"tabular-feature move-column-left"
+\bind "S-KP_Right"  			"char-right-select"
+\bind "S-KP_Left"				"char-left-select"
 \bind "S-KP_Up" 				"up-select"
 \bind "S-KP_Down"				"down-select"
-\bind "S-C-KP_Right"			"word-forward-select"
-\bind "S-C-KP_Left" 			"word-backward-select"
+\bind "S-C-KP_Right"			"word-right-select"
+\bind "S-C-KP_Left" 			"word-left-select"
+\bind "C-KP_Right"			"word-right"
+\bind "C-KP_Left" 			"word-left"
 \bind "S-C-KP_Up"				"paragraph-up-select"
 \bind "S-C-KP_Down" 			"paragraph-down-select"
 \bind "S-KP_Home"				"line-begin-select"
@@ -238,3 +260,10 @@
 
 
 \bind "M-x" "command-execute"
+
+\bind "C-M-c" "buffer-view"
+
+# custom commands imported from cua.bind by Michael
+\bind "C-space"			"command-alternatives math-space ; space-insert protected"
+\bind "C-Return"		"newline-insert newline"
+\bind "C-S-Return"		"newline-insert linebreak"