1 files changed, 11 insertions, 15 deletions

diff --git a/src/FbTk/MacroCommand.cc b/src/FbTk/MacroCommand.cc
index 55d403c..3a05179 100644
--- a/src/FbTk/MacroCommand.cc
+++ b/src/FbTk/MacroCommand.cc
@@ -26,6 +26,7 @@
 #include "ObjectRegistry.hh"
 #include "StringUtil.hh"
 
+#include <list>
 #include <string>
 
 namespace FbTk {
@@ -35,21 +36,16 @@ namespace {
 template <typename M>
 M *addCommands(M *macro, const std::string &args, bool trusted) {
 
-    std::string cmd;
-    int err = 0;
-    int pos = 0;
-
-    while (true) {
-        RefCount<Command> next(0);
-        pos += err;
-        err = StringUtil::getStringBetween(cmd, args.c_str() + pos,
-                                           '{', '}', " \t\n", true);
-        if (err == 0)
-            break;
-        if (err > 0)
-            next = ObjectRegistry<Command>::instance().parse(cmd, trusted);
-        if (*next != 0)
-            macro->add(next);
+    std::string blah;
+    std::list<std::string> cmds;
+    StringUtil::stringTokensBetween(cmds, args, blah, '{', '}');
+    RefCount<Command> cmd(0);
+
+    std::list<std::string>::iterator it = cmds.begin(), it_end = cmds.end();
+    for (; it != it_end; ++it) {
+        cmd = ObjectRegistry<Command>::instance().parse(*it, trusted);
+        if (*cmd)
+            macro->add(cmd);
     }
 
     if (macro->size() > 0)