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

[lilypond.git] / ly / bagpipe.ly

diff --git a/ly/bagpipe.ly b/ly/bagpipe.ly
old mode 100755 (executable)
new mode 100644 (file)
index 4390e93..cfe1ec1
--- a/ly/bagpipe.ly
+++ b/ly/bagpipe.ly
@@ -1,15 +1,15 @@
 %{
-  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 
   Sven Axelsson, the Murray Pipes & Drums of Gothenburg
   (http://www.murrays.nu)
   
-  $Id: bagpipe.ly,v 1.4 2005/08/19 18:18:02 hanwen Exp $
+  $Id: bagpipe.ly,v 1.12 2006/03/16 14:39:46 hanwen Exp $
 %}
 
-\version "2.6.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.
@@ -38,14 +38,14 @@ pitchnames = \pitchnamesBagpipe
 
 hideKeySignature = {
   % We normally don't want to show the key signature.
-  \override Staff.KeySignature #'print-function = ##f
+  \override Staff.KeySignature  #'stencil = ##f
   \set Staff.extraNatural = ##f
   \key d \major
   #(set-accidental-style 'forget)
 }
 showKeySignature = {
   % Show the key signature e.g. for BMW compatibility.
-  \override Staff.KeySignature #'print-function = #'Key_signature_interface::print
+  \override Staff.KeySignature  #'stencil = #ly:key-signature-interface::print
   \set Staff.extraNatural = ##f
   \key d \major
   #(set-accidental-style 'forget)
@@ -53,41 +53,32 @@ showKeySignature = {
 
 % Layout tweaks.
 
-%{
-
-% WTF is this? --hwn
 \layout {
   \context {
     \Voice
     % All stems go down.
-    \stemDown
+    \override Stem #'direction = #DOWN
     % All slurs and ties are on top.
-    \slurUp
-    \tieUp
+    \override Slur #'direction = #UP
+    \override Tie #'direction = #UP
   }
 }
 
-%}
-
 % Some common timing tweaks.
 
 % 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 = {