* 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 2dddf6c773dc0a9c5bd85c228e53dcb8e0de1f1a..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
@@ -65,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 = #'()
@@ -134,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"
@@ -346,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"       
@@ -390,6 +397,7 @@ ScoreContext = \translator {
        automaticMelismata = ##t
        
        defaultBarType = #"|"
+       barNumberVisibility = #default-bar-number-visibility
 
        explicitClefVisibility = #all-visible
        explicitKeySignatureVisibility = #all-visible
@@ -464,13 +472,17 @@ TabVoiceContext =   \translator {
       \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 {
@@ -483,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)
@@ -492,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   = #'(-20 -15 -10 -5 -1 4)
+      \remove Key_engraver
+      stringTunings   = #guitar-tunings
       tablatureFormat = #fret-number-tablature-format
 }