Cleanup

generator/arrange/generate.py

@@ -121,7 +121,7 @@ def accompaniment_notes(measure: dict, chord_symbol: str, sequence: int, *, incl
   return apply_source_chord_markers(notes, measure, include_optional=include_optional), sequence
 
 
-def slash_notes(measure: dict, chord_symbol: str, sequence: int) -> tuple[list[dict], int]:
+def slash_notes(measure: dict, chord_symbol: str, sequence: int, *, include_optional: bool = True) -> tuple[list[dict], int]:
   capacity = measure_capacity_ticks(str(measure.get("time_signature", "4/4")))
   notes: list[dict] = []
   cursor = 0
@@ -130,7 +130,7 @@ def slash_notes(measure: dict, chord_symbol: str, sequence: int) -> tuple[list[d
     duration = min(QUARTER_TICKS, capacity - cursor)
     notes.append(slash_note(f"arr-slash-{sequence}", duration))
     cursor += duration
-  return notes, sequence
+  return apply_source_chord_markers(notes, measure, include_optional=include_optional), sequence
 
 
 def rest_notes(measure: dict, chord_symbol: str, sequence: int, *, include_optional: bool = True) -> tuple[list[dict], int]:
@@ -211,7 +211,7 @@ def voice_for_section(section: ArrangementSection, measure: dict, chord_symbol:
   elif section.role == "accompaniment":
     notes, sequence = accompaniment_notes(measure, chord_symbol, sequence, include_optional=include_optional)
   elif section.role == "slash":
-    notes, sequence = slash_notes(measure, chord_symbol, sequence)
+    notes, sequence = slash_notes(measure, chord_symbol, sequence, include_optional=include_optional)
   else:
     notes, sequence = rest_notes(measure, chord_symbol, sequence, include_optional=include_optional)
   return {"id": "voice-arranged-guitar", "tuplets": [], "notes": notes}, sequence