X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fbagpipe.ly;h=1c239246a0d1cbd3f9170d0a710dbf00a7022aee;hb=98ac53591234404cd70c5eebd370a598ec74095b;hp=b3cc07213b3f8d395d0ad9e88fb44e44ae3371fd;hpb=ccc485525e63f68623bce1c3ca7a2d4fb6e94499;p=lilypond.git

diff --git a/ly/bagpipe.ly b/ly/bagpipe.ly
index b3cc07213b..1c239246a0 100644
--- 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.15.18"
+\version "2.19.22"
 
 % Notes of the scale of the Great Highland Bagpipe. Extra high notes for bombarde.
 % Flat notes used mainly in some modern music.
@@ -19,12 +19,15 @@ pitchnamesBagpipe = #`(
   (a . ,(ly:make-pitch 0 5 NATURAL))
   (b . ,(ly:make-pitch 0 6 NATURAL))
   (c . ,(ly:make-pitch 1 0 SHARP))
+  (c-flat . ,(ly:make-pitch 1 0 FLAT))
   (cflat . ,(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))
+  (f-flat . ,(ly:make-pitch 1 3 FLAT))
   (fflat . ,(ly:make-pitch 1 3 FLAT))
   (g . ,(ly:make-pitch 1 4 NATURAL))
+  (g-flat . ,(ly:make-pitch 1 4 FLAT))
   (gflat . ,(ly:make-pitch 1 4 FLAT))
   (A . ,(ly:make-pitch 1 5 NATURAL))
   (B . ,(ly:make-pitch 1 6 NATURAL))
@@ -38,17 +41,17 @@ 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
-  $(set-accidental-style 'forget)
+  \accidentalStyle forget
 }
 showKeySignature = {
   % Show the key signature e.g. for BMW compatibility.
-  \override Staff.KeySignature  #'stencil = #ly:key-signature-interface::print
+  \override Staff.KeySignature.stencil = #ly:key-signature-interface::print
   \set Staff.extraNatural = ##f
   \key d \major
-  $(set-accidental-style 'forget)
+  \accidentalStyle forget
 }
 
 % Layout tweaks.
@@ -57,10 +60,10 @@ showKeySignature = {
   \context {
     \Voice
     % All stems go down.
-    \override Stem #'direction = #DOWN
+    \override Stem.direction = #DOWN
     % All slurs and ties are on top.
-    \override Slur #'direction = #UP
-    \override Tie #'direction = #UP
+    \override Slur.direction = #UP
+    \override Tie.direction = #UP
   }
 }
 
@@ -71,8 +74,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.
@@ -88,14 +92,14 @@ marchTime = {
 }
 
 % Add appropriate tweaks needed for piping grace notes to look great.
-stemspace = #(define-music-function (parser location extent) (pair?) #{
-  \once \override Staff.Stem #'X-extent = #extent
+stemspace = #(define-music-function (extent) (pair?) #{
+  \once \override Staff.Stem.X-extent = #extent
 #})
-pgrace = #(define-music-function (parser location notes) (ly:music?) #{
-  \override Score.GraceSpacing #'spacing-increment = #0
-  \override Score.Stem #'beamlet-max-length-proportion = #'(0.5 . 0.5)
+pgrace = #(define-music-function (notes) (ly:music?) #{
+  \override Score.GraceSpacing.spacing-increment = #0
+  \override Score.Stem.beamlet-max-length-proportion = #'(0.5 . 0.5)
   \small \grace $notes \normalsize
-  \revert Score.Stem #'beamlet-default-length
+  \revert Score.Stem.beamlet-default-length
 #})
 
 % Single grace notes