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

2019-01-03 23:34:05 +01:00 · 2019-01-03 23:34:05 +01:00 · a63a7cdc6c
parent efaa3fda01
commit a63a7cdc6c
22 changed files with 135 additions and 75 deletions
--- a/.gitignore
+++ b/.gitignore
@ -2,3 +2,4 @@ sets
 **/*.pdf
 **/*.midi
 **/*.png
+**/*.bww
--- a/4-4_marches/cabar_feidh/config.ily
+++ b/4-4_marches/cabar_feidh/config.ily
@ -13,5 +13,6 @@ halfline = { \repeat unfold 4 \measure }
 line = { \repeat unfold 2 { \halfline } }

 %% Headers
+title = "Cabar Feidh"
 title = "Cabar Fèidh"
 meter = "Regimental March of the Seaforth Highlanders"
--- a/6-8_marches/hills_of_glenorchy/config.ily
+++ b/6-8_marches/hills_of_glenorchy/config.ily
@ -8,7 +8,7 @@ confTempo = {
 	}

 %% Format
-part = { \partial 8 s8 }
+part = { \partial 8 \grace{ s4 } s8 }
 measure = { \grace { s4 } s1. | }
 halfline = { \repeat unfold 2 { \measure } }
 line = { \repeat unfold 2 { \halfline } }
--- a/airs/bells_of_dunblane/notes.pipes.ily
+++ b/airs/bells_of_dunblane/notes.pipes.ily
@ -11,25 +11,26 @@ pipesA = {
 	\dble e2~ e8 [ \grG e8 ] \grg f8 [ \dblA A8 ] |
 	e16 [ c8.~ ] c4~ c8 [ \grG c8 ] \grg d16 [ c16 b8 ] |
 	\grg c16 [ e8.~ ] e4~ e8 [ \grG e8 ] \grg d8. [ b16 ] |
-	\grg c16 [ a8.~ ] a2 
+	\grg c16 [ a8.~ ] a2
 }
 pipesBA = {
 	\grg a8 [ \grd a8 ] |
 	\grg f2~ f8 [ \grg f8 ] g16 [ \grA f16 g8 ] |
 	\grA f16 [ d8.~ ] d2 \grg \tuplet 3/2 { d8 [ c8 b8 ] } |
 	\grg c16 [ e8.~ ] e4~ e8 [ \grG e8 ] \grg d8. [ b16 ] |
-	\grd c2. \grg a8 [ \grd a8 ] 
+	\grd c2.
 }
 pipesBB = {
+	\grg a8 [ \grd a8 ]  |
 	\grg f2~ f8 [ \grg f8 ] g16 [ \grA f16 g8 ] |
 	\grA f16 [ d8.~ ] d2 \grg \tuplet 3/2 { d8 [ c8 b8 ] } |
 	\grg c16 [ e8.~ ] e4~ e8 [ \grG e8 ] \grg d8. [ b16 ] |
-	\grg c16 [ a8.~ ] a4~ a8 [ e8 ] 
+	\grg c16 [ a8.~ ] a4~ a8 [ e8 ]
 }
 pipesC = {
 	\grg f8 [ \dblA A8 ] |
 	e16 [ c8.~ ] c4~ c8 [ \grG c8 ] \grg d16 [ c16 b8 ] |
 	\grg c16 [ e8.~ ] e4~ e8 [ \grG e8 ] \grg f8 [ \dblA A8 ] |
 	e16 [ c8.~ ] c4~ c8 [ \grG c8 ] \grg d8. [ b16 ] |
-	\grG a2. 
+	\grG a2.
 }
--- a/airs/morag_of_dunvegan/notes.side.ily
+++ b/airs/morag_of_dunvegan/notes.side.ily
@ -2,30 +2,37 @@
 % Tenor
 \version "2.18.2"
 sideglobal={}
+composerSide="2018, v1.1"
 snareA = \drummode {
-	\flamd d8 d8:32( g8)		\flamd d8 r8 \flamd d8 |
-	g8 d8:32( g8)		g8 \tuplet 3/2 { d16 g d } g8 |
+	\flam d8 d8:32( g8)		\flam d8 r8 \flam d8 |
+	g8 d8:32( g8)		\flam d8 \tuplet 3/2 { d16 g d } g8 |

-	\flamd d8 d8:32( g8)		\flamd d8 r8 d8 |
-	\tuplet 3/2 { d16 g d } g8 \flamd d8		d4.:32(\< |
+	\tutti {
+		\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 |
-	g8 d8:32( g8)		\flamd d8 \tuplet 3/2 { d16 g d } g8 |
-
-	\flamd d8 d8:32( g8)		\flamd d8 g16. d32-> g16. g32 |
-	d4.:32(		d4.)
+	\tutti {
+		\flam d8 d8:32( g8)		\flam d8 g16. d32-> g16. g32 |
+		d4:32( d8:32)(\>		d4.)\!
+	}
 }

 snareB = \drummode {
 	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		d8:32(-> g8) \flamd d8 |
-	\tuplet 3/2 { d16 g d } g8 \flamd d8		d4.:32(\< |
-
+	\tutti {
+		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		\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 |
-	d4.:32(		d4.)
+	\tutti {
+		\flamd d8 d8:32( g8)		\flamd d8 g16. d32-> g16. g32 |
+		d4:32( d8:32)(\>		d4.)\!
+	}
 }
--- a/airs/my_home/drums.ly
+++ b/airs/my_home/drums.ly
@ -25,17 +25,17 @@
 				}
 			>>
 		}
-		\new PipeBandDrumStaff = "bass" {
-			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
-
-		}
 		\new PipeBandDrumStaff = "tenor" {
 			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
 			\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 {
 		title = \title
--- a/airs/my_home/full.ly
+++ b/airs/my_home/full.ly
@ -56,18 +56,18 @@
 			\tenorglobal
 			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
-			
-			s8 \tenorA s8
-			\tenorB s8
+
+			r8 \tenorA s8
+			r8 \tenorB s8
 		}
-		\new PipeBandDrumStaff = "bass" {
+%{		\new PipeBandDrumStaff = "bass" {
 			\bassglobal
 			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}

 			\bassA s8
 			\bassB s8
-		}
+		}%}
 	>>
 	\header {
 		title = \title
--- a/airs/my_home/notes.side.ily
+++ b/airs/my_home/notes.side.ily
@ -1,13 +1,13 @@
 % 6/8 My Home
 % Side
 \version "2.18.2"
-composerSide = ""
+composerSide = "v1.1, 2018"
 sideglobal = { \eighthCompoundBeaming }
 snareA = \drummode {
 	d8:32( |
 	g8.) d16 g8		\flamd d8. g16 d8 |
-	\flamg g8. d16 g8		d4.:32( |
-	d8.) g16 d8		\flamg g8. d16 g8 |
+	\flamg g8. d16 g8		d4:32(\< 8:32\> |
+	d8.)\! g16 d8		\flamg g4 d16. g32 |
 	\flamd d8. g16 d8		d4.:32( |
 	d8.) g16 d8		\flamd d4 g8 |
 	d8. g16 d8		d4.:32( |
@ -16,12 +16,12 @@ snareA = \drummode {
 }
 snareB = \drummode {
 	d8 |
-	\flamd d8. g16 d8		d4.:32(
-	d8.) g16 d8		d4.:32( |
-	d8.) g16 d8		\flamg g8. d16 g8 |
-	\flamd d8. g16 d8		d4.:32( |
-	d8.) g16 d8		d4.:32( |
-	d8.) g16 d8		\flamd d4 g8 |
+	\flamd d8. g16 d8		d4:32(\< 8:32\> |
+	d8.)\! g16 d8		d4:32(\< 8:32\> |
+	d8.)\! g16 d8		\flamg g4 d16. g32 |
+	\flamd d8. g16 d8		d4.:32(\< |
+	d8.)\! g16 d8		d4.:32(\> |
+	d8.) g16 d8		\flamd d4\! g8 |
 	\flamd d8. g16 d8		\flamg g8. d16 g8 |
 	d4.:32(		d4)
 }
--- a/airs/my_home/notes.tenor.ily
+++ b/airs/my_home/notes.tenor.ily
@ -7,10 +7,10 @@ tenorA = \drummode {
 	d4. g |
 	d4. g8. d16 g8 |
 	d4. g4. |
-	d4. g8 r8 g8 |
+	d4. g4 g8 |
 	d4. g4. |
 	d4. g8. d16 g8 |
 	r8 g d r8 d g |
-	d8 g8 d8 g8 r4
+	d8 g8 d8 g4
 }
 tenorB = \tenorA
--- a/airs/my_home/tenor.ly
+++ b/airs/my_home/tenor.ly
@ -15,7 +15,7 @@

 			}
 			{
-				\repeat unfold 2 { \tenorA }
+				\repeat unfold 2 { \tenorA r8 }
 			}
 		>>
 	}
--- a/airs/the_mist_covered_mountains/drums.ly
+++ b/airs/the_mist_covered_mountains/drums.ly
@ -16,17 +16,24 @@
 			\global
 			<<
 				{
-					\repeat volta 2 { 
-						\part \line 
-			  		} 
+					\repeat volta 2 {
+						\part \line
+			  		}
 			  		\break
 					\repeat volta 2 {
 						\part \line
 					}
 				}
 				{
-				  \snareA s8
-				  \snareB s8
+					\snareA s8
+					<<
+						{
+							\snareB s8
+						}
+						{
+							s8 | s1_\markup { \dynamic {ff} 2nd time through}
+						}
+			  		>>
 				}
 			>>
 		}
@ -34,8 +41,8 @@
 			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }

-			s8 \tenorA
-			s8 \tenorB
+			r8 \tenorA s8
+			r8 \tenorB s8
 		}
 %		\new PipeBandDrumStaff = "bass" {
 %			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
@ -49,7 +56,7 @@
 	\header {
 		title = \title
 		meter = \meter
-		composer = \markup \tiny {
+		composer = \markup {
 			\column \right-align {
 				$(if (not (string=? "" composerSide))  #{ \markup {\line { \composerSide  ":" }} #} )
 				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \composerTenor  ":" }} #} )
--- a/airs/the_mist_covered_mountains/full.ly
+++ b/airs/the_mist_covered_mountains/full.ly
@ -21,9 +21,9 @@
 			<<
 				\new Voice = "format"
 			  	{
-				  	\repeat volta 2 { 
-						\part \line 
-				  	} 
+				  	\repeat volta 2 {
+						\part \line
+				  	}
 				  	\break
 					\repeat volta 2 {
 						\part \line
@ -60,19 +60,27 @@
 			\sideglobal
 			\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
-			
+
 			\snareA s8

-			\snareB s8
+
+			  	<<
+					{
+						\snareB s8
+					}
+					{
+						s8 | s1_\markup { \dynamic {ff} 2nd time through}
+					}
+			  	>>
 		}
 		\new PipeBandDrumStaff = "tenor" {
 			\tenorglobal
 			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }

-			s8 \tenorA
+			r8 \tenorA s8

-			s8 \tenorB
+			r8 \tenorB s8
 		}
 %		\new PipeBandDrumStaff = "bass" {
 %			\bassglobal
--- a/airs/the_mist_covered_mountains/notes.side.ily
+++ b/airs/the_mist_covered_mountains/notes.side.ily
@ -1,15 +1,16 @@
 \version "2.18.2"
 sideglobal = {}
+composerSide = "v1.1, 2018"
 snareA = \drummode {
 	d8:32( |
 	g8.) d16 g8		d8 r8 d8:32( |
 	g8.) d16 g8		d8 r8 d8:32( |
 	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. g16 d8 |
-	d4.:32(		d4) 
+	d4.:32(		d4)
 }
 snareB = \drummode {
 	d8 |
--- a/airs/the_mist_covered_mountains/notes.tenor.ily
+++ b/airs/the_mist_covered_mountains/notes.tenor.ily
@ -11,6 +11,6 @@ tenorA = \drummode {
 	d4. g4. |
 	d4. g8. d16 g8 |
 	r8 g d r8 d g |
-	d8 g8 d8 g8 r4
+	d8 g8 d8 g4
 }
 tenorB = \tenorA
--- a/airs/the_mist_covered_mountains/side.ly
+++ b/airs/the_mist_covered_mountains/side.ly
@ -10,17 +10,24 @@
        \global
        <<
 			{
-			  	\repeat volta 2 { 
-					\part \line 
-			  	} 
+			  	\repeat volta 2 {
+					\part \line
+			  	}
 			  	\break
 				\repeat volta 2 {
 					\part \line
 				}
 			}
 			{
-			  \snareA s8
-			  \snareB s8
+				\snareA s8
+				<<
+					{
+						\snareB s8
+					}
+					{
+						s8 | s1_\markup { \dynamic {ff} 2nd time through}
+					}
+				>>
 			}
 		>>
 	}
--- a/airs/the_mist_covered_mountains/tenor.ly
+++ b/airs/the_mist_covered_mountains/tenor.ly
@ -10,18 +10,18 @@
 		\global
        <<
 			{
-			  	\repeat volta 2 { 
-					\line 
-			  	} 
+			  	\repeat volta 2 {
+					\line
+			  	}
 			  	\break
 				\repeat volta 2 {
 					\line
 				}
 			}
-			
+
 			{
-			  \tenorA
-			  \tenorB
+			  \tenorA r8
+			  \tenorB r8
 		 	}
 		>>
 	}
--- a/2
+++ b/2
@ -18,7 +18,7 @@ LILYDRUM="$LIB/lilydrum/"
 # Add custom bagpipe.ly to search path
 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
 OPTIONS="-dno-strip-output-dir -dno-point-and-click -dpaper-size=\"a4landscape\""

--- a/standards/98_standards.side.ily
+++ b/standards/98_standards.side.ily
@ -37,8 +37,8 @@ pempty = \drummode {
 pone = \drummode {
 	g8 |
 	\flam d8. d16 g8
-	d4.:32~ 
-	d8 d16 g d g 
+	d4.:32~
+	d8 d16 g d g
 	|
 	d8. d16 \flam g8
 	d4.:32~
@ -84,3 +84,13 @@ pfive = \drummode {
  d16 g d g d8
  \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)
+}
--- a/standards/98_standards.side.ly
+++ b/standards/98_standards.side.ly
@ -11,6 +11,7 @@
 			\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 \pfive \midone \pfive \endone } \break
+			\repeat volta 2 { \partial 8 \psix \midone \psix \endone } \break
 		}% End of drums %
 	}
 	\header {
--- a/template/drums.ly
+++ b/template/drums.ly
@ -7,6 +7,12 @@
 \include "./notes.tenor.ily"
 \include "./notes.side.ily"

+
+\layout {
+	indent = 5.0
+	short-indent = 2.0
+}
+
 \score {
 	\new StaffGroup <<
 		\new PipeBandDrumStaff = "side" \with {
--- a/template/full.ly
+++ b/template/full.ly
@ -11,6 +11,11 @@
 %\include "./notes.pipes.seconds.ily"
 %\include "./notes.lyrics.ily"

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

+\layout {
+	indent = 5.0
+	short-indent = 2.0
+}
+
 \score {
 	\new StaffGroup <<
 		\new PipeBandDrumStaff = "tenor" \with {