Extend fix for #7404 to allow any inset collapsible to be edited

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

diff --git a/lib/bind/mac.bind b/lib/bind/mac.bind
index 6fcd406ec3d99cb709d62d2101ea8067121e2fd3..af358d6e36839e441936c50d3c26aa2dfae5dfe1 100644 (file)
--- a/lib/bind/mac.bind
+++ b/lib/bind/mac.bind
@@ -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 2
+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
@@ -136,7 +136,7 @@ Format 2
 #  +: "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"
@@ -152,6 +152,7 @@ Format 2
 #  +: "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"
@@ -165,8 +166,6 @@ Format 2
 \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
@@ -178,7 +177,7 @@ Format 2
 \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"
@@ -255,12 +254,12 @@ Format 2
 \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"
@@ -287,7 +286,7 @@ Format 2
 #
 
 \bind "C-~S-greater"                 "label-goto"
-\bind "C-~S-less"                           "bookmark-goto 0"
+\bind "C-~S-less"                    "bookmark-goto 0"
 
 #
 # Additional Motion + select group
@@ -360,12 +359,14 @@ Format 2
 \bind "C-period"                     "specialchar-insert end-of-sentence"
 \bind "M-period"                     "specialchar-insert dots"
 \bind "Escape"                       "cancel"
-\bind "C-M-Up"                       "command-alternatives outline-up; paragraph-move-up; inset-modify tabular move-row-up"
-\bind "C-M-Down"                     "command-alternatives outline-down; paragraph-move-down; inset-modify tabular move-row-down"
-\bind "C-M-Right"                    "inset-modify tabular move-column-right"
-\bind "C-M-Left"                     "inset-modify tabular move-column-left"
+\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"
+
 # Include menu and math bindings
 
 \bind_file menus.bind