lilypond-0.0.10

diff --git a/src/getcommands.cc b/src/getcommands.cc
index 1f9362c59cdd8651da2b37d7c4ba8ba22f18ef9c..04170f582a200b7fcf477d5c71d6279428bf2014 100644 (file)
--- a/src/getcommands.cc
+++ b/src/getcommands.cc
@@ -2,15 +2,52 @@
 #include "parseconstruct.hh"
 #include "command.hh"
 
+
 Command*
-get_bar_command(Real w)
+get_key_interpret_command(svec<String> which)
 {
     Command*c = new Command;
-    c->when = w;
-    c->code = TYPESET;
-    c->args.add( "BAR");
-    c->args.add( "|");
-    c->priority = 100;
+    c->code = INTERPRET;    
+    c->args= which;
+    String k("KEY");
+    c->args.insert(k,0 );
+    c->priority = 200;
+    return c;
+}
+
+Command*
+get_clef_interpret_command(String w)
+{
+    Command*c = new Command;
+    c->code = INTERPRET;
+    c->args.add("CLEF");
+    c->args.add(w);
+    c->priority = 190;
+    return c;
+}
+
+Command*
+get_key_typeset_command(svec<String> which)
+{
+    Command*c = new Command;
+    c->code = TYPESET;    
+    c->args = which;
+    String k("KEY");
+    c->args.insert(k,0 );
+    c->priority = 70;
+    return c;
+}
+
+Command *
+get_meterchange_command(int n, int m)
+{
+    Command*c = new Command;
+
+    c->code = INTERPRET;
+    c->args.add( "METER");
+    c->args.add( n );
+    c->args.add( m );
+    c->priority = 170;         // more than bar
     return c;
 }
 
@@ -24,20 +61,19 @@ get_meter_command(Real w, int n, int m)
     c->args.add( "METER");
     c->args.add( n );
     c->args.add( m );
-    c->priority = 50;          // less than bar
+    c->priority = 40;
     return c;
 }
 
-Command *
-get_meterchange_command(int n, int m)
+Command*
+get_bar_command(Real w)
 {
     Command*c = new Command;
-
+    c->when = w;
     c->code = INTERPRET;
-    c->args.add( "METER");
-    c->args.add( n );
-    c->args.add( m );
-    c->priority = 0;           // more than bar
+    c->args.add( "BAR");
+    c->args.add( "|");
+    c->priority = 170;
     return c;
 }
 
@@ -51,7 +87,7 @@ get_skip_command(int n, Real m)
     c->args.add( "SKIP");
     c->args.add( n );
     c->args.add( m );
-    c->priority = 0;           // more than bar
+    c->priority = 0;           
     return c;
 }