Cleaned up music.py files.

trevorbaca · Mar 31, 2024 · 63fccb8 · 63fccb8
1 parent 7df898f
commit 63fccb8
Show file tree

Hide file tree

Showing 25 changed files with 879 additions and 879 deletions.
diff --git a/faberge/builds/a4-parts/cello/layout.py b/faberge/builds/a4-parts/cello/layout.py
@@ -11,88 +11,88 @@ def main():
     y_offset_6 = 152
     y_offset_7 = 180
     y_offset_8 = 208
-    layout = baca.make_layout(
-        baca.page(
+    layout = baca.layout.layout(
+        baca.layout.page(
             1,
-            # baca.system(measure=1, y_offset=57, distances=distances),
-            baca.system(measure=1, y_offset=y_offset_3, distances=distances),
-            baca.system(measure=9, y_offset=y_offset_4, distances=distances),
-            baca.system(measure=17, y_offset=y_offset_5, distances=distances),
-            baca.system(measure=25, y_offset=y_offset_6, distances=distances),
-            baca.system(measure=33, y_offset=y_offset_7, distances=distances),
-            baca.system(measure=41, y_offset=y_offset_8, distances=distances),
+            # baca.layout.System(1, y_offset=57, distances=distances),
+            baca.layout.System(1, y_offset=y_offset_3, distances=distances),
+            baca.layout.System(9, y_offset=y_offset_4, distances=distances),
+            baca.layout.System(17, y_offset=y_offset_5, distances=distances),
+            baca.layout.System(25, y_offset=y_offset_6, distances=distances),
+            baca.layout.System(33, y_offset=y_offset_7, distances=distances),
+            baca.layout.System(41, y_offset=y_offset_8, distances=distances),
         ),
-        baca.page(
+        baca.layout.page(
             2,
-            baca.system(measure=49, y_offset=y_offset_1, distances=distances),
-            baca.system(measure=57, y_offset=y_offset_2, distances=distances),
-            baca.system(measure=65, y_offset=y_offset_3, distances=distances),
-            baca.system(measure=73, y_offset=y_offset_4, distances=distances),
-            baca.system(measure=81, y_offset=y_offset_5, distances=distances),
-            baca.system(measure=89, y_offset=y_offset_6, distances=distances),
-            baca.system(measure=97, y_offset=y_offset_7, distances=distances),
-            baca.system(measure=105, y_offset=y_offset_8, distances=distances),
+            baca.layout.System(49, y_offset=y_offset_1, distances=distances),
+            baca.layout.System(57, y_offset=y_offset_2, distances=distances),
+            baca.layout.System(65, y_offset=y_offset_3, distances=distances),
+            baca.layout.System(73, y_offset=y_offset_4, distances=distances),
+            baca.layout.System(81, y_offset=y_offset_5, distances=distances),
+            baca.layout.System(89, y_offset=y_offset_6, distances=distances),
+            baca.layout.System(97, y_offset=y_offset_7, distances=distances),
+            baca.layout.System(105, y_offset=y_offset_8, distances=distances),
         ),
-        baca.page(
+        baca.layout.page(
             3,
-            baca.system(measure=113, y_offset=y_offset_1, distances=distances),
-            baca.system(measure=121, y_offset=y_offset_2, distances=distances),
-            baca.system(measure=129, y_offset=y_offset_3, distances=distances),
-            baca.system(measure=137, y_offset=y_offset_4, distances=distances),
-            baca.system(measure=145, y_offset=y_offset_5, distances=distances),
-            baca.system(measure=153, y_offset=y_offset_6, distances=distances),
-            baca.system(measure=157, y_offset=y_offset_7, distances=distances),
-            baca.system(measure=162, y_offset=y_offset_8, distances=distances),
+            baca.layout.System(113, y_offset=y_offset_1, distances=distances),
+            baca.layout.System(121, y_offset=y_offset_2, distances=distances),
+            baca.layout.System(129, y_offset=y_offset_3, distances=distances),
+            baca.layout.System(137, y_offset=y_offset_4, distances=distances),
+            baca.layout.System(145, y_offset=y_offset_5, distances=distances),
+            baca.layout.System(153, y_offset=y_offset_6, distances=distances),
+            baca.layout.System(157, y_offset=y_offset_7, distances=distances),
+            baca.layout.System(162, y_offset=y_offset_8, distances=distances),
         ),
-        baca.page(
+        baca.layout.page(
             4,
-            baca.system(measure=167, y_offset=y_offset_1, distances=distances),
-            baca.system(measure=171, y_offset=y_offset_2, distances=distances),
-            baca.system(measure=175, y_offset=y_offset_3, distances=distances),
-            baca.system(measure=179, y_offset=y_offset_4, distances=distances),
-            baca.system(measure=183, y_offset=y_offset_5, distances=distances),
-            baca.system(measure=187, y_offset=y_offset_6, distances=distances),
-            baca.system(measure=191, y_offset=y_offset_7, distances=distances),
-            baca.system(measure=195, y_offset=y_offset_8, distances=distances),
+            baca.layout.System(167, y_offset=y_offset_1, distances=distances),
+            baca.layout.System(171, y_offset=y_offset_2, distances=distances),
+            baca.layout.System(175, y_offset=y_offset_3, distances=distances),
+            baca.layout.System(179, y_offset=y_offset_4, distances=distances),
+            baca.layout.System(183, y_offset=y_offset_5, distances=distances),
+            baca.layout.System(187, y_offset=y_offset_6, distances=distances),
+            baca.layout.System(191, y_offset=y_offset_7, distances=distances),
+            baca.layout.System(195, y_offset=y_offset_8, distances=distances),
         ),
-        baca.page(
+        baca.layout.page(
             5,
-            baca.system(measure=199, y_offset=y_offset_1, distances=distances),
-            baca.system(measure=203, y_offset=y_offset_2, distances=distances),
-            baca.system(measure=207, y_offset=y_offset_3, distances=distances),
-            baca.system(measure=211, y_offset=y_offset_4, distances=distances),
-            baca.system(measure=215, y_offset=y_offset_5, distances=distances),
-            baca.system(measure=219, y_offset=y_offset_6, distances=distances),
-            baca.system(measure=223, y_offset=y_offset_7, distances=distances),
-            baca.system(measure=226, y_offset=y_offset_8, distances=distances),
+            baca.layout.System(199, y_offset=y_offset_1, distances=distances),
+            baca.layout.System(203, y_offset=y_offset_2, distances=distances),
+            baca.layout.System(207, y_offset=y_offset_3, distances=distances),
+            baca.layout.System(211, y_offset=y_offset_4, distances=distances),
+            baca.layout.System(215, y_offset=y_offset_5, distances=distances),
+            baca.layout.System(219, y_offset=y_offset_6, distances=distances),
+            baca.layout.System(223, y_offset=y_offset_7, distances=distances),
+            baca.layout.System(226, y_offset=y_offset_8, distances=distances),
         ),
-        baca.page(
+        baca.layout.page(
             6,
-            baca.system(measure=230, y_offset=y_offset_1, distances=distances),
-            baca.system(measure=234, y_offset=y_offset_2, distances=distances),
-            baca.system(measure=239, y_offset=y_offset_3, distances=distances),
-            baca.system(measure=243, y_offset=y_offset_4, distances=distances),
-            baca.system(measure=247, y_offset=y_offset_5, distances=distances),
-            baca.system(measure=250, y_offset=y_offset_6, distances=distances),
-            baca.system(measure=255, y_offset=y_offset_7, distances=distances),
-            baca.system(measure=259, y_offset=y_offset_8, distances=distances),
+            baca.layout.System(230, y_offset=y_offset_1, distances=distances),
+            baca.layout.System(234, y_offset=y_offset_2, distances=distances),
+            baca.layout.System(239, y_offset=y_offset_3, distances=distances),
+            baca.layout.System(243, y_offset=y_offset_4, distances=distances),
+            baca.layout.System(247, y_offset=y_offset_5, distances=distances),
+            baca.layout.System(250, y_offset=y_offset_6, distances=distances),
+            baca.layout.System(255, y_offset=y_offset_7, distances=distances),
+            baca.layout.System(259, y_offset=y_offset_8, distances=distances),
         ),
-        baca.page(
+        baca.layout.page(
             7,
-            baca.system(measure=263, y_offset=y_offset_1, distances=distances),
-            baca.system(measure=267, y_offset=y_offset_2, distances=distances),
-            baca.system(measure=271, y_offset=y_offset_3, distances=distances),
-            baca.system(measure=275, y_offset=y_offset_4, distances=distances),
-            baca.system(measure=279, y_offset=y_offset_5, distances=distances),
-            baca.system(measure=283, y_offset=y_offset_6, distances=distances),
+            baca.layout.System(263, y_offset=y_offset_1, distances=distances),
+            baca.layout.System(267, y_offset=y_offset_2, distances=distances),
+            baca.layout.System(271, y_offset=y_offset_3, distances=distances),
+            baca.layout.System(275, y_offset=y_offset_4, distances=distances),
+            baca.layout.System(279, y_offset=y_offset_5, distances=distances),
+            baca.layout.System(283, y_offset=y_offset_6, distances=distances),
         ),
-        spacing=(1, 16),
-        overrides=(
-            baca.region((157, 265), (1, 20)),
-            baca.region([193, 196, 211, 216, 223, 227], (1, 4)),
+        default_spacing=(1, 16),
+        spacing_overrides=(
+            baca.layout.Override((157, 265), (1, 20)),
+            baca.layout.Override([193, 196, 211, 216, 223, 227], (1, 4)),
         ),
     )
-    baca.section.make_layout_ly(layout)
+    baca.section.write_layout_ly(layout)
 
 
 if __name__ == "__main__":