diff --git a/voicing.py b/voicing.py index fe18a28..f8685e5 100644 --- a/voicing.py +++ b/voicing.py @@ -193,7 +193,7 @@ def voiceProgression(key, chordProgression): return list(reversed(ret)), totalCost -def generateScore(chords, lengths=None, ts="4/4"): +def generateScore(chords, lengths=None, ts="4/4", key='C'): """Generates a four-part score from a sequence of chords. Soprano and alto parts are displayed on the top (treble) clef, while tenor @@ -215,8 +215,8 @@ def generateScore(chords, lengths=None, ts="4/4"): voices[2].append(tenor) voices[3].append(bass) - female = Part([TrebleClef(), TimeSignature(ts), voices[0], voices[1]]) - male = Part([BassClef(), TimeSignature(ts), voices[2], voices[3]]) + female = Part([TrebleClef(), TimeSignature(ts), Key(key), voices[0], voices[1]]) + male = Part([BassClef(), TimeSignature(ts), Key(key), voices[2], voices[3]]) score = Score([female, male]) return score @@ -241,7 +241,7 @@ def generateChorale(chorale, lengths=None, ts="4/4"): for key, chords in lines: phrase, _ = voiceProgression(key, chords) progression.extend(phrase) - score = generateScore(progression, lengths, ts) + score = generateScore(progression, lengths, ts, key) return score