add new variant of ActionMap::find_action()
[ardour.git] / libs / gtkmm2ext / bindings.cc
index 802e32dd1affc0204b6763eedfbcf6a20ac7e449..b1abcb0507f0cafc55d1d8107bfb2a0c0938c4f5 100644 (file)
@@ -1,19 +1,19 @@
 /*
-    Copyright (C) 2012 Paul Davis
+  Copyright (C) 2012 Paul Davis
 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
 
@@ -26,6 +26,7 @@
 #include "pbd/convert.h"
 #include "pbd/debug.h"
 #include "pbd/error.h"
+#include "pbd/replace_all.h"
 #include "pbd/xml++.h"
 
 #include "gtkmm2ext/actions.h"
@@ -34,7 +35,7 @@
 #include "gtkmm2ext/keyboard.h"
 #include "gtkmm2ext/utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Glib;
@@ -46,13 +47,11 @@ list<Bindings*> Bindings::bindings; /* global. Gulp */
 list<ActionMap*> ActionMap::action_maps; /* global. Gulp */
 PBD::Signal1<void,Bindings*> Bindings::BindingsChanged;
 
-
-/*============================ ActionNameRegistered ===========================*/
 template <typename IteratorValueType>
 struct ActionNameRegistered
 {
        ActionNameRegistered(std::string const& name)
-       : action_name(name)
+               : action_name(name)
        {}
 
        bool operator()(IteratorValueType elem) const {
@@ -61,109 +60,108 @@ struct ActionNameRegistered
        std::string const& action_name;
 };
 
-/*================================ MouseButton ================================*/
 MouseButton::MouseButton (uint32_t state, uint32_t keycode)
 {
-        uint32_t ignore = ~Keyboard::RelevantModifierKeyMask;
-
-        /* this is a slightly wierd test that relies on
-         * gdk_keyval_is_{upper,lower}() returning true for keys that have no
-         * case-sensitivity. This covers mostly non-alphanumeric keys.
-         */
-
-        if (gdk_keyval_is_upper (keycode) && gdk_keyval_is_lower (keycode)) {
-                /* key is not subject to case, so ignore SHIFT
-                 */
-                ignore |= GDK_SHIFT_MASK;
-        }
-
-        _val = (state & ~ignore);
-        _val <<= 32;
-        _val |= keycode;
+       uint32_t ignore = ~Keyboard::RelevantModifierKeyMask;
+
+       /* this is a slightly wierd test that relies on
+        * gdk_keyval_is_{upper,lower}() returning true for keys that have no
+        * case-sensitivity. This covers mostly non-alphanumeric keys.
+        */
+
+       if (gdk_keyval_is_upper (keycode) && gdk_keyval_is_lower (keycode)) {
+               /* key is not subject to case, so ignore SHIFT
+                */
+               ignore |= GDK_SHIFT_MASK;
+       }
+
+       _val = (state & ~ignore);
+       _val <<= 32;
+       _val |= keycode;
 };
 
 bool
 MouseButton::make_button (const string& str, MouseButton& b)
 {
-        int s = 0;
+       int s = 0;
 
-        if (str.find ("Primary") != string::npos) {
-                s |= Keyboard::PrimaryModifier;
-        }
+       if (str.find ("Primary") != string::npos) {
+               s |= Keyboard::PrimaryModifier;
+       }
 
-        if (str.find ("Secondary") != string::npos) {
-                s |= Keyboard::SecondaryModifier;
-        }
+       if (str.find ("Secondary") != string::npos) {
+               s |= Keyboard::SecondaryModifier;
+       }
 
-        if (str.find ("Tertiary") != string::npos) {
-                s |= Keyboard::TertiaryModifier;
-        }
+       if (str.find ("Tertiary") != string::npos) {
+               s |= Keyboard::TertiaryModifier;
+       }
 
-        if (str.find ("Level4") != string::npos) {
-                s |= Keyboard::Level4Modifier;
-        }
+       if (str.find ("Level4") != string::npos) {
+               s |= Keyboard::Level4Modifier;
+       }
 
-        string::size_type lastmod = str.find_last_of ('-');
-        uint32_t button_number;
+       string::size_type lastmod = str.find_last_of ('-');
+       uint32_t button_number;
 
-        if (lastmod == string::npos) {
-                button_number = PBD::atoi (str);
-        } else {
-                button_number = PBD::atoi (str.substr (lastmod+1));
-        }
+       if (lastmod == string::npos) {
+               button_number = PBD::atoi (str);
+       } else {
+               button_number = PBD::atoi (str.substr (lastmod+1));
+       }
 
-        b = MouseButton (s, button_number);
-        return true;
+       b = MouseButton (s, button_number);
+       return true;
 }
 
 string
 MouseButton::name () const
 {
-        int s = state();
-
-        string str;
-
-        if (s & Keyboard::PrimaryModifier) {
-                str += "Primary";
-        }
-        if (s & Keyboard::SecondaryModifier) {
-                if (!str.empty()) {
-                        str += '-';
-                }
-                str += "Secondary";
-        }
-        if (s & Keyboard::TertiaryModifier) {
-                if (!str.empty()) {
-                        str += '-';
-                }
-                str += "Tertiary";
-        }
-        if (s & Keyboard::Level4Modifier) {
-                if (!str.empty()) {
-                        str += '-';
-                }
-                str += "Level4";
-        }
-
-        if (!str.empty()) {
-                str += '-';
-        }
-
-        char buf[16];
-        snprintf (buf, sizeof (buf), "%u", button());
-        str += buf;
-
-        return str;
+       int s = state();
+
+       string str;
+
+       if (s & Keyboard::PrimaryModifier) {
+               str += "Primary";
+       }
+       if (s & Keyboard::SecondaryModifier) {
+               if (!str.empty()) {
+                       str += '-';
+               }
+               str += "Secondary";
+       }
+       if (s & Keyboard::TertiaryModifier) {
+               if (!str.empty()) {
+                       str += '-';
+               }
+               str += "Tertiary";
+       }
+       if (s & Keyboard::Level4Modifier) {
+               if (!str.empty()) {
+                       str += '-';
+               }
+               str += "Level4";
+       }
+
+       if (!str.empty()) {
+               str += '-';
+       }
+
+       char buf[16];
+       snprintf (buf, sizeof (buf), "%u", button());
+       str += buf;
+
+       return str;
 }
 
 /*================================ KeyboardKey ================================*/
 KeyboardKey::KeyboardKey (uint32_t state, uint32_t keycode)
 {
-        uint32_t ignore = ~Keyboard::RelevantModifierKeyMask;
+       uint32_t ignore = ~Keyboard::RelevantModifierKeyMask;
 
-        _val = (state & ~ignore);
-        _val <<= 32;
-        _val |= keycode;
+       _val = (state & ~ignore);
+       _val <<= 32;
+       _val |= keycode;
 }
 
 string
@@ -177,17 +175,7 @@ KeyboardKey::display_label () const
         *  on all platforms, notably the command key on OS X.
         */
 
-        uint32_t mod = state();
-
-#ifdef __APPLE__
-                /* We use both bits (MOD2|META) for Primary on OS X,
-                 * but we don't want MOD2 showing up in listings.
-                 */
-
-                if (mod & GDK_MOD2_MASK) {
-                        mod &= ~GDK_MOD2_MASK;
-                }
-#endif
+       uint32_t mod = state();
 
        return gtk_accelerator_get_label (key(), (GdkModifierType) mod);
 }
@@ -195,96 +183,191 @@ KeyboardKey::display_label () const
 string
 KeyboardKey::name () const
 {
-        int s = state();
-
-        string str;
-
-        if (s & Keyboard::PrimaryModifier) {
-                str += "Primary";
-        }
-        if (s & Keyboard::SecondaryModifier) {
-                if (!str.empty()) {
-                        str += '-';
-                }
-                str += "Secondary";
-        }
-        if (s & Keyboard::TertiaryModifier) {
-                if (!str.empty()) {
-                        str += '-';
-                }
-                str += "Tertiary";
-        }
-        if (s & Keyboard::Level4Modifier) {
-                if (!str.empty()) {
-                        str += '-';
-                }
-                str += "Level4";
-        }
-
-        if (!str.empty()) {
-                str += '-';
-        }
-
-        char const *gdk_name = gdk_keyval_name (key());
-
-        if (gdk_name) {
-               str += gdk_name;
-        } else {
-               /* fail! */
-               return string();
-        }
-
-        return str;
+       int s = state();
+
+       string str;
+
+       if (s & Keyboard::PrimaryModifier) {
+               str += "Primary";
+       }
+       if (s & Keyboard::SecondaryModifier) {
+               if (!str.empty()) {
+                       str += '-';
+               }
+               str += "Secondary";
+       }
+       if (s & Keyboard::TertiaryModifier) {
+               if (!str.empty()) {
+                       str += '-';
+               }
+               str += "Tertiary";
+       }
+       if (s & Keyboard::Level4Modifier) {
+               if (!str.empty()) {
+                       str += '-';
+               }
+               str += "Level4";
+       }
+
+       if (!str.empty()) {
+               str += '-';
+       }
+
+       char const *gdk_name = gdk_keyval_name (key());
+
+       if (gdk_name) {
+               str += gdk_name;
+       } else {
+               /* fail! */
+               return string();
+       }
+
+       return str;
+}
+
+string
+KeyboardKey::native_name () const
+{
+       int s = state();
+
+       string str;
+
+       if (s & Keyboard::PrimaryModifier) {
+               str += Keyboard::primary_modifier_name ();
+       }
+       if (s & Keyboard::SecondaryModifier) {
+               if (!str.empty()) {
+                       str += '-';
+               }
+               str += Keyboard::secondary_modifier_name ();
+       }
+       if (s & Keyboard::TertiaryModifier) {
+               if (!str.empty()) {
+                       str += '-';
+               }
+               str += Keyboard::tertiary_modifier_name ();
+       }
+       if (s & Keyboard::Level4Modifier) {
+               if (!str.empty()) {
+                       str += '-';
+               }
+               str += Keyboard::level4_modifier_name ();
+       }
+
+       if (!str.empty()) {
+               str += '-';
+       }
+
+       char const *gdk_name = gdk_keyval_name (key());
+
+       if (gdk_name) {
+               str += gdk_name;
+       } else {
+               /* fail! */
+               return string();
+       }
+
+       return str;
+}
+
+string
+KeyboardKey::native_short_name () const
+{
+       int s = state();
+
+       string str;
+
+       if (s & Keyboard::PrimaryModifier) {
+               str += Keyboard::primary_modifier_short_name ();
+       }
+       if (s & Keyboard::SecondaryModifier) {
+               if (!str.empty()) {
+                       str += '-';
+               }
+               str += Keyboard::secondary_modifier_short_name ();
+       }
+       if (s & Keyboard::TertiaryModifier) {
+               if (!str.empty()) {
+                       str += '-';
+               }
+               str += Keyboard::tertiary_modifier_short_name ();
+       }
+       if (s & Keyboard::Level4Modifier) {
+               if (!str.empty()) {
+                       str += '-';
+               }
+               str += Keyboard::level4_modifier_short_name ();
+       }
+
+       if (!str.empty()) {
+               str += '-';
+       }
+
+       char const *gdk_name = gdk_keyval_name (key());
+
+       if (gdk_name) {
+               str += gdk_name;
+       } else {
+               /* fail! */
+               return string();
+       }
+
+       return str;
 }
 
 bool
 KeyboardKey::make_key (const string& str, KeyboardKey& k)
 {
-        int s = 0;
+       int s = 0;
+
+       if (str.find ("Primary") != string::npos) {
+               s |= Keyboard::PrimaryModifier;
+       }
 
-        if (str.find ("Primary") != string::npos) {
-                s |= Keyboard::PrimaryModifier;
-        }
+       if (str.find ("Secondary") != string::npos) {
+               s |= Keyboard::SecondaryModifier;
+       }
 
-        if (str.find ("Secondary") != string::npos) {
-                s |= Keyboard::SecondaryModifier;
-        }
+       if (str.find ("Tertiary") != string::npos) {
+               s |= Keyboard::TertiaryModifier;
+       }
 
-        if (str.find ("Tertiary") != string::npos) {
-                s |= Keyboard::TertiaryModifier;
-        }
+       if (str.find ("Level4") != string::npos) {
+               s |= Keyboard::Level4Modifier;
+       }
 
-        if (str.find ("Level4") != string::npos) {
-                s |= Keyboard::Level4Modifier;
-        }
+       /* since all SINGLE key events keycodes are changed to lower case
+        * before looking them up, make sure we only store lower case here. The
+        * Shift part will be stored in the modifier part of the KeyboardKey.
+        *
+        * And yes Mildred, this doesn't cover CapsLock cases. Oh well.
+        */
 
-        string::size_type lastmod = str.find_last_of ('-');
-        guint keyval;
+       string actual;
 
-        /* since all key events keycodes are changed to lower case before
-         * looking them up, make sure we only store lower case here. The Shift
-         * part will be stored in the modifier part of the KeyboardKey.
-         *
-         * And yes Mildred, this doesn't cover CapsLock cases. Oh well.
-         */
+       string::size_type lastmod = str.find_last_of ('-');
 
-        string lower;
+       if (lastmod != string::npos) {
+               actual = str.substr (lastmod+1);
+       }
+       else {
+               actual = str;
+       }
 
-        if (lastmod == string::npos) {
-               lower = PBD::downcase (str);
-        } else {
-               lower = PBD::downcase (str.substr (lastmod+1));
-        }
+       if (actual.size() == 1) {
+               actual = PBD::downcase (actual);
+       }
 
-        keyval = gdk_keyval_from_name (lower.c_str());
+       guint keyval;
+       keyval = gdk_keyval_from_name (actual.c_str());
 
-        if (keyval == GDK_VoidSymbol || keyval == 0) {
-               return false;
-        }
+       if (keyval == GDK_VoidSymbol || keyval == 0) {
+               return false;
+       }
 
-        k = KeyboardKey (s, keyval);
+       k = KeyboardKey (s, keyval);
 
-        return true;
+       return true;
 }
 
 /*================================= Bindings =================================*/
@@ -312,49 +395,49 @@ Bindings::get_binding_for_action (RefPtr<Action> action, Operation& op)
 {
        const string action_name = ardour_action_name (action);
 
-        for (KeybindingMap::iterator k = press_bindings.begin(); k != press_bindings.end(); ++k) {
+       for (KeybindingMap::iterator k = press_bindings.begin(); k != press_bindings.end(); ++k) {
 
-               /* option one: action has already been associated with the
-                * binding
-                */
+               /* option one: action has already been associated with the
+                * binding
+                */
 
-               if (k->second.action == action) {
-                       return k->first;
-               }
+               if (k->second.action == action) {
+                       return k->first;
+               }
 
-               /* option two: action name matches, so lookup the action,
-                * setup the association while we're here, and return the binding.
-                */
+               /* option two: action name matches, so lookup the action,
+                * setup the association while we're here, and return the binding.
+                */
 
-               if (_action_map && k->second.action_name == action_name) {
-                       k->second.action = _action_map->find_action (action_name);
-                       return k->first;
-               }
+               if (_action_map && k->second.action_name == action_name) {
+                       k->second.action = _action_map->find_action (action_name);
+                       return k->first;
+               }
 
-        }
+       }
 
-        for (KeybindingMap::iterator k = release_bindings.begin(); k != release_bindings.end(); ++k) {
+       for (KeybindingMap::iterator k = release_bindings.begin(); k != release_bindings.end(); ++k) {
 
-               /* option one: action has already been associated with the
-                * binding
-                */
+               /* option one: action has already been associated with the
+                * binding
+                */
 
-               if (k->second.action == action) {
-                       return k->first;
-               }
+               if (k->second.action == action) {
+                       return k->first;
+               }
 
-               /* option two: action name matches, so lookup the action,
-                * setup the association while we're here, and return the binding.
-                */
+               /* option two: action name matches, so lookup the action,
+                * setup the association while we're here, and return the binding.
+                */
 
-               if (_action_map && k->second.action_name == action_name) {
-                        k->second.action = _action_map->find_action (action_name);
-                        return k->first;
-                }
+               if (_action_map && k->second.action_name == action_name) {
+                       k->second.action = _action_map->find_action (action_name);
+                       return k->first;
+               }
 
-        }
+       }
 
-        return KeyboardKey::null_key();
+       return KeyboardKey::null_key();
 }
 
 void
@@ -394,41 +477,40 @@ Bindings::activate (KeyboardKey kb, Operation op)
 {
        KeybindingMap& kbm = get_keymap (op);
 
+       /* if shift was pressed, GDK will send us (e.g) 'E' rather than 'e'.
+          Our bindings all use the lower case character/keyname, so switch
+          to the lower case before doing the lookup.
+       */
 
-        /* if shift was pressed, GDK will send us (e.g) 'E' rather than 'e'.
-           Our bindings all use the lower case character/keyname, so switch
-           to the lower case before doing the lookup.
-        */
-
-        KeyboardKey unshifted (kb.state(), gdk_keyval_to_lower (kb.key()));
+       KeyboardKey unshifted (kb.state(), gdk_keyval_to_lower (kb.key()));
 
-        KeybindingMap::iterator k = kbm.find (unshifted);
+       KeybindingMap::iterator k = kbm.find (unshifted);
 
-        if (k == kbm.end()) {
-                /* no entry for this key in the state map */
-               DEBUG_TRACE (DEBUG::Bindings, string_compose ("no binding for %1\n", unshifted));
-               return false;
-        }
+       if (k == kbm.end()) {
+               /* no entry for this key in the state map */
+               DEBUG_TRACE (DEBUG::Bindings, string_compose ("no binding for %1\n", unshifted));
+               return false;
+       }
 
-        RefPtr<Action> action;
+       RefPtr<Action> action;
 
-        if (k->second.action) {
-               action = k->second.action;
-        } else {
-               if (_action_map) {
-                       action = _action_map->find_action (k->second.action_name);
-               }
-        }
+       if (k->second.action) {
+               action = k->second.action;
+       } else {
+               if (_action_map) {
+                       action = _action_map->find_action (k->second.action_name);
+               }
+       }
 
-        if (action) {
-               /* lets do it ... */
-               DEBUG_TRACE (DEBUG::Bindings, string_compose ("binding for %1: %2\n", unshifted, k->second.action_name));
-               action->activate ();
-        }
+       if (action) {
+               /* lets do it ... */
+               DEBUG_TRACE (DEBUG::Bindings, string_compose ("binding for %1: %2\n", unshifted, k->second.action_name));
+               action->activate ();
+       }
 
-        /* return true even if the action could not be found */
+       /* return true even if the action could not be found */
 
-        return true;
+       return true;
 }
 
 void
@@ -481,32 +563,35 @@ Bindings::dissociate ()
 void
 Bindings::push_to_gtk (KeyboardKey kb, RefPtr<Action> what)
 {
-        /* GTK has the useful feature of showing key bindings for actions in
-         * menus. As of August 2015, we have no interest in trying to
-         * reimplement this functionality, so we will use it even though we no
-         * longer use GTK accelerators for handling key events. To do this, we
-         * need to make sure that there is a fully populated GTK AccelMap set
-         * up with all bindings/actions.
-         */
+       /* GTK has the useful feature of showing key bindings for actions in
+        * menus. As of August 2015, we have no interest in trying to
+        * reimplement this functionality, so we will use it even though we no
+        * longer use GTK accelerators for handling key events. To do this, we
+        * need to make sure that there is a fully populated GTK AccelMap set
+        * up with all bindings/actions.
+        */
 
        Gtk::AccelKey gtk_key;
        bool entry_exists = Gtk::AccelMap::lookup_entry (what->get_accel_path(), gtk_key);
 
-        if (!entry_exists) {
-
-               /* there is a trick happening here. It turns out that
-                * gtk_accel_map_add_entry() performs no validation checks on
-                * the accelerator keyval. This means we can use it to define
-                * ANY accelerator, even if they violate GTK's rules
-                * (e.g. about not using navigation keys). This works ONLY when
-                * the entry in the GTK accelerator map has not already been
-                * added. The entries will be added by the GTK UIManager when
-                * building menus, so this code must be called before that
-                * happens.
-                */
-
-               Gtk::AccelMap::add_entry (what->get_accel_path(), kb.key(), (Gdk::ModifierType) kb.state());
-        }
+       if (!entry_exists) {
+
+               /* there is a trick happening here. It turns out that
+                * gtk_accel_map_add_entry() performs no validation checks on
+                * the accelerator keyval. This means we can use it to define
+                * ANY accelerator, even if they violate GTK's rules
+                * (e.g. about not using navigation keys). This works ONLY when
+                * the entry in the GTK accelerator map has not already been
+                * added. The entries will be added by the GTK UIManager when
+                * building menus, so this code must be called before that
+                * happens.
+                */
+
+
+               int mod = kb.state();
+
+               Gtk::AccelMap::add_entry (what->get_accel_path(), kb.key(), (Gdk::ModifierType) mod);
+       }
 }
 
 bool
@@ -517,23 +602,33 @@ Bindings::replace (KeyboardKey kb, Operation op, string const & action_name, boo
        }
 
        if (is_registered(op, action_name)) {
-               remove(op, action_name, can_save);
+               remove (op, action_name, can_save);
        }
-       add (kb, op, action_name, can_save);
+
+       /* XXX need a way to get the old group name */
+       add (kb, op, action_name, 0, can_save);
+
        return true;
 }
 
 bool
-Bindings::add (KeyboardKey kb, Operation op, string const& action_name, bool can_save)
+Bindings::add (KeyboardKey kb, Operation op, string const& action_name, XMLProperty const* group, bool can_save)
 {
-       if (is_registered(op, action_name)) {
+       if (is_registered (op, action_name)) {
                return false;
        }
 
        KeybindingMap& kbm = get_keymap (op);
+       if (group) {
+               KeybindingMap::value_type new_pair = make_pair (kb, ActionInfo (action_name, group->value()));
+               (void) kbm.insert (new_pair).first;
+       } else {
+               KeybindingMap::value_type new_pair = make_pair (kb, ActionInfo (action_name));
+               (void) kbm.insert (new_pair).first;
+       }
 
-       KeybindingMap::value_type new_pair (kb, ActionInfo (action_name));
-       kbm.insert (new_pair).first;
+       DEBUG_TRACE (DEBUG::Bindings, string_compose ("add binding between %1 and %2, group [%3]\n",
+                                                     kb, action_name, (group ? group->value() : string())));
 
        if (can_save) {
                Keyboard::keybindings_changed ();
@@ -574,167 +669,356 @@ Bindings::activate (MouseButton bb, Operation op)
 {
        MouseButtonBindingMap& bbm = get_mousemap(op);
 
-        MouseButtonBindingMap::iterator b = bbm.find (bb);
+       MouseButtonBindingMap::iterator b = bbm.find (bb);
 
-        if (b == bbm.end()) {
-                /* no entry for this key in the state map */
-                return false;
-        }
+       if (b == bbm.end()) {
+               /* no entry for this key in the state map */
+               return false;
+       }
 
-        RefPtr<Action> action;
+       RefPtr<Action> action;
 
-        if (b->second.action) {
-               action = b->second.action;
-        } else {
-               if (_action_map) {
-                       action = _action_map->find_action (b->second.action_name);
-               }
-        }
+       if (b->second.action) {
+               action = b->second.action;
+       } else {
+               if (_action_map) {
+                       action = _action_map->find_action (b->second.action_name);
+               }
+       }
 
-        if (action) {
-               /* lets do it ... */
-               DEBUG_TRACE (DEBUG::Bindings, string_compose ("activating action %1\n", ardour_action_name (action)));
-               action->activate ();
-        }
+       if (action) {
+               /* lets do it ... */
+               DEBUG_TRACE (DEBUG::Bindings, string_compose ("activating action %1\n", ardour_action_name (action)));
+               action->activate ();
+       }
 
-        /* return true even if the action could not be found */
+       /* return true even if the action could not be found */
 
-        return true;
+       return true;
 }
 
 void
-Bindings::add (MouseButton bb, Operation op, string const& action_name)
+Bindings::add (MouseButton bb, Operation op, string const& action_name, XMLProperty const* /*group*/)
 {
        MouseButtonBindingMap& bbm = get_mousemap(op);
 
-        MouseButtonBindingMap::value_type newpair (bb, ActionInfo (action_name));
-        bbm.insert (newpair);
+       MouseButtonBindingMap::value_type newpair (bb, ActionInfo (action_name));
+       bbm.insert (newpair);
 }
 
 void
 Bindings::remove (MouseButton bb, Operation op)
 {
        MouseButtonBindingMap& bbm = get_mousemap(op);
-        MouseButtonBindingMap::iterator b = bbm.find (bb);
+       MouseButtonBindingMap::iterator b = bbm.find (bb);
 
-        if (b != bbm.end()) {
-                bbm.erase (b);
-        }
+       if (b != bbm.end()) {
+               bbm.erase (b);
+       }
 }
 
 void
 Bindings::save (XMLNode& root)
 {
-        XMLNode* presses = new XMLNode (X_("Press"));
-
-        for (KeybindingMap::iterator k = press_bindings.begin(); k != press_bindings.end(); ++k) {
-                XMLNode* child;
-
-                if (k->first.name().empty()) {
-                       continue;
-                }
-
-                child = new XMLNode (X_("Binding"));
-                child->add_property (X_("key"), k->first.name());
-                child->add_property (X_("action"), k->second.action_name);
-                presses->add_child_nocopy (*child);
-        }
-
-        for (MouseButtonBindingMap::iterator k = button_press_bindings.begin(); k != button_press_bindings.end(); ++k) {
-                XMLNode* child;
-                child = new XMLNode (X_("Binding"));
-                child->add_property (X_("button"), k->first.name());
-                child->add_property (X_("action"), k->second.action_name);
-                presses->add_child_nocopy (*child);
-        }
-
-        XMLNode* releases = new XMLNode (X_("Release"));
-
-        for (KeybindingMap::iterator k = release_bindings.begin(); k != release_bindings.end(); ++k) {
-                XMLNode* child;
-
-                if (k->first.name().empty()) {
-                       continue;
-                }
-
-                child = new XMLNode (X_("Binding"));
-                child->add_property (X_("key"), k->first.name());
-                child->add_property (X_("action"), k->second.action_name);
-                releases->add_child_nocopy (*child);
-        }
-
-        for (MouseButtonBindingMap::iterator k = button_release_bindings.begin(); k != button_release_bindings.end(); ++k) {
-                XMLNode* child;
-                child = new XMLNode (X_("Binding"));
-                child->add_property (X_("button"), k->first.name());
-                child->add_property (X_("action"), k->second.action_name);
-                releases->add_child_nocopy (*child);
-        }
-
-        root.add_child_nocopy (*presses);
-        root.add_child_nocopy (*releases);
+       XMLNode* presses = new XMLNode (X_("Press"));
+
+       for (KeybindingMap::iterator k = press_bindings.begin(); k != press_bindings.end(); ++k) {
+               XMLNode* child;
+
+               if (k->first.name().empty()) {
+                       continue;
+               }
+
+               child = new XMLNode (X_("Binding"));
+               child->set_property (X_("key"), k->first.name());
+               child->set_property (X_("action"), k->second.action_name);
+               presses->add_child_nocopy (*child);
+       }
+
+       for (MouseButtonBindingMap::iterator k = button_press_bindings.begin(); k != button_press_bindings.end(); ++k) {
+               XMLNode* child;
+               child = new XMLNode (X_("Binding"));
+               child->set_property (X_("button"), k->first.name());
+               child->set_property (X_("action"), k->second.action_name);
+               presses->add_child_nocopy (*child);
+       }
+
+       XMLNode* releases = new XMLNode (X_("Release"));
+
+       for (KeybindingMap::iterator k = release_bindings.begin(); k != release_bindings.end(); ++k) {
+               XMLNode* child;
+
+               if (k->first.name().empty()) {
+                       continue;
+               }
+
+               child = new XMLNode (X_("Binding"));
+               child->set_property (X_("key"), k->first.name());
+               child->set_property (X_("action"), k->second.action_name);
+               releases->add_child_nocopy (*child);
+       }
+
+       for (MouseButtonBindingMap::iterator k = button_release_bindings.begin(); k != button_release_bindings.end(); ++k) {
+               XMLNode* child;
+               child = new XMLNode (X_("Binding"));
+               child->set_property (X_("button"), k->first.name());
+               child->set_property (X_("action"), k->second.action_name);
+               releases->add_child_nocopy (*child);
+       }
+
+       root.add_child_nocopy (*presses);
+       root.add_child_nocopy (*releases);
+}
+
+void
+Bindings::save_all_bindings_as_html (ostream& ostr)
+{
+       if (bindings.empty()) {
+               return;
+       }
+
+
+       ostr << "<html>\n<head>\n<title>";
+       ostr << PROGRAM_NAME;
+       ostr << "</title>\n";
+       ostr << "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n";
+
+       ostr << "</head>\n<body>\n";
+
+       ostr << "<table border=\"2\" cellpadding=\"6\"><tbody>\n\n";
+       ostr << "<tr>\n\n";
+
+       /* first column: separate by group */
+       ostr << "<td>\n\n";
+       for (list<Bindings*>::const_iterator b = bindings.begin(); b != bindings.end(); ++b) {
+               (*b)->save_as_html (ostr, true);
+       }
+       ostr << "</td>\n\n";
+
+       //second column
+       ostr << "<td style=\"vertical-align:top\">\n\n";
+       for (list<Bindings*>::const_iterator b = bindings.begin(); b != bindings.end(); ++b) {
+               (*b)->save_as_html (ostr, false);
+       }
+       ostr << "</td>\n\n";
+
+
+       ostr << "</tr>\n\n";
+       ostr << "</tbody></table>\n\n";
+
+       ostr << "</br></br>\n\n";
+       ostr << "<table border=\"2\" cellpadding=\"6\"><tbody>\n\n";
+       ostr << "<tr>\n\n";
+       ostr << "<td>\n\n";
+       ostr << "<h2><u> Partial List of Available Actions { => with current shortcut, where applicable } </u></h2>\n\n";
+       {
+               vector<string> paths;
+               vector<string> labels;
+               vector<string> tooltips;
+               vector<string> keys;
+               vector<Glib::RefPtr<Gtk::Action> > actions;
+
+               Gtkmm2ext::ActionMap::get_all_actions (paths, labels, tooltips, keys, actions);
+
+               vector<string>::iterator k;
+               vector<string>::iterator p;
+               vector<string>::iterator l;
+
+               for (p = paths.begin(), k = keys.begin(), l = labels.begin(); p != paths.end(); ++k, ++p, ++l) {
+
+                       string print_path = *p;
+                       /* strip <Actions>/ from the start */
+                       print_path = print_path.substr (10);
+
+                       if ((*k).empty()) {
+                               ostr << print_path  << " ( " << *l << " ) "  << "</br>" << endl;
+                       } else {
+                               ostr << print_path << " ( " << *l << " ) " << " => " << *k << "</br>" << endl;
+                       }
+               }
+       }
+       ostr << "</td>\n\n";
+       ostr << "</tr>\n\n";
+       ostr << "</tbody></table>\n\n";
+
+       ostr << "</body>\n";
+       ostr << "</html>\n";
+}
+
+void
+Bindings::save_as_html (ostream& ostr, bool categorize) const
+{
+
+       if (!press_bindings.empty()) {
+
+               ostr << "<h2><u>";
+               if (categorize)
+                       ostr << _("Window") << ": " << name() << _(" (Categorized)");
+               else
+                       ostr << _("Window") << ": " << name() << _(" (Alphabetical)");
+               ostr << "</u></h2>\n\n";
+
+               typedef std::map<std::string, std::vector<KeybindingMap::const_iterator> > GroupMap;
+               GroupMap group_map;
+
+               for (KeybindingMap::const_iterator k = press_bindings.begin(); k != press_bindings.end(); ++k) {
+
+                       if (k->first.name().empty()) {
+                               continue;
+                       }
+
+                       string group_name;
+                       if (categorize && !k->second.group_name.empty()) {
+                               group_name = k->second.group_name;
+                       } else {
+                               group_name = _("Uncategorized");
+                       }
+
+                       GroupMap::iterator gm = group_map.find (group_name);
+                       if (gm == group_map.end()) {
+                               std::vector<KeybindingMap::const_iterator> li;
+                               li.push_back (k);
+                               group_map.insert (make_pair (group_name,li));
+                       } else {
+                               gm->second.push_back (k);
+                       }
+               }
+
+
+               for (GroupMap::const_iterator gm = group_map.begin(); gm != group_map.end(); ++gm) {
+
+                       if (categorize) {
+                               ostr << "<h3>" << gm->first << "</h3>\n";
+                       }
+
+                       for (vector<KeybindingMap::const_iterator>::const_iterator k = gm->second.begin(); k != gm->second.end(); ++k) {
+
+                               if ((*k)->first.name().empty()) {
+                                       continue;
+                               }
+
+                               RefPtr<Action> action;
+
+                               if ((*k)->second.action) {
+                                       action = (*k)->second.action;
+                               } else {
+                                       if (_action_map) {
+                                               action = _action_map->find_action ((*k)->second.action_name);
+                                       }
+                               }
+
+                               if (!action) {
+                                       continue;
+                               }
+
+                               string key_name = (*k)->first.native_short_name ();
+                               replace_all (key_name, X_("KP_"), X_("Numpad "));
+                               replace_all (key_name, X_("nabla"), X_("Tab"));
+
+                               string::size_type pos;
+
+                               char const *targets[] = { X_("Separator"), X_("Add"), X_("Subtract"), X_("Decimal"), X_("Divide"),
+                                                         X_("grave"), X_("comma"), X_("period"), X_("asterisk"), X_("backslash"),
+                                                         X_("apostrophe"), X_("minus"), X_("plus"), X_("slash"), X_("semicolon"),
+                                                         X_("colon"), X_("equal"), X_("bracketleft"), X_("bracketright"),
+                                                         X_("ampersand"), X_("numbersign"), X_("parenleft"), X_("parenright"),
+                                                         X_("quoteright"), X_("quoteleft"), X_("exclam"), X_("quotedbl"),
+                                                         0
+                               };
+
+                               char const *replacements[] = { X_("-"), X_("+"), X_("-"), X_("."), X_("/"),
+                                                              X_("`"), X_(","), X_("."), X_("*"), X_("\\"),
+                                                              X_("'"), X_("-"), X_("+"), X_("/"), X_(";"),
+                                                              X_(":"), X_("="), X_("{"), X_("{"),
+                                                              X_("&"), X_("#"), X_("("), X_(")"),
+                                                              X_("`"), X_("'"), X_("!"), X_("\""),
+                               };
+
+                               for (size_t n = 0; targets[n]; ++n) {
+                                       if ((pos = key_name.find (targets[n])) != string::npos) {
+                                               key_name.replace (pos, strlen (targets[n]), replacements[n]);
+                                       }
+                               }
+
+                               key_name.append(" ");
+
+                               while (key_name.length()<28)
+                                       key_name.append("-");
+
+                               ostr << "<span style=\"font-family:monospace;\">" << key_name;
+                               ostr << "<i>" << action->get_label() << "</i></span></br>\n";
+                       }
+                       ostr << "\n\n";
+
+               }
+
+               ostr << "\n";
+       }
 }
 
 bool
 Bindings::load (XMLNode const& node)
 {
-        const XMLNodeList& children (node.children());
+       const XMLNodeList& children (node.children());
 
-        press_bindings.clear ();
-        release_bindings.clear ();
+       press_bindings.clear ();
+       release_bindings.clear ();
 
-        for (XMLNodeList::const_iterator i = children.begin(); i != children.end(); ++i) {
-               /* each node could be Press or Release */
-               load_operation (**i);
-        }
+       for (XMLNodeList::const_iterator i = children.begin(); i != children.end(); ++i) {
+               /* each node could be Press or Release */
+               load_operation (**i);
+       }
 
-        return true;
+       return true;
 }
 
 void
 Bindings::load_operation (XMLNode const& node)
 {
-        if (node.name() == X_("Press") || node.name() == X_("Release")) {
-
-                Operation op;
-
-                if (node.name() == X_("Press")) {
-                        op = Press;
-                } else {
-                        op = Release;
-                }
-
-                const XMLNodeList& children (node.children());
-
-                for (XMLNodeList::const_iterator p = children.begin(); p != children.end(); ++p) {
-
-                        XMLProperty* ap;
-                        XMLProperty* kp;
-                        XMLProperty* bp;
-
-                        ap = (*p)->property ("action");
-                        kp = (*p)->property ("key");
-                        bp = (*p)->property ("button");
-
-                        if (!ap || (!kp && !bp)) {
-                                continue;
-                        }
-
-                        if (kp) {
-                                KeyboardKey k;
-                                if (!KeyboardKey::make_key (kp->value(), k)) {
-                                        continue;
-                                }
-                                add (k, op, ap->value());
-                        } else {
-                                MouseButton b;
-                                if (!MouseButton::make_button (bp->value(), b)) {
-                                        continue;
-                                }
-                                add (b, op, ap->value());
-                        }
-                }
-        }
+       if (node.name() == X_("Press") || node.name() == X_("Release")) {
+
+               Operation op;
+
+               if (node.name() == X_("Press")) {
+                       op = Press;
+               } else {
+                       op = Release;
+               }
+
+               const XMLNodeList& children (node.children());
+
+               for (XMLNodeList::const_iterator p = children.begin(); p != children.end(); ++p) {
+
+                       XMLProperty const * ap;
+                       XMLProperty const * kp;
+                       XMLProperty const * bp;
+                       XMLProperty const * gp;
+                       XMLNode const * child = *p;
+
+                       ap = child->property ("action");
+                       kp = child->property ("key");
+                       bp = child->property ("button");
+                       gp = child->property ("group");
+
+                       if (!ap || (!kp && !bp)) {
+                               continue;
+                       }
+
+                       if (kp) {
+                               KeyboardKey k;
+                               if (!KeyboardKey::make_key (kp->value(), k)) {
+                                       continue;
+                               }
+                               add (k, op, ap->value(), gp);
+                       } else {
+                               MouseButton b;
+                               if (!MouseButton::make_button (bp->value(), b)) {
+                                       continue;
+                               }
+                               add (b, op, ap->value(), gp);
+                       }
+               }
+       }
 }
 
 void
@@ -808,6 +1092,17 @@ Bindings::is_bound (KeyboardKey const& kb, Operation op) const
        return km.find(kb) != km.end();
 }
 
+std::string
+Bindings::bound_name (KeyboardKey const& kb, Operation op) const
+{
+       const KeybindingMap& km = get_keymap(op);
+       KeybindingMap::const_iterator b = km.find(kb);
+       if (b == km.end()) {
+               return "";
+       }
+       return b->second.action_name;
+}
+
 bool
 Bindings::is_registered (Operation op, std::string const& action_name) const
 {
@@ -815,39 +1110,39 @@ Bindings::is_registered (Operation op, std::string const& action_name) const
        return std::find_if(km.begin(),  km.end(),  ActionNameRegistered<KeybindingMap::const_iterator::value_type>(action_name)) != km.end();
 }
 
-Bindings::KeybindingMap& 
+Bindings::KeybindingMap&
 Bindings::get_keymap (Operation op)
 {
        switch (op) {
-               case Press:
-                       return press_bindings;
-               case Release:
-               default:
-                       return release_bindings;
+       case Press:
+               return press_bindings;
+       case Release:
+       default:
+               return release_bindings;
        }
 }
 
-const Bindings::KeybindingMap& 
+const Bindings::KeybindingMap&
 Bindings::get_keymap (Operation op) const
 {
        switch (op) {
-               case Press:
-                       return press_bindings;
-               case Release:
-               default:
-                       return release_bindings;
+       case Press:
+               return press_bindings;
+       case Release:
+       default:
+               return release_bindings;
        }
 }
 
-Bindings::MouseButtonBindingMap& 
+Bindings::MouseButtonBindingMap&
 Bindings::get_mousemap (Operation op)
 {
        switch (op) {
-               case Press:
-                       return button_press_bindings;
-               case Release:
-               default:
-                       return button_release_bindings;
+       case Press:
+               return button_press_bindings;
+       case Release:
+       default:
+               return button_release_bindings;
        }
 }
 
@@ -882,18 +1177,45 @@ ActionMap::get_actions (ActionMap::Actions& acts)
 RefPtr<Action>
 ActionMap::find_action (const string& name)
 {
-        _ActionMap::iterator a = _actions.find (name);
+       _ActionMap::iterator a = _actions.find (name);
 
-        if (a != _actions.end()) {
-                return a->second;
-        }
+       if (a != _actions.end()) {
+               return a->second;
+       }
 
-        return RefPtr<Action>();
+       cerr << "Failed to find action: [" << name << ']' << endl;
+       return RefPtr<Action>();
+}
+
+RefPtr<Action>
+ActionMap::find_action (char const * group_name, char const * action_name)
+{
+       string fullpath;
+
+       fullpath = group_name;
+       fullpath += '/';
+       fullpath += action_name;
+
+       _ActionMap::iterator a = _actions.find (fullpath);
+
+       if (a != _actions.end()) {
+               return a->second;
+       }
+
+       cerr << "Failed to find action (2): [" << fullpath << ']' << endl;
+       return RefPtr<Action>();
 }
 
 RefPtr<ActionGroup>
 ActionMap::create_action_group (const string& name)
 {
+       Glib::ListHandle<Glib::RefPtr<ActionGroup> > agl =  ActionManager::ui_manager->get_action_groups ();
+       for (Glib::ListHandle<Glib::RefPtr<ActionGroup> >::iterator i = agl.begin (); i != agl.end (); ++i) {
+               if ((*i)->get_name () == name) {
+                       return *i;
+               }
+       }
+
        RefPtr<ActionGroup> g = ActionGroup::create (name);
 
        /* this is one of the places where our own Action management code
@@ -913,42 +1235,42 @@ ActionMap::create_action_group (const string& name)
 RefPtr<Action>
 ActionMap::register_action (RefPtr<ActionGroup> group, const char* name, const char* label)
 {
-        string fullpath;
+       string fullpath;
 
-        RefPtr<Action> act = Action::create (name, label);
+       RefPtr<Action> act = Action::create (name, label);
 
-        fullpath = group->get_name();
-        fullpath += '/';
-        fullpath += name;
+       fullpath = group->get_name();
+       fullpath += '/';
+       fullpath += name;
 
-        if (_actions.insert (_ActionMap::value_type (fullpath, act)).second) {
-               group->add (act);
-               return act;
-        }
+       if (_actions.insert (_ActionMap::value_type (fullpath, act)).second) {
+               group->add (act);
+               return act;
+       }
 
-        /* already registered */
-        return RefPtr<Action> ();
+       /* already registered */
+       return RefPtr<Action> ();
 }
 
 RefPtr<Action>
 ActionMap::register_action (RefPtr<ActionGroup> group,
                             const char* name, const char* label, sigc::slot<void> sl)
 {
-        string fullpath;
+       string fullpath;
 
-        RefPtr<Action> act = Action::create (name, label);
+       RefPtr<Action> act = Action::create (name, label);
 
-        fullpath = group->get_name();
-        fullpath += '/';
-        fullpath += name;
+       fullpath = group->get_name();
+       fullpath += '/';
+       fullpath += name;
 
-        if (_actions.insert (_ActionMap::value_type (fullpath, act)).second) {
-               group->add (act, sl);
-               return act;
-        }
+       if (_actions.insert (_ActionMap::value_type (fullpath, act)).second) {
+               group->add (act, sl);
+               return act;
+       }
 
-        /* already registered */
-        return RefPtr<Action>();
+       /* already registered */
+       return RefPtr<Action>();
 }
 
 RefPtr<Action>
@@ -957,22 +1279,22 @@ ActionMap::register_radio_action (RefPtr<ActionGroup> group,
                                   const char* name, const char* label,
                                   sigc::slot<void> sl)
 {
-        string fullpath;
+       string fullpath;
 
-        RefPtr<Action> act = RadioAction::create (rgroup, name, label);
-        RefPtr<RadioAction> ract = RefPtr<RadioAction>::cast_dynamic(act);
+       RefPtr<Action> act = RadioAction::create (rgroup, name, label);
+       RefPtr<RadioAction> ract = RefPtr<RadioAction>::cast_dynamic(act);
 
-        fullpath = group->get_name();
-        fullpath += '/';
-        fullpath += name;
+       fullpath = group->get_name();
+       fullpath += '/';
+       fullpath += name;
 
-        if (_actions.insert (_ActionMap::value_type (fullpath, act)).second) {
-               group->add (act, sl);
-               return act;
-        }
+       if (_actions.insert (_ActionMap::value_type (fullpath, act)).second) {
+               group->add (act, sl);
+               return act;
+       }
 
-        /* already registered */
-        return RefPtr<Action>();
+       /* already registered */
+       return RefPtr<Action>();
 }
 
 RefPtr<Action>
@@ -982,53 +1304,53 @@ ActionMap::register_radio_action (RefPtr<ActionGroup> group,
                                   sigc::slot<void,GtkAction*> sl,
                                   int value)
 {
-        string fullpath;
+       string fullpath;
 
-        RefPtr<Action> act = RadioAction::create (rgroup, name, label);
-        RefPtr<RadioAction> ract = RefPtr<RadioAction>::cast_dynamic(act);
-        ract->property_value() = value;
+       RefPtr<Action> act = RadioAction::create (rgroup, name, label);
+       RefPtr<RadioAction> ract = RefPtr<RadioAction>::cast_dynamic(act);
+       ract->property_value() = value;
 
-        fullpath = group->get_name();
-        fullpath += '/';
-        fullpath += name;
+       fullpath = group->get_name();
+       fullpath += '/';
+       fullpath += name;
 
-        if (_actions.insert (_ActionMap::value_type (fullpath, act)).second) {
-               group->add (act, sigc::bind (sl, act->gobj()));
-               return act;
-        }
+       if (_actions.insert (_ActionMap::value_type (fullpath, act)).second) {
+               group->add (act, sigc::bind (sl, act->gobj()));
+               return act;
+       }
 
-        /* already registered */
+       /* already registered */
 
-        return RefPtr<Action>();
+       return RefPtr<Action>();
 }
 
 RefPtr<Action>
 ActionMap::register_toggle_action (RefPtr<ActionGroup> group,
                                    const char* name, const char* label, sigc::slot<void> sl)
 {
-        string fullpath;
+       string fullpath;
 
-        fullpath = group->get_name();
-        fullpath += '/';
-        fullpath += name;
+       fullpath = group->get_name();
+       fullpath += '/';
+       fullpath += name;
 
-        RefPtr<Action> act = ToggleAction::create (name, label);
+       RefPtr<Action> act = ToggleAction::create (name, label);
 
-        if (_actions.insert (_ActionMap::value_type (fullpath, act)).second) {
-               group->add (act, sl);
-               return act;
-        }
+       if (_actions.insert (_ActionMap::value_type (fullpath, act)).second) {
+               group->add (act, sl);
+               return act;
+       }
 
-        /* already registered */
-        return RefPtr<Action>();
+       /* already registered */
+       return RefPtr<Action>();
 }
 
 void
 ActionMap::get_all_actions (std::vector<std::string>& paths,
-                           std::vector<std::string>& labels,
-                           std::vector<std::string>& tooltips,
-                           std::vector<std::string>& keys,
-                           std::vector<RefPtr<Action> >& actions)
+                            std::vector<std::string>& labels,
+                            std::vector<std::string>& tooltips,
+                            std::vector<std::string>& keys,
+                            std::vector<RefPtr<Action> >& actions)
 {
        for (list<ActionMap*>::const_iterator map = action_maps.begin(); map != action_maps.end(); ++map) {
 
@@ -1067,5 +1389,6 @@ ActionMap::get_all_actions (std::vector<std::string>& paths,
 
 std::ostream& operator<<(std::ostream& out, Gtkmm2ext::KeyboardKey const & k) {
        char const *gdk_name = gdk_keyval_name (k.key());
-       return out << "Key " << k.key() << " (" << (gdk_name ? gdk_name : "no-key") << ") state " << hex << k.state() << dec;
+       return out << "Key " << k.key() << " (" << (gdk_name ? gdk_name : "no-key") << ") state "
+                  << hex << k.state() << dec << ' ' << show_gdk_event_state (k.state());
 }