]> git.lyx.org Git - lyx.git/blobdiff - lib/bind/mac.bind
Use << for raising 2 to power instead of ^
[lyx.git] / lib / bind / mac.bind
index 620811d8cee811073edb30ca4dab759a45492ba9..bceea69026d73c0bc4e60b60db89a41ee172946c 100644 (file)
@@ -1,7 +1,7 @@
 # This file is part of
 # ==================================================================
 #
-#                    LyX, the High Level Word Processor
+#                    LyX, the High Level Word Processor
 #
 #         Copyright (C) 1995-1997 Asger Alstrup & The LyX Team
 #
@@ -26,7 +26,7 @@
 
 ###
 
-Format 1
+Format 4
 
 # based on the table at http://support.apple.com/kb/HT1343
 # Note: these bindings assume the swapped Meta and Control modifiers standard of Qt
@@ -34,6 +34,9 @@ Format 1
 # Option  - A
 # Control - M
 
+# Status indicates if it is matching the mac standard
+#  +: correct binding
+#  -: missing or wrong binding
 # Status: "Key combination"           What it does
 #  +: "Command-Space"                # Show or hide the Spotlight search field (if multiple languages are installed, may rotate through enabled script systems)
 #  +: "Option-Command-Space"         # Show the Spotlight search results window (if multiple languages are installed, may rotate through keyboard layouts and input methods within a script)
@@ -65,17 +68,20 @@ Format 1
 #  +: "Control-N"                    # Move down one line
 \bind "M-n"                          "down"
 #  +: "Control-O"                    # Insert a new line after the cursor
-\bind "M-o"                          "break-paragraph"
+\bind "M-o"                          "paragraph-break"
 #  -: "Control-P"                    # Move up one line
 # used by menu.bind - layouts
-#  -: "Control-T"                    # Transpose the character behind the cursor and the character in front of the cursor
+#  +: "Control-T"                    # Transpose the character behind the cursor and the character in front of the cursor
+\bind "M-t"                          "chars-transpose"
 #  +: "Control-V"                    # Move down one page
 \bind "M-v"                          "scroll page up"
 #  -: "Shift-Tab"                    # Navigate through controls in a reverse direction
 #  +: "Control-Tab"                  # Move focus to the next grouping of controls in a dialog or the next table (when Tab moves to the next cell)
 \bind "M-Tab"                        "buffer-next"
+\bind "A-Tab"                        "buffer-next"
 #  +: "Shift-Control-Tab"            # Move focus to the previous grouping of controls
 \bind "M-S-BackTab"                  "buffer-previous"
+\bind "A-S-BackTab"                  "buffer-previous"
 #  +: "fn-Delete"                    # Forward Delete (on portable Macs' built-in keyboard)
 \bind "Delete"                       "char-delete-forward"
 #  ?: "Control-F1"                   # Toggle full keyboard access on or off
@@ -95,9 +101,12 @@ Format 1
 #  -: "Shift-Command-`"              # Activate the previous open window in the frontmost application
 #  -: "Option-Command-`"             # Move focus to the window drawer
 #  +: "Command- - (minus)"           # Decrease the size of the selected item
+\bind "C-0"                          "buffer-zoom"
 \bind "C-minus"                      "buffer-zoom-out"
-#  ?: "Shift-Command-="              # Increase the size of the selected item
+#  +: "Shift-Command-="              # Increase the size of the selected item
 \bind "C-plus"                       "buffer-zoom-in"
+\bind "C-S-equal"                    "buffer-zoom-in"
+\bind "C-equal"                      "buffer-zoom-in"
 #  -: "Command-{"                    # Left-align a selection
 #  -: "Command-}"                    # Right-align a selection
 #  -: "Command-|"                    # Center-align a selection
@@ -115,8 +124,8 @@ Format 1
 #  +: "Shift-Command-4"              # Capture a selection to a file
 #  +: "Shift-Control-Command-4"      # Capture a selection to the Clipboard
 #  +: "Command-A"                    # Highlight every item in a document or window, or all characters in a text field
-\bind "C-a"                          "command-sequence buffer-begin ; buffer-end-select"
-\bind "C-M-a"                        "inset-select-all"
+\bind "C-M-a"                        "command-sequence buffer-begin ; buffer-end-select"
+\bind "C-a"                          "inset-select-all"
 #  +: "Command-B"                    # Boldface the selected text or toggle boldfaced text on and off
 \bind "C-M-b"                        "font-boldsymbol"
 \bind "C-b"                          "font-bold"
@@ -128,7 +137,7 @@ Format 1
 #  +: "Option-Command-D"             # Show or hide the Dock
 #  -: "Command-Control D"            # Display the definition of the selected word in the Dictionary application
 \bind "C-d"                          "buffer-view dvi" # 'd' for dvi
-\bind "C-M-d"                        "master-buffer-view dvi"
+\bind "C-M-d"                        "command-alternatives master-buffer-view dvi; buffer.view dvi"
 \bind "C-S-D"                        "buffer-update dvi"       # 'd' for dvi
 #  -: "Command-E"                    # Use the selection for a find
 \bind "C-e"                          "font-emph"
@@ -144,6 +153,7 @@ Format 1
 #  +: "Option-Command-H"             # Hide the windows of all other running applications
 #  -: "Command-I"                    # Italicize the selected text or toggle italic text on or off
 \bind "C-i"                          "inset-toggle" # 'i' for Inset
+\bind "C-M-i"                        "inset-settings"
 #  -: "Option-Command-I"             # Display an inspector window
 #  -: "Command-J"                    # Scroll to a selection
 \bind "C-k"                          "line-delete-forward"
@@ -157,8 +167,6 @@ Format 1
 \bind "C-S-N"                        "buffer-new-template"
 #  +: "Command-O"                    # Display a dialog for choosing a document to open in the frontmost application
 \bind "C-o"                          "file-open"
-#  +: "Command-P"                    # Display the Print dialog
-\bind "C-p"                          "dialog-show print"
 #  -: "Shift-Command-P"              # Display a dialog for specifying printing parameters (Page Setup)
 \bind "C-S-P"                        "font-typewriter" # 'P' for Program
 #  +: "Command-Q"                    # Quit the frontmost application
@@ -170,7 +178,7 @@ Format 1
 \bind "C-S-S"                        "buffer-write-as"
 #  -: "Command-T"                    # Display the Fonts window
 \bind "C-t"                          "buffer-view pdf"
-\bind "C-M-t"                        "master-buffer-view pdf"
+\bind "C-M-t"                        "command-alternatives master-buffer-view pdf; buffer-view pdf"
 #  -: "Option-Command-T"             # Show or hide a toolbar
 #  -: "Command-U"                    # Underline the selected text or turn underlining on or off
 \bind "C-u"                          "font-underline"
@@ -181,10 +189,10 @@ Format 1
 #  -: "Option-Shift-Command-V"       # Apply the style of the surrounding text to the inserted object (Paste and Match Style)
 #  -: "Control-Command-V"            # Apply formatting settings to the selected object (Paste Ruler Command)
 \bind "C-M-v"                        "primary-selection-paste"
-#  ?: "Command-W"                    # Close the frontmost window
-\bind "C-w"                          "buffer-close" # should be "window-close"
-#  +: "Shift-Command-W"              # Close a file and its associated windows
-\bind "C-S-w"                        "buffer-close"
+#  +: "Command-W"                    # Close the frontmost window - modern applications map this to close tab or window if it's the last one
+\bind "C-w"                          "buffer-close"
+#  +: "Shift-Command-W"              # Close a file and its associated windows - modern applications map this close window
+\bind "C-S-w"                        "window-close"
 #  +: "Option-Command-W"             # Close all windows in the application without quitting it
 \bind "C-A-w"                        "buffer-close-all"
 #  +: "Command-X"                    # Remove the selection and store in the Clipboard
@@ -247,12 +255,12 @@ Format 1
 \bind "C-S-O"                        "font-strikeout"
 \bind "C-S-T"                        "buffer-update pdf" # (pdflatex; was "ps")
 \bind "C-S-R"                        "buffer-update"
-\bind "C-M-S-T"                      "master-buffer-update pdf"
-\bind "C-M-S-D"                      "master-buffer-update dvi"
+\bind "C-M-S-T"                      "command-alternatives master-buffer-update pdf; buffer-update pdf"
+\bind "C-M-S-D"                      "command-alternatives master-buffer-update dvi; buffer-update dvi"
 
 \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-S-underscore"               "command-alternatives math-macro-fold;specialchar-insert hyphenation"
 \bind "C-M-minus"                    "specialchar-insert nobreakdash"
 \bind "M-C-Right"                    "depth-increment"
@@ -279,7 +287,7 @@ Format 1
 #
 
 \bind "C-~S-greater"                 "label-goto"
-\bind "C-~S-less"                           "bookmark-goto 0"
+\bind "C-~S-less"                    "bookmark-goto 0"
 
 #
 # Additional Motion + select group
@@ -306,8 +314,8 @@ Format 1
 \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"
@@ -341,10 +349,10 @@ Format 1
 
 \bind "A-Delete"                     "word-delete-forward"
 \bind "A-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 "A-space"                      "space-insert protected"
+\bind "A-space"                      "command-alternatives math-space ; space-insert protected"
 \bind "nobreakspace"                 "space-insert protected"
 \bind "C-A-space"                    "space-insert normal"
 \bind "S-A-space"                    "space-insert thin"
@@ -352,10 +360,15 @@ Format 1
 \bind "C-period"                     "specialchar-insert end-of-sentence"
 \bind "M-period"                     "specialchar-insert dots"
 \bind "Escape"                       "cancel"
-\bind "C-M-Up"                       "paragraph-move-up"
-\bind "C-M-Down"                     "paragraph-move-down"
+\bind "C-M-Up"                       "command-alternatives outline-up; paragraph-move-up; tabular-feature move-row-up"
+\bind "C-M-Down"                     "command-alternatives outline-down; paragraph-move-down; tabular-feature move-row-down"
+\bind "C-M-Right"                    "tabular-feature move-column-right"
+\bind "C-M-Left"                     "tabular-feature move-column-left"
 #\bind "F9"                          "meta-prefix"
 
+\bind "C-M-F"                        "ui-toggle fullscreen"
+\bind "C-A-F"                        "forward-search"
+
 # Include menu and math bindings
 
 \bind_file menus.bind