@@ -8,62 +8,35 @@
 random.seed(time.time())
 import parse
 
 def main():
     key = "A"
-    bps = 80/60
-    print bps
+    bps = 60/60
     tempo = 1/bps
     max_duration = 1
 
     composition = {
         "a": {  # Movement block 'a' for reuse throughout the piece
-            "melody": {  # Instrument 'melody'
-                "score_line": "i2 %(time)f %(duration)f 7000 %(octave)d.%(note)s %(octave)d.%(note)s 0 6",
+            "bassline": {  # Instrument 'melody'
+                "score_line": "i1 %(time)f %(duration)f 10000 %(octave)d.%(note)s",
+                "octave": 6,
                 "grammars": {  # Notes for this instrument to use in this piece
-                    "u": ["I V V V I I IV u u", "I IV u u", "I VII IV u u"  , "e"],
+                    "u": ["I,/2 z/2 I,/2 z/2 I,/2 z/2 V,/2 z/2 u u", "e"],
                     "e": [""],
                 },
                 "score": "u u u u u",
             },
-            "rhythm": {
-                "score_line": "i2 %(time)f %(duration)f 7000 %(octave)d.%(note)s %(octave)d.%(note)s 0 6",
-                "grammars": {
-                    "u": ['"I" "ii"/4 "ii"/4 "IV"/2 "V"2 "IV" "I" u u', '"I" "vii" "IV" u u', '"I" "v" "IV" u u', "e"],
-#                    "u": ['"i" "I" "ii" "II" "v" "V" u', "e"],
-                    "e": [""]
-                },
-                "score": "u u u",
-            },
-        },
-        "b": {
-            "melody": {  # Instrument 'melody'
-                "score_line": "i2 %(time)f %(duration)f 7000 %(octave)d.%(note)s %(octave)d.%(note)s 0 6",
-                "grammars": {  # Notes for this instrument to use in this piece
-                    "u": ["I V I I/2 IV/2 u u", "I2 IV u u", "I IV IV VI V u u" , "e"],
-                    "e": [""],
-                },
-                "score": "u u u",
-            },
-            "rhythm": {
-                "score_line": "i2 %(time)f %(duration)f 7000 %(octave)d.%(note)s %(octave)d.%(note)s 0 6",
-                "grammars": {
-                    "u": ['"I" "IV"/2 "V"2 "IV" "I" u u', '"I" "VII" "IV" u u', '"I" "V" "IV" u u', "e"],
-                    "e": [""]
-                },
-                "score": "u u u",
-            },
         },
     }
 
     max_t = 0  # max time encountered so far. Used for movement timing
-    progression = "a b"
+    progression = "a"
     for comp_name in progression.split():
         instr_start_time = max_t
         for instr_name, instr in composition[comp_name].iteritems():
             generated_score = generate_score(instr["score"], instr["grammars"])  # Fill in the scores by generating them based on the grammars
-            score = parse.parse(generated_score)  # Return Node/Chord objects
+            score = parse.parse(generated_score, default_octave=instr["octave"])  # Return Node/Chord objects
 
             # Generate timestamps for the notes 
             t = instr_start_time
             for note in range(len(score)):
                 score[note].time = t
@@ -71,11 +44,13 @@
                 t += score[note].duration
                 max_t = t if t > max_t else max_t
             composition[comp_name][instr_name]["score"] = score
 
     # Must be done after all note times keyed in, else you can't coordinate melodies with the rhythm chords
-    print "f1  0   256 10  1 0 3   ; sine wave function table"
+    print "f1  0  512  10  1"
+#    print "f1  0   513 9 1 1 0 3 .33 180 5 .2 0 7 .143 180 9 .111 0"
+#    print "f2 0 8192 10 .24 .64 .88 .76 ,96 .5 .24 .08"
     for comp_name in progression.split():
         for instr_name, instr in composition[comp_name].iteritems():
             composition[comp_name][instr_name]["score"] = transliterate_score(composition[comp_name][instr_name]["score"], key)
 #            print "\nMovement %s instrument %s" % (comp_name, instr_name)
 #            print composition[comp_name][instr_name]["score"] 
@@ -164,11 +139,11 @@
                 note = csound_note_values[note]
 #                csound_score.append("i2 %(time)f %(duration)f 7000 %(octave)d.%(note)s %(octave)d.%(note)s 0 6" % {"time": token.time, "octave": random.choice([7,8]), "note": note, "duration": token.duration})
                 csound_score.append(score_line % {"time": token.time, "octave": random.choice([7,8]), "note": note, "duration": token.duration})
         elif isinstance(token, parse.Note):  # Individual notes
             note = csound_note_values[token.value]
-            csound_score.append(score_line % {"time": token.time, "octave": random.choice([8,9]), "note": note, "duration": token.duration})
+            csound_score.append(score_line % {"time": token.time, "octave": token.octave, "note": note, "duration": token.duration})
 #            csound_score.append("i2 %(time)f %(duration)f 7000 %(octave)d.%(note)s %(octave)d.%(note)s 0 6" % {"time": token.time, "octave": random.choice([8,9]), "note": note, "duration": token.duration})
     return csound_score
 
 
 if __name__ == "__main__": main()