remove noload/don't typeset

[lyx.git] / src / LyXAction.C

diff --git a/src/LyXAction.C b/src/LyXAction.C
index 9999d1312b6cdc33fe92525850fd2c670ce315e6..b42c04528ccf996a1df6424840a6b188bd4cc298 100644 (file)
--- a/src/LyXAction.C
+++ b/src/LyXAction.C
@@ -16,8 +16,6 @@
 #include "gettext.h"
 #include "support/lstrings.h"
 
-#include <boost/tuple/tuple.hpp>
- 
 using std::ostream;
 using std::endl;
 using std::pair;
@@ -249,6 +247,8 @@ void LyXAction::init()
                  ReadOnly },
                { LFUN_INSERT_LABEL, "label-insert", N_("Insert Label"),
                  Noop },
+               { LFUN_INSET_OPTARG, "optional-insert", N_("Insert Optional Argument"),
+                 Noop },
                { LFUN_LANGUAGE, "language", N_("Change language"), Noop },
                { LFUN_LATEX_LOG, "latex-view-log", N_("View LaTeX log"),
                  ReadOnly },
@@ -276,19 +276,18 @@ void LyXAction::init()
 #endif
                { LFUN_QUIT, "lyx-quit", N_("Exit"), NoBuffer },
                { LFUN_INSET_MARGINAL, "marginalnote-insert",
-                 N_("Insert Marginalnote"), Noop },
+                 N_("Insert margin note"), Noop },
                { LFUN_MARK_OFF, "mark-off", "", ReadOnly },
                { LFUN_MARK_ON, "mark-on", "", ReadOnly },
                { LFUN_SETMARK, "mark-toggle", "", ReadOnly },
-               { LFUN_MATH, "math", "", Noop },
                { LFUN_MATH_DELIM, "math-delim", "", Noop },
                { LFUN_MATH_DISPLAY, "math-display", "", Noop },
                { LFUN_GREEK, "math-greek", N_("Math Greek"), Noop },
                { LFUN_GREEK_TOGGLE, "math-greek-toggle", "", Noop },
                { LFUN_INSERT_MATH, "math-insert",
                  N_("Insert math symbol"), Noop },
-               { LFUN_SUBSCRIPT, "math-subscript", "", Noop },
-               { LFUN_SUPERSCRIPT, "math-superscript", "", Noop },
+               { LFUN_SUBSCRIPT, "math-subscript", N_("Add subscript"), Noop },
+               { LFUN_SUPERSCRIPT, "math-superscript", N_("Add superscript"), Noop },
                { LFUN_MATH_LIMITS, "math-limits", "", Noop },
                { LFUN_MATH_MACRO, "math-macro", "", Noop },
                { LFUN_MATH_MUTATE, "math-mutate", "", Noop },
@@ -299,12 +298,6 @@ void LyXAction::init()
                { LFUN_MATH_NONUMBER, "math-nonumber", "", Noop },
                { LFUN_MATH_NUMBER, "math-number", "", Noop },
                { LFUN_MATH_EXTERN, "math-extern", "", Noop },
-               { LFUN_MATH_VALIGN, "math-valign", "", Noop },
-               { LFUN_MATH_HALIGN, "math-halign", "", Noop },
-               { LFUN_MATH_ROW_INSERT, "math-row-insert", "", Noop },
-               { LFUN_MATH_ROW_DELETE, "math-row-delete", "", Noop },
-               { LFUN_MATH_COLUMN_INSERT, "math-column-insert", "", Noop },
-               { LFUN_MATH_COLUMN_DELETE, "math-column-delete", "", Noop },
                { LFUN_MATH_PANEL, "math-panel", "", Noop },
                { LFUN_MATH_SIZE, "math-size", "", Noop },
                { LFUN_MENU_OPEN_BY_NAME, "menu-open", "", NoBuffer },
@@ -492,10 +485,10 @@ int LyXAction::getPseudoAction(kb_action action, string const & arg)
 }
 
 
-pair<kb_action, string> LyXAction::retrieveActionArg(int pseudo) const
+FuncRequest LyXAction::retrieveActionArg(int pseudo) const
 {
        if (!isPseudoAction(pseudo))
-               return make_pair(static_cast<kb_action>(pseudo), string());
+               return FuncRequest(static_cast<kb_action>(pseudo));
 
        pseudo_map::const_iterator pit = lyx_pseudo_map.find(pseudo);
 
@@ -503,11 +496,11 @@ pair<kb_action, string> LyXAction::retrieveActionArg(int pseudo) const
                lyxerr[Debug::ACTION] << "Found the pseudoaction: ["
                                      << pit->second.action << '|'
                                      << pit->second.argument << "]\n";
-               return make_pair(pit->second.action, pit->second.argument);
+               return pit->second;
        } else {
                lyxerr << "Lyx Error: Unrecognized pseudo-action "
                        << pseudo << endl;
-               return make_pair(LFUN_UNKNOWN_ACTION, string());
+               return FuncRequest(LFUN_UNKNOWN_ACTION);
        }
 }
 
@@ -537,36 +530,28 @@ int LyXAction::LookupFunc(string const & func)
 
 string const LyXAction::getActionName(int action) const
 {
-       kb_action ac;
-       string arg;
-       boost::tie(ac, arg) = retrieveActionArg(action);
- 
-       if (!arg.empty())
-               arg.insert(0, " ");
+       FuncRequest ev = retrieveActionArg(action);
+       if (!ev.argument.empty())
+               ev.argument.insert(0, " ");
 
-       info_map::const_iterator iit = lyx_info_map.find(ac);
+       info_map::const_iterator iit = lyx_info_map.find(ev.action);
 
-       if (iit != lyx_info_map.end()) {
-               string ret(iit->second.name);
-               ret += arg;
-               return ret;
-       } else
-               return string();
+       if (iit != lyx_info_map.end())
+               return iit->second.name + ev.argument;
+       return string();
 }
 
 
 string const LyXAction::helpText(int pseudoaction) const
 {
-       kb_action action;
-       string arg;
-       boost::tie(action, arg) = retrieveActionArg(pseudoaction);
+       FuncRequest ev = retrieveActionArg(pseudoaction);
 
        string help;
  
-       info_map::const_iterator ici = lyx_info_map.find(action);
+       info_map::const_iterator ici = lyx_info_map.find(ev.action);
        if (ici != lyx_info_map.end()) {
                if (lyxerr.debugging(Debug::ACTION)) {
-                       lyxerr << "Action: " << action << '\n';
+                       lyxerr << "Action: " << ev.action << '\n';
                        lyxerr << "   name: "
                               << ici->second.name << '\n';
                        lyxerr << " attrib: "
@@ -581,9 +566,9 @@ string const LyXAction::helpText(int pseudoaction) const
 
        if (help.empty()) {
                help = _("No description available!");
-       } else if (!arg.empty()) {
+       } else if (!ev.argument.empty()) {
                help += ' ';
-               help += arg;
+               help += ev.argument;
        }
 
        return help;