patch::: 1.3.130.jcn1

[lilypond.git] / ly / engraver.ly

diff --git a/ly/engraver.ly b/ly/engraver.ly
index d44bd8fbf62ddd8731db2dc048f0f5218c82f479..39623a205622f4c36865886cedfd67884a48a729 100644 (file)
--- a/ly/engraver.ly
+++ b/ly/engraver.ly
@@ -1,6 +1,6 @@
+\version "1.3.122"
 
-\version "1.3.110"
-       %
+%
 % setup for Request->Element conversion. Guru-only
 %
 
@@ -33,8 +33,6 @@ StaffContext=\translator {
        \consists "Local_key_engraver";
        \consists "Piano_pedal_engraver";
 
-       \consistsend "Axis_group_engraver";
-
 %{
        The Instrument_name_engraver puts the name of the instrument
        (\property Staff.instrument; Staff.instr for subsequent lines)
@@ -45,11 +43,20 @@ StaffContext=\translator {
        \consists "Instrument_name_engraver";
 %}
 
+       \consistsend "Axis_group_engraver";
 
          
        \accepts "Voice";
 }
 
+
+StaffContainerContext = \translator {
+       \type Engraver_group_engraver;
+       \consists "Axis_group_engraver";
+       \accepts Staff;
+       \name StaffContainer;
+}
+
 ChoirStaffContext = \translator {
        \type "Engraver_group_engraver";
        \name ChoirStaff;
@@ -101,7 +108,6 @@ VoiceContext = \translator {
        \consists "Output_property_engraver";   
        \consists "Arpeggio_engraver";
 
-       \consists "Dynamic_engraver";   % must come before text_engraver.
        \consists "Text_spanner_engraver";
        \consists "Property_engraver";
        
@@ -114,17 +120,25 @@ VoiceContext = \translator {
 
        \consists "Chord_tremolo_engraver";
        \consists "Melisma_engraver";
+
+%{
+ Must come before text_engraver, but after note_column engraver.
+
+%}
+       \consists "Dynamic_engraver";
        \consists "Text_engraver";
-       \consists "A2_engraver";
-       \consists "Voice_devnull_engraver";
 
        \consists "Script_engraver";
        \consists "Script_column_engraver";
        \consists "Rhythmic_column_engraver";
+       \consists "Phrasing_slur_engraver";
        \consists "Slur_engraver";
        \consists "Tie_engraver";
        \consists "Tuplet_engraver";
        \consists "Grace_position_engraver";
+       \consists "A2_engraver";
+       \consists "Voice_devnull_engraver";
+
        \consists "Skip_req_swallow_translator";
        \accepts Thread; % bug if you leave out this!
        \accepts Grace;
@@ -179,13 +193,14 @@ GraceContext=\translator {
 
 ThreadContext = \translator{
        \type Engraver_group_engraver;
+       \name Thread;
+       
        \consists "Thread_devnull_engraver";
        \consists "Note_heads_engraver";
        \consists "Note_head_line_engraver";
        \consists "Output_property_engraver";   
        Generic_property_list = #generic-thread-properties
        \consists "Property_engraver";
-       \name Thread;
 }
 
 GrandStaffContext=\translator{
@@ -208,7 +223,8 @@ PianoStaffContext = \translator{
        \consists "Vertical_align_engraver";
 
        alignmentReference = \center;
-       VerticalAlignment \override #'threshold = #'(12 . 12) 
+       verticalAlignmentChildCallback = #Align_interface::fixed_distance_alignment_callback
+       VerticalAlignment \override #'forced-distance = #12
 
 %      \consistsend "Axis_group_engraver";
 }
@@ -237,9 +253,9 @@ StaffGroupContext= \translator {
 LyricsVoiceContext= \translator{
        \type "Engraver_group_engraver";
        \consistsend "Axis_group_engraver";
-       LyricVoiceMinimumVerticalExtent = #(cons -1.2 1.2)
+       LyricsVoiceMinimumVerticalExtent = #(cons -1.2 1.2)
 
-       \name LyricVoice ;
+       \name LyricsVoice ;
        \consists "Separating_line_group_engraver";
        \consists "Lyric_engraver";
        \consists "Extender_engraver";
@@ -264,7 +280,7 @@ LyricsContext = \translator {
        \consists "Property_engraver";
        \consistsend "Axis_group_engraver";
        
-       \accepts "LyricVoice";
+       \accepts "LyricsVoice";
 }
 
 ChordNamesVoiceContext = \translator {
@@ -275,7 +291,9 @@ ChordNamesVoiceContext = \translator {
        \consistsend "Axis_group_engraver";
        \consists "Separating_line_group_engraver";
        \consists "Chord_name_engraver";
+       \consists "Skip_req_swallow_translator";
 }
+
 ChordNamesContext = \translator {
        \type "Engraver_group_engraver";
        \name ChordNames;
@@ -291,12 +309,6 @@ ChordNamesContext = \translator {
        }
 
 
-ScoreWithNumbers = \translator {
-       \type "Score_engraver";
-
-       % uncomment to bar numbers on a whole system.
-       \consists "Bar_number_engraver";
-}
 
 StupidScore = \translator {
        \type "Score_engraver";
@@ -306,10 +318,6 @@ StupidScore = \translator {
 
 
 
-BarNumberingStaffContext = \translator {
-       \StaffContext
-       \consists "Mark_engraver";
-}
 
 HaraKiriStaffContext = \translator {
        \StaffContext
@@ -325,10 +333,8 @@ HaraKiriStaffContext = \translator {
   %\translator { \HaraKiriStaffContext }
 %}
 
-OrchestralPartStaffContext = \translator {
-       \StaffContext
-       \consists "Mark_engraver";
-}
+
+
 
 ScoreContext = \translator {
        \type Score_engraver;
@@ -348,8 +354,8 @@ ScoreContext = \translator {
        \consists "Bar_number_engraver";
        \consists "Span_arpeggio_engraver";
 
-       
-       \accepts "Staff";
+       \accepts "Staff";       
+       \accepts "StaffContainer";
        \accepts "StaffGroup";
        \accepts "RhythmicStaff";       
        \accepts "Lyrics";
@@ -366,6 +372,9 @@ ScoreContext = \translator {
        splitInterval = #'(0 . 1)
        changeMoment = #`(,(make-moment 0 0) . ,(make-moment 1 512))
 
+       %devNullThread = #'unisolo
+       %devNullVoice = #'unisolo
+
        StaffMinimumVerticalExtent = #(cons -4.0 4.0)
 
        barAuto = ##t
@@ -385,7 +394,9 @@ ScoreContext = \translator {
          ("clefs-mensural1_c" . 0)
          ("clefs-mensural2_c" . 0)
          ("clefs-mensural3_c" . 0)
-         ("clefs-mensural_f" . 0))
+         ("clefs-mensural1_f" . 4)
+         ("clefs-mensural2_f" . 4)
+         ("clefs-mensural_g" . -4))
 
        clefGlyph = #"clefs-G"
        clefPosition = #-2
@@ -399,19 +410,12 @@ ScoreContext = \translator {
        
        scriptDefinitions = #default-script-alist
 
-       startSustain = #"Ped."
-       stopSustain = #"*"
-       stopStartSustain = #"*Ped."
-       startUnaChorda = #"una chorda"
-       stopUnaChorda = #"tre chorde"
-       % should make separate lists for stopsustain and startsustain 
+       verticalAlignmentChildCallback = #Align_interface::alignment_callback
 
+       pedalSustainStrings = #'("Ped." "*Ped." "*")
+       pedalUnaChordaStrings = #'("una chorda" "" "tre chorde")
+       pedalSostenutoStrings = #'()  % FIXME
 
-       %
-       % what order to print accs.  We could compute this, 
-       % but computing is more work than putting it here.
-       %
-       % Flats come first, then sharps.
        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)
@@ -430,11 +434,7 @@ ScoreContext = \translator {
        )
 
 
-       \elementdescriptions #all-element-descriptions
-       %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-       % TODO: uniform naming.;  
-       %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-       
+       \elementdescriptions #all-grob-descriptions
 }
 
 OrchestralScoreContext= \translator {