X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fengraver.ly;h=be2d0f15e70893228453dd3c21a56de5e0c52444;hb=0af6d4cb04fa3e4aa69a7aecb76034e4cb1ec49b;hp=b21a4d5f43cd45b0e87edcc777394120cda8c7d8;hpb=287611887cd612ac84dbf10c5fe4e1a44cc56596;p=lilypond.git

diff --git a/ly/engraver.ly b/ly/engraver.ly
index b21a4d5f43..be2d0f15e7 100644
--- a/ly/engraver.ly
+++ b/ly/engraver.ly
@@ -1,4 +1,6 @@
-%
+
+\version "1.3.96"
+	%
 % setup for Request->Element conversion. Guru-only
 %
 
@@ -10,12 +12,14 @@ StaffContext=\translator {
 	\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";
+%	\consists "Repeat_engraver";
+	\consists "Volta_engraver";
 	\consists "Separating_line_group_engraver";	
 
 
@@ -27,6 +31,7 @@ StaffContext=\translator {
 	\consists "Collision_engraver";
 	\consists "Rest_collision_engraver";
 	\consists "Local_key_engraver";
+	\consists "Piano_pedal_engraver";
 
 	\consistsend "Axis_group_engraver";
 
@@ -43,15 +48,14 @@ StaffContext=\translator {
 
 	  
 	\accepts "Voice";
-};
+}
 
-\translator{\StaffContext }
-\translator {
+ChoirStaffContext = \translator {
 	\type "Engraver_group_engraver";
 	\name ChoirStaff;
 	alignmentReference = \center;
 	\consists "System_start_delimiter_engraver";
-	systemStartDelimiterGlyph = #'bracket
+	SystemStartDelimiter \push #'glyph = #'bracket
 
 	\accepts "Staff";
 	\accepts "RhythmicStaff";
@@ -64,31 +68,29 @@ 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 ; % urg: pt
 
 	\consists "Pitch_squash_engraver";
 	\consists "Separating_line_group_engraver";	
 	\name RhythmicStaff;
+	Bar \push #'bar-size = #4
+	VoltaBracket \push #'minimum-space =  #15  % urg, in \pt
+	VoltaBracket \push #'padding =  #5  % urg, in \pt
+	StaffSymbol \push #'line-count = #1	
 
-	basicVoltaSpannerProperties \push #'minimum-space =  #15  % urg, in \pt
-	basicVoltaSpannerProperties \push #'padding =  #5  % urg, in \pt
-
-
-
-	\consists "Repeat_engraver";
+%	\consists "Repeat_engraver";
+	\consists "Volta_engraver";
 	\consists "Bar_engraver";
 	\consists "Time_signature_engraver";
 	\consists "Staff_symbol_engraver";
 	\consistsend "Axis_group_engraver";
 	\accepts "Voice";
-};
-\translator{\RhythmicStaffContext}
+}
+
 
 VoiceContext = \translator {
 	\type "Engraver_group_engraver";
@@ -97,8 +99,10 @@ VoiceContext = \translator {
 	Generic_property_list = #generic-voice-properties
 	
 	\consists "Output_property_engraver";	
+	\consists "Arpeggio_engraver";
 
 	\consists "Dynamic_engraver";   % must come before text_engraver.
+	\consists "Text_spanner_engraver";
 	\consists "Property_engraver";
 	
 	\consists "Breathing_sign_engraver";
@@ -107,7 +111,6 @@ VoiceContext = \translator {
 	\consists "Stem_engraver";
 	\consists "Beam_engraver";
 	\consists "Auto_beam_engraver";
-	\include "auto-beam-settings.ly";
 
 	\consists "Chord_tremolo_engraver";
 	\consists "Melisma_engraver";
@@ -115,15 +118,6 @@ VoiceContext = \translator {
 	\consists "A2_engraver";
 	\consists "Voice_devnull_engraver";
 
-
-	startSustain = #"Ped."
-	stopSustain = #"*"
-	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";
 	\consists "Rhythmic_column_engraver";
@@ -134,7 +128,7 @@ VoiceContext = \translator {
 	\consists "Skip_req_swallow_translator";
 	\accepts Thread; % bug if you leave out this!
 	\accepts Grace;
-};
+}
 
 GraceContext=\translator {
 	\type "Grace_engraver_group";
@@ -148,9 +142,8 @@ GraceContext=\translator {
 	\consists "Stem_engraver";
 	\consists "Beam_engraver";
 	\consists "Slur_engraver";
-	
+
 	\consists "Auto_beam_engraver";
-	\include "auto-beam-settings.ly";
 	\consists "Align_note_column_engraver";
 
 	\consists "Rhythmic_column_engraver";
@@ -160,24 +153,30 @@ GraceContext=\translator {
 
 	\consists "Property_engraver";
 
-	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
-
-	weAreGraceContext = ##t 
-	graceAccidentalSpace= 1.5 * \staffspace;
-};
-
-\translator{\GraceContext}
-\translator {\VoiceContext}
+	Stem \push  #'style = #"grace"
+	Stem \push  #'flag-style = #"grace"
+	Stem \push  #'stem-length = #6.0
+	Stem \push  #'direction = #1
+
+	NoteHead \push #'font-relative-size = #-1
+	Stem \push #'font-relative-size = #-1
+	Stem \push #'stem-shorten = #'(0)
+	Beam \push #'font-relative-size = #-1
+	TextScript \push #'font-relative-size = #-1
+	Slur \push #'font-relative-size = #-1
+	Accidentals \push #'font-relative-size = #-1
+	Beam \push #'thickness = #0.3
+	Beam \push #'space-function = #(lambda (x) 0.5)
+
+	Stem \push #'lengths = #(map (lambda (x) (* 0.8 x)) '(3.5 3.5 3.5 4.5 5.0))
+	Stem \push #'beamed-lengths =
+		#'(0.0 2.5 2.0 1.5)
+	Stem \push #'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;
@@ -187,46 +186,43 @@ ThreadContext = \translator{
 	Generic_property_list = #generic-thread-properties
 	\consists "Property_engraver";
 	\name Thread;
-};
+}
 
-\translator{\ThreadContext}
 GrandStaffContext=\translator{
 	\type "Engraver_group_engraver";
 	\name GrandStaff;
 	\consists "Span_bar_engraver";
+	\consists "Span_arpeggio_engraver";
 	\consists "System_start_delimiter_engraver";
-	systemStartDelimiterGlyph = #'brace
+	SystemStartDelimiter \push #'glyph = #'brace
 	
 	\consists "Property_engraver";	
 	Generic_property_list = #generic-grand-staff-properties
 	\accepts "Staff";
-};
-\translator{\GrandStaffContext}
+}
 
-PianoStaffContext = \translator{\GrandStaffContext
-	alignmentReference = \center;
+PianoStaffContext = \translator{
+	\GrandStaffContext
+	\name "PianoStaff";
 
 	\consists "Vertical_align_engraver";
-	minVerticalAlign = 3.0*\staffheight;
-	maxVerticalAlign = 3.0*\staffheight;
+
+	alignmentReference = \center;
+	VerticalAlignment \push #'threshold = #'(12 . 12) 
 
 %	\consistsend "Axis_group_engraver";
-	\name "PianoStaff";
-	
-};
-\translator{\PianoStaffContext}
+}
+
 StaffGroupContext= \translator {
 	\type "Engraver_group_engraver";
+	\name StaffGroup;
+
 	\consists "Span_bar_engraver";
+	\consists "Span_arpeggio_engraver";
 	\consists "Output_property_engraver";	
-	\consists "System_start_delimiter_engraver";
-       systemStartDelimiterGlyph = #'bracket
-       
-
+	SystemStartDelimiter \push #'glyph = #'bracket
 
-
-
-	\name StaffGroup;
+	\consists "System_start_delimiter_engraver";
 	\accepts "Staff";
 	\accepts "RhythmicStaff";
 	\accepts "GrandStaff";
@@ -234,9 +230,8 @@ StaffGroupContext= \translator {
 	
 	\accepts "Lyrics";
 	\accepts "ChordNames";
-};
+}
 
-\translator { \StaffGroupContext }
 
 % UGH! JUNKME
 LyricsVoiceContext= \translator{
@@ -252,8 +247,14 @@ LyricsVoiceContext= \translator{
 	\consists "Stanza_number_engraver";
 	phrasingPunctuation = #".,;:!?\""
 	
-};
-\translator{ \LyricsVoiceContext }
+}
+NoteNamesContext = \translator {
+	\type "Engraver_group_engraver";
+	\name NoteNames;
+	\consistsend "Axis_group_engraver";
+	\consists "Note_name_engraver";
+	\consists "Separating_line_group_engraver";
+}
 
 LyricsContext = \translator {
 	\type "Engraver_group_engraver";
@@ -264,31 +265,30 @@ LyricsContext = \translator {
 	\consistsend "Axis_group_engraver";
 	
 	\accepts "LyricVoice";
-};
-\translator { \LyricsContext }
+}
 
-ChordNameVoiceContext = \translator {
+ChordNamesVoiceContext = \translator {
 	\type "Engraver_group_engraver";
-	\name ChordNameVoice ;
+	\name ChordNamesVoice ;
 
 	\consists "Output_property_engraver";	
 	\consistsend "Axis_group_engraver";
 	\consists "Separating_line_group_engraver";
 	\consists "Chord_name_engraver";
-};
-\translator {\ChordNameVoiceContext}
-
-ChordNameContext = \translator {
+}
+ChordNamesContext = \translator {
 	\type "Engraver_group_engraver";
 	\name ChordNames;
 
 	Generic_property_list = #generic-chord-staff-properties
+
 	\consists "Property_engraver";	
 	\consists "Output_property_engraver";	
-	\accepts "ChordNameVoice";
+	\accepts "ChordNamesVoice";
+
+	VerticalAxisGroup \push #'invisible-staff = ##t
 	\consistsend "Axis_group_engraver";
-	};
-\translator { \ChordNameContext }
+	}
 
 
 ScoreWithNumbers = \translator {
@@ -296,20 +296,20 @@ ScoreWithNumbers = \translator {
 
 	% uncomment to bar numbers on a whole system.
 	\consists "Bar_number_engraver";
-};
+}
 
 StupidScore = \translator {
  	\type "Score_engraver";
 	\name Score;
 	\consists "Note_heads_engraver";
-};
+}
 
 
 
 BarNumberingStaffContext = \translator {
 	\StaffContext
 	\consists "Mark_engraver";
-};
+}
 
 HaraKiriStaffContext = \translator {
 	\StaffContext
@@ -317,7 +317,7 @@ HaraKiriStaffContext = \translator {
 	\consistsend "Hara_kiri_engraver";	  
 	\consists "Instrument_name_engraver";
 	\accepts "Voice";
-};
+}
 %{
   The HaraKiriStaffContexts doesn't override \name,
   so it is still named `Staff'.
@@ -328,24 +328,25 @@ HaraKiriStaffContext = \translator {
 OrchestralPartStaffContext = \translator {
 	\StaffContext
 	\consists "Mark_engraver";
-};
+}
 
 ScoreContext = \translator {
 	\type Score_engraver;
 	\name Score;
 	
 
+	\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";
@@ -363,41 +364,48 @@ ScoreContext = \translator {
 	aDueText = #"\\`a2"
 	soloADue = ##t
 	splitInterval = #'(0 . 1)
-
-	defaultClef = #"treble"
+	changeMoment = #`(,(make-moment 0 0) . ,(make-moment 1 512))
 
 	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))
-	)
+	%  name, glyph id, clef position 
 	% where is c0 in this clef?
 	clefPitches = #'(("clefs-G" . -4)
 	  ("clefs-C" . 0)
-	  ("clefs-F" . 4))
-	  	
+	  ("clefs-F" . 4)
+	  ("clefs-vaticana_do" . 0)
+	  ("clefs-vaticana_fa" . 4)
+	  ("clefs-medicaea_do" . 0)
+	  ("clefs-medicaea_fa" . 4)
+	  ("clefs-hufnagel_do" . 0)
+	  ("clefs-hufnagel_fa" . 4)
+	  ("clefs-hufnagel_do_fa" . 0)
+	  ("clefs-mensural1_c" . 0)
+	  ("clefs-mensural2_c" . 0)
+	  ("clefs-mensural3_c" . 0)
+	  ("clefs-mensural_f" . 0))
+
+	clefGlyph = #"clefs-G"
+	clefPosition = #-2
 
         automaticPhrasing = ##t;
 	alignmentReference = \down;
-	defaultClef = #"treble"
 	defaultBarType = #"|"
-	systemStartDelimiterGlyph = #'bar-line
+
+	explicitClefVisibility = #all-visible
+	explicitKeySignatureVisibility = #all-visible
+	
+	scriptDefinitions = #default-script-alist
+
+	startSustain = #"Ped."
+	stopSustain = #"*"
+	stopStartSustain = #"*Ped."
+	startUnaChorda = #"una chorda"
+	stopUnaChorda = #"tre chorde"
+	% should make separate lists for stopsustain and startsustain 
+
 
        %
        % what order to print accs.  We could compute this, 
@@ -417,429 +425,19 @@ ScoreContext = \translator {
 	  Key_item
 	  Staff_bar
 	  Time_signature
+	  Custos
 	  Stanza_number
 	)
-       
+
+
+	\elementdescriptions #all-element-descriptions
 	%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 	% TODO: uniform naming.;  
 	%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
-	%
-	% 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)
-		(breakable . #t)
-		(before-line-breaking-callback . ,Bar::before_line_breaking)
-		;;
-		;; Ross. page 151 lists other values, we opt for a leaner look
-		;; 
-		(kern . 3.0)
-		(thin-kern . 3.0)
-		(hair-thickness . 1.6)
-		(thick-thickness . 6.0)
-		(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)
-		(name . "beam")		
-	)
-
-	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)
-		(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)
-	   (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))
-		(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)
-		(name . "augmentation dot")		
-	)
-	basicDynamicTextProperties = #`(
-		(style . "dynamic")
-		(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))
-		(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)
-	  (interfaces . (key-item-interface))
-	  (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)
-		(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)
-		(word-space . 0.6)
-		(name . "lyric syllable") 
-	)
-	basicMarkProperties = #`(
-	  (interfaces . (mark-interface side-position-interface))
-	  (molecule-callback . ,Text_item::brew_molecule)	
-	  (breakable . #t)
-	  (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)
-		(name . "multi-measure rest")
-	)
-	basicNoteColumnProperties = #`(
-		(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)
-		(text . "8")
-		(visibility-lambda . ,begin-of-line-visible) 
-		(molecule-callback . ,Text_item::brew_molecule)
-		(style . "italic")
-	)
-	basicPaperColumnProperties = #`(
-		(interfaces . (paper-column-interface axis-group-interface))
-		(axes 0)
-		(rank . -1)
-	)
-	basicTextProperties = #`( )
-	basicRestProperties = #`(
-		(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 = #`(
-		(interfaces . (rest-collision-interface))
-		(minimum-distance . 0.75)
-		(name . "rest collision")		
-	)
-	basicScriptProperties = #`(
-		(molecule-callback . ,Script::brew_molecule)
-		(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)		
-		(minimum-length . 1.5)
-		(after-line-breaking-callback . ,Slur::after_line_breaking)
-		(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! 
-		
-		;;
-		;; Ross. page 151 lists other values, we opt for a leaner look
-		;; 
-		(kern . 3.0)
-		(thin-kern . 3.0)
-		(hair-thickness . 1.6)
-		(thick-thickness . 6.0)
-		(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")
-	)
-	basicSystemStartDelimiterProperties = #`(
-		(molecule-callback . ,System_start_delimiter::brew_molecule)
-		(after-line-breaking-callback . ,System_start_delimiter::after_line_breaking)
-		(collapse-height . 1.0)
-		(thickness . 1.6)
-		(arch-height . 1.5)
-		(arch-angle . 50.0)
-		(arch-thick . 0.25)
-		(arch-width . 1.5)
-		(bracket-thick . 0.25)
-		(bracket-width . 2.0)
-		(name . "system start bracket")
-	)
-	basicTextScriptProperties = #`(
-		(molecule-callback . ,Text_item::brew_molecule)
-		(no-spacing-rods . #t)
-		(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)
-		(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)
-		(name . "time signature")
-	)
-	basicTupletSpannerProperties = #`(
-		(number-gap . 2.0)   
-		(delta-y . 0)
-		(thick . 1.0)
-		(after-line-breaking-callback . ,Tuplet_spanner::after_line_breaking)
-		(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
-		(name . "stem tremolo")
-	)
-	basicStemProperties = #`(
-		(interfaces . (stem-interface))
-		(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)
-		(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")
-	)
-	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)
-		(minimum-space . 25)
-		(name . "volta brace")
-	)	
-	basicVerticalAxisGroupProperties = #`(
-		(axes 1)
-		(interfaces . (axis-group-interface))
-		(name . "Y-axis group")
-	)
-};
-
-\translator { \ScoreContext }
+}
 
 OrchestralScoreContext= \translator {
 	\ScoreContext
-
-};
-
-\translator {
-	\type "Engraver_group_engraver";
-	\name NoteNames;
-	\consistsend "Axis_group_engraver";
-	\consists "Note_name_engraver";
-	\consists "Separating_line_group_engraver";
 }
+