From 39effeefb30b1d15f397442ad1cc092fcc902212 Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Sat, 10 Feb 2024 21:12:32 +0100 Subject: [PATCH] [typesetting] restructure for segnoMarking in Caller Herrin' --- 2-4_marches/caller_herrin/bass.ly | 23 +++++--- 2-4_marches/caller_herrin/drums.ly | 60 ++++++++++--------- 2-4_marches/caller_herrin/full.ly | 70 +++++++++++++---------- 2-4_marches/caller_herrin/mid.ly | 46 +++++++++------ 2-4_marches/caller_herrin/notes.tenor.ily | 23 ++++++-- 2-4_marches/caller_herrin/pipes.cairns.ly | 47 ++++++--------- 2-4_marches/caller_herrin/pipes.full.ly | 2 +- 2-4_marches/caller_herrin/pipes.ly | 37 +++++------- 2-4_marches/caller_herrin/side.ly | 32 ++++++----- 2-4_marches/caller_herrin/tenor.ly | 33 ++++++----- 10 files changed, 202 insertions(+), 171 deletions(-) diff --git a/2-4_marches/caller_herrin/bass.ly b/2-4_marches/caller_herrin/bass.ly index 669cc83..a71c576 100644 --- a/2-4_marches/caller_herrin/bass.ly +++ b/2-4_marches/caller_herrin/bass.ly @@ -5,24 +5,31 @@ \include "./config.ily" \include "./notes.bass.ily" +mbreak = {\break} + \score { \new PipeBandDrumStaff { \global << \new NullVoice = "format" { + \repeat segno 2 { \repeat volta 2 { + \part \halfline - \mark \markup { \musicglyph "scripts.segno"} - \inStaffSegno + \volta 2 { \segnoMark \default } \halfline - \fine + \volta 2 { \fine } } - \break - \halfline - \halfline - \dsalfine - \bar "||" + \volta 1 { + \allowBreak + \mbreak + \part + \halfline + \halfline + \bar "||" + } + } }%Format \new DrumVoice = "bass" { \bassglobal diff --git a/2-4_marches/caller_herrin/drums.ly b/2-4_marches/caller_herrin/drums.ly index a7cb1a1..ed2b122 100644 --- a/2-4_marches/caller_herrin/drums.ly +++ b/2-4_marches/caller_herrin/drums.ly @@ -13,6 +13,29 @@ short-indent = 2.0 } +mbreak = {\break} + +timing = \new NullVoice = "format" { + \repeat segno 2 { + \repeat volta 2 { + \part + \halfline + \volta 2 { \segnoMark \default } + \halfline + \volta 2 { \fine } + } + + \volta 1 { + \allowBreak + \mbreak + \part + \halfline + \halfline + \bar "||" + } + } + } % Format + \score { \new StaffGroup << \new PipeBandDrumStaff = "side" \with { @@ -21,28 +44,7 @@ } { \global << - \new NullVoice = "format" { - \repeat volta 2 { - \part - \halfline - \mark \markup { \musicglyph "scripts.segno"} - \inStaffSegno - \halfline - \fine - } - \break - - \part - \halfline - \halfline - \dsalfine - \bar "||" - %\break - %\halfline - %\break - %\halfline - %\bar "|." - }%End of Format + \timing \new DrumVoice = "side" { \sideglobal \sideA s8 @@ -55,16 +57,22 @@ shortInstrumentName = \markup{ \shortInstrumentTenor } } { \tenorglobal - \tenorA s8 - \removeWithTag #'fine \tenorB + << \timing + { + \tenorA s8 + \removeWithTag #'fine \tenorB + } >> } \new PipeBandDrumStaff = "bass" \with { instrumentName = \markup{ \instrumentBass } shortInstrumentName = \markup{ \shortInstrumentBass } } { \bassglobal - s8 \bassA - s8 \removeWithTag #'fine \bassB + << \timing + { + s8 \bassA + s8 \removeWithTag #'fine \bassB + } >> } >> \header { diff --git a/2-4_marches/caller_herrin/full.ly b/2-4_marches/caller_herrin/full.ly index ee7116e..d8d37fa 100644 --- a/2-4_marches/caller_herrin/full.ly +++ b/2-4_marches/caller_herrin/full.ly @@ -18,6 +18,29 @@ #(set-global-staff-size 18) +mbreak = {\break} + +timing = \new NullVoice = "format" { + \repeat segno 2 { + \repeat volta 2 { + \part + \halfline + \volta 2 { \segnoMark \default } + \halfline + \volta 2 { \fine } + } + + \volta 1 { + \allowBreak + \mbreak + \part + \halfline + \halfline + \bar "||" + } + } + } % Format + \score { \new StaffGroup << \new Staff \with { @@ -27,28 +50,7 @@ \global \pipeglobal << - \new NullVoice = "format" { - \repeat volta 2 { - \part - \halfline - \mark \markup { \musicglyph "scripts.segno"} - \inStaffSegno - \halfline - \fine - } - \break - - \part - \halfline - \halfline - \dsalfine - \bar "||" - %\break - %\halfline - %\break - %\halfline - %\bar "|." - } % Format + \timing \new Voice = "pipes" { \pipesA s8 \removeWithTag #'fine \pipesB @@ -82,27 +84,33 @@ shortInstrumentName = \markup{ \shortInstrumentSide } } { \sideglobal - - \sideA s8 - \removeWithTag #'fine \sideB + << \timing + { + \sideA s8 + \removeWithTag #'fine \sideB + } >> } \new PipeBandDrumStaff = "tenor" \with { instrumentName = \markup{ \instrumentTenor } shortInstrumentName = \markup{ \shortInstrumentTenor } } { \tenorglobal - - \tenorA s8 - \removeWithTag #'fine \tenorB + << \timing + { + \tenorA s8 + \removeWithTag #'fine \tenorB + } >> } \new PipeBandDrumStaff = "bass" \with { instrumentName = \markup{ \instrumentBass } shortInstrumentName = \markup{ \shortInstrumentBass } } { \bassglobal - - s8 \bassA - s8 \removeWithTag #'fine \bassB + << \timing + { + s8 \bassA + s8 \removeWithTag #'fine \bassB + } >> } >> \header { diff --git a/2-4_marches/caller_herrin/mid.ly b/2-4_marches/caller_herrin/mid.ly index 6f2c9e6..1c22afb 100644 --- a/2-4_marches/caller_herrin/mid.ly +++ b/2-4_marches/caller_herrin/mid.ly @@ -11,6 +11,28 @@ short-indent = 2.0 } +mbreak = {\break} +timing = \new NullVoice = "format" { + \repeat segno 2 { + \repeat volta 2 { + \part + \halfline + \volta 2 { \segnoMark \default } + \halfline + \volta 2 { \fine } + } + + \volta 1 { + \allowBreak + \mbreak + \part + \halfline + \halfline + \bar "||" + } + } + }%End of Format + \score { \new StaffGroup << \new PipeBandDrumStaff = "tenor" \with { @@ -19,23 +41,7 @@ } { \global << - \new NullVoice = "format" { - \repeat volta 2 { - \part - \halfline - \mark \markup { \musicglyph "scripts.segno"} - \inStaffSegno - \halfline - \fine - } - \break - - \part - \halfline - \halfline - \dsalfine - \bar "||" - }%End of Format + \timing \new DrumVoice = "tenor" { \tenorglobal \tenorA s8 @@ -48,8 +54,10 @@ shortInstrumentName = \markup{ \shortInstrumentBass } } { \bassglobal - s8 \bassA - s8 \removeWithTag #'fine \bassB + << \timing + { s8 \bassA + s8 \removeWithTag #'fine \bassB + } >> } >> \header { diff --git a/2-4_marches/caller_herrin/notes.tenor.ily b/2-4_marches/caller_herrin/notes.tenor.ily index 6040cb7..ca95135 100644 --- a/2-4_marches/caller_herrin/notes.tenor.ily +++ b/2-4_marches/caller_herrin/notes.tenor.ily @@ -1,15 +1,28 @@ % 2/4 Caller Herrin % Tenor \version "2.18.2" -composerTenor = "E.T. de Boone, v0.2" +composerTenor = "E.T. de Boone, v0.3" arrangerTenor = "" tenorglobal = {} + +startRPiano = #(define-event-function (parser location) () #{ + -\tweak HorizontalBracketText.text "R" + \startGroup +#}) + +startTPiano = #(define-event-function (parser location) () #{ + -\tweak HorizontalBracketText.text "T" + \startGroup +#}) + % Music tenorA = \drummode { \tag #'fineRemove { \tag #'upbeat { d8 | } - g4\up d8 g | - d8 g d4 | + g4\up + + d8\startRPiano g | + d8 g d4\stopGroup | g4\up d8.\up g16 | d4 g8 @@ -17,8 +30,8 @@ tenorA = \drummode { d8 | } - g4\up d8 g | - d8 g d4 | + g4\up d8\startRPiano g | + d8 g d4\stopGroup | g4 \scoop { d8. g16 | d4 } r8 } diff --git a/2-4_marches/caller_herrin/pipes.cairns.ly b/2-4_marches/caller_herrin/pipes.cairns.ly index 6a283c6..4e4afe5 100644 --- a/2-4_marches/caller_herrin/pipes.cairns.ly +++ b/2-4_marches/caller_herrin/pipes.cairns.ly @@ -5,16 +5,7 @@ \include "./config.ily" \include "./notes.pipes.ily" -markTextEolDown = #(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 - \once \override Score.RehearsalMark #'direction = #DOWN - \mark \markup $text -#}) - -fine = {\markTextEolDown "Fine" } -dsalfine = {\markTextEolDown "D.S. al Fine" } - +mbreak = {\break} \score { \new Staff { @@ -22,26 +13,24 @@ dsalfine = {\markTextEolDown "D.S. al Fine" } \pipeglobal << \new NullVoice = "format" { - \repeat volta 2 { - \part - \halfline - \mark \markup { \musicglyph "scripts.segno"} - %\inStaffSegno - \halfline - \fine + \repeat segno 2 { + \repeat volta 2 { + \part + \halfline + \volta 2 { \segnoMark \default } + \halfline + \volta 2 { \fine } + } + + \volta 1 { + \allowBreak + \mbreak + \part + \halfline + \halfline + \bar "||" + } } - \break - - \part - \halfline - \halfline - \dsalfine - \bar "||" - %\break - %\halfline - %\break - %\halfline - %\bar "|." } % Format \new Voice = "pipes" { \pipesAvI s8 diff --git a/2-4_marches/caller_herrin/pipes.full.ly b/2-4_marches/caller_herrin/pipes.full.ly index 66c6718..dba3fab 100644 --- a/2-4_marches/caller_herrin/pipes.full.ly +++ b/2-4_marches/caller_herrin/pipes.full.ly @@ -45,7 +45,7 @@ \pipesSecA s8 - \pipesSecB + \pipesSecB s8 } >> diff --git a/2-4_marches/caller_herrin/pipes.ly b/2-4_marches/caller_herrin/pipes.ly index 5b0c0e5..f959e92 100644 --- a/2-4_marches/caller_herrin/pipes.ly +++ b/2-4_marches/caller_herrin/pipes.ly @@ -5,16 +5,7 @@ \include "./config.ily" \include "./notes.pipes.ily" -markTextEolDown = #(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 - \once \override Score.RehearsalMark #'direction = #DOWN - \mark \markup $text -#}) - -fine = {\markTextEolDown "Fine" } -dsalfine = {\markTextEolDown "D.S. al Fine" } - +mbreak = {\break} \score { \new Staff { @@ -22,26 +13,24 @@ dsalfine = {\markTextEolDown "D.S. al Fine" } \pipeglobal << \new NullVoice = "format" { + \repeat segno 2 { \repeat volta 2 { \part \halfline - \mark \markup { \musicglyph "scripts.segno"} - %\inStaffSegno + \volta 2 { \segnoMark \default} \halfline - \fine + \volta 2 { \fine } } - \break - \part - \halfline - \halfline - \dsalfine - \bar "||" - %\break - %\halfline - %\break - %\halfline - %\bar "|." + \volta 1 { + \allowBreak + \mbreak + \part + \halfline + \halfline + \bar "||" + } + } } % Format \new Voice = "pipes" { \pipesA s8 diff --git a/2-4_marches/caller_herrin/side.ly b/2-4_marches/caller_herrin/side.ly index c8ef1ee..3de9e36 100644 --- a/2-4_marches/caller_herrin/side.ly +++ b/2-4_marches/caller_herrin/side.ly @@ -5,26 +5,30 @@ \include "./config.ily" \include "./notes.side.ily" +mbreak = {\break} \score { \new PipeBandDrumStaff { \global << \new NullVoice = "format" { - \repeat volta 2 { - \part - \halfline - \mark \markup { \musicglyph "scripts.segno"} - %\inStaffSegno - \halfline - \fine - } - \break + \repeat segno 2 { + \repeat volta 2 { + \part + \halfline + \volta 2 { \segnoMark \default } + \halfline + \volta 2 { \fine } + } - \part - \halfline - \halfline - \dsalfine - \bar "||" + \volta 1 { + \allowBreak + \mbreak + \part + \halfline + \halfline + \bar "||" + } + } } % Format \new DrumVoice = "side" { \sideglobal diff --git a/2-4_marches/caller_herrin/tenor.ly b/2-4_marches/caller_herrin/tenor.ly index 0239178..b3b029f 100644 --- a/2-4_marches/caller_herrin/tenor.ly +++ b/2-4_marches/caller_herrin/tenor.ly @@ -5,26 +5,31 @@ \include "./config.ily" \include "./notes.tenor.ily" +mbreak = {\break} + \score { \new PipeBandDrumStaff { \global << \new NullVoice = "format" { - \repeat volta 2 { - \part - \halfline - \mark \markup { \musicglyph "scripts.segno"} - %\inStaffSegno - \halfline - \fine - } - \break + \repeat segno 2 { + \repeat volta 2 { + \part + \halfline + \volta 2 { \segnoMark \default } + \halfline + \volta 2 { \fine } + } - \part - \halfline - \halfline - \dsalfine - \bar "||" + \volta 1 { + \allowBreak + \mbreak + \part + \halfline + \halfline + \bar "||" + } + } }%Format \new DrumVoice = "tenor" { \tenorglobal