X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fengraver-init.ly;h=b49a101205661f198aa7cf2a88f46b83b9a00b97;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=dfaa47e12faf136a7a5e8ac63e345e3b9858141c;hpb=9f909143a605a677787915e5dcce5dbc48f2211c;p=lilypond.git diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly index dfaa47e12f..b49a101205 100644 --- a/ly/engraver-init.ly +++ b/ly/engraver-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.17.29" +\version "2.19.16" \context { \name "Global" @@ -86,7 +86,7 @@ \consists "Cue_clef_engraver" \consists "Fingering_column_engraver" - localKeySignature = #'() + localAlterations = #'() createSpacing = ##t ignoreFiguredBassRest = ##f @@ -162,7 +162,7 @@ contained staves are not connected vertically." \context{ \type "Engraver_group" - localKeySignature = #'() + localAlterations = #'() createSpacing = ##t squashedPosition = #0 @@ -210,7 +210,8 @@ subscripts, slurs, ties, and rests. You have to instantiate this explicitly if you want to have multiple voices on the same staff." - + %% Grace_engraver sets properties, it must come first. + \consists "Grace_engraver" \consists "Font_size_engraver" \consists "Pitched_trill_engraver" @@ -266,7 +267,6 @@ multiple voices on the same staff." \consists "Slur_engraver" \consists "Tie_engraver" \consists "Tuplet_engraver" - \consists "Grace_engraver" \consists "Instrument_switch_engraver" } @@ -305,7 +305,7 @@ multiple voices on the same staff." \context{ \type "Engraver_group" \name GrandStaff - localKeySignature = #'() + localAlterations = #'() \description "A group of staves, with a brace on the left side, grouping the staves together. The bar lines of the @@ -313,6 +313,9 @@ contained staves are connected vertically." \consists "Instrument_name_engraver" \consists "Span_bar_engraver" +% The default for DynamicText.extra-spacing-width causes dynamics to +% be placed across span bars, so switch it off: + \override DynamicText.extra-spacing-width = ##f \consists "Span_bar_stub_engraver" \consists "Span_arpeggio_engraver" \consists "System_start_delimiter_engraver" @@ -359,6 +362,9 @@ together, never separately." \consists "Instrument_name_engraver" \consists "Span_bar_engraver" +% The default for DynamicText.extra-spacing-width causes dynamics to +% be placed across span bars, so switch it off: + \override DynamicText.extra-spacing-width = ##f \consists "Span_bar_stub_engraver" \consists "Span_arpeggio_engraver" \consists "Output_property_engraver" @@ -414,13 +420,6 @@ a collection of staves, with a bracket in front and spanning bar lines." \override DynamicLineSpanner.outside-staff-priority = ##f \override DynamicText.outside-staff-priority = ##f \override Hairpin.outside-staff-priority = ##f - \override DynamicText.X-offset = - #(ly:make-simple-closure - `(,+ - ,(ly:make-simple-closure - (list ly:self-alignment-interface::centered-on-note-columns)) - ,(ly:make-simple-closure - (list ly:self-alignment-interface::x-aligned-on-self)))) \description "Holds a single line of dynamics, which will be centered between the staves surrounding this context." @@ -579,6 +578,7 @@ automatically when an output definition (a @code{\\score} or \accepts "ChoirStaff" \accepts "PianoStaff" \accepts "Devnull" + \accepts "NullVoice" \accepts "NoteNames" \accepts "FiguredBass" @@ -593,6 +593,7 @@ automatically when an output definition (a @code{\\score} or drumStyleTable = #drums-style + associatedVoiceType = #'Voice melismaBusyProperties = #default-melisma-properties tieWaitForNote = ##f clefGlyph = #"clefs.G" @@ -608,7 +609,7 @@ automatically when an output definition (a @code{\\score} or doubleRepeatType = #":..:" startRepeatType = #".|:" endRepeatType = #":|." - alternativeRestores = #'(measurePosition measureLength) + alternativeRestores = #'(measurePosition measureLength lastChord) barNumberVisibility = #first-bar-number-invisible-and-no-parenthesized-bar-numbers barNumberFormatter = #robust-bar-number-function clefTranspositionFormatter = #clef-transposition-markup @@ -618,7 +619,7 @@ automatically when an output definition (a @code{\\score} or explicitClefVisibility = #all-visible explicitCueClefVisibility = #end-of-line-invisible explicitKeySignatureVisibility = #all-visible - implicitTimeSignatureVisibility = #end-of-line-invisible + initialTimeSignatureVisibility = #end-of-line-invisible repeatCountVisibility = #all-repeat-counts-visible @@ -773,54 +774,33 @@ context." \context { \name "NullVoice" \type "Engraver_group" - - \description "Non-printing context, typically used for aligning -lyrics in polyphonic situations, or with @code{\partcombine}." + \description "For aligning lyrics without printing notes" %% don't route anything out of here \alias "Staff" \alias "Voice" - %% all three are needed for ties to work with lyrics + % provide non-printing NoteHeads with proper extents for lyric alignment \consists "Note_heads_engraver" - \consists "Rhythmic_column_engraver" - \consists "Tie_engraver" + \omit NoteHead + \override NoteHead.X-extent = #(lambda (g) + (ly:stencil-extent (ly:note-head::print g) X)) - %% both are needed for melismas to work with \autoBeamOff - \consists "Beam_engraver" - \consists "Stem_engraver" - - %% needed for slurs to work with lyrics - \consists "Slur_engraver" + % generate no accidentals + nullAccidentals = ##t %% keep noteheads inside the staff \consists "Pitch_squash_engraver" squashedPosition = 0 - %% `\omit NoteHead' would give slur attachment errors - \omit Accidental + % the engravers that control the 'busy' flags for note-onsets and melismata + \consists "Grob_pq_engraver" + \consists "Tie_engraver" + \omit Tie + \consists "Beam_engraver" \omit Beam - \omit Dots - \omit Flag - \omit Rest + \consists "Slur_engraver" \omit Slur - \omit Stem - \omit Tie - - %% let these take up space (for lyric extenders, etc.) - \override NoteHead.transparent = ##t - \override TabNoteHead.transparent = ##t - - %% don't let notes shift - \override NoteHead.X-offset = 0 - \override NoteColumn.ignore-collision = ##t - - %% keep beams and stems inside the staff - \override Beam.positions = #'(1 . 1) - \override Stem.length = 0 - - %% prevent "weird stem size" warnings - \override Stem.direction = #UP } \context {