X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fperformer-init.ly;h=8e3ef0e7ef10ffa3ac1a0538b92bb69bf2fd431a;hb=29b05c33ce2a1b0ee671afb52d23a40e5fb26a39;hp=0ad1e2964ee9cab5e4b7b7f030b00f1fed8ffd71;hpb=ae2db5b21bf232f5145f3a3e091689c8fc7247e9;p=lilypond.git

diff --git a/ly/performer-init.ly b/ly/performer-init.ly
index 0ad1e2964e..8e3ef0e7ef 100644
--- 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.14.0"
+\version "2.17.11"
 
 %%
 %% setup for Request->Element conversion.
@@ -31,11 +31,45 @@
   \consists "Staff_performer"
   \consists "Key_performer"
 }
+
 \context {
   \name Global
   \accepts Score
+  \defaultchild Score
   \description "Hard coded entry point for LilyPond.  Cannot be tuned."
-  EventClasses = #all-event-classes
+}
+
+\context {
+  \type "Performer_group"
+  \name KievanStaff
+  \denies Voice
+  \accepts KievanVoice
+  \defaultchild KievanVoice
+  \alias Staff
+  \consists "Staff_performer"
+  \consists "Key_performer"
+}
+
+\context {
+  \type "Performer_group"
+  \name VaticanaStaff
+  \alias Staff
+  \denies Voice
+  \accepts VaticanaVoice
+  \defaultchild VaticanaVoice
+  \consists "Staff_performer"
+  \consists "Key_performer"
+}
+
+\context {
+  \type "Performer_group"
+  \name MensuralStaff
+  \denies Voice
+  \accepts MensuralVoice
+  \defaultchild MensuralVoice
+  \alias Staff
+  \consists "Staff_performer"
+  \consists "Key_performer"
 }
 
 \context {
@@ -64,9 +98,39 @@
 }
 
 \context {
-  \Voice
+  \type "Performer_group"
   \name VaticanaVoice
   \alias Voice
+  \consists "Dynamic_performer"
+  \consists "Tie_performer"
+  \consists "Note_performer"
+  \consists "Beam_performer"
+  autoBeaming = ##f  % needed for consistent melismata with engravers
+  \consists "Slur_performer"
+}
+
+\context {
+  \type "Performer_group"
+  \name KievanVoice
+  \alias Voice
+  \consists "Dynamic_performer"
+  \consists "Tie_performer"
+  \consists "Note_performer"
+  \consists "Beam_performer"
+  autoBeaming = ##f  % needed for consistent melismata with engravers
+  \consists "Slur_performer"
+}
+
+\context {
+  \type "Performer_group"
+  \name MensuralVoice
+  \alias Voice
+  \consists "Dynamic_performer"
+  \consists "Tie_performer"
+  \consists "Note_performer"
+  \consists "Beam_performer"
+  autoBeaming = ##f  % needed for consistent melismata with engravers
+  \consists "Slur_performer"
 }
 
 \context {
@@ -120,15 +184,7 @@
   \alias Staff
   \accepts TabVoice
   \defaultchild TabVoice
-}
-
-\context {
-  \type "Performer_group"
-  \name "VaticanaStaff"
-  \alias "Staff"
-  \denies "Voice"
-  \accepts "VaticanaVoice"
-  \defaultchild "VaticanaVoice"
+  autoBeaming = ##f  % needed for consistent melismata with engravers
 }
 
 \context {
@@ -141,7 +197,7 @@
   midiChannelMapping = #'staff
 
   %% quarter = 60
-  tempoWholesPerMinute = #(ly:make-moment 15 1)
+  tempoWholesPerMinute = #(ly:make-moment 15/1)
 
   \accepts Staff
   \accepts DrumStaff
@@ -157,6 +213,8 @@
   \accepts FretBoards
   \accepts Lyrics
   \accepts VaticanaStaff
+  \accepts KievanStaff
+  \accepts MensuralStaff
 
   \consists "Time_signature_performer"
   \consists "Control_track_performer"
@@ -171,12 +229,13 @@
   %% Timing variables in layout definitions before any
   %% Timing_translator has been run.
 
-  timeSignatureFraction = #'(4 . 4)
+  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"
 
@@ -208,12 +267,12 @@
   \type "Performer_group"
   \consists "Staff_performer"
   \accepts ChordNameVoice
+  \defaultchild ChordNameVoice
   \name ChordNames
 }
 
 \context {
-  \type "Performer_group"
-  \consists "Note_performer"
+  \Voice
   \name ChordNameVoice
 }