diff --git a/faberge/builds/a4-parts/cello/layout.py b/faberge/builds/a4-parts/cello/layout.py index ac87973d4d..e441536d86 100644 --- a/faberge/builds/a4-parts/cello/layout.py +++ b/faberge/builds/a4-parts/cello/layout.py @@ -11,8 +11,8 @@ def main(): y_offset_6 = 152 y_offset_7 = 180 y_offset_8 = 208 - layout = baca.layout.layout( - baca.layout.page( + layout = baca.layout.Layout( + baca.layout.Page( 1, # baca.layout.System(1, y_offset=57, distances=distances), baca.layout.System(1, y_offset=y_offset_3, distances=distances), @@ -22,7 +22,7 @@ def main(): baca.layout.System(33, y_offset=y_offset_7, distances=distances), baca.layout.System(41, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 2, baca.layout.System(49, y_offset=y_offset_1, distances=distances), baca.layout.System(57, y_offset=y_offset_2, distances=distances), @@ -33,7 +33,7 @@ def main(): baca.layout.System(97, y_offset=y_offset_7, distances=distances), baca.layout.System(105, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 3, baca.layout.System(113, y_offset=y_offset_1, distances=distances), baca.layout.System(121, y_offset=y_offset_2, distances=distances), @@ -44,7 +44,7 @@ def main(): baca.layout.System(157, y_offset=y_offset_7, distances=distances), baca.layout.System(162, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 4, baca.layout.System(167, y_offset=y_offset_1, distances=distances), baca.layout.System(171, y_offset=y_offset_2, distances=distances), @@ -55,7 +55,7 @@ def main(): baca.layout.System(191, y_offset=y_offset_7, distances=distances), baca.layout.System(195, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 5, baca.layout.System(199, y_offset=y_offset_1, distances=distances), baca.layout.System(203, y_offset=y_offset_2, distances=distances), @@ -66,7 +66,7 @@ def main(): baca.layout.System(223, y_offset=y_offset_7, distances=distances), baca.layout.System(226, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 6, baca.layout.System(230, y_offset=y_offset_1, distances=distances), baca.layout.System(234, y_offset=y_offset_2, distances=distances), @@ -77,7 +77,7 @@ def main(): baca.layout.System(255, y_offset=y_offset_7, distances=distances), baca.layout.System(259, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 7, baca.layout.System(263, y_offset=y_offset_1, distances=distances), baca.layout.System(267, y_offset=y_offset_2, distances=distances), diff --git a/faberge/builds/a4-parts/clarinet/layout.py b/faberge/builds/a4-parts/clarinet/layout.py index 666a50b2e7..9c1f89cbea 100644 --- a/faberge/builds/a4-parts/clarinet/layout.py +++ b/faberge/builds/a4-parts/clarinet/layout.py @@ -11,8 +11,8 @@ def main(): y_offset_6 = 152 y_offset_7 = 180 y_offset_8 = 208 - layout = baca.layout.layout( - baca.layout.page( + layout = baca.layout.Layout( + baca.layout.Page( 1, baca.layout.System(1, y_offset=y_offset_3, distances=distances), baca.layout.System(7, y_offset=y_offset_4, distances=distances), @@ -21,7 +21,7 @@ def main(): baca.layout.System(25, y_offset=y_offset_7, distances=distances), baca.layout.System(31, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 2, baca.layout.System(37, y_offset=y_offset_1, distances=distances), baca.layout.System(43, y_offset=y_offset_2, distances=distances), @@ -32,7 +32,7 @@ def main(): baca.layout.System(73, y_offset=y_offset_7, distances=distances), baca.layout.System(79, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 3, baca.layout.System(85, y_offset=y_offset_1, distances=distances), baca.layout.System(89, y_offset=y_offset_2, distances=distances), @@ -43,7 +43,7 @@ def main(): baca.layout.System(109, y_offset=y_offset_7, distances=distances), baca.layout.System(113, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 4, baca.layout.System(117, y_offset=y_offset_1, distances=distances), baca.layout.System(121, y_offset=y_offset_2, distances=distances), @@ -54,7 +54,7 @@ def main(): baca.layout.System(141, y_offset=y_offset_7, distances=distances), baca.layout.System(145, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 5, baca.layout.System(149, y_offset=y_offset_1, distances=distances), baca.layout.System(153, y_offset=y_offset_2, distances=distances), @@ -65,7 +65,7 @@ def main(): baca.layout.System(173, y_offset=y_offset_7, distances=distances), baca.layout.System(177, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 6, baca.layout.System(181, y_offset=y_offset_1, distances=distances), baca.layout.System(185, y_offset=y_offset_2, distances=distances), @@ -76,7 +76,7 @@ def main(): baca.layout.System(205, y_offset=y_offset_7, distances=distances), baca.layout.System(208, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 7, baca.layout.System(213, y_offset=y_offset_1, distances=distances), baca.layout.System(217, y_offset=y_offset_2, distances=distances), @@ -87,7 +87,7 @@ def main(): baca.layout.System(235, y_offset=y_offset_7, distances=distances), baca.layout.System(238, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 8, baca.layout.System(241, y_offset=y_offset_1, distances=distances), baca.layout.System(245, y_offset=y_offset_2, distances=distances), @@ -98,7 +98,7 @@ def main(): baca.layout.System(265, y_offset=y_offset_7, distances=distances), baca.layout.System(269, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 9, baca.layout.System(273, y_offset=y_offset_1, distances=distances), baca.layout.System(276, y_offset=y_offset_2, distances=distances), diff --git a/faberge/builds/a4-parts/english-horn/layout.py b/faberge/builds/a4-parts/english-horn/layout.py index 545c8bfbfd..0f24b861f9 100644 --- a/faberge/builds/a4-parts/english-horn/layout.py +++ b/faberge/builds/a4-parts/english-horn/layout.py @@ -11,8 +11,8 @@ def main(): y_offset_6 = 152 y_offset_7 = 180 y_offset_8 = 208 - layout = baca.layout.layout( - baca.layout.page( + layout = baca.layout.Layout( + baca.layout.Page( 1, baca.layout.System(1, y_offset=y_offset_3, distances=distances), baca.layout.System(7, y_offset=y_offset_4, distances=distances), @@ -21,7 +21,7 @@ def main(): baca.layout.System(25, y_offset=y_offset_7, distances=distances), baca.layout.System(32, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 2, baca.layout.System(35, y_offset=y_offset_1, distances=distances), baca.layout.System(45, y_offset=y_offset_2, distances=distances), @@ -32,7 +32,7 @@ def main(): baca.layout.System(70, y_offset=y_offset_7, distances=distances), baca.layout.System(79, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 3, baca.layout.System(85, y_offset=y_offset_1, distances=distances), baca.layout.System(87, y_offset=y_offset_2, distances=distances), @@ -43,7 +43,7 @@ def main(): baca.layout.System(97, y_offset=y_offset_7, distances=distances), baca.layout.System(99, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 4, baca.layout.System(101, y_offset=y_offset_1, distances=distances), baca.layout.System(103, y_offset=y_offset_2, distances=distances), @@ -54,7 +54,7 @@ def main(): baca.layout.System(113, y_offset=y_offset_7, distances=distances), baca.layout.System(115, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 5, baca.layout.System(117, y_offset=y_offset_1, distances=distances), baca.layout.System(119, y_offset=y_offset_2, distances=distances), @@ -65,7 +65,7 @@ def main(): baca.layout.System(135, y_offset=y_offset_7, distances=distances), baca.layout.System(137, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 6, baca.layout.System(141, y_offset=y_offset_1, distances=distances), baca.layout.System(143, y_offset=y_offset_2, distances=distances), @@ -76,7 +76,7 @@ def main(): baca.layout.System(153, y_offset=y_offset_7, distances=distances), baca.layout.System(155, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 7, baca.layout.System(157, y_offset=y_offset_1, distances=distances), baca.layout.System(161, y_offset=y_offset_2, distances=distances), @@ -87,7 +87,7 @@ def main(): baca.layout.System(181, y_offset=y_offset_7, distances=distances), baca.layout.System(185, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 8, baca.layout.System(189, y_offset=y_offset_1, distances=distances), baca.layout.System(193, y_offset=y_offset_2, distances=distances), @@ -98,7 +98,7 @@ def main(): baca.layout.System(213, y_offset=y_offset_7, distances=distances), baca.layout.System(218, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 9, baca.layout.System(222, y_offset=y_offset_1, distances=distances), baca.layout.System(224, y_offset=y_offset_2, distances=distances), @@ -109,7 +109,7 @@ def main(): baca.layout.System(245, y_offset=y_offset_7, distances=distances), baca.layout.System(249, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 10, baca.layout.System(253, y_offset=y_offset_1, distances=distances), baca.layout.System(257, y_offset=y_offset_2, distances=distances), diff --git a/faberge/builds/a4-parts/flute/layout.py b/faberge/builds/a4-parts/flute/layout.py index d1b715c2bb..8a65a9dcf3 100644 --- a/faberge/builds/a4-parts/flute/layout.py +++ b/faberge/builds/a4-parts/flute/layout.py @@ -11,8 +11,8 @@ def main(): y_offset_6 = 152 y_offset_7 = 180 y_offset_8 = 208 - layout = baca.layout.layout( - baca.layout.page( + layout = baca.layout.Layout( + baca.layout.Page( 1, baca.layout.System(1, y_offset=y_offset_3, distances=distances), baca.layout.System(7, y_offset=y_offset_4, distances=distances), @@ -21,7 +21,7 @@ def main(): baca.layout.System(25, y_offset=y_offset_7, distances=distances), baca.layout.System(31, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 2, baca.layout.System(37, y_offset=y_offset_1, distances=distances), baca.layout.System(43, y_offset=y_offset_2, distances=distances), @@ -32,7 +32,7 @@ def main(): baca.layout.System(73, y_offset=y_offset_7, distances=distances), baca.layout.System(79, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 3, baca.layout.System(85, y_offset=y_offset_1, distances=distances), baca.layout.System(89, y_offset=y_offset_2, distances=distances), @@ -43,7 +43,7 @@ def main(): baca.layout.System(109, y_offset=y_offset_7, distances=distances), baca.layout.System(113, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 4, baca.layout.System(117, y_offset=y_offset_1, distances=distances), baca.layout.System(121, y_offset=y_offset_2, distances=distances), @@ -54,7 +54,7 @@ def main(): baca.layout.System(141, y_offset=y_offset_7, distances=distances), baca.layout.System(145, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 5, baca.layout.System(149, y_offset=y_offset_1, distances=distances), baca.layout.System(153, y_offset=y_offset_2, distances=distances), @@ -65,7 +65,7 @@ def main(): baca.layout.System(173, y_offset=y_offset_7, distances=distances), baca.layout.System(177, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 6, baca.layout.System(181, y_offset=y_offset_1, distances=distances), baca.layout.System(185, y_offset=y_offset_2, distances=distances), @@ -76,7 +76,7 @@ def main(): baca.layout.System(205, y_offset=y_offset_7, distances=distances), baca.layout.System(209, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 7, baca.layout.System(213, y_offset=y_offset_1, distances=distances), baca.layout.System(217, y_offset=y_offset_2, distances=distances), @@ -87,7 +87,7 @@ def main(): baca.layout.System(237, y_offset=y_offset_7, distances=distances), baca.layout.System(241, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 8, baca.layout.System(245, y_offset=y_offset_1, distances=distances), baca.layout.System(249, y_offset=y_offset_2, distances=distances), @@ -98,7 +98,7 @@ def main(): baca.layout.System(269, y_offset=y_offset_7, distances=distances), baca.layout.System(273, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 9, baca.layout.System(277, y_offset=y_offset_1, distances=distances), baca.layout.System(281, y_offset=y_offset_2, distances=distances), diff --git a/faberge/builds/a4-parts/percussion/layout.py b/faberge/builds/a4-parts/percussion/layout.py index a088c5daaa..d4eab9e1b2 100644 --- a/faberge/builds/a4-parts/percussion/layout.py +++ b/faberge/builds/a4-parts/percussion/layout.py @@ -11,8 +11,8 @@ def main(): y_offset_6 = 152 y_offset_7 = 180 y_offset_8 = 208 - layout = baca.layout.layout( - baca.layout.page( + layout = baca.layout.Layout( + baca.layout.Page( 1, baca.layout.System(1, y_offset=y_offset_3, distances=distances), baca.layout.System(7, y_offset=y_offset_4, distances=distances), @@ -21,7 +21,7 @@ def main(): baca.layout.System(25, y_offset=y_offset_7, distances=distances), baca.layout.System(31, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 2, baca.layout.System(37, y_offset=y_offset_1, distances=distances), baca.layout.System(43, y_offset=y_offset_2, distances=distances), @@ -32,7 +32,7 @@ def main(): baca.layout.System(73, y_offset=y_offset_7, distances=distances), baca.layout.System(79, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 3, baca.layout.System(85, y_offset=y_offset_1, distances=distances), baca.layout.System(89, y_offset=y_offset_2, distances=distances), @@ -43,7 +43,7 @@ def main(): baca.layout.System(109, y_offset=y_offset_7, distances=distances), baca.layout.System(113, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 4, baca.layout.System(117, y_offset=y_offset_1, distances=distances), baca.layout.System(121, y_offset=y_offset_2, distances=distances), @@ -54,7 +54,7 @@ def main(): baca.layout.System(141, y_offset=y_offset_7, distances=distances), baca.layout.System(145, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 5, baca.layout.System(149, y_offset=y_offset_1, distances=distances), baca.layout.System(153, y_offset=y_offset_2, distances=distances), @@ -65,7 +65,7 @@ def main(): baca.layout.System(173, y_offset=y_offset_7, distances=distances), baca.layout.System(177, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 6, baca.layout.System(181, y_offset=y_offset_1, distances=distances), baca.layout.System(185, y_offset=y_offset_2, distances=distances), @@ -76,7 +76,7 @@ def main(): baca.layout.System(205, y_offset=y_offset_7, distances=distances), baca.layout.System(209, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 7, baca.layout.System(213, y_offset=y_offset_1, distances=distances), baca.layout.System(217, y_offset=y_offset_2, distances=distances), @@ -91,7 +91,7 @@ def main(): ), baca.layout.System(241, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 8, baca.layout.System(245, y_offset=y_offset_1, distances=distances), baca.layout.System(249, y_offset=y_offset_2, distances=distances), @@ -102,7 +102,7 @@ def main(): baca.layout.System(269, y_offset=y_offset_7, distances=distances), baca.layout.System(273, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 9, baca.layout.System(277, y_offset=y_offset_1, distances=distances), baca.layout.System(281, y_offset=y_offset_2, distances=distances), diff --git a/faberge/builds/a4-parts/piano/layout.py b/faberge/builds/a4-parts/piano/layout.py index a7ebd4c464..b56a2ed6bf 100644 --- a/faberge/builds/a4-parts/piano/layout.py +++ b/faberge/builds/a4-parts/piano/layout.py @@ -8,15 +8,15 @@ def main(): y_offset_3 = 100 y_offset_4 = 144 y_offset_5 = 188 - layout = baca.layout.layout( - baca.layout.page( + layout = baca.layout.Layout( + baca.layout.Page( 1, 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.layout.page( + baca.layout.Page( 2, baca.layout.System(21, y_offset=y_offset_1, distances=distances), baca.layout.System(26, y_offset=y_offset_2, distances=distances), @@ -24,7 +24,7 @@ def main(): baca.layout.System(36, y_offset=y_offset_4, distances=distances), baca.layout.System(41, y_offset=y_offset_5, distances=distances), ), - baca.layout.page( + baca.layout.Page( 3, baca.layout.System(46, y_offset=y_offset_1, distances=distances), baca.layout.System(51, y_offset=y_offset_2, distances=distances), @@ -32,7 +32,7 @@ def main(): baca.layout.System(61, y_offset=y_offset_4, distances=distances), baca.layout.System(66, y_offset=y_offset_5, distances=distances), ), - baca.layout.page( + baca.layout.Page( 4, baca.layout.System(71, y_offset=y_offset_1, distances=distances), baca.layout.System(76, y_offset=y_offset_2, distances=distances), @@ -40,7 +40,7 @@ def main(): baca.layout.System(86, y_offset=y_offset_4, distances=distances), baca.layout.System(91, y_offset=y_offset_5, distances=distances), ), - baca.layout.page( + baca.layout.Page( 5, baca.layout.System(96, y_offset=y_offset_1, distances=distances), baca.layout.System(101, y_offset=y_offset_2, distances=distances), @@ -48,7 +48,7 @@ def main(): baca.layout.System(111, y_offset=y_offset_4, distances=distances), baca.layout.System(116, y_offset=y_offset_5, distances=distances), ), - baca.layout.page( + baca.layout.Page( 6, baca.layout.System(121, y_offset=y_offset_1, distances=distances), baca.layout.System(126, y_offset=y_offset_2, distances=distances), @@ -56,7 +56,7 @@ def main(): baca.layout.System(136, y_offset=y_offset_4, distances=distances), baca.layout.System(141, y_offset=y_offset_5, distances=distances), ), - baca.layout.page( + baca.layout.Page( 7, baca.layout.System(146, y_offset=y_offset_1, distances=distances), baca.layout.System(151, y_offset=y_offset_2, distances=distances), @@ -64,7 +64,7 @@ def main(): baca.layout.System(161, y_offset=y_offset_4, distances=distances), baca.layout.System(166, y_offset=y_offset_5, distances=distances), ), - baca.layout.page( + baca.layout.Page( 8, baca.layout.System(171, y_offset=y_offset_1, distances=distances), baca.layout.System(176, y_offset=y_offset_2, distances=distances), @@ -72,7 +72,7 @@ def main(): baca.layout.System(186, y_offset=y_offset_4, distances=distances), baca.layout.System(191, y_offset=y_offset_5, distances=distances), ), - baca.layout.page( + baca.layout.Page( 9, baca.layout.System(196, y_offset=y_offset_1, distances=distances), baca.layout.System(201, y_offset=y_offset_2, distances=distances), @@ -80,7 +80,7 @@ def main(): baca.layout.System(211, y_offset=y_offset_4, distances=distances), baca.layout.System(216, y_offset=y_offset_5, distances=distances), ), - baca.layout.page( + baca.layout.Page( 10, baca.layout.System(221, y_offset=y_offset_1, distances=distances), baca.layout.System(226, y_offset=y_offset_2, distances=distances), @@ -88,7 +88,7 @@ def main(): baca.layout.System(236, y_offset=y_offset_4, distances=distances), baca.layout.System(241, y_offset=y_offset_5, distances=distances), ), - baca.layout.page( + baca.layout.Page( 11, baca.layout.System(246, y_offset=y_offset_1, distances=distances), baca.layout.System(251, y_offset=y_offset_2, distances=distances), @@ -96,7 +96,7 @@ def main(): baca.layout.System(261, y_offset=y_offset_4, distances=distances), baca.layout.System(265, y_offset=y_offset_5, distances=distances), ), - baca.layout.page( + baca.layout.Page( 12, baca.layout.System(271, y_offset=y_offset_1, distances=distances), baca.layout.System(276, y_offset=y_offset_2, distances=distances), diff --git a/faberge/builds/a4-parts/viola/layout.py b/faberge/builds/a4-parts/viola/layout.py index aa5fd17d3a..de10e0f9a0 100644 --- a/faberge/builds/a4-parts/viola/layout.py +++ b/faberge/builds/a4-parts/viola/layout.py @@ -11,8 +11,8 @@ def main(): y_offset_6 = 152 y_offset_7 = 180 y_offset_8 = 208 - layout = baca.layout.layout( - baca.layout.page( + layout = baca.layout.Layout( + baca.layout.Page( 1, baca.layout.System(1, y_offset=y_offset_3, distances=distances), baca.layout.System(7, y_offset=y_offset_4, distances=distances), @@ -21,7 +21,7 @@ def main(): baca.layout.System(25, y_offset=y_offset_7, distances=distances), baca.layout.System(31, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 2, baca.layout.System(37, y_offset=y_offset_1, distances=distances), baca.layout.System(43, y_offset=y_offset_2, distances=distances), @@ -32,7 +32,7 @@ def main(): baca.layout.System(73, y_offset=y_offset_7, distances=distances), baca.layout.System(79, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 3, baca.layout.System(84, y_offset=y_offset_1, distances=distances), baca.layout.System(89, y_offset=y_offset_2, distances=distances), @@ -43,7 +43,7 @@ def main(): baca.layout.System(109, y_offset=y_offset_7, distances=distances), baca.layout.System(113, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 4, baca.layout.System(117, y_offset=y_offset_1, distances=distances), baca.layout.System(121, y_offset=y_offset_2, distances=distances), @@ -54,7 +54,7 @@ def main(): baca.layout.System(141, y_offset=y_offset_7, distances=distances), baca.layout.System(145, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 5, baca.layout.System(149, y_offset=y_offset_1, distances=distances), baca.layout.System(153, y_offset=y_offset_2, distances=distances), @@ -65,7 +65,7 @@ def main(): baca.layout.System(173, y_offset=y_offset_7, distances=distances), baca.layout.System(177, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 6, baca.layout.System(181, y_offset=y_offset_1, distances=distances), baca.layout.System(185, y_offset=y_offset_2, distances=distances), @@ -76,7 +76,7 @@ def main(): baca.layout.System(204, y_offset=y_offset_7, distances=distances), baca.layout.System(210, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 7, baca.layout.System(213, y_offset=y_offset_1, distances=distances), baca.layout.System(217, y_offset=y_offset_2, distances=distances), @@ -91,7 +91,7 @@ def main(): baca.layout.System(228, y_offset=y_offset_7 + 4, distances=distances), baca.layout.System(231, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 8, baca.layout.System(234, y_offset=y_offset_1, distances=distances), baca.layout.System(238, y_offset=y_offset_2, distances=distances), @@ -102,7 +102,7 @@ def main(): baca.layout.System(258, y_offset=y_offset_7, distances=distances), baca.layout.System(262, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 9, baca.layout.System(266, y_offset=y_offset_1, distances=distances), baca.layout.System(270, y_offset=y_offset_2, distances=distances), diff --git a/faberge/builds/a4-parts/violin/layout.py b/faberge/builds/a4-parts/violin/layout.py index a83fb35ac9..a00fe4f36e 100644 --- a/faberge/builds/a4-parts/violin/layout.py +++ b/faberge/builds/a4-parts/violin/layout.py @@ -11,8 +11,8 @@ def main(): y_offset_6 = 152 y_offset_7 = 180 y_offset_8 = 208 - layout = baca.layout.layout( - baca.layout.page( + layout = baca.layout.Layout( + baca.layout.Page( 1, baca.layout.System(1, y_offset=y_offset_3, distances=distances), baca.layout.System(7, y_offset=y_offset_4, distances=distances), @@ -21,7 +21,7 @@ def main(): baca.layout.System(25, y_offset=y_offset_7, distances=distances), baca.layout.System(31, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 2, baca.layout.System(37, y_offset=y_offset_1, distances=distances), baca.layout.System(43, y_offset=y_offset_2, distances=distances), @@ -32,7 +32,7 @@ def main(): baca.layout.System(73, y_offset=y_offset_7, distances=distances), baca.layout.System(79, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 3, baca.layout.System(85, y_offset=y_offset_1, distances=distances), baca.layout.System(89, y_offset=y_offset_2, distances=distances), @@ -43,7 +43,7 @@ def main(): baca.layout.System(109, y_offset=y_offset_7, distances=distances), baca.layout.System(113, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 4, baca.layout.System(117, y_offset=y_offset_1, distances=distances), baca.layout.System(121, y_offset=y_offset_2, distances=distances), @@ -54,7 +54,7 @@ def main(): baca.layout.System(141, y_offset=y_offset_7, distances=distances), baca.layout.System(145, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 5, baca.layout.System(149, y_offset=y_offset_1, distances=distances), baca.layout.System(153, y_offset=y_offset_2, distances=distances), @@ -65,7 +65,7 @@ def main(): baca.layout.System(173, y_offset=y_offset_7, distances=distances), baca.layout.System(177, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 6, baca.layout.System(181, y_offset=y_offset_1, distances=distances), baca.layout.System(185, y_offset=y_offset_2, distances=distances), @@ -76,7 +76,7 @@ def main(): baca.layout.System(204, y_offset=y_offset_7, distances=distances), baca.layout.System(210, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 7, baca.layout.System(213, y_offset=y_offset_1, distances=distances), baca.layout.System(217, y_offset=y_offset_2, distances=distances), @@ -91,7 +91,7 @@ def main(): baca.layout.System(228, y_offset=y_offset_7, distances=distances), baca.layout.System(231, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 8, baca.layout.System(234, y_offset=y_offset_1, distances=distances), baca.layout.System(238, y_offset=y_offset_2, distances=distances), @@ -102,7 +102,7 @@ def main(): baca.layout.System(258, y_offset=y_offset_7, distances=distances), baca.layout.System(262, y_offset=y_offset_8, distances=distances), ), - baca.layout.page( + baca.layout.Page( 9, baca.layout.System(266, y_offset=y_offset_1, distances=distances), baca.layout.System(270, y_offset=y_offset_2, distances=distances), diff --git a/faberge/builds/arch-a-score/layout.py b/faberge/builds/arch-a-score/layout.py index 03316db451..7d7377ed3d 100644 --- a/faberge/builds/arch-a-score/layout.py +++ b/faberge/builds/arch-a-score/layout.py @@ -3,8 +3,8 @@ def main(): distances = (24, (28, 28, 44), (22, 28, 44), (28, 28, 44)) - layout = baca.layout.layout( - baca.layout.page( + layout = baca.layout.Layout( + baca.layout.Page( 1, baca.layout.System( measure=1, @@ -12,234 +12,234 @@ def main(): distances=(24, (28, 28, 40), (22, 28, 40), (28, 28, 40)), ), ), - baca.layout.page( + baca.layout.Page( 2, # baca.layout.System(7, 45, distances=distances), baca.layout.System(8, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 3, # baca.layout.System(13, y_offset=45, distances=distances), baca.layout.System(14, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 4, baca.layout.System(19, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 5, baca.layout.System(25, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 6, baca.layout.System(31, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 7, baca.layout.System(37, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 8, baca.layout.System(43, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 9, baca.layout.System(49, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 10, baca.layout.System(55, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 11, baca.layout.System(61, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 12, baca.layout.System(67, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 13, baca.layout.System(73, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 14, baca.layout.System(79, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 15, baca.layout.System(84, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 16, baca.layout.System(88, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 17, baca.layout.System(92, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 18, baca.layout.System(96, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 19, baca.layout.System(100, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 20, baca.layout.System(104, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 21, baca.layout.System(108, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 22, baca.layout.System(112, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 23, baca.layout.System(116, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 24, baca.layout.System(120, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 25, baca.layout.System(124, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 26, baca.layout.System(128, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 27, baca.layout.System(132, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 28, baca.layout.System(136, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 29, baca.layout.System(140, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 30, baca.layout.System(144, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 31, baca.layout.System(148, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 32, baca.layout.System(152, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 33, baca.layout.System(156, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 34, baca.layout.System(162, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 35, baca.layout.System(167, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 36, # baca.layout.System(176, y_offset=45, distances=distances), baca.layout.System(175, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 37, baca.layout.System(182, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 38, baca.layout.System(187, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 39, baca.layout.System(192, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 40, # 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.layout.page( + baca.layout.Page( 41, baca.layout.System(202, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 42, baca.layout.System(207, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 43, baca.layout.System(212, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 44, baca.layout.System(217, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 45, baca.layout.System(222, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 46, # baca.layout.System(227, y_offset=45, distances=distances), baca.layout.System(226, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 47, baca.layout.System(232, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 48, baca.layout.System(237, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 49, baca.layout.System(242, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 50, baca.layout.System(247, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 51, baca.layout.System(252, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 52, baca.layout.System(257, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 53, baca.layout.System(261, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 54, baca.layout.System(267, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 55, baca.layout.System(272, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 56, baca.layout.System(276, y_offset=45, distances=distances), ), - baca.layout.page( + baca.layout.Page( 57, baca.layout.System(282, y_offset=45, distances=distances), ), diff --git a/faberge/sections/01/music.py b/faberge/sections/01/music.py index d0d1455dac..bbcf731eaa 100644 --- a/faberge/sections/01/music.py +++ b/faberge/sections/01/music.py @@ -287,8 +287,8 @@ def persist_score(score, environment): def make_layout(): - layout = baca.layout.layout( - baca.layout.page( + layout = baca.layout.Layout( + baca.layout.Page( 1, baca.layout.System( measure=1, diff --git a/faberge/sections/02/music.py b/faberge/sections/02/music.py index 022670ddb4..5dda10a535 100644 --- a/faberge/sections/02/music.py +++ b/faberge/sections/02/music.py @@ -1040,7 +1040,7 @@ 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.layout.page( + page = baca.layout.Page( page_number, baca.layout.System( measure=start_measure_number, @@ -1049,7 +1049,7 @@ def make_layout(): ), ) pages.append(page) - layout = baca.layout.layout( + layout = baca.layout.Layout( *pages, default_spacing=(1, 48), spacing_overrides=(baca.layout.Override(1, (1, 56)),), diff --git a/faberge/sections/03/music.py b/faberge/sections/03/music.py index 7c858aeb00..d822db35db 100644 --- a/faberge/sections/03/music.py +++ b/faberge/sections/03/music.py @@ -1085,12 +1085,12 @@ 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.layout.page( + page = baca.layout.Page( page_number, baca.layout.System(start_measure_number, y_offset=40, distances=distances), ) pages.append(page) - layout = baca.layout.layout( + layout = baca.layout.Layout( *pages, default_spacing=(1, 48), ) diff --git a/faberge/sections/04/music.py b/faberge/sections/04/music.py index c2a23ed533..3a929d30d1 100644 --- a/faberge/sections/04/music.py +++ b/faberge/sections/04/music.py @@ -544,8 +544,8 @@ 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.layout.layout( - baca.layout.page( + layout = baca.layout.Layout( + baca.layout.Page( 1, baca.layout.System(1, y_offset=40, distances=distances), ), diff --git a/faberge/sections/05/music.py b/faberge/sections/05/music.py index 16471ba706..4aea508462 100644 --- a/faberge/sections/05/music.py +++ b/faberge/sections/05/music.py @@ -504,8 +504,8 @@ 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.layout.layout( - baca.layout.page( + layout = baca.layout.Layout( + baca.layout.Page( 1, baca.layout.System(1, y_offset=40, distances=distances), ), diff --git a/faberge/sections/06/music.py b/faberge/sections/06/music.py index aacea1f6b3..c388c6b2d9 100644 --- a/faberge/sections/06/music.py +++ b/faberge/sections/06/music.py @@ -642,8 +642,8 @@ def persist_score(score, environment): def make_layout(): distances = [18, (21, 21, 24), (21, 21, 24), (24, 24, 24)] - layout = baca.layout.layout( - baca.layout.page( + layout = baca.layout.Layout( + baca.layout.Page( 1, baca.layout.System(1, y_offset=40, distances=distances), ), diff --git a/faberge/sections/07/music.py b/faberge/sections/07/music.py index 8b0ad14a0e..98521ef7a3 100644 --- a/faberge/sections/07/music.py +++ b/faberge/sections/07/music.py @@ -737,8 +737,8 @@ def persist_score(score, environment): def make_layout(): distances = [18, (21, 21, 24), (21, 21, 24), (21, 21, 24)] - layout = baca.layout.layout( - baca.layout.page( + layout = baca.layout.Layout( + baca.layout.Page( 1, baca.layout.System(1, y_offset=40, distances=distances), ), diff --git a/faberge/sections/08/music.py b/faberge/sections/08/music.py index c661e9a169..4d3e18ff19 100644 --- a/faberge/sections/08/music.py +++ b/faberge/sections/08/music.py @@ -657,8 +657,8 @@ def persist_score(score, environment): def make_layout(): distances = [18, (21, 21, 24), (21, 21, 24), (21, 21, 24)] - layout = baca.layout.layout( - baca.layout.page( + layout = baca.layout.Layout( + baca.layout.Page( 1, baca.layout.System(1, y_offset=40, distances=distances), ), diff --git a/faberge/sections/09/music.py b/faberge/sections/09/music.py index aa1b5e8e1d..3df3de2d9e 100644 --- a/faberge/sections/09/music.py +++ b/faberge/sections/09/music.py @@ -709,8 +709,8 @@ def persist_score(score, environment): def make_layout(): distances = [18, (21, 21, 24), (18, 18, 24), (27, 27, 27)] - layout = baca.layout.layout( - baca.layout.page( + layout = baca.layout.Layout( + baca.layout.Page( 1, baca.layout.System(1, y_offset=40, distances=distances), ), diff --git a/faberge/sections/10/music.py b/faberge/sections/10/music.py index 7b70457a2c..86261b5e91 100644 --- a/faberge/sections/10/music.py +++ b/faberge/sections/10/music.py @@ -727,8 +727,8 @@ 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.layout.layout( - baca.layout.page( + layout = baca.layout.Layout( + baca.layout.Page( 1, baca.layout.System(1, y_offset=40, distances=distances), ), diff --git a/faberge/sections/11/music.py b/faberge/sections/11/music.py index 25727e6c15..224865666d 100644 --- a/faberge/sections/11/music.py +++ b/faberge/sections/11/music.py @@ -674,8 +674,8 @@ 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.layout.layout( - baca.layout.page( + layout = baca.layout.Layout( + baca.layout.Page( 1, baca.layout.System(1, y_offset=40, distances=distances), ), diff --git a/faberge/sections/12/music.py b/faberge/sections/12/music.py index a66049a9a4..ae7bc8dbeb 100644 --- a/faberge/sections/12/music.py +++ b/faberge/sections/12/music.py @@ -618,8 +618,8 @@ def persist_score(score, environment): def make_layout(): distances = [18, (21, 21, 24), (21, 21, 24), (21, 21, 24)] - layout = baca.layout.layout( - baca.layout.page( + layout = baca.layout.Layout( + baca.layout.Page( 1, baca.layout.System(1, y_offset=40, distances=distances), ), diff --git a/faberge/sections/13/music.py b/faberge/sections/13/music.py index 4beb9b5e09..08e57d7136 100644 --- a/faberge/sections/13/music.py +++ b/faberge/sections/13/music.py @@ -643,8 +643,8 @@ 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.layout.layout( - baca.layout.page( + layout = baca.layout.Layout( + baca.layout.Page( 1, baca.layout.System(1, y_offset=40, distances=distances), ), diff --git a/faberge/sections/14/music.py b/faberge/sections/14/music.py index 3a14db8386..18743a60de 100644 --- a/faberge/sections/14/music.py +++ b/faberge/sections/14/music.py @@ -552,8 +552,8 @@ 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.layout.layout( - baca.layout.page( + layout = baca.layout.Layout( + baca.layout.Page( 1, baca.layout.System(1, y_offset=40, distances=distances), ), diff --git a/faberge/sections/15/music.py b/faberge/sections/15/music.py index 178706265e..26740681b1 100644 --- a/faberge/sections/15/music.py +++ b/faberge/sections/15/music.py @@ -465,8 +465,8 @@ def persist_score(score, environment): def make_layout(): distances = [18, (21, 21, 24), (21, 21, 24), (21, 21, 24)] - layout = baca.layout.layout( - baca.layout.page( + layout = baca.layout.Layout( + baca.layout.Page( 1, baca.layout.System(1, y_offset=40, distances=distances), ), diff --git a/faberge/sections/16/music.py b/faberge/sections/16/music.py index 5dac07cd07..abf96c8216 100644 --- a/faberge/sections/16/music.py +++ b/faberge/sections/16/music.py @@ -303,8 +303,8 @@ def persist_score(score, environment): def make_layout(): distances = [18, (21, 21, 24), (21, 21, 24), (21, 21, 24)] - layout = baca.layout.layout( - baca.layout.page( + layout = baca.layout.Layout( + baca.layout.Page( 1, baca.layout.System(1, y_offset=40, distances=distances), ),