X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=ly%2Fperformer-init.ly;h=1a36b7fd19ef8b13a326ac610b08007f3fad19e9;hb=ca7baa2950c23337825b1c5f6e22e8fd514cd648;hp=a929bc9d5d8bc864468f0ef75270c713b88cf43c;hpb=b4459d71ac1a86b73fbae1cb320127a1ed1ed1fb;p=lilypond.git

diff --git a/ly/performer-init.ly b/ly/performer-init.ly
index a929bc9d5d..1a36b7fd19 100644
--- 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--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 %%%%                          Jan Nieuwenhuizen <janneke@gnu.org>
 %%%%
 %%%% LilyPond is free software: you can redistribute it and/or modify
@@ -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.12.0"
+\version "2.14.0"
 
 %%
 %% setup for Request->Element conversion.
@@ -31,10 +31,45 @@
   \consists "Staff_performer"
   \consists "Key_performer"
 }
+
 \context {
   \name Global
   \accepts 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 {
@@ -63,9 +98,36 @@
 }
 
 \context {
-  \Voice
+  \type "Performer_group"
   \name VaticanaVoice
   \alias Voice
+  \consists "Dynamic_performer"
+  \consists "Tie_performer"
+  \consists "Note_performer"
+  \consists "Beam_performer"
+  \consists "Slur_performer"
+}
+
+\context {
+  \type "Performer_group"
+  \name KievanVoice
+  \alias Voice
+  \consists "Dynamic_performer"
+  \consists "Tie_performer"
+  \consists "Note_performer"
+  \consists "Beam_performer"
+  \consists "Slur_performer"
+}
+
+\context {
+  \type "Performer_group"
+  \name MensuralVoice
+  \alias Voice
+  \consists "Dynamic_performer"
+  \consists "Tie_performer"
+  \consists "Note_performer"
+  \consists "Beam_performer"
+  \consists "Slur_performer"
 }
 
 \context {
@@ -80,6 +142,11 @@
   \name FiguredBass
 }
 
+\context {
+  \type "Performer_group"
+  \name FretBoards
+}
+
 \context {
   \type "Performer_group"
   \name GrandStaff
@@ -116,15 +183,6 @@
   \defaultchild TabVoice
 }
 
-\context {
-  \type "Performer_group"
-  \name "VaticanaStaff"
-  \alias "Staff"
-  \denies "Voice"
-  \accepts "VaticanaVoice"
-  \defaultchild "VaticanaVoice"
-}
-
 \context {
   \type "Score_performer"
 
@@ -132,6 +190,7 @@
 
   melismaBusyProperties = #default-melisma-properties
   instrumentName = #"bright acoustic"
+  midiChannelMapping = #'staff
 
   %% quarter = 60
   tempoWholesPerMinute = #(ly:make-moment 15 1)
@@ -141,19 +200,38 @@
   \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
+  \accepts KievanStaff
+  \accepts MensuralStaff
 
   \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.
+
+  timeSignatureFraction = #'(4 . 4)
+
+%% 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)
+
   \consists "Timing_translator"
 
   \defaultchild "Staff"
@@ -205,6 +283,7 @@
   \accepts Lyrics
   \accepts ChordNames
   \accepts FiguredBass
+  \accepts FretBoards
   \defaultchild Staff
 }