X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fperformer-init.ly;h=0942116dcef34cfc47a3d05c42cf537c78697c99;hb=bf8440d934cf7d31ea4649710a43fa720b7ef696;hp=0ad1e2964ee9cab5e4b7b7f030b00f1fed8ffd71;hpb=af60e9b57f205a3c2e044ac8db351b42ef3e26ad;p=lilypond.git diff --git a/ly/performer-init.ly b/ly/performer-init.ly index 0ad1e2964e..0942116dce 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--2012 Han-Wen Nienhuys +%%%% Copyright (C) 1996--2015 Han-Wen Nienhuys %%%% Jan Nieuwenhuizen %%%% %%%% 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 . -\version "2.14.0" +\version "2.19.16" %% %% setup for Request->Element conversion. @@ -24,24 +24,74 @@ \context { \type "Performer_group" \name Staff - \accepts Voice \accepts CueVoice + \accepts NullVoice + \accepts Voice \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 { + \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 { + \Staff + \name GregorianTranscriptionStaff + \alias Staff + \denies Voice + \accepts GregorianTranscriptionVoice + \defaultchild GregorianTranscriptionVoice } \context { \Staff \name DrumStaff + \alias Staff midiInstrument = #"drums" + \denies Voice \accepts DrumVoice \defaultchild DrumVoice } @@ -67,13 +117,43 @@ \Voice \name VaticanaVoice \alias Voice + autoBeaming = ##f % needed for consistent melismata with engravers" } \context { \Voice + \name KievanVoice + \alias Voice + autoBeaming = ##f % needed for consistent melismata with engravers" +} + +\context { + \Voice + \name MensuralVoice + \alias Voice + autoBeaming = ##f % needed for consistent melismata with engravers +} + +\context { + \Voice + \name PetrucciVoice + \alias Voice + autoBeaming = ##f % needed for consistent melismata with engravers +} + +\context { + \Voice + \name GregorianTranscriptionVoice + \alias Voice + autoBeaming = ##f % needed for consistent melismata with engravers +} + +\context { + \Voice + \name DrumVoice + \alias Voice \remove "Note_performer" \consists "Drum_note_performer" - \name DrumVoice } \context { @@ -84,33 +164,51 @@ \context { \type "Performer_group" \name FretBoards + \alias Staff } \context { \type "Performer_group" \name GrandStaff + \accepts ChordNames + \accepts DrumStaff + \accepts Dynamics + \accepts FiguredBass + \accepts Lyrics \accepts RhythmicStaff \accepts Staff - \accepts Dynamics + \accepts TabStaff \defaultchild Staff } \context { - \type "Performer_group" - \name "PianoStaff" - \accepts Staff - \accepts DrumStaff - \defaultchild Staff + \GrandStaff + \name PianoStaff + \alias GrandStaff } \context { \Voice \name TabVoice + \alias Voice } \context { \type "Performer_group" - \name "Devnull" + \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 { @@ -118,17 +216,10 @@ \name TabStaff midiInstrument = #"acoustic guitar (nylon)" \alias Staff + \denies Voice \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,21 +232,27 @@ midiChannelMapping = #'staff %% quarter = 60 - tempoWholesPerMinute = #(ly:make-moment 15 1) + tempoWholesPerMinute = #(ly:make-moment 15/1) - \accepts Staff + \accepts ChoirStaff + \accepts ChordNames + \accepts Devnull \accepts DrumStaff + \accepts FiguredBass \accepts GrandStaff + \accepts GregorianTranscriptionStaff + \accepts KievanStaff + \accepts Lyrics + \accepts MensuralStaff + \accepts NoteNames + \accepts NullVoice + \accepts PetrucciStaff \accepts PianoStaff - \accepts TabStaff - \accepts StaffGroup - \accepts Devnull - \accepts ChoirStaff \accepts RhythmicStaff - \accepts ChordNames - \accepts FiguredBass \accepts FretBoards - \accepts Lyrics + \accepts Staff + \accepts StaffGroup + \accepts TabStaff \accepts VaticanaStaff \consists "Time_signature_performer" @@ -171,12 +268,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" @@ -199,47 +297,59 @@ \context{ \type "Performer_group" \name ChoirStaff - \accepts Staff + \accepts ChoirStaff + \accepts ChordNames + \accepts FiguredBass \accepts DrumStaff + \accepts GrandStaff + \accepts Lyrics + \accepts PianoStaff + \accepts RhythmicStaff + \accepts Staff + \accepts StaffGroup \defaultchild Staff } \context { \type "Performer_group" \consists "Staff_performer" - \accepts ChordNameVoice - \name ChordNames + \name NoteNames } \context { \type "Performer_group" - \consists "Note_performer" - \name ChordNameVoice + \consists "Staff_performer" + \name ChordNames } \context { \type "Performer_group" \name StaffGroup - \accepts Staff - \accepts DrumStaff - \accepts TabStaff - \accepts RhythmicStaff - \accepts GrandStaff - \accepts PianoStaff - \accepts Lyrics + \accepts ChoirStaff \accepts ChordNames + \accepts DrumStaff \accepts FiguredBass \accepts FretBoards + \accepts GrandStaff + \accepts Lyrics + \accepts PianoStaff + \accepts RhythmicStaff + \accepts Staff + \accepts StaffGroup + \accepts TabStaff \defaultchild Staff } \context { \Staff \name RhythmicStaff + \alias Staff + \defaultchild Voice } \context { \type "Performer_group" \name Dynamics + \alias Voice \consists "Piano_pedal_performer" }