X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fengraver-init.ly;h=a8b80d096a778051359a84bbb7e9c7b439e74e70;hb=88e4c845630eaa9462729321a13c060f718a1975;hp=9c37b26c5a5fb6a746e01b091c7632d59a98a83a;hpb=8bca46bcb5abd57557cb7c2b5665a4926289dd6b;p=lilypond.git

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 9c37b26c5a..a8b80d096a 100644
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.3.2"
 
 \context {
     \name Global
@@ -8,10 +8,6 @@
     \grobdescriptions #all-grob-descriptions    
 }
 
-%
-% setup for Request->Element conversion. Guru-only
-%
-
 \context {
 	\type "Engraver_group_engraver"
 	\name Staff
@@ -48,6 +44,7 @@
 	verticalExtent = ##f 
 	localKeySignature = #'()
 	createSpacing = ##t
+	
 	% explicitly set instrument, so we don't get 
 	% weird effects when doing instrument names for
 	% piano staves
@@ -62,7 +59,7 @@
 }
 
 \context {
-    \StaffContext
+    \Staff
     \type "Engraver_group_engraver"
     \name DrumStaff
     \alias Staff
@@ -89,7 +86,6 @@
     \name InnerChoirStaff
     \consists "System_start_delimiter_engraver"
     systemStartDelimiter = #'SystemStartBracket
-    localKeySignature = #'()
 
     \accepts "Staff"
     \accepts "DrumStaff"
@@ -101,7 +97,7 @@
 }
 
 \context {
-	\InnerChoirStaffContext
+	\InnerChoirStaff
 	\name ChoirStaff
 	
 	\accepts "InnerChoirStaff"
@@ -213,7 +209,7 @@
 }
 
 \context {
-    \VoiceContext
+    \Voice
     \name DrumVoice
     \alias Voice
 
@@ -257,7 +253,7 @@
 }
 
 \context{
-    \GrandStaffContext
+    \GrandStaff
     \name "PianoStaff"
     \alias "GrandStaff"
 
@@ -279,7 +275,6 @@
 \context {
     \type "Engraver_group_engraver"
     \name InnerStaffGroup
-    localKeySignature = #'()
 
     \consists "Span_bar_engraver"
     \consists "Span_arpeggio_engraver"
@@ -298,7 +293,7 @@
 }
 
 \context {
-    \InnerStaffGroupContext
+    \InnerStaffGroup
     \name StaffGroup
     
     \description
@@ -357,6 +352,8 @@ printing of a single line of lyrics.  "
     \type "Engraver_group_engraver"
     \name ChordNames
     \description "Typesets chord names."
+
+    \consists "Volta_engraver"
     
     \consists "Rest_swallow_translator" 
     \consists "Output_property_engraver"	
@@ -365,6 +362,7 @@ printing of a single line of lyrics.  "
     \consists "Skip_event_swallow_translator"
     \consistsend "Hara_kiri_engraver"
     
+    voltaOnThisStaff = ##f
     minimumVerticalExtent = #'(0 . 2.5)
     extraVerticalExtent = ##f
     \override SeparatingGroupSpanner #'padding = #0.8
@@ -373,7 +371,7 @@ printing of a single line of lyrics.  "
 
 
 RemoveEmptyStaffContext= \context {
-    \StaffContext
+    \Staff
     \remove "Axis_group_engraver"
     \consistsend "Hara_kiri_engraver"
     \override Beam #'auto-knee-gap = #'()
@@ -390,7 +388,6 @@ AncientRemoveEmptyStaffContext = \context {
 \context {
     \type Score_engraver
     \name Score
-    localKeySignature = #'()
 
     \description "This is the top level notation context.  No
     other context can contain a @code{Score} context.  This context
@@ -542,7 +539,7 @@ AncientRemoveEmptyStaffContext = \context {
 	(Voice NoteHead  font-size -3)
 	(Voice Dots  font-size -3)
 	(Voice Stem beamed-lengths  
-	 ,(map (lambda (x) (* 0.8 x)) '(3.26)))
+	 ,(map (lambda (x) (* 0.8 x)) '(3.3 3.3 4.0)))
 	(Voice Stem beamed-minimum-free-lengths  
 	 ,(map (lambda (x) (* 0.8 x)) '(2.5 2.0 1.5)))
 	(Voice Stem beamed-extreme-minimum-free-lengths  
@@ -553,21 +550,14 @@ AncientRemoveEmptyStaffContext = \context {
 	(Voice Beam space-function ,(lambda (beam mult)
 				     (* 0.8 (Beam::space_function
 					     beam mult))))
-	(Voice Beam position-callbacks (,Beam::least_squares
-					,Beam::check_concave
-					,Beam::slope_damping))
 	(Voice Accidental font-size -4)
 	(Voice Slur direction -1)
     )
     
 }
 
-OrchestralScoreContext = \context {
-	\ScoreContext
-}
-
-EasyNotation = \context {
-	\ScoreContext
+EasyNotation = \context {	% TODO: why \context override? 
+	\Score
 	\override NoteHead #'print-function = #Note_head::brew_ez_stencil
 	\override NoteHead #'Y-extent-callback = #'()
 	\override NoteHead #'X-extent-callback = #'()
@@ -599,7 +589,7 @@ EasyNotation = \context {
     }
 
 \context {
-      \VoiceContext
+      \Voice
       \name "TabVoice"
       \consists "Tab_note_heads_engraver"
       \remove "Note_heads_engraver"
@@ -621,7 +611,7 @@ EasyNotation = \context {
 }
 
 \context {
-      \StaffContext
+      \Staff
       \alias "Staff"
       \name "TabStaff"
       \denies "Voice"
@@ -651,14 +641,14 @@ EasyNotation = \context {
 % but this does not work (is this a bug or intended behaviour?):
 %
 % If I try to do so, I get "error: unknown escaped string:
-% `\VaticanaStaffContext'" in params-init.ly.  If I also move
+% `\VaticanaStaff'" in params-init.ly.  If I also move
 % "\context { \Vaticana*Context }" from params-init.ly to the end
 % of gregorian-init.ly, then I get "error: parse error, unexpected
-% TRANSLATOR: \context { \VaticanaStaffContext }" in
+% TRANSLATOR: \context { \VaticanaStaff }" in
 % gregorian-init.ly. --jr
 
 \context {
-  \VoiceContext
+  \Voice
   \name "VaticanaVoice"
   \alias "Voice"
   \description "Same as @code{Voice} context, except that it is accommodated for tyepsetting Gregorian Chant in the notational style of Editio Vaticana."
@@ -687,7 +677,7 @@ EasyNotation = \context {
 }
 
 \context {
-  \StaffContext
+  \Staff
   \name "VaticanaStaff"
   \alias "Staff"
   \denies "Voice"
@@ -726,7 +716,7 @@ EasyNotation = \context {
 }
 
 \context {
-  \VoiceContext
+  \Voice
   \name "GregorianTranscriptionVoice"
   \alias "Voice"
 
@@ -751,7 +741,7 @@ EasyNotation = \context {
   \override TextSpanner #'edge-text = #'("" . "")
 }
  \context {
-  \StaffContext
+  \Staff
   \name "GregorianTranscriptionStaff"
   \alias "Staff"
   \denies "Voice"