@@ -10,20 +10,21 @@
 def main():
     key = "A"
 
     composition = {
         "a": {  # Movement block 'a' for reuse throughout the piece
-#            "melody": {  # Instrument 'melody'
-#                "csound_parameters": {
-#                    "instrument": 1,
-#                },
-#                "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"],
-#                    "e": [""],
-#                },
-#                "score": "u u u",
-#            },
+            "melody": {  # Instrument 'melody'
+                "csound_parameters": {
+                    "instrument": 1,
+                },
+                "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 I I I u u", "e"],
+                    "e": [""],
+                },
+                "score": "u u u u u",
+            },
             "rhythm": {
                 "csound_parameters": {
                     "instrument": 1,
                 },
                 "grammars": {
@@ -32,50 +33,56 @@
                     "e": [""]
                 },
                 "score": "u u u",
             },
         },
-#        "b": {
-#            "melody": {  # Instrument 'melody'
-#                "csound_parameters": {
-#                    "instrument": 1,
-#                },
-#                "grammars": {  # Notes for this instrument to use in this piece
-#                    "u": ["I V I I/2 IV/2 u u", "I4 IV u u", "I IV IV VI V u u"  , "e"],
-#                    "e": [""],
-#                },
-#                "score": "u u u",
-#            },
-#            "rhythm": {
-#                "csound_parameters": {
-#                    "instrument": 1,
-#                },
-#                "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",
-#            },
-#        },
-    }
-
-    for comp_name, comp in composition.iteritems():
-        for instr_name, instr in comp.iteritems():
-            generated_score = generate_score(instr["score"], instr["grammars"])  # Fill in the scores by generating them based on the grammars
-#                composition[comp_name][instr_name][grammar]["score"] = parse.parse(generate_score)  # Return Node/Chord objects
+        "b": {
+            "melody": {  # Instrument 'melody'
+                "csound_parameters": {
+                    "instrument": 1,
+                },
+                "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"],
+#                    "u": ["I IV I V u u u", "e"],
+                    "e": [""],
+                },
+                "score": "u u u",
+            },
+            "rhythm": {
+                "csound_parameters": {
+                    "instrument": 1,
+                },
+                "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"
+    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
 
             # Generate timestamps for the notes 
-            t = 0
+            t = instr_start_time
             for note in range(len(score)):
                 score[note].time = t
                 t += score[note].duration
+                max_t = t if t > max_t else max_t
+#                print "end note,", max_t
             composition[comp_name][instr_name]["score"] = score
+#            print "end instr,", max_t
 
-    # Must be done after all note times keyed in, else you c,an't coordinate melodies with the rhythm chords
-    for comp_name, comp in composition.iteritems():
-        for instr_name, instr in comp.iteritems():
+    # Must be done after all note times keyed in, else you can't coordinate melodies with the rhythm chords
+    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"] 
             print "f1  0   256 10  1 0 3   ; sine wave function table"
             final_score = generate_csound_score(composition[comp_name][instr_name]["score"])
@@ -100,11 +107,11 @@
         for key,value in grammars.iteritems():
             if score.find(key) != -1:
                 found_substitution = True
                 while score.find(key) != -1:
                     score = score.replace(key, random.choice(grammars[key]), 1)
-                    if len(score.split()) > 200:
+                    if len(score.split()) > 20:
                         score = score.replace("u", "")
                         score = score.replace("e", "")
                         return score
         if found_substitution is False:
             break
@@ -152,21 +159,18 @@
         "G#": "08",
         "A": "09",
         "A#": "10",
         "B": "11",
     }
-    t = 0 
     csound_score = []
     for token in score:
         if isinstance(token, parse.Chord):  # Chords
             for note in token.chord: 
                 note = csound_note_values[note]
-                csound_score.append("i2 %(time)f 1 7000 %(octave)d.%(note)s %(octave)d.%(note)s 0 6" % {"time": t, "octave": random.choice([7,8]), "note": note})
-            t += 1
+                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})
         else:  # Individual notes
             note = csound_note_values[token.value]
-            csound_score.append("i2 %(time)f 1 7000 %(octave)d.%(note)s %(octave)d.%(note)s 0 6" % {"time": t, "octave": random.choice([8,9]), "note": note})
-            t += .25
+            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()