X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fbind%2Faqua.bind;h=bea8b4763695a790d592a63c5ac74004911a7f7b;hb=9f0dd70ed377bb98d5ce8d0aa4755dc7e04bd55f;hp=609609fc00dc574c54f00cd33f8e48700016a446;hpb=6fc7d47a5f88276f0aff75e90cd5230613b872e9;p=lyx.git

diff --git a/lib/bind/aqua.bind b/lib/bind/aqua.bind
index 609609fc00..bea8b47636 100644
--- a/lib/bind/aqua.bind
+++ b/lib/bind/aqua.bind
@@ -4,12 +4,17 @@
 # are grabbed by the Qt/MacOSX library.
 # NB.  These bindings use Option-Shift
 #
+# An attempt to imitate Linux's ability to access the menus from
+# the keyboard (albeit without the menus dropping down).
+#
 # DO NOT CHANGE THIS DEFAULT BINDING FILE! It will be replaced
 # with every new install of LyX and your changes will be lost.
 # Instead, customize a copy of this file placed in
 # ~/.lyx/bind/aqua.bind
 #
 
+Format 4
+
 \bind "M-~S-i c"		"citation-insert"
 \bind "M-~S-i f"		"footnote-insert"
 \bind "M-~S-i u"		"url-insert"
@@ -22,17 +27,21 @@
 
 \bind "M-~S-i s s"		"command-sequence math-mode ; math-superscript ; font-free; "
 \bind "M-~S-i s u"		"command-sequence math-mode ; math-subscript ; font-free; "
-\bind "M-~S-i s h"		"hfill-insert"
-\bind "M-~S-i s p"		"hyphenation-point-insert"
-\bind "M-~S-i s k"		"ligature-break-insert"
-\bind "M-~S-i s b"		"protected-space-insert"
-\bind "M-~S-i s l"		"break-line"
-\bind "M-~S-i s i"		"dots-insert"
-\bind "M-~S-i s e"		"end-of-sentence-period-insert"
+\bind "M-~S-i s h"		"space-insert hfill"
+\bind "M-~S-i s p"		"specialchar-insert hyphenation"
+\bind "C-M-minus"		"specialchar-insert nobreakdash"
+\bind "M-~S-i s k"		"specialchar-insert ligature-break"
+\bind "M-~S-i s b"		"space-insert protected"
+\bind "nobreakspace"		"space-insert protected"
+\bind "C-~S-slash"		"specialchar-insert slash"
+\bind "M-~S-i s l"		"newline-insert newline"
+\bind "M-~S-i s r"		"newline-insert linebreak"
+\bind "M-~S-i s i"		"specialchar-insert dots"
+\bind "M-~S-i s e"		"specialchar-insert end-of-sentence"
 \bind "M-~S-i s q"		"self-insert \""
 # FIXME: find a binding for single quotes
-# \bind "M-~S-i s q"		"quote-insert single"
-\bind "M-~S-i s m"		"menu-separator-insert"
+# \bind "M-~S-i s q"		"quote-insert inner"
+\bind "M-~S-i s m"		"specialchar-insert menu-separator"
 
 \bind "M-~S-i h i"		"math-mode"
 \bind "M-~S-i h d"		"math-display"
@@ -42,9 +51,8 @@
 \bind "M-~S-i h f"		"command-sequence math-mode; math-mutate flalign;"
 \bind "M-~S-i h y"		"math-matrix 2 2"
 \bind "M-~S-i h c"		"math-insert \cases"
-\bind "M-~S-i h l"		"math-panel"
 
-\bind "M-~S-i o c"		"toc-insert"
+\bind "M-~S-i o c"		"inset-insert toc"
 \bind "M-~S-i o i"		"index-print"
 \bind "M-~S-i o b"		"bibtex-insert"
 
@@ -52,7 +60,6 @@
 \bind "M-~S-i e l" 		"file-insert-plaintext"
 \bind "M-~S-i e p" 		"file-insert-plaintext-para"
 
-\bind "M-~S-f p"		"buffer-print"
 \bind "M-~S-f n"		"buffer-new"
 \bind "M-~S-f t"		"buffer-new-template"
 \bind "M-~S-f o"		"file-open"
@@ -77,7 +84,7 @@
 \bind "M-~S-e s"		"spellchecker"
 \bind "M-~S-e h"		"buffer-chktex"
 \bind "M-~S-e e"		"error-remove-all"
-\bind "M-~S-e l"		"next-inset-toggle"
+\bind "M-~S-e l"		"inset-toggle"
 \bind "M-~S-e p"		"dialog-preferences"
 \bind "M-~S-e r"		"reconfigure"
 
@@ -100,8 +107,8 @@
 \bind "M-~S-e t u"		"tabular-feature append-column"
 \bind "M-~S-e t d"		"tabular-feature delete-column"
 
-\bind "M-~S-e m n"		"math-number"
-\bind "M-~S-e m u"		"math-nonumber"
+\bind "M-~S-e m n"		"math-number-toggle"
+\bind "M-~S-e m u"		"math-number-line-toggle"
 \bind "M-~S-e m r"		"tabular-feature append-row"
 \bind "M-~S-e m d"		"tabular-feature delete-row"
 \bind "M-~S-e m c"		"tabular-feature append-column"
@@ -126,21 +133,19 @@
 
 \bind "M-~S-v l"		"latex-view-log"
 \bind "M-~S-v t"		"toc-view"
-\bind "M-~S-v c"		"show-forks"
 \bind "M-~S-v x"		"help-Texinfo"
 
-\bind "M-~S-n e"		"error-next"
 \bind "M-~S-n n"		"note-next"
 \bind "M-~S-n r"		"label-goto"
-\bind "M-~S-n S-B 1"	"bookmark-save 1"
-\bind "M-~S-n S-B 2"	"bookmark-save 2"
-\bind "M-~S-n S-B 3"	"bookmark-save 3"
-\bind "M-~S-n S-B 4"	"bookmark-save 4"
-\bind "M-~S-n S-B 5"	"bookmark-save 5"
-\bind "M-~S-n S-B 6"	"bookmark-save 6"
-\bind "M-~S-n S-B 7"	"bookmark-save 7"
-\bind "M-~S-n S-B 8"	"bookmark-save 8"
-\bind "M-~S-n S-B 9"	"bookmark-save 9"
+\bind "M-~S-n S-B 1"		"bookmark-save 1"
+\bind "M-~S-n S-B 2"		"bookmark-save 2"
+\bind "M-~S-n S-B 3"		"bookmark-save 3"
+\bind "M-~S-n S-B 4"		"bookmark-save 4"
+\bind "M-~S-n S-B 5"		"bookmark-save 5"
+\bind "M-~S-n S-B 6"		"bookmark-save 6"
+\bind "M-~S-n S-B 7"		"bookmark-save 7"
+\bind "M-~S-n S-B 8"		"bookmark-save 8"
+\bind "M-~S-n S-B 9"		"bookmark-save 9"
 \bind "M-~S-n b 1"		"bookmark-goto 1"
 \bind "M-~S-n b 2"		"bookmark-goto 2"
 \bind "M-~S-n b 3"		"bookmark-goto 3"
@@ -154,7 +159,7 @@
 \bind "M-~S-h i"		"help-open Intro"
 \bind "M-~S-h t"		"help-open Tutorial"
 \bind "M-~S-h u"		"help-open UserGuide"
-\bind "M-~S-h e"		"help-open Extended"
+\bind "M-~S-h e"		"help-open Additional"
 \bind "M-~S-h c"		"help-open Customization"
 \bind "M-~S-h f"		"help-open FAQ"
 \bind "M-~S-h a"		"help-open TOC"