X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fperformer-init.ly;h=fdfa7add3c69ee58dc6c18b0a8ce47dfa447b5cf;hb=8247813bc580a90f7838846dc38aad5d49ac9d9d;hp=0ad1e2964ee9cab5e4b7b7f030b00f1fed8ffd71;hpb=af60e9b57f205a3c2e044ac8db351b42ef3e26ad;p=lilypond.git diff --git a/ly/performer-init.ly b/ly/performer-init.ly index 0ad1e2964e..fdfa7add3c 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 . -\version "2.14.0" +\version "2.15.39" %% %% setup for Request->Element conversion. @@ -31,6 +31,7 @@ \consists "Staff_performer" \consists "Key_performer" } + \context { \name Global \accepts Score @@ -38,6 +39,39 @@ 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 { \Staff \name DrumStaff @@ -64,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 { @@ -122,15 +183,6 @@ \defaultchild TabVoice } -\context { - \type "Performer_group" - \name "VaticanaStaff" - \alias "Staff" - \denies "Voice" - \accepts "VaticanaVoice" - \defaultchild "VaticanaVoice" -} - \context { \type "Score_performer" @@ -157,6 +209,8 @@ \accepts FretBoards \accepts Lyrics \accepts VaticanaStaff + \accepts KievanStaff + \accepts MensuralStaff \consists "Time_signature_performer" \consists "Control_track_performer" @@ -171,7 +225,7 @@ %% Timing variables in layout definitions before any %% Timing_translator has been run. - timeSignatureFraction = #'(4 . 4) + timeSignatureFraction = 4/4 %% These defaults should be the same as the rules established in %% scm/time-signature-settings.scm for 4/4 time