Voice Leading

tests/test_electric_voicing.py

@@ -7,7 +7,7 @@ import unittest.mock
 import generator.arrange.form
 import generator.arrange.generate
 import generator.electric
-import generator.guitar
+import generator.fretboard
 import generator.harmony
 import generator.model
 import generator.musicxml
@@ -17,9 +17,9 @@ def harmony(symbol, onset=0):
   return generator.harmony.parse_symbol(symbol) | {'id': f'chord-{onset}', 'onset': generator.model.rational(onset)}
 
 def note(identifier, onset, chord, frets, *, melody=False, duration=1):
-  tuning = dict(generator.guitar.STANDARD_TUNING)
-  positions = tuple(generator.guitar.TabPosition(string, fret, tuning[string] + fret) for string, fret in zip((4, 3, 2, 1), frets))
-  pitches = generator.guitar.chord_pitches(chord, positions)
+  tuning = dict(generator.fretboard.STANDARD_TUNING)
+  positions = tuple(generator.fretboard.TabPosition(string, fret, tuning[string] + fret) for string, fret in zip((4, 3, 2, 1), frets))
+  pitches = generator.fretboard.chord_pitches(chord, positions)
   result = generator.model.make_event(identifier, fractions.Fraction(onset), fractions.Fraction(duration), 'note', pitches)
   result.update(_harmony=chord, _guitar_profile='electric')
   if melody: