Merge remote branch 'origin/master' into release/unstable

[lilypond.git] / ly / bagpipe.ly

diff --git a/ly/bagpipe.ly b/ly/bagpipe.ly
index ea252970aab58bc21f754f75c3799162b98231be..c1c7f41e03a4eb5a32bb102a0116a972db0783f3 100644 (file)
--- a/ly/bagpipe.ly
+++ b/ly/bagpipe.ly
@@ -9,7 +9,7 @@
   $Id: bagpipe.ly,v 1.12 2006/03/16 14:39:46 hanwen Exp $
 %}
 
-\version "2.17.6"
+\version "2.19.16"
 
 % Notes of the scale of the Great Highland Bagpipe. Extra high notes for bombarde.
 % Flat notes used mainly in some modern music.
@@ -19,13 +19,13 @@ pitchnamesBagpipe = #`(
   (a . ,(ly:make-pitch 0 5 NATURAL))
   (b . ,(ly:make-pitch 0 6 NATURAL))
   (c . ,(ly:make-pitch 1 0 SHARP))
-  (cflat . ,(ly:make-pitch 1 0 FLAT))
+  (c-flat . ,(ly:make-pitch 1 0 FLAT))
   (d . ,(ly:make-pitch 1 1 NATURAL))
   (e . ,(ly:make-pitch 1 2 NATURAL))
   (f . ,(ly:make-pitch 1 3 SHARP))
-  (fflat . ,(ly:make-pitch 1 3 FLAT))
+  (f-flat . ,(ly:make-pitch 1 3 FLAT))
   (g . ,(ly:make-pitch 1 4 NATURAL))
-  (gflat . ,(ly:make-pitch 1 4 FLAT))
+  (g-flat . ,(ly:make-pitch 1 4 FLAT))
   (A . ,(ly:make-pitch 1 5 NATURAL))
   (B . ,(ly:make-pitch 1 6 NATURAL))
   (C . ,(ly:make-pitch 2 0 SHARP))
@@ -38,7 +38,7 @@ pitchnames = \pitchnamesBagpipe
 
 hideKeySignature = {
   % We normally don't want to show the key signature.
-  \override Staff.KeySignature.stencil = ##f
+  \omit Staff.KeySignature
   \set Staff.extraNatural = ##f
   \key d \major
   \accidentalStyle forget
@@ -71,8 +71,9 @@ quarterBeaming = {
   \set Staff.beamExceptions = #'()
 }
 halfBeaming = {
-  \set Staff.beamExceptions = #'((end . (((1 . 8) . (4 4))
-                                         ((1 . 12) . (3 3)))))
+  \set Staff.beamExceptions =
+  \beamExceptions { 8[ 8 8 8] |
+                   \tuplet 3/2 { 8[ 8 8] 8[ 8 8] 8[ 8 8] 8[ 8 8] } }
 }
 
 % Reels are in allabreve time with half note beaming.