*** empty log message ***

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

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index c8a1216fed79eee1f297168c0359835133ee878b..3e930cc84e2e371095a5bb137f0c742386909fc6 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -43,8 +43,8 @@ StaffContext=\translator {
        % weird effects when doing instrument names for
        % piano staves
 
-       instrument = ##f
-       instr = ##f
+       instrument = #'()
+       instr = #'()
          
        \accepts "Voice"
 }
@@ -181,6 +181,8 @@ ThreadContext = \translator{
        \consists "Thread_devnull_engraver"
        \consists "Note_heads_engraver"
        \consists "Rest_engraver"
+
+       % why here ? 
        \consists "Note_head_line_engraver"
        \consists "Output_property_engraver"    
 
@@ -237,6 +239,7 @@ InnerStaffGroupContext= \translator {
        \accepts "Lyrics"
        \accepts "ChordNames"
 }
+
 StaffGroupContext = \translator {
        \InnerStaffGroupContext
        \name StaffGroup
@@ -250,7 +253,7 @@ StaffGroupContext = \translator {
 % UGH! JUNKME
 LyricsVoiceContext= \translator{
        \type "Engraver_group_engraver"
-       \consistsend "Axis_group_engraver"
+       \consistsend "Hara_kiri_engraver"
        minimumVerticalExtent = #'(-1.2 . 1.2)
        extraVerticalExtent = ##f
        verticalExtent = ##f 
@@ -285,7 +288,7 @@ LyricsContext = \translator {
        %% To get folded repeats right.
        \consists Vertical_align_engraver 
 
-       \consistsend "Axis_group_engraver"
+       \consistsend "Hara_kiri_engraver"
        minimumVerticalExtent = ##f
        extraVerticalExtent = ##f
        verticalExtent = ##f 
@@ -298,27 +301,18 @@ ChordNamesContext = \translator {
        \type "Engraver_group_engraver"
        \name ChordNames
 
+       \consists "Rest_swallow_translator" 
        \consists "Output_property_engraver"    
        \consists "Separating_line_group_engraver"
-       \consists "New_chord_name_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"
@@ -422,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)
@@ -442,8 +435,28 @@ ScoreContext = \translator {
          custos
        )
        barCheckSynchronize = ##t
-       chordNameFunction = #chord->markup-banter
-       chordNameExceptions = #chord::exception-alist-banter
+
+       %% 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
 }
@@ -464,11 +477,12 @@ 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 {
       \VoiceContext
       \name "TabVoice"
@@ -499,26 +513,15 @@ TabStaffContext = \translator {
       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 !
+     % 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
-
 
+      % Special "TAB" clef
+      clefGlyph = #"clefs-tab"
+      clefPosition = #0
 }