Generation

generator/engraving/pipeline.py

@@ -17,6 +17,7 @@ import generator.engraving.audit
 import generator.engraving.cache
 import generator.engraving.fonts
 import generator.engraving.layout
+import generator.engraving.notation
 import generator.engraving.raster
 import generator.engraving.types
 import generator.engraving.validation
@@ -111,6 +112,7 @@ def engrave_group(notation, paths, root, font_path, cache_dir, fingerprint, prog
   family = generator.engraving.fonts.Fonts(font_path)
   style = generator.engraving.types.Style()
   systems = None
+  index = None
   scores = {}
   audited = set()
   result = GroupResult()
@@ -132,10 +134,12 @@ def engrave_group(notation, paths, root, font_path, cache_dir, fingerprint, prog
           else:
             if systems is None:
               started = time.monotonic()
-              systems = generator.engraving.layout.layout_systems(document, style, family)
+              generator.model.validate_document(document)
+              index = generator.engraving.notation.ScoreIndex(document)
+              systems = generator.engraving.layout.layout_systems(document, style, family, index=index)
               result.timings['layout'] += time.monotonic() - started
             started = time.monotonic()
-            pages_layout = generator.engraving.layout.paginate(systems, document, family, style)
+            pages_layout = generator.engraving.layout.paginate(systems, document, family, style, index=index)
             placement = tuple((page.width, page.height, tuple((system.start, system.end, system.box) for system in page.systems)) for page in pages_layout)
             if placement not in audited:
               layout = generator.engraving.types.LayoutDocument(pages_layout, style, fingerprint)