From 4f4d32da4b164a10a217fc55324d67822dd2c1f0 Mon Sep 17 00:00:00 2001
From: Stephan Witt <switt@lyx.org>
Date: Thu, 22 Jul 2010 16:38:26 +0000
Subject: [PATCH] change key-bindings to support cmd-plus/minus text size
 adjust on mac

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35006 a592a061-630c-0410-9148-cb99ea01b6c8
---
 development/MacOSX/lyxrc.dist.in | 4 +++-
 lib/bind/cua.bind                | 9 +++++----
 lib/bind/mac.bind                | 7 +++----
 lib/bind/math.bind               | 2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/development/MacOSX/lyxrc.dist.in b/development/MacOSX/lyxrc.dist.in
index 0ee4aac593..d8b1aa590e 100644
--- a/development/MacOSX/lyxrc.dist.in
+++ b/development/MacOSX/lyxrc.dist.in
@@ -30,6 +30,8 @@
 \open_buffers_in_tabs false
 \mac_like_word_movement true
 
+\scroll_wheel_zoom "off"
+
 #
 # COLOR SECTION ###################################
 #
@@ -65,7 +67,7 @@
 # SPELLCHECKER SECTION ##############################
 #
 
-\spell_command "aspell"
+\spell_command "native"
 
 #
 # LANGUAGE SUPPORT SECTION ##########################
diff --git a/lib/bind/cua.bind b/lib/bind/cua.bind
index e202157448..dbf68eaec4 100644
--- a/lib/bind/cua.bind
+++ b/lib/bind/cua.bind
@@ -89,7 +89,8 @@
 \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"			"command-alternatives math-macro-fold;specialchar-insert hyphenation"
+\bind "C-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"
@@ -119,9 +120,9 @@
 
 \bind "F11"			"ui-toggle fullscreen"
 
-\bind "M-equal"			"buffer-zoom-in"
-\bind "M-plus"			"buffer-zoom-in"
-\bind "M-minus"			"buffer-zoom-out"
+\bind "M-equal"	"buffer-zoom-in"
+\bind "M-plus"		"buffer-zoom-in"
+\bind "M-minus"	"buffer-zoom-out"
 
 #
 # Motion group
diff --git a/lib/bind/mac.bind b/lib/bind/mac.bind
index 6a9be64f59..13d81f8ccc 100644
--- a/lib/bind/mac.bind
+++ b/lib/bind/mac.bind
@@ -79,7 +79,7 @@
 \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"			"command-alternatives math-macro-fold;specialchar-insert hyphenation"
+\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"
 \bind "M-C-Left"		"depth-decrement"
@@ -103,9 +103,8 @@
 \bind "M-x"				"command-execute"
 \bind "M-o"				"dialog-show toc"
 
-\bind "M-equal"			"buffer-zoom-in"
-\bind "M-plus"			"buffer-zoom-in"
-\bind "M-minus"			"buffer-zoom-out"
+\bind "C-plus"			"buffer-zoom-in"
+\bind "C-minus"		"buffer-zoom-out"
 
 #
 # Motion group
diff --git a/lib/bind/math.bind b/lib/bind/math.bind
index e5b21b4d14..0630f36748 100644
--- a/lib/bind/math.bind
+++ b/lib/bind/math.bind
@@ -141,7 +141,7 @@
 #\bind "C-Tab"          "cell-split"
 
 # math-macros
-\bind "C-plus"         "math-macro-unfold"
+\bind "C-S-asterisk"         "math-macro-unfold"
 # Defined in cua.bind as command-alternative to specialchar-insert hyphenation
 #\bind "C-minus"        "math-macro-fold"