Don try to be smart and always protect the preamble with \makeatletter

[lyx.git] / src / KeyMap.h

diff --git a/src/KeyMap.h b/src/KeyMap.h
index ee992de628142f75c600bdfdd6e1b38eeee368ea..81c7b82ebfb8d37256d55fc87a8e1ea9103462d0 100644 (file)
--- a/src/KeyMap.h
+++ b/src/KeyMap.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Jean-Marc Lasgouttes
  * \author John Levon
  *
@@ -56,11 +56,13 @@ public:
                    unsigned int r = 0);
 
 
-       // if a keybinding has been defined.
-       bool hasBinding(KeySequence const & seq, FuncRequest const & func,
-                       unsigned int r = 0);
+       /// returns the function bound to this key sequence, or 
+       /// FuncRequest::unknown if no binding exists for it.
+       /// @param r an internal recursion counter
+       // FIXME Surely there's a better way to do that?
+       FuncRequest getBinding(KeySequence const & seq, unsigned int r = 0);
 
-       // clear all bindings
+       /// clear all bindings
        void clear();
 
        /** Parse a bind file. If a valid unbind_map is given, put \unbind 
@@ -104,7 +106,8 @@ public:
        Bindings findBindings(FuncRequest const & func) const;
 
        /// Given an action, print the keybindings.
-       docstring printBindings(FuncRequest const & func) const;
+       docstring printBindings(FuncRequest const & func,
+                               KeySequence::outputFormat format) const;
 
        struct Binding {
                Binding(FuncRequest const & r, KeySequence const & s, ItemType t)
@@ -148,7 +151,7 @@ private:
                /// Modifier masks
                ModifierPair mod;
                /// Keymap for prefix keys
-               boost::shared_ptr<KeyMap> table;
+               boost::shared_ptr<KeyMap> prefixes;
                /// Action for !prefix keys
                FuncRequest func;
        };