From 63fccb8c48853890305449a036ce81cff5052e8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Trevor=20Ba=C4=8Da?= Date: Sun, 31 Mar 2024 15:30:16 -0400 Subject: [PATCH] Cleaned up music.py files. --- faberge/builds/a4-parts/cello/layout.py | 132 ++++----- faberge/builds/a4-parts/clarinet/layout.py | 172 +++++------ .../builds/a4-parts/english-horn/layout.py | 200 ++++++------- faberge/builds/a4-parts/flute/layout.py | 162 +++++------ faberge/builds/a4-parts/percussion/layout.py | 156 +++++----- faberge/builds/a4-parts/piano/layout.py | 144 +++++----- faberge/builds/a4-parts/viola/layout.py | 174 +++++------ faberge/builds/a4-parts/violin/layout.py | 174 +++++------ faberge/builds/arch-a-score/layout.py | 270 +++++++++--------- faberge/sections/01/music.py | 10 +- faberge/sections/02/music.py | 12 +- faberge/sections/03/music.py | 10 +- faberge/sections/04/music.py | 12 +- faberge/sections/05/music.py | 10 +- faberge/sections/06/music.py | 10 +- faberge/sections/07/music.py | 16 +- faberge/sections/08/music.py | 10 +- faberge/sections/09/music.py | 12 +- faberge/sections/10/music.py | 10 +- faberge/sections/11/music.py | 12 +- faberge/sections/12/music.py | 10 +- faberge/sections/13/music.py | 10 +- faberge/sections/14/music.py | 10 +- faberge/sections/15/music.py | 10 +- faberge/sections/16/music.py | 10 +- 25 files changed, 879 insertions(+), 879 deletions(-) diff --git a/faberge/builds/a4-parts/cello/layout.py b/faberge/builds/a4-parts/cello/layout.py index e00aec96a..a00fc0abb 100644 --- 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__": diff --git a/faberge/builds/a4-parts/clarinet/layout.py b/faberge/builds/a4-parts/clarinet/layout.py index a69da200c..91170484e 100644 --- a/faberge/builds/a4-parts/clarinet/layout.py +++ b/faberge/builds/a4-parts/clarinet/layout.py @@ -11,112 +11,112 @@ 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=y_offset_3, distances=distances), - baca.system(measure=7, y_offset=y_offset_4, distances=distances), - baca.system(measure=13, y_offset=y_offset_5, distances=distances), - baca.system(measure=19, y_offset=y_offset_6, distances=distances), - baca.system(measure=25, y_offset=y_offset_7, distances=distances), - baca.system(measure=31, y_offset=y_offset_8, distances=distances), + baca.layout.System(1, y_offset=y_offset_3, distances=distances), + baca.layout.System(7, y_offset=y_offset_4, distances=distances), + baca.layout.System(13, y_offset=y_offset_5, distances=distances), + baca.layout.System(19, y_offset=y_offset_6, distances=distances), + baca.layout.System(25, y_offset=y_offset_7, distances=distances), + baca.layout.System(31, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 2, - baca.system(measure=37, y_offset=y_offset_1, distances=distances), - baca.system(measure=43, y_offset=y_offset_2, distances=distances), - baca.system(measure=49, y_offset=y_offset_3, distances=distances), - baca.system(measure=55, y_offset=y_offset_4, distances=distances), - baca.system(measure=61, y_offset=y_offset_5, distances=distances), - baca.system(measure=67, y_offset=y_offset_6, distances=distances), - baca.system(measure=73, y_offset=y_offset_7, distances=distances), - baca.system(measure=79, y_offset=y_offset_8, distances=distances), + baca.layout.System(37, y_offset=y_offset_1, distances=distances), + baca.layout.System(43, y_offset=y_offset_2, distances=distances), + baca.layout.System(49, y_offset=y_offset_3, distances=distances), + baca.layout.System(55, y_offset=y_offset_4, distances=distances), + baca.layout.System(61, y_offset=y_offset_5, distances=distances), + baca.layout.System(67, y_offset=y_offset_6, distances=distances), + baca.layout.System(73, y_offset=y_offset_7, distances=distances), + baca.layout.System(79, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 3, - baca.system(measure=85, y_offset=y_offset_1, distances=distances), - baca.system(measure=89, y_offset=y_offset_2, distances=distances), - baca.system(measure=93, y_offset=y_offset_3, distances=distances), - baca.system(measure=97, y_offset=y_offset_4, distances=distances), - baca.system(measure=101, y_offset=y_offset_5, distances=distances), - baca.system(measure=105, y_offset=y_offset_6, distances=distances), - baca.system(measure=109, y_offset=y_offset_7, distances=distances), - baca.system(measure=113, y_offset=y_offset_8, distances=distances), + baca.layout.System(85, y_offset=y_offset_1, distances=distances), + baca.layout.System(89, y_offset=y_offset_2, distances=distances), + baca.layout.System(93, y_offset=y_offset_3, distances=distances), + baca.layout.System(97, y_offset=y_offset_4, distances=distances), + baca.layout.System(101, y_offset=y_offset_5, distances=distances), + baca.layout.System(105, y_offset=y_offset_6, distances=distances), + baca.layout.System(109, y_offset=y_offset_7, distances=distances), + baca.layout.System(113, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 4, - baca.system(measure=117, y_offset=y_offset_1, distances=distances), - baca.system(measure=121, y_offset=y_offset_2, distances=distances), - baca.system(measure=125, y_offset=y_offset_3, distances=distances), - baca.system(measure=129, y_offset=y_offset_4, distances=distances), - baca.system(measure=133, y_offset=y_offset_5, distances=distances), - baca.system(measure=137, y_offset=y_offset_6, distances=distances), - baca.system(measure=141, y_offset=y_offset_7, distances=distances), - baca.system(measure=145, y_offset=y_offset_8, distances=distances), + baca.layout.System(117, y_offset=y_offset_1, distances=distances), + baca.layout.System(121, y_offset=y_offset_2, distances=distances), + baca.layout.System(125, y_offset=y_offset_3, distances=distances), + baca.layout.System(129, y_offset=y_offset_4, distances=distances), + baca.layout.System(133, y_offset=y_offset_5, distances=distances), + baca.layout.System(137, y_offset=y_offset_6, distances=distances), + baca.layout.System(141, y_offset=y_offset_7, distances=distances), + baca.layout.System(145, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 5, - baca.system(measure=149, y_offset=y_offset_1, distances=distances), - baca.system(measure=153, y_offset=y_offset_2, distances=distances), - baca.system(measure=157, y_offset=y_offset_3, distances=distances), - baca.system(measure=161, y_offset=y_offset_4, distances=distances), - baca.system(measure=165, y_offset=y_offset_5, distances=distances), - baca.system(measure=169, y_offset=y_offset_6, distances=distances), - baca.system(measure=173, y_offset=y_offset_7, distances=distances), - baca.system(measure=177, y_offset=y_offset_8, distances=distances), + baca.layout.System(149, y_offset=y_offset_1, distances=distances), + baca.layout.System(153, y_offset=y_offset_2, distances=distances), + baca.layout.System(157, y_offset=y_offset_3, distances=distances), + baca.layout.System(161, y_offset=y_offset_4, distances=distances), + baca.layout.System(165, y_offset=y_offset_5, distances=distances), + baca.layout.System(169, y_offset=y_offset_6, distances=distances), + baca.layout.System(173, y_offset=y_offset_7, distances=distances), + baca.layout.System(177, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 6, - baca.system(measure=181, y_offset=y_offset_1, distances=distances), - baca.system(measure=185, y_offset=y_offset_2, distances=distances), - baca.system(measure=189, y_offset=y_offset_3, distances=distances), - baca.system(measure=193, y_offset=y_offset_4, distances=distances), - baca.system(measure=197, y_offset=y_offset_5, distances=distances), - baca.system(measure=201, y_offset=y_offset_6, distances=distances), - baca.system(measure=205, y_offset=y_offset_7, distances=distances), - baca.system(measure=208, y_offset=y_offset_8, distances=distances), + baca.layout.System(181, y_offset=y_offset_1, distances=distances), + baca.layout.System(185, y_offset=y_offset_2, distances=distances), + baca.layout.System(189, y_offset=y_offset_3, distances=distances), + baca.layout.System(193, y_offset=y_offset_4, distances=distances), + baca.layout.System(197, y_offset=y_offset_5, distances=distances), + baca.layout.System(201, y_offset=y_offset_6, distances=distances), + baca.layout.System(205, y_offset=y_offset_7, distances=distances), + baca.layout.System(208, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 7, - baca.system(measure=213, y_offset=y_offset_1, distances=distances), - baca.system(measure=217, y_offset=y_offset_2, distances=distances), - baca.system(measure=221, y_offset=y_offset_3, distances=distances), - baca.system(measure=225, y_offset=y_offset_4, distances=distances), - baca.system(measure=229, y_offset=y_offset_5, distances=distances), - baca.system(measure=232, y_offset=y_offset_6, distances=distances), - baca.system(measure=235, y_offset=y_offset_7, distances=distances), - baca.system(measure=238, y_offset=y_offset_8, distances=distances), + baca.layout.System(213, y_offset=y_offset_1, distances=distances), + baca.layout.System(217, y_offset=y_offset_2, distances=distances), + baca.layout.System(221, y_offset=y_offset_3, distances=distances), + baca.layout.System(225, y_offset=y_offset_4, distances=distances), + baca.layout.System(229, y_offset=y_offset_5, distances=distances), + baca.layout.System(232, y_offset=y_offset_6, distances=distances), + baca.layout.System(235, y_offset=y_offset_7, distances=distances), + baca.layout.System(238, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 8, - baca.system(measure=241, y_offset=y_offset_1, distances=distances), - baca.system(measure=245, y_offset=y_offset_2, distances=distances), - baca.system(measure=249, y_offset=y_offset_3, distances=distances), - baca.system(measure=253, y_offset=y_offset_4, distances=distances), - baca.system(measure=257, y_offset=y_offset_5, distances=distances), - baca.system(measure=261, y_offset=y_offset_6, distances=distances), - baca.system(measure=265, y_offset=y_offset_7, distances=distances), - baca.system(measure=269, y_offset=y_offset_8, distances=distances), + baca.layout.System(241, y_offset=y_offset_1, distances=distances), + baca.layout.System(245, y_offset=y_offset_2, distances=distances), + baca.layout.System(249, y_offset=y_offset_3, distances=distances), + baca.layout.System(253, y_offset=y_offset_4, distances=distances), + baca.layout.System(257, y_offset=y_offset_5, distances=distances), + baca.layout.System(261, y_offset=y_offset_6, distances=distances), + baca.layout.System(265, y_offset=y_offset_7, distances=distances), + baca.layout.System(269, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 9, - baca.system(measure=273, y_offset=y_offset_1, distances=distances), - baca.system(measure=276, y_offset=y_offset_2, distances=distances), - baca.system(measure=281, y_offset=y_offset_3, distances=distances), - baca.system(measure=285, y_offset=y_offset_4, distances=distances), + baca.layout.System(273, y_offset=y_offset_1, distances=distances), + baca.layout.System(276, y_offset=y_offset_2, distances=distances), + baca.layout.System(281, y_offset=y_offset_3, distances=distances), + baca.layout.System(285, y_offset=y_offset_4, distances=distances), ), - spacing=(1, 16), - overrides=( - baca.region(95, (1, 40)), - baca.region(152, (1, 40)), - baca.region(166, (1, 40)), - baca.region(239, (1, 8)), - baca.region(257, (1, 4)), - baca.region(262, (1, 4)), - baca.region(266, (1, 4)), + default_spacing=(1, 16), + spacing_overrides=( + baca.layout.Override(95, (1, 40)), + baca.layout.Override(152, (1, 40)), + baca.layout.Override(166, (1, 40)), + baca.layout.Override(239, (1, 8)), + baca.layout.Override(257, (1, 4)), + baca.layout.Override(262, (1, 4)), + baca.layout.Override(266, (1, 4)), ), ) - baca.section.make_layout_ly(layout) + baca.section.write_layout_ly(layout) if __name__ == "__main__": diff --git a/faberge/builds/a4-parts/english-horn/layout.py b/faberge/builds/a4-parts/english-horn/layout.py index 7d090c87e..e03cf85f9 100644 --- a/faberge/builds/a4-parts/english-horn/layout.py +++ b/faberge/builds/a4-parts/english-horn/layout.py @@ -11,128 +11,128 @@ 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=y_offset_3, distances=distances), - baca.system(measure=7, y_offset=y_offset_4, distances=distances), - baca.system(measure=13, y_offset=y_offset_5, distances=distances), - baca.system(measure=19, y_offset=y_offset_6, distances=distances), - baca.system(measure=25, y_offset=y_offset_7, distances=distances), - baca.system(measure=32, y_offset=y_offset_8, distances=distances), + baca.layout.System(1, y_offset=y_offset_3, distances=distances), + baca.layout.System(7, y_offset=y_offset_4, distances=distances), + baca.layout.System(13, y_offset=y_offset_5, distances=distances), + baca.layout.System(19, y_offset=y_offset_6, distances=distances), + baca.layout.System(25, y_offset=y_offset_7, distances=distances), + baca.layout.System(32, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 2, - baca.system(measure=35, y_offset=y_offset_1, distances=distances), - baca.system(measure=45, y_offset=y_offset_2, distances=distances), - baca.system(measure=49, y_offset=y_offset_3, distances=distances), - baca.system(measure=53, y_offset=y_offset_4, distances=distances), - baca.system(measure=61, y_offset=y_offset_5, distances=distances), - baca.system(measure=65, y_offset=y_offset_6, distances=distances), - baca.system(measure=70, y_offset=y_offset_7, distances=distances), - baca.system(measure=79, y_offset=y_offset_8, distances=distances), + baca.layout.System(35, y_offset=y_offset_1, distances=distances), + baca.layout.System(45, y_offset=y_offset_2, distances=distances), + baca.layout.System(49, y_offset=y_offset_3, distances=distances), + baca.layout.System(53, y_offset=y_offset_4, distances=distances), + baca.layout.System(61, y_offset=y_offset_5, distances=distances), + baca.layout.System(65, y_offset=y_offset_6, distances=distances), + baca.layout.System(70, y_offset=y_offset_7, distances=distances), + baca.layout.System(79, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 3, - baca.system(measure=85, y_offset=y_offset_1, distances=distances), - baca.system(measure=87, y_offset=y_offset_2, distances=distances), - baca.system(measure=89, y_offset=y_offset_3, distances=distances), - baca.system(measure=91, y_offset=y_offset_4, distances=distances), - baca.system(measure=93, y_offset=y_offset_5, distances=distances), - baca.system(measure=95, y_offset=y_offset_6, distances=distances), - baca.system(measure=97, y_offset=y_offset_7, distances=distances), - baca.system(measure=99, y_offset=y_offset_8, distances=distances), + baca.layout.System(85, y_offset=y_offset_1, distances=distances), + baca.layout.System(87, y_offset=y_offset_2, distances=distances), + baca.layout.System(89, y_offset=y_offset_3, distances=distances), + baca.layout.System(91, y_offset=y_offset_4, distances=distances), + baca.layout.System(93, y_offset=y_offset_5, distances=distances), + baca.layout.System(95, y_offset=y_offset_6, distances=distances), + baca.layout.System(97, y_offset=y_offset_7, distances=distances), + baca.layout.System(99, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 4, - baca.system(measure=101, y_offset=y_offset_1, distances=distances), - baca.system(measure=103, y_offset=y_offset_2, distances=distances), - baca.system(measure=105, y_offset=y_offset_3, distances=distances), - baca.system(measure=107, y_offset=y_offset_4, distances=distances), - baca.system(measure=109, y_offset=y_offset_5, distances=distances), - baca.system(measure=111, y_offset=y_offset_6, distances=distances), - baca.system(measure=113, y_offset=y_offset_7, distances=distances), - baca.system(measure=115, y_offset=y_offset_8, distances=distances), + baca.layout.System(101, y_offset=y_offset_1, distances=distances), + baca.layout.System(103, y_offset=y_offset_2, distances=distances), + baca.layout.System(105, y_offset=y_offset_3, distances=distances), + baca.layout.System(107, y_offset=y_offset_4, distances=distances), + baca.layout.System(109, y_offset=y_offset_5, distances=distances), + baca.layout.System(111, y_offset=y_offset_6, distances=distances), + baca.layout.System(113, y_offset=y_offset_7, distances=distances), + baca.layout.System(115, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 5, - baca.system(measure=117, y_offset=y_offset_1, distances=distances), - baca.system(measure=119, y_offset=y_offset_2, distances=distances), - baca.system(measure=122, y_offset=y_offset_3, distances=distances), - baca.system(measure=125, y_offset=y_offset_4, distances=distances), - baca.system(measure=129, y_offset=y_offset_5, distances=distances), - baca.system(measure=132, y_offset=y_offset_6, distances=distances), - baca.system(measure=135, y_offset=y_offset_7, distances=distances), - baca.system(measure=137, y_offset=y_offset_8, distances=distances), + baca.layout.System(117, y_offset=y_offset_1, distances=distances), + baca.layout.System(119, y_offset=y_offset_2, distances=distances), + baca.layout.System(122, y_offset=y_offset_3, distances=distances), + baca.layout.System(125, y_offset=y_offset_4, distances=distances), + baca.layout.System(129, y_offset=y_offset_5, distances=distances), + baca.layout.System(132, y_offset=y_offset_6, distances=distances), + baca.layout.System(135, y_offset=y_offset_7, distances=distances), + baca.layout.System(137, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 6, - baca.system(measure=141, y_offset=y_offset_1, distances=distances), - baca.system(measure=143, y_offset=y_offset_2, distances=distances), - baca.system(measure=145, y_offset=y_offset_3, distances=distances), - baca.system(measure=147, y_offset=y_offset_4, distances=distances), - baca.system(measure=149, y_offset=y_offset_5, distances=distances), - baca.system(measure=151, y_offset=y_offset_6, distances=distances), - baca.system(measure=153, y_offset=y_offset_7, distances=distances), - baca.system(measure=155, y_offset=y_offset_8, distances=distances), + baca.layout.System(141, y_offset=y_offset_1, distances=distances), + baca.layout.System(143, y_offset=y_offset_2, distances=distances), + baca.layout.System(145, y_offset=y_offset_3, distances=distances), + baca.layout.System(147, y_offset=y_offset_4, distances=distances), + baca.layout.System(149, y_offset=y_offset_5, distances=distances), + baca.layout.System(151, y_offset=y_offset_6, distances=distances), + baca.layout.System(153, y_offset=y_offset_7, distances=distances), + baca.layout.System(155, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 7, - baca.system(measure=157, y_offset=y_offset_1, distances=distances), - baca.system(measure=161, y_offset=y_offset_2, distances=distances), - baca.system(measure=165, y_offset=y_offset_3, distances=distances), - baca.system(measure=169, y_offset=y_offset_4, distances=distances), - baca.system(measure=173, y_offset=y_offset_5, distances=distances), - baca.system(measure=177, y_offset=y_offset_6, distances=distances), - baca.system(measure=181, y_offset=y_offset_7, distances=distances), - baca.system(measure=185, y_offset=y_offset_8, distances=distances), + baca.layout.System(157, y_offset=y_offset_1, distances=distances), + baca.layout.System(161, y_offset=y_offset_2, distances=distances), + baca.layout.System(165, y_offset=y_offset_3, distances=distances), + baca.layout.System(169, y_offset=y_offset_4, distances=distances), + baca.layout.System(173, y_offset=y_offset_5, distances=distances), + baca.layout.System(177, y_offset=y_offset_6, distances=distances), + baca.layout.System(181, y_offset=y_offset_7, distances=distances), + baca.layout.System(185, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 8, - baca.system(measure=189, y_offset=y_offset_1, distances=distances), - baca.system(measure=193, y_offset=y_offset_2, distances=distances), - baca.system(measure=197, y_offset=y_offset_3, distances=distances), - baca.system(measure=201, y_offset=y_offset_4, distances=distances), - baca.system(measure=205, y_offset=y_offset_5, distances=distances), - baca.system(measure=209, y_offset=y_offset_6, distances=distances), - baca.system(measure=213, y_offset=y_offset_7, distances=distances), - baca.system(measure=218, y_offset=y_offset_8, distances=distances), + baca.layout.System(189, y_offset=y_offset_1, distances=distances), + baca.layout.System(193, y_offset=y_offset_2, distances=distances), + baca.layout.System(197, y_offset=y_offset_3, distances=distances), + baca.layout.System(201, y_offset=y_offset_4, distances=distances), + baca.layout.System(205, y_offset=y_offset_5, distances=distances), + baca.layout.System(209, y_offset=y_offset_6, distances=distances), + baca.layout.System(213, y_offset=y_offset_7, distances=distances), + baca.layout.System(218, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 9, - baca.system(measure=222, y_offset=y_offset_1, distances=distances), - baca.system(measure=224, y_offset=y_offset_2, distances=distances), - baca.system(measure=229, y_offset=y_offset_3, distances=distances), - baca.system(measure=233, y_offset=y_offset_4, distances=distances), - baca.system(measure=237, y_offset=y_offset_5, distances=distances), - baca.system(measure=241, y_offset=y_offset_6, distances=distances), - baca.system(measure=245, y_offset=y_offset_7, distances=distances), - baca.system(measure=249, y_offset=y_offset_8, distances=distances), + baca.layout.System(222, y_offset=y_offset_1, distances=distances), + baca.layout.System(224, y_offset=y_offset_2, distances=distances), + baca.layout.System(229, y_offset=y_offset_3, distances=distances), + baca.layout.System(233, y_offset=y_offset_4, distances=distances), + baca.layout.System(237, y_offset=y_offset_5, distances=distances), + baca.layout.System(241, y_offset=y_offset_6, distances=distances), + baca.layout.System(245, y_offset=y_offset_7, distances=distances), + baca.layout.System(249, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 10, - baca.system(measure=253, y_offset=y_offset_1, distances=distances), - baca.system(measure=257, y_offset=y_offset_2, distances=distances), - baca.system(measure=261, y_offset=y_offset_3, distances=distances), - baca.system(measure=265, y_offset=y_offset_4, distances=distances), - baca.system(measure=269, y_offset=y_offset_5, distances=distances), - baca.system(measure=273, y_offset=y_offset_6, distances=distances), - baca.system(measure=277, y_offset=y_offset_7, distances=distances), - baca.system(measure=281, y_offset=y_offset_8, distances=distances), + baca.layout.System(253, y_offset=y_offset_1, distances=distances), + baca.layout.System(257, y_offset=y_offset_2, distances=distances), + baca.layout.System(261, y_offset=y_offset_3, distances=distances), + baca.layout.System(265, y_offset=y_offset_4, distances=distances), + baca.layout.System(269, y_offset=y_offset_5, distances=distances), + baca.layout.System(273, y_offset=y_offset_6, distances=distances), + baca.layout.System(277, y_offset=y_offset_7, distances=distances), + baca.layout.System(281, y_offset=y_offset_8, distances=distances), ), - spacing=(1, 16), - overrides=( - baca.region((25, 30), (1, 8)), - baca.region((18, 19), (1, 40)), - baca.region((31, 34), (1, 40)), - baca.region((45, 46), (1, 40)), - baca.region(48, (1, 40)), - baca.region(49, (1, 40)), - baca.region([61, 63], (1, 40)), - baca.region(222, (1, 8)), + default_spacing=(1, 16), + spacing_overrides=( + baca.layout.Override((25, 30), (1, 8)), + baca.layout.Override((18, 19), (1, 40)), + baca.layout.Override((31, 34), (1, 40)), + baca.layout.Override((45, 46), (1, 40)), + baca.layout.Override(48, (1, 40)), + baca.layout.Override(49, (1, 40)), + baca.layout.Override([61, 63], (1, 40)), + baca.layout.Override(222, (1, 8)), ), ) - baca.section.make_layout_ly(layout) + baca.section.write_layout_ly(layout) if __name__ == "__main__": diff --git a/faberge/builds/a4-parts/flute/layout.py b/faberge/builds/a4-parts/flute/layout.py index 669b7a238..13a6ea628 100644 --- a/faberge/builds/a4-parts/flute/layout.py +++ b/faberge/builds/a4-parts/flute/layout.py @@ -11,107 +11,107 @@ 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=y_offset_3, distances=distances), - baca.system(measure=7, y_offset=y_offset_4, distances=distances), - baca.system(measure=13, y_offset=y_offset_5, distances=distances), - baca.system(measure=19, y_offset=y_offset_6, distances=distances), - baca.system(measure=25, y_offset=y_offset_7, distances=distances), - baca.system(measure=31, y_offset=y_offset_8, distances=distances), + baca.layout.System(1, y_offset=y_offset_3, distances=distances), + baca.layout.System(7, y_offset=y_offset_4, distances=distances), + baca.layout.System(13, y_offset=y_offset_5, distances=distances), + baca.layout.System(19, y_offset=y_offset_6, distances=distances), + baca.layout.System(25, y_offset=y_offset_7, distances=distances), + baca.layout.System(31, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 2, - baca.system(measure=37, y_offset=y_offset_1, distances=distances), - baca.system(measure=43, y_offset=y_offset_2, distances=distances), - baca.system(measure=49, y_offset=y_offset_3, distances=distances), - baca.system(measure=55, y_offset=y_offset_4, distances=distances), - baca.system(measure=61, y_offset=y_offset_5, distances=distances), - baca.system(measure=67, y_offset=y_offset_6, distances=distances), - baca.system(measure=73, y_offset=y_offset_7, distances=distances), - baca.system(measure=79, y_offset=y_offset_8, distances=distances), + baca.layout.System(37, y_offset=y_offset_1, distances=distances), + baca.layout.System(43, y_offset=y_offset_2, distances=distances), + baca.layout.System(49, y_offset=y_offset_3, distances=distances), + baca.layout.System(55, y_offset=y_offset_4, distances=distances), + baca.layout.System(61, y_offset=y_offset_5, distances=distances), + baca.layout.System(67, y_offset=y_offset_6, distances=distances), + baca.layout.System(73, y_offset=y_offset_7, distances=distances), + baca.layout.System(79, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 3, - baca.system(measure=85, y_offset=y_offset_1, distances=distances), - baca.system(measure=89, y_offset=y_offset_2, distances=distances), - baca.system(measure=93, y_offset=y_offset_3, distances=distances), - baca.system(measure=97, y_offset=y_offset_4, distances=distances), - baca.system(measure=101, y_offset=y_offset_5, distances=distances), - baca.system(measure=105, y_offset=y_offset_6, distances=distances), - baca.system(measure=109, y_offset=y_offset_7, distances=distances), - baca.system(measure=113, y_offset=y_offset_8, distances=distances), + baca.layout.System(85, y_offset=y_offset_1, distances=distances), + baca.layout.System(89, y_offset=y_offset_2, distances=distances), + baca.layout.System(93, y_offset=y_offset_3, distances=distances), + baca.layout.System(97, y_offset=y_offset_4, distances=distances), + baca.layout.System(101, y_offset=y_offset_5, distances=distances), + baca.layout.System(105, y_offset=y_offset_6, distances=distances), + baca.layout.System(109, y_offset=y_offset_7, distances=distances), + baca.layout.System(113, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 4, - baca.system(measure=117, y_offset=y_offset_1, distances=distances), - baca.system(measure=121, y_offset=y_offset_2, distances=distances), - baca.system(measure=125, y_offset=y_offset_3, distances=distances), - baca.system(measure=129, y_offset=y_offset_4, distances=distances), - baca.system(measure=133, y_offset=y_offset_5, distances=distances), - baca.system(measure=137, y_offset=y_offset_6, distances=distances), - baca.system(measure=141, y_offset=y_offset_7, distances=distances), - baca.system(measure=145, y_offset=y_offset_8, distances=distances), + baca.layout.System(117, y_offset=y_offset_1, distances=distances), + baca.layout.System(121, y_offset=y_offset_2, distances=distances), + baca.layout.System(125, y_offset=y_offset_3, distances=distances), + baca.layout.System(129, y_offset=y_offset_4, distances=distances), + baca.layout.System(133, y_offset=y_offset_5, distances=distances), + baca.layout.System(137, y_offset=y_offset_6, distances=distances), + baca.layout.System(141, y_offset=y_offset_7, distances=distances), + baca.layout.System(145, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 5, - baca.system(measure=149, y_offset=y_offset_1, distances=distances), - baca.system(measure=153, y_offset=y_offset_2, distances=distances), - baca.system(measure=157, y_offset=y_offset_3, distances=distances), - baca.system(measure=161, y_offset=y_offset_4, distances=distances), - baca.system(measure=165, y_offset=y_offset_5, distances=distances), - baca.system(measure=169, y_offset=y_offset_6, distances=distances), - baca.system(measure=173, y_offset=y_offset_7, distances=distances), - baca.system(measure=177, y_offset=y_offset_8, distances=distances), + baca.layout.System(149, y_offset=y_offset_1, distances=distances), + baca.layout.System(153, y_offset=y_offset_2, distances=distances), + baca.layout.System(157, y_offset=y_offset_3, distances=distances), + baca.layout.System(161, y_offset=y_offset_4, distances=distances), + baca.layout.System(165, y_offset=y_offset_5, distances=distances), + baca.layout.System(169, y_offset=y_offset_6, distances=distances), + baca.layout.System(173, y_offset=y_offset_7, distances=distances), + baca.layout.System(177, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 6, - baca.system(measure=181, y_offset=y_offset_1, distances=distances), - baca.system(measure=185, y_offset=y_offset_2, distances=distances), - baca.system(measure=189, y_offset=y_offset_3, distances=distances), - baca.system(measure=193, y_offset=y_offset_4, distances=distances), - baca.system(measure=197, y_offset=y_offset_5, distances=distances), - baca.system(measure=201, y_offset=y_offset_6, distances=distances), - baca.system(measure=205, y_offset=y_offset_7, distances=distances), - baca.system(measure=209, y_offset=y_offset_8, distances=distances), + baca.layout.System(181, y_offset=y_offset_1, distances=distances), + baca.layout.System(185, y_offset=y_offset_2, distances=distances), + baca.layout.System(189, y_offset=y_offset_3, distances=distances), + baca.layout.System(193, y_offset=y_offset_4, distances=distances), + baca.layout.System(197, y_offset=y_offset_5, distances=distances), + baca.layout.System(201, y_offset=y_offset_6, distances=distances), + baca.layout.System(205, y_offset=y_offset_7, distances=distances), + baca.layout.System(209, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 7, - baca.system(measure=213, y_offset=y_offset_1, distances=distances), - baca.system(measure=217, y_offset=y_offset_2, distances=distances), - baca.system(measure=221, y_offset=y_offset_3, distances=distances), - baca.system(measure=225, y_offset=y_offset_4, distances=distances), - baca.system(measure=229, y_offset=y_offset_5, distances=distances), - baca.system(measure=233, y_offset=y_offset_6, distances=distances), - baca.system(measure=237, y_offset=y_offset_7, distances=distances), - baca.system(measure=241, y_offset=y_offset_8, distances=distances), + baca.layout.System(213, y_offset=y_offset_1, distances=distances), + baca.layout.System(217, y_offset=y_offset_2, distances=distances), + baca.layout.System(221, y_offset=y_offset_3, distances=distances), + baca.layout.System(225, y_offset=y_offset_4, distances=distances), + baca.layout.System(229, y_offset=y_offset_5, distances=distances), + baca.layout.System(233, y_offset=y_offset_6, distances=distances), + baca.layout.System(237, y_offset=y_offset_7, distances=distances), + baca.layout.System(241, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 8, - baca.system(measure=245, y_offset=y_offset_1, distances=distances), - baca.system(measure=249, y_offset=y_offset_2, distances=distances), - baca.system(measure=253, y_offset=y_offset_3, distances=distances), - baca.system(measure=257, y_offset=y_offset_4, distances=distances), - baca.system(measure=261, y_offset=y_offset_5, distances=distances), - baca.system(measure=265, y_offset=y_offset_6, distances=distances), - baca.system(measure=269, y_offset=y_offset_7, distances=distances), - baca.system(measure=273, y_offset=y_offset_8, distances=distances), + baca.layout.System(245, y_offset=y_offset_1, distances=distances), + baca.layout.System(249, y_offset=y_offset_2, distances=distances), + baca.layout.System(253, y_offset=y_offset_3, distances=distances), + baca.layout.System(257, y_offset=y_offset_4, distances=distances), + baca.layout.System(261, y_offset=y_offset_5, distances=distances), + baca.layout.System(265, y_offset=y_offset_6, distances=distances), + baca.layout.System(269, y_offset=y_offset_7, distances=distances), + baca.layout.System(273, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 9, - baca.system(measure=277, y_offset=y_offset_1, distances=distances), - baca.system(measure=281, y_offset=y_offset_2, distances=distances), - baca.system(measure=285, y_offset=y_offset_3, distances=distances), + baca.layout.System(277, y_offset=y_offset_1, distances=distances), + baca.layout.System(281, y_offset=y_offset_2, distances=distances), + baca.layout.System(285, y_offset=y_offset_3, distances=distances), ), - spacing=(1, 16), - overrides=( - baca.region(95, (1, 40)), - baca.region(152, (1, 40)), - baca.region(166, (1, 40)), + default_spacing=(1, 16), + spacing_overrides=( + baca.layout.Override(95, (1, 40)), + baca.layout.Override(152, (1, 40)), + baca.layout.Override(166, (1, 40)), ), ) - baca.section.make_layout_ly(layout) + baca.section.write_layout_ly(layout) if __name__ == "__main__": diff --git a/faberge/builds/a4-parts/percussion/layout.py b/faberge/builds/a4-parts/percussion/layout.py index 47c8e035e..e6ffa8107 100644 --- a/faberge/builds/a4-parts/percussion/layout.py +++ b/faberge/builds/a4-parts/percussion/layout.py @@ -11,107 +11,107 @@ 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=y_offset_3, distances=distances), - baca.system(measure=7, y_offset=y_offset_4, distances=distances), - baca.system(measure=13, y_offset=y_offset_5, distances=distances), - baca.system(measure=19, y_offset=y_offset_6, distances=distances), - baca.system(measure=25, y_offset=y_offset_7, distances=distances), - baca.system(measure=31, y_offset=y_offset_8, distances=distances), + baca.layout.System(1, y_offset=y_offset_3, distances=distances), + baca.layout.System(7, y_offset=y_offset_4, distances=distances), + baca.layout.System(13, y_offset=y_offset_5, distances=distances), + baca.layout.System(19, y_offset=y_offset_6, distances=distances), + baca.layout.System(25, y_offset=y_offset_7, distances=distances), + baca.layout.System(31, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 2, - baca.system(measure=37, y_offset=y_offset_1, distances=distances), - baca.system(measure=43, y_offset=y_offset_2, distances=distances), - baca.system(measure=49, y_offset=y_offset_3, distances=distances), - baca.system(measure=55, y_offset=y_offset_4, distances=distances), - baca.system(measure=61, y_offset=y_offset_5, distances=distances), - baca.system(measure=67, y_offset=y_offset_6, distances=distances), - baca.system(measure=73, y_offset=y_offset_7, distances=distances), - baca.system(measure=79, y_offset=y_offset_8, distances=distances), + baca.layout.System(37, y_offset=y_offset_1, distances=distances), + baca.layout.System(43, y_offset=y_offset_2, distances=distances), + baca.layout.System(49, y_offset=y_offset_3, distances=distances), + baca.layout.System(55, y_offset=y_offset_4, distances=distances), + baca.layout.System(61, y_offset=y_offset_5, distances=distances), + baca.layout.System(67, y_offset=y_offset_6, distances=distances), + baca.layout.System(73, y_offset=y_offset_7, distances=distances), + baca.layout.System(79, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 3, - baca.system(measure=85, y_offset=y_offset_1, distances=distances), - baca.system(measure=89, y_offset=y_offset_2, distances=distances), - baca.system(measure=93, y_offset=y_offset_3, distances=distances), - baca.system(measure=97, y_offset=y_offset_4, distances=distances), - baca.system(measure=101, y_offset=y_offset_5, distances=distances), - baca.system(measure=105, y_offset=y_offset_6, distances=distances), - baca.system(measure=109, y_offset=y_offset_7, distances=distances), - baca.system(measure=113, y_offset=y_offset_8, distances=distances), + baca.layout.System(85, y_offset=y_offset_1, distances=distances), + baca.layout.System(89, y_offset=y_offset_2, distances=distances), + baca.layout.System(93, y_offset=y_offset_3, distances=distances), + baca.layout.System(97, y_offset=y_offset_4, distances=distances), + baca.layout.System(101, y_offset=y_offset_5, distances=distances), + baca.layout.System(105, y_offset=y_offset_6, distances=distances), + baca.layout.System(109, y_offset=y_offset_7, distances=distances), + baca.layout.System(113, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 4, - baca.system(measure=117, y_offset=y_offset_1, distances=distances), - baca.system(measure=121, y_offset=y_offset_2, distances=distances), - baca.system(measure=125, y_offset=y_offset_3, distances=distances), - baca.system(measure=129, y_offset=y_offset_4, distances=distances), - baca.system(measure=133, y_offset=y_offset_5, distances=distances), - baca.system(measure=137, y_offset=y_offset_6, distances=distances), - baca.system(measure=141, y_offset=y_offset_7, distances=distances), - baca.system(measure=145, y_offset=y_offset_8, distances=distances), + baca.layout.System(117, y_offset=y_offset_1, distances=distances), + baca.layout.System(121, y_offset=y_offset_2, distances=distances), + baca.layout.System(125, y_offset=y_offset_3, distances=distances), + baca.layout.System(129, y_offset=y_offset_4, distances=distances), + baca.layout.System(133, y_offset=y_offset_5, distances=distances), + baca.layout.System(137, y_offset=y_offset_6, distances=distances), + baca.layout.System(141, y_offset=y_offset_7, distances=distances), + baca.layout.System(145, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 5, - baca.system(measure=149, y_offset=y_offset_1, distances=distances), - baca.system(measure=153, y_offset=y_offset_2, distances=distances), - baca.system(measure=157, y_offset=y_offset_3, distances=distances), - baca.system(measure=161, y_offset=y_offset_4, distances=distances), - baca.system(measure=165, y_offset=y_offset_5, distances=distances), - baca.system(measure=169, y_offset=y_offset_6, distances=distances), - baca.system(measure=173, y_offset=y_offset_7, distances=distances), - baca.system(measure=177, y_offset=y_offset_8, distances=distances), + baca.layout.System(149, y_offset=y_offset_1, distances=distances), + baca.layout.System(153, y_offset=y_offset_2, distances=distances), + baca.layout.System(157, y_offset=y_offset_3, distances=distances), + baca.layout.System(161, y_offset=y_offset_4, distances=distances), + baca.layout.System(165, y_offset=y_offset_5, distances=distances), + baca.layout.System(169, y_offset=y_offset_6, distances=distances), + baca.layout.System(173, y_offset=y_offset_7, distances=distances), + baca.layout.System(177, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 6, - baca.system(measure=181, y_offset=y_offset_1, distances=distances), - baca.system(measure=185, y_offset=y_offset_2, distances=distances), - baca.system(measure=189, y_offset=y_offset_3, distances=distances), - baca.system(measure=193, y_offset=y_offset_4, distances=distances), - baca.system(measure=197, y_offset=y_offset_5, distances=distances), - baca.system(measure=201, y_offset=y_offset_6, distances=distances), - baca.system(measure=205, y_offset=y_offset_7, distances=distances), - baca.system(measure=209, y_offset=y_offset_8, distances=distances), + baca.layout.System(181, y_offset=y_offset_1, distances=distances), + baca.layout.System(185, y_offset=y_offset_2, distances=distances), + baca.layout.System(189, y_offset=y_offset_3, distances=distances), + baca.layout.System(193, y_offset=y_offset_4, distances=distances), + baca.layout.System(197, y_offset=y_offset_5, distances=distances), + baca.layout.System(201, y_offset=y_offset_6, distances=distances), + baca.layout.System(205, y_offset=y_offset_7, distances=distances), + baca.layout.System(209, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 7, - baca.system(measure=213, y_offset=y_offset_1, distances=distances), - baca.system(measure=217, y_offset=y_offset_2, distances=distances), - baca.system(measure=222, y_offset=y_offset_3, distances=distances), - baca.system(measure=225, y_offset=y_offset_4, distances=distances), - baca.system(measure=229, y_offset=y_offset_5, distances=distances), - baca.system(measure=233, y_offset=y_offset_6, distances=distances), - baca.system( + baca.layout.System(213, y_offset=y_offset_1, distances=distances), + baca.layout.System(217, y_offset=y_offset_2, distances=distances), + baca.layout.System(222, y_offset=y_offset_3, distances=distances), + baca.layout.System(225, y_offset=y_offset_4, distances=distances), + baca.layout.System(229, y_offset=y_offset_5, distances=distances), + baca.layout.System(233, y_offset=y_offset_6, distances=distances), + baca.layout.System( measure=237, y_offset=y_offset_7, distances=(10,), ), - baca.system(measure=241, y_offset=y_offset_8, distances=distances), + baca.layout.System(241, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 8, - baca.system(measure=245, y_offset=y_offset_1, distances=distances), - baca.system(measure=249, y_offset=y_offset_2, distances=distances), - baca.system(measure=253, y_offset=y_offset_3, distances=distances), - baca.system(measure=257, y_offset=y_offset_4, distances=distances), - baca.system(measure=261, y_offset=y_offset_5, distances=distances), - baca.system(measure=265, y_offset=y_offset_6, distances=distances), - baca.system(measure=269, y_offset=y_offset_7, distances=distances), - baca.system(measure=273, y_offset=y_offset_8, distances=distances), + baca.layout.System(245, y_offset=y_offset_1, distances=distances), + baca.layout.System(249, y_offset=y_offset_2, distances=distances), + baca.layout.System(253, y_offset=y_offset_3, distances=distances), + baca.layout.System(257, y_offset=y_offset_4, distances=distances), + baca.layout.System(261, y_offset=y_offset_5, distances=distances), + baca.layout.System(265, y_offset=y_offset_6, distances=distances), + baca.layout.System(269, y_offset=y_offset_7, distances=distances), + baca.layout.System(273, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 9, - baca.system(measure=277, y_offset=y_offset_1, distances=distances), - baca.system(measure=281, y_offset=y_offset_2, distances=distances), - baca.system(measure=285, y_offset=y_offset_3, distances=distances), + baca.layout.System(277, y_offset=y_offset_1, distances=distances), + baca.layout.System(281, y_offset=y_offset_2, distances=distances), + baca.layout.System(285, y_offset=y_offset_3, distances=distances), ), - spacing=(1, 16), - overrides=(baca.region((221, 223), (1, 4)),), + default_spacing=(1, 16), + spacing_overrides=(baca.layout.Override((221, 223), (1, 4)),), ) - baca.section.make_layout_ly(layout) + baca.section.write_layout_ly(layout) if __name__ == "__main__": diff --git a/faberge/builds/a4-parts/piano/layout.py b/faberge/builds/a4-parts/piano/layout.py index f0a4ddd83..e764d30a8 100644 --- a/faberge/builds/a4-parts/piano/layout.py +++ b/faberge/builds/a4-parts/piano/layout.py @@ -8,103 +8,103 @@ def main(): y_offset_3 = 100 y_offset_4 = 144 y_offset_5 = 188 - layout = baca.make_layout( - baca.page( + layout = baca.layout.layout( + baca.layout.page( 1, - baca.system(measure=1, y_offset=y_offset_2, distances=distances), - baca.system(measure=5, y_offset=y_offset_3, distances=distances), - baca.system(measure=11, y_offset=y_offset_4, distances=distances), - baca.system(measure=16, y_offset=y_offset_5, distances=distances), + baca.layout.System(1, y_offset=y_offset_2, distances=distances), + baca.layout.System(5, y_offset=y_offset_3, distances=distances), + baca.layout.System(11, y_offset=y_offset_4, distances=distances), + baca.layout.System(16, y_offset=y_offset_5, distances=distances), ), - baca.page( + baca.layout.page( 2, - baca.system(measure=21, y_offset=y_offset_1, distances=distances), - baca.system(measure=26, y_offset=y_offset_2, distances=distances), - baca.system(measure=31, y_offset=y_offset_3, distances=distances), - baca.system(measure=36, y_offset=y_offset_4, distances=distances), - baca.system(measure=41, y_offset=y_offset_5, distances=distances), + baca.layout.System(21, y_offset=y_offset_1, distances=distances), + baca.layout.System(26, y_offset=y_offset_2, distances=distances), + baca.layout.System(31, y_offset=y_offset_3, distances=distances), + baca.layout.System(36, y_offset=y_offset_4, distances=distances), + baca.layout.System(41, y_offset=y_offset_5, distances=distances), ), - baca.page( + baca.layout.page( 3, - baca.system(measure=46, y_offset=y_offset_1, distances=distances), - baca.system(measure=51, y_offset=y_offset_2, distances=distances), - baca.system(measure=56, y_offset=y_offset_3, distances=distances), - baca.system(measure=61, y_offset=y_offset_4, distances=distances), - baca.system(measure=66, y_offset=y_offset_5, distances=distances), + baca.layout.System(46, y_offset=y_offset_1, distances=distances), + baca.layout.System(51, y_offset=y_offset_2, distances=distances), + baca.layout.System(56, y_offset=y_offset_3, distances=distances), + baca.layout.System(61, y_offset=y_offset_4, distances=distances), + baca.layout.System(66, y_offset=y_offset_5, distances=distances), ), - baca.page( + baca.layout.page( 4, - baca.system(measure=71, y_offset=y_offset_1, distances=distances), - baca.system(measure=76, y_offset=y_offset_2, distances=distances), - baca.system(measure=81, y_offset=y_offset_3, distances=distances), - baca.system(measure=86, y_offset=y_offset_4, distances=distances), - baca.system(measure=91, y_offset=y_offset_5, distances=distances), + baca.layout.System(71, y_offset=y_offset_1, distances=distances), + baca.layout.System(76, y_offset=y_offset_2, distances=distances), + baca.layout.System(81, y_offset=y_offset_3, distances=distances), + baca.layout.System(86, y_offset=y_offset_4, distances=distances), + baca.layout.System(91, y_offset=y_offset_5, distances=distances), ), - baca.page( + baca.layout.page( 5, - baca.system(measure=96, y_offset=y_offset_1, distances=distances), - baca.system(measure=101, y_offset=y_offset_2, distances=distances), - baca.system(measure=106, y_offset=y_offset_3, distances=distances), - baca.system(measure=111, y_offset=y_offset_4, distances=distances), - baca.system(measure=116, y_offset=y_offset_5, distances=distances), + baca.layout.System(96, y_offset=y_offset_1, distances=distances), + baca.layout.System(101, y_offset=y_offset_2, distances=distances), + baca.layout.System(106, y_offset=y_offset_3, distances=distances), + baca.layout.System(111, y_offset=y_offset_4, distances=distances), + baca.layout.System(116, y_offset=y_offset_5, distances=distances), ), - baca.page( + baca.layout.page( 6, - baca.system(measure=121, y_offset=y_offset_1, distances=distances), - baca.system(measure=126, y_offset=y_offset_2, distances=distances), - baca.system(measure=131, y_offset=y_offset_3, distances=distances), - baca.system(measure=136, y_offset=y_offset_4, distances=distances), - baca.system(measure=141, y_offset=y_offset_5, distances=distances), + baca.layout.System(121, y_offset=y_offset_1, distances=distances), + baca.layout.System(126, y_offset=y_offset_2, distances=distances), + baca.layout.System(131, y_offset=y_offset_3, distances=distances), + baca.layout.System(136, y_offset=y_offset_4, distances=distances), + baca.layout.System(141, y_offset=y_offset_5, distances=distances), ), - baca.page( + baca.layout.page( 7, - baca.system(measure=146, y_offset=y_offset_1, distances=distances), - baca.system(measure=151, y_offset=y_offset_2, distances=distances), - baca.system(measure=156, y_offset=y_offset_3, distances=distances), - baca.system(measure=161, y_offset=y_offset_4, distances=distances), - baca.system(measure=166, y_offset=y_offset_5, distances=distances), + baca.layout.System(146, y_offset=y_offset_1, distances=distances), + baca.layout.System(151, y_offset=y_offset_2, distances=distances), + baca.layout.System(156, y_offset=y_offset_3, distances=distances), + baca.layout.System(161, y_offset=y_offset_4, distances=distances), + baca.layout.System(166, y_offset=y_offset_5, distances=distances), ), - baca.page( + baca.layout.page( 8, - baca.system(measure=171, y_offset=y_offset_1, distances=distances), - baca.system(measure=176, y_offset=y_offset_2, distances=distances), - baca.system(measure=181, y_offset=y_offset_3, distances=distances), - baca.system(measure=186, y_offset=y_offset_4, distances=distances), - baca.system(measure=191, y_offset=y_offset_5, distances=distances), + baca.layout.System(171, y_offset=y_offset_1, distances=distances), + baca.layout.System(176, y_offset=y_offset_2, distances=distances), + baca.layout.System(181, y_offset=y_offset_3, distances=distances), + baca.layout.System(186, y_offset=y_offset_4, distances=distances), + baca.layout.System(191, y_offset=y_offset_5, distances=distances), ), - baca.page( + baca.layout.page( 9, - baca.system(measure=196, y_offset=y_offset_1, distances=distances), - baca.system(measure=201, y_offset=y_offset_2, distances=distances), - baca.system(measure=206, y_offset=y_offset_3, distances=distances), - baca.system(measure=211, y_offset=y_offset_4, distances=distances), - baca.system(measure=216, y_offset=y_offset_5, distances=distances), + baca.layout.System(196, y_offset=y_offset_1, distances=distances), + baca.layout.System(201, y_offset=y_offset_2, distances=distances), + baca.layout.System(206, y_offset=y_offset_3, distances=distances), + baca.layout.System(211, y_offset=y_offset_4, distances=distances), + baca.layout.System(216, y_offset=y_offset_5, distances=distances), ), - baca.page( + baca.layout.page( 10, - baca.system(measure=221, y_offset=y_offset_1, distances=distances), - baca.system(measure=226, y_offset=y_offset_2, distances=distances), - baca.system(measure=231, y_offset=y_offset_3, distances=distances), - baca.system(measure=236, y_offset=y_offset_4, distances=distances), - baca.system(measure=241, y_offset=y_offset_5, distances=distances), + baca.layout.System(221, y_offset=y_offset_1, distances=distances), + baca.layout.System(226, y_offset=y_offset_2, distances=distances), + baca.layout.System(231, y_offset=y_offset_3, distances=distances), + baca.layout.System(236, y_offset=y_offset_4, distances=distances), + baca.layout.System(241, y_offset=y_offset_5, distances=distances), ), - baca.page( + baca.layout.page( 11, - baca.system(measure=246, y_offset=y_offset_1, distances=distances), - baca.system(measure=251, y_offset=y_offset_2, distances=distances), - baca.system(measure=256, y_offset=y_offset_3, distances=distances), - baca.system(measure=261, y_offset=y_offset_4, distances=distances), - baca.system(measure=265, y_offset=y_offset_5, distances=distances), + baca.layout.System(246, y_offset=y_offset_1, distances=distances), + baca.layout.System(251, y_offset=y_offset_2, distances=distances), + baca.layout.System(256, y_offset=y_offset_3, distances=distances), + baca.layout.System(261, y_offset=y_offset_4, distances=distances), + baca.layout.System(265, y_offset=y_offset_5, distances=distances), ), - baca.page( + baca.layout.page( 12, - baca.system(measure=271, y_offset=y_offset_1, distances=distances), - baca.system(measure=276, y_offset=y_offset_2, distances=distances), - baca.system(measure=281, y_offset=y_offset_3, distances=distances), + baca.layout.System(271, y_offset=y_offset_1, distances=distances), + baca.layout.System(276, y_offset=y_offset_2, distances=distances), + baca.layout.System(281, y_offset=y_offset_3, distances=distances), ), - spacing=(1, 16), + default_spacing=(1, 16), ) - baca.section.make_layout_ly(layout) + baca.section.write_layout_ly(layout) if __name__ == "__main__": diff --git a/faberge/builds/a4-parts/viola/layout.py b/faberge/builds/a4-parts/viola/layout.py index e6532cba1..5e4f79802 100644 --- a/faberge/builds/a4-parts/viola/layout.py +++ b/faberge/builds/a4-parts/viola/layout.py @@ -11,117 +11,117 @@ 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=y_offset_3, distances=distances), - baca.system(measure=7, y_offset=y_offset_4, distances=distances), - baca.system(measure=13, y_offset=y_offset_5, distances=distances), - baca.system(measure=19, y_offset=y_offset_6, distances=distances), - baca.system(measure=25, y_offset=y_offset_7, distances=distances), - baca.system(measure=31, y_offset=y_offset_8, distances=distances), + baca.layout.System(1, y_offset=y_offset_3, distances=distances), + baca.layout.System(7, y_offset=y_offset_4, distances=distances), + baca.layout.System(13, y_offset=y_offset_5, distances=distances), + baca.layout.System(19, y_offset=y_offset_6, distances=distances), + baca.layout.System(25, y_offset=y_offset_7, distances=distances), + baca.layout.System(31, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 2, - baca.system(measure=37, y_offset=y_offset_1, distances=distances), - baca.system(measure=43, y_offset=y_offset_2, distances=distances), - baca.system(measure=49, y_offset=y_offset_3, distances=distances), - baca.system(measure=55, y_offset=y_offset_4, distances=distances), - baca.system(measure=61, y_offset=y_offset_5, distances=distances), - baca.system(measure=67, y_offset=y_offset_6, distances=distances), - baca.system(measure=73, y_offset=y_offset_7, distances=distances), - baca.system(measure=79, y_offset=y_offset_8, distances=distances), + baca.layout.System(37, y_offset=y_offset_1, distances=distances), + baca.layout.System(43, y_offset=y_offset_2, distances=distances), + baca.layout.System(49, y_offset=y_offset_3, distances=distances), + baca.layout.System(55, y_offset=y_offset_4, distances=distances), + baca.layout.System(61, y_offset=y_offset_5, distances=distances), + baca.layout.System(67, y_offset=y_offset_6, distances=distances), + baca.layout.System(73, y_offset=y_offset_7, distances=distances), + baca.layout.System(79, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 3, - baca.system(measure=84, y_offset=y_offset_1, distances=distances), - baca.system(measure=89, y_offset=y_offset_2, distances=distances), - baca.system(measure=93, y_offset=y_offset_3, distances=distances), - baca.system(measure=97, y_offset=y_offset_4, distances=distances), - baca.system(measure=101, y_offset=y_offset_5, distances=distances), - baca.system(measure=105, y_offset=y_offset_6, distances=distances), - baca.system(measure=109, y_offset=y_offset_7, distances=distances), - baca.system(measure=113, y_offset=y_offset_8, distances=distances), + baca.layout.System(84, y_offset=y_offset_1, distances=distances), + baca.layout.System(89, y_offset=y_offset_2, distances=distances), + baca.layout.System(93, y_offset=y_offset_3, distances=distances), + baca.layout.System(97, y_offset=y_offset_4, distances=distances), + baca.layout.System(101, y_offset=y_offset_5, distances=distances), + baca.layout.System(105, y_offset=y_offset_6, distances=distances), + baca.layout.System(109, y_offset=y_offset_7, distances=distances), + baca.layout.System(113, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 4, - baca.system(measure=117, y_offset=y_offset_1, distances=distances), - baca.system(measure=121, y_offset=y_offset_2, distances=distances), - baca.system(measure=125, y_offset=y_offset_3, distances=distances), - baca.system(measure=129, y_offset=y_offset_4, distances=distances), - baca.system(measure=133, y_offset=y_offset_5, distances=distances), - baca.system(measure=137, y_offset=y_offset_6, distances=distances), - baca.system(measure=141, y_offset=y_offset_7, distances=distances), - baca.system(measure=145, y_offset=y_offset_8, distances=distances), + baca.layout.System(117, y_offset=y_offset_1, distances=distances), + baca.layout.System(121, y_offset=y_offset_2, distances=distances), + baca.layout.System(125, y_offset=y_offset_3, distances=distances), + baca.layout.System(129, y_offset=y_offset_4, distances=distances), + baca.layout.System(133, y_offset=y_offset_5, distances=distances), + baca.layout.System(137, y_offset=y_offset_6, distances=distances), + baca.layout.System(141, y_offset=y_offset_7, distances=distances), + baca.layout.System(145, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 5, - baca.system(measure=149, y_offset=y_offset_1, distances=distances), - baca.system(measure=153, y_offset=y_offset_2, distances=distances), - baca.system(measure=157, y_offset=y_offset_3, distances=distances), - baca.system(measure=161, y_offset=y_offset_4, distances=distances), - baca.system(measure=164, y_offset=y_offset_5, distances=distances), - baca.system(measure=169, y_offset=y_offset_6, distances=distances), - baca.system(measure=173, y_offset=y_offset_7, distances=distances), - baca.system(measure=177, y_offset=y_offset_8, distances=distances), + baca.layout.System(149, y_offset=y_offset_1, distances=distances), + baca.layout.System(153, y_offset=y_offset_2, distances=distances), + baca.layout.System(157, y_offset=y_offset_3, distances=distances), + baca.layout.System(161, y_offset=y_offset_4, distances=distances), + baca.layout.System(164, y_offset=y_offset_5, distances=distances), + baca.layout.System(169, y_offset=y_offset_6, distances=distances), + baca.layout.System(173, y_offset=y_offset_7, distances=distances), + baca.layout.System(177, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 6, - baca.system(measure=181, y_offset=y_offset_1, distances=distances), - baca.system(measure=185, y_offset=y_offset_2, distances=distances), - baca.system(measure=189, y_offset=y_offset_3, distances=distances), - baca.system(measure=193, y_offset=y_offset_4, distances=distances), - baca.system(measure=197, y_offset=y_offset_5, distances=distances), - baca.system(measure=201, y_offset=y_offset_6, distances=distances), - baca.system(measure=204, y_offset=y_offset_7, distances=distances), - baca.system(measure=210, y_offset=y_offset_8, distances=distances), + baca.layout.System(181, y_offset=y_offset_1, distances=distances), + baca.layout.System(185, y_offset=y_offset_2, distances=distances), + baca.layout.System(189, y_offset=y_offset_3, distances=distances), + baca.layout.System(193, y_offset=y_offset_4, distances=distances), + baca.layout.System(197, y_offset=y_offset_5, distances=distances), + baca.layout.System(201, y_offset=y_offset_6, distances=distances), + baca.layout.System(204, y_offset=y_offset_7, distances=distances), + baca.layout.System(210, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 7, - baca.system(measure=213, y_offset=y_offset_1, distances=distances), - baca.system(measure=217, y_offset=y_offset_2, distances=distances), - baca.system(measure=219, y_offset=y_offset_3, distances=distances), - baca.system(measure=221, y_offset=y_offset_4, distances=distances), - baca.system( + baca.layout.System(213, y_offset=y_offset_1, distances=distances), + baca.layout.System(217, y_offset=y_offset_2, distances=distances), + baca.layout.System(219, y_offset=y_offset_3, distances=distances), + baca.layout.System(221, y_offset=y_offset_4, distances=distances), + baca.layout.System( measure=223, y_offset=y_offset_5, distances=(8,), ), - baca.system(measure=225, y_offset=y_offset_6, distances=distances), - baca.system(measure=228, y_offset=y_offset_7 + 4, distances=distances), - baca.system(measure=231, y_offset=y_offset_8, distances=distances), + baca.layout.System(225, y_offset=y_offset_6, distances=distances), + baca.layout.System(228, y_offset=y_offset_7 + 4, distances=distances), + baca.layout.System(231, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 8, - baca.system(measure=234, y_offset=y_offset_1, distances=distances), - baca.system(measure=238, y_offset=y_offset_2, distances=distances), - baca.system(measure=242, y_offset=y_offset_3, distances=distances), - baca.system(measure=246, y_offset=y_offset_4, distances=distances), - baca.system(measure=250, y_offset=y_offset_5, distances=distances), - baca.system(measure=254, y_offset=y_offset_6 + 2, distances=distances), - baca.system(measure=258, y_offset=y_offset_7, distances=distances), - baca.system(measure=262, y_offset=y_offset_8, distances=distances), + baca.layout.System(234, y_offset=y_offset_1, distances=distances), + baca.layout.System(238, y_offset=y_offset_2, distances=distances), + baca.layout.System(242, y_offset=y_offset_3, distances=distances), + baca.layout.System(246, y_offset=y_offset_4, distances=distances), + baca.layout.System(250, y_offset=y_offset_5, distances=distances), + baca.layout.System(254, y_offset=y_offset_6 + 2, distances=distances), + baca.layout.System(258, y_offset=y_offset_7, distances=distances), + baca.layout.System(262, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 9, - baca.system(measure=266, y_offset=y_offset_1, distances=distances), - baca.system(measure=270, y_offset=y_offset_2, distances=distances), - baca.system(measure=274, y_offset=y_offset_3, distances=distances), - baca.system(measure=277, y_offset=y_offset_4, distances=distances), - baca.system(measure=281, y_offset=y_offset_5, distances=distances), - baca.system(measure=284, y_offset=y_offset_6, distances=distances), + baca.layout.System(266, y_offset=y_offset_1, distances=distances), + baca.layout.System(270, y_offset=y_offset_2, distances=distances), + baca.layout.System(274, y_offset=y_offset_3, distances=distances), + baca.layout.System(277, y_offset=y_offset_4, distances=distances), + baca.layout.System(281, y_offset=y_offset_5, distances=distances), + baca.layout.System(284, y_offset=y_offset_6, distances=distances), ), - spacing=(1, 16), - overrides=( - baca.region((70, 72), (1, 4)), - baca.region([198, 200], (1, 2)), - baca.region([201, 203], (1, 2)), - baca.region(202, (1, 40)), - baca.region([205, 209], (1, 4)), - baca.region((274, 286), (1, 4)), + default_spacing=(1, 16), + spacing_overrides=( + baca.layout.Override((70, 72), (1, 4)), + baca.layout.Override([198, 200], (1, 2)), + baca.layout.Override([201, 203], (1, 2)), + baca.layout.Override(202, (1, 40)), + baca.layout.Override([205, 209], (1, 4)), + baca.layout.Override((274, 286), (1, 4)), ), ) - baca.section.make_layout_ly(layout) + baca.section.write_layout_ly(layout) if __name__ == "__main__": diff --git a/faberge/builds/a4-parts/violin/layout.py b/faberge/builds/a4-parts/violin/layout.py index 15f1dd277..e183f7f6f 100644 --- a/faberge/builds/a4-parts/violin/layout.py +++ b/faberge/builds/a4-parts/violin/layout.py @@ -11,117 +11,117 @@ 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=y_offset_3, distances=distances), - baca.system(measure=7, y_offset=y_offset_4, distances=distances), - baca.system(measure=13, y_offset=y_offset_5, distances=distances), - baca.system(measure=19, y_offset=y_offset_6, distances=distances), - baca.system(measure=25, y_offset=y_offset_7, distances=distances), - baca.system(measure=31, y_offset=y_offset_8, distances=distances), + baca.layout.System(1, y_offset=y_offset_3, distances=distances), + baca.layout.System(7, y_offset=y_offset_4, distances=distances), + baca.layout.System(13, y_offset=y_offset_5, distances=distances), + baca.layout.System(19, y_offset=y_offset_6, distances=distances), + baca.layout.System(25, y_offset=y_offset_7, distances=distances), + baca.layout.System(31, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 2, - baca.system(measure=37, y_offset=y_offset_1, distances=distances), - baca.system(measure=43, y_offset=y_offset_2, distances=distances), - baca.system(measure=49, y_offset=y_offset_3, distances=distances), - baca.system(measure=55, y_offset=y_offset_4, distances=distances), - baca.system(measure=61, y_offset=y_offset_5, distances=distances), - baca.system(measure=67, y_offset=y_offset_6, distances=distances), - baca.system(measure=73, y_offset=y_offset_7, distances=distances), - baca.system(measure=79, y_offset=y_offset_8, distances=distances), + baca.layout.System(37, y_offset=y_offset_1, distances=distances), + baca.layout.System(43, y_offset=y_offset_2, distances=distances), + baca.layout.System(49, y_offset=y_offset_3, distances=distances), + baca.layout.System(55, y_offset=y_offset_4, distances=distances), + baca.layout.System(61, y_offset=y_offset_5, distances=distances), + baca.layout.System(67, y_offset=y_offset_6, distances=distances), + baca.layout.System(73, y_offset=y_offset_7, distances=distances), + baca.layout.System(79, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 3, - baca.system(measure=85, y_offset=y_offset_1, distances=distances), - baca.system(measure=89, y_offset=y_offset_2, distances=distances), - baca.system(measure=93, y_offset=y_offset_3, distances=distances), - baca.system(measure=97, y_offset=y_offset_4, distances=distances), - baca.system(measure=101, y_offset=y_offset_5, distances=distances), - baca.system(measure=105, y_offset=y_offset_6, distances=distances), - baca.system(measure=109, y_offset=y_offset_7, distances=distances), - baca.system(measure=113, y_offset=y_offset_8, distances=distances), + baca.layout.System(85, y_offset=y_offset_1, distances=distances), + baca.layout.System(89, y_offset=y_offset_2, distances=distances), + baca.layout.System(93, y_offset=y_offset_3, distances=distances), + baca.layout.System(97, y_offset=y_offset_4, distances=distances), + baca.layout.System(101, y_offset=y_offset_5, distances=distances), + baca.layout.System(105, y_offset=y_offset_6, distances=distances), + baca.layout.System(109, y_offset=y_offset_7, distances=distances), + baca.layout.System(113, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 4, - baca.system(measure=117, y_offset=y_offset_1, distances=distances), - baca.system(measure=121, y_offset=y_offset_2, distances=distances), - baca.system(measure=125, y_offset=y_offset_3, distances=distances), - baca.system(measure=129, y_offset=y_offset_4, distances=distances), - baca.system(measure=133, y_offset=y_offset_5, distances=distances), - baca.system(measure=137, y_offset=y_offset_6, distances=distances), - baca.system(measure=141, y_offset=y_offset_7, distances=distances), - baca.system(measure=145, y_offset=y_offset_8, distances=distances), + baca.layout.System(117, y_offset=y_offset_1, distances=distances), + baca.layout.System(121, y_offset=y_offset_2, distances=distances), + baca.layout.System(125, y_offset=y_offset_3, distances=distances), + baca.layout.System(129, y_offset=y_offset_4, distances=distances), + baca.layout.System(133, y_offset=y_offset_5, distances=distances), + baca.layout.System(137, y_offset=y_offset_6, distances=distances), + baca.layout.System(141, y_offset=y_offset_7, distances=distances), + baca.layout.System(145, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 5, - baca.system(measure=149, y_offset=y_offset_1, distances=distances), - baca.system(measure=153, y_offset=y_offset_2, distances=distances), - baca.system(measure=157, y_offset=y_offset_3, distances=distances), - baca.system(measure=161, y_offset=y_offset_4, distances=distances), - baca.system(measure=164, y_offset=y_offset_5, distances=distances), - baca.system(measure=169, y_offset=y_offset_6, distances=distances), - baca.system(measure=173, y_offset=y_offset_7, distances=distances), - baca.system(measure=177, y_offset=y_offset_8, distances=distances), + baca.layout.System(149, y_offset=y_offset_1, distances=distances), + baca.layout.System(153, y_offset=y_offset_2, distances=distances), + baca.layout.System(157, y_offset=y_offset_3, distances=distances), + baca.layout.System(161, y_offset=y_offset_4, distances=distances), + baca.layout.System(164, y_offset=y_offset_5, distances=distances), + baca.layout.System(169, y_offset=y_offset_6, distances=distances), + baca.layout.System(173, y_offset=y_offset_7, distances=distances), + baca.layout.System(177, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 6, - baca.system(measure=181, y_offset=y_offset_1, distances=distances), - baca.system(measure=185, y_offset=y_offset_2, distances=distances), - baca.system(measure=189, y_offset=y_offset_3, distances=distances), - baca.system(measure=193, y_offset=y_offset_4, distances=distances), - baca.system(measure=197, y_offset=y_offset_5, distances=distances), - baca.system(measure=201, y_offset=y_offset_6, distances=distances), - baca.system(measure=204, y_offset=y_offset_7, distances=distances), - baca.system(measure=210, y_offset=y_offset_8, distances=distances), + baca.layout.System(181, y_offset=y_offset_1, distances=distances), + baca.layout.System(185, y_offset=y_offset_2, distances=distances), + baca.layout.System(189, y_offset=y_offset_3, distances=distances), + baca.layout.System(193, y_offset=y_offset_4, distances=distances), + baca.layout.System(197, y_offset=y_offset_5, distances=distances), + baca.layout.System(201, y_offset=y_offset_6, distances=distances), + baca.layout.System(204, y_offset=y_offset_7, distances=distances), + baca.layout.System(210, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 7, - baca.system(measure=213, y_offset=y_offset_1, distances=distances), - baca.system(measure=217, y_offset=y_offset_2, distances=distances), - baca.system(measure=219, y_offset=y_offset_3, distances=distances), - baca.system(measure=221, y_offset=y_offset_4, distances=distances), - baca.system( + baca.layout.System(213, y_offset=y_offset_1, distances=distances), + baca.layout.System(217, y_offset=y_offset_2, distances=distances), + baca.layout.System(219, y_offset=y_offset_3, distances=distances), + baca.layout.System(221, y_offset=y_offset_4, distances=distances), + baca.layout.System( measure=223, y_offset=y_offset_5, distances=(8,), ), - baca.system(measure=225, y_offset=y_offset_6, distances=distances), - baca.system(measure=228, y_offset=y_offset_7, distances=distances), - baca.system(measure=231, y_offset=y_offset_8, distances=distances), + baca.layout.System(225, y_offset=y_offset_6, distances=distances), + baca.layout.System(228, y_offset=y_offset_7, distances=distances), + baca.layout.System(231, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 8, - baca.system(measure=234, y_offset=y_offset_1, distances=distances), - baca.system(measure=238, y_offset=y_offset_2, distances=distances), - baca.system(measure=242, y_offset=y_offset_3, distances=distances), - baca.system(measure=246, y_offset=y_offset_4, distances=distances), - baca.system(measure=250, y_offset=y_offset_5, distances=distances), - baca.system(measure=254, y_offset=y_offset_6 + 2, distances=distances), - baca.system(measure=258, y_offset=y_offset_7, distances=distances), - baca.system(measure=262, y_offset=y_offset_8, distances=distances), + baca.layout.System(234, y_offset=y_offset_1, distances=distances), + baca.layout.System(238, y_offset=y_offset_2, distances=distances), + baca.layout.System(242, y_offset=y_offset_3, distances=distances), + baca.layout.System(246, y_offset=y_offset_4, distances=distances), + baca.layout.System(250, y_offset=y_offset_5, distances=distances), + baca.layout.System(254, y_offset=y_offset_6 + 2, distances=distances), + baca.layout.System(258, y_offset=y_offset_7, distances=distances), + baca.layout.System(262, y_offset=y_offset_8, distances=distances), ), - baca.page( + baca.layout.page( 9, - baca.system(measure=266, y_offset=y_offset_1, distances=distances), - baca.system(measure=270, y_offset=y_offset_2, distances=distances), - baca.system(measure=274, y_offset=y_offset_3, distances=distances), - baca.system(measure=277, y_offset=y_offset_4, distances=distances), - baca.system(measure=281, y_offset=y_offset_5, distances=distances), - baca.system(measure=284, y_offset=y_offset_6, distances=distances), + baca.layout.System(266, y_offset=y_offset_1, distances=distances), + baca.layout.System(270, y_offset=y_offset_2, distances=distances), + baca.layout.System(274, y_offset=y_offset_3, distances=distances), + baca.layout.System(277, y_offset=y_offset_4, distances=distances), + baca.layout.System(281, y_offset=y_offset_5, distances=distances), + baca.layout.System(284, y_offset=y_offset_6, distances=distances), ), - spacing=(1, 16), - overrides=( - baca.region((70, 72), (1, 4)), - baca.region([198, 200], (1, 2)), - baca.region([201, 203], (1, 2)), - baca.region(202, (1, 40)), - baca.region([205, 209], (1, 4)), - baca.region((274, 286), (1, 4)), + default_spacing=(1, 16), + spacing_overrides=( + baca.layout.Override((70, 72), (1, 4)), + baca.layout.Override([198, 200], (1, 2)), + baca.layout.Override([201, 203], (1, 2)), + baca.layout.Override(202, (1, 40)), + baca.layout.Override([205, 209], (1, 4)), + baca.layout.Override((274, 286), (1, 4)), ), ) - baca.section.make_layout_ly(layout) + baca.section.write_layout_ly(layout) if __name__ == "__main__": diff --git a/faberge/builds/arch-a-score/layout.py b/faberge/builds/arch-a-score/layout.py index ac050ef71..ede192019 100644 --- a/faberge/builds/arch-a-score/layout.py +++ b/faberge/builds/arch-a-score/layout.py @@ -3,260 +3,260 @@ def main(): distances = (24, (28, 28, 44), (22, 28, 44), (28, 28, 44)) - layout = baca.make_layout( - baca.page( + layout = baca.layout.layout( + baca.layout.page( 1, - baca.system( + baca.layout.System( measure=1, y_offset=75, distances=(24, (28, 28, 40), (22, 28, 40), (28, 28, 40)), ), ), - baca.page( + baca.layout.page( 2, - # baca.system(measure=7, 45, distances=distances), - baca.system(measure=8, y_offset=45, distances=distances), + # baca.layout.System(7, 45, distances=distances), + baca.layout.System(8, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 3, - # baca.system(measure=13, y_offset=45, distances=distances), - baca.system(measure=14, y_offset=45, distances=distances), + # baca.layout.System(13, y_offset=45, distances=distances), + baca.layout.System(14, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 4, - baca.system(measure=19, y_offset=45, distances=distances), + baca.layout.System(19, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 5, - baca.system(measure=25, y_offset=45, distances=distances), + baca.layout.System(25, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 6, - baca.system(measure=31, y_offset=45, distances=distances), + baca.layout.System(31, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 7, - baca.system(measure=37, y_offset=45, distances=distances), + baca.layout.System(37, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 8, - baca.system(measure=43, y_offset=45, distances=distances), + baca.layout.System(43, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 9, - baca.system(measure=49, y_offset=45, distances=distances), + baca.layout.System(49, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 10, - baca.system(measure=55, y_offset=45, distances=distances), + baca.layout.System(55, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 11, - baca.system(measure=61, y_offset=45, distances=distances), + baca.layout.System(61, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 12, - baca.system(measure=67, y_offset=45, distances=distances), + baca.layout.System(67, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 13, - baca.system(measure=73, y_offset=45, distances=distances), + baca.layout.System(73, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 14, - baca.system(measure=79, y_offset=45, distances=distances), + baca.layout.System(79, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 15, - baca.system(measure=84, y_offset=45, distances=distances), + baca.layout.System(84, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 16, - baca.system(measure=88, y_offset=45, distances=distances), + baca.layout.System(88, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 17, - baca.system(measure=92, y_offset=45, distances=distances), + baca.layout.System(92, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 18, - baca.system(measure=96, y_offset=45, distances=distances), + baca.layout.System(96, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 19, - baca.system(measure=100, y_offset=45, distances=distances), + baca.layout.System(100, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 20, - baca.system(measure=104, y_offset=45, distances=distances), + baca.layout.System(104, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 21, - baca.system(measure=108, y_offset=45, distances=distances), + baca.layout.System(108, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 22, - baca.system(measure=112, y_offset=45, distances=distances), + baca.layout.System(112, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 23, - baca.system(measure=116, y_offset=45, distances=distances), + baca.layout.System(116, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 24, - baca.system(measure=120, y_offset=45, distances=distances), + baca.layout.System(120, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 25, - baca.system(measure=124, y_offset=45, distances=distances), + baca.layout.System(124, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 26, - baca.system(measure=128, y_offset=45, distances=distances), + baca.layout.System(128, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 27, - baca.system(measure=132, y_offset=45, distances=distances), + baca.layout.System(132, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 28, - baca.system(measure=136, y_offset=45, distances=distances), + baca.layout.System(136, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 29, - baca.system(measure=140, y_offset=45, distances=distances), + baca.layout.System(140, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 30, - baca.system(measure=144, y_offset=45, distances=distances), + baca.layout.System(144, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 31, - baca.system(measure=148, y_offset=45, distances=distances), + baca.layout.System(148, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 32, - baca.system(measure=152, y_offset=45, distances=distances), + baca.layout.System(152, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 33, - baca.system(measure=156, y_offset=45, distances=distances), + baca.layout.System(156, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 34, - baca.system(measure=162, y_offset=45, distances=distances), + baca.layout.System(162, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 35, - baca.system(measure=167, y_offset=45, distances=distances), + baca.layout.System(167, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 36, - # baca.system(measure=176, y_offset=45, distances=distances), - baca.system(measure=175, y_offset=45, distances=distances), + # baca.layout.System(176, y_offset=45, distances=distances), + baca.layout.System(175, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 37, - baca.system(measure=182, y_offset=45, distances=distances), + baca.layout.System(182, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 38, - baca.system(measure=187, y_offset=45, distances=distances), + baca.layout.System(187, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 39, - baca.system(measure=192, y_offset=45, distances=distances), + baca.layout.System(192, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 40, - # baca.system(measure=198, y_offset=45, distances=distances), - # baca.system(measure=197, y_offset=45, distances=distances), - # baca.system(measure=199, y_offset=45, distances=distances), - baca.system(measure=198, y_offset=45, distances=distances), + # baca.layout.System(198, y_offset=45, distances=distances), + # baca.layout.System(197, y_offset=45, distances=distances), + # baca.layout.System(199, y_offset=45, distances=distances), + baca.layout.System(198, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 41, - baca.system(measure=202, y_offset=45, distances=distances), + baca.layout.System(202, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 42, - baca.system(measure=207, y_offset=45, distances=distances), + baca.layout.System(207, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 43, - baca.system(measure=212, y_offset=45, distances=distances), + baca.layout.System(212, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 44, - baca.system(measure=217, y_offset=45, distances=distances), + baca.layout.System(217, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 45, - baca.system(measure=222, y_offset=45, distances=distances), + baca.layout.System(222, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 46, - # baca.system(measure=227, y_offset=45, distances=distances), - baca.system(measure=226, y_offset=45, distances=distances), + # baca.layout.System(227, y_offset=45, distances=distances), + baca.layout.System(226, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 47, - baca.system(measure=232, y_offset=45, distances=distances), + baca.layout.System(232, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 48, - baca.system(measure=237, y_offset=45, distances=distances), + baca.layout.System(237, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 49, - baca.system(measure=242, y_offset=45, distances=distances), + baca.layout.System(242, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 50, - baca.system(measure=247, y_offset=45, distances=distances), + baca.layout.System(247, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 51, - baca.system(measure=252, y_offset=45, distances=distances), + baca.layout.System(252, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 52, - baca.system(measure=257, y_offset=45, distances=distances), + baca.layout.System(257, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 53, - baca.system(measure=261, y_offset=45, distances=distances), + baca.layout.System(261, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 54, - baca.system(measure=267, y_offset=45, distances=distances), + baca.layout.System(267, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 55, - baca.system(measure=272, y_offset=45, distances=distances), + baca.layout.System(272, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 56, - baca.system(measure=276, y_offset=45, distances=distances), + baca.layout.System(276, y_offset=45, distances=distances), ), - baca.page( + baca.layout.page( 57, - baca.system(measure=282, y_offset=45, distances=distances), - ), - spacing=(1, 32), - overrides=( - baca.region((1, 84), (1, 32)), - baca.region([2, 4], (1, 4)), - baca.region((85, 156), (1, 48)), - baca.region((157, 286), (1, 32)), - baca.region(166, (1, 48)), - baca.region(195, (1, 16)), - baca.region(202, (1, 48)), - baca.region((203, 206), (1, 24)), - baca.region([193, 196, 211, 216, 227, 278], (1, 4)), + baca.layout.System(282, y_offset=45, distances=distances), + ), + default_spacing=(1, 32), + spacing_overrides=( + baca.layout.Override((1, 84), (1, 32)), + baca.layout.Override([2, 4], (1, 4)), + baca.layout.Override((85, 156), (1, 48)), + baca.layout.Override((157, 286), (1, 32)), + baca.layout.Override(166, (1, 48)), + baca.layout.Override(195, (1, 16)), + baca.layout.Override(202, (1, 48)), + baca.layout.Override((203, 206), (1, 24)), + baca.layout.Override([193, 196, 211, 216, 227, 278], (1, 4)), ), ) - baca.section.make_layout_ly(layout) + baca.section.write_layout_ly(layout) if __name__ == "__main__": diff --git a/faberge/sections/01/music.py b/faberge/sections/01/music.py index 5e5d9cfd8..c2c05ea04 100644 --- a/faberge/sections/01/music.py +++ b/faberge/sections/01/music.py @@ -287,18 +287,18 @@ def persist_score(score, environment): def make_layout(): - layout = baca.make_layout( - baca.page( + layout = baca.layout.layout( + baca.layout.page( 1, - baca.system( + baca.layout.System( measure=1, y_offset=70, distances=[18, (18, 18, 24), (18, 18, 24), (18, 18, 24)], ), ), - spacing=(1, 28), + default_spacing=(1, 28), ) - baca.section.make_layout_ly(layout) + baca.section.write_layout_ly(layout) def main(): diff --git a/faberge/sections/02/music.py b/faberge/sections/02/music.py index 436b67ebf..b8d85b1d5 100644 --- a/faberge/sections/02/music.py +++ b/faberge/sections/02/music.py @@ -1040,21 +1040,21 @@ def make_layout(): for page_index in range(page_count): page_number = page_index + 1 start_measure_number = measures_per_page * page_index + 1 - page = baca.page( + page = baca.layout.page( page_number, - baca.system( + baca.layout.System( measure=start_measure_number, y_offset=40, distances=distances, ), ) pages.append(page) - layout = baca.make_layout( + layout = baca.layout.layout( *pages, - spacing=(1, 48), - overrides=(baca.region(1, (1, 56)),), + default_spacing=(1, 48), + spacing_overrides=(baca.layout.Override(1, (1, 56)),), ) - baca.section.make_layout_ly(layout) + baca.section.write_layout_ly(layout) def main(): diff --git a/faberge/sections/03/music.py b/faberge/sections/03/music.py index e1d8a5c5d..42073703d 100644 --- a/faberge/sections/03/music.py +++ b/faberge/sections/03/music.py @@ -1085,16 +1085,16 @@ def make_layout(): for page_index in range(page_count): page_number = page_index + 1 start_measure_number = measures_per_page * page_index + 1 - page = baca.page( + page = baca.layout.page( page_number, - baca.system(measure=start_measure_number, y_offset=40, distances=distances), + baca.layout.System(start_measure_number, y_offset=40, distances=distances), ) pages.append(page) - layout = baca.make_layout( + layout = baca.layout.layout( *pages, - spacing=(1, 48), + default_spacing=(1, 48), ) - baca.section.make_layout_ly(layout) + baca.section.write_layout_ly(layout) def main(): diff --git a/faberge/sections/04/music.py b/faberge/sections/04/music.py index f23b9625e..6679a2453 100644 --- a/faberge/sections/04/music.py +++ b/faberge/sections/04/music.py @@ -544,15 +544,15 @@ def persist_score(score, environment, voice_name_to_parameter_to_state): def make_layout(): distances = [18, (21, 21, 24), (21, 21, 24), (21, 21, 24)] - layout = baca.make_layout( - baca.page( + layout = baca.layout.layout( + baca.layout.page( 1, - baca.system(measure=1, y_offset=40, distances=distances), + baca.layout.System(1, y_offset=40, distances=distances), ), - spacing=(1, 24), - overrides=(baca.region((5, 8), (1, 32)),), + default_spacing=(1, 24), + spacing_overrides=(baca.layout.Override((5, 8), (1, 32)),), ) - baca.section.make_layout_ly(layout) + baca.section.write_layout_ly(layout) def main(): diff --git a/faberge/sections/05/music.py b/faberge/sections/05/music.py index 63829ded3..64e67dc2f 100644 --- a/faberge/sections/05/music.py +++ b/faberge/sections/05/music.py @@ -504,14 +504,14 @@ def persist_score(score, environment, voice_name_to_parameter_to_state): def make_layout(): distances = [18, (21, 21, 24), (21, 21, 24), (21, 21, 24)] - layout = baca.make_layout( - baca.page( + layout = baca.layout.layout( + baca.layout.page( 1, - baca.system(measure=1, y_offset=40, distances=distances), + baca.layout.System(1, y_offset=40, distances=distances), ), - spacing=(1, 24), + default_spacing=(1, 24), ) - baca.section.make_layout_ly(layout) + baca.section.write_layout_ly(layout) def main(): diff --git a/faberge/sections/06/music.py b/faberge/sections/06/music.py index 77179c500..d2188e50f 100644 --- a/faberge/sections/06/music.py +++ b/faberge/sections/06/music.py @@ -642,14 +642,14 @@ def persist_score(score, environment): def make_layout(): distances = [18, (21, 21, 24), (21, 21, 24), (24, 24, 24)] - layout = baca.make_layout( - baca.page( + layout = baca.layout.layout( + baca.layout.page( 1, - baca.system(measure=1, y_offset=40, distances=distances), + baca.layout.System(1, y_offset=40, distances=distances), ), - spacing=(1, 24), + default_spacing=(1, 24), ) - baca.section.make_layout_ly(layout) + baca.section.write_layout_ly(layout) def main(): diff --git a/faberge/sections/07/music.py b/faberge/sections/07/music.py index 5b061ca3e..31a344c0b 100644 --- a/faberge/sections/07/music.py +++ b/faberge/sections/07/music.py @@ -737,18 +737,18 @@ def persist_score(score, environment): def make_layout(): distances = [18, (21, 21, 24), (21, 21, 24), (21, 21, 24)] - layout = baca.make_layout( - baca.page( + layout = baca.layout.layout( + baca.layout.page( 1, - baca.system(measure=1, y_offset=40, distances=distances), + baca.layout.System(1, y_offset=40, distances=distances), ), - spacing=(1, 20), - overrides=( - baca.region(1, (1, 40)), - baca.region((2, 4), (1, 24)), + default_spacing=(1, 20), + spacing_overrides=( + baca.layout.Override(1, (1, 40)), + baca.layout.Override((2, 4), (1, 24)), ), ) - baca.section.make_layout_ly(layout) + baca.section.write_layout_ly(layout) def main(): diff --git a/faberge/sections/08/music.py b/faberge/sections/08/music.py index 346c747c4..640137f58 100644 --- a/faberge/sections/08/music.py +++ b/faberge/sections/08/music.py @@ -657,14 +657,14 @@ def persist_score(score, environment): def make_layout(): distances = [18, (21, 21, 24), (21, 21, 24), (21, 21, 24)] - layout = baca.make_layout( - baca.page( + layout = baca.layout.layout( + baca.layout.page( 1, - baca.system(measure=1, y_offset=40, distances=distances), + baca.layout.System(1, y_offset=40, distances=distances), ), - spacing=(1, 16), + default_spacing=(1, 16), ) - baca.section.make_layout_ly(layout) + baca.section.write_layout_ly(layout) def main(): diff --git a/faberge/sections/09/music.py b/faberge/sections/09/music.py index 059c93912..bff0cd919 100644 --- a/faberge/sections/09/music.py +++ b/faberge/sections/09/music.py @@ -709,15 +709,15 @@ def persist_score(score, environment): def make_layout(): distances = [18, (21, 21, 24), (18, 18, 24), (27, 27, 27)] - layout = baca.make_layout( - baca.page( + layout = baca.layout.layout( + baca.layout.page( 1, - baca.system(measure=1, y_offset=40, distances=distances), + baca.layout.System(1, y_offset=40, distances=distances), ), - spacing=(1, 16), - overrides=(baca.region((1, 4), (1, 12)),), + default_spacing=(1, 16), + spacing_overrides=(baca.layout.Override((1, 4), (1, 12)),), ) - baca.section.make_layout_ly(layout) + baca.section.write_layout_ly(layout) def main(): diff --git a/faberge/sections/10/music.py b/faberge/sections/10/music.py index b3fc99bc7..de89a4ad3 100644 --- a/faberge/sections/10/music.py +++ b/faberge/sections/10/music.py @@ -727,14 +727,14 @@ def persist_score(score, environment, voice_name_to_parameter_to_state): def make_layout(): distances = [18, (21, 21, 24), (21, 21, 24), (21, 21, 24)] - layout = baca.make_layout( - baca.page( + layout = baca.layout.layout( + baca.layout.page( 1, - baca.system(measure=1, y_offset=40, distances=distances), + baca.layout.System(1, y_offset=40, distances=distances), ), - spacing=(1, 16), + default_spacing=(1, 16), ) - baca.section.make_layout_ly(layout) + baca.section.write_layout_ly(layout) def main(): diff --git a/faberge/sections/11/music.py b/faberge/sections/11/music.py index 28c94769e..4f2e3a3c9 100644 --- a/faberge/sections/11/music.py +++ b/faberge/sections/11/music.py @@ -674,15 +674,15 @@ def persist_score(score, environment, voice_name_to_parameter_to_state): def make_layout(): distances = [18, (21, 21, 24), (21, 21, 24), (21, 21, 24)] - layout = baca.make_layout( - baca.page( + layout = baca.layout.layout( + baca.layout.page( 1, - baca.system(measure=1, y_offset=40, distances=distances), + baca.layout.System(1, y_offset=40, distances=distances), ), - spacing=(1, 20), - overrides=(baca.region((1, 4), (1, 32)),), + default_spacing=(1, 20), + spacing_overrides=(baca.layout.Override((1, 4), (1, 32)),), ) - baca.section.make_layout_ly(layout) + baca.section.write_layout_ly(layout) def main(): diff --git a/faberge/sections/12/music.py b/faberge/sections/12/music.py index 23b90b6d5..4ec9ceec8 100644 --- a/faberge/sections/12/music.py +++ b/faberge/sections/12/music.py @@ -618,14 +618,14 @@ def persist_score(score, environment): def make_layout(): distances = [18, (21, 21, 24), (21, 21, 24), (21, 21, 24)] - layout = baca.make_layout( - baca.page( + layout = baca.layout.layout( + baca.layout.page( 1, - baca.system(measure=1, y_offset=40, distances=distances), + baca.layout.System(1, y_offset=40, distances=distances), ), - spacing=(1, 24), + default_spacing=(1, 24), ) - baca.section.make_layout_ly(layout) + baca.section.write_layout_ly(layout) def main(): diff --git a/faberge/sections/13/music.py b/faberge/sections/13/music.py index c30f96828..dec6fa071 100644 --- a/faberge/sections/13/music.py +++ b/faberge/sections/13/music.py @@ -643,14 +643,14 @@ def persist_score(score, environment, voice_name_to_parameter_to_state): def make_layout(): distances = [18, (21, 21, 24), (21, 21, 24), (21, 21, 24)] - layout = baca.make_layout( - baca.page( + layout = baca.layout.layout( + baca.layout.page( 1, - baca.system(measure=1, y_offset=40, distances=distances), + baca.layout.System(1, y_offset=40, distances=distances), ), - spacing=(1, 24), + default_spacing=(1, 24), ) - baca.section.make_layout_ly(layout) + baca.section.write_layout_ly(layout) def main(): diff --git a/faberge/sections/14/music.py b/faberge/sections/14/music.py index bb32a9f54..1fa3d56ae 100644 --- a/faberge/sections/14/music.py +++ b/faberge/sections/14/music.py @@ -552,14 +552,14 @@ def persist_score(score, environment, voice_name_to_parameter_to_state): def make_layout(): distances = [18, (21, 21, 24), (21, 21, 24), (21, 21, 24)] - layout = baca.make_layout( - baca.page( + layout = baca.layout.layout( + baca.layout.page( 1, - baca.system(measure=1, y_offset=40, distances=distances), + baca.layout.System(1, y_offset=40, distances=distances), ), - spacing=(1, 24), + default_spacing=(1, 24), ) - baca.section.make_layout_ly(layout) + baca.section.write_layout_ly(layout) def main(): diff --git a/faberge/sections/15/music.py b/faberge/sections/15/music.py index b0c3c5e6d..cff584a72 100644 --- a/faberge/sections/15/music.py +++ b/faberge/sections/15/music.py @@ -465,14 +465,14 @@ def persist_score(score, environment): def make_layout(): distances = [18, (21, 21, 24), (21, 21, 24), (21, 21, 24)] - layout = baca.make_layout( - baca.page( + layout = baca.layout.layout( + baca.layout.page( 1, - baca.system(measure=1, y_offset=40, distances=distances), + baca.layout.System(1, y_offset=40, distances=distances), ), - spacing=(1, 20), + default_spacing=(1, 20), ) - baca.section.make_layout_ly(layout) + baca.section.write_layout_ly(layout) def main(): diff --git a/faberge/sections/16/music.py b/faberge/sections/16/music.py index 1fe3569b8..e134576ee 100644 --- a/faberge/sections/16/music.py +++ b/faberge/sections/16/music.py @@ -303,14 +303,14 @@ def persist_score(score, environment): def make_layout(): distances = [18, (21, 21, 24), (21, 21, 24), (21, 21, 24)] - layout = baca.make_layout( - baca.page( + layout = baca.layout.layout( + baca.layout.page( 1, - baca.system(measure=1, y_offset=40, distances=distances), + baca.layout.System(1, y_offset=40, distances=distances), ), - spacing=(1, 12), + default_spacing=(1, 12), ) - baca.section.make_layout_ly(layout) + baca.section.write_layout_ly(layout) def main():