X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fengraver-init.ly;h=15e40fc446c928c8354fe329ab29ceb2a53ef3a4;hb=09e0661443dcf763606254f81aa975b78f369465;hp=94fed640aa29757bfd2b318d61491223bdd7cd4c;hpb=56efe0dc2799eaa46a9dfcec593c1ac3aeef7161;p=lilypond.git diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly index 94fed640aa..15e40fc446 100644 --- a/ly/engraver-init.ly +++ b/ly/engraver-init.ly @@ -1,15 +1,17 @@ -\version "2.4.0" +\version "2.7.6" \context { \name Global \accepts Score + + \defaultchild Score \description "Hard coded entry point for LilyPond. Cannot be tuned." - \grobdescriptions #all-grob-descriptions + \grobdescriptions #all-grob-descriptions } \context { - \type "Engraver_group_engraver" + \type "Engraver_group" \name Staff \consists "Output_property_engraver" @@ -50,6 +52,7 @@ instrument = #'() instr = #'() + \defaultchild "Voice" \accepts "Voice" \accepts "CueVoice" @@ -60,10 +63,9 @@ \context { \Staff - \type "Engraver_group_engraver" + \type "Engraver_group" \name DrumStaff \alias Staff - \remove "Accidental_engraver" \remove "Ottava_spanner_engraver" \remove "Key_engraver" @@ -74,6 +76,7 @@ \denies Voice \accepts DrumVoice + \defaultchild DrumVoice clefGlyph = #"clefs.percussion" clefPosition = #0 @@ -82,7 +85,7 @@ \context { - \type "Engraver_group_engraver" + \type "Engraver_group" \name InnerChoirStaff \consists "System_start_delimiter_engraver" systemStartDelimiter = #'SystemStartBracket @@ -94,12 +97,14 @@ \accepts "PianoStaff" \accepts "Lyrics" \accepts "ChordNames" + \defaultchild "Staff" } \context { \InnerChoirStaff \name ChoirStaff + \defaultchild "Staff" \accepts "InnerChoirStaff" \accepts "InnerStaffGroup" \description "Identical to @code{StaffGroup} except that the @@ -109,18 +114,16 @@ contained staves are not connected vertically." \context{ - \type "Engraver_group_engraver" + \type "Engraver_group" - \consists "Output_property_engraver" - minimumVerticalExtent = ##f extraVerticalExtent = ##f verticalExtent = ##f localKeySignature = #'() + createSpacing = ##t - \consists "Pitch_squash_engraver" + squashedPosition = #0 - \consists "Separating_line_group_engraver" \name RhythmicStaff \alias "Staff" @@ -129,19 +132,26 @@ contained staves are not connected vertically." \override VoltaBracket #'padding = #5 \override StaffSymbol #'line-count = #1 - \override Stem #'neutral-direction = #1 - \override Beam #'neutral-direction = #1 - %% \consists "Repeat_engraver" - \consists "Dot_column_engraver" + \override Stem #'neutral-direction = #UP + \override Beam #'neutral-direction = #UP + + \consists "Output_property_engraver" + \consists "Font_size_engraver" \consists "Volta_engraver" + \consists "Separating_line_group_engraver" + \consists "Dot_column_engraver" \consists "Bar_engraver" - \consists "Time_signature_engraver" - \consists "Staff_symbol_engraver" \consists "Ledger_line_engraver" + \consists "Staff_symbol_engraver" + \consists "Pitch_squash_engraver" + \consists "Time_signature_engraver" \consists "Instrument_name_engraver" \consists "Axis_group_engraver" + \accepts "Voice" \accepts "CueVoice" + \defaultchild "Voice" + \description " A context like @code{Staff} but for printing rhythms. Pitches are ignored; the notes are printed on one line. @@ -150,7 +160,7 @@ contained staves are not connected vertically." \context { - \type "Engraver_group_engraver" + \type "Engraver_group" \name Voice \description " @@ -163,7 +173,8 @@ contained staves are not connected vertically." localKeySignature = #'() \consists "Font_size_engraver" - + + \consists "Pitched_trill_engraver" \consists "Output_property_engraver" \consists "Arpeggio_engraver" \consists "Multi_measure_rest_engraver" @@ -232,7 +243,6 @@ contained staves are not connected vertically." \remove "Glissando_engraver" \remove "Ligature_bracket_engraver" \remove "Note_heads_engraver" - \consists "Rest_engraver" \consists "Drum_notes_engraver" \remove "New_fingering_engraver" @@ -245,7 +255,7 @@ contained staves are not connected vertically." } \context{ - \type "Engraver_group_engraver" + \type "Engraver_group" \name GrandStaff localKeySignature = #'() @@ -282,7 +292,7 @@ contained staves are not connected vertically." } \context { - \type "Engraver_group_engraver" + \type "Engraver_group" \name InnerStaffGroup \consists "Span_bar_engraver" @@ -291,6 +301,8 @@ contained staves are not connected vertically." systemStartDelimiter = #'SystemStartBracket \consists "System_start_delimiter_engraver" + + \defaultchild "Staff" \accepts "Staff" \accepts "RhythmicStaff" \accepts "DrumStaff" @@ -319,7 +331,7 @@ connected vertically. " \context{ - \type "Engraver_group_engraver" + \type "Engraver_group" minimumVerticalExtent = #'(-1.2 . 2.4) extraVerticalExtent = ##f verticalExtent = ##f @@ -337,11 +349,12 @@ printing of a single line of lyrics. " \consists "Skip_event_swallow_translator" \consists "Font_size_engraver" \consists "Hara_kiri_engraver" + \override RemoveEmptyVerticalGroup #'remove-first = ##t \override SeparationItem #'padding = #0.2 } \context { - \type "Engraver_group_engraver" + \type "Engraver_group" \name NoteNames \consists "Axis_group_engraver" @@ -358,7 +371,7 @@ printing of a single line of lyrics. " } \context { - \type "Engraver_group_engraver" + \type "Engraver_group" \name ChordNames \description "Typesets chord names." @@ -375,6 +388,7 @@ printing of a single line of lyrics. " minimumVerticalExtent = #'(0 . 2.5) extraVerticalExtent = ##f \override SeparatingGroupSpanner #'padding = #0.8 + \override RemoveEmptyVerticalGroup #'remove-first = ##t verticalExtent = ##f } @@ -397,7 +411,7 @@ AncientRemoveEmptyStaffContext = \context { \context { \type Score_engraver - \name Score + \name "Score" \description "This is the top level notation context. No other context can contain a @code{Score} context. This context @@ -409,14 +423,17 @@ AncientRemoveEmptyStaffContext = \context { not contained in any other context). It is instantiated automatically when an output definition (a @code{\score} or @code{\layout} block) is processed." - + + + \consists "Paper_column_engraver" + \consists "Vertically_spaced_contexts_engraver" \consists "Repeat_acknowledge_engraver" \consists "Staff_collecting_engraver" %% move the alias along with the engraver. - \consists "Timing_engraver" - + \consists "Timing_translator" + \consists "Default_bar_line_engraver" \consists "Output_property_engraver" \consists "System_start_delimiter_engraver" \consists "Mark_engraver" @@ -428,13 +445,14 @@ AncientRemoveEmptyStaffContext = \context { \consists "Bar_number_engraver" \consists "Span_arpeggio_engraver" + \defaultchild "Staff" \accepts "Staff" + \accepts "RhythmicStaff" \accepts "TabStaff" \accepts "VaticanaStaff" \accepts "GregorianTranscriptionStaff" \accepts "MensuralStaff" \accepts "StaffGroup" - \accepts "RhythmicStaff" \accepts "DrumStaff" \accepts "Lyrics" \accepts "ChordNames" @@ -458,6 +476,7 @@ AncientRemoveEmptyStaffContext = \context { clefGlyph = #"clefs.G" clefPosition = #-2 middleCPosition = #-6 + firstClef = ##t defaultBarType = #"|" barNumberVisibility = #default-bar-number-visibility @@ -467,6 +486,7 @@ AncientRemoveEmptyStaffContext = \context { explicitKeySignatureVisibility = #all-visible autoBeamSettings = #default-auto-beam-settings autoBeaming = ##t + autoBeamCheck = #default-auto-beam-check scriptDefinitions = #default-script-alist verticalAlignmentChildCallback = #Align_interface::alignment_callback @@ -497,7 +517,7 @@ AncientRemoveEmptyStaffContext = \context { autoCautionaries = #'() printKeyCancellation = ##t - keyAccidentalOrder = #`( + keyAlterationOrder = #`( (6 . ,FLAT) (2 . ,FLAT) (5 . ,FLAT ) (1 . ,FLAT) (4 . ,FLAT) (0 . ,FLAT) (3 . ,FLAT) (3 . ,SHARP) (0 . ,SHARP) (4 . ,SHARP) (1 . ,SHARP) (5 . ,SHARP) (2 . ,SHARP) (6 . ,SHARP) (6 . ,DOUBLE-FLAT) (2 . ,DOUBLE-FLAT) (5 . ,DOUBLE-FLAT ) (1 . ,DOUBLE-FLAT) (4 . ,DOUBLE-FLAT) (0 . ,DOUBLE-FLAT) (3 . ,DOUBLE-FLAT) @@ -513,6 +533,7 @@ AncientRemoveEmptyStaffContext = \context { chordNameExceptions = #ignatzekExceptions chordNoteNamer = #'() chordRootNamer = #note-name->markup + chordPrefixSpacer = #0 chordNameExceptionsFull = #fullJazzExceptions chordNameExceptionsPartial = #partialJazzExceptions @@ -558,36 +579,34 @@ AncientRemoveEmptyStaffContext = \context { (Voice Slur direction -1) ) + keepAliveInterfaces = #'(rhythmic-grob-interface lyric-interface percent-repeat-interface) quotedEventTypes = #'(note-event rest-event time-scaled-music tie-event) instrumentTransposition = #(ly:make-pitch 0 0 0) verticallySpacedContexts = #'(Staff) -} -EasyNotation = \context { %% TODO: why \context override? - \Score - \override NoteHead #'print-function = #Note_head::brew_ez_stencil - \override NoteHead #'Y-extent-callback = #'() - \override NoteHead #'X-extent-callback = #'() + timing = ##t } + \context { - \type "Engraver_group_engraver" + \type "Engraver_group" \name FiguredBass + \consists "Figured_bass_engraver" \consists "Rest_swallow_translator" \consists "Note_swallow_translator" \consists "Skip_event_swallow_translator" \consists "Separating_line_group_engraver" - \consists "Hara_kiri_engraver" + \override RemoveEmptyVerticalGroup #'remove-first = ##t } \context { \name "Devnull" - \type "Engraver_group_engraver" + \type "Engraver_group" %% don't want to route anything out of here: \alias "Staff" @@ -605,9 +624,6 @@ EasyNotation = \context { %% TODO: why \context override? \remove "New_fingering_engraver" \description "Context for drawing notes in a Tab staff. " - \override Slur #'font-family = #'roman - \override Slur #'print-function = #hammer-print-function - \override Slur #'direction = #-1 %% Draws all stems/beams out of the staff (and not in the middle of the staff !) %% This feature is now disabled because most of the tab does not use it. @@ -636,6 +652,7 @@ EasyNotation = \context { %% TODO: why \context override? \description "Context for generating tablature. [DOCME]" \accepts "TabVoice" + \defaultchild "TabVoice" %% 6 strings \override StaffSymbol #'staff-space = #1.5 @@ -710,6 +727,8 @@ EasyNotation = \context { %% TODO: why \context override? \alias "Staff" \denies "Voice" \accepts "VaticanaVoice" + \defaultchild "VaticanaVoice" + \description "Same as @code{Staff} context, except that it is accommodated for tyepsetting Gregorian Chant in the notational style of Editio Vaticana." \remove "Time_signature_engraver" @@ -737,7 +756,7 @@ EasyNotation = \context { %% TODO: why \context override? \override Accidental #'style = #'vaticana \override Custos #'style = #'vaticana \override Custos #'neutral-position = #3 - \override Custos #'neutral-direction = #-1 + \override Custos #'neutral-direction = #DOWN %% Score.timing = ##f %% Score.barAlways = ##t @@ -777,12 +796,14 @@ EasyNotation = \context { %% TODO: why \context override? \override TextSpanner #'enclose-bounds = #1 \override TextSpanner #'edge-text = #'("" . "") } + \context { \Staff \name "GregorianTranscriptionStaff" \alias "Staff" \denies "Voice" \accepts "GregorianTranscriptionVoice" + \defaultchild "GregorianTranscriptionVoice" %% We can not remove Bar_engraver; otherwise clefs and custodes will %% not show up any more among other line breaking issues. @@ -801,7 +822,7 @@ EasyNotation = \context { %% TODO: why \context override? \consists "Mensural_ligature_engraver" %% Set default head for notes outside of \[ \]. - \override NoteHead #'style = #'mensural + \override NoteHead #'style = #'petrucci %% There are no beams in mensural notation. autoBeaming = ##f @@ -812,6 +833,7 @@ EasyNotation = \context { %% TODO: why \context override? \name "MensuralStaff" \alias "Staff" \denies "Voice" + \defaultchild "MensuralVoice" \accepts "MensuralVoice" \description "Same as @code{Staff} context, except that it is accommodated for tyepsetting a piece in mensural style." @@ -839,7 +861,7 @@ EasyNotation = \context { %% TODO: why \context override? \override Accidental #'style = #'mensural \override Custos #'style = #'mensural \override Custos #'neutral-position = #3 - \override Custos #'neutral-direction = #-1 + \override Custos #'neutral-direction = #DOWN %% Score.timing = ##f %% Score.barAlways = ##t