* 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 487dea35ceb81495cc54abab548ee5334f0e6cbf..c195c75f972e4afbfe2b43fb0f9249e48dc58f11 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -1,4 +1,4 @@
-\version "1.5.49"
+\version "1.5.68"
 
 %
 % 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 
@@ -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"
@@ -180,6 +184,8 @@ ThreadContext = \translator{
 
 }
 
+
+
 GrandStaffContext=\translator{
        \type "Engraver_group_engraver"
        \name GrandStaff
@@ -197,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"
 }
 
@@ -299,7 +306,7 @@ ChordNamesContext = \translator {
        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"       
@@ -377,8 +394,10 @@ ScoreContext = \translator {
        centralCPosition = #-6
        
         automaticPhrasing = ##t
+       automaticMelismata = ##t
        
        defaultBarType = #"|"
+       barNumberVisibility = #default-bar-number-visibility
 
        explicitClefVisibility = #all-visible
        explicitKeySignatureVisibility = #all-visible
@@ -412,6 +431,7 @@ ScoreContext = \translator {
        breakAlignOrder = #'(
          instrument-name
          left-edge
+         ambitus
          span-bar
          breathing-sign
          clef
@@ -420,7 +440,7 @@ ScoreContext = \translator {
          time-signature
          custos
        )
-
+       barCheckSynchronize = ##t
 
        \grobdescriptions #all-grob-descriptions
 }
@@ -445,19 +465,24 @@ FiguredBassContext = \translator {
        \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 !)
-      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
-      Accidental  = \turnOff 
 }
 
 TabStaffContext = \translator {
@@ -470,7 +495,10 @@ TabStaffContext = \translator {
       % 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)
@@ -479,14 +507,13 @@ TabStaffContext = \translator {
       clefGlyph = #"clefs-tab"
       clefPosition = #0
       
-      % Don't draw stems over the tabature figures !
+      % Don't draw stems over the tablature figures !
       Stem \override #'avoid-note-head = ##t
       
       % No accidental in tablature !
       \remove Accidental_engraver
-      Accidental  = \turnOff 
-      
-      stringTunings = #'(4 9 14 19 23 28)
+      \remove Key_engraver
+      stringTunings   = #guitar-tunings
       tablatureFormat = #fret-number-tablature-format
 }