X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fengraver.ly;h=0fdd838bea38dc310be20df3c92b87a1653bf8fd;hb=refs%2Ftags%2Frelease%2F1.3.88;hp=9167c65804a1cd947b559c2e5cd91365c4e289e9;hpb=127a1c165d3c16f971413ba36de9bb65cf3d8aa4;p=lilypond.git

diff --git a/ly/engraver.ly b/ly/engraver.ly
index 9167c65804..0fdd838bea 100644
--- a/ly/engraver.ly
+++ b/ly/engraver.ly
@@ -6,8 +6,6 @@ StaffContext=\translator {
 	\type "Engraver_group_engraver";
 	\name Staff ;
 	\consists "Output_property_engraver";	
-	barAuto = ##t
-	voltaVisibility = ##t
 	Generic_property_list = #generic-staff-properties
 	\consists "Property_engraver";
 	
@@ -16,36 +14,12 @@ StaffContext=\translator {
  % Bar_engraver must be first so default bars aren't overwritten
 % with empty ones.
 
-	voltaPadding = #5  % urg, in \pt
-	voltaMinimumSpace = #25  % urg, in \pt
-
-	StaffMinimumVerticalExtent = #(cons -4.0 4.0)
 
 	\consists "Repeat_engraver";
+	\consists "Separating_line_group_engraver";	
+
 
 
-	%  name, glyph id, c0 position
-	supportedClefTypes = #'(
-	  ("treble" . ("clefs-G" -2))
-	  ("violin" . ("clefs-G" -2))
-	  ("G" . ("clefs-G" -2))
-	  ("G2" . ("clefs-G" -2))
-	  ("french" . ("clefs-G" -4 ))
-	  ("soprano" . ("clefs-C" -4 ))
-	  ("mezzosoprano" . ("clefs-C" -2 ))
-	  ("alto" . ("clefs-C" 0 ))
-	  ("tenor" . ("clefs-C" 2 ))
-	  ("baritone" . ("clefs-C" 4 ))
-	  ("varbaritone"  . ("clefs-F" 0))
-	  ("bass" . ("clefs-F" 2 ))
-	  ("F" . ( "clefs-F" 2))
-	  ("subbass" . ("clefs-F" 4))
-	)
-	% where is c0 in this clef?
-	clefPitches = #'(("clefs-G" . -4)
-	  ("clefs-C" . 0)
-	  ("clefs-F" . 4))
-	  
 	\consists "Clef_engraver";
 	\consists "Key_engraver";
 	\consists "Time_signature_engraver";
@@ -56,23 +30,19 @@ StaffContext=\translator {
 
 	\consistsend "Axis_group_engraver";
 
-
-
 %{
 	The Instrument_name_engraver puts the name of the instrument
 	(\property Staff.instrument; Staff.instr for subsequent lines)
 	to the left of a staff.
-	Usually, you only want this in the full score, not in the parts.
 
+	This is commented out, so you don't get funny things on the
+	PianoStaff	
 	\consists "Instrument_name_engraver";
 %}
 
-	defaultClef = #"treble"
 
-	\consists "Separating_line_group_engraver";
 	  
 	\accepts "Voice";
-	dynamicStyle = #"dynamic"
 };
 
 \translator{\StaffContext }
@@ -83,14 +53,10 @@ StaffContext=\translator {
 	\consists "System_start_delimiter_engraver";
 	systemStartDelimiterGlyph = #'bracket
 
-
-
 	\accepts "Staff";
 	\accepts "RhythmicStaff";
 	\accepts "GrandStaff";
 	\accepts "PianoStaff";
-
-		
 	\accepts "Lyrics";
 	\accepts "ChordNames";
 }
@@ -98,19 +64,22 @@ StaffContext=\translator {
 
 RhythmicStaffContext=\translator{
 	\type "Engraver_group_engraver";
-	numberOfStaffLines  = #1
+	
 	\consists "Property_engraver";
 	\consists "Output_property_engraver";	
 
 	Generic_property_list = #generic-staff-properties
 	
-	barSize =   4.0 * \staffspace ; 
+ 	barSize =   4.0 * \staffspace ; % JUNKME
+
 	\consists "Pitch_squash_engraver";
 	\consists "Separating_line_group_engraver";	
 	\name RhythmicStaff;
 
-	voltaPadding = #5  % urg, in \pt
-	voltaMinimumSpace = #15  % urg, in \pt
+	basicVoltaSpannerProperties \push #'minimum-space =  #15  % urg, in \pt
+	basicVoltaSpannerProperties \push #'padding =  #5  % urg, in \pt
+	basicStaffSymbolProperties \push #'line-count = #1	
+
 	\consists "Repeat_engraver";
 	\consists "Bar_engraver";
 	\consists "Time_signature_engraver";
@@ -124,10 +93,8 @@ VoiceContext = \translator {
 	\type "Engraver_group_engraver";
 	\name Voice;
 
-	dynamicPadding = #3  % urg, in \pt
-	dynamicMinimumSpace = #6  % urg, in \pt
-
 	Generic_property_list = #generic-voice-properties
+	
 	\consists "Output_property_engraver";	
 
 	\consists "Dynamic_engraver";   % must come before text_engraver.
@@ -143,8 +110,9 @@ VoiceContext = \translator {
 
 	\consists "Chord_tremolo_engraver";
 	\consists "Melisma_engraver";
-	textScriptPadding = #3.0
 	\consists "Text_engraver";
+	\consists "A2_engraver";
+	\consists "Voice_devnull_engraver";
 
 
 	startSustain = #"Ped."
@@ -152,7 +120,8 @@ VoiceContext = \translator {
 	stopStartSustain = #"*Ped."
 	startUnaChorda = #"una chorda"
 	stopUnaChorda = #"tre chorde"
-
+	% should make separate lists for stopsustain and startsustain 
+	
 	\consists "Piano_pedal_engraver";
 	\consists "Script_engraver";
 	\consists "Script_column_engraver";
@@ -184,19 +153,28 @@ GraceContext=\translator {
 	\consists "Align_note_column_engraver";
 
 	\consists "Rhythmic_column_engraver";
-	\consists "Dynamic_engraver";
-	\consists "Text_engraver";
+
+	\consists "Dynamic_engraver";% in Grace ???
+	\consists "Text_engraver"; % in Grace ???
 
 	\consists "Property_engraver";
 
-	stemStyle = #"grace"
-	flagStyle = #"grace" 
-	weAreGraceContext = ##t 
-	fontSize = #-1
+	basicStemProperties \push  #'style = #"grace"
+	basicStemProperties \push  #'flag-style = #"grace"
+	basicStemProperties \push  #'stem-length = #6.0
+	basicStemProperties \push  #'direction = #1
+
+	basicNoteHeadProperties \push #'font-size = #-1
+	basicStemProperties \push #'font-size = #-1
+	basicBeamProperties \push #'font-size = #-1
+	basicTextScriptProperties \push #'font-size = #-1
+	basicSlurProperties \push #'font-size = #-1
+	basicLocalKeyProperties \push #'font-size = #-1
+	basicBeamProperties \push #'beam-thickness = #0.3
+	basicBeamProperties \push #'beam-space-function = #(lambda (x) 0.5)
 	
-	stemLength = #6.0
-	verticalDirection = \up ;
-	graceAccidentalSpace= 1.5 * \staffspace;
+	weAreGraceContext = ##t   
+	graceAccidentalSpace= 1.5 * \staffspace; % JUNKME
 };
 
 \translator{\GraceContext}
@@ -204,7 +182,8 @@ GraceContext=\translator {
 
 ThreadContext = \translator{
 	\type Engraver_group_engraver;
-	\consists "Note_heads_engraver" ;
+	\consists "Thread_devnull_engraver";
+	\consists "Note_heads_engraver";
 	\consists "Output_property_engraver";	
 	Generic_property_list = #generic-thread-properties
 	\consists "Property_engraver";
@@ -229,6 +208,8 @@ PianoStaffContext = \translator{\GrandStaffContext
 	alignmentReference = \center;
 
 	\consists "Vertical_align_engraver";
+
+	% JUNKME
 	minVerticalAlign = 3.0*\staffheight;
 	maxVerticalAlign = 3.0*\staffheight;
 
@@ -355,40 +336,71 @@ OrchestralPartStaffContext = \translator {
 ScoreContext = \translator {
 	\type Score_engraver;
 	\name Score;
-
-	marginScriptPadding = #10  % urg, in \pt
+	
 
 	\consists "Timing_engraver";
 	\consists "Output_property_engraver";	
-
-	%bracketCollapseHeight = #10  % \pt
 	\consists "System_start_delimiter_engraver";
-	
-%	\consists "Score_priority_engraver";
+	\consists "Mark_engraver";	
 	\consists "Break_align_engraver";
-	breakAlignOrder = #'(
-	  Instrument_name
-	  Left_edge_item
-	  Span_bar
-	  Breathing_sign
-	  Clef_item
-	  Key_item
-	  Staff_bar
-	  Time_signature
-	  Stanza_number
-	)
 	\consists "Spacing_engraver";
 
 	\consists "Vertical_align_engraver";
 
 	\consists "Lyric_phrasing_engraver";
-        automaticPhrasing = ##t;
-
 	\consists "Bar_number_engraver";
+
+	
+	\accepts "Staff";
+	\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)
+
+	defaultClef = #"treble"
+
+	StaffMinimumVerticalExtent = #(cons -4.0 4.0)
+
+	barAuto = ##t
+	voltaVisibility = ##t
+	%  name, glyph id, c0 position
+	supportedClefTypes = #'(
+	  ("treble" . ("clefs-G" -2))
+	  ("violin" . ("clefs-G" -2))
+	  ("G" . ("clefs-G" -2))
+	  ("G2" . ("clefs-G" -2))
+	  ("french" . ("clefs-G" -4 ))
+	  ("soprano" . ("clefs-C" -4 ))
+	  ("mezzosoprano" . ("clefs-C" -2 ))
+	  ("alto" . ("clefs-C" 0 ))
+	  ("tenor" . ("clefs-C" 2 ))
+	  ("baritone" . ("clefs-C" 4 ))
+	  ("varbaritone"  . ("clefs-F" 0))
+	  ("bass" . ("clefs-F" 2 ))
+	  ("F" . ( "clefs-F" 2))
+	  ("subbass" . ("clefs-F" 4))
+	)
+	% where is c0 in this clef?
+	clefPitches = #'(("clefs-G" . -4)
+	  ("clefs-C" . 0)
+	  ("clefs-F" . 4))
+	  	
+
+        automaticPhrasing = ##t;
 	alignmentReference = \down;
 	defaultClef = #"treble"
 	defaultBarType = #"|"
-       systemStartDelimiterGlyph = #'bar-line
+	systemStartDelimiterGlyph = #'bar-line
 
        %
        % what order to print accs.  We could compute this, 
@@ -399,19 +411,31 @@ ScoreContext = \translator {
          (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
+	  Stanza_number
+	)
+       
 	%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-	% default settings, mainly for breakable items
-	% in alphabetical order
 	% TODO: uniform naming.;  
 	%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 	%
-	% distances are given in stafflinethickness (thicknesses) and staffspace (distances)
+	% distances are given in stafflinethickness (thicknesses) and
+	% staffspace (distances)
 	%
-	
-	
 	basicBarProperties = #`(
+		(interfaces . (bar-interface staff-bar-interface))
 		(break-align-symbol . Staff_bar)
+		(glyph . "|")
 		(barsize-procedure . ,Bar::get_staff_bar_size)
 		(molecule-callback . ,Bar::brew_molecule)	   
 		(visibility-lambda . ,all-visible)
@@ -424,101 +448,123 @@ ScoreContext = \translator {
 		(thin-kern . 3.0)
 		(hair-thickness . 1.6)
 		(thick-thickness . 6.0)
-
-		(interfaces . (bar-interface staff-bar-interface))		
+		(name . "barline")
 	)
 
 	basicBarNumberProperties = #`(
 		(molecule-callback . ,Text_item::brew_molecule)
 		(breakable . #t)
 		(visibility-lambda . ,begin-of-line-visible)
+		(name . "barnumber")
 	)
 
-	basicBeamProperties = #`(
-		(molecule-callback . ,Beam::brew_molecule)
-		(beam-thickness . 0.42) ; staff-space
-		(before-line-breaking-callback . ,Beam::before_line_breaking)
-		(after-line-breaking-callback . ,Beam::after_line_breaking)
-		(default-neutral-direction . 1)
-		(interfaces . (beam-interface))
-		(damping . 1)
-	)
-
+	basicBeamProperties = #basic-beam-properties
 	basicBreakAlignProperties = #`(
 		(breakable . #t)
 		(interfaces . (break-align-interface))
 		(stacking-dir . 1)
 		(axes 0)
+		(name . "break alignment")		
 	)
 	basicBreakAlignGroupProperties = #`(
 		(interfaces . (axis-group-interface))
 		(axes  . (0))
+		(name . "break alignment group")
 	)
 	basicBreathingSignProperties = #`(
+		(interfaces . (breathing-sign-interface))
 		(break-align-symbol . Breathing_sign)
 		(breakable . #t )
 		(molecule-callback . ,Breathing_sign::brew_molecule)
 		(visibility-lambda . ,begin-of-line-invisible)
-		(interfaces . (breathing-sign-interface))
+		(name . "breathing sign")
 	)
 	 basicClefItemProperties = #`(
+	   (interfaces .  (clef-interface))
    	   (molecule-callback . ,Score_element::brew_molecule)
 	   (before-line-breaking-callback . ,Clef::before_line_breaking)
 	   (breakable . #t)
 	   (break-align-symbol . Clef_item)
 	   (visibility-lambda . ,begin-of-line-visible)
-	   (interfaces .  (clef-interface))
+	   (name . "clef")
 	 )
 	basicChordNameProperties = #`(
 		(molecule-callback . ,Chord_name::brew_molecule)
 		(interfaces . (chord-name-interface))
+		(after-line-breaking-callback . ,Chord_name::after_line_breaking)
+		(name . "chord name")  
 	)
 	basicCollisionProperties = #`(
 		(axes 0 1)
 		(interfaces . (collision-interface))
+		(note-width . 1.65)
+		(name . "note collision")
 	)
 	basicCrescendoProperties = #`(
 		(molecule-callback . ,Crescendo::brew_molecule)
 		(interfaces . (crescendo-interface dynamic-interface))
+		(name . "crescendo")
 	)
 	basicDotColumnProperties = #`(
 		(interfaces . (dot-column-interface axis-group-interface ))
 		(axes 0 )
+		(name . "dot column")
 	)
 	basicDotsProperties = #`(
+		(interfaces . (dot-interface))
 		(molecule-callback . ,Dots::brew_molecule)
 		(dot-count . 1)
-		(interfaces . (dot-interface))
+		(name . "augmentation dot")		
 	)
-	basicDynamicLineSpannerProperties = #`(
-		(interfaces (dynamic-interface axis-group-interface))
-		(axes . ( 1))
-	)
-	basicDynamicTextProperties	 = # `(
+	basicDynamicTextProperties = #`(
 		(style . "dynamic")
-		(interface (dynamic-interface))
+		(interfaces . (dynamic-interface))
 		(molecule-callback . ,Text_item::brew_molecule)
 		(script-priority . 100)
 		(self-alignment-Y . 0)
+		(name . "dynamic text")
+	)
+	
+	basicDynamicLineSpannerProperties = #`(
+		(interfaces . (dynamic-interface axis-group-interface side-position-interface))
+		(axes . ( 1))
+		(padding . 3)
+		(minimum-space . 6)
+		(name . "dynamic alignment")
 	)
+	
 	leftEdgeBasicProperties = #`(
 		(break-align-symbol . Left_edge_item)
 		(breakable . #t)
+		(name . "left edge")
 	)
 	basicGraceAlignItemProperties = #`(
-		(axes . (0))
 		(interfaces . (axis-group-interface align-interface))
+		(axes . (0))
+		(horizontal-space . 1.2)
+		(padding . 1.0)
 		(before-line-breaking-callback . ,Grace_align_item::before_line_breaking)
+		(name . "grace alignment")
 	)
 	basicHaraKiriVerticalGroupspannerProperties = #`(
 		(interfaces . (hara-kiri-interface))
 		(axes 1)
+		(name . "hara kiri")
 	)
 	basicHyphenSpannerProperties = #`(
 		(thickness . 1.0)
 		(height . 0.4)
 		(minimum-length .  0.5) 
 		(molecule-callback . ,Hyphen_spanner::brew_molecule)
+		(name . "hyphen")		
+	)
+	
+	basicInstrumentNameProperties = #`(
+		(breakable . #t)
+		(molecule-callback . ,Text_item::brew_molecule)		
+		(break-align-symbol . Instrument_name)
+		(visibility-lambda . ,begin-of-line-visible)
+		(name . "instrument name")
 	)
 	basicKeyProperties = #`(
   	  (molecule-callback . ,Key_item::brew_molecule)
@@ -526,47 +572,67 @@ ScoreContext = \translator {
 	  (break-align-symbol . Key_item)
 	  (visibility-lambda . ,begin-of-line-visible)
 	  (breakable . #t)
+	  (name . "key signature")
 	  )	
 	basicLocalKeyProperties = #`(
 		(molecule-callback . ,Local_key_item::brew_molecule)
 		(left-padding . 0.2)
 		(right-padding . 0.4)
 		(interfaces . (accidentals-interface))
+		(name .  "accidentals")
 	)
 	basicLineOfScoreProperties = #`(
 		(axes . (0 1))
 		(interfaces . (axis-group-interface))
+		(name .  "godzilla")
 	)
 	basicLyricExtenderProperties = #`(
+		(interfaces . (lyric-extender-interface))
 		(molecule-callback . ,Lyric_extender::brew_molecule)
+		(height . 0.8) ; stafflinethickness;
+		(right-trim-amount . 0.5)
+		(name . "extender line")
 	)
 	basicLyricTextProperties = #`(
+		(interfaces .  (lyric-syllable-interface text-item-interface))
 		(molecule-callback . ,Text_item::brew_molecule)
 		(self-alignment-X . 0)
 		(non-rhythmic . #t)
-		(interfaces .  (lyric-syllable-interface text-item-interface))
+		(word-space . 0.6)
+		(name . "lyric syllable") 
 	)
 	basicMarkProperties = #`(
+	  (interfaces . (mark-interface side-position-interface))
 	  (molecule-callback . ,Text_item::brew_molecule)	
 	  (breakable . #t)
-	  (interfaces . (mark-interface))
 	  (visibility-lambda . ,end-of-line-invisible)
+	  (padding . 4.0)
+	  (name . "rehearsal mark")
 	)
 	basicMultiMeasureRestProperties = #`(
 		(spacing-procedure . ,Multi_measure_rest::set_spacing_rods)		
 		(molecule-callback . ,Multi_measure_rest::brew_molecule)
 		(staff-position . 0)
+		(expand-limit . 10)
+		(padding . 2.0) ; staffspace
+		(minimum-width . 12.5) ; staffspace
+
+		(name . "multi-measure rest")
 	)
 	basicNoteColumnProperties = #`(
-		(axes 0 1)
 		(interfaces . (axis-group-interface note-column-interface))
+		(axes 0 1)
+		(name . "note column")
 	)
 	basicNoteHeadProperties = #`(
 		(interfaces . (note-head-interface rhythmic-head-interface))
+		(style . default)
 		(molecule-callback . ,Note_head::brew_molecule)
+		(name . "note head")
 	)
 	basicNoteNameProperties = #`(
 		(molecule-callback . ,Text_item::brew_molecule)
+		(name . "note name")
 	)
 	basicOctavateEightProperties  = #`(
 		(self-alignment-X . 0)
@@ -580,52 +646,56 @@ ScoreContext = \translator {
 		(axes 0)
 		(rank . -1)
 	)
-	basicPedalProperties = #`(
-		(molecule-callback . ,Text_item::brew_molecule)
-		(style . "italic")
-		(no-spacing-rods . #t)
-		(self-alignment-X . 0)
-				
-	)
 	basicTextProperties = #`( )
 	basicRestProperties = #`(
-		(interfaces . (rest-interface rhythmic-head-interface))	
+		(interfaces . (rest-interface rhythmic-head-interface))
+		(after-line-breaking-callback . ,Rest::after_line_breaking)
 		(molecule-callback . ,Rest::brew_molecule)
 		(minimum-beam-collision-distance . 1.5)
+		(name . "rest")
 	)
 	
 	basicRestCollisionProperties = #`(
-		(minimum-distance . 0.75)
 		(interfaces . (rest-collision-interface))
+		(minimum-distance . 0.75)
+		(name . "rest collision")		
 	)
-	basicScriptProperties	 = #`(
+	basicScriptProperties = #`(
 		(molecule-callback . ,Script::brew_molecule)
-		(interface . (script-interface))
+		(interfaces . (script-interface side-position-interface))
+		(name . "script")
 	)
 	basicScriptColumnProperties = #`(
 		(before-line-breaking-callback . ,Script_column::before_line_breaking)
+		(name . "script column")
 	)
 	basicSlurProperties = #`(
+		(interfaces . (slur-interface))
 		(molecule-callback . ,Slur::brew_molecule)
 		(thickness . 1.2)		
-		(spacing-procedure . ,Slur::set_spacing_rods)		e
+		(spacing-procedure . ,Slur::set_spacing_rods)		
 		(minimum-length . 1.5)
-		(after-line-breaking-callback . ,Slur::after_line_breaking) 
+		(after-line-breaking-callback . ,Slur::after_line_breaking)
+
+		(de-uglify-parameters . ( 1.5  0.8  -2.0))
+		(name . "slur")
 	)
 	basicSpacingSpannerProperties =#`(
 		(spacing-procedure . ,Spacing_spanner::set_springs)
 
 		;; assume that notes at least this long are present.
 		(maximum-duration-for-spacing . ,(make-moment 1 8))
+		(name . "spacing spanner")
 	)
 	basicSpanBarProperties = #`(
+		(interfaces . (bar-interface span-bar-interface))
 		(break-align-symbol . Staff_bar)
 		(barsize-procedure . ,Span_bar::get_bar_size) 
 		(molecule-callback . ,Bar::brew_molecule)
 		(visibility-lambda . ,begin-of-line-invisible)
 		(breakable . #t)
+		(glyph . "|")
 		(before-line-breaking-callback . ,Span_bar::before_line_breaking)
-
 		;; ugh duplication! 
 		
 		;;
@@ -635,14 +705,22 @@ ScoreContext = \translator {
 		(thin-kern . 3.0)
 		(hair-thickness . 1.6)
 		(thick-thickness . 6.0)
-		(interfaces . (bar-interface span-bar-interface))
+		(name . "cross staff bar-line")
+	)
+	basicStanzaNumberProperties = #`(
+		(breakable . #t)
+		(molecule-callback . ,Text_item::brew_molecule)		
+		(break-align-symbol . Clef_item)
+		(visibility-lambda . ,begin-of-line-visible)
+		(name . "stanza number")
+	)
+	basicStaffSymbolProperties = #`(
+		(interfaces . (staff-symbol-interface ))
+		(molecule-callback . ,Staff_symbol::brew_molecule)
+		(staff-space . 1.0)
+		(line-count . 5 )
+		(name . "staff symbol")
 	)
-	basicSustainPedalProperties = #`(
-		(no-spacing-rods . #t)
-		(molecule-callback . ,Sustain_pedal::brew_molecule)
-		(self-alignment-X . 0)
-		(interface . (sustain-pedal-interface))
-	)	
 	basicSystemStartDelimiterProperties = #`(
 		(molecule-callback . ,System_start_delimiter::brew_molecule)
 		(after-line-breaking-callback . ,System_start_delimiter::after_line_breaking)
@@ -654,43 +732,35 @@ ScoreContext = \translator {
 		(arch-width . 1.5)
 		(bracket-thick . 0.25)
 		(bracket-width . 2.0)
-	)
-	basicStemProperties = #`(
-		(before-line-breaking-callback . ,Stem::before_line_breaking)
-		(molecule-callback . ,Stem::brew_molecule)
-
-		; if stem is on middle line, choose this direction.
-		(default-neutral-direction . 1)
-		(interfaces . (stem-interface))
-	)
-	staffSymbolBasicProperties = #`(
-		(molecule-callback . ,Staff_symbol::brew_molecule)
-		(staff-space . 1.0)
-		(line-count . 5 )
-		(interfaces . (staff-symbol-interface ))
+		(name . "system start bracket")
 	)
 	basicTextScriptProperties = #`(
 		(molecule-callback . ,Text_item::brew_molecule)
 		(no-spacing-rods . #t)
-		(interfaces . (text-script-interface text-item-interface))
+		(interfaces . (text-script-interface text-item-interface side-position-interface))
+		(padding . 	3.0)
+		(name . "text script") 
 	)
 	basicTieProperties = #`(
+		(interfaces . (tie-interface))
 		(molecule-callback . ,Tie::brew_molecule)
 		(spacing-procedure . ,Tie::set_spacing_rods)
 		(thickness . 1.2)
 		(minimum-length  . 2.5)
-		(interfaces . (tie-interface))
+		(name . "tie")
 	)
 	basicTieColumnProperties = #`(
 		(after-line-breaking-callback . ,Tie_column::after_line_breaking)
 		(interfaces . (tie-column-interface))
+		(name . "tie column")		
 	)
 	basicTimeSignatureProperties = #`(
+		(interfaces . (time-signature-interface))
 		(molecule-callback . ,Time_signature::brew_molecule)
 		(break-align-symbol . Time_signature)
 		(visibility-lambda . ,all-visible)
 		(breakable . #t)
-		(interfaces . (time-signature-interface))
+		(name . "time signature")
 	)
 	basicTupletSpannerProperties = #`(
 		(number-gap . 2.0)   
@@ -700,55 +770,70 @@ ScoreContext = \translator {
 		(molecule-callback . ,Tuplet_spanner::brew_molecule)
 		(interfaces . (tuplet-spanner-interface))
 	)	
+	basicSostenutoPedalProperties = #`(
+		(molecule-callback . ,Text_item::brew_molecule)
+		(style . "italic")
+		(no-spacing-rods . #t)
+		(self-alignment-X . 0)
+		(name  . "sostenuto pedal")
+				
+	)
 	basicStemTremoloProperties = #`(
 	   	(molecule-callback . ,Stem_tremolo::brew_molecule)
 		(beam-width . 2.0) ; staff-space
 		(beam-thickness . 0.42) ; staff-space
+		(beam-space-function . ,default-beam-space-function)
+		(name . "stem tremolo")
 	)
+	basicStemProperties = #`(
+		(interfaces . (stem-interface))
+		(before-line-breaking-callback . ,Stem::before_line_breaking)
+		(molecule-callback . ,Stem::brew_molecule)
+		(thickness . 0.8)
 
+		; if stem is on middle line, choose this direction.
+		(default-neutral-direction . 1)
+		(name . "stem")
+	)
    	basicSeparationItemProperties = #`(
 		(interfaces . (separation-item-interface))
+		(name . "separation item")
 	)
 	basicSeparatingGroupSpannerProperties = #`(
 		(interfaces . (separation-spanner-interface))
 		(spacing-procedure . ,Separating_group_spanner::set_spacing_rods)
+		(name . "separation spanner")
 	)
-	basicInstrumentNameProperties = #`(
-		(breakable . #t)
-		(molecule-callback . ,Text_item::brew_molecule)		
-		(break-align-symbol . Instrument_name)
-		(visibility-lambda . ,begin-of-line-visible)
+	basicSustainPedalProperties = #`(
+		(interfaces . (sustain-pedal-interface  side-position-interface))
+		(no-spacing-rods . #t)
+		(molecule-callback . ,Sustain_pedal::brew_molecule)
+		(self-alignment-X . 0)
+		(name . "sustain pedal")		
+	)	
+	basicUnaChordaPdealProperties = #`(
+		(molecule-callback . ,Text_item::brew_molecule)
+		(style . "italic")
+		(no-spacing-rods . #t)
+		(self-alignment-X . 0)
+		(name . "una chorda pedal")
 	)
+
+	basicVoltaSpannerProperties = #`(
+		(molecule-callback . ,Volta_spanner::brew_molecule)
+		(interfaces . (volta-spanner-interface side-position-interface))
+		(direction . 1)
+		(padding . 5)
+		(thickness . 1.6)  ;  stafflinethickness
+		(height . 2.0) ; staffspace;
+		(minimum-space . 25)
+		(name . "volta brace")
+	)	
 	basicVerticalAxisGroupProperties = #`(
 		(axes 1)
 		(interfaces . (axis-group-interface))
+		(name . "Y-axis group")
 	)
-	basicVoltaSpannerProperties = #`(
-		(molecule-callback . ,Volta_spanner::brew_molecule)
-		(interfaces . (volta-spanner-interface))
-	)
-	basicStanzaNumberProperties = #`(
-		(breakable . #t)
-		(molecule-callback . ,Text_item::brew_molecule)		
-		(break-align-symbol . Clef_item)
-		(visibility-lambda . ,begin-of-line-visible)
-	)
-	basicMelismaProperties = #`(
-	        (interfaces . (melisma-interface))
-	)
-	
-	\accepts "Staff";
-	\accepts "StaffGroup";
-	\accepts "RhythmicStaff";	
-	\accepts "Lyrics";
-	\accepts "ChordNames";
-	\accepts "GrandStaff";
-	\accepts "ChoirStaff";
-	\accepts "PianoStaff";
-	\accepts "NoteNames";
-
-
-	markVisibilityFunction = #end-of-line-invisible
 };
 
 \translator { \ScoreContext }
@@ -756,10 +841,6 @@ ScoreContext = \translator {
 OrchestralScoreContext= \translator {
 	\ScoreContext
 
-	barScriptPadding = #2.0		% dimension \pt
-	markScriptPadding = #4.0
-
-	\consists "Mark_engraver";
 };
 
 \translator {
@@ -767,4 +848,5 @@ OrchestralScoreContext= \translator {
 	\name NoteNames;
 	\consistsend "Axis_group_engraver";
 	\consists "Note_name_engraver";
+	\consists "Separating_line_group_engraver";
 }