release: 1.3.19

[lilypond.git] / ly / engraver.ly

diff --git a/ly/engraver.ly b/ly/engraver.ly
index cd6f98cf44c6bb16522977e03bb8adb76e4a6a0e..a65ad4bd38d05bdd1047e5e4df4ba03dec0173a7 100644 (file)
--- a/ly/engraver.ly
+++ b/ly/engraver.ly
@@ -20,22 +20,25 @@ StaffContext=\translator {
 
        %  name, glyph id, c0 position
        supportedClefTypes = #'(
-         ("treble" "treble" -2)
-         ("violin" "treble" -2)
-         ("G" "treble" -2)
-         ("G2" "treble" -2)
-         ("french" "treble" -4 )
-         ("soprano" "alto" -4 )
-         ("mezzosoprano" "alto" -2 )
-         ("alto" "alto" 0 )
-         ("tenor" "alto" 2 )
-         ("baritone" "alto" 4 )
-         ("varbaritone" "bass" 0)
-         ("bass" "bass" 2 )
-         ("F" "bass" 2)
-         ("subbass" "bass" 4)
+         ("treble" . ("G" -2))
+         ("violin" . ("G" -2))
+         ("G" . ("G" -2))
+         ("G2" . ("G" -2))
+         ("french" . ("G" -4 ))
+         ("soprano" . ("C" -4 ))
+         ("mezzosoprano" . ("C" -2 ))
+         ("alto" . ("C" 0 ))
+         ("tenor" . ("C" 2 ))
+         ("baritone" . ("C" 4 ))
+         ("varbaritone"  . ("F" 0))
+         ("bass" . ("F" 2 ))
+         ("F" . ( "F" 2))
+         ("subbass" . ("F" 4))
        )
-       
+       clefPitches = #'(("G" . -4)
+         ("C" . 0)
+         ("F" . 4))
+         
        \consists "Clef_engraver";
        \consists "Key_engraver";
        \consists "Time_signature_engraver";
@@ -161,7 +164,8 @@ GraceContext=\translator {
 
        \consists "Property_engraver";
 
-       stemStyle = #"grace" 
+       stemStyle = #"grace"
+       flagStyle = #"grace" 
        weAreGraceContext = ##t 
        fontSize = #-1
        
@@ -187,7 +191,8 @@ GrandStaffContext=\translator{
        \name GrandStaff;
        \consists "Span_bar_engraver";
        \consists "Piano_bar_engraver";
-
+       \consists "Property_engraver";  
+       Generic_property_list = #generic-grand-staff-properties
        \accepts "Staff";
 };
 \translator{\GrandStaffContext}
@@ -309,7 +314,16 @@ ScoreContext = \translator {
        \consists "Timing_engraver";
 
        \consists "Span_score_bar_engraver";
-       \consists "Score_priority_engraver";
+%      \consists "Score_priority_engraver";
+       \consists "Break_align_engraver";
+       breakAlignOrder = #'(
+         "Span_bar"
+         "Breathing_sign"
+         "Clef_item"
+         "Key_item"
+         "Staff_bar"
+         "Time_signature"
+       )
        \consists "Spacing_engraver";
        \consists "Vertical_align_engraver";
        alignmentReference = \down;
@@ -323,6 +337,7 @@ ScoreContext = \translator {
        \accepts "GrandStaff";
        \accepts "ChoirStaff";
        \accepts "PianoStaff";
+       \accepts "NoteNames";
 
        clefBreakPriority = #-2
        breathingSignBreakPriority = #-4
@@ -341,3 +356,10 @@ OrchestralScoreContext= \translator {
 
        \accepts "HaraKiriStaff";
 };
+
+\translator {
+       \type "Engraver_group_engraver";
+       \name NoteNames;
+       \consistsend "Axis_group_engraver";
+       \consists "Note_name_engraver";
+}