A lot of small fixes, My Home, Mist Covered Mountains, Morag of Dunvegan, Template, ...

This commit is contained in:
Eric Teunis de Boone 2019-01-03 23:34:05 +01:00
parent efaa3fda01
commit a63a7cdc6c
22 changed files with 135 additions and 75 deletions

1
.gitignore vendored
View File

@ -2,3 +2,4 @@ sets
**/*.pdf **/*.pdf
**/*.midi **/*.midi
**/*.png **/*.png
**/*.bww

View File

@ -13,5 +13,6 @@ halfline = { \repeat unfold 4 \measure }
line = { \repeat unfold 2 { \halfline } } line = { \repeat unfold 2 { \halfline } }
%% Headers %% Headers
title = "Cabar Feidh"
title = "Cabar Fèidh" title = "Cabar Fèidh"
meter = "Regimental March of the Seaforth Highlanders" meter = "Regimental March of the Seaforth Highlanders"

View File

@ -8,7 +8,7 @@ confTempo = {
} }
%% Format %% Format
part = { \partial 8 s8 } part = { \partial 8 \grace{ s4 } s8 }
measure = { \grace { s4 } s1. | } measure = { \grace { s4 } s1. | }
halfline = { \repeat unfold 2 { \measure } } halfline = { \repeat unfold 2 { \measure } }
line = { \repeat unfold 2 { \halfline } } line = { \repeat unfold 2 { \halfline } }

View File

@ -11,25 +11,26 @@ pipesA = {
\dble e2~ e8 [ \grG e8 ] \grg f8 [ \dblA A8 ] | \dble e2~ e8 [ \grG e8 ] \grg f8 [ \dblA A8 ] |
e16 [ c8.~ ] c4~ c8 [ \grG c8 ] \grg d16 [ c16 b8 ] | e16 [ c8.~ ] c4~ c8 [ \grG c8 ] \grg d16 [ c16 b8 ] |
\grg c16 [ e8.~ ] e4~ e8 [ \grG e8 ] \grg d8. [ b16 ] | \grg c16 [ e8.~ ] e4~ e8 [ \grG e8 ] \grg d8. [ b16 ] |
\grg c16 [ a8.~ ] a2 \grg c16 [ a8.~ ] a2
} }
pipesBA = { pipesBA = {
\grg a8 [ \grd a8 ] | \grg a8 [ \grd a8 ] |
\grg f2~ f8 [ \grg f8 ] g16 [ \grA f16 g8 ] | \grg f2~ f8 [ \grg f8 ] g16 [ \grA f16 g8 ] |
\grA f16 [ d8.~ ] d2 \grg \tuplet 3/2 { d8 [ c8 b8 ] } | \grA f16 [ d8.~ ] d2 \grg \tuplet 3/2 { d8 [ c8 b8 ] } |
\grg c16 [ e8.~ ] e4~ e8 [ \grG e8 ] \grg d8. [ b16 ] | \grg c16 [ e8.~ ] e4~ e8 [ \grG e8 ] \grg d8. [ b16 ] |
\grd c2. \grg a8 [ \grd a8 ] \grd c2.
} }
pipesBB = { pipesBB = {
\grg a8 [ \grd a8 ] |
\grg f2~ f8 [ \grg f8 ] g16 [ \grA f16 g8 ] | \grg f2~ f8 [ \grg f8 ] g16 [ \grA f16 g8 ] |
\grA f16 [ d8.~ ] d2 \grg \tuplet 3/2 { d8 [ c8 b8 ] } | \grA f16 [ d8.~ ] d2 \grg \tuplet 3/2 { d8 [ c8 b8 ] } |
\grg c16 [ e8.~ ] e4~ e8 [ \grG e8 ] \grg d8. [ b16 ] | \grg c16 [ e8.~ ] e4~ e8 [ \grG e8 ] \grg d8. [ b16 ] |
\grg c16 [ a8.~ ] a4~ a8 [ e8 ] \grg c16 [ a8.~ ] a4~ a8 [ e8 ]
} }
pipesC = { pipesC = {
\grg f8 [ \dblA A8 ] | \grg f8 [ \dblA A8 ] |
e16 [ c8.~ ] c4~ c8 [ \grG c8 ] \grg d16 [ c16 b8 ] | e16 [ c8.~ ] c4~ c8 [ \grG c8 ] \grg d16 [ c16 b8 ] |
\grg c16 [ e8.~ ] e4~ e8 [ \grG e8 ] \grg f8 [ \dblA A8 ] | \grg c16 [ e8.~ ] e4~ e8 [ \grG e8 ] \grg f8 [ \dblA A8 ] |
e16 [ c8.~ ] c4~ c8 [ \grG c8 ] \grg d8. [ b16 ] | e16 [ c8.~ ] c4~ c8 [ \grG c8 ] \grg d8. [ b16 ] |
\grG a2. \grG a2.
} }

View File

@ -2,30 +2,37 @@
% Tenor % Tenor
\version "2.18.2" \version "2.18.2"
sideglobal={} sideglobal={}
composerSide="2018, v1.1"
snareA = \drummode { snareA = \drummode {
\flamd d8 d8:32( g8) \flamd d8 r8 \flamd d8 | \flam d8 d8:32( g8) \flam d8 r8 \flam d8 |
g8 d8:32( g8) g8 \tuplet 3/2 { d16 g d } g8 | g8 d8:32( g8) \flam d8 \tuplet 3/2 { d16 g d } g8 |
\flamd d8 d8:32( g8) \flamd d8 r8 d8 | \tutti {
\tuplet 3/2 { d16 g d } g8 \flamd d8 d4.:32(\< | \flam d8 d8:32( g8) \flam d8 r8 \flam d8 |
\tuplet 3/2 { d16 g d } g8 \flam d8 d4.:32(\< |
}
d8)\! d8:32( g8) \flam d8 r8 \flam d8 |
g8 d8:32( g8) \flam d8 \tuplet 3/2 { d16 g d } g8 |
d8)\! d8:32( g8) \flamd d8 r8 \flamd d8 | \tutti {
g8 d8:32( g8) \flamd d8 \tuplet 3/2 { d16 g d } g8 | \flam d8 d8:32( g8) \flam d8 g16. d32-> g16. g32 |
d4:32( d8:32)(\> d4.)\!
\flamd d8 d8:32( g8) \flamd d8 g16. d32-> g16. g32 | }
d4.:32( d4.)
} }
snareB = \drummode { snareB = \drummode {
d16.-> g32 d16. d32 g8 d8:32(-> g8) \flamd d8 | d16.-> g32 d16. d32 g8 d8:32(-> g8) \flamd d8 |
d16.-> g32 d16. d32 g8 \flamd d8-> \tuplet 3/2 { d16 g d } g8 | d16.-> g32 d16. d32 g8 \flamd d8-> \tuplet 3/2 { d16 g d } g8 |
d16.-> g32 d16. d32 g8 d8:32(-> g8) \flamd d8 | \tutti {
\tuplet 3/2 { d16 g d } g8 \flamd d8 d4.:32(\< | d16.-> g32 d16. d32 g8 d8:32(-> g8) \flamd d8 |
\tuplet 3/2 { d16 g d } g8 \flamd d8 d4.:32(\< |
}
d16.)->\! g32 d16. d32 g8 d8:32(-> g8) \flamd d8 | d16.)->\! g32 d16. d32 g8 d8:32(-> g8) \flamd d8 |
d16. g32 d16. d32 g8 \flamd d8-> \tuplet 3/2 { d16 g d } g8 | d16.-> g32 d16. d32 g8 \flamd d8-> \tuplet 3/2 { d16 g d } g8 |
\flamd d8 d8:32( g8) \flamd d8 g16. d32-> g16. g32 | \tutti {
d4.:32( d4.) \flamd d8 d8:32( g8) \flamd d8 g16. d32-> g16. g32 |
d4:32( d8:32)(\> d4.)\!
}
} }

View File

@ -25,17 +25,17 @@
} }
>> >>
} }
\new PipeBandDrumStaff = "bass" {
\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
}
\new PipeBandDrumStaff = "tenor" { \new PipeBandDrumStaff = "tenor" {
\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
\repeat unfold 2 { s8 \tenorA } \repeat unfold 2 { r8 \tenorA s8 }
} }
%{ \new PipeBandDrumStaff = "bass" {
\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
}%}
>> >>
\header { \header {
title = \title title = \title

View File

@ -56,18 +56,18 @@
\tenorglobal \tenorglobal
\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
s8 \tenorA s8 r8 \tenorA s8
\tenorB s8 r8 \tenorB s8
} }
\new PipeBandDrumStaff = "bass" { %{ \new PipeBandDrumStaff = "bass" {
\bassglobal \bassglobal
\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
\bassA s8 \bassA s8
\bassB s8 \bassB s8
} }%}
>> >>
\header { \header {
title = \title title = \title

View File

@ -1,13 +1,13 @@
% 6/8 My Home % 6/8 My Home
% Side % Side
\version "2.18.2" \version "2.18.2"
composerSide = "" composerSide = "v1.1, 2018"
sideglobal = { \eighthCompoundBeaming } sideglobal = { \eighthCompoundBeaming }
snareA = \drummode { snareA = \drummode {
d8:32( | d8:32( |
g8.) d16 g8 \flamd d8. g16 d8 | g8.) d16 g8 \flamd d8. g16 d8 |
\flamg g8. d16 g8 d4.:32( | \flamg g8. d16 g8 d4:32(\< 8:32\> |
d8.) g16 d8 \flamg g8. d16 g8 | d8.)\! g16 d8 \flamg g4 d16. g32 |
\flamd d8. g16 d8 d4.:32( | \flamd d8. g16 d8 d4.:32( |
d8.) g16 d8 \flamd d4 g8 | d8.) g16 d8 \flamd d4 g8 |
d8. g16 d8 d4.:32( | d8. g16 d8 d4.:32( |
@ -16,12 +16,12 @@ snareA = \drummode {
} }
snareB = \drummode { snareB = \drummode {
d8 | d8 |
\flamd d8. g16 d8 d4.:32( \flamd d8. g16 d8 d4:32(\< 8:32\> |
d8.) g16 d8 d4.:32( | d8.)\! g16 d8 d4:32(\< 8:32\> |
d8.) g16 d8 \flamg g8. d16 g8 | d8.)\! g16 d8 \flamg g4 d16. g32 |
\flamd d8. g16 d8 d4.:32( | \flamd d8. g16 d8 d4.:32(\< |
d8.) g16 d8 d4.:32( | d8.)\! g16 d8 d4.:32(\> |
d8.) g16 d8 \flamd d4 g8 | d8.) g16 d8 \flamd d4\! g8 |
\flamd d8. g16 d8 \flamg g8. d16 g8 | \flamd d8. g16 d8 \flamg g8. d16 g8 |
d4.:32( d4) d4.:32( d4)
} }

View File

@ -7,10 +7,10 @@ tenorA = \drummode {
d4. g | d4. g |
d4. g8. d16 g8 | d4. g8. d16 g8 |
d4. g4. | d4. g4. |
d4. g8 r8 g8 | d4. g4 g8 |
d4. g4. | d4. g4. |
d4. g8. d16 g8 | d4. g8. d16 g8 |
r8 g d r8 d g | r8 g d r8 d g |
d8 g8 d8 g8 r4 d8 g8 d8 g4
} }
tenorB = \tenorA tenorB = \tenorA

View File

@ -15,7 +15,7 @@
} }
{ {
\repeat unfold 2 { \tenorA } \repeat unfold 2 { \tenorA r8 }
} }
>> >>
} }

View File

@ -16,17 +16,24 @@
\global \global
<< <<
{ {
\repeat volta 2 { \repeat volta 2 {
\part \line \part \line
} }
\break \break
\repeat volta 2 { \repeat volta 2 {
\part \line \part \line
} }
} }
{ {
\snareA s8 \snareA s8
\snareB s8 <<
{
\snareB s8
}
{
s8 | s1_\markup { \dynamic {ff} 2nd time through}
}
>>
} }
>> >>
} }
@ -34,8 +41,8 @@
\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
s8 \tenorA r8 \tenorA s8
s8 \tenorB r8 \tenorB s8
} }
% \new PipeBandDrumStaff = "bass" { % \new PipeBandDrumStaff = "bass" {
% \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } % \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
@ -49,7 +56,7 @@
\header { \header {
title = \title title = \title
meter = \meter meter = \meter
composer = \markup \tiny { composer = \markup {
\column \right-align { \column \right-align {
$(if (not (string=? "" composerSide)) #{ \markup {\line { \composerSide ":" }} #} ) $(if (not (string=? "" composerSide)) #{ \markup {\line { \composerSide ":" }} #} )
$(if (not (string=? "" composerTenor)) #{ \markup {\line { \composerTenor ":" }} #} ) $(if (not (string=? "" composerTenor)) #{ \markup {\line { \composerTenor ":" }} #} )

View File

@ -21,9 +21,9 @@
<< <<
\new Voice = "format" \new Voice = "format"
{ {
\repeat volta 2 { \repeat volta 2 {
\part \line \part \line
} }
\break \break
\repeat volta 2 { \repeat volta 2 {
\part \line \part \line
@ -60,19 +60,27 @@
\sideglobal \sideglobal
\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide} \set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
\snareA s8 \snareA s8
\snareB s8
<<
{
\snareB s8
}
{
s8 | s1_\markup { \dynamic {ff} 2nd time through}
}
>>
} }
\new PipeBandDrumStaff = "tenor" { \new PipeBandDrumStaff = "tenor" {
\tenorglobal \tenorglobal
\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
s8 \tenorA r8 \tenorA s8
s8 \tenorB r8 \tenorB s8
} }
% \new PipeBandDrumStaff = "bass" { % \new PipeBandDrumStaff = "bass" {
% \bassglobal % \bassglobal

View File

@ -1,15 +1,16 @@
\version "2.18.2" \version "2.18.2"
sideglobal = {} sideglobal = {}
composerSide = "v1.1, 2018"
snareA = \drummode { snareA = \drummode {
d8:32( | d8:32( |
g8.) d16 g8 d8 r8 d8:32( | g8.) d16 g8 d8 r8 d8:32( |
g8.) d16 g8 d8 r8 d8:32( | g8.) d16 g8 d8 r8 d8:32( |
g8.) d16 g8 d8. g16 d8 | g8.) d16 g8 d8. g16 d8 |
d4.:32( d8) r8 d8:32( | d4:32(\< d8:32\> d8)\! r8 d8:32( |
g8.) d16 g8 d8 r8 d8:32( | g8.) d16 g8 d8 r8 d8:32( |
g8.) d16 g8 d8 r8 d8:32( | g8.) d16 g8 d8 r8 d8:32( |
g8.) d16 g8 d8. g16 d8 | g8.) d16 g8 d8. g16 d8 |
d4.:32( d4) d4.:32( d4)
} }
snareB = \drummode { snareB = \drummode {
d8 | d8 |

View File

@ -11,6 +11,6 @@ tenorA = \drummode {
d4. g4. | d4. g4. |
d4. g8. d16 g8 | d4. g8. d16 g8 |
r8 g d r8 d g | r8 g d r8 d g |
d8 g8 d8 g8 r4 d8 g8 d8 g4
} }
tenorB = \tenorA tenorB = \tenorA

View File

@ -10,17 +10,24 @@
\global \global
<< <<
{ {
\repeat volta 2 { \repeat volta 2 {
\part \line \part \line
} }
\break \break
\repeat volta 2 { \repeat volta 2 {
\part \line \part \line
} }
} }
{ {
\snareA s8 \snareA s8
\snareB s8 <<
{
\snareB s8
}
{
s8 | s1_\markup { \dynamic {ff} 2nd time through}
}
>>
} }
>> >>
} }

View File

@ -10,18 +10,18 @@
\global \global
<< <<
{ {
\repeat volta 2 { \repeat volta 2 {
\line \line
} }
\break \break
\repeat volta 2 { \repeat volta 2 {
\line \line
} }
} }
{ {
\tenorA \tenorA r8
\tenorB \tenorB r8
} }
>> >>
} }

2
build
View File

@ -18,7 +18,7 @@ LILYDRUM="$LIB/lilydrum/"
# Add custom bagpipe.ly to search path # Add custom bagpipe.ly to search path
BAGPIPELY="$LIB/bagpipe.ly/" BAGPIPELY="$LIB/bagpipe.ly/"
# Options by this script # Options by this script
# see http://lilypond.org/doc/v2.18/Documentation/usage/command_002dline-usage#advanced-command-line-options-for-lilypond # see http://lilypond.org/doc/v2.18/Documentation/usage/command_002dline-usage#advanced-command-line-options-for-lilypond
OPTIONS="-dno-strip-output-dir -dno-point-and-click -dpaper-size=\"a4landscape\"" OPTIONS="-dno-strip-output-dir -dno-point-and-click -dpaper-size=\"a4landscape\""

View File

@ -37,8 +37,8 @@ pempty = \drummode {
pone = \drummode { pone = \drummode {
g8 | g8 |
\flam d8. d16 g8 \flam d8. d16 g8
d4.:32~ d4.:32~
d8 d16 g d g d8 d16 g d g
| |
d8. d16 \flam g8 d8. d16 \flam g8
d4.:32~ d4.:32~
@ -84,3 +84,13 @@ pfive = \drummode {
d16 g d g d8 d16 g d g d8
\flam g4 \flam g4
} }
psix = \drummode {
g8 |
\flam d8. d16 \flam g8
d4.:32(
d8.) g16 d32 g d g
|
d8.-> d16 \flam g8
d4.:32(
d4)
}

View File

@ -11,6 +11,7 @@
\repeat volta 2 { \partial 8 \pthree \midone \pthree \endone } \break \repeat volta 2 { \partial 8 \pthree \midone \pthree \endone } \break
\repeat volta 2 { \partial 8 \pfour \midone \pfour \endone } \break \repeat volta 2 { \partial 8 \pfour \midone \pfour \endone } \break
\repeat volta 2 { \partial 8 \pfive \midone \pfive \endone } \break \repeat volta 2 { \partial 8 \pfive \midone \pfive \endone } \break
\repeat volta 2 { \partial 8 \psix \midone \psix \endone } \break
}% End of drums % }% End of drums %
} }
\header { \header {

View File

@ -7,6 +7,12 @@
\include "./notes.tenor.ily" \include "./notes.tenor.ily"
\include "./notes.side.ily" \include "./notes.side.ily"
\layout {
indent = 5.0
short-indent = 2.0
}
\score { \score {
\new StaffGroup << \new StaffGroup <<
\new PipeBandDrumStaff = "side" \with { \new PipeBandDrumStaff = "side" \with {

View File

@ -11,6 +11,11 @@
%\include "./notes.pipes.seconds.ily" %\include "./notes.pipes.seconds.ily"
%\include "./notes.lyrics.ily" %\include "./notes.lyrics.ily"
\layout {
indent = 5.0
short-indent = 2.0
}
\score { \score {
\new StaffGroup << \new StaffGroup <<
\new Staff \with { \new Staff \with {

View File

@ -6,6 +6,11 @@
\include "./notes.bass.ily" \include "./notes.bass.ily"
\include "./notes.tenor.ily" \include "./notes.tenor.ily"
\layout {
indent = 5.0
short-indent = 2.0
}
\score { \score {
\new StaffGroup << \new StaffGroup <<
\new PipeBandDrumStaff = "tenor" \with { \new PipeBandDrumStaff = "tenor" \with {