Imported Upstream version 2.18.0

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

diff --git a/ly/performer-init.ly b/ly/performer-init.ly
index fddfbf09188e839542ae21ad77fdf281f3fb37b4..1a383607f1ea2c4d068edcf322f3cb5cf0ef2e6f 100644 (file)
--- a/ly/performer-init.ly
+++ b/ly/performer-init.ly
@@ -16,7 +16,7 @@
 %%%% You should have received a copy of the GNU General Public License
 %%%% along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
-\version "2.16.0"
+\version "2.17.14"
 
 %%
 %% setup for Request->Element conversion.
@@ -26,17 +26,19 @@
   \name Staff
   \accepts Voice
   \accepts CueVoice
+  \accepts NullVoice
   \defaultchild Voice
 
   \consists "Staff_performer"
   \consists "Key_performer"
+  \consists "Midi_control_function_performer"
 }
 
 \context {
   \name Global
   \accepts Score
+  \defaultchild Score
   \description "Hard coded entry point for LilyPond.  Cannot be tuned."
-  EventClasses = #all-event-classes
 }
 
 \context {
@@ -48,6 +50,7 @@
   \alias Staff
   \consists "Staff_performer"
   \consists "Key_performer"
+  \consists "Midi_control_function_performer"
 }
 
 \context {
@@ -59,6 +62,7 @@
   \defaultchild VaticanaVoice
   \consists "Staff_performer"
   \consists "Key_performer"
+  \consists "Midi_control_function_performer"
 }
 
 \context {
@@ -70,6 +74,7 @@
   \alias Staff
   \consists "Staff_performer"
   \consists "Key_performer"
+  \consists "Midi_control_function_performer"
 }
 
 \context {
@@ -170,7 +175,6 @@
 \context {
   \Voice
   \name TabVoice
-  autoBeaming = ##f  % needed for consistent melismata with engravers
 }
 
 \context {
@@ -178,6 +182,20 @@
   \name "Devnull"
 }
 
+\context {
+  \type "Performer_Group"
+  \name NullVoice
+  \alias Staff
+  \alias Voice
+  %% needed for melismata
+  %% TODO: at least the tie performer likely does not work without the
+  %% Note_performer, but I don't know how to shut note output off in
+  %% MIDI.
+  \consists "Tie_performer"
+  \consists "Beam_performer"
+  \consists "Slur_performer"
+}
+
 \context {
   \Staff
   \name TabStaff
@@ -185,6 +203,7 @@
   \alias Staff
   \accepts TabVoice
   \defaultchild TabVoice
+  autoBeaming = ##f  % needed for consistent melismata with engravers
 }
 
 \context {
@@ -193,12 +212,11 @@
   \name Score
 
   melismaBusyProperties = #default-melisma-properties
-  autoBeaming = ##t  % needed for consistent melismata with engravers
   instrumentName = #"bright acoustic"
   midiChannelMapping = #'staff
 
   %% quarter = 60
-  tempoWholesPerMinute = #(ly:make-moment 15 1)
+  tempoWholesPerMinute = #(ly:make-moment 15/1)
 
   \accepts Staff
   \accepts DrumStaff
@@ -230,12 +248,13 @@
   %% Timing variables in layout definitions before any
   %% Timing_translator has been run.
 
+  timeSignatureSettings = #default-time-signature-settings
   timeSignatureFraction = 4/4
+  autoBeaming = ##t  % needed for consistent melismata with engravers
 
-%% These defaults should be the same as the rules established in
-%%   scm/time-signature-settings.scm for 4/4 time
-  measureLength = #(ly:make-moment 4 4)
-  baseMoment = #(ly:make-moment 1  4)
+  %% Other beaming variables are not important as autobeams don't affect
+  %% the Midi.  Melismata are only affected by beams when autobeaming
+  %% is switched off.
 
   \consists "Timing_translator"
 
@@ -267,12 +286,12 @@
   \type "Performer_group"
   \consists "Staff_performer"
   \accepts ChordNameVoice
+  \defaultchild ChordNameVoice
   \name ChordNames
 }
 
 \context {
-  \type "Performer_group"
-  \consists "Note_performer"
+  \Voice
   \name ChordNameVoice
 }