Run grand replace for 2015.

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

diff --git a/ly/performer-init.ly b/ly/performer-init.ly
index 2d0d4d40db4e6a2b36beb08e15105337c431a4cd..645c8ee45a79a03422b5e974dc2cb292ea3dc5c3 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--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+%%%% Copyright (C) 1996--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 %%%%                          Jan Nieuwenhuizen <janneke@gnu.org>
 %%%%
 %%%% LilyPond is free software: you can redistribute it and/or modify
@@ -26,6 +26,7 @@
   \name Staff
   \accepts Voice
   \accepts CueVoice
+  \accepts NullVoice
   \defaultchild Voice
 
   \consists "Staff_performer"
@@ -181,6 +182,17 @@
   \name "Devnull"
 }
 
+\context {
+  \type "Performer_group"
+  \name NullVoice
+  \alias Staff
+  \alias Voice
+  %% needed for melismata
+  \consists "Tie_performer"
+  \consists "Beam_performer"
+  \consists "Slur_performer"
+}
+
 \context {
   \Staff
   \name TabStaff
@@ -197,6 +209,7 @@
   \name Score
 
   melismaBusyProperties = #default-melisma-properties
+  instrumentName = #"bright acoustic"
   midiChannelMapping = #'staff
 
   %% quarter = 60
@@ -209,6 +222,7 @@
   \accepts TabStaff
   \accepts StaffGroup
   \accepts Devnull
+  \accepts NullVoice
   \accepts ChoirStaff
   \accepts RhythmicStaff
   \accepts ChordNames