X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fperformer-init.ly;h=419d52baa59ab01fa4dd6834d210b10483e27bf0;hb=2bbacb364aa29041af9cbbbd32cfad2e8e387cb3;hp=b48bd5454d01ba1b6ca7c53d4ff44ae7300e5f18;hpb=3cdeec5f8598bfaa1dd98baa31a1da8d601eeec5;p=lilypond.git

diff --git a/ly/performer-init.ly b/ly/performer-init.ly
index b48bd5454d..419d52baa5 100644
--- a/ly/performer-init.ly
+++ b/ly/performer-init.ly
@@ -1,41 +1,110 @@
-\version "2.10.0"
+%%%% This file is part of LilyPond, the GNU music typesetter.
+%%%%
+%%%% 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
+%%%% it under the terms of the GNU General Public License as published by
+%%%% the Free Software Foundation, either version 3 of the License, or
+%%%% (at your option) any later version.
+%%%%
+%%%% LilyPond is distributed in the hope that it will be useful,
+%%%% but WITHOUT ANY WARRANTY; without even the implied warranty of
+%%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+%%%% GNU General Public License for more details.
+%%%%
+%%%% 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.19.16"
 
 %%
-%% setup for Request->Element conversion. 
+%% setup for Request->Element conversion.
 %%
 \context {
-    \type "Performer_group"
-    \name Staff
-    \accepts Voice
-    \accepts CueVoice
-    \defaultchild Voice
-    
-    \consists "Staff_performer"
-    \consists "Key_performer"
+  \type "Performer_group"
+  \name Staff
+  \accepts CueVoice
+  \accepts NullVoice
+  \accepts Voice
+  \defaultchild Voice
+
+  \consists "Staff_performer"
+  \consists "Key_performer"
+  \consists "Midi_control_change_performer"
+}
+
+\context {
+  \name Global
+  \accepts Score
+  \defaultchild Score
+  \description "Hard coded entry point for LilyPond.  Cannot be tuned."
+}
+
+\context {
+  \Staff
+  \name KievanStaff
+  \alias Staff
+  \denies Voice
+  \accepts KievanVoice
+  \defaultchild KievanVoice
+}
+
+\context {
+  \Staff
+  \name VaticanaStaff
+  \alias Staff
+  \denies Voice
+  \accepts VaticanaVoice
+  \defaultchild VaticanaVoice
+}
+
+\context {
+  \Staff
+  \name MensuralStaff
+  \alias Staff
+  \denies Voice
+  \accepts MensuralVoice
+  \defaultchild MensuralVoice
 }
+
+\context {
+  \Staff
+  \name PetrucciStaff
+  \alias Staff
+  \denies Voice
+  \accepts PetrucciVoice
+  \defaultchild PetrucciVoice
+}
+
 \context {
-    \name Global
-    \accepts Score
-\description "Hard coded entry point for LilyPond. Cannot be tuned."
-    }
+  \Staff
+  \name GregorianTranscriptionStaff
+  \alias Staff
+  \denies Voice
+  \accepts GregorianTranscriptionVoice
+  \defaultchild GregorianTranscriptionVoice
+}
 
 \context {
-    \Staff
-    \name DrumStaff
-    midiInstrument = #"drums"
-    \accepts DrumVoice
-    \defaultchild DrumVoice
+  \Staff
+  \name DrumStaff
+  \alias Staff
+  midiInstrument = #"drums"
+  \denies Voice
+  \accepts DrumVoice
+  \defaultchild DrumVoice
 }
 
 \context {
-    \type "Performer_group"
-    \name Voice
-    \consists "Dynamic_performer"    
-    \consists "Tie_performer"
-    \consists "Piano_pedal_performer"
-    \consists "Note_performer"
-    \consists "Beam_performer"
-    \consists "Slur_performer"
+  \type "Performer_group"
+  \name Voice
+  \consists "Dynamic_performer"
+  \consists "Tie_performer"
+  \consists "Piano_pedal_performer"
+  \consists "Note_performer"
+  \consists "Beam_performer"
+  \consists "Slur_performer"
 }
 
 \context {
@@ -48,153 +117,274 @@
   \Voice
   \name VaticanaVoice
   \alias Voice
+  autoBeaming = ##f  % needed for consistent melismata with engravers"
 }
 
 \context {
-    \Voice
-    \remove "Note_performer"
-    \consists "Drum_note_performer" 
-    \name DrumVoice
+  \Voice
+  \name KievanVoice
+  \alias Voice
+  autoBeaming = ##f  % needed for consistent melismata with engravers"
 }
 
 \context {
-    \type "Performer_group"
-    \name FiguredBass 
-    \consists "Swallow_performer"
+  \Voice
+  \name MensuralVoice
+  \alias Voice
+  autoBeaming = ##f  % needed for consistent melismata with engravers
 }
 
 \context {
-    \type "Performer_group"
-    \name GrandStaff
-    \accepts RhythmicStaff
-    \accepts Staff
-    \defaultchild Staff
+  \Voice
+  \name PetrucciVoice
+  \alias Voice
+  autoBeaming = ##f  % needed for consistent melismata with engravers
 }
 
 \context {
-    \type "Performer_group"
-    \name "PianoStaff"
-    \accepts Staff
-    \accepts DrumStaff
-    \defaultchild Staff
+  \Voice
+  \name GregorianTranscriptionVoice
+  \alias Voice
+  autoBeaming = ##f  % needed for consistent melismata with engravers
 }
 
 \context {
-    \type "Performer_group"
-    \name "TabVoice"
-    \consists "Swallow_performer"
+  \Voice
+  \name DrumVoice
+  \alias Voice
+  \remove "Note_performer"
+  \consists "Drum_note_performer"
 }
 
 \context {
-    \type "Performer_group"
-    \name "Devnull"
-    \consists "Swallow_performer"
+  \type "Performer_group"
+  \name FiguredBass
 }
+
 \context {
-    \type "Performer_group"
-    \name "TabStaff"
-    \accepts "TabVoice"
-    \defaultchild "TabVoice"
+  \type "Performer_group"
+  \name FretBoards
+  \alias Staff
 }
 
 \context {
-    \type "Performer_group"
-    \name "VaticanaStaff"
-    \alias "Staff"
-    \denies "Voice"
-    \accepts "VaticanaVoice"
-    \defaultchild "VaticanaVoice"
+  \type "Performer_group"
+  \name GrandStaff
+  \accepts ChordNames
+  \accepts DrumStaff
+  \accepts Dynamics
+  \accepts FiguredBass
+  \accepts Lyrics
+  \accepts RhythmicStaff
+  \accepts Staff
+  \accepts TabStaff
+  \defaultchild Staff
 }
 
 \context {
-    \type "Score_performer"
-
-    \name Score
-    
-    melismaBusyProperties = #default-melisma-properties
-    instrumentName = #"bright acoustic"
+  \GrandStaff
+  \name PianoStaff
+  \alias GrandStaff
+}
 
-    %% quarter = 60
-    tempoWholesPerMinute = #(ly:make-moment 15 1)
-    
-    \accepts Staff
-    \accepts DrumStaff
-    \accepts GrandStaff
-    \accepts PianoStaff
-    \accepts TabStaff
-    \accepts Staff
-    \accepts StaffGroup
-    \accepts Devnull
-    \accepts ChoirStaff
-    \accepts RhythmicStaff
-    \accepts ChordNames
-    \accepts FiguredBass
-    \accepts Lyrics
-    \accepts VaticanaStaff
+\context {
+  \Voice
+  \name TabVoice
+  \alias Voice
+}
 
-    \consists "Time_signature_performer"
-    \consists "Control_track_performer"
-    \consists "Tempo_performer"
-    \consists "Timing_translator"
-    \consists "Swallow_performer"
-    
-    \defaultchild "Staff"
-    
-    dynamicAbsoluteVolumeFunction = #default-dynamic-absolute-volume
-    instrumentEqualizer = #default-instrument-equalizer
-    drumPitchTable = #(alist->hash-table midiDrumPitches)
-    timing = ##t 
+\context {
+  \type "Performer_group"
+  \name Devnull
+  \alias Voice
+  \alias Staff
 }
 
+\context {
+  \type "Performer_group"
+  \name NullVoice
+  \alias Staff
+  \alias Voice
+  %% needed for melismata
+  \consists "Tie_performer"
+  \consists "Beam_performer"
+  \consists "Slur_performer"
+}
 
 \context {
-    \type "Performer_group"
-    \consists "Staff_performer" % Performer_group ?
-    \consists "Lyric_performer"
-    \name Lyrics
+  \Staff
+  \name TabStaff
+  midiInstrument = #"acoustic guitar (nylon)"
+  \alias Staff
+  \denies Voice
+  \accepts TabVoice
+  \defaultchild TabVoice
+  autoBeaming = ##f  % needed for consistent melismata with engravers
 }
 
-\context{
-    \type "Performer_group"
-    \name ChoirStaff
-    \accepts Staff
-    \accepts DrumStaff
-    \defaultchild Staff
+\context {
+  \type "Score_performer"
 
-}
+  \name Score
 
+  melismaBusyProperties = #default-melisma-properties
+  instrumentName = #"bright acoustic"
+  midiChannelMapping = #'staff
 
+  %% quarter = 60
+  tempoWholesPerMinute = #(ly:make-moment 15/1)
 
-\context {
-    \type "Performer_group"
-    \consists "Staff_performer"
-    \accepts ChordNameVoice
-    \name ChordNames
+  \accepts ChoirStaff
+  \accepts ChordNames
+  \accepts Devnull
+  \accepts DrumStaff
+  \accepts Dynamics
+  \accepts FiguredBass
+  \accepts GrandStaff
+  \accepts GregorianTranscriptionStaff
+  \accepts KievanStaff
+  \accepts Lyrics
+  \accepts MensuralStaff
+  \accepts NoteNames
+  \accepts OneStaff
+  \accepts PetrucciStaff
+  \accepts PianoStaff
+  \accepts RhythmicStaff
+  \accepts FretBoards
+  \accepts Staff
+  \accepts StaffGroup
+  \accepts TabStaff
+  \accepts VaticanaStaff
+
+  \consists "Time_signature_performer"
+  \consists "Control_track_performer"
+  \consists "Tempo_performer"
+
+  \alias "Timing"
+
+  %% An alias for Timing is established by the Timing_translator in
+  %% whatever context it is initialized, and the timing variables are
+  %% then copied from wherever Timing had been previously established.
+  %% The alias at Score level provides a target for initializing
+  %% 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
+
+  %% 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"
+
+  \defaultchild "Staff"
+
+  dynamicAbsoluteVolumeFunction = #default-dynamic-absolute-volume
+  instrumentEqualizer = #default-instrument-equalizer
+  drumPitchTable = #(alist->hash-table midiDrumPitches)
+
+  %% \quoteDuring is supposed to quote everything but we don't admit
+  %% cue events by default in order not to get multiple midi
+  %% renditions in an orchestral score.
+
+  quotedEventTypes = #'(StreamEvent)
+  quotedCueEventTypes = #'()
+
+  timing = ##t
 }
 
+
 \context {
-    \type "Performer_group"
-    \consists "Note_performer"
-    \name ChordNameVoice	
+  \type "Performer_group"
+  \consists "Staff_performer" % Performer_group ?
+  \consists "Lyric_performer"
+  \name Lyrics
+}
+
+\context{
+  \type "Performer_group"
+  \name ChoirStaff
+  \accepts ChoirStaff
+  \accepts ChordNames
+  \accepts FiguredBass
+  \accepts DrumStaff
+  \accepts Dynamics
+  \accepts GrandStaff
+  \accepts Lyrics
+  \accepts OneStaff
+  \accepts PianoStaff
+  \accepts RhythmicStaff
+  \accepts Staff
+  \accepts StaffGroup
+  \defaultchild Staff
 }
 
 \context {
-    \type "Performer_group"
+  \type "Performer_group"
+  \consists "Staff_performer"
+  \name NoteNames
+}
 
-    \name StaffGroup
-    \accepts Staff
-    \accepts DrumStaff
-    \accepts TabStaff
-    \accepts RhythmicStaff
-    \accepts GrandStaff
-    \accepts PianoStaff
-    \accepts Lyrics
-    \accepts ChordNames
-    \accepts FiguredBass
+\context {
+  \Voice			% We want all the actual performers
+  \name ChordNames
+  \alias Staff			% Catch Staff-level overrides like
+				% \key, \transposition
+  \consists "Staff_performer"
+}
 
-    \defaultchild Staff
+\context {
+  \type "Performer_group"
+  \name StaffGroup
+  \accepts ChoirStaff
+  \accepts ChordNames
+  \accepts DrumStaff
+  \accepts FiguredBass
+  \accepts FretBoards
+  \accepts GrandStaff
+  \accepts Lyrics
+  \accepts OneStaff
+  \accepts PianoStaff
+  \accepts RhythmicStaff
+  \accepts Staff
+  \accepts StaffGroup
+  \accepts TabStaff
+  \defaultchild Staff
 }
 
-\context { \Staff \name RhythmicStaff }
+\context {
+  \type "Performer_group"
+  \name "OneStaff"
+  \accepts "ChordNames"
+  \accepts "DrumStaff"
+  \accepts "Dynamics"
+  \accepts "FiguredBass"
+  \accepts "FretBoards"
+  \accepts "GregorianTranscriptionStaff"
+  \accepts "KievanStaff"
+  \accepts "Lyrics"
+  \accepts "MensuralStaff"
+  \accepts "NoteNames"
+  \accepts "PetrucciStaff"
+  \accepts "RhythmicStaff"
+  \accepts "Staff"
+  \accepts "TabStaff"
+  \accepts "VaticanaStaff"
+  \defaultchild "Staff"
+}
 
+\context {
+  \Staff
+  \name RhythmicStaff
+  \alias Staff
+  \defaultchild Voice
+}
 
+\context {
+  \type "Performer_group"
+  \name Dynamics
+  \alias Voice
+  \consists "Piano_pedal_performer"
+}