Cleaned up breaks.

trevorbaca · Jun 21, 2024 · 7d96f66 · 7d96f66
1 parent 0f42381
commit 7d96f66
Show file tree

Hide file tree

Showing 25 changed files with 40,522 additions and 22,962 deletions.
diff --git a/faberge/builds/a4-parts/cello/layout.ily b/faberge/builds/a4-parts/cello/layout.ily
diff --git a/faberge/builds/a4-parts/clarinet/layout.ily b/faberge/builds/a4-parts/clarinet/layout.ily
diff --git a/faberge/builds/a4-parts/english-horn/layout.ily b/faberge/builds/a4-parts/english-horn/layout.ily
diff --git a/faberge/builds/a4-parts/flute/layout.ily b/faberge/builds/a4-parts/flute/layout.ily
diff --git a/faberge/builds/a4-parts/percussion/layout.ily b/faberge/builds/a4-parts/percussion/layout.ily
diff --git a/faberge/builds/a4-parts/piano/layout.ily b/faberge/builds/a4-parts/piano/layout.ily
diff --git a/faberge/builds/a4-parts/viola/layout.ily b/faberge/builds/a4-parts/viola/layout.ily
diff --git a/faberge/builds/a4-parts/violin/layout.ily b/faberge/builds/a4-parts/violin/layout.ily
diff --git a/faberge/builds/arch-a-score/layout.ily b/faberge/builds/arch-a-score/layout.ily
diff --git a/faberge/sections/01/layout.ily b/faberge/sections/01/layout.ily
@@ -11,57 +11,21 @@
         {   %*% PageLayout
 
             % [PageLayout measure 1]
-              %! SPACING_COMMAND
-            \baca-new-strict-spacing-section #1 #28
             s1 * 3/4
-              %! SPACING
-            %@% - \baca-start-spm-left-only "[1/28]"
-              %! SPACING
-            %@% \bacaStartTextSpanSPM
 
             % [PageLayout measure 2]
-              %! SPACING_COMMAND
-            \baca-new-strict-spacing-section #1 #4
             s1 * 1/4
-              %! SPACING
-            %@% \bacaStopTextSpanSPM
-              %! SPACING
-            %@% - \baca-start-spm-left-only "[1/4]"
-              %! SPACING
-            %@% \bacaStartTextSpanSPM
 
             % [PageLayout measure 3]
-              %! SPACING_COMMAND
-            \baca-new-strict-spacing-section #1 #28
             s1 * 4/4
-              %! SPACING
-            %@% \bacaStopTextSpanSPM
-              %! SPACING
-            %@% - \baca-start-spm-left-only "[1/28]"
-              %! SPACING
-            %@% \bacaStartTextSpanSPM
 
             % [PageLayout measure 4]
-              %! SPACING_COMMAND
-            \baca-new-strict-spacing-section #1 #4
             s1 * 1/4
-              %! SPACING
-            %@% \bacaStopTextSpanSPM
-              %! SPACING
-            %@% - \baca-start-spm-left-only "[1/4]"
-              %! SPACING
-            %@% \bacaStartTextSpanSPM
 
             % [anchor skip]
               %! ANCHOR_SKIP
-              %! SPACING_COMMAND
-            \baca-new-strict-spacing-section #1 #4
-              %! ANCHOR_SKIP
             s1 * 1/4
               %! ANCHOR_SKIP
-              %! SPACING
-            %@% \bacaStopTextSpanSPM
-              %! ANCHOR_SKIP
             \once \override Score.BarLine.transparent = ##t
               %! ANCHOR_SKIP
             \once \override Score.SpanBar.transparent = ##t
@@ -96,6 +60,82 @@
 
         }   %*% Breaks
 
+        \context GlobalSkips = "SpacingCommands"
+        {   %*% SpacingCommands
+
+            % [SpacingCommands measure 1]
+              %! SPACING_COMMAND
+            \baca-new-strict-spacing-section #1 #28
+            s1 * 3/4
+
+            % [SpacingCommands measure 2]
+              %! SPACING_COMMAND
+            \baca-new-strict-spacing-section #1 #4
+            s1 * 1/4
+
+            % [SpacingCommands measure 3]
+              %! SPACING_COMMAND
+            \baca-new-strict-spacing-section #1 #28
+            s1 * 4/4
+
+            % [SpacingCommands measure 4]
+              %! SPACING_COMMAND
+            \baca-new-strict-spacing-section #1 #4
+            s1 * 1/4
+
+            % [anchor skip]
+              %! SPACING_COMMAND
+            \baca-new-strict-spacing-section #1 #4
+              %! ANCHOR_SKIP
+            s1 * 1/4
+
+        }   %*% SpacingCommands
+
+        \context GlobalSkips = "SpacingAnnotations"
+        {   %*% SpacingAnnotations
+
+            % [SpacingAnnotations measure 1]
+            s1 * 3/4
+              %! SPACING
+            %@% - \baca-start-spm-left-only "[1/28]"
+              %! SPACING
+            %@% \bacaStartTextSpanSPM
+
+            % [SpacingAnnotations measure 2]
+            s1 * 1/4
+              %! SPACING
+            %@% \bacaStopTextSpanSPM
+              %! SPACING
+            %@% - \baca-start-spm-left-only "[1/4]"
+              %! SPACING
+            %@% \bacaStartTextSpanSPM
+
+            % [SpacingAnnotations measure 3]
+            s1 * 4/4
+              %! SPACING
+            %@% \bacaStopTextSpanSPM
+              %! SPACING
+            %@% - \baca-start-spm-left-only "[1/28]"
+              %! SPACING
+            %@% \bacaStartTextSpanSPM
+
+            % [SpacingAnnotations measure 4]
+            s1 * 1/4
+              %! SPACING
+            %@% \bacaStopTextSpanSPM
+              %! SPACING
+            %@% - \baca-start-spm-left-only "[1/4]"
+              %! SPACING
+            %@% \bacaStartTextSpanSPM
+
+            % [anchor skip]
+              %! ANCHOR_SKIP
+            s1 * 1/4
+              %! SPACING
+            %@% \bacaStopTextSpanSPM
+
+        }   %*% SpacingAnnotations
+
     >>
 
 >>