X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fengraver-init.ly;h=3e930cc84e2e371095a5bb137f0c742386909fc6;hb=70ce2535fede040193d9c2afbfcb5ec6253da8f3;hp=5491381a4062dc6231f23e6808b313a4c3d46725;hpb=c9bdb374406905646871f29552c4580e29c000e9;p=lilypond.git diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly index 5491381a40..3e930cc84e 100644 --- a/ly/engraver-init.ly +++ b/ly/engraver-init.ly @@ -1,4 +1,4 @@ -\version "1.5.49" +\version "1.7.3" % % setup for Request->Element conversion. Guru-only @@ -31,10 +31,9 @@ StaffContext=\translator { \consists "Piano_pedal_engraver" \consists "Instrument_name_engraver" \consists "Grob_pq_engraver" - + \consists "Forbid_line_break_engraver" \consistsend "Axis_group_engraver" - minimumVerticalExtent = #'(-6 . 6) extraVerticalExtent = ##f verticalExtent = ##f @@ -44,8 +43,8 @@ StaffContext=\translator { % weird effects when doing instrument names for % piano staves - instrument = ##f - instr = ##f + instrument = #'() + instr = #'() \accepts "Voice" } @@ -66,7 +65,7 @@ StaffContainerContext = \translator { InnerChoirStaffContext = \translator { \type "Engraver_group_engraver" \name InnerChoirStaff - alignmentReference = #0 + %% alignmentReference = #0 FIXME \consists "System_start_delimiter_engraver" systemStartDelimiter = #'SystemStartBracket localKeySignature = #'() @@ -102,16 +101,20 @@ RhythmicStaffContext=\translator{ \name RhythmicStaff \alias "Staff" - Bar \override #'bar-size = #4 + BarLine \override #'bar-size = #4 VoltaBracket \override #'minimum-space = #15 % urg, in \pt VoltaBracket \override #'padding = #5 % urg, in \pt StaffSymbol \override #'line-count = #1 + Stem \override #'neutral-direction = #1 + Beam \override #'neutral-direction = #1 % \consists "Repeat_engraver" + \consists "Dot_column_engraver" \consists "Volta_engraver" \consists "Bar_engraver" \consists "Time_signature_engraver" \consists "Staff_symbol_engraver" + \consists "Instrument_name_engraver" \consistsend "Axis_group_engraver" \accepts "Voice" } @@ -131,6 +134,7 @@ VoiceContext = \translator { \consists "Arpeggio_engraver" \consists "Multi_measure_rest_engraver" \consists "Text_spanner_engraver" + \consists "Grob_pq_engraver" \consists "Ligature_bracket_engraver" \consists "Breathing_sign_engraver" @@ -139,7 +143,7 @@ VoiceContext = \translator { \consists "Beam_engraver" \consists "Grace_beam_engraver" \consists "Auto_beam_engraver" - + \consists "New_fingering_engraver" \consists "Chord_tremolo_engraver" \consists "Percent_repeat_engraver" \consists "Melisma_engraver" @@ -156,8 +160,10 @@ VoiceContext = \translator { \consists "Script_column_engraver" \consists "Rhythmic_column_engraver" \consists "Phrasing_slur_engraver" + \consists "Cluster_engraver" \consists "Slur_engraver" \consists "Tie_engraver" + \consists "New_tie_engraver" \consists "Porrectus_engraver" \consists "Tuplet_engraver" \consists "A2_engraver" @@ -175,11 +181,15 @@ ThreadContext = \translator{ \consists "Thread_devnull_engraver" \consists "Note_heads_engraver" \consists "Rest_engraver" + + % why here ? \consists "Note_head_line_engraver" \consists "Output_property_engraver" } + + GrandStaffContext=\translator{ \type "Engraver_group_engraver" \name GrandStaff @@ -197,15 +207,16 @@ PianoStaffContext = \translator{ \name "PianoStaff" \alias "GrandStaff" + verticalAlignmentChildCallback = #Align_interface::fixed_distance_alignment_callback + VerticalAlignment \override #'forced-distance = #12 + VerticalAlignment \override #'self-alignment-Y = #0 + \consists "Vertical_align_engraver" \consists "Instrument_name_engraver" instrument = #'() instr = #'() - verticalAlignmentChildCallback = #Align_interface::fixed_distance_alignment_callback - VerticalAlignment \override #'forced-distance = #12 - VerticalAlignment \override #'self-alignment-Y = #0 % \consistsend "Axis_group_engraver" } @@ -228,6 +239,7 @@ InnerStaffGroupContext= \translator { \accepts "Lyrics" \accepts "ChordNames" } + StaffGroupContext = \translator { \InnerStaffGroupContext \name StaffGroup @@ -241,8 +253,8 @@ StaffGroupContext = \translator { % UGH! JUNKME LyricsVoiceContext= \translator{ \type "Engraver_group_engraver" - \consistsend "Axis_group_engraver" - minimumVerticalExtent = #(cons -1.2 1.2) + \consistsend "Hara_kiri_engraver" + minimumVerticalExtent = #'(-1.2 . 1.2) extraVerticalExtent = ##f verticalExtent = ##f \name LyricsVoice @@ -272,10 +284,11 @@ NoteNamesContext = \translator { LyricsContext = \translator { \type "Engraver_group_engraver" \name Lyrics - \consists Vertical_align_engraver %need this for getting folded repeats right. - + + %% To get folded repeats right. + \consists Vertical_align_engraver - \consistsend "Axis_group_engraver" + \consistsend "Hara_kiri_engraver" minimumVerticalExtent = ##f extraVerticalExtent = ##f verticalExtent = ##f @@ -288,37 +301,29 @@ ChordNamesContext = \translator { \type "Engraver_group_engraver" \name ChordNames - - - + \consists "Rest_swallow_translator" \consists "Output_property_engraver" \consists "Separating_line_group_engraver" \consists "Chord_name_engraver" \consists "Skip_req_swallow_translator" - \consistsend "Axis_group_engraver" - minimumVerticalExtent = ##f + \consistsend "Hara_kiri_engraver" + minimumVerticalExtent = #'(0 . 2.5) extraVerticalExtent = ##f verticalExtent = ##f - } - - - -StupidScore = \translator { - \type "Score_engraver" - \name Score - \consists "Note_heads_engraver" } - - HaraKiriStaffContext = \translator { \StaffContext \remove "Axis_group_engraver" \consistsend "Hara_kiri_engraver" \consists "Instrument_name_engraver" \accepts "Voice" + + % hara kiri & auto knee don't work together. + Beam \override #'auto-knee-gap = #'() } + %{ The HaraKiriStaffContexts doesn't override \name, so it is still named `Staff'. @@ -336,7 +341,13 @@ ScoreContext = \translator { \consists "Repeat_acknowledge_engraver" \consists "Staff_collecting_engraver" + + % move the alias along with the engraver. + + %% TODO? add this alias from Timing_engraver::initialize() ? \consists "Timing_engraver" + \alias "Timing" + \consists "Output_property_engraver" \consists "System_start_delimiter_engraver" \consists "Mark_engraver" @@ -365,20 +376,21 @@ ScoreContext = \translator { aDueText = #"a2" soloADue = ##t splitInterval = #'(0 . 1) - changeMoment = #`(,(make-moment 0 0) . ,(make-moment 1 512)) + changeMoment = #`(,(ly:make-moment 0 0) . ,(ly:make-moment 1 512)) systemStartDelimiter =#'SystemStartBar - % name, glyph id, clef position - % where is c0 in this clef? - + %% name, glyph id, clef position + %% where is c0 in this clef? clefGlyph = #"clefs-G" clefPosition = #-2 centralCPosition = #-6 automaticPhrasing = ##t + automaticMelismata = ##t defaultBarType = #"|" + barNumberVisibility = #default-bar-number-visibility explicitClefVisibility = #all-visible explicitKeySignatureVisibility = #all-visible @@ -391,8 +403,10 @@ ScoreContext = \translator { pedalSustainStrings = #'("Ped." "*Ped." "*") pedalUnaCordaStrings = #'("una corda" "" "tre corde") - %% these are in ordinary italic font, including the *, but they are unlikely to be used, - %% as the default pedal-style for SostenutoPedal is 'mixed': i.e. Sost. Ped_____________________ + %% These are in ordinary italic font, including the *, + %% but they are unlikely to be used, + %% as the default pedal-style for SostenutoPedal is 'mixed': + %% i.e. Sost. Ped_____________________ pedalSostenutoStrings = #'("Sost. Ped." "*Sost. Ped." "*") tupletNumberFormatFunction = #denominator-tuplet-formatter @@ -402,7 +416,6 @@ ScoreContext = \translator { autoAccidentals = #'(Staff (same-octave . 0)) autoCautionaries = #'() - keyAccidentalOrder = #'( (6 . -1) (2 . -1) (5 . -1 ) (1 . -1) (4 . -1) (0 . -1) (3 . -1) (3 . 1) (0 . 1) (4 . 1) (1 . 1) (5 . 1) (2 . 1) (6 . 1) @@ -412,6 +425,7 @@ ScoreContext = \translator { breakAlignOrder = #'( instrument-name left-edge + ambitus span-bar breathing-sign clef @@ -420,6 +434,28 @@ ScoreContext = \translator { time-signature custos ) + barCheckSynchronize = ##t + + %% chord names: + chordNameFunction = #ignatzek-chord-names + majorSevenSymbol = #whiteTriangleMarkup + chordNameSeparator = #(make-simple-markup "/") + chordNameExceptions = #ignatzekExceptions + chordNoteNamer = #'() + chordRootNamer = #note-name->markup + + %% tablature: + stringOneTopmost = ##t + highStringOne = ##t + + %% One may change the strings tuning as following : + %% The lenght of the list must be equal to the number of string + + stringTunings = #guitar-tunings + tablatureFormat = #fret-number-tablature-format + + %% + bassFigureFormatFunction = #make-bass-figure-markup \grobdescriptions #all-grob-descriptions @@ -441,8 +477,10 @@ GraceContext = \translator { FiguredBassContext = \translator { \type "Engraver_group_engraver" \name FiguredBass - \consists "Figured_bass_engraver" - \consistsend "Axis_group_engraver" + \consists "Figured_bass_engraver" + \consists "Rest_swallow_translator" + \consists "Note_swallow_translator" + \consistsend "Hara_kiri_engraver" } TabVoiceContext = \translator { @@ -450,10 +488,18 @@ TabVoiceContext = \translator { \name "TabVoice" \denies "Thread" \consists "Tab_note_heads_engraver" - + + Slur \override #'font-family = #'roman + Slur \override #'molecule-callback = #hammer-molecule-callback + Slur \override #'direction = #-1 + % Draws all stems/beams out of the staff (and not in the middle of the staff !) - Beam \override #'damping = #100000 - Stem \override #'up-to-staff = ##t + % This feature is now disabled because most of the tab does not use it. + %Beam \override #'damping = #100000 + %Stem \override #'up-to-staff = ##t + + % No accidental in tablature ! + \remove Accidental_engraver } TabStaffContext = \translator { @@ -466,22 +512,16 @@ TabStaffContext = \translator { % 6 strings StaffSymbol \override #'line-count = #6 StaffSymbol \override #'staff-space = #1.5 + + % Don't draw stems over the tablature figures ! + Stem \override #'avoid-note-head = ##t - % One may change the strings tuning as following : - % The lenght of the list must be equal to the number of string - %TabNoteHead \override #'string-tunings = #'(10 10 10 10 10 10) - + % No accidental in tablature ! + \remove Accidental_engraver + \remove Key_engraver + % Special "TAB" clef clefGlyph = #"clefs-tab" clefPosition = #0 - - % Don't draw stems over the tabature figures ! - Stem \override #'avoid-note-head = ##t - - % No accidental in tablature ! - Accidental = \turnOff - - stringTunings = #'(-8 -3 2 7 11 16) - tablatureFormat = #fret-number-tablature-format }