Updated.

cheatsheet.ly

@@ -10,7 +10,7 @@
 #(set-global-staff-size 18)
 #(set-default-paper-size "a4" 'landscape)
 
-\include "./bagpipe.ly"
+\include "./bagpipe_new.ly"
 
 \paper {
   indent = 0\mm
@@ -27,8 +27,8 @@
     \set Staff.instrumentName = "Plain notes "
     G4 a b c cflat d e f fflat g gflat A
     }
-    \addlyrics { 
+    \addlyrics {
-    G a b c cflat d e f fflat g gflat A 
+    G a b c cflat d e f fflat g gflat A
     }
 }
 
@@ -36,12 +36,12 @@
     {
     \bagpipeKey
     \set Staff.instrumentName = "Single grace notes "
-    \grG a4 \gra a \grb a \grc a \grd a 
+    \grG a4 \gra a \grb a \grc a \grd a
     \gre a \grf a \grg a \grA a
     }
-    \addlyrics { 
+    \addlyrics {
-    "\grG" "\gra" "\grb" "\grc" "\grd" 
+    "\grG" "\gra" "\grb" "\grc" "\grd"
-    "\gre" "\grf" "\grg" "\grA" 
+    "\gre" "\grf" "\grg" "\grA"
     }
 }
 
@@ -53,9 +53,9 @@
     \dble e \dblf f \dblg g \dblA A \tripleA A
     \hdblf f \tdblf f
     }
-    \addlyrics { 
+    \addlyrics {
-    "\dblG" "\dbla" "\dblb" "\dblc" "\dbld" 
+    "\dblG" "\dbla" "\dblb" "\dblc" "\dbld"
-    "\dble" "\dblf" "\dblg" "\dblA" 
+    "\dble" "\dblf" "\dblg" "\dblA"
     "\\tripleA" "\hdblf" "\\tdblf"
     }
 }
@@ -69,13 +69,13 @@
     \slure e \slurf f \slurg g \slurA A
     \hslurf f \tslurf f
     }
-    \addlyrics { 
+    \addlyrics {
-    "\slura" "\slurb" "\slurc" "\slurd" 
+    "\slura" "\slurb" "\slurc" "\slurd"
-    "\slure" "\slurf" "\slurg" "\slurA" 
+    "\slure" "\slurf" "\slurg" "\slurA"
     "\hslurf" "\\tslurf"
     }
 }
-\markup { "All other half slurs and thumb slurs are available similarly. " 
+\markup { "All other half slurs and thumb slurs are available similarly. "
           "Note that many of these aren't really playable, and are only included for consistency." }
 
 \score {
@@ -86,14 +86,14 @@
     \shakee e \shakef f \shakeg g \shakeA A
     \hshakef f \tshakef f
     }
-    \addlyrics { 
+    \addlyrics {
-    "\shakea" "\shakeb" "\shakec" "\shaked" 
+    "\shakea" "\shakeb" "\shakec" "\shaked"
-    "\shakee" "\shakef" "\shakeg" "\shakeA" 
+    "\shakee" "\shakef" "\shakeg" "\shakeA"
     "\hshakef" "\\tshakef"
     }
     \header { piece = " " breakbefore = ##t }
 }
-\markup { "All other half shakes and thumb shakes are available similarly. " 
+\markup { "All other half shakes and thumb shakes are available similarly. "
           "Note that many of these aren't really playable, and are only included for consistency." }
 
 \score {
@@ -103,9 +103,9 @@
     e \catcha a e \catchb b e \catchc c e \catchd d f \catche e
     e \gcatchc c g \tcatchc c
     }
-    \addlyrics { 
+    \addlyrics {
     \skip 4 "\catcha" \skip 4 "\catchb" \skip 4 "\catchc" \skip 4 "\catchd"
-    \skip 4 "\catche" \skip 4 "\gcatchc" \skip 4 "\\tcatchc" 
+    \skip 4 "\catche" \skip 4 "\gcatchc" \skip 4 "\\tcatchc"
     }
 }
 
@@ -115,10 +115,10 @@
     {
     \bagpipeKey
     \set Staff.instrumentName = "Throws "
-    a \thrwd d G \Gthrwd d e \thrwf f a \gripthrwd d
+    a \thrwd d G \Gthrwd d a \thrwe e a \wthrwe e d \thrwf f a \gripthrwd d
     }
-    \addlyrics { 
+    \addlyrics {
-    \skip 4 "\\thrwd" \skip 4 "\Gthrwd" \skip 4 "\\thrwf" \skip 4 "\\gripthrwd" 
+    \skip 4 "\\thrwd" \skip 4 "\Gthrwd" \skip 4 "\\thrwe" \skip 4 "\\wthrwe" \skip4 "\\thrwf" \skip 4 "\\gripthrwd"
     }
 }
 
@@ -129,9 +129,9 @@
     a \grip c a \dgrip d a \egrip c
     \birl a \wbirl a \gbirl a \dbirl a
     }
-    \addlyrics { 
+    \addlyrics {
-    \skip 4 "\grip" \skip 4 "\dgrip" \skip 4 "\egrip" 
+    \skip 4 "\grip" \skip 4 "\dgrip" \skip 4 "\egrip"
-    "\birl" "\wbirl" "\gbirl" "\dbirl" 
+    "\birl" "\wbirl" "\gbirl" "\dbirl"
     }
 }
 
@@ -142,9 +142,9 @@
     e \taor a d \dtaor a G \Gtaor a
     b \taoramb b c \taoramc c b \taoramd d
     }
-    \addlyrics { 
+    \addlyrics {
-    \skip 4 "\\taor" \skip 4 "\dtaor" \skip 4 "\Gtaor" 
+    \skip 4 "\\taor" \skip 4 "\dtaor" \skip 4 "\Gtaor"
-    \skip 4 "\\taoramb" \skip 4 "\\taoramc" \skip 4 "\\taoramd" 
+    \skip 4 "\\taoramb" \skip 4 "\\taoramc" \skip 4 "\\taoramd"
     }
 }
 
@@ -155,9 +155,9 @@
     e \crun e d \dcrun e G \Gcrun e
     b \crunamb e c \crunamc e b \crunamd e
     }
-    \addlyrics { 
+    \addlyrics {
-    \skip 4 "\\crun" \skip 4 "\dcrun" \skip 4 "\Gcrun" 
+    \skip 4 "\\crun" \skip 4 "\dcrun" \skip 4 "\Gcrun"
-    \skip 4 "\\crunamb" \skip 4 "\\crunamc" \skip 4 "\\crunamd" 
+    \skip 4 "\\crunamb" \skip 4 "\\crunamc" \skip 4 "\\crunamd"
     }
     \header { piece = " " breakbefore = ##t }
 }
@@ -166,16 +166,16 @@
     {
     \bagpipeKey
     \set Staff.instrumentName = \markup { \column { "Piobaireachd " "notation " } }
-    \cad c4 A \hcad c 
+    \cad c4 A \hcad c
     e \gracad e d \grGcad d
     a \pthrwd d c \darodo b G \Gdarodo c
     a \dre e G \bari g e \dari g e \dare f
     }
-    \addlyrics { 
+    \addlyrics {
-    "\cad" \skip 4 "\hcad" 
+    "\cad" \skip 4 "\hcad"
-    \skip 4 "\gracad" \skip 4 "\grGcad" 
+    \skip 4 "\gracad" \skip 4 "\grGcad"
-    \skip 4 "\pthrwd" \skip 4 "\darodo" \skip 4 "\Gdarodo" 
+    \skip 4 "\pthrwd" \skip 4 "\darodo" \skip 4 "\Gdarodo"
-    \skip 4 "\dre" \skip 4 "\bari" \skip 4 "\dari" \skip 4 "\dare" 
+    \skip 4 "\dre" \skip 4 "\bari" \skip 4 "\dari" \skip 4 "\dare"
     }
 }
 
@@ -199,8 +199,8 @@
     e \fifteenthcutting a G \Gfifteenthcutting a
     e \seventeenthcutting a G \Gseventeenthcutting a
     }
-    \addlyrics { 
+    \addlyrics {
-    \skip 4 "\fifteenthcutting" \skip 4 "\Gfifteenthcutting" 
+    \skip 4 "\fifteenthcutting" \skip 4 "\Gfifteenthcutting"
     \skip 4 "\seventeenthcutting" \skip 4 "\Gseventeenthcutting"
     }
 }
@@ -215,15 +215,15 @@
     \skip 4 "\barluadh" \skip 4 "\Gbarluadh"
     }
 }
-    
+
 \markup {
 \column {
     \override #'(line-width . 140)
     \justify {
-    These are the specific bagpipe markups that are 
+    These are the specific bagpipe markups that are
-    available. You need to know alot more about entering normal music 
+    available. You need to know alot more about entering normal music
-    in order to produce userful output. All of this is available in 
+    in order to produce userful output. All of this is available in
-    the Lilypond tutorial and manual, as well as in the tips, regression 
+    the Lilypond tutorial and manual, as well as in the tips, regression
     tests, and snippet repository.
     }
     \line { " " }
@@ -231,7 +231,7 @@
     \justify {
     Check out \with-url #"http://www.lilypond.org/" {\bold www.lilypond.org} to learn
     more about this. All of these things are linked from the documentation
-    page. Make sure you use the \bold 2.11.0 documentation — lots of
+    page. Make sure you use the \bold 2.12.0 documentation — lots of
     things have changed since the older versions.
     }
 }