Metronome-mark: process Neil's comments: cleanups and fixing warnings.

[lilypond.git] / ly / performer-init.ly

diff --git a/ly/performer-init.ly b/ly/performer-init.ly
index 8c5b4932591edb401414adf453845d75d2ecae7d..4dcce2915b359bc84b43122ff9c23b75709c0395 100644 (file)
--- a/ly/performer-init.ly
+++ b/ly/performer-init.ly
@@ -1,6 +1,6 @@
 %%%% This file is part of LilyPond, the GNU music typesetter.
 %%%%
-%%%% Copyright (C) 1996--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+%%%% Copyright (C) 1996--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 %%%%                          Jan Nieuwenhuizen <janneke@gnu.org>
 %%%%
 %%%% LilyPond is free software: you can redistribute it and/or modify
@@ -78,7 +78,11 @@
 \context {
   \type "Performer_group"
   \name FiguredBass
-  \consists "Swallow_performer"
+}
+
+\context {
+  \type "Performer_group"
+  \name FretBoards
 }
 
 \context {
@@ -106,8 +110,8 @@
 \context {
   \type "Performer_group"
   \name "Devnull"
-  \consists "Swallow_performer"
 }
+
 \context {
   \Staff
   \name TabStaff
@@ -142,13 +146,13 @@
   \accepts GrandStaff
   \accepts PianoStaff
   \accepts TabStaff
-  \accepts Staff
   \accepts StaffGroup
   \accepts Devnull
   \accepts ChoirStaff
   \accepts RhythmicStaff
   \accepts ChordNames
   \accepts FiguredBass
+  \accepts FretBoards
   \accepts Lyrics
   \accepts VaticanaStaff
 
@@ -156,7 +160,6 @@
   \consists "Control_track_performer"
   \consists "Tempo_performer"
   \consists "Timing_translator"
-  \consists "Swallow_performer"
 
   \defaultchild "Staff"
 
@@ -207,6 +210,7 @@
   \accepts Lyrics
   \accepts ChordNames
   \accepts FiguredBass
+  \accepts FretBoards
   \defaultchild Staff
 }