X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fbind%2Fcua.bind;h=2ba0064c41d18236e2483fddf66a989e0dab15cf;hb=5598c1fa961d5e55d7e34bde1be3e52a3054e538;hp=91e8f2147923c3de4f7d062d1ad3ace6be2cc954;hpb=551f32859db25cb9e269eb5522a3fcd04806b9ba;p=lyx.git

diff --git a/lib/bind/cua.bind b/lib/bind/cua.bind
index 91e8f21479..2ba0064c41 100644
--- a/lib/bind/cua.bind
+++ b/lib/bind/cua.bind
@@ -34,41 +34,48 @@
 
 ###
 
+Format 5
+
 \bind "C-n"			"buffer-new"
-\bind "C-S-N"			"buffer-new-template"
+\bind "C-S-N"			"dialog-show lyxfiles templates"
 \bind "C-o"			"file-open"
-\bind "C-w"			"buffer-close"
+\bind "C-w"			"view-close"
 \bind "C-s"			"buffer-write"
 \bind "C-S-S"			"buffer-write-as"
-\bind "C-p"			"dialog-show print"
+\bind "C-r"			"buffer-view"
 \bind "C-d"			"buffer-view dvi"	# 'd' for dvi
 \bind "C-t"			"buffer-view ps"
-\bind "C-M-t"			"master-buffer-view ps"
-\bind "C-M-d"			"master-buffer-view dvi"
+\bind "C-M-r"			"command-alternatives master-buffer-view; buffer-view"
+\bind "C-M-t"			"command-alternatives master-buffer-view ps; buffer-view ps"
+\bind "C-M-d"			"command-alternatives master-buffer-view dvi; buffer-view dvi"
+\bind "C-S-R"			"buffer-update"
 \bind "C-S-D"			"buffer-update dvi"	# 'd' for dvi
 \bind "C-S-T"			"buffer-update ps"
-\bind "C-M-S-t"			"master-buffer-update ps"
-\bind "C-M-S-d"			"master-buffer-update dvi"
+\bind "C-M-S-t"			"command-alternatives master-buffer-update ps; buffer-update ps"
+\bind "C-M-S-d"			"command-alternatives master-buffer-update dvi; buffer-update dvi"
 \bind "C-q"			"lyx-quit"
 \bind "C-Next"			"buffer-next"
 \bind "C-Tab"			"buffer-next"
 \bind "C-Prior"			"buffer-previous"
-\bind "C-S-Tab"			"buffer-previous"
+\bind "C-S-BackTab"		"buffer-previous"
 
-\bind "C-M-b"			"math-insert \mathbf"
-\bind "C-b"			"font-bold"
+\bind "C-M-b"			"font-bold"
+\bind "C-b"			"font-boldsymbol"
 \bind "C-e"			"font-emph"
 # used below for line-delete-forward
 #\bind "C-k"			"font-noun"		# 'k' for capitals
 \bind "C-u"			"font-underline"
 \bind "C-S-P"			"font-typewriter" # 'P' for Program
+\bind "C-S-O"			"font-strikeout"
 
 \bind "C-m"			"math-mode"
 \bind "C-S-M"			"math-display"
 \bind "C-M-n"			"command-sequence math-display; math-number-toggle;"
 
 \bind "C-f"			"dialog-show findreplace"
-\bind "C-i"			"next-inset-toggle"		# 'i' for Inset
+\bind "C-S-f"			"dialog-show findreplaceadv"
+\bind "C-i"			"inset-toggle"		# 'i' for Inset
+\bind "C-M-i"			"inset-settings"
 
 \bind "C-c"			"copy"
 \bind "C-x"			"cut"
@@ -80,24 +87,28 @@
 \bind "C-y"			"redo"
 \bind "C-S-Z"			"redo"
 
-\bind "C-a"			"command-sequence buffer-begin ; buffer-end-select"   # select all
+\bind "C-M-a"			"command-sequence buffer-begin ; buffer-end-select"   # select all
+\bind "C-a"			"inset-select-all"
 
 \bind "C-S-E"			"changes-track"  # it's what MS Word uses
-\bind "~S-M-quotedbl"		"quote-insert single"
-\bind "~S-C-quotedbl"		"self-insert \""
-\bind "C-minus"			"specialchar-insert hyphenation"
+\bind "~S-M-quotedbl"		"quote-insert inner"
+\bind "~S-C-quotedbl"		"quote-insert outer auto plain"
+\bind "M-minus"			"specialchar-insert hyphenation"
+\bind "C-S-underscore"		"math-macro-fold"
 \bind "C-M-minus"		"specialchar-insert nobreakdash"
 \bind "M-S-Right"		"depth-increment"
 \bind "M-S-Left"		"depth-decrement"
 \bind "C-S-L"			"specialchar-insert ligature-break"
-\bind "C-S-slash"		"specialchar-insert slash"
+\bind "C-~S-slash"		"specialchar-insert slash"
 \bind "C-l"			"ert-insert"		# 'l' for LaTeX
 \bind "C-S-I"			"info-insert"
 
 #bind "F1"			"help"			# Not yet implemented!
 #bind "C-F1"			"help-context"		# Not yet implemented!
-\bind "F2"			"buffer-write"
+\bind "F2"			"buffer-write force"
 \bind "F3"			"word-find"
+\bind "S-F3"			"word-find-backward"
+\bind "C-F3"			"search-string-set"
 \bind "C-F4"			"buffer-close"
 \bind "M-F4"			"lyx-quit"
 \bind "F5"			"screen-recenter"
@@ -111,26 +122,35 @@
 \bind "S-F7"			"thesaurus-entry"
 
 \bind "M-x"			"command-execute"
+\bind "C-M-o"			"dialog-show toc"
 
 \bind "F11"			"ui-toggle fullscreen"
 
+\bind "C-0"			"buffer-zoom"
+\bind "C-equal"			"buffer-zoom-in"
+\bind "C-plus"			"buffer-zoom-in"
+\bind "C-minus"			"buffer-zoom-out"
+
 #
 # Motion group
 #
 
-\bind "M-Up"			"paragraph-move-up"
-\bind "M-Down"			"paragraph-move-down"
+\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 "C-Right"			"word-right"
 \bind "C-Left"			"word-left"
 \bind "C-Up"			"paragraph-up"
 \bind "C-Down"			"paragraph-down"
 \bind "C-Home"			"buffer-begin"
 \bind "C-End"			"buffer-end"
+\bind "M-C-Home"		"inset-begin"
+\bind "M-C-End"			"inset-end"
 
 \bind "C-~S-greater"		"label-goto"
 \bind "C-~S-less" 		"bookmark-goto 0"
 
-
 #
 # Motion + select group
 #
@@ -149,53 +169,55 @@
 \bind "S-Next"			"screen-down-select"
 \bind "S-C-Home"		"buffer-begin-select"
 \bind "S-C-End"			"buffer-end-select"
+\bind "S-M-C-Home"		"inset-begin-select"
+\bind "S-M-C-End"		"inset-end-select"
 \bind "C-Insert"		"copy"
 \bind "S-Insert"		"paste"
 \bind "S-Delete"		"cut"
 
 # Numeric keypad (if Shift+KP_XXX does not switch the NumLock state)
-\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-right-select"
-\bind "S-C-KP_Left"             "word-left-select"
-\bind "S-C-KP_Up"               "paragraph-up-select"
-\bind "S-C-KP_Down"             "paragraph-down-select"
-\bind "S-KP_Home"               "line-begin-select"
-\bind "S-KP_End"                "line-end-select"
-\bind "S-KP_Prior"              "screen-up-select"
-\bind "S-KP_Next"               "screen-down-select"
-\bind "S-C-KP_Home"             "buffer-begin-select"
-\bind "S-C-KP_End"              "buffer-end-select"
-\bind "S-C-KP_Prior"            "buffer-begin-select"
-\bind "S-C-KP_Next"             "buffer-end-select"
-\bind "C-KP_Insert"             "copy"
-\bind "S-KP_Insert"             "paste"
-\bind "S-KP_Delete"             "cut"
+\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-right-select"
+\bind "S-C-KP_Left"		"word-left-select"
+\bind "S-C-KP_Up"		"paragraph-up-select"
+\bind "S-C-KP_Down"		"paragraph-down-select"
+\bind "S-KP_Home"		"line-begin-select"
+\bind "S-KP_End"		"line-end-select"
+\bind "S-KP_Prior"		"screen-up-select"
+\bind "S-KP_Next"		"screen-down-select"
+\bind "S-C-KP_Home"		"buffer-begin-select"
+\bind "S-C-KP_End"		"buffer-end-select"
+\bind "S-C-KP_Prior"		"buffer-move-previous"
+\bind "S-C-KP_Next"		"buffer-move-next"
+\bind "C-KP_Insert"		"copy"
+\bind "S-KP_Insert"		"paste"
+\bind "S-KP_Delete"		"cut"
 
 #
 # bookmarks
 #
 
-\bind "C-~S-1"			"bookmark-goto 1"
-\bind "C-~S-2"			"bookmark-goto 2"
-\bind "C-~S-3"			"bookmark-goto 3"
-\bind "C-~S-4"			"bookmark-goto 4"
-\bind "C-~S-5"			"bookmark-goto 5"
-\bind "C-~S-6"			"bookmark-goto 6"
-\bind "C-~S-7"			"bookmark-goto 7"
-\bind "C-~S-8"			"bookmark-goto 8"
-\bind "C-~S-9"			"bookmark-goto 9"
-\bind "C-M-~S-1"		"bookmark-save 1"
-\bind "C-M-~S-2"		"bookmark-save 2"
-\bind "C-M-~S-3"		"bookmark-save 3"
-\bind "C-M-~S-4"		"bookmark-save 4"
-\bind "C-M-~S-5"		"bookmark-save 5"
-\bind "C-M-~S-6"		"bookmark-save 6"
-\bind "C-M-~S-7"		"bookmark-save 7"
-\bind "C-M-~S-8"		"bookmark-save 8"
-\bind "C-M-~S-9"		"bookmark-save 9"
+\bind "C-~S-1"		"bookmark-goto 1"
+\bind "C-~S-2"		"bookmark-goto 2"
+\bind "C-~S-3"		"bookmark-goto 3"
+\bind "C-~S-4"		"bookmark-goto 4"
+\bind "C-~S-5"		"bookmark-goto 5"
+\bind "C-~S-6"		"bookmark-goto 6"
+\bind "C-~S-7"		"bookmark-goto 7"
+\bind "C-~S-8"		"bookmark-goto 8"
+\bind "C-~S-9"		"bookmark-goto 9"
+\bind "M-~S-1"		"bookmark-save 1"
+\bind "M-~S-2"		"bookmark-save 2"
+\bind "M-~S-3"		"bookmark-save 3"
+\bind "M-~S-4"		"bookmark-save 4"
+\bind "M-~S-5"		"bookmark-save 5"
+\bind "M-~S-6"		"bookmark-save 6"
+\bind "M-~S-7"		"bookmark-save 7"
+\bind "M-~S-8"		"bookmark-save 8"
+\bind "M-~S-9"		"bookmark-save 9"
 
 
 #
@@ -204,11 +226,12 @@
 
 \bind "C-Delete"		"word-delete-forward"
 \bind "C-BackSpace"		"word-delete-backward"
-\bind "M-Return"		"break-paragraph inverse"
+\bind "M-Return"		"paragraph-break inverse"
 \bind "C-Return"		"newline-insert newline"
 \bind "C-S-Return"		"newline-insert linebreak"
 \bind "C-k"			"line-delete-forward"
-\bind "C-space"			"space-insert protected"
+\bind "C-space"			"command-alternatives math-space ; space-insert protected"
+\bind "nobreakspace"		"space-insert protected"
 \bind "C-M-space"		"space-insert normal"
 \bind "S-C-space"		"space-insert thin"
 \bind "C-period"		"specialchar-insert end-of-sentence"