X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fengraver-init.ly;h=79ba6c17cd2f001f43e4e2eb7ba324c8841edeae;hb=c8c2d260c38de22812e8783e48252b92cd23c880;hp=5902b25da9833d050b29a8287f5abb4d44d16ab7;hpb=785441aeb8cc557217d1b0658ef88d058f58eeb4;p=lilypond.git diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly index 5902b25da9..79ba6c17cd 100644 --- a/ly/engraver-init.ly +++ b/ly/engraver-init.ly @@ -26,7 +26,6 @@ \defaultchild "Score" \description "Hard coded entry point for LilyPond. Cannot be tuned." \grobdescriptions #all-grob-descriptions - EventClasses = #all-event-classes } \context { @@ -100,6 +99,7 @@ \defaultchild "Voice" \accepts "Voice" \accepts "CueVoice" + \accepts "NullVoice" \description "Handles clefs, bar lines, keys, accidentals. It can contain @code{Voice} contexts." @@ -240,6 +240,7 @@ multiple voices on the same staff." \consists "Beam_engraver" \consists "Grace_beam_engraver" \consists "Auto_beam_engraver" + \consists "Grace_auto_beam_engraver" %% must come before Script_column_engraver. \consists "New_fingering_engraver" @@ -611,8 +612,8 @@ automatically when an output definition (a @code{\\score} or endRepeatType = #":|." barNumberVisibility = #first-bar-number-invisible-and-no-parenthesized-bar-numbers barNumberFormatter = #robust-bar-number-function - clefOctavationFormatter = #clef-octavation-markup - cueClefOctavationFormatter = #clef-octavation-markup + clefTranspositionFormatter = #clef-transposition-markup + cueClefTranspositionFormatter = #clef-transposition-markup automaticBars = ##t explicitClefVisibility = #all-visible @@ -705,26 +706,8 @@ automatically when an output definition (a @code{\\score} or figuredBassFormatter = #format-bass-figure metronomeMarkFormatter = #format-metronome-markup - %% See also make-voice-props-set - graceSettings = #`( - (Voice Stem direction ,UP) - (Voice Stem font-size -3) - (Voice Flag font-size -3) - (Voice NoteHead font-size -3) - (Voice TabNoteHead font-size -4) - (Voice Dots font-size -3) - (Voice Stem length-fraction 0.8) - (Voice Stem no-stem-extend #t) - (Voice Beam beam-thickness 0.384) - (Voice Beam length-fraction 0.8) - (Voice Accidental font-size -4) - (Voice AccidentalCautionary font-size -4) - (Voice Slur direction ,DOWN) - (Voice Script font-size -3) - (Voice Fingering font-size -8) - (Voice StringNumber font-size -8) - ) + graceSettings = #score-grace-settings keepAliveInterfaces = #'( bass-figure-interface @@ -786,6 +769,59 @@ automatically when an output definition (a @code{\\score} or context." } +\context { + \name "NullVoice" + \type "Engraver_group" + + \description "Non-printing context, typically used for aligning +lyrics in polyphonic situations, or with @code{\partcombine}." + + %% don't route anything out of here + \alias "Staff" + \alias "Voice" + + %% all three are needed for ties to work with lyrics + \consists "Note_heads_engraver" + \consists "Rhythmic_column_engraver" + \consists "Tie_engraver" + + %% 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" + + %% keep noteheads inside the staff + \consists "Pitch_squash_engraver" + squashedPosition = 0 + + %% `\omit NoteHead' would give slur attachment errors + \omit Accidental + \omit Beam + \omit Dots + \omit Flag + \omit Rest + \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 { \Voice \name "TabVoice" @@ -800,6 +836,51 @@ context." \description "Context for drawing notes in a Tab staff." + %% No accidental in tablature ! + \remove "Accidental_engraver" +} + +\context { + \Staff + \alias "Staff" + \name "TabStaff" + \denies "Voice" + \consists "Tab_staff_symbol_engraver" + + \description "Context for generating tablature. It accepts only @code{TabVoice} +contexts and handles the line spacing, the tablature clef etc. properly." + + \accepts "TabVoice" + \defaultchild "TabVoice" + + %% 6 strings, bigger spacing + \override StaffSymbol.staff-space = #1.5 + + %% Don't draw stems over the tablature figures ! + \override Stem.avoid-note-head = ##t + + %% No accidental in tablature ! + \remove "Accidental_engraver" + \remove "Key_engraver" + + \remove "Ottava_spanner_engraver" + %% the clef handler + \override Clef.stencil = #clef::print-modern-tab-if-set + %% no time signature + \override TimeSignature.stencil = ##f + %% no arpeggios + \override Arpeggio.stencil = ##f + %% we ignore collision warnings that may occur due to + %% stem overlapping, because we have no stems ;-) + \override NoteColumn.ignore-collision = ##t + %% Special "TAB" clef + clefGlyph = #"clefs.tab" + clefPosition = #0 + %% Change string if note results in negative fret number + handleNegativeFrets = #'recalculate + %% Allow open strings even if minimumFret is set + restrainOpenStrings = ##f + %% TabStaff increase the staff-space, which in turn %% increases beam thickness and spacing; beams are %% too big. We have to adjust the beam settings: @@ -814,8 +895,6 @@ context." (/ 1 (ly:staff-symbol-staff-space grob))) \override StemTremolo.beam-width = #stem-tremolo::calc-tab-width - %% No accidental in tablature ! - \remove "Accidental_engraver" %% make the Stems as short as possible to minimize their influence %% on the slur::calc-control-points routine \override Stem.no-stem-extend = ##t @@ -868,48 +947,6 @@ context." \override TabNoteHead.stencil = #tab-note-head::whiteout-if-style-set } -\context { - \Staff - \alias "Staff" - \name "TabStaff" - \denies "Voice" - \consists "Tab_staff_symbol_engraver" - - \description "Context for generating tablature. It accepts only @code{TabVoice} -contexts and handles the line spacing, the tablature clef etc. properly." - - \accepts "TabVoice" - \defaultchild "TabVoice" - - %% 6 strings, bigger spacing - \override StaffSymbol.staff-space = #1.5 - - %% Don't draw stems over the tablature figures ! - \override Stem.avoid-note-head = ##t - - %% No accidental in tablature ! - \remove "Accidental_engraver" - \remove "Key_engraver" - - \remove "Ottava_spanner_engraver" - %% the clef handler - \override Clef.stencil = #clef::print-modern-tab-if-set - %% no time signature - \override TimeSignature.stencil = ##f - %% no arpeggios - \override Arpeggio.stencil = ##f - %% we ignore collision warnings that may occur due to - %% stem overlapping, because we have no stems ;-) - \override NoteColumn.ignore-collision = ##t - %% Special "TAB" clef - clefGlyph = #"clefs.tab" - clefPosition = #0 - %% Change string if note results in negative fret number - handleNegativeFrets = #'recalculate - %% Allow open strings even if minimumFret is set - restrainOpenStrings = ##f -} - \context { \Voice \name "VaticanaVoice" @@ -967,7 +1004,7 @@ of Editio Vaticana." middleCPosition = #1 middleCClefPosition = #1 clefPosition = #1 - clefOctavation = #0 + clefTransposition = #0 %% Select vaticana style font. \override KeySignature.glyph-name-alist = #alteration-vaticana-glyph-name-alist @@ -1060,7 +1097,7 @@ accommodated for typesetting a piece in mensural style." middleCClefPosition = #-6 middleCPosition = #-6 clefPosition = #-2 - clefOctavation = #0 + clefTransposition = #0 %% Select mensural style font. \override TimeSignature.style = #'mensural @@ -1119,7 +1156,7 @@ accommodated for typesetting a piece in Petrucci style." middleCClefPosition = #-6 middleCPosition = #-6 clefPosition = #-2 - clefOctavation = #0 + clefTransposition = #0 \override Custos.style = #'mensural \override Custos.neutral-position = #3 @@ -1178,7 +1215,7 @@ accommodated for typesetting a piece in Kievan style." middleCClefPosition = #0 middleCPosition = #0 clefPosition = #0 - clefOctavation = #0 + clefTransposition = #0 %% Accidentals are valid only once (if the following note is different) extraNatural = ##f