lilypond-0.0.15

diff --git a/hdr/inputcommand.hh b/hdr/inputcommand.hh
index aeec3b8ad395e90dd8cad290ceb5c17463e00743..21aeaeacb486309abd72ac58c9cff65afc042293 100644 (file)
--- a/hdr/inputcommand.hh
+++ b/hdr/inputcommand.hh
@@ -10,7 +10,6 @@
 #include "scalar.hh"
 #include "vray.hh"
 
-
 struct Input_command {
     Real when;
     
@@ -28,6 +27,7 @@ Input_command* get_clef_interpret_command(String w);
 Input_command *get_reset_command();
 Input_command *get_partial_command(Real u);
 Input_command* get_skip_command( int,Real);
+Input_command* get_grouping_command( svec<int>);
 
 void
 interpret_meter(Input_command *c, int &beats_per_meas, int& one_beat,

diff --git a/src/getcommands.cc b/src/getcommands.cc
index 5b12009ff92fc791160547abd7797c4e76b7da6d..8a133bdd5c7ecf3a3ebb9084a21fadaffd12ac47 100644 (file)
--- a/src/getcommands.cc
+++ b/src/getcommands.cc
@@ -40,18 +40,4 @@ get_meter_command(Real w, int n, int m)
     c->priority = 40;
     return c;
 }
-#if 0
-Command*
-get_bar_command(Real w)
-{
-    Command*c = new Command;
-    c->when = w;
-    c->code = INTERPRET;
-    c->args.add( "BAR");
-    c->args.add( "|");
-    c->priority = 170;
-    return c;
-}
-
 
-#endif

diff --git a/src/inputcommand.cc b/src/inputcommand.cc
index c0bdb969196b1c76899b693c4566988e8e0c175d..121271e4f0daecaa56da60e5686b3a95e86dba77 100644 (file)
--- a/src/inputcommand.cc
+++ b/src/inputcommand.cc
@@ -21,7 +21,7 @@ Input_command::operator Command()
     c.code = INTERPRET;
     String s = args[0];
         
-    int p;
+    int p=0;
     if (s == "KEY")
        p = 200;
     else if (s=="CLEF")
@@ -30,6 +30,8 @@ Input_command::operator Command()
        p = 180;
     else if (s == "BAR")
        p = 170;
+    else if (s == "GROUPING")
+       p = 160;
     
     c.priority = p;
     c.args = args;
@@ -47,6 +49,17 @@ get_partial_command(Real u)
     return c;
 }
 
+Input_command*
+get_grouping_command(svec<int>a ) 
+{
+    Input_command*c = new Input_command;
+    c->args.add("GROUPING");
+    for (int i=0; i < a.sz(); i ++)
+       c->args.add(a[i]);
+
+    return c;
+}
+
 Input_command*
 get_key_interpret_command(svec<String>a ) 
 {