Routines for calculating numerical labels for BibTeX citations.

[lyx.git] / src / FuncRequest.cpp

diff --git a/src/FuncRequest.cpp b/src/FuncRequest.cpp
index 9f1405ddc454c2275dc68e3724200ad04814abaf..c7624c38ae336775ffe6e2da052f8ffac60dbb8b 100644 (file)
--- a/src/FuncRequest.cpp
+++ b/src/FuncRequest.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -11,12 +11,17 @@
 #include <config.h>
 
 #include "FuncRequest.h"
+#include "LyXAction.h"
 
+#include "support/lstrings.h"
+
+#include <climits>
 #include <iostream>
 #include <sstream>
 #include <vector>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
@@ -29,24 +34,24 @@ FuncRequest::FuncRequest(Origin o)
 {}
 
 
-FuncRequest::FuncRequest(kb_action act, Origin o)
+FuncRequest::FuncRequest(FuncCode act, Origin o)
        : action(act), origin(o), x(0), y(0), button_(mouse_button::none)
 {}
 
 
-FuncRequest::FuncRequest(kb_action act, docstring const & arg, Origin o)
+FuncRequest::FuncRequest(FuncCode act, docstring const & arg, Origin o)
        : action(act), argument_(arg), origin(o), x(0), y(0),
          button_(mouse_button::none)
 {}
 
 
-FuncRequest::FuncRequest(kb_action act, string const & arg, Origin o)
+FuncRequest::FuncRequest(FuncCode act, string const & arg, Origin o)
        : action(act), argument_(from_utf8(arg)), origin(o), x(0), y(0),
          button_(mouse_button::none)
 {}
 
 
-FuncRequest::FuncRequest(kb_action act, int ax, int ay,
+FuncRequest::FuncRequest(FuncCode act, int ax, int ay,
                         mouse_button::state but, Origin o)
        : action(act), origin(o), x(ax), y(ay), button_(but)
 {}
@@ -70,17 +75,33 @@ mouse_button::state FuncRequest::button() const
 }
 
 
-void split(vector<string> & args, string const & str)
+namespace {
+
+// Extracts arguments from str into args. Arguments are delimted by
+// whitespace or by double quotes.
+// We extract at most max + 1 arguments, treating args[max] as 
+// continuing to eol.
+void splitArg(vector<string> & args, string const & str, 
+               unsigned int max = UINT_MAX)
 {
        istringstream is(str);
        while (is) {
+               if (args.size() == max) {
+                       string s;
+                       getline(is, s);
+                       args.push_back(trim(s));
+                       return;
+               }               
+
                char c;
                string s;
                is >> c;
                if (is) {
                        if (c == '"')
+                               // get quote delimited argument
                                getline(is, s, '"');
                        else {
+                               // get whitespace delimited argument
                                is.putback(c);
                                is >> s;
                        }
@@ -89,11 +110,20 @@ void split(vector<string> & args, string const & str)
        }
 }
 
+}
 
 string FuncRequest::getArg(unsigned int i) const
 {
        vector<string> args;
-       split(args, to_utf8(argument_));
+       splitArg(args, to_utf8(argument_));
+       return i < args.size() ? args[i] : string();
+}
+
+
+string FuncRequest::getLongArg(unsigned int i) const
+{
+       vector<string> args;
+       splitArg(args, to_utf8(argument_), i);
        return i < args.size() ? args[i] : string();
 }
 
@@ -107,7 +137,8 @@ bool operator==(FuncRequest const & lhs, FuncRequest const & rhs)
 ostream & operator<<(ostream & os, FuncRequest const & cmd)
 {
        return os
-               << " action: " << cmd.action
+               << " action: " << cmd.action 
+               << " [" << lyxaction.getActionName(cmd.action) << "] " 
                << " arg: '" << to_utf8(cmd.argument()) << "'"
                << " x: " << cmd.x
                << " y: " << cmd.y;