X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fengraver-init.ly;h=aeed2f96e55f6193f06d3d2915ca81e6611a5b55;hb=bd2e7580a591a24c2f9b11f556ea6c60005a6e0a;hp=691dcb2aaf29db0287f776c8479b3b5fd225f05c;hpb=8e25b11a9f3dbf7854e41d35e9dd6dd8a66986e4;p=lilypond.git

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 691dcb2aaf..aeed2f96e5 100644
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -1,4 +1,4 @@
-\version "1.3.146"
+\version "1.5.49"
 
 %
 % setup for Request->Element conversion. Guru-only
@@ -8,7 +8,6 @@ StaffContext=\translator {
 	\type "Engraver_group_engraver"
 	\name Staff 
 	\consists "Output_property_engraver"	
-	Generic_property_list = #generic-staff-properties
 	
 	\consists "Bar_engraver"
  % Bar_engraver must be first so default bars aren't overwritten
@@ -20,7 +19,7 @@ StaffContext=\translator {
 	\consists "Separating_line_group_engraver"	
 	SeparatingGroupSpanner \override #'spacing-procedure
 	  =  #Separating_group_spanner::set_spacing_rods_and_seqs
-
+	\consists "Dot_column_engraver"
 
 	\consists "Clef_engraver"
 	\consists "Key_engraver"
@@ -31,12 +30,15 @@ StaffContext=\translator {
 	\consists "Accidental_engraver"
 	\consists "Piano_pedal_engraver"
 	\consists "Instrument_name_engraver"
+	\consists "Grob_pq_engraver"
 
 	\consistsend "Axis_group_engraver"
-	
-	MinimumVerticalExtent = #'(-4 . 4)
+
+
+	MinimumVerticalExtent = #'(-6 . 6)
 	ExtraVerticalExtent = ##f
 	VerticalExtent = ##f 
+	localKeySignature = #'()
 
 	% explicitly set instrument, so we don't get 
 	% weird effects when doing instrument names for
@@ -55,7 +57,8 @@ StaffContainerContext = \translator {
 	MinimumVerticalExtent = ##f
 	ExtraVerticalExtent = ##f
 	VerticalExtent = ##f 
-	
+	localKeySignature = #'()
+
 	\accepts Staff
 	\name StaffContainer
 }
@@ -65,7 +68,8 @@ InnerChoirStaffContext = \translator {
 	\name InnerChoirStaff
 	alignmentReference = #0
 	\consists "System_start_delimiter_engraver"
-	SystemStartDelimiter = #'SystemStartBracket
+	systemStartDelimiter = #'SystemStartBracket
+	localKeySignature = #'()
 
 	\accepts "Staff"
 	\accepts "RhythmicStaff"
@@ -87,10 +91,11 @@ RhythmicStaffContext=\translator{
 	
 	\consists "Output_property_engraver"	
 
-	Generic_property_list = #generic-staff-properties
+
 	MinimumVerticalExtent = ##f
 	ExtraVerticalExtent = ##f
 	VerticalExtent = ##f 
+	localKeySignature = #'()
 
 	\consists "Pitch_squash_engraver"
 	\consists "Separating_line_group_engraver"	
@@ -116,7 +121,8 @@ VoiceContext = \translator {
 	\type "Engraver_group_engraver"
 	\name Voice
 
-	Generic_property_list = #generic-voice-properties
+
+	localKeySignature = #'()
 	\consists "Font_size_engraver"
 	
 	% must come before all
@@ -125,10 +131,10 @@ VoiceContext = \translator {
 	\consists "Arpeggio_engraver"
 	\consists "Multi_measure_rest_engraver"
 	\consists "Text_spanner_engraver"
-	
+
+	\consists "Ligature_bracket_engraver"
 	\consists "Breathing_sign_engraver"
  	% \consists "Rest_engraver"
-	\consists "Dot_column_engraver"
 	\consists "Stem_engraver"
 	\consists "Beam_engraver"
 	\consists "Auto_beam_engraver"
@@ -162,6 +168,7 @@ VoiceContext = \translator {
 ThreadContext = \translator{
 	\type Engraver_group_engraver
 	\name Thread
+	localKeySignature = #'()
 
 	\consists "Font_size_engraver"	
 	\consists "Thread_devnull_engraver"
@@ -169,29 +176,31 @@ ThreadContext = \translator{
 	\consists "Rest_engraver"
 	\consists "Note_head_line_engraver"
 	\consists "Output_property_engraver"	
-	Generic_property_list = #generic-thread-properties
+
 }
 
 GrandStaffContext=\translator{
 	\type "Engraver_group_engraver"
 	\name GrandStaff
+	localKeySignature = #'()
 	\consists "Span_bar_engraver"
 	\consists "Span_arpeggio_engraver"
 	\consists "System_start_delimiter_engraver"
-	SystemStartDelimiter = #'SystemStartBrace
-	Generic_property_list = #generic-grand-staff-properties
+	systemStartDelimiter = #'SystemStartBrace
+
 	\accepts "Staff"
 }
 
 PianoStaffContext = \translator{
 	\GrandStaffContext
 	\name "PianoStaff"
+	\alias "GrandStaff"
 
 	\consists "Vertical_align_engraver"
 	\consists "Instrument_name_engraver"
 	
-	instrument = ##f
-	instr = ##f
+	instrument = #'()
+	instr = #'()
 	
 	verticalAlignmentChildCallback = #Align_interface::fixed_distance_alignment_callback
 	VerticalAlignment \override #'forced-distance = #12
@@ -202,18 +211,19 @@ PianoStaffContext = \translator{
 InnerStaffGroupContext= \translator {
 	\type "Engraver_group_engraver"
 	\name InnerStaffGroup
+	localKeySignature = #'()
 
 	\consists "Span_bar_engraver"
 	\consists "Span_arpeggio_engraver"
 	\consists "Output_property_engraver"	
-	SystemStartDelimiter = #'SystemStartBracket
+	systemStartDelimiter = #'SystemStartBracket
 
 	\consists "System_start_delimiter_engraver"
 	\accepts "Staff"
 	\accepts "RhythmicStaff"
 	\accepts "GrandStaff"
 	\accepts "PianoStaff"
-	
+	\accepts "TabStaff"	
 	\accepts "Lyrics"
 	\accepts "ChordNames"
 }
@@ -240,6 +250,7 @@ LyricsVoiceContext= \translator{
 	\consists "Extender_engraver"
 	\consists "Hyphen_engraver"
 	\consists "Stanza_number_engraver"
+	\consists "Skip_req_swallow_translator"
 	phrasingPunctuation = #".,:!?\""
 	
 }
@@ -261,7 +272,7 @@ 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
+
 
 	\consistsend "Axis_group_engraver"
 	MinimumVerticalExtent = ##f
@@ -276,7 +287,7 @@ ChordNamesContext = \translator {
 	\type "Engraver_group_engraver"
 	\name ChordNames
 
-	Generic_property_list = #generic-chord-staff-properties
+
 
 
 	\consists "Output_property_engraver"	
@@ -287,8 +298,6 @@ ChordNamesContext = \translator {
 	MinimumVerticalExtent = ##f
 	ExtraVerticalExtent = ##f
 	VerticalExtent = ##f 
-
-	VerticalAxisGroup \override #'invisible-staff = ##t
 	}
 
 
@@ -322,8 +331,10 @@ HaraKiriStaffContext = \translator {
 ScoreContext = \translator {
 	\type Score_engraver
 	\name Score
+	localKeySignature = #'()
 	
 	\consists "Repeat_acknowledge_engraver"
+	\consists "Staff_collecting_engraver"
 	\consists "Timing_engraver"
 	\consists "Output_property_engraver"
 	\consists "System_start_delimiter_engraver"
@@ -336,6 +347,7 @@ ScoreContext = \translator {
 	\consists "Span_arpeggio_engraver"
 
 	\accepts "Staff"
+	\accepts "TabStaff"
 	\accepts "StaffContainer"
 	\accepts "StaffGroup"
 	\accepts "RhythmicStaff"	
@@ -353,9 +365,9 @@ ScoreContext = \translator {
 	soloADue = ##t
 	splitInterval = #'(0 . 1)
 	changeMoment = #`(,(make-moment 0 0) . ,(make-moment 1 512))
-	SystemStartDelimiter =#'SystemStartBar
-	barAuto = ##t
-	voltaVisibility = ##t
+	systemStartDelimiter =#'SystemStartBar
+
+
 	%  name, glyph id, clef position 
 	% where is c0 in this clef?
 
@@ -364,26 +376,29 @@ ScoreContext = \translator {
 	centralCPosition = #-6
 	
         automaticPhrasing = ##t
-	alignmentReference = #-1   % \down
+	
 	defaultBarType = #"|"
 
 	explicitClefVisibility = #all-visible
 	explicitKeySignatureVisibility = #all-visible
 	autoBeamSettings = #auto-beam-settings
-
+	autoBeaming = ##t
 	scriptDefinitions = #default-script-alist
 
 	verticalAlignmentChildCallback = #Align_interface::alignment_callback
 
 	pedalSustainStrings = #'("Ped." "*Ped." "*")
 	pedalUnaCordaStrings = #'("una corda" "" "tre corde")
-	pedalSostenutoStrings = #'()  % FIXME
+
+	%% these are in ordinary italic font, including the *, but they are unlikely to be used, 
+	%% as the default pedal-style for SostenutoPedal is 'mixed': i.e.  Sost. Ped_____________________ 
+	pedalSostenutoStrings = #'("Sost. Ped." "*Sost. Ped." "*") 
 
 	tupletNumberFormatFunction = #denominator-tuplet-formatter
 	
 	subdivideBeams = ##f
 	extraNatural = ##t
-	autoAccidentals = #'((measure-same-octave . 0))
+	autoAccidentals = #'(Staff (same-octave . 0))
 	autoCautionaries = #'()  
 
 
@@ -394,15 +409,15 @@ ScoreContext = \translator {
          (3  . 2) (0 . 2) (4 . 2) (2 . 2) (5 . 2) (2 . 2) (6 . 2)
         )
 	breakAlignOrder = #'(
-	  Instrument_name
-	  Left_edge_item
-	  Span_bar
-	  Breathing_sign
-	  Clef_item
-	  Key_item
-	  Staff_bar
-	  Time_signature
-	  Custos
+	  instrument-name
+	  left-edge
+	  span-bar
+	  breathing-sign
+	  clef
+	  key-signature
+	  staff-bar
+	  time-signature
+	  custos
 	)
 
 
@@ -415,7 +430,6 @@ OrchestralScoreContext= \translator {
 EasyNotation =  \translator {
 	\ScoreContext
 	NoteHead \override #'molecule-callback = #Note_head::brew_ez_molecule
-	easyPlay = ##t
 }
 
 % retain for compatibility reasons (FIXME: convert-ly)
@@ -429,3 +443,37 @@ FiguredBassContext = \translator {
 	\consists "Figured_bass_engraver"	
 	\consistsend "Axis_group_engraver"
 }
+
+TabVoiceContext =   \translator {
+      \VoiceContext
+      \name "TabVoice"
+      \denies "Thread"
+      \consists "Tab_note_heads_engraver"
+}
+
+TabStaffContext = \translator {
+      \StaffContext
+      \alias "Staff"
+      \name "TabStaff"
+      \denies "Voice"
+      \accepts "TabVoice"
+      
+      % 6 strings
+      StaffSymbol \override #'line-count  = #6
+      StaffSymbol \override #'staff-space = #1.5
+      
+      % One may change the strings tuning as following :
+      % The lenght of the list must be equal to the number of string
+      %TabNoteHead \override #'string-tunings = #'(10 10 10 10 10 10)
+      
+      % Special "TAB" clef
+      clefGlyph = #"clefs-tab"
+      clefPosition = #0
+      
+      % Don't draw stems over the tabature figures !
+      Stem \override #'avoid-note-head = ##t
+      
+      % No accidental in tablature !
+      Accidental  = \turnOff 
+}
+