Index: cfg.py ================================================================== --- cfg.py +++ cfg.py @@ -10,53 +10,54 @@ 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", - }, - "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", - }, - }, - "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", - }, - }, +# "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", +# }, + "rhythm": { + "csound_parameters": { + "instrument": 1, + }, + "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' +# "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 @@ -127,11 +128,14 @@ score[i].value = scale[scale_conversion[score[i].value]-1] else: chord = [] root_note_index = scale.index(key) + scale_conversion[score[i].value] chord.append(scale[root_note_index]) - chord.append(scale[(root_note_index+3) % 8]) + if score[i].chord_type == "m": # Minor chords, flat the 3rd + chord.append(scale[(root_note_index+2) % 8]) + else: + chord.append(scale[(root_note_index+3) % 8]) chord.append(scale[(root_note_index+5) % 8]) score[i].chord = chord return score Index: parse.py ================================================================== --- parse.py +++ parse.py @@ -102,11 +102,13 @@ def p_chord(p): '''chord : QUOTE pitch QUOTE | QUOTE pitch CHORD_TYPE QUOTE ''' - p[0] = Chord(value=p[2].value) + pitch = p[2].value + pitch = pitch.upper() + p[0] = Chord(value=pitch) if len(p) > 3: p[0].chord_type = p[3] def p_accidental(p): Index: test.sco ================================================================== --- test.sco +++ test.sco @@ -0,0 +1,55 @@ +f1 0 256 10 1 0 3 ; sine wave function table +i2 0.000000 1 7000 7.11 7.11 0 6 +i2 0.000000 1 7000 7.04 7.04 0 6 +i2 0.000000 1 7000 8.08 8.08 0 6 +i2 1.000000 1 7000 8.11 8.11 0 6 +i2 1.000000 1 7000 8.04 8.04 0 6 +i2 1.000000 1 7000 8.08 8.08 0 6 +i2 2.000000 1 7000 8.01 8.01 0 6 +i2 2.000000 1 7000 8.06 8.06 0 6 +i2 2.000000 1 7000 8.09 8.09 0 6 +i2 3.000000 1 7000 7.01 7.01 0 6 +i2 3.000000 1 7000 7.06 7.06 0 6 +i2 3.000000 1 7000 8.09 8.09 0 6 +i2 4.000000 1 7000 7.06 7.06 0 6 +i2 4.000000 1 7000 7.09 7.09 0 6 +i2 4.000000 1 7000 7.01 7.01 0 6 +i2 5.000000 1 7000 8.06 8.06 0 6 +i2 5.000000 1 7000 7.09 7.09 0 6 +i2 5.000000 1 7000 7.01 7.01 0 6 +i2 6.000000 1 7000 7.11 7.11 0 6 +i2 6.000000 1 7000 7.04 7.04 0 6 +i2 6.000000 1 7000 8.08 8.08 0 6 +i2 7.000000 1 7000 8.11 8.11 0 6 +i2 7.000000 1 7000 7.04 7.04 0 6 +i2 7.000000 1 7000 7.08 7.08 0 6 +i2 8.000000 1 7000 8.01 8.01 0 6 +i2 8.000000 1 7000 8.06 8.06 0 6 +i2 8.000000 1 7000 7.09 7.09 0 6 +i2 9.000000 1 7000 8.01 8.01 0 6 +i2 9.000000 1 7000 7.06 7.06 0 6 +i2 9.000000 1 7000 8.09 8.09 0 6 +i2 10.000000 1 7000 8.06 8.06 0 6 +i2 10.000000 1 7000 7.09 7.09 0 6 +i2 10.000000 1 7000 8.01 8.01 0 6 +i2 11.000000 1 7000 8.06 8.06 0 6 +i2 11.000000 1 7000 8.09 8.09 0 6 +i2 11.000000 1 7000 8.01 8.01 0 6 +i2 12.000000 1 7000 7.11 7.11 0 6 +i2 12.000000 1 7000 7.04 7.04 0 6 +i2 12.000000 1 7000 8.08 8.08 0 6 +i2 13.000000 1 7000 7.11 7.11 0 6 +i2 13.000000 1 7000 8.04 8.04 0 6 +i2 13.000000 1 7000 7.08 7.08 0 6 +i2 14.000000 1 7000 7.01 7.01 0 6 +i2 14.000000 1 7000 7.06 7.06 0 6 +i2 14.000000 1 7000 7.09 7.09 0 6 +i2 15.000000 1 7000 8.01 8.01 0 6 +i2 15.000000 1 7000 8.06 8.06 0 6 +i2 15.000000 1 7000 7.09 7.09 0 6 +i2 16.000000 1 7000 8.06 8.06 0 6 +i2 16.000000 1 7000 8.09 8.09 0 6 +i2 16.000000 1 7000 7.01 7.01 0 6 +i2 17.000000 1 7000 7.06 7.06 0 6 +i2 17.000000 1 7000 7.09 7.09 0 6 +i2 17.000000 1 7000 7.01 7.01 0 6 Index: todo.org ================================================================== --- todo.org +++ todo.org @@ -1,8 +1,17 @@ -* Features [0/5] -- [ ] Top-down composition +* Features [1/4] +- [X] Top-down composition - [ ] Transition the melody between chords appropriately - [ ] Set maximum song length +- [ ] Need to support all chord types -* Bugs [0/1] -- [ ] Doesn't handle minor chords +* Bugs [1/5] +- [ ] TLD resets clock for each movement +- [ ] TLD doesn't accept an ordering for the movements +- [X] Doesn't handle minor chords - [ ] Duration syntax is absolute, not relative to BPM +- [ ] Chords don't respect octaves + + +* Structure [0/2] +- [ ] Chords should be composed of Notes, not ordinary arrays +- [ ] Generate score with proper generation tools