release: 1.3.19

[lilypond.git] / ly / engraver.ly

diff --git a/ly/engraver.ly b/ly/engraver.ly
index 0e5e9d2cb198827d4097ec5c557d8ac75411f710..a65ad4bd38d05bdd1047e5e4df4ba03dec0173a7 100644 (file)
--- a/ly/engraver.ly
+++ b/ly/engraver.ly
@@ -5,14 +5,40 @@
 StaffContext=\translator {
        \type "Engraver_group_engraver";
        \name Staff ;
-       barAuto = "1";
-       voltaVisibility = "1";
-
+       
+       barAuto = ##t
+       voltaVisibility = ##t
+       Generic_property_list = #generic-staff-properties
+       \consists "Property_engraver";
+       
        \consists "Multi_measure_rest_engraver";
        \consists "Bar_engraver";
  % Bar_engraver must be first so default bars aren't overwritten
 % with empty ones.
        \consists "Repeat_engraver";
+
+
+       %  name, glyph id, c0 position
+       supportedClefTypes = #'(
+         ("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";
@@ -33,16 +59,14 @@ StaffContext=\translator {
 %{
        \consists "Staff_margin_engraver";
 %}
-       defaultClef = treble;
-
-       marginBreakPriority = "-5";
+       defaultClef = #"treble"
 
+       marginBreakPriority = #-5
 
        \consists "Separating_line_group_engraver";
-       \consists "Font_size_engraver";
          
        \accepts "Voice";
-       dynamicStyle = "dynamic";
+       dynamicStyle = #"dynamic"
 };
 
 \translator{\StaffContext }
@@ -66,7 +90,11 @@ StaffContext=\translator {
 
 RhythmicStaffContext=\translator{
        \type "Engraver_group_engraver";
-       numberOfStaffLines  = "1";
+       numberOfStaffLines  = #1
+       \consists "Property_engraver";
+       
+       Generic_property_list = #generic-staff-properties
+       
        barSize = \staffheight;
        \consists "Pitch_squash_engraver";
        \consists "Separating_line_group_engraver";     
@@ -81,31 +109,31 @@ RhythmicStaffContext=\translator{
 };
 \translator{\RhythmicStaffContext}
 VoiceContext = \translator {
+
        \type "Engraver_group_engraver";
-       dynamicPadding = "5.0";
+       dynamicPadding = #5.0
+       Generic_property_list = #generic-voice-properties
+
+
        \consists "Dynamic_engraver";   % must come before text_engraver.
        \name Voice ;
-
-%      \consists "Tie_engraver";
+       \consists "Property_engraver";
+       
        \consists "Breathing_sign_engraver";
        \consists "Rest_engraver";
        \consists "Dot_column_engraver";
        \consists "Stem_engraver";
        \consists "Beam_engraver";
-       beamAuto = "1";
        \consists "Auto_beam_engraver";
        \include "auto-beam-settings.ly";
        \consists "Chord_tremolo_engraver";
-%      \consists "Multi_measure_rest_engraver";
 
-       % ugh.  Order matters here.
        \consists "Melisma_engraver";
-       textScriptPadding = "3.0";
+       textScriptPadding = #3.0
        \consists "Text_engraver";
        \consists "Script_engraver";
        \consists "Script_column_engraver";
        \consists "Rhythmic_column_engraver";
-       \consists "Font_size_engraver";
        \consists "Slur_engraver";
        \consists "Tie_engraver";
        \consists "Tuplet_engraver";
@@ -118,24 +146,31 @@ VoiceContext = \translator {
 GraceContext=\translator {
        \type "Grace_engraver_group";
        \name "Grace";
+
+       Generic_property_list = #generic-grace-properties
+       
        \consists "Note_heads_engraver";
        \consists "Local_key_engraver";
        \consists "Stem_engraver";
        \consists "Beam_engraver";
-       beamAuto = "1";
        \consists "Slur_engraver";
+       
        \consists "Auto_beam_engraver";
        \include "auto-beam-settings.ly";
        \consists "Align_note_column_engraver";
-       \consists "Font_size_engraver";
+
        \consists "Rhythmic_column_engraver";
        \consists "Dynamic_engraver";
 
-       stemStyle = "grace";
-       weAreGraceContext = "1";
-       fontSize = "-1";
-       stemLength = "6.0";
-       verticalDirection = "1";
+       \consists "Property_engraver";
+
+       stemStyle = #"grace"
+       flagStyle = #"grace" 
+       weAreGraceContext = ##t 
+       fontSize = #-1
+       
+       stemLength = #6.0
+       verticalDirection = \up ;
        graceAccidentalSpace= 1.5 * \interline;
 };
 
@@ -144,7 +179,9 @@ GraceContext=\translator {
 
 ThreadContext = \translator{
        \type Engraver_group_engraver;
-       \consists "Note_heads_engraver" ;       
+       \consists "Note_heads_engraver" ;
+       Generic_property_list = #generic-thread-properties
+       \consists "Property_engraver";
        \name Thread;
 };
 
@@ -154,10 +191,9 @@ 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}
 
@@ -176,7 +212,6 @@ PianoStaffContext = \translator{\GrandStaffContext
 StaffGroupContext= \translator {
        \type "Engraver_group_engraver";
        \consists "Span_bar_engraver";
-
        
        \consists "Staff_group_bar_engraver";
        \name StaffGroup;
@@ -188,9 +223,11 @@ StaffGroupContext= \translator {
        \accepts "Lyrics";
        \accepts "ChordNames";
 };
+
 \translator { \StaffGroupContext }
 
-\translator{
+% UGH! JUNKME
+LyricsVoiceContext= \translator{
        \type "Engraver_group_engraver";
        \consistsend "Axis_group_engraver";
 
@@ -199,9 +236,10 @@ StaffGroupContext= \translator {
        \consists "Lyric_engraver";
        \consists "Extender_engraver";
        \consists "Hyphen_engraver";
-}
+};
+\translator{ \LyricsVoiceContext }
 
-\translator {
+LyricsContext = \translator {
        \type "Engraver_group_engraver";
        \name Lyrics;
        \consists Vertical_align_engraver;%need this for getting folded repeats right.
@@ -209,7 +247,8 @@ StaffGroupContext= \translator {
        \consistsend "Axis_group_engraver";
        
        \accepts "LyricVoice";
-}
+};
+\translator { \LyricsContext }
 
 \translator{
        \type "Engraver_group_engraver";
@@ -247,8 +286,8 @@ StupidScore = \translator {
 
 BarNumberingStaffContext = \translator {
        \StaffContext
-       barColumnPriority = "0";
-       marginBreakPriority = "-4";
+       barColumnPriority = #0
+       marginBreakPriority = #-4
        \consists "Mark_engraver";
        \consists "Bar_number_engraver";
 };
@@ -262,8 +301,8 @@ HaraKiriStaffContext = \translator {
 
 OrchestralPartStaffContext = \translator {
        \StaffContext
-       barColumnPriority = "0";
-       marginBreakPriority = "-4";
+       barColumnPriority = #0
+       marginBreakPriority = #-4
        \consists "Mark_engraver";
        \consists "Bar_number_engraver";
 };
@@ -273,13 +312,23 @@ ScoreContext = \translator {
        \name Score;
 
        \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;
-       defaultClef = treble;
-
+       defaultClef = #"treble"
+       defaultBarType = #"|"
        \accepts "Staff";
        \accepts "StaffGroup";
        \accepts "RhythmicStaff";       
@@ -288,6 +337,10 @@ ScoreContext = \translator {
        \accepts "GrandStaff";
        \accepts "ChoirStaff";
        \accepts "PianoStaff";
+       \accepts "NoteNames";
+
+       clefBreakPriority = #-2
+       breathingSignBreakPriority = #-4
 };
 
 \translator { \ScoreContext }
@@ -295,11 +348,18 @@ ScoreContext = \translator {
 OrchestralScoreContext= \translator {
        \ScoreContext
 
-       barScriptPadding = "2.0";       % dimension \pt
-       markScriptPadding = "4.0";
+       barScriptPadding = #2.0         % dimension \pt
+       markScriptPadding = #4.0
 
        \consists "Bar_number_engraver";
        \consists "Mark_engraver";
 
        \accepts "HaraKiriStaff";
 };
+
+\translator {
+       \type "Engraver_group_engraver";
+       \name NoteNames;
+       \consistsend "Axis_group_engraver";
+       \consists "Note_name_engraver";
+}