Merge branch 'lilypond/translation' of ssh://git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / ly / bagpipe.ly

diff --git a/ly/bagpipe.ly b/ly/bagpipe.ly
index 976eb7c6cc4706fac4abfb8b2f5554748e5d8ab0..cfe1ec14506acdecc228ee75750ac3497a9382e5 100644 (file)
--- a/ly/bagpipe.ly
+++ b/ly/bagpipe.ly
@@ -1,5 +1,5 @@
 %{
-  Bagpipe music settings for Lilypond.
+  Bagpipe music settings for LilyPond.
   This file builds on work by Andrew McNabb (http://www.mcnabbs.org/andrew/)
   
   Substantial changes and additions made by 
@@ -9,7 +9,7 @@
   $Id: bagpipe.ly,v 1.12 2006/03/16 14:39:46 hanwen Exp $
 %}
 
-\version "2.10.0"
+\version "2.12.0"
 
 % Notes of the scale of the Great Highland Bagpipe. Extra high notes for bombarde.
 % Flat notes used mainly in some modern music.
@@ -45,7 +45,7 @@ hideKeySignature = {
 }
 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)
@@ -69,20 +69,16 @@ showKeySignature = {
 % Sets the autobeamer to span quarter notes only. Use for fast music.
 % TODO: Needs more tweaking
 quarterBeaming = {
-  #(override-auto-beam-setting '(end * * * *) 1 4 'Staff)
-  #(override-auto-beam-setting '(end * * * *) 1 2 'Staff)
-  #(override-auto-beam-setting '(end * * * *) 3 4 'Staff)
-  #(override-auto-beam-setting '(end * * * *) 4 4 'Staff)
-  #(revert-auto-beam-setting '(end 1 32 2 4 ) 1 8 'Staff)
-  #(revert-auto-beam-setting '(end 1 32 2 4 ) 3 8 'Staff)
-  #(revert-auto-beam-setting '(end 1 32 4 4 ) 1 8 'Staff)
-  #(revert-auto-beam-setting '(end 1 32 4 4 ) 3 8 'Staff)
-  #(revert-auto-beam-setting '(end 1 32 4 4 ) 5 8 'Staff)
-  #(revert-auto-beam-setting '(end 1 32 4 4 ) 7 8 'Staff)
+  \overrideBeamSettings #'Staff #'(4 . 4) #'end
+    #'((* . (1 1 1 1)) ; could omit this and use beatLength
+       ((1 . 32) . (4 4 4 4 4 4 4 4)))
+  \overrideBeamSettings #'Staff #'(2 . 4) #'end
+    #'((* . (1 1))
+       ((1 . 32) . (4 4 4 4)))
 }
 halfBeaming = {
-  #(override-auto-beam-setting '(end * * 2 2) 1 2 'Staff)
-  #(override-auto-beam-setting '(end * * 2 2) 2 2 'Staff)
+  \overrideBeamSettings #'Staff #'(2 . 2) #'end
+    #'((* . (1 1))) % could omit this and use beatLength
 }
 % Reels are in allabreve time with half note beaming.
 reelTime = {