From e0f84705f3fe9c25789aa86838388a3b14b474a4 Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Wed, 27 Jul 2022 02:10:12 +0200 Subject: [PATCH 1/2] Update Amazing Grace Side notation --- airs/amazing_grace/config.ily | 2 +- airs/amazing_grace/full.ly | 25 +++++++------ airs/amazing_grace/notes.side.ily | 60 +++++++++++++++++++++---------- airs/amazing_grace/pipes.ly | 1 + airs/amazing_grace/side.ly | 11 ++++-- 5 files changed, 68 insertions(+), 31 deletions(-) diff --git a/airs/amazing_grace/config.ily b/airs/amazing_grace/config.ily index 17dd254..0d99028 100644 --- a/airs/amazing_grace/config.ily +++ b/airs/amazing_grace/config.ily @@ -8,7 +8,7 @@ confTempo = { \tempo 4 = 60 } %% Format -part = { \partial 4 s4 } +part = { \partial 4 \grace{ s4 } s4 } measure = { \grace { s4 } s4*3 | } halfline = { \repeat unfold 2 { \measure } } line = { \repeat unfold 2 { \halfline } } diff --git a/airs/amazing_grace/full.ly b/airs/amazing_grace/full.ly index ef4f84a..d0ab287 100644 --- a/airs/amazing_grace/full.ly +++ b/airs/amazing_grace/full.ly @@ -9,17 +9,23 @@ \include "./notes.side.ily" \include "./notes.pipes.ily" +\layout { + indent = 5.0 + short-indent = 2.0 +} + \score { \new StaffGroup << - \new Staff { + \new Staff \with { + instrumentName = \markup{ \instrumentPipes } + shortInstrumentName = \markup{ \shortInstrumentPipes } + } { \global \pipeglobal - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes } << { + \part \repeat volta 2 { - \part \line \break \line \break \line \break @@ -38,18 +44,17 @@ }%Pipes >> } - \new PipeBandDrumStaff = "side" { + \new PipeBandDrumStaff = "side" \with { + instrumentName = \markup { \instrumentSide } + shortInstrumentName = \markup{ \shortInstrumentSide } + } { \sideglobal - \set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide} - \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} \snarePart \snareAA \snareAB \snareAC - \snareAD - - \snareADendA + \keepWithTag #'with-volta \snareAD \snareADendB } % \new PipeBandDrumStaff = "tenor" { diff --git a/airs/amazing_grace/notes.side.ily b/airs/amazing_grace/notes.side.ily index 7dcb7fa..70adde6 100644 --- a/airs/amazing_grace/notes.side.ily +++ b/airs/amazing_grace/notes.side.ily @@ -1,32 +1,56 @@ % 3/4 Amazing Grace % Side \version "2.18.2" -composerSide = "" +composerSide = "v1.0" +arrangerSide = "" sideglobal = {} + +optdragd = \drummode { \drumgrace { \startParenthesis g16[ \endParenthesis g] } } +optdragg = \drummode { \drumgrace { \startParenthesis d16[ \endParenthesis d] } } +optdrag = #(autohandFunc optdragg optdragd) + snarePart = \drummode { - \flamd d8. g16 | + \optflam d8. g16 | } +snareAAraw = \drummode { + \tag #'repeating { d2->)\! } + \tag #'not-repeating {\flam d2 } + \flam d8 g32 d16. | + \flam g2 \flam d8. g16 | + d2:32( d4:32)(\> | + d2)\! \flam d8. g16 | +} + + snareAA = \drummode { - \flamd d2)\! \flamd d8 g32 d16. | - \flamd d2 \flamd d8. g16 | - d4:32( d4:32)( d4:32)(\> | - d2)\! \flamd d8. g16 | + \keepWithTag #'not-repeating \snareAAraw } snareAB = \drummode { - \flamd d2 \flamd d8 g32 d16. | - \flamd d2 \flamd d8. \flamg g16-> | - d4:32(\< d4:32)( d4:32)(\> | - d4:32)(\! d4:32)( d4:32)(\< | + \flam d2 \flam d8 g32 d16. | + \flam g2 \flam d8. g16 | + d2.:32(\< | + d4:32)(\> d4:32)(\! d4:32)(\< | } snareAC = \drummode { - d2->)\! d8 g32 d16. | - \flamd d2 d8. g16 | - d4:32( d4:32)( d4:32)(\> | - d2)\! \flamd d8. g16 | + \keepWithTag #'repeating \snareAAraw +} + +snareADA = \drummode { + \flam d2 \flam d8 g32 d16. | + \flam g2 \optdrag g4 | +} +snareADendA = \drummode { + d4:32(\> d4:32)( d4:32)(\! | + d4:32)( d4:32)(\< + \tag #'with-volta {d4:32) \! \laissezVibrer} + \tag #'no-volta { d4:32)( } +} +snareADendB = \drummode { + d2.:32( \f \> | + d2:32)\p } snareAD = \drummode { - \flamd d2 d8 g32 d16. | - \flamd d2 \dragd d4 | - d4:32(\> d4:32)( d4:32)(\! | - d4:32)( d4:32)(\< d4:32( <>)\!) + \snareADA + \snareADendA } + diff --git a/airs/amazing_grace/pipes.ly b/airs/amazing_grace/pipes.ly index 025c52b..ef60c9d 100644 --- a/airs/amazing_grace/pipes.ly +++ b/airs/amazing_grace/pipes.ly @@ -42,6 +42,7 @@ \new Staff { \global \pipeglobal \set Staff.midiInstrument = #"bagpipe" %%Tune + \partial 4 \pipesA \pipesAendA diff --git a/airs/amazing_grace/side.ly b/airs/amazing_grace/side.ly index 66f8e8b..2d28de6 100644 --- a/airs/amazing_grace/side.ly +++ b/airs/amazing_grace/side.ly @@ -15,15 +15,21 @@ \line \break \line \break \line \break - \line \break + \halfline } + \alternative { + { \halfline } + { \halfline } + } + \bar "|." } { \snarePart \snareAA \snareAB \snareAC - \snareAD + \keepWithTag #'with-volta \snareAD + \snareADendB } >> } @@ -32,5 +38,6 @@ meter = \meter instrument = \instrumentSide composer = \composerSide + arranger = \arrangerSide } } From d83c6b83c1b028deef50b082da816cd06033c572 Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Wed, 27 Jul 2022 15:54:56 +0200 Subject: [PATCH 2/2] Added lyrics to Amazing Grace --- airs/amazing_grace/full.ly | 20 +++++++++++++++---- airs/amazing_grace/notes.lyrics.ily | 31 +++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 4 deletions(-) create mode 100644 airs/amazing_grace/notes.lyrics.ily diff --git a/airs/amazing_grace/full.ly b/airs/amazing_grace/full.ly index d0ab287..91e63d8 100644 --- a/airs/amazing_grace/full.ly +++ b/airs/amazing_grace/full.ly @@ -8,6 +8,7 @@ %\include "./notes.tenor.ily" \include "./notes.side.ily" \include "./notes.pipes.ily" +\include "./notes.lyrics.ily" \layout { indent = 5.0 @@ -23,7 +24,7 @@ \global \pipeglobal << - { + \new Voice = "format" { \part \repeat volta 2 { \line \break @@ -37,13 +38,21 @@ } \bar "|." }%Format - { + \new Voice = "pipes" { \pipesA \pipesAendA s4 \pipesAendB s4 }%Pipes + \new NullVoice = "lyrics-aligner" { + \lyricsA + } >> } + \new Lyrics = "lyrics1" { + \lyricsto "lyrics-aligner" { + \verseA + } + } \new PipeBandDrumStaff = "side" \with { instrumentName = \markup { \instrumentSide } shortInstrumentName = \markup{ \shortInstrumentSide } @@ -55,7 +64,7 @@ \snareAB \snareAC \keepWithTag #'with-volta \snareAD - \snareADendB + \snareADendB s4 } % \new PipeBandDrumStaff = "tenor" { % \tenorglobal @@ -75,17 +84,20 @@ meter = \meter composer = \markup \large { \column \right-align { - $(if (not (string=? "" composerPipes)) #{ \markup {\line { \composerPipes ":" }} #} ) + $(if (not (string=? "" composerLyrics)) #{ \markup { \line { \composerLyrics ":" } } #} ) + $(if (not (string=? "" composerPipes)) #{ \markup {\line { \composerPipes \arrangerPipes ":" }} #} ) $(if (not (string=? "" composerSide)) #{ \markup {\line { \composerSide ":" }} #} ) $(if (not (string=? "" composerTenor)) #{ \markup {\line { \composerTenor ":" }} #} ) $(if (not (string=? "" composerBass)) #{ \markup {\line { \composerBass ":" }} #} ) } \column \right-align { + $(if (not (string=? "" composerLyrics)) #{ \markup { \line { "Lyrics" } } #} ) $(if (not (string=? "" composerPipes)) #{ \markup {\line { \instrumentPipes }}#} ) $(if (not (string=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) } } + } } diff --git a/airs/amazing_grace/notes.lyrics.ily b/airs/amazing_grace/notes.lyrics.ily new file mode 100644 index 0000000..ef442c1 --- /dev/null +++ b/airs/amazing_grace/notes.lyrics.ily @@ -0,0 +1,31 @@ +% 4/4 Abide with Me +% Lyrics +\version "2.18.2" +composerLyrics = "J. Newton" +lyricsA = { + d4 | + d2 d4 | + d2 d4 | + d2 d4 | + d2 d4 | + d2 d4 | + d2 d4 | + d2~ d4~ | d2 + + d4 | + d2 d4 | + d2 d4 | + d2 d4 | + d2 d4 | + d2 d4 | + d2 d4 | + d2~ d4~ | d2 +} +verseA = \lyricmode { + \set stanza = #"1." + A -- ma -- zing grace! + How sweet the sound, that saved a wretch like me! __ __ + + I once was lost, but now am found. + Was blind, but now I see. __ __ +}