*** empty log message ***

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

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 6ed3450a10bafbff92d18d27c55bb338f88b1afb..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"
 }
@@ -143,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"
@@ -160,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"
@@ -179,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"    
 
@@ -235,6 +239,7 @@ InnerStaffGroupContext= \translator {
        \accepts "Lyrics"
        \accepts "ChordNames"
 }
+
 StaffGroupContext = \translator {
        \InnerStaffGroupContext
        \name StaffGroup
@@ -248,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 
@@ -279,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 
@@ -295,30 +301,18 @@ 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"
@@ -386,9 +380,8 @@ ScoreContext = \translator {
        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
@@ -410,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
@@ -421,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,6 +436,28 @@ ScoreContext = \translator {
        )
        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
 }
 
@@ -461,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"
@@ -496,24 +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
 }