X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fengraver-init.ly;h=654f5dd8df3e2f05c9824e9ef25d4300fe743fd4;hb=d4f38c4239f67dd08d616794a9cdc47a30a86b6a;hp=1fec13a6af90d61b9a644e07e36997d17bea2806;hpb=913f4a33e9b60b94e673ae48c1fb299f1465b4ad;p=lilypond.git diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly index 1fec13a6af..654f5dd8df 100644 --- a/ly/engraver-init.ly +++ b/ly/engraver-init.ly @@ -1,18 +1,18 @@ -\version "2.7.6" +\version "2.7.39" \context { - \name Global + \name "Global" - \accepts Score + \accepts "Score" - \defaultchild Score + \defaultchild "Score" \description "Hard coded entry point for LilyPond. Cannot be tuned." \grobdescriptions #all-grob-descriptions } \context { \type "Engraver_group" - \name Staff + \name "Staff" \consists "Output_property_engraver" \consists "Bar_engraver" @@ -38,8 +38,10 @@ \consists "Instrument_name_engraver" \consists "String_number_engraver" \consists "Axis_group_engraver" + \consists "Figured_bass_engraver" + \consists "Figured_bass_position_engraver" - minimumVerticalExtent = #'(-4 . 4) + \override VerticalAxisGroup #'minimum-Y-extent = #'(-4 . 4) extraVerticalExtent = ##f verticalExtent = ##f localKeySignature = #'() @@ -64,8 +66,9 @@ \context { \Staff \type "Engraver_group" - \name DrumStaff - \alias Staff + \name "DrumStaff" + \alias "Staff" + \remove "Accidental_engraver" \remove "Ottava_spanner_engraver" \remove "Key_engraver" @@ -74,9 +77,9 @@ \description "Handles typesetting for percussion." - \denies Voice - \accepts DrumVoice - \defaultchild DrumVoice + \denies "Voice" + \accepts "DrumVoice" + \defaultchild "DrumVoice" clefGlyph = #"clefs.percussion" clefPosition = #0 @@ -86,9 +89,11 @@ \context { \type "Engraver_group" - \name InnerChoirStaff + \name "InnerChoirStaff" \consists "System_start_delimiter_engraver" systemStartDelimiter = #'SystemStartBracket + vocalName = #'() + vocNam = #'() \accepts "Staff" \accepts "DrumStaff" @@ -109,14 +114,13 @@ \accepts "InnerStaffGroup" \description "Identical to @code{StaffGroup} except that the contained staves are not connected vertically." - -} +} \context{ \type "Engraver_group" - minimumVerticalExtent = ##f + \override VerticalAxisGroup #'minimum-Y-extent = ##f extraVerticalExtent = ##f verticalExtent = ##f localKeySignature = #'() @@ -139,7 +143,6 @@ contained staves are not connected vertically." \consists "Separating_line_group_engraver" \consists "Dot_column_engraver" \consists "Bar_engraver" - \consists "Ledger_line_engraver" \consists "Staff_symbol_engraver" \consists "Pitch_squash_engraver" \consists "Time_signature_engraver" @@ -159,7 +162,7 @@ contained staves are not connected vertically." \context { \type "Engraver_group" - \name Voice + \name "Voice" \description " Corresponds to a voice on a staff. This context handles the @@ -181,14 +184,18 @@ contained staves are not connected vertically." \consists "Grob_pq_engraver" \consists "Forbid_line_break_engraver" \consists "Laissez_vibrer_engraver" + \consists "Repeat_tie_engraver" \consists "Note_head_line_engraver" \consists "Glissando_engraver" \consists "Ligature_bracket_engraver" \consists "Breathing_sign_engraver" - %% \consists "Rest_engraver" \consists "Note_heads_engraver" \consists "Rest_engraver" + %% switch on to make stem directions interpolate for the + %% center line. + % \consists "Melody_engraver" + \consists "Stem_engraver" \consists "Beam_engraver" \consists "Grace_beam_engraver" @@ -223,7 +230,8 @@ contained staves are not connected vertically." \name CueVoice \alias Voice fontSize = #-4 - \override Stem #'lengths = #'(2.5 2.5 3.0 3.0) + \override Stem #'length-fraction = #(magstep -4) + \override Beam #'length-fraction = #(magstep -4) } \context { @@ -278,11 +286,8 @@ contained staves are not connected vertically." "Just like @code{GrandStaff} but with a forced distance between the staves, so cross staff beaming and slurring can be used." - verticalAlignmentChildCallback = #Align_interface::fixed_distance_alignment_callback \override VerticalAlignment #'forced-distance = #12 \override VerticalAlignment #'self-alignment-Y = #0 - \override VerticalAlignment #'after-line-breaking-callback - = #Align_interface::stretch_after_break \consists "Vertical_align_engraver" \consists "Instrument_name_engraver" @@ -321,7 +326,8 @@ contained staves are not connected vertically." "Groups staffs while adding a bracket on the left side, grouping the staves together. The bar lines of the contained staves are -connected vertically. " +connected vertically. StaffGroup only consists of a collection of +staffs, with a bracket in front and spanning bar lines. " \accepts "InnerChoirStaff" \accepts "ChoirStaff" @@ -332,7 +338,7 @@ connected vertically. " \context{ \type "Engraver_group" - minimumVerticalExtent = #'(-1.2 . 2.4) + \override VerticalAxisGroup #'minimum-Y-extent = #'(-1.2 . 2.4) extraVerticalExtent = ##f verticalExtent = ##f @@ -340,17 +346,26 @@ connected vertically. " printing of a single line of lyrics. " \name Lyrics - \consists "Separating_line_group_engraver" \consists "Lyric_engraver" \consists "Extender_engraver" \consists "Hyphen_engraver" \consists "Stanza_number_engraver" - \consists "Vocal_name_engraver" + \consists "Instrument_name_engraver" \consists "Skip_event_swallow_translator" \consists "Font_size_engraver" \consists "Hara_kiri_engraver" - \override RemoveEmptyVerticalGroup #'remove-first = ##t + \override VerticalAxisGroup #'remove-first = ##t + \override VerticalAxisGroup #'remove-empty = ##t \override SeparationItem #'padding = #0.2 + \override InstrumentName #'self-alignment-Y = ##f + + %% sync with define-grobs.scm ; + \override InstrumentName #'font-size = #1.0 + + %% make sure that barlines aren't collapsed, when + %% Bar_engraver is there. + \override BarLine #'bar-size = #0.1 + } \context { @@ -358,7 +373,7 @@ printing of a single line of lyrics. " \name NoteNames \consists "Axis_group_engraver" - minimumVerticalExtent = ##f + \override VerticalAxisGroup #'minimum-Y-extent = ##f extraVerticalExtent = ##f verticalExtent = ##f @@ -385,10 +400,11 @@ printing of a single line of lyrics. " \consists "Hara_kiri_engraver" voltaOnThisStaff = ##f - minimumVerticalExtent = #'(0 . 2.5) + \override VerticalAxisGroup #'minimum-Y-extent = #'(0 . 2.5) extraVerticalExtent = ##f \override SeparatingGroupSpanner #'padding = #0.8 - \override RemoveEmptyVerticalGroup #'remove-first = ##t + \override VerticalAxisGroup #'remove-first = ##t + \override VerticalAxisGroup #'remove-empty = ##t verticalExtent = ##f } @@ -398,6 +414,7 @@ RemoveEmptyStaffContext= \context { \remove "Axis_group_engraver" \consists "Hara_kiri_engraver" \override Beam #'auto-knee-gap = #'() + \override VerticalAxisGroup #'remove-empty = ##t } AncientRemoveEmptyStaffContext = \context { @@ -410,9 +427,9 @@ AncientRemoveEmptyStaffContext = \context { } \context { - \type Score_engraver + \type "Score_engraver" \name "Score" - + \description "This is the top level notation context. No other context can contain a @code{Score} context. This context handles the administration of time signatures. It also makes sure @@ -443,9 +460,11 @@ AncientRemoveEmptyStaffContext = \context { \consists "Vertical_align_engraver" \consists "Stanza_number_align_engraver" \consists "Bar_number_engraver" - \consists "Span_arpeggio_engraver" - + \consists "Tweak_engraver" + \consists "Parenthesis_engraver" + \defaultchild "Staff" + \accepts "Staff" \accepts "RhythmicStaff" \accepts "TabStaff" @@ -462,7 +481,7 @@ AncientRemoveEmptyStaffContext = \context { \accepts "Devnull" \accepts "NoteNames" \accepts "FiguredBass" - + soloText = #"Solo" soloIIText = #"Solo II" aDueText = #"a2" @@ -489,8 +508,6 @@ AncientRemoveEmptyStaffContext = \context { autoBeamCheck = #default-auto-beam-check scriptDefinitions = #default-script-alist - verticalAlignmentChildCallback = #Align_interface::alignment_callback - pedalSustainStrings = #'("Ped." "*Ped." "*") pedalSustainStyle = #'text pedalUnaCordaStrings = #'("una corda" "" "tre corde") @@ -503,13 +520,12 @@ AncientRemoveEmptyStaffContext = \context { pedalSostenutoStrings = #'("Sost. Ped." "*Sost. Ped." "*") pedalSostenutoStyle = #'mixed - harmonicAccidentals = ##t fingeringOrientations = #'(up down) stringNumberOrientations = #'(up down) tupletNumberFormatFunction = #denominator-tuplet-formatter markFormatter = #format-mark-letters - rehearsalMark = #1 + rehearsalMark = #1 subdivideBeams = ##f allowBeamBreak = ##f extraNatural = ##t @@ -551,41 +567,29 @@ AncientRemoveEmptyStaffContext = \context { tablatureFormat = #fret-number-tablature-format %% - bassFigureFormatFunction = #format-bass-figure - newFiguredBassFormatter = #format-new-bass-figure + figuredBassFormatter = #format-bass-figure metronomeMarkFormatter = #format-metronome-markup graceSettings = #`( - (Voice Stem direction 1) - ;; TODO: should take from existing definition. - ;; c&p from define-grobs.scm - - (Voice Stem lengths ,(map (lambda (x) (* 0.8 x)) '(3.5 3.5 3.5 4.5 5.0))) - (Voice Stem stem-shorten (0.4 0.4)) - (Voice Stem font-size -3) - (Voice NoteHead font-size -3) - (Voice Dots font-size -3) - (Voice Stem beamed-lengths - ,(map (lambda (x) (* 0.8 x)) '(3.3 3.3 4.0))) - (Voice Stem beamed-minimum-free-lengths - ,(map (lambda (x) (* 0.8 x)) '(2.5 2.0 1.5))) - (Voice Stem beamed-extreme-minimum-free-lengths - ,(map (lambda (x) (* 0.8 x)) '(1.83 1.5))) - + (Voice Stem direction ,UP) + (Voice Stem font-size -3) + (Voice NoteHead font-size -3) + (Voice Dots font-size -3) + (Voice Stem length-fraction 0.8) (Voice Stem no-stem-extend #t) (Voice Beam thickness 0.384) - (Voice Beam space-function ,(lambda (beam mult) - (* 0.8 (Beam::space_function - beam mult)))) + (Voice Beam length-fraction 0.8) (Voice Accidental font-size -4) - (Voice Slur direction -1) + (Voice Slur direction ,DOWN) ) keepAliveInterfaces = #'(rhythmic-grob-interface lyric-interface percent-repeat-interface) - quotedEventTypes = #'(note-event rest-event time-scaled-music tie-event) + quotedEventTypes = #'(note-event rest-event time-scaled-music tie-event beam-event) instrumentTransposition = #(ly:make-pitch 0 0 0) verticallySpacedContexts = #'(Staff) + hairpinToBarline = ##t + timing = ##t } @@ -594,15 +598,17 @@ AncientRemoveEmptyStaffContext = \context { \context { \type "Engraver_group" - \name FiguredBass + \name "FiguredBass" -%% \consists "Figured_bass_engraver" - \consists "New_figured_bass_engraver" + \consists "Figured_bass_engraver" \consists "Note_swallow_translator" \consists "Skip_event_swallow_translator" \consists "Separating_line_group_engraver" \consists "Hara_kiri_engraver" - \override RemoveEmptyVerticalGroup #'remove-first = ##t + + \override VerticalAxisGroup #'remove-empty = ##t + \override VerticalAxisGroup #'remove-first = ##t + \override VerticalAxisGroup #'minimum-Y-extent = #'(-0.5 . 2.5) } \context { @@ -627,17 +633,11 @@ AncientRemoveEmptyStaffContext = \context { \description "Context for drawing notes in a Tab staff. " - %% 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. - %%\override Beam #'damping = #100000 - %%\override Stem #'up-to-staff = ##t - %% TabStaff increase the staff-space, which in turn %% increases beam thickness and spacing; beams are %% too big. We have to adjust the beam settings: \override Beam #'thickness = #0.32 - \override Beam #'space-function = - #(lambda (beam mult) (* 0.62 (Beam::space_function beam mult))) + \override Beam #'length-fraction = #0.62 %% No accidental in tablature ! \remove Accidental_engraver @@ -759,9 +759,6 @@ AncientRemoveEmptyStaffContext = \context { \override Custos #'style = #'vaticana \override Custos #'neutral-position = #3 \override Custos #'neutral-direction = #DOWN - - %% Score.timing = ##f - %% Score.barAlways = ##t } \context { @@ -864,14 +861,12 @@ AncientRemoveEmptyStaffContext = \context { \override Custos #'style = #'mensural \override Custos #'neutral-position = #3 \override Custos #'neutral-direction = #DOWN - - %% Score.timing = ##f - %% Score.barAlways = ##t } RemoveEmptyRhythmicStaffContext= \context { \RhythmicStaff \remove "Axis_group_engraver" + \override VerticalAxisGroup #'remove-empty = ##t \consists "Hara_kiri_engraver" }