GraceHandler now generates spacer grace notes.

consort/tools/GraceHandler.py

@@ -69,6 +69,7 @@ def __init__(
     def __call__(
         self,
         logical_tie,
+        maximum_grace_count=None,
         seed=0,
         ):
         assert isinstance(logical_tie, selectiontools.LogicalTie)
@@ -94,19 +95,39 @@ def __call__(
             return
         kind = 'after'
         leaf_to_attach_to = previous_leaf
-        grace_notes = scoretools.make_notes([0], [(1, 16)] * grace_count)
-        assert len(grace_notes)
+        leaves = []
+        if maximum_grace_count:
+            skip_count = maximum_grace_count - grace_count
+            if 0 < skip_count:
+                skips = [scoretools.Skip((1, 16)) for _ in range(skip_count)]
+                leaves.extend(skips)
+        notes = scoretools.make_notes([0], [(1, 16)] * grace_count)
+        leaves.extend(notes)
+        assert len(leaves)
         grace_container = scoretools.GraceContainer(
-            grace_notes,
+            leaves,
             kind=kind,
             )
         override(grace_container).flag.stroke_style = \
             schemetools.Scheme('grace', force_quotes=True)
         override(grace_container).script.font_size = 0.5
         attach(grace_container, leaf_to_attach_to)
 
+    ### PRIVATE METHODS ###
+
+    @staticmethod
+    def _find_maximum_grace_count(segment_maker):
+        maximum_grace_count = 0
+        for music_setting in segment_maker._settings:
+            for music_specifier in music_setting.music_specifiers.values():
+                if music_specifier.grace_handler is None:
+                    continue
+                counts = max(music_specifier.grace_handler.counts)
+                maximum_grace_count = max(maximum_grace_count, counts)
+        return maximum_grace_count
+
     @staticmethod
-    def _process_session(segment_session):
+    def _process_session(segment_session, maximum_grace_count=None):
         import consort
         counter = collections.Counter()
         attack_point_map = segment_session.attack_point_map
@@ -126,7 +147,11 @@ def _process_session(segment_session):
                 seed = music_specifier.seed or 0
                 counter[music_specifier] = seed
             seed = counter[music_specifier]
-            grace_handler(logical_tie, seed=seed)
+            grace_handler(
+                logical_tie,
+                maximum_grace_count=maximum_grace_count,
+                seed=seed,
+                )
             counter[music_specifier] += 1
 
     ### PUBLIC METHODS ###

consort/tools/SegmentMaker.py

@@ -187,7 +187,12 @@ def __call__(self):
                 enter_message='GraceHandler:',
                 exit_message='\ttotal:',
                 ):
-                consort.GraceHandler._process_session(segment_session)
+                maximum_grace_count = \
+                    consort.GraceHandler._find_maximum_grace_count(self)
+                consort.GraceHandler._process_session(
+                    segment_session,
+                    maximum_grace_count,
+                    )
             with systemtools.Timer(
                 enter_message='PitchHandler:',
                 exit_message='\ttotal:',

consort/tools/test/test_GraceHandler.py

@@ -201,6 +201,8 @@ def test_GraceHandler_02():
                                     {
                                         \override Flag #'stroke-style = #"grace"
                                         \override Script #'font-size = #0.5
+                                        s16
+                                        s16
                                         c'16
                                         \revert Flag #'stroke-style
                                         \revert Script #'font-size
@@ -214,6 +216,7 @@ def test_GraceHandler_02():
                                     {
                                         \override Flag #'stroke-style = #"grace"
                                         \override Script #'font-size = #0.5
+                                        s16
                                         c'16
                                         c'16
                                         \revert Flag #'stroke-style
@@ -264,6 +267,8 @@ def test_GraceHandler_02():
                                     {
                                         \override Flag #'stroke-style = #"grace"
                                         \override Script #'font-size = #0.5
+                                        s16
+                                        s16
                                         c'16
                                         \revert Flag #'stroke-style
                                         \revert Script #'font-size
@@ -275,6 +280,7 @@ def test_GraceHandler_02():
                                     {
                                         \override Flag #'stroke-style = #"grace"
                                         \override Script #'font-size = #0.5
+                                        s16
                                         c'16
                                         c'16
                                         \revert Flag #'stroke-style
@@ -359,6 +365,8 @@ def test_GraceHandler_03():
                                     {
                                         \override Flag #'stroke-style = #"grace"
                                         \override Script #'font-size = #0.5
+                                        s16
+                                        s16
                                         c'16
                                         c'16
                                         \revert Flag #'stroke-style
@@ -414,6 +422,8 @@ def test_GraceHandler_03():
                                     {
                                         \override Flag #'stroke-style = #"grace"
                                         \override Script #'font-size = #0.5
+                                        s16
+                                        s16
                                         c'16
                                         c'16
                                         \revert Flag #'stroke-style