release: 1.3.0

[lilypond.git] / ly / engraver.ly

diff --git a/ly/engraver.ly b/ly/engraver.ly
index 4be101d52dd77032e9acad07b56dd87b7e8c4bce..b323524d32614e8dd096722ea49fefdf1e9be54d 100644 (file)
--- a/ly/engraver.ly
+++ b/ly/engraver.ly
@@ -5,35 +5,25 @@
 StaffContext=\translator {
        \type "Engraver_group_engraver";
        \name Staff ;
-       barAuto = "1";
-       voltaVisibility = "1";
+       barAuto = ##t
+       voltaVisibility = ##t
 
        \consists "Multi_measure_rest_engraver";
-       \consists "Repeat_engraver";
        \consists "Bar_engraver";
+ % Bar_engraver must be first so default bars aren't overwritten
+% with empty ones.
+       \consists "Repeat_engraver";
        \consists "Clef_engraver";
        \consists "Key_engraver";
        \consists "Time_signature_engraver";
        \consists "Staff_symbol_engraver";
        \consists "Collision_engraver";
        \consists "Rest_collision_engraver";
+       \consists "Local_key_engraver";
+
        \consistsend "Axis_group_engraver";
 
-%{
-       Uncomment to get bar numbers on single staff systems:
-       
-       The Bar_number_engraver puts a number over a staff created
-       at the same level of hierarchy.  This why you have to add it
-       here separately if you want to have numbers on single staff
-       systems: The Bar_number_engraver in Score_engraver will only
-       put numbers on bars that are Score ("system") wide.  Such
-       bars are only created when the toplevel system has multiple
-       children-staffs.
 
-%}
-%{
-       \consists "Bar_number_engraver";
-%}
 
 %{
        The Staff_margin_engraver puts the name of the instrument
@@ -43,16 +33,15 @@ 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 }
@@ -76,7 +65,9 @@ StaffContext=\translator {
 
 RhythmicStaffContext=\translator{
        \type "Engraver_group_engraver";
-       numberOfStaffLines  = "1";
+       numberOfStaffLines  = #1
+       
+       barSize = \staffheight;
        \consists "Pitch_squash_engraver";
        \consists "Separating_line_group_engraver";     
        \name RhythmicStaff;
@@ -91,11 +82,11 @@ RhythmicStaffContext=\translator{
 \translator{\RhythmicStaffContext}
 VoiceContext = \translator {
        \type "Engraver_group_engraver";
+       dynamicPadding = #5.0
        \consists "Dynamic_engraver";   % must come before text_engraver.
        \name Voice ;
-       beamAuto = "1";
-       \consists "Local_key_engraver";
-       
+
+%      \consists "Tie_engraver";
        \consists "Breathing_sign_engraver";
        \consists "Rest_engraver";
        \consists "Dot_column_engraver";
@@ -103,10 +94,12 @@ VoiceContext = \translator {
        \consists "Beam_engraver";
        \consists "Auto_beam_engraver";
        \include "auto-beam-settings.ly";
-%      \consists "Abbreviation_beam_engraver";
+       \consists "Chord_tremolo_engraver";
 %      \consists "Multi_measure_rest_engraver";
 
        % ugh.  Order matters here.
+       \consists "Melisma_engraver";
+       textScriptPadding = #3.0
        \consists "Text_engraver";
        \consists "Script_engraver";
        \consists "Script_column_engraver";
@@ -125,18 +118,26 @@ GraceContext=\translator {
        \type "Grace_engraver_group";
        \name "Grace";
        \consists "Note_heads_engraver";
+       \consists "Local_key_engraver";
        \consists "Stem_engraver";
-       \consists "Slur_engraver";
-       \consists "Timing_engraver";    %UGH.
        \consists "Beam_engraver";
+       \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";
-       
-       fontSize = "-1";
-       stemLength = "6.0";
-       verticalDirection = "1";
+       \consists "Dynamic_engraver";
+
+       stemStyle = #"grace" 
+       weAreGraceContext = ##t 
+       fontSize = #-1
+       stemLength = #6.0
+       verticalDirection = \up ;
+       graceAccidentalSpace= 1.5 * \interline;
 };
+
 \translator{\GraceContext}
 \translator {\VoiceContext}
 
@@ -153,9 +154,7 @@ GrandStaffContext=\translator{
        \consists "Span_bar_engraver";
        \consists "Piano_bar_engraver";
 
-
        \accepts "Staff";
-
 };
 \translator{\GrandStaffContext}
 
@@ -174,7 +173,6 @@ PianoStaffContext = \translator{\GrandStaffContext
 StaffGroupContext= \translator {
        \type "Engraver_group_engraver";
        \consists "Span_bar_engraver";
-
        
        \consists "Staff_group_bar_engraver";
        \name StaffGroup;
@@ -186,9 +184,11 @@ StaffGroupContext= \translator {
        \accepts "Lyrics";
        \accepts "ChordNames";
 };
+
 \translator { \StaffGroupContext }
 
-\translator{
+% UGH! JUNKME
+LyricsVoiceContext= \translator{
        \type "Engraver_group_engraver";
        \consistsend "Axis_group_engraver";
 
@@ -196,9 +196,11 @@ StaffGroupContext= \translator {
        \consists "Separating_line_group_engraver";
        \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.
@@ -206,7 +208,8 @@ StaffGroupContext= \translator {
        \consistsend "Axis_group_engraver";
        
        \accepts "LyricVoice";
-}
+};
+\translator { \LyricsContext }
 
 \translator{
        \type "Engraver_group_engraver";
@@ -244,8 +247,8 @@ StupidScore = \translator {
 
 BarNumberingStaffContext = \translator {
        \StaffContext
-       barColumnPriority = "0";
-       marginBreakPriority = "-4";
+       barColumnPriority = #0
+       marginBreakPriority = #-4
        \consists "Mark_engraver";
        \consists "Bar_number_engraver";
 };
@@ -259,8 +262,8 @@ HaraKiriStaffContext = \translator {
 
 OrchestralPartStaffContext = \translator {
        \StaffContext
-       barColumnPriority = "0";
-       marginBreakPriority = "-4";
+       barColumnPriority = #0
+       marginBreakPriority = #-4
        \consists "Mark_engraver";
        \consists "Bar_number_engraver";
 };
@@ -270,13 +273,14 @@ ScoreContext = \translator {
        \name Score;
 
        \consists "Timing_engraver";
+
        \consists "Span_score_bar_engraver";
        \consists "Score_priority_engraver";
        \consists "Spacing_engraver";
        \consists "Vertical_align_engraver";
        alignmentReference = \down;
-       defaultClef = treble;
-
+       defaultClef = #"treble"
+       defaultBarType = #"|"
        \accepts "Staff";
        \accepts "StaffGroup";
        \accepts "RhythmicStaff";       
@@ -292,8 +296,8 @@ 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";