* VERSION (MY_PATCH_LEVEL): make 1.7.0

[lilypond.git] / ly / engraver-init.ly

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 2f27452f13a89c54363340922b916cf5313fa8ba..c195c75f972e4afbfe2b43fb0f9249e48dc58f11 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -1,4 +1,4 @@
-\version "1.5.33"
+\version "1.5.68"
 
 %
 % setup for Request->Element conversion. Guru-only
@@ -31,13 +31,12 @@ 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 
+       minimumVerticalExtent = #'(-6 . 6)
+       extraVerticalExtent = ##f
+       verticalExtent = ##f 
        localKeySignature = #'()
 
        % explicitly set instrument, so we don't get 
@@ -54,9 +53,9 @@ StaffContext=\translator {
 StaffContainerContext = \translator {
        \type Engraver_group_engraver
        \consists "Axis_group_engraver"
-       MinimumVerticalExtent = ##f
-       ExtraVerticalExtent = ##f
-       VerticalExtent = ##f 
+       minimumVerticalExtent = ##f
+       extraVerticalExtent = ##f
+       verticalExtent = ##f 
        localKeySignature = #'()
 
        \accepts Staff
@@ -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 = #'()
@@ -92,9 +91,9 @@ RhythmicStaffContext=\translator{
        \consists "Output_property_engraver"    
 
 
-       MinimumVerticalExtent = ##f
-       ExtraVerticalExtent = ##f
-       VerticalExtent = ##f 
+       minimumVerticalExtent = ##f
+       extraVerticalExtent = ##f
+       verticalExtent = ##f 
        localKeySignature = #'()
 
        \consists "Pitch_squash_engraver"
@@ -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,11 +134,14 @@ 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"
        % \consists "Rest_engraver"
        \consists "Stem_engraver"
        \consists "Beam_engraver"
+       \consists "Grace_beam_engraver"
        \consists "Auto_beam_engraver"
 
        \consists "Chord_tremolo_engraver"
@@ -178,6 +184,8 @@ ThreadContext = \translator{
 
 }
 
+
+
 GrandStaffContext=\translator{
        \type "Engraver_group_engraver"
        \name GrandStaff
@@ -195,15 +203,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"
 }
 
@@ -222,7 +231,7 @@ InnerStaffGroupContext= \translator {
        \accepts "RhythmicStaff"
        \accepts "GrandStaff"
        \accepts "PianoStaff"
-       
+       \accepts "TabStaff"     
        \accepts "Lyrics"
        \accepts "ChordNames"
 }
@@ -240,9 +249,9 @@ StaffGroupContext = \translator {
 LyricsVoiceContext= \translator{
        \type "Engraver_group_engraver"
        \consistsend "Axis_group_engraver"
-       MinimumVerticalExtent = #(cons -1.2 1.2)
-       ExtraVerticalExtent = ##f
-       VerticalExtent = ##f 
+       minimumVerticalExtent = #(cons -1.2 1.2)
+       extraVerticalExtent = ##f
+       verticalExtent = ##f 
        \name LyricsVoice 
        \consists "Separating_line_group_engraver"
        \consists "Lyric_engraver"
@@ -258,9 +267,9 @@ NoteNamesContext = \translator {
        \name NoteNames
        \consistsend "Axis_group_engraver"
 
-       MinimumVerticalExtent = ##f
-       ExtraVerticalExtent = ##f
-       VerticalExtent = ##f 
+       minimumVerticalExtent = ##f
+       extraVerticalExtent = ##f
+       verticalExtent = ##f 
 
        
        \consists "Note_name_engraver"
@@ -274,9 +283,9 @@ LyricsContext = \translator {
 
 
        \consistsend "Axis_group_engraver"
-       MinimumVerticalExtent = ##f
-       ExtraVerticalExtent = ##f
-       VerticalExtent = ##f 
+       minimumVerticalExtent = ##f
+       extraVerticalExtent = ##f
+       verticalExtent = ##f 
        
        \accepts "LyricsVoice"
 }
@@ -294,12 +303,10 @@ ChordNamesContext = \translator {
        \consists "Chord_name_engraver"
        \consists "Skip_req_swallow_translator"
        \consistsend "Axis_group_engraver"
-       MinimumVerticalExtent = ##f
-       ExtraVerticalExtent = ##f
-       VerticalExtent = ##f 
-
-       VerticalAxisGroup \override #'invisible-staff = ##t
-       }
+       minimumVerticalExtent = ##f
+       extraVerticalExtent = ##f
+       verticalExtent = ##f 
+}
 
 
 
@@ -318,7 +325,11 @@ HaraKiriStaffContext = \translator {
        \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 +347,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"       
@@ -348,6 +365,7 @@ ScoreContext = \translator {
        \consists "Span_arpeggio_engraver"
 
        \accepts "Staff"
+       \accepts "TabStaff"
        \accepts "StaffContainer"
        \accepts "StaffGroup"
        \accepts "RhythmicStaff"        
@@ -376,8 +394,10 @@ ScoreContext = \translator {
        centralCPosition = #-6
        
         automaticPhrasing = ##t
+       automaticMelismata = ##t
        
        defaultBarType = #"|"
+       barNumberVisibility = #default-bar-number-visibility
 
        explicitClefVisibility = #all-visible
        explicitKeySignatureVisibility = #all-visible
@@ -411,6 +431,7 @@ ScoreContext = \translator {
        breakAlignOrder = #'(
          instrument-name
          left-edge
+         ambitus
          span-bar
          breathing-sign
          clef
@@ -419,7 +440,7 @@ ScoreContext = \translator {
          time-signature
          custos
        )
-
+       barCheckSynchronize = ##t
 
        \grobdescriptions #all-grob-descriptions
 }
@@ -443,3 +464,56 @@ FiguredBassContext = \translator {
        \consists "Figured_bass_engraver"       
        \consistsend "Axis_group_engraver"
 }
+
+
+TabVoiceContext =   \translator {
+      \VoiceContext
+      \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 !)
+      % 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 {
+      \StaffContext
+      \alias "Staff"
+      \name "TabStaff"
+      \denies "Voice"
+      \accepts "TabVoice"
+      
+      % 6 strings
+      StaffSymbol \override #'line-count  = #6
+      StaffSymbol \override #'staff-space = #1.5
+
+      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
+      %TabNoteHead \override #'string-tunings = #'(10 10 10 10 10 10)
+      
+      % Special "TAB" clef
+      clefGlyph = #"clefs-tab"
+      clefPosition = #0
+      
+      % Don't draw stems over the tablature figures !
+      Stem \override #'avoid-note-head = ##t
+      
+      % No accidental in tablature !
+      \remove Accidental_engraver
+      \remove Key_engraver
+      stringTunings   = #guitar-tunings
+      tablatureFormat = #fret-number-tablature-format
+}
+