@@ -13,81 +13,204 @@
     bps = 60/60
     tempo = 1/bps
     max_duration = 1
 
     composition = {
+        "intro1": {
+            "rhythm": {
+                "score_line": "i1 %(time)f %(duration)f 7000 %(octave)d.%(note)s %(octave)d.%(note)s 0 6",
+                "octave": 7,
+                "duration": 4,
+                "grammars": {
+                    "u": ['"I" "ii"/4 "ii"/4 "IV"/2 "V"2 "IV" "ii" x u', '"I" "vii" "III" y u', '"I" "v" "IV" u u'],
+                    "w": ['"i" "VII"2 "VI"/4 "V"/4 "i"/4 "VII"2 "VI" "V" w u'],
+                    "x": ['"III/2" "VI"/2 "III"/2 "vii"2 "i"2 "V" u'],
+                    "y": ['"I" "vi"2 "IV" "V" y y u'],
+                },
+                "score": "u x u y x w u",
+            },
+        },
+        "intro2": {
+            "rhythm": {
+                "score_line": "i1 %(time)f %(duration)f 7000 %(octave)d.%(note)s %(octave)d.%(note)s 0 6",
+                "octave": 7,
+                "duration": 6,
+                "grammars": {
+                    "u": ['"I" "ii"/4 "ii"/4 "IV"/2 "V"2 "IV" "ii" x u', '"I" "vii" "III" y u', '"I" "v" "IV" u u'],
+                    "w": ['"i" "VII"2 "VI"/4 "V"/4 "i"/4 "VII"2 "VI" "V" w u'],
+                    "x": ['"III/2" "VI"/2 "III"/2 "vii"2 "i"2 "V" u'],
+                    "y": ['"I" "vi"2 "IV" "V" y y u'],
+                },
+                "score": "u x u y x w u",
+            },
+            "timbre": {
+                "score_line": "i3 %(time)f %(duration)f 2000 %(octave)d.%(note)s 2 3 5 3",
+                "octave": 6,
+                "duration": 6,
+                "grammars": {  # Notes for this instrument to use in this piece
+                    "u": ['I2 VII2 V2 VI2 I2 IV/2 V/2 III2 u', 'I2 IV2 V2 IV I V2 III2 II2 u']
+                },
+                "score": "u u u u u",
+            },
+        },
         "a": {  # Movement block 'a' for reuse throughout the piece
-#            "melody": {  # Instrument 'melody'
-#                "score_line": "i2 %(time)f %(duration)f 7000 %(octave)d.%(note)s 2",
-#                "octave": 8,
-#                "duration": 40,
-#                "grammars": {  # Notes for this instrument to use in this piece
-#                    "u": ["I V/2 V/2 V/2 I VII, IV' x u", "I IV w w", "I VII IV u u"],
-#                    "w": ['VII I IV V VI u', 'w w'],
-#                    "x": ['VI/4 III/4 II/4 I/4 w', 'x x'],
-#                },
-#                "score": "u",
-#            },
-#            "rhythm": {
-#                "score_line": "i1 %(time)f %(duration)f 7000 %(octave)d.%(note)s %(octave)d.%(note)s 0 6",
-#                "octave": 7,
-#                "duration": 50,
-#                "grammars": {
-#                    "u": ['"I" "ii"/4 "ii"/4 "IV"/2 "V"2 "IV" "ii" x u', '"I" "vii" "III" y u', '"I" "v" "IV" u u'],
-#                    "w": ['"i" "VII"2 "VI"/4 "V"/4 "i"/4 "VII"2 "VI" "V" w u'],
-#                    "x": ['"III/2" "VI"/2 "III"/2 "vii"2 "i"2 "V" u'],
-#                    "y": ['"I" "vi"2 "IV" "V" y y u'],
-#                },
-#                "score": "u x u y x w u",
-#            },
-            "timbre": {
-                "score_line": "i3 %(time)f %(duration)f 5000 %(octave)d.%(note)s 2 3 5 3",
-                "octave": 5,
+            "melody": {  # Instrument 'melody'
+                "score_line": "i2 %(time)f %(duration)f 7000 %(octave)d.%(note)s 2",
+                "octave": 8,
                 "duration": 40,
                 "grammars": {  # Notes for this instrument to use in this piece
-                    "u": ['I2 I2 V VI I/2 IV/2 "V"2 "I"2']
+                    "u": ["I V/2 V/2 V/2 I VII, IV' x u", "I IV w w", "I VII IV u u"],
+                    "w": ['VII I IV V VI VII I IV V VI VII u', 'x'],
+                    "x": ['VI/4 III/4 II/4 I/4 w', 'x x'],
+                },
+                "score": "u",
+            },
+            "rhythm": {
+                "score_line": "i1 %(time)f %(duration)f 7000 %(octave)d.%(note)s %(octave)d.%(note)s 0 6",
+                "octave": 7,
+                "duration": 48,
+                "grammars": {
+                    "u": ['"I" "ii"/4 "ii"/4 "IV"/2 "V"2 "IV" "ii" x u', '"I" "vii" "III" y u', '"I" "v" "IV" u u'],
+                    "w": ['"i" "VII"2 "VI"/4 "V"/4 "i"/4 "VII"2 "VI" "V" w u'],
+                    "x": ['"III/2" "VI"/2 "III"/2 "vii"2 "i"2 "V" u'],
+                    "y": ['"I" "vi"2 "IV" "V" y y u'],
+                },
+                "score": "u x u y x w u",
+            },
+            "timbre": {
+                "score_line": "i3 %(time)f %(duration)f 2000 %(octave)d.%(note)s 2 3 5 3",
+                "octave": 6,
+                "duration": 42,
+                "grammars": {  # Notes for this instrument to use in this piece
+                    "u": ['I2 VII2 V2 VI2 I2 IV/2 V/2 III2 u', 'I2 IV2 V2 IV I V2 III2 II2 u']
                 },
                 "score": "u u u u u",
             },
         },
         "b": {  # Movement block 'a' for reuse throughout the piece
             "melody": {  # Instrument 'melody'
                 "score_line": "i2 %(time)f %(duration)f 7000 %(octave)d.%(note)s 2",
                 "octave": 8,
-                "duration": 20,
+                "duration": 40,
                 "grammars": {  # Notes for this instrument to use in this piece
                     "u": ['I VII V III u', "y"],
-                    "w": ['VII I IV V VI u', 'w w'],
+                    "w": ['VII I IV V VI u', 'w'],
                     "x": ['VI/4 III/4 II/4 I/4 w', 'x x'],
                     "y": ["III/4 VI/4 II/4 V/4 VI/4 IV/4 VII2"],
                 },
                 "score": "w w x x w",
             },
             "rhythm": {
                 "score_line": "i1 %(time)f %(duration)f 7000 %(octave)d.%(note)s %(octave)d.%(note)s 0 6",
                 "octave": 7,
-                "duration": 24,
+                "duration": 44,
                 "grammars": {
                     "u": ['"I" "V" "vi" "iii" "IV" "I" "IV" "V" u u', "y"],
                     "y": ['"I" "vi"2 "IV" "V" y y u'],
                 },
                 "score": "u u y y u",
             },
+            "timbre": {
+                "score_line": "i3 %(time)f %(duration)f 2000 %(octave)d.%(note)s 2 3 5 3",
+                "octave": 6,
+                "duration": 40,
+                "grammars": {  # Notes for this instrument to use in this piece
+                    "u": ['I2 VII2 V2 VI2 I2 IV/2 V/2 III2 u', 'I2 IV2 V2 IV I V2 III2 II2 u']
+                },
+                "score": "u u u u u",
+            },
+        },
+        "zelda1": {  # Movement block 'a' for reuse throughout the piece
+            "melody": {  # Instrument 'melody'
+                "score_line": "i2 %(time)f %(duration)f 7000 %(octave)d.%(note)s 2",
+                "octave": 8,
+                "duration": 40,
+                "grammars": {  # Notes for this instrument to use in this piece
+                    "u": ['I VI/2 VI/2 IV/2 u', "y"],
+                    "w": ['VII/2 I/2 II/2 V/2 u', 'w w', 'u w'],
+                    "x": ['VI/4 III/4 II/4 I/4 w', 'x x', 'x u'],
+                    "y": ["III/4 VI/4 II/4 V/4 VI/4 IV/4 VII2", 'y y'],
+                },
+                "score": "w x w",
+            },
+            "rhythm": {
+                "score_line": "i1 %(time)f %(duration)f 7000 %(octave)d.%(note)s %(octave)d.%(note)s 0 6",
+                "octave": 7,
+                "duration": 40,
+                "grammars": {
+                    "u": ['"I"/2 "V"/2 "vi"/2 "iii"/2 "IV"/2 "I"/2 "IV"/2 "V"/2 u u', "y"],
+                    "y": ['"I"/2 "vi" "IV"/2 "V"/2 y y u'],
+                },
+                "score": "u u y y u",
+            },
+            "timbre": {
+                "score_line": "i3 %(time)f %(duration)f 2000 %(octave)d.%(note)s 2 3 5 3",
+                "octave": 6,
+                "duration": 40,
+                "grammars": {  # Notes for this instrument to use in this piece
+                    "u": ['I2 VII2 V2 VI2 I2 IV/2 V/2 III2 u', 'I2 IV2 V2 IV I V2 III2 II2 u']
+                },
+                "score": "u u u u u",
+            },
         },
-        "c": {  # Movement block 'a' for reuse throughout the piece
+        "zelda2": {  # Movement block 'a' for reuse throughout the piece
             "melody": {  # Instrument 'melody'
                 "score_line": "i2 %(time)f %(duration)f 7000 %(octave)d.%(note)s 2",
                 "octave": 8,
+                "duration": 40,
+                "grammars": {  # Notes for this instrument to use in this piece
+                    "u": ['I/2 I/2 VI IV/2 V2 z I/2 I/2 VI IV/2 V u', "w"],
+                    "w": ['III/2 II/2 IV/2 III/2 V/2 IV/2 VI/2 V/2 w', 'u', 'x'],
+                    "x": ['VII3 z2 V/4 IV/4 V/4 IV/4 V/4 VI/4 II/4 II/4 II/4 u', 'w'],
+                },
+                "score": "u",
+            },
+            "rhythm": {
+                "score_line": "i1 %(time)f %(duration)f 7000 %(octave)d.%(note)s %(octave)d.%(note)s 0 6",
+                "octave": 7,
+                "duration": 40,
+                "grammars": {
+                    "u": ['"I"/2 "V"/2 "vi"/2 "iii"/2 "IV"/2 "I"/2 "IV"/2 "V"/2 u u', "y"],
+                    "y": ['"I"/2 "vi" "IV"/2 "V"/2 y y u'],
+                },
+                "score": "u u y y u",
+            },
+            "timbre": {
+                "score_line": "i3 %(time)f %(duration)f 2000 %(octave)d.%(note)s 2 3 5 3",
+                "octave": 6,
+                "duration": 40,
+                "grammars": {  # Notes for this instrument to use in this piece
+                    "u": ['I2 VII2 V2 VI2 I2 IV/2 V/2 III2 u', 'I2 IV2 V2 IV I V2 III2 II2 u']
+                },
+                "score": "u u u u u",
+            },
+        },
+        "d": {  # Movement block 'a' for reuse throughout the piece
+            "rhythm": {
+                "score_line": "i1 %(time)f %(duration)f 7000 %(octave)d.%(note)s %(octave)d.%(note)s 0 6",
+                "octave": 7,
+                "duration": 20,
+                "grammars": {
+                    "u": ['"I"/2 "V"/2 "vi"/2 "iii"/2 "IV"/2 "I"/2 "IV"/2 "V"/2 u u', "y"],
+                    "y": ['"I"/2 "vi" "IV"/2 "V"/2 y y u'],
+                },
+                "score": "u u y y u",
+            },
+            "timbre": {
+                "score_line": "i3 %(time)f %(duration)f 2000 %(octave)d.%(note)s 2 3 5 3",
+                "octave": 6,
                 "duration": 20,
                 "grammars": {  # Notes for this instrument to use in this piece
                     "u": ['I VI/2 VI/2 IV/2 u', "y"],
-                    "w": ['VII/2 I/2 II/2 V/2 u', 'w w'],
-                    "x": ['VI/4 III/4 II/4 I/4 w', 'x x'],
-                    "y": ["III/4 VI/4 II/4 V/4 VI/4 IV/4 VII2"],
+                    "w": ['VII/2 I/2 II/2 V/2 u', 'w w', 'u w'],
+                    "x": ['VI/4 III/4 II/4 I/4 w', 'x x', 'x u'],
+                    "y": ["III/4 VI/4 II/4 V/4 VI/4 IV/4 VII2", 'y y'],
                 },
-                "score": "w w x x w",
+                "score": "w x w",
             },
+        },
+        "e": {  # Movement block 'a' for reuse throughout the piece
             "rhythm": {
                 "score_line": "i1 %(time)f %(duration)f 7000 %(octave)d.%(note)s %(octave)d.%(note)s 0 6",
                 "octave": 7,
                 "duration": 20,
                 "grammars": {
@@ -94,12 +217,22 @@
                     "u": ['"I"/2 "V"/2 "vi"/2 "iii"/2 "IV"/2 "I"/2 "IV"/2 "V"/2 u u', "y"],
                     "y": ['"I"/2 "vi" "IV"/2 "V"/2 y y u'],
                 },
                 "score": "u u y y u",
             },
+            "timbre": {
+                "score_line": "i3 %(time)f %(duration)f 2000 %(octave)d.%(note)s 2 3 5 3",
+                "octave": 6,
+                "duration": 20,
+                "grammars": {  # Notes for this instrument to use in this piece
+                    "u": ['I2 VII2 V2 VI2 I2 IV/2 V/2 III2 u', 'I2 IV2 V2 IV I V2 III2 II2 w'],
+                    "w": ['I/2 VII/4 IV/4 VI/2 V w', ''],
+                },
+                "score": "u w u",
+            },
         },
-        "d": {  # Movement block 'a' for reuse throughout the piece
+        "outro": {  # Movement block 'a' for reuse throughout the piece
             "melody": {  # Instrument 'melody'
                 "score_line": "i2 %(time)f %(duration)f 7000 %(octave)d.%(note)s 2",
                 "octave": 8,
                 "duration": 20,
                 "grammars": {  # Notes for this instrument to use in this piece
@@ -111,22 +244,32 @@
                 "score": "w w x x w",
             },
             "rhythm": {
                 "score_line": "i1 %(time)f %(duration)f 7000 %(octave)d.%(note)s %(octave)d.%(note)s 0 6",
                 "octave": 7,
-                "duration": 24,
+                "duration": 26,
                 "grammars": {
                     "u": ['"I" "V" "vi" "iii" "IV" "I" "IV" "V" u u', "y"],
                     "y": ['"I" "vi"2 "IV" "V" y y u'],
                 },
                 "score": "u u y y u",
             },
+            "timbre": {
+                "score_line": "i3 %(time)f %(duration)f 2000 %(octave)d.%(note)s 2 3 5 3",
+                "octave": 6,
+                "duration": 30,
+                "grammars": {  # Notes for this instrument to use in this piece
+                    "u": ['I2 VII2 V2 VI2 I2 IV/2 V/2 III2 u', 'I2 IV2 V2 IV I V2 III2 II2 u']
+                },
+                "score": "u u u u u",
+            },
         },
     }
 
     max_t = 0  # max time encountered so far. Used for movement timing
-    progression = "a b c d"
+    progression = "intro1 intro2 a b zelda1 zelda2 d e outro"
+#    progression = "zelda2"
     for comp_name in progression.split():
         comp_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
 #            print generated_score