X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fengraver.ly;h=c60ee1a5104525f7cbfbf417e214b1aa81398948;hb=70a98a1bfe6eafa9a4cee14a8a5264a52a329d03;hp=fadc695390b9f49211b01eaaac019070885ee274;hpb=925f4ac3cf01ad7b1233514223ffb899f03899d1;p=lilypond.git

diff --git a/ly/engraver.ly b/ly/engraver.ly
index fadc695390..b8fa85214a 100644
--- a/ly/engraver.ly
+++ b/ly/engraver.ly
@@ -1,303 +1,461 @@
+\version "1.3.146"
+
 %
 % setup for Request->Element conversion. Guru-only
 %
 
 StaffContext=\translator {
-	\type "Engraver_group_engraver";
-	\name Staff ;
-	barAuto = "1";
-	voltaVisibility = "1";
-
-	\consists "Multi_measure_rest_engraver";
-	\consists "Bar_engraver";
+	\type "Engraver_group_engraver"
+	\name Staff 
+	\consists "Output_property_engraver"	
+	Generic_property_list = #generic-staff-properties
+	\consists "Property_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";
 
+%	\consists "Repeat_engraver"
+	\consists "Volta_engraver"
+	\consists "Separating_line_group_engraver"	
 
 
-%{
-	The Staff_margin_engraver puts the name of the instrument
-	(\property Staff.instrument; Staff.instr for subsequent lines)
-	to the left of a staff.
-%}
-%{
-	\consists "Staff_margin_engraver";
-%}
-	defaultClef = treble;
 
-	marginBreakPriority = "-5";
+	\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"
+	\consists "Piano_pedal_engraver"
+	\consists "Instrument_name_engraver"
+
+	\consistsend "Axis_group_engraver"
+	
+	MinimumVerticalExtent = #'(-4 . 4)
+	ExtraVerticalExtent = ##f
+	VerticalExtent = ##f 
 
+	% explicitly set instrument, so we don't get 
+	% weird effects when doing instrument names for
+	% piano staffs
 
-	\consists "Separating_line_group_engraver";
-	\consists "Font_size_engraver";
+	instrument = ##f
+	instr = ##f
 	  
-	\accepts "Voice";
-	dynamicStyle = "dynamic";
-};
-
-\translator{\StaffContext }
-\translator {
-	\type "Engraver_group_engraver";
-	\name ChoirStaff;
-	alignmentReference = \center;	
-	\consists "Staff_group_bar_engraver";
-
-
-	\accepts "Staff";
-	\accepts "RhythmicStaff";
-	\accepts "GrandStaff";
-	\accepts "PianoStaff";
-
-		
-	\accepts "Lyrics";
-	\accepts "ChordNames";
+	\accepts "Voice"
+}
+
+
+StaffContainerContext = \translator {
+	\type Engraver_group_engraver
+	\consists "Axis_group_engraver"
+	MinimumVerticalExtent = ##f
+	ExtraVerticalExtent = ##f
+	VerticalExtent = ##f 
+	
+	\accepts Staff
+	\name StaffContainer
+}
+
+InnerChoirStaffContext = \translator {
+	\type "Engraver_group_engraver"
+	\name InnerChoirStaff
+	alignmentReference = #0
+	\consists "System_start_delimiter_engraver"
+	SystemStartDelimiter \override #'glyph = #'bracket
+
+	\accepts "Staff"
+	\accepts "RhythmicStaff"
+	\accepts "GrandStaff"
+	\accepts "PianoStaff"
+	\accepts "Lyrics"
+	\accepts "ChordNames"
+}
+ChoirStaffContext = \translator {
+	\InnerChoirStaffContext
+	\name ChoirStaff
+	\accepts "InnerChoirStaff"
+	\accepts "InnerStaffGroup"
 }
 
 
 RhythmicStaffContext=\translator{
-	\type "Engraver_group_engraver";
-	numberOfStaffLines  = "1";
-	barSize = \staffheight;
-	\consists "Pitch_squash_engraver";
-	\consists "Separating_line_group_engraver";	
-	\name RhythmicStaff;
-
-	\consists "Repeat_engraver";
-	\consists "Bar_engraver";
-	\consists "Time_signature_engraver";
-	\consists "Staff_symbol_engraver";
-	\consistsend "Axis_group_engraver";
-	\accepts "Voice";
-};
-\translator{\RhythmicStaffContext}
+	\type "Engraver_group_engraver"
+	
+	\consists "Property_engraver"
+	\consists "Output_property_engraver"	
+
+	Generic_property_list = #generic-staff-properties
+	MinimumVerticalExtent = ##f
+	ExtraVerticalExtent = ##f
+	VerticalExtent = ##f 
+
+	\consists "Pitch_squash_engraver"
+	\consists "Separating_line_group_engraver"	
+	\name RhythmicStaff
+	\alias "Staff"
+	
+	Bar \override #'bar-size = #4
+	VoltaBracket \override #'minimum-space =  #15  % urg, in \pt
+	VoltaBracket \override #'padding =  #5  % urg, in \pt
+	StaffSymbol \override #'line-count = #1	
+
+%	\consists "Repeat_engraver"
+	\consists "Volta_engraver"
+	\consists "Bar_engraver"
+	\consists "Time_signature_engraver"
+	\consists "Staff_symbol_engraver"
+	\consistsend "Axis_group_engraver"
+	\accepts "Voice"
+}
+
+
 VoiceContext = \translator {
-	\type "Engraver_group_engraver";
-	dynamicPadding = "5.0";
-	\consists "Dynamic_engraver";   % must come before text_engraver.
-	\name Voice ;
-
-%	\consists "Tie_engraver";
-	\consists "Breathing_sign_engraver";
- 	\consists "Rest_engraver";
-	\consists "Dot_column_engraver";
-	\consists "Stem_engraver";
-	\consists "Beam_engraver";
-	\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";
-	\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";
-	\consists "Grace_position_engraver";
-	\consists "Skip_req_swallow_translator";
-	\accepts Thread; % bug if you leave out this!
-	\accepts Grace;
-};
+	\type "Engraver_group_engraver"
+	\name Voice
+
+	Generic_property_list = #generic-voice-properties
+
+	% must come before all
+	\consists "Voice_devnull_engraver"
+	\consists "Output_property_engraver"	
+	\consists "Arpeggio_engraver"
+	\consists "Multi_measure_rest_engraver"
+	\consists "Text_spanner_engraver"
+	\consists "Property_engraver"
+	
+	\consists "Breathing_sign_engraver"
+ 	% \consists "Rest_engraver"
+	\consists "Dot_column_engraver"
+	\consists "Stem_engraver"
+	\consists "Beam_engraver"
+	\consists "Auto_beam_engraver"
+
+	\consists "Chord_tremolo_engraver"
+	\consists "Percent_repeat_engraver"
+	\consists "Melisma_engraver"
+
+%{
+ Must come before text_engraver, but after note_column engraver.
+
+%}
+	\consists "Dynamic_engraver"
+	\consists "Text_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 "Skip_req_swallow_translator"
+	\accepts Thread % bug if you leave out this!
+	\accepts Grace
+}
 
 GraceContext=\translator {
-	\type "Grace_engraver_group";
-	\name "Grace";
-	\consists "Note_heads_engraver";
-	\consists "Local_key_engraver";
-	\consists "Stem_engraver";
-	\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";
-	\consists "Dynamic_engraver";
-
-	stemStyle = "grace";
-	weAreGraceContext = "1";
-	fontSize = "-1";
-	stemLength = "6.0";
-	verticalDirection = "1";
-	graceAccidentalSpace= 1.5 * \interline;
-};
-
-\translator{\GraceContext}
-\translator {\VoiceContext}
+	\type "Grace_engraver_group"
+	\name "Grace"
+	\consists "Output_property_engraver"	
+
+	Generic_property_list = #generic-grace-properties
+	
+	\consists "Note_heads_engraver"
+	\consists "Local_key_engraver"
+	\consists "Stem_engraver"
+	\consists "Beam_engraver"
+	\consists "Slur_engraver"
+
+	\consists "Auto_beam_engraver"
+	\consists "Align_note_column_engraver"
+
+	\consists "Rhythmic_column_engraver"
+
+	\consists "Dynamic_engraver"% in Grace ???
+	\consists "Text_engraver" % in Grace ???
+
+	\consists "Property_engraver"
+
+	Stem \override  #'flag-style = #"grace"
+	Stem \override  #'stem-length = #6.0
+	Stem \override  #'direction = #1
+
+	NoteHead \override #'font-relative-size = #-1
+	Stem \override #'font-relative-size = #-1
+	Stem \override #'stem-shorten = #'(0)
+	Beam \override #'font-relative-size = #-1
+	TextScript \override #'font-relative-size = #-1
+	Slur \override #'font-relative-size = #-1
+	Accidentals \override #'font-relative-size = #-1
+	Beam \override #'thickness = #0.3
+	Beam \override #'space-function = #(lambda (x) 0.5)
+
+	Stem \override #'lengths = #(map (lambda (x) (* 0.8 x)) '(3.5 3.5 3.5 4.5 5.0))
+	Stem \override #'beamed-lengths =
+		#'(0.0 2.5 2.0 1.5)
+	Stem \override #'beamed-minimum-lengths
+		 = #(map (lambda (x) (* 0.8 x)) '(0.0 2.5 2.0 1.5))
+
+	weAreGraceContext = ##t   
+	graceAccidentalSpace= #1.5  % in staff space
+}
 
 ThreadContext = \translator{
-	\type Engraver_group_engraver;
-	\consists "Note_heads_engraver" ;	
-	\name Thread;
-};
+	\type Engraver_group_engraver
+	\name Thread
+	
+	\consists "Thread_devnull_engraver"
+	\consists "Note_heads_engraver"
+	\consists "Rest_engraver"
+	\consists "Note_head_line_engraver"
+	\consists "Output_property_engraver"	
+	Generic_property_list = #generic-thread-properties
+	\consists "Property_engraver"
+}
 
-\translator{\ThreadContext}
 GrandStaffContext=\translator{
-	\type "Engraver_group_engraver";
-	\name GrandStaff;
-	\consists "Span_bar_engraver";
-	\consists "Piano_bar_engraver";
-
+	\type "Engraver_group_engraver"
+	\name GrandStaff
+	\consists "Span_bar_engraver"
+	\consists "Span_arpeggio_engraver"
+	\consists "System_start_delimiter_engraver"
+	SystemStartDelimiter \override #'glyph = #'brace
+	
+	\consists "Property_engraver"	
+	Generic_property_list = #generic-grand-staff-properties
+	\accepts "Staff"
+}
 
-	\accepts "Staff";
+PianoStaffContext = \translator{
+	\GrandStaffContext
+	\name "PianoStaff"
 
-};
-\translator{\GrandStaffContext}
+	\consists "Vertical_align_engraver"
+	\consists "Instrument_name_engraver"
+	
+	instrument = ##f
+	instr = ##f
+	
+	verticalAlignmentChildCallback = #Align_interface::fixed_distance_alignment_callback
+	VerticalAlignment \override #'forced-distance = #12
+	VerticalAlignment \override #'self-alignment-Y = #0
+%	\consistsend "Axis_group_engraver"
+}
 
-PianoStaffContext = \translator{\GrandStaffContext
-	alignmentReference = \center;
+InnerStaffGroupContext= \translator {
+	\type "Engraver_group_engraver"
+	\name InnerStaffGroup
 
-	\consists "Vertical_align_engraver";
-	minVerticalAlign = 3.0*\staffheight;
-	maxVerticalAlign = 3.0*\staffheight;
+	\consists "Span_bar_engraver"
+	\consists "Span_arpeggio_engraver"
+	\consists "Output_property_engraver"	
+	SystemStartDelimiter \override #'glyph = #'bracket
 
-%	\consistsend "Axis_group_engraver";
-	\name "PianoStaff";
+	\consists "System_start_delimiter_engraver"
+	\accepts "Staff"
+	\accepts "RhythmicStaff"
+	\accepts "GrandStaff"
+	\accepts "PianoStaff"
 	
-};
-\translator{\PianoStaffContext}
-StaffGroupContext= \translator {
-	\type "Engraver_group_engraver";
-	\consists "Span_bar_engraver";
+	\accepts "Lyrics"
+	\accepts "ChordNames"
+}
+StaffGroupContext = \translator {
+	\InnerStaffGroupContext
+	\name StaffGroup
+	\accepts "InnerChoirStaff"
+	\accepts "ChoirStaff"
+	\accepts "InnerStaffGroup"
+}
 
+
+% UGH! JUNKME
+LyricsVoiceContext= \translator{
+	\type "Engraver_group_engraver"
+	\consistsend "Axis_group_engraver"
+	MinimumVerticalExtent = #(cons -1.2 1.2)
+	ExtraVerticalExtent = ##f
+	VerticalExtent = ##f 
+	\name LyricsVoice 
+	\consists "Separating_line_group_engraver"
+	\consists "Lyric_engraver"
+	\consists "Extender_engraver"
+	\consists "Hyphen_engraver"
+	\consists "Stanza_number_engraver"
+	phrasingPunctuation = #".,:!?\""
 	
-	\consists "Staff_group_bar_engraver";
-	\name StaffGroup;
-	\accepts "Staff";
-	\accepts "RhythmicStaff";
-	\accepts "GrandStaff";
-	\accepts "PianoStaff";
-	
-	\accepts "Lyrics";
-	\accepts "ChordNames";
-};
-\translator { \StaffGroupContext }
-
-\translator{
-	\type "Engraver_group_engraver";
-	\consistsend "Axis_group_engraver";
-
-	\name LyricVoice ;
-	\consists "Separating_line_group_engraver";
-	\consists "Lyric_engraver";
-	\consists "Extender_engraver";
-	\consists "Hyphen_engraver";
 }
+NoteNamesContext = \translator {
+	\type "Engraver_group_engraver"
+	\name NoteNames
+	\consistsend "Axis_group_engraver"
 
-\translator {
-	\type "Engraver_group_engraver";
-	\name Lyrics;
-	\consists Vertical_align_engraver;%need this for getting folded repeats right.
+	MinimumVerticalExtent = ##f
+	ExtraVerticalExtent = ##f
+	VerticalExtent = ##f 
 
-	\consistsend "Axis_group_engraver";
 	
-	\accepts "LyricVoice";
+	\consists "Note_name_engraver"
+	\consists "Separating_line_group_engraver"
 }
 
-\translator{
-	\type "Engraver_group_engraver";
-
-	\consistsend "Axis_group_engraver";
-	\name ChordNameVoice ;
-	\consists "Separating_line_group_engraver";
-	\consists "Chord_name_engraver";
+LyricsContext = \translator {
+	\type "Engraver_group_engraver"
+	\name Lyrics
+	\consists Vertical_align_engraver %need this for getting folded repeats right.
+	Generic_property_list = #generic-lyrics-properties
+	\consists "Property_engraver"
+	\consistsend "Axis_group_engraver"
+	MinimumVerticalExtent = ##f
+	ExtraVerticalExtent = ##f
+	VerticalExtent = ##f 
+	
+	\accepts "LyricsVoice"
 }
 
 
-ChordNameContext = \translator {
-	\type "Engraver_group_engraver";
-	\name ChordNames;
-	\accepts "ChordNameVoice";
-	\consistsend "Axis_group_engraver";
-	};
-\translator { \ChordNameContext }
+ChordNamesContext = \translator {
+	\type "Engraver_group_engraver"
+	\name ChordNames
 
+	Generic_property_list = #generic-chord-staff-properties
+
+	\consists "Property_engraver"	
+	\consists "Output_property_engraver"	
+	\consists "Separating_line_group_engraver"
+	\consists "Chord_name_engraver"
+	\consists "Skip_req_swallow_translator"
+	\consistsend "Axis_group_engraver"
+	MinimumVerticalExtent = ##f
+	ExtraVerticalExtent = ##f
+	VerticalExtent = ##f 
+
+	VerticalAxisGroup \override #'invisible-staff = ##t
+	}
 
-ScoreWithNumbers = \translator {
- 	\type "Score_engraver";
 
-	% uncomment to bar numbers on a whole system.
-	\consists "Bar_number_engraver";
-};
 
 StupidScore = \translator {
- 	\type "Score_engraver";
-	\name Score;
-	\consists "Note_heads_engraver";
-};
+ 	\type "Score_engraver"
+	\name Score
+	\consists "Note_heads_engraver"
+}
 
 
 
-BarNumberingStaffContext = \translator {
-	\StaffContext
-	barColumnPriority = "0";
-	marginBreakPriority = "-4";
-	\consists "Mark_engraver";
-	\consists "Bar_number_engraver";
-};
 
 HaraKiriStaffContext = \translator {
 	\StaffContext
-	\remove "Axis_group_engraver";
-	\consistsend "Hara_kiri_engraver";	  
-	\accepts "Voice";
-};
+	\remove "Axis_group_engraver"
+	\consistsend "Hara_kiri_engraver"
+	\consists "Instrument_name_engraver"
+	\accepts "Voice"
+}
+%{
+  The HaraKiriStaffContexts doesn't override \name,
+  so it is still named `Staff'.
+
+  %\translator { \HaraKiriStaffContext }
+%}
+
+
 
-OrchestralPartStaffContext = \translator {
-	\StaffContext
-	barColumnPriority = "0";
-	marginBreakPriority = "-4";
-	\consists "Mark_engraver";
-	\consists "Bar_number_engraver";
-};
 
 ScoreContext = \translator {
-	\type Score_engraver;
-	\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;
-
-	\accepts "Staff";
-	\accepts "StaffGroup";
-	\accepts "RhythmicStaff";	
-	\accepts "Lyrics";
-	\accepts "ChordNames";
-	\accepts "GrandStaff";
-	\accepts "ChoirStaff";
-	\accepts "PianoStaff";
-};
-
-\translator { \ScoreContext }
+	\type Score_engraver
+	\name Score
+	
 
-OrchestralScoreContext= \translator {
-	\ScoreContext
+	\consists "Repeat_acknowledge_engraver"
+	\consists "Timing_engraver"
+	\consists "Output_property_engraver"
+	\consists "System_start_delimiter_engraver"
+	\consists "Mark_engraver"	
+	\consists "Break_align_engraver"
+	\consists "Spacing_engraver"
+	\consists "Vertical_align_engraver"
+
+	\consists "Lyric_phrasing_engraver"
+	\consists "Bar_number_engraver"
+	\consists "Span_arpeggio_engraver"
+
+	\accepts "Staff"
+	\accepts "StaffContainer"
+	\accepts "StaffGroup"
+	\accepts "RhythmicStaff"	
+	\accepts "Lyrics"
+	\accepts "ChordNames"
+	\accepts "GrandStaff"
+	\accepts "ChoirStaff"
+	\accepts "PianoStaff"
+	\accepts "NoteNames"
+
+	soloText = #"Solo"
+	soloIIText = #"Solo II"
+	aDueText = #"a2"
+	soloADue = ##t
+	splitInterval = #'(0 . 1)
+	changeMoment = #`(,(make-moment 0 0) . ,(make-moment 1 512))
+
+	barAuto = ##t
+	voltaVisibility = ##t
+	%  name, glyph id, clef position 
+	% where is c0 in this clef?
+
+	clefGlyph = #"clefs-G"
+	clefPosition = #-2
+	centralCPosition = #-6
+	
+        automaticPhrasing = ##t
+	alignmentReference = #-1   % \down
+	defaultBarType = #"|"
+
+	explicitClefVisibility = #all-visible
+	explicitKeySignatureVisibility = #all-visible
+	
+	scriptDefinitions = #default-script-alist
+
+	verticalAlignmentChildCallback = #Align_interface::alignment_callback
 
-	barScriptPadding = "2.0";	% dimension \pt
-	markScriptPadding = "4.0";
+	pedalSustainStrings = #'("Ped." "*Ped." "*")
+	pedalUnaCordaStrings = #'("una corda" "" "tre corde")
+	pedalSostenutoStrings = #'()  % FIXME
 
-	\consists "Bar_number_engraver";
-	\consists "Mark_engraver";
+	tupletNumberFormatFunction = #denominator-tuplet-formatter
+	
+       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)
+       )
+	breakAlignOrder = #'(
+	  Instrument_name
+	  Left_edge_item
+	  Span_bar
+	  Breathing_sign
+	  Clef_item
+	  Key_item
+	  Staff_bar
+	  Time_signature
+	  Custos
+	)
+
+
+	\elementdescriptions #all-grob-descriptions
+}
+
+OrchestralScoreContext= \translator {
+	\ScoreContext
+}
+EasyNotation =  \translator {
+	\ScoreContext
+	NoteHead \override #'molecule-callback = #Note_head::brew_ez_molecule
+	easyPlay = ##t
+}
 
-	\accepts "HaraKiriStaff";
-};