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

diff --git a/ly/bagpipe.ly b/ly/bagpipe.ly
index b3cc07213b..c1901e460c 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.0"
 
 % Notes of the scale of the Great Highland Bagpipe. Extra high notes for bombarde.
 % Flat notes used mainly in some modern music.
@@ -38,17 +38,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 +57,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 +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.
@@ -89,13 +90,13 @@ 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
+  \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)
+  \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