doc files: port recent changes from branch

[lyx.git] / lib / bind / cua.bind

diff --git a/lib/bind/cua.bind b/lib/bind/cua.bind
index 359e1d486d4436d92cc27706aa333ab3171acefc..9c5652a76147dbca52ef24733d6b1d5bbfdf26b5 100644 (file)
--- a/lib/bind/cua.bind
+++ b/lib/bind/cua.bind
@@ -34,7 +34,7 @@
 
 ###
 
-Format 2
+Format 4
 
 \bind "C-n"                    "buffer-new"
 \bind "C-S-N"                  "buffer-new-template"
@@ -42,26 +42,25 @@ Format 2
 \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-r"                  "master-buffer-view"
-\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-BackTab"            "buffer-previous"
 
-\bind "C-M-b"                  "font-boldsymbol"
-\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
@@ -91,8 +90,8 @@ Format 2
 \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 "~S-M-quotedbl"          "quote-insert inner"
+\bind "~S-C-quotedbl"          "quote-insert outer auto plain"
 \bind "C-minus"                        "specialchar-insert hyphenation"
 \bind "C-S-underscore"         "math-macro-fold"
 \bind "C-M-minus"              "specialchar-insert nobreakdash"
@@ -132,10 +131,10 @@ Format 2
 # Motion group
 #
 
-\bind "M-Up"                   "command-alternatives outline-up; paragraph-move-up; inset-modify tabular move-row-up"
-\bind "M-Down"                 "command-alternatives outline-down; paragraph-move-down; inset-modify tabular move-row-down"
-\bind "M-Right"                        "inset-modify tabular move-column-right"
-\bind "M-Left"                 "inset-modify tabular move-column-left"
+\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"
@@ -187,8 +186,8 @@ Format 2
 \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 "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"
@@ -206,15 +205,15 @@ Format 2
 \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 "S-F1"                   "bookmark-save 1"
+\bind "S-F2"                   "bookmark-save 2"
+\bind "S-F3"                   "bookmark-save 3"
+\bind "S-F4"                   "bookmark-save 4"
+\bind "S-F5"                   "bookmark-save 5"
+\bind "S-F6"                   "bookmark-save 6"
+\bind "S-F7"                   "bookmark-save 7"
+\bind "S-F8"                   "bookmark-save 8"
+\bind "S-F9"                   "bookmark-save 9"
 
 
 #