diff --git a/faberge/sections/02/music.ily b/faberge/sections/02/music.ily index 3d50e5c65e..726d5456ec 100644 --- a/faberge/sections/02/music.ily +++ b/faberge/sections/02/music.ily @@ -5,14 +5,14 @@ number.2.Skips = { %@% \baca-thick-red-bar-line %! EXPLICIT_TIME_SIGNATURE_COLOR \baca-time-signature-color #blue - %! EXPLICIT_TIME_SIGNATURE - \time 3/4 %! RED_START_BAR %@% \tweak break-visibility ##(#t #t #f) %! RED_START_BAR %@% \tweak color #red %! RED_START_BAR %@% \mark \markup \with-dimensions-from \null "02" + %! EXPLICIT_TIME_SIGNATURE + \time 3/4 s1 * 3/4 %! +SECTION - \tweak extra-offset #'(0 . 18) diff --git a/faberge/sections/03/music.ily b/faberge/sections/03/music.ily index 0d1d7aefd6..925d5b0262 100644 --- a/faberge/sections/03/music.ily +++ b/faberge/sections/03/music.ily @@ -5,14 +5,14 @@ number.3.Skips = { %@% \baca-thick-red-bar-line %! EXPLICIT_TIME_SIGNATURE_COLOR \baca-time-signature-color #blue - %! EXPLICIT_TIME_SIGNATURE - \time 3/4 %! RED_START_BAR %@% \tweak break-visibility ##(#t #t #f) %! RED_START_BAR %@% \tweak color #red %! RED_START_BAR %@% \mark \markup \with-dimensions-from \null "03" + %! EXPLICIT_TIME_SIGNATURE + \time 3/4 s1 * 3/4 %! +SCORE %%% - \tweak extra-offset #'(0 . 14) diff --git a/faberge/sections/04/music.ily b/faberge/sections/04/music.ily index ec7030c00f..6c2ae5f606 100644 --- a/faberge/sections/04/music.ily +++ b/faberge/sections/04/music.ily @@ -5,14 +5,14 @@ number.4.Skips = { %@% \baca-thick-red-bar-line %! EXPLICIT_TIME_SIGNATURE_COLOR \baca-time-signature-color #blue - %! EXPLICIT_TIME_SIGNATURE - \time 3/4 %! RED_START_BAR %@% \tweak break-visibility ##(#t #t #f) %! RED_START_BAR %@% \tweak color #red %! RED_START_BAR %@% \mark \markup \with-dimensions-from \null "04" + %! EXPLICIT_TIME_SIGNATURE + \time 3/4 s1 * 3/4 %! +SCORE %%% - \tweak extra-offset #'(0 . 14) diff --git a/faberge/sections/05/music.ily b/faberge/sections/05/music.ily index 43eb5fc9ae..64cb4f7ac5 100644 --- a/faberge/sections/05/music.ily +++ b/faberge/sections/05/music.ily @@ -5,14 +5,14 @@ number.5.Skips = { %@% \baca-thick-red-bar-line %! EXPLICIT_TIME_SIGNATURE_COLOR \baca-time-signature-color #blue - %! EXPLICIT_TIME_SIGNATURE - \time 4/4 %! RED_START_BAR %@% \tweak break-visibility ##(#t #t #f) %! RED_START_BAR %@% \tweak color #red %! RED_START_BAR %@% \mark \markup \with-dimensions-from \null "05" + %! EXPLICIT_TIME_SIGNATURE + \time 4/4 s1 * 4/4 %! +SCORE %%% - \tweak extra-offset #'(0 . 14) diff --git a/faberge/sections/06/music.ily b/faberge/sections/06/music.ily index c55f3f59dd..652a2e2643 100644 --- a/faberge/sections/06/music.ily +++ b/faberge/sections/06/music.ily @@ -5,14 +5,14 @@ number.6.Skips = { %@% \baca-thick-red-bar-line %! EXPLICIT_TIME_SIGNATURE_COLOR \baca-time-signature-color #blue - %! EXPLICIT_TIME_SIGNATURE - \time 4/4 %! RED_START_BAR %@% \tweak break-visibility ##(#t #t #f) %! RED_START_BAR %@% \tweak color #red %! RED_START_BAR %@% \mark \markup \with-dimensions-from \null "06" + %! EXPLICIT_TIME_SIGNATURE + \time 4/4 s1 * 4/4 %! +SCORE %%% - \tweak extra-offset #'(0 . 14) diff --git a/faberge/sections/07/music.ily b/faberge/sections/07/music.ily index 0f3b328301..a749d034a1 100644 --- a/faberge/sections/07/music.ily +++ b/faberge/sections/07/music.ily @@ -5,14 +5,14 @@ number.7.Skips = { %@% \baca-thick-red-bar-line %! EXPLICIT_TIME_SIGNATURE_COLOR \baca-time-signature-color #blue - %! EXPLICIT_TIME_SIGNATURE - \time 7/4 %! RED_START_BAR %@% \tweak break-visibility ##(#t #t #f) %! RED_START_BAR %@% \tweak color #red %! RED_START_BAR %@% \mark \markup \with-dimensions-from \null "07" + %! EXPLICIT_TIME_SIGNATURE + \time 7/4 s1 * 7/4 %! +SCORE %%% - \tweak extra-offset #'(0 . 14) diff --git a/faberge/sections/08/music.ily b/faberge/sections/08/music.ily index cd5a5f1ae2..d45c0f72d2 100644 --- a/faberge/sections/08/music.ily +++ b/faberge/sections/08/music.ily @@ -5,14 +5,14 @@ number.8.Skips = { %@% \baca-thick-red-bar-line %! EXPLICIT_TIME_SIGNATURE_COLOR \baca-time-signature-color #blue - %! EXPLICIT_TIME_SIGNATURE - \time 6/4 %! RED_START_BAR %@% \tweak break-visibility ##(#t #t #f) %! RED_START_BAR %@% \tweak color #red %! RED_START_BAR %@% \mark \markup \with-dimensions-from \null "08" + %! EXPLICIT_TIME_SIGNATURE + \time 6/4 s1 * 6/4 %! +SCORE %%% - \tweak extra-offset #'(0 . 14) diff --git a/faberge/sections/09/music.ily b/faberge/sections/09/music.ily index 908dcf5ff7..66f5de0d1f 100644 --- a/faberge/sections/09/music.ily +++ b/faberge/sections/09/music.ily @@ -5,14 +5,14 @@ number.9.Skips = { %@% \baca-thick-red-bar-line %! EXPLICIT_TIME_SIGNATURE_COLOR \baca-time-signature-color #blue - %! EXPLICIT_TIME_SIGNATURE - \time 12/4 %! RED_START_BAR %@% \tweak break-visibility ##(#t #t #f) %! RED_START_BAR %@% \tweak color #red %! RED_START_BAR %@% \mark \markup \with-dimensions-from \null "09" + %! EXPLICIT_TIME_SIGNATURE + \time 12/4 s1 * 12/4 %! +SCORE %%% - \tweak extra-offset #'(0 . 14) diff --git a/faberge/sections/10/music.ily b/faberge/sections/10/music.ily index d71f9d008e..8b0df5bb65 100644 --- a/faberge/sections/10/music.ily +++ b/faberge/sections/10/music.ily @@ -5,14 +5,14 @@ number.10.Skips = { %@% \baca-thick-red-bar-line %! REAPPLIED_TIME_SIGNATURE_COLOR \baca-time-signature-color #(x11-color 'green4) - %! REAPPLIED_TIME_SIGNATURE - \time 6/4 %! RED_START_BAR %@% \tweak break-visibility ##(#t #t #f) %! RED_START_BAR %@% \tweak color #red %! RED_START_BAR %@% \mark \markup \with-dimensions-from \null "10" + %! REAPPLIED_TIME_SIGNATURE + \time 6/4 s1 * 6/4 %! +SCORE %%% - \tweak extra-offset #'(0 . 14) diff --git a/faberge/sections/11/music.ily b/faberge/sections/11/music.ily index 19f0093eaa..24495c4b8b 100644 --- a/faberge/sections/11/music.ily +++ b/faberge/sections/11/music.ily @@ -5,14 +5,14 @@ number.11.Skips = { %@% \baca-thick-red-bar-line %! EXPLICIT_TIME_SIGNATURE_COLOR \baca-time-signature-color #blue - %! EXPLICIT_TIME_SIGNATURE - \time 4/4 %! RED_START_BAR %@% \tweak break-visibility ##(#t #t #f) %! RED_START_BAR %@% \tweak color #red %! RED_START_BAR %@% \mark \markup \with-dimensions-from \null "11" + %! EXPLICIT_TIME_SIGNATURE + \time 4/4 s1 * 4/4 %! +SCORE %%% - \tweak extra-offset #'(0 . 14) diff --git a/faberge/sections/12/music.ily b/faberge/sections/12/music.ily index 28a8b15d31..fbbf44047a 100644 --- a/faberge/sections/12/music.ily +++ b/faberge/sections/12/music.ily @@ -5,14 +5,14 @@ number.12.Skips = { %@% \baca-thick-red-bar-line %! REAPPLIED_TIME_SIGNATURE_COLOR \baca-time-signature-color #(x11-color 'green4) - %! REAPPLIED_TIME_SIGNATURE - \time 5/4 %! RED_START_BAR %@% \tweak break-visibility ##(#t #t #f) %! RED_START_BAR %@% \tweak color #red %! RED_START_BAR %@% \mark \markup \with-dimensions-from \null "12" + %! REAPPLIED_TIME_SIGNATURE + \time 5/4 s1 * 5/4 %! +SCORE %%% - \tweak extra-offset #'(0 . 14) diff --git a/faberge/sections/13/music.ily b/faberge/sections/13/music.ily index 0d47e92913..d90857c4e8 100644 --- a/faberge/sections/13/music.ily +++ b/faberge/sections/13/music.ily @@ -5,14 +5,14 @@ number.13.Skips = { %@% \baca-thick-red-bar-line %! EXPLICIT_TIME_SIGNATURE_COLOR \baca-time-signature-color #blue - %! EXPLICIT_TIME_SIGNATURE - \time 7/4 %! RED_START_BAR %@% \tweak break-visibility ##(#t #t #f) %! RED_START_BAR %@% \tweak color #red %! RED_START_BAR %@% \mark \markup \with-dimensions-from \null "13" + %! EXPLICIT_TIME_SIGNATURE + \time 7/4 s1 * 7/4 %! +SCORE %%% - \tweak extra-offset #'(0 . 14) diff --git a/faberge/sections/14/music.ily b/faberge/sections/14/music.ily index 169e4c9755..dde0296628 100644 --- a/faberge/sections/14/music.ily +++ b/faberge/sections/14/music.ily @@ -5,14 +5,14 @@ number.14.Skips = { %@% \baca-thick-red-bar-line %! REAPPLIED_TIME_SIGNATURE_COLOR \baca-time-signature-color #(x11-color 'green4) - %! REAPPLIED_TIME_SIGNATURE - \time 4/4 %! RED_START_BAR %@% \tweak break-visibility ##(#t #t #f) %! RED_START_BAR %@% \tweak color #red %! RED_START_BAR %@% \mark \markup \with-dimensions-from \null "14" + %! REAPPLIED_TIME_SIGNATURE + \time 4/4 s1 * 4/4 %! +SCORE %%% - \tweak extra-offset #'(0 . 14) diff --git a/faberge/sections/15/music.ily b/faberge/sections/15/music.ily index 6911d123f4..be1490f719 100644 --- a/faberge/sections/15/music.ily +++ b/faberge/sections/15/music.ily @@ -5,14 +5,14 @@ number.15.Skips = { %@% \baca-thick-red-bar-line %! EXPLICIT_TIME_SIGNATURE_COLOR \baca-time-signature-color #blue - %! EXPLICIT_TIME_SIGNATURE - \time 3/4 %! RED_START_BAR %@% \tweak break-visibility ##(#t #t #f) %! RED_START_BAR %@% \tweak color #red %! RED_START_BAR %@% \mark \markup \with-dimensions-from \null "15" + %! EXPLICIT_TIME_SIGNATURE + \time 3/4 s1 * 3/4 %! +SCORE %%% - \tweak extra-offset #'(0 . 14) diff --git a/faberge/sections/16/music.ily b/faberge/sections/16/music.ily index 3bec61dba4..ec0ffa0d34 100644 --- a/faberge/sections/16/music.ily +++ b/faberge/sections/16/music.ily @@ -5,14 +5,14 @@ number.16.Skips = { %@% \baca-thick-red-bar-line %! EXPLICIT_TIME_SIGNATURE_COLOR \baca-time-signature-color #blue - %! EXPLICIT_TIME_SIGNATURE - \time 8/4 %! RED_START_BAR %@% \tweak break-visibility ##(#t #t #f) %! RED_START_BAR %@% \tweak color #red %! RED_START_BAR %@% \mark \markup \with-dimensions-from \null "16" + %! EXPLICIT_TIME_SIGNATURE + \time 8/4 s1 * 8/4 %! +SCORE %%% - \tweak extra-offset #'(0 . 14) @@ -1387,11 +1387,11 @@ number.16.Cello.Music = { - \accent % [Cello.Music measure 8] + \mark \faberge-colophon-markup \once \override Score.RehearsalMark.direction = #down \once \override Score.RehearsalMark.extra-offset = #'(40 . 0) \once \override Score.RehearsalMark.padding = 6 \once \override Score.RehearsalMark.self-alignment-X = #right - \mark \faberge-colophon-markup e,1.. :32 - \accent