#include "lfuns.h"
-#include "LString.h"
#include <boost/utility.hpp>
-#include <map>
+#include <map>
+#include <string>
class FuncRequest;
/// information for an action
struct func_info {
/// the action name
- string name;
+ std::string name;
/// the func_attrib values set
unsigned int attrib;
};
public:
/// type for map between a function name and its action
- typedef std::map<string, kb_action> func_map;
+ typedef std::map<std::string, kb_action> func_map;
/// type for map between an action and its info
typedef std::map<kb_action, func_info> info_map;
- /// type for a map between a pseudo-action and its stored action/arg
- typedef std::map<unsigned int, FuncRequest> pseudo_map;
- /// map from argument to pseudo-action
- typedef std::map<string, unsigned int> arg_item;
- /// map from an action to all its dependent pseudo-actions
- typedef std::map<kb_action, arg_item> arg_map;
/// possible "permissions" for an action
enum func_attrib {
Noop = 0, //< nothing special about this func
ReadOnly = 1, //< can be used in RO mode (perhaps this should change)
NoBuffer = 2, //< Can be used when there is no document open
- Argument = 4 //< Requires argument
+ Argument = 4, //< Requires argument
+ NoUpdate = 8, //< Does not (usually) require update
+ SingleParUpdate = 16 //< Usually only requires this par updated
};
LyXAction();
* If you include arguments in func_name, a new pseudoaction
* will be created if needed.
*/
- int LookupFunc(string const & func_name);
-
- /// Returns a pseudo-action given an action and its argument.
- int getPseudoAction(kb_action action, string const & arg);
-
- /**
- * Given a pseudo-action, return the real action and
- * associated argument
- */
- FuncRequest retrieveActionArg(int pseudo) const;
-
- /// Search for an existent pseudoaction, return -1 if it doesn't exist.
- int searchActionArg(kb_action action, string const & arg) const;
+ FuncRequest lookupFunc(std::string const & func_name) const;
/// Return the name (and argument) associated with the given (pseudo) action
- string const getActionName(int action) const;
+ std::string const getActionName(kb_action action) const;
/// True if the command has `flag' set
bool funcHasFlag(kb_action action, func_attrib flag) const;
/// populate the action container with our actions
void init();
/// add the given action
- void newFunc(kb_action, string const & name, unsigned int attrib);
+ void newFunc(kb_action, std::string const & name, unsigned int attrib);
/**
* This is a list of all the LyXFunc names with the
* command attributes (ro)
*/
info_map lyx_info_map;
-
- /**
- * A mapping from the automatically created pseudo action number
- * to the real action and its argument.
- */
- pseudo_map lyx_pseudo_map;
-
- /**
- * A (multi) mapping from the lyx action to all the generated
- * pseudofuncs and the arguments the action should use.
- */
- arg_map lyx_arg_map;
};
/// singleton instance