diff --git a/2-4_marches/brown_haired_maiden/pipes.ly b/2-4_marches/brown_haired_maiden/pipes.ly index 497e48e..633efdd 100644 --- a/2-4_marches/brown_haired_maiden/pipes.ly +++ b/2-4_marches/brown_haired_maiden/pipes.ly @@ -9,30 +9,19 @@ \new Staff { \global \pipeglobal - << - \new NullVoice = "format" { - \repeat volta 2 { - \line - } - \break - \repeat volta 2 { - \halfline - } - \alternative { - { \halfline } - { \halfline } - } - \bar "|." - }%Format - \new Voice = "pipes" { - \pipesA + \repeat volta 2 { + \pipesA + } + \break + \repeat volta 2 { + \pipesA + } \alternative { + \pipesBA + \pipesBB + } + \bar "|." - \pipesB - \pipesBA - \pipesBB - } - >> } \header { title = \title diff --git a/2-4_marches/mairis_wedding/config.ily b/2-4_marches/mairis_wedding/config.ily index 798f58b..a7b244e 100644 --- a/2-4_marches/mairis_wedding/config.ily +++ b/2-4_marches/mairis_wedding/config.ily @@ -13,4 +13,4 @@ line = { \repeat unfold 2 { \halfline } } %% Headers title = "Mairi's Wedding" -meter = "Meter" +meter = "March" diff --git a/hornpipes/the_jolly_beggarman/notes.pipes.ily b/hornpipes/the_jolly_beggarman/notes.pipes.ily index 3e266d6..48753e9 100644 --- a/hornpipes/the_jolly_beggarman/notes.pipes.ily +++ b/hornpipes/the_jolly_beggarman/notes.pipes.ily @@ -29,7 +29,7 @@ pipesPartB = { } pipesPartC = { e8 | - \grg a16. e32 e16. a32 \grg e16. a32 a16. a32 | + \grg a16. e32 e16. a32 \grg e16. a32 a16. b32 | \grg a16. e32 e16. c32 \thrwd d8 } pipesPartD = { diff --git a/reels/lady_seaforth/notes.pipes.ily b/reels/lady_seaforth/notes.pipes.ily index c4b6a22..af2413c 100644 --- a/reels/lady_seaforth/notes.pipes.ily +++ b/reels/lady_seaforth/notes.pipes.ily @@ -8,7 +8,7 @@ pipeglobal = { } % Music pipesA = { - A16 | + A8 | c16 \grd a8. \grg e8 a8 \grg c16 \grd a8. \dblg g4 | b16 \grd a8. \dbld d8 a8 \grg b8. \grd b16 \gre b8 A8 | c16 \grd a8. \grg e8 a8 \grg c16 \grd a8. \dblg g4 | @@ -16,7 +16,7 @@ pipesA = { } pipesBA = { - e16 | + e8 | \dblA A4 e8. A16 g16 A8. \hdble e8. g16 | \dblg g4 \grA d8. g16 \grA b16 g8. d8. e16 | } @@ -27,4 +27,4 @@ pipesBBA = { pipesBBB = { A8 f g e \grg f8 d \grg e16 A8. | g8 e \grg d b \gra c8. \grd a16 \gre a8 -} \ No newline at end of file +} diff --git a/reels/lady_seaforth/pipes.ly b/reels/lady_seaforth/pipes.ly index 2db46ce..5253176 100644 --- a/reels/lady_seaforth/pipes.ly +++ b/reels/lady_seaforth/pipes.ly @@ -11,16 +11,16 @@ \pipeglobal \repeat volta 2 { - \partial 16 - \pipesA s16 + \partial 8 + \pipesA s8 } \break \repeat volta 2 { - \partial 16 + \partial 8 \pipesBA } \alternative { { \pipesBBA } - { \pipesBBB s16 } + { \pipesBBB s8 } } \bar "|." } diff --git a/standards/68_standards.side.ily b/standards/68_standards.side.ily index 5790a86..2968bc5 100644 --- a/standards/68_standards.side.ily +++ b/standards/68_standards.side.ily @@ -138,9 +138,15 @@ pfourteen = \drummode { d16 g d g d8 g16 d g d g8 | \flam d8. d16:64( d8) g16 d g d g8 | } + pfifteen = \drummode { g8 | d8. g8. d4 d8:32( | g4) g8 d8.:32( d16) g8 | } +psixteen = \drummode { + g8 | + d8:32(-> \tuplet 3/2 { g8) d g } \tuplet 3/2 { d8 g d } g8:32(-> | + \tuplet 3/2 { d8) g d } \flam g8 g8. d16 \flam g8 | +} diff --git a/standards/68_standards_extra.side.ly b/standards/68_standards_extra.side.ly index f3f112b..ac9e493 100644 --- a/standards/68_standards_extra.side.ly +++ b/standards/68_standards_extra.side.ly @@ -12,7 +12,7 @@ \repeat volta 2 { \partial 8 \pnine \midtwo \pten \endtwo} \break \repeat volta 2 { \partial 8 \peleven \midtwo \ptwelve \endthree} \break \repeat volta 2 { \partial 8 \pthirteen \midthree \pfourteen \endfour} \break - \repeat volta 2 { \partial 8 \pfifteen \midone \pempty \endfour} \break + \repeat volta 2 { \partial 8 \pfifteen \midone \psixteen \endfour} \break }% End of drums % } \header{