Re: Doc: Update ../ly/Bagpipe.ly (issue 241270043 by address@hidden)

[David Kastrup]

address@hidden writes:

> Reviewers: dak,
>
> Message:
> Oliver, I wonder if you could take a look at the comments by one of our
> developers about the recent patch you supplied to us for Bagpipe.ly and
> answer his questions.

I've prepared a patch based on the difference to version 2.19.0.  This
should likely be used instead of what we currently have in Rietveld.

>From 1f737a6238e4d45776cc8ffc92d31633c2790683 Mon Sep 17 00:00:00 2001
From: Oliver Briede <address@hidden>
Date: Fri, 12 Jun 2015 15:06:26 +0200
Subject: [PATCH] Issue 3605: Corrections to ly/bagpipe.ly

---
 ly/bagpipe.ly | 126 ++++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 87 insertions(+), 39 deletions(-)

diff --git a/ly/bagpipe.ly b/ly/bagpipe.ly
index 1c23924..a234b6d 100644
--- a/ly/bagpipe.ly
+++ b/ly/bagpipe.ly
@@ -6,6 +6,8 @@
   Sven Axelsson, the Murray Pipes & Drums of Gothenburg
   (http://www.murrays.nu)
 
+  Notation - Errors fixed by Julia Meihoefer and Oliver Briede are marked '@JO'
+
   $Id: bagpipe.ly,v 1.12 2006/03/16 14:39:46 hanwen Exp $
 %}
 
@@ -146,93 +148,137 @@ tdble = { \pgrace { A32[ e f] } }
 tdblf = { \pgrace { A32[ f g] } }
 tdblg = { \pgrace { A32[ g f] } }
 
-% Shakes
+% Shakes / Pele
 % A few of these can't really be played and are here only for consistency.
+% @JO: We would skip the previous comment line. It is irritating, because some 
triple strikes
+%      are intentionally left out, because they can't be played.
+%
 shakea = { \pgrace { g32[ a e a G] } }
 shakeb = { \pgrace { g32[ b e b G] } }
 shakec = { \pgrace { g32[ c e c G] } }
 shaked = { \pgrace { g32[ d e d G] } }
+wshaked = { \pgrace { g32[ d e d c] } }        % @JO: added missing light shake
 shakee = { \pgrace { g32[ e f e a] } }
-shakef = { \pgrace { g32[ f g f a] } }
+%shakef = { \pgrace { g32[ f g f a] } }        % @JO: changed a to e
+shakef = { \pgrace { g32[ f g f e] } }
 shakeg = { \pgrace { A32[ f g a] } }
 shakeA = { \pgrace { A32[ g A a] } }
 
-% Half shakes
-hshakea = { \pgrace { a32[ d a G] } }
-hshakeb = { \pgrace { b32[ d b G] } }
-hshakec = { \pgrace { c32[ d c G] } }
+% Half shakes / Half Pele
+%hshakea = { \pgrace { a32[ d a G] } } % @JO: changed d to e
+hshakea = { \pgrace { a32[ e a G] } }
+%hshakeb = { \pgrace { b32[ d b G] } } % @JO: changed d to e
+hshakeb = { \pgrace { b32[ e b G] } }
+%hshakec = { \pgrace { c32[ d c G] } } % @JO: changed d to e
+hshakec = { \pgrace { c32[ e c G] } }
 hshaked = { \pgrace { d32[ e d G] } }
+whshaked = { \pgrace { d32[ e d c] } } % @JO: added missing light half shake
 hshakee = { \pgrace { e32[ f e a] } }
-hshakef = { \pgrace { f32[ g f a] } }
-hshakeg = { \pgrace { g32[ f g a] } }
+%hshakef = { \pgrace { f32[ g f a] } } % @JO: changed a to e
+hshakef = { \pgrace { f32[ g f e] } }
+%hshakeg = { \pgrace { g32[ f g a] } } % @JO: changed f to A and a to f
+hshakeg = { \pgrace { g32[ A g f] } }
 hshakeA = { \pgrace { A32[ g A a] } }
 
-% Thumb shakes
-tshakea = { \pgrace { A32[ a d a G] } }
-tshakeb = { \pgrace { A32[ b d b G] } }
-tshakec = { \pgrace { A32[ c d c G] } }
+% Thumb shakes / Thumb Peles
+%tshakea = { \pgrace { A32[ a d a G] } } % @JO: changed d to e
+tshakea = { \pgrace { A32[ a e a G] } }
+%tshakeb = { \pgrace { A32[ b d b G] } } % @JO: changed d to e
+tshakeb = { \pgrace { A32[ b e b G] } }
+%tshakec = { \pgrace { A32[ c d c G] } } % @JO: changed d to e
+tshakec = { \pgrace { A32[ c e c G] } }
 tshaked = { \pgrace { A32[ d e d G] } }
+wtshaked = { \pgrace { A32[ d e d c] } } % @JO: added missing light thumb shake
 tshakee = { \pgrace { A32[ e f e a] } }
-tshakef = { \pgrace { A32[ f g f a] } }
-tshakeg = { \pgrace { A32[ f g a] } }
+%tshakef = { \pgrace { A32[ f g f a] } } % @JO: changed a to e
+tshakef = { \pgrace { A32[ f g f e] } }
+%tshakeg = { \pgrace { A32[ f g a] } } % @JO: changed f to g, g to A, a to g 
and add f
+tshakeg = { \pgrace { A32[ g A g f] } }
 tshakeA = { \pgrace { A32[ g A a] } }
 
-% Slurs
+% Slurs / G - Grace Strike
 % A few of these can't really be played and are here only for consistency.
+% @JO: We would skip the previous comment line. It is irritating, because some 
triple strikes
+%      are intentionally left out, because they can't be played.
+%
 slura  = { \pgrace { g32[ a G] } }
 slurb  = { \pgrace { g32[ b G] } }
 slurc  = { \pgrace { g32[ c G] } }
 slurd  = { \pgrace { g32[ d G] } }
 wslurd = { \pgrace { g32[ d c] } }
 slure  = { \pgrace { g32[ e a] } }
-slurf  = { \pgrace { g32[ f a] } }
+%slurf  = { \pgrace { g32[ f a] } } % @JO: changed a to e
+slurf  = { \pgrace { g32[ f e] } }
 slurg  = { \pgrace { A32[ f a] } }
 slurA  = { \pgrace { f32[ a] } }
 
-% Half slurs
+% Half slurs / Half Strike
 hslura  = { \pgrace { a32[ G] } }
 hslurb  = { \pgrace { b32[ G] } }
 hslurc  = { \pgrace { c32[ G] } }
 hslurd  = { \pgrace { d32[ G] } }
 whslurd = { \pgrace { d32[ c] } }
 hslure  = { \pgrace { e32[ a] } }
-hslurf  = { \pgrace { f32[ a] } }
-hslurg  = { \pgrace { g32[ a] } }
+%hslurf  = { \pgrace { f32[ a] } } % @JO: changed a to e
+hslurf  = { \pgrace { f32[ e] } }
+%hslurg  = { \pgrace { g32[ a] } } % @JO: changed a to f
+hslurg  = { \pgrace { g32[ f] } }
 hslurA  = { \pgrace { A32[ a] } }
 
-% Thumb slurs
+% Thumb slurs / Thumb Strike
 tslura  = { \pgrace { A32[ a G] } }
 tslurb  = { \pgrace { A32[ b G] } }
 tslurc  = { \pgrace { A32[ c G] } }
 tslurd  = { \pgrace { A32[ d G] } }
 wtslurd = { \pgrace { A32[ d c] } }
 tslure  = { \pgrace { A32[ e a] } }
-tslurf  = { \pgrace { A32[ f a] } }
-tslurg  = { \pgrace { A32[ f a] } }
+%tslurf  = { \pgrace { A32[ f a] } } % @JO: changed a to e
+tslurf  = { \pgrace { A32[ f e] } }
+%tslurg  = { \pgrace { A32[ f a] } } % @JO: changed f to g and a to f
+tslurg  = { \pgrace { A32[ g f] } }
 tslurA  = { \pgrace { f32[ a] } }
 
-% Catches
-catcha = { \pgrace { a32[ G d G] } }
-catchb = { \pgrace { b32[ G d G] } }
-catchc = { \pgrace { c32[ G d G] } }
-catchd = { \pgrace { d32[ G b G] } }
-catche = { \pgrace { e32[ G d G] } }
-
-% G-grace catches
-gcatcha = { \pgrace { g32[ a G d G] } }
-gcatchb = { \pgrace { g32[ b G d G] } }
-gcatchc = { \pgrace { g32[ c G d G] } }
-gcatchd = { \pgrace { g32[ d G b G] } }
-gcatche = { \pgrace { g32[ e G d G] } }
+% Catches / Half Grip
+%catcha = { \pgrace { a32[ G d G] } } % @JO: Names are irritating for these 
movements.
+%catchb = { \pgrace { b32[ G d G] } } %      Does not match with above name 
conventions.
+%catchc = { \pgrace { c32[ G d G] } } %      These movements are half catches
+%catchd = { \pgrace { d32[ G b G] } } %      (shorter than catches).
+%catche = { \pgrace { e32[ G d G] } } %      Correct movements 'catches' 
follow here:
+
+catcha = { \pgrace { g32[ a G d G] } }
+catchb = { \pgrace { g32[ b G d G] } }
+catchc = { \pgrace { g32[ c G d G] } }
+catchd = { \pgrace { g32[ d G d G] } } % @JO: added normal d
+%catchd = { \pgrace { g32[ d G b G] } } % @JO: this is light d
+wcatchd = { \pgrace { g32[ d G b G] } }
+catche = { \pgrace { g32[ e G d G] } }
+
+% @JO: Half catches / G - Grace Grip
+%gcatcha = { \pgrace { g32[ a G d G] } } % @JO: Names are irritating for these 
movements.
+%gcatchb = { \pgrace { g32[ b G d G] } } %      Does not match with above name 
conventions.
+%gcatchc = { \pgrace { g32[ c G d G] } } %      These movements are 'normal' 
catches
+%gcatchd = { \pgrace { g32[ d G b G] } } %      There is nothing like a 'G - 
catch'
+%gcatche = { \pgrace { g32[ e G d G] } } %      Correct movements 'half 
catches' follow here:
+
+hcatcha = { \pgrace { a32[ G d G] } }
+hcatchb = { \pgrace { b32[ G d G] } }
+hcatchc = { \pgrace { c32[ G d G] } }
+hcatchd = { \pgrace { d32[ G d G] } } % @JO: added normal d
+%hcatchd = { \pgrace { d32[ G b G] } } % @JO: this is light d
+whcatchd = { \pgrace { d32[ G b G] } }
+hcatche = { \pgrace { e32[ G d G] } }
 
 % Thumb catches
 tcatcha = { \pgrace { A32[ a G d G] } }
 tcatchb = { \pgrace { A32[ b G d G] } }
 tcatchc = { \pgrace { A32[ c G d G] } }
-tcatchd = { \pgrace { A32[ d G b G] } }
+tcatchd = { \pgrace { A32[ d G d G] } } % @JO: added normal d
+%tcatchd = { \pgrace { A32[ d G b G] } } % @JO: this is light d
+wtcatchd = { \pgrace { A32[ d G b G] } }
 tcatche = { \pgrace { A32[ e G d G] } }
 
 % Triple strikes (BMW has them all, but I've never seen any but the A one 
used, so ...)
+% @JO: See above comment in 'shakes' and 'slurs' section
 tripleA = { \pgrace { A32[ g A g A g] } }
 
 % Throws
@@ -249,16 +295,18 @@ wbirl = { \pgrace { G32[ a G] } }
 gbirl = { \pgrace { g32[ a G a G] } }
 dbirl = { \pgrace { d32[ a G a G] } }
 
-% Grips
+% Grips / Leumluath
 grip  = { \pgrace { G32[ d G] } }
-dgrip = { \pgrace { G32[ b G] } }
+%dgrip = { \pgrace { G32[ b G] } } % @JO: wrong name. This is b grip
+bgrip = { \pgrace { G32[ b G] } }
 egrip = { \pgrace { G32[ e G] } }
 
 % Taorluaths
 taor    = { \pgrace { G32[ d G e] } }
 taorjmd = { \pgrace { G32[ d a e] } }
 taorold = { \pgrace { G32[ d G a e] } }
-dtaor   = { \pgrace { G32[ b G e] } }
+%dtaor   = { \pgrace { G32[ b G e] } } % @JO: wrong name. This is b taorluath
+btaor   = { \pgrace { G32[ b G e] } }
 Gtaor   = { \pgrace { d32[ G e] } }
 taoramb = { \pgrace { G32[ d G b e] } }
 taoramc = { \pgrace { G32[ d G c e] } }
-- 
2.1.4


-- 
David Kastrup