[side,tenor] try out new repeat segno structure from ly:2.24.1 in 4/4 marches

This commit is contained in:
Eric Teunis de Boone 2023-09-06 02:19:01 +02:00
parent 88881dcd94
commit ee00c91bd6
11 changed files with 169 additions and 190 deletions

View File

@ -1,29 +1,27 @@
\version "2.18.2" \version "2.24.1"
\include "lilydrum.ly" \include "lilydrum.ly"
\include "./config.ily" \include "./config.ily"
\include "./notes.side.ily" \include "./notes.side.ily"
markTextEol = #(define-music-function (parser location text) (string?) #{
\once \override Score.RehearsalMark #'break-visibility = #end-of-line-visible
\once \override Score.RehearsalMark #'self-alignment-X = #RIGHT
\mark \markup $text
#})
\score { \score {
\new PipeBandDrumStaff { \new PipeBandDrumStaff {
\global \global
<< <<
\new NullVoice = "format" { \new NullVoice = "format" {
\repeat volta 2 { \repeat segno 2 {
\part \halfline \markTextEol "Fine" \repeat volta 2 {
\part \line
\volta 2 {
\fine
}
}
\break
\section
\part \line
\section
} }
\break
\part
\halfline
\markTextEol "D.C. al Fine"
\bar "||"
}%Format }%Format
\new DrumVoice = "side" { \new DrumVoice = "side" {
\sideglobal \sideglobal

View File

@ -1,34 +1,30 @@
\version "2.18.2" \version "2.24.1"
\include "lilydrum.ly" \include "lilydrum.ly"
\include "./config.ily" \include "./config.ily"
\include "./notes.side.ily" \include "./notes.side.ily"
markTextEol = #(define-music-function (parser location text) (string?) #{
\once \override Score.RehearsalMark #'break-visibility = #end-of-line-visible
\once \override Score.RehearsalMark #'self-alignment-X = #RIGHT
\mark \markup $text
#})
\score { \score {
\new PipeBandDrumStaff { \new PipeBandDrumStaff {
\global \global
\sideglobal
<< <<
\new NullVoice = "format" { \new NullVoice = "format" {
\repeat volta 2 { \repeat segno 2 {
\part \halfline \repeat volta 2 {
\part \halfline
\volta 2 {
\fine
}
}
\break
\section
\part \repeat unfold 4 \measure
\section
} }
\markTextEol "Fine"
\break
\part \repeat unfold 4 \measure
\markTextEol "D.C. al Fine"
\bar "|."
}%Format }%Format
\new DrumVoice = "side" { \new DrumVoice = "side" {
\sideglobal
\snareA s4 \snareA s4
\snareBA s4 \snareBA s4

View File

@ -1,35 +1,28 @@
\version "2.18.2" \version "2.24.1"
\include "lilydrum.ly" \include "lilydrum.ly"
\include "./config.ily" \include "./config.ily"
\include "./notes.side.ily" \include "./notes.side.ily"
markTextEol = #(define-music-function (parser location text) (string?) #{
\once \override Score.RehearsalMark #'break-visibility = #end-of-line-visible
\once \override Score.RehearsalMark #'self-alignment-X = #RIGHT
\mark \markup $text
#})
\score { \score {
\new PipeBandDrumStaff { \new PipeBandDrumStaff {
\global \global
<< \sideglobal
\new NullVoice = "format" { \repeat segno 2 {
\repeat volta 2 { \repeat volta 2 {
\part \halfline \markTextEol "Fine" \partial 4
} \snareA
\break
\part \halfline \markTextEol "D.C. al Fine"\bar "||"
}%Format
\new DrumVoice = "side" {
\sideglobal
\snareA s4
\snareBA
} }
>> \volta 2 \fine
\volta 1 {
\allowBreak
\break
\snareBA
\section
}
}
} }
\header { \header {
title = \title title = \title

View File

@ -1,31 +1,28 @@
\version "2.18.2" \version "2.24.1"
\include "lilydrum.ly" \include "lilydrum.ly"
\include "./config.ily" \include "./config.ily"
\include "./notes.side.ily" \include "./notes.side.ily"
markTextEol = #(define-music-function (parser location text) (string?) #{
\once \override Score.RehearsalMark #'break-visibility = #end-of-line-visible
\once \override Score.RehearsalMark #'self-alignment-X = #RIGHT
\mark \markup $text
#})
\score { \score {
\new PipeBandDrumStaff { \new PipeBandDrumStaff {
\global \global
\sideglobal \sideglobal
<< %\unfoldRepeats
{ \repeat segno 2 {
\repeat volta 2 {\part \line \markTextEol "Fine" \break } \repeat volta 2 {
\part \line \markTextEol "D.C. al Fine" \bar "||" \partial 8 \snareA
} }
{ \volta 2 \fine
\snareA s8 \volta 1 {
\allowBreak
\snareBAhigh \section
\partial 8 \snareBAhigh
\section
\allowBreak
} }
>> }
} }
\header { \header {
title = #(string-append title " (high)" ) title = #(string-append title " (high)" )

View File

@ -1,26 +1,30 @@
\version "2.18.2" \version "2.24.1"
\include "lilydrum.ly" \include "lilydrum.ly"
\include "./config.ily" \include "./config.ily"
\include "./notes.side.ily" \include "./notes.side.ily"
markTextEol = #(define-music-function (parser location text) (string?) #{
\once \override Score.RehearsalMark #'break-visibility = #end-of-line-visible
\once \override Score.RehearsalMark #'self-alignment-X = #RIGHT
\mark \markup $text
#})
\score { \score {
\new PipeBandDrumStaff { \new PipeBandDrumStaff {
\global \global
\sideglobal <<
<< \new NullVoice = "format" {
{ \repeat segno 2 {
\repeat volta 2 {\part \line \markTextEol "Fine" \break } \repeat volta 2 {
\part \line \markTextEol "D.C. al Fine" \bar "||" \part \line
\volta 2 {
\fine
}
}
\break
\section
\part \line
\section
}
} }
{ \new DrumVoice = "side" {
\sideglobal
\snareA s8 \snareA s8
\snareBA \snareBA

View File

@ -6,8 +6,8 @@
\include "./notes.side.ily" \include "./notes.side.ily"
\score { \score {
\new PipeBandDrumStaff { \new PipeBandDrumStaff {
\global \global
\sideglobal \sideglobal
\repeat volta 2 { \repeat volta 2 {
\partial 4 r8 \partial 4 r8

View File

@ -1,4 +1,4 @@
\version "2.19.0" \version "2.24.1"
\include "lilydrum.ly" \include "lilydrum.ly"
@ -11,6 +11,7 @@
indent = 5.0 indent = 5.0
short-indent = 2.0 short-indent = 2.0
} }
mBreak = {\break}
\score { \score {
\new StaffGroup << \new StaffGroup <<
@ -19,31 +20,35 @@
shortInstrumentName = \markup{ \shortInstrumentSide } shortInstrumentName = \markup{ \shortInstrumentSide }
} { } {
\global \global
\sideglobal
<< <<
\new NullVoice = "format" { \new NullVoice = "format" {
\part \part
\repeat volta 2 { \repeat segno 2 {
\measure \repeat volta 2 {
s2. \measure
} \alternative { s2.
{ s4 | \halfline } } \alternative {
{ { s4 | \halfline }
s4 | {
\halfline s4 |
\fine \halfline
\fine
}
}
\volta 2 \fine
\volta 1 {
\allowBreak
\mBreak
\section
\part
\line
\section
} }
} }
\bar "||"
\break
\part
\line
\dcalfine
\bar "||"
}%End of Format }%End of Format
\new DrumVoice = "side" { \new DrumVoice = "side" {
\sideglobal
\snareAupbeatA \snareAupbeatA
\snareAA \snareAA
\snareAB r8 \snareAupbeatB \snareAB r8 \snareAupbeatB
@ -59,12 +64,13 @@
} { } {
\tenorglobal \tenorglobal
\drummode { g4 | } s4 |
\tenorAA \tenorAA
\tenorABA r4 \tenorABA r4
r8 g8 | \tenorABB s4 r8 g8 | \tenorABB s4
r4 \tenorBA r4 \tenorBA
\section
} }
%{ \new PipeBandDrumStaff = "bass" \with { %{ \new PipeBandDrumStaff = "bass" \with {
instrumentName = \markup{ \instrumentBass } instrumentName = \markup{ \instrumentBass }

View File

@ -1,41 +1,32 @@
\version "2.18.2" \version "2.24.1"
\include "lilydrum.ly" \include "lilydrum.ly"
\include "./config.ily" \include "./config.ily"
\include "./notes.side.ily" \include "./notes.side.ily"
fine = {\mark \markup "Fine" }
\score { \score {
\new PipeBandDrumStaff { \new PipeBandDrumStaff {
\global \global
\sideglobal \sideglobal
<< \partial 4 \snareAupbeatA
\new NullVoice = "format" { \repeat segno 2 {
\part \repeat volta 2 {
\repeat volta 2 {
\halfline \measure << s2. { s2 \fine } >>
} \alternative {
{ s4 | }
{
}
}
%\bar "||"
\break
\part \line
\dcalfine
\bar "||"
}%Format
\new DrumVoice = "side" {
\snareAupbeatA
\snareA \snareA
r8 \snareAupbeatB \volta 2 \fine
\alternative {
\volta 1 { r8 \snareAupbeatB }
}
}
\volta 1 {
\allowBreak
\break
\section
\partial 4
r8 \snareBA r8 \snareBA
} }
>> }
} }
\header { \header {
title = \title title = \title

View File

@ -1,40 +1,34 @@
\version "2.18.2" \version "2.24.1"
\include "lilydrum.ly" \include "lilydrum.ly"
\include "./config.ily" \include "./config.ily"
\include "./notes.tenor.ily" \include "./notes.tenor.ily"
mBreak = {\break}
\score { \score {
\new PipeBandDrumStaff { \new PipeBandDrumStaff {
\global \global
<< \tenorglobal
{ \partial 4 \drummode { g4 } |
\part \repeat volta 2 { \repeat segno 2 {
\halfline \repeat volta 2 {
} \alternative { \tenorAA
\halfline \alternative {
{ { \tenorABA r4 }
\halfline { \tenorABB r4 }
\fine
}
} }
\bar "||"
\break
\line
\dcalfine
\bar "||"
} }
{ \volta 2 {\fine}
\drummode { g4 | } \volta 1 {
\tenorAA \allowBreak
\tenorABA r4 \mBreak
\tenorABB r4 \section
\tenorBA
\tenorBA \section
} }
>> }
} }
\header { \header {
title = \title title = \title

View File

@ -31,6 +31,6 @@ snareBA = \drummode {
g8) d16. g32 \flam d16. d32:128( d8) \flam d8 d16. g32 d8:32(-> \< g8:32)(-> | g8) d16. g32 \flam d16. d32:128( d8) \flam d8 d16. g32 d8:32(-> \< g8:32)(-> |
d8.)->\fr \! g16 d8:32( g16.) g32 d8:32( g16.) g32 \sextuplet { d16[ g d-> g d g] } | d8.)->\fr \! g16 d8:32( g16.) g32 d8:32( g16.) g32 \sextuplet { d16[ g d-> g d g] } |
\flamdr d8 d16. g32-> d16. d32 \flam g8 \flam d4\fr \triplet { <> \p d16 g d } \flam g8 | \flamdr d8 d16. g32-> d16. d32 \flam g8 \flam d4 \triplet { <> \p d16 g d } \flam g8 |
\flam d4 r4 d8:32(\dr \< g8:32)(-> d8:32)(-> \afterGrace g8:32)(-> {s8)\!\ofr} \flam d4 r4 d8:32( \< g8:32)(-> d8:32)(-> \afterGrace g8:32)(-> {s8)\!\ofr}
} }

View File

@ -1,38 +1,38 @@
\version "2.18.2" \version "2.24.1"
\include "lilydrum.ly" \include "lilydrum.ly"
\include "./config.ily" \include "./config.ily"
\include "./notes.side.ily" \include "./notes.side.ily"
markTextEol = #(define-music-function (parser location text) (string?) #{ mbreak = {\break}
\once \override Score.RehearsalMark #'break-visibility = #end-of-line-visible
\once \override Score.RehearsalMark #'self-alignment-X = #RIGHT
\mark \markup $text
#})
\score { \score {
\new PipeBandDrumStaff { \new PipeBandDrumStaff {
\global \global
\sideglobal
<< <<
\new NullVoice = "format" { \new NullVoice = "format" {
\partial 8 s8 \partial 8 s8
\repeat volta 2 { \repeat segno 2 {
\quartline \repeat volta 2 {
} \alternative { \quartline
\quartline } \alternative {
{ \quartline \quartline
\markTextEol "Fine" { \quartline
\fine
}
} }
}\bar "|."
\break
\partial 8 s8 \volta 1 {
\halfline \allowBreak
\markTextEol "D.C. al Fine" \mbreak
\bar "||" \partial 8 s8
\halfline
\bar "||"
}
}
}%Format }%Format
\new DrumVoice = "side" { \new DrumVoice = "side" {
\sideglobal \sideglobal
\snareAA \snareAA