* Documentation/user/tutorial.itely (Integrating text and music):

[lilypond.git] / ly / engraver-init.ly

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 05fe54c1869198d85157d718eb322ed814b068c4..1c9ddec64269e9af47368209defce70e0a4e2233 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.3.8"
 
 \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
@@ -34,6 +30,7 @@
        \consists "Clef_engraver"
        \consists "Key_engraver"
        \consists "Time_signature_engraver"
+       \consists "Ledger_line_engraver" 
        \consists "Staff_symbol_engraver"
        \consists "Collision_engraver"
        \consists "Rest_collision_engraver"
@@ -41,12 +38,13 @@
        \consists "Piano_pedal_engraver"
        \consists "Instrument_name_engraver"
        \consists "String_number_engraver"
-       \consistsend "Axis_group_engraver"
+       \consists "Axis_group_engraver"
 
        minimumVerticalExtent = #'(-6 . 6)
        extraVerticalExtent = ##f
        verticalExtent = ##f 
        localKeySignature = #'()
+       createSpacing = ##t
        
        % explicitly set instrument, so we don't get 
        % weird effects when doing instrument names for
@@ -62,7 +60,7 @@
 }
 
 \context {
-    \StaffContext
+    \Staff
     \type "Engraver_group_engraver"
     \name DrumStaff
     \alias Staff
@@ -89,7 +87,6 @@
     \name InnerChoirStaff
     \consists "System_start_delimiter_engraver"
     systemStartDelimiter = #'SystemStartBracket
-    localKeySignature = #'()
 
     \accepts "Staff"
     \accepts "DrumStaff"
@@ -101,7 +98,7 @@
 }
 
 \context {
-       \InnerChoirStaffContext
+       \InnerChoirStaff
        \name ChoirStaff
        
        \accepts "InnerChoirStaff"
@@ -141,8 +138,9 @@
     \consists "Bar_engraver"
     \consists "Time_signature_engraver"
     \consists "Staff_symbol_engraver"
+    \consists "Ledger_line_engraver" 
     \consists "Instrument_name_engraver"
-    \consistsend "Axis_group_engraver"
+    \consists "Axis_group_engraver"
     \accepts "Voice"
     \description  "
     A context like @code{Staff} but for printing rhythms.  Pitches are
@@ -213,7 +211,7 @@
 }
 
 \context {
-    \VoiceContext
+    \Voice
     \name DrumVoice
     \alias Voice
 
@@ -257,7 +255,7 @@
 }
 
 \context{
-    \GrandStaffContext
+    \GrandStaff
     \name "PianoStaff"
     \alias "GrandStaff"
 
@@ -279,7 +277,6 @@
 \context {
     \type "Engraver_group_engraver"
     \name InnerStaffGroup
-    localKeySignature = #'()
 
     \consists "Span_bar_engraver"
     \consists "Span_arpeggio_engraver"
@@ -298,7 +295,7 @@
 }
 
 \context {
-    \InnerStaffGroupContext
+    \InnerStaffGroup
     \name StaffGroup
     
     \description
@@ -316,7 +313,6 @@ connected vertically.  "
 
 \context{
     \type "Engraver_group_engraver"
-    \consistsend "Hara_kiri_engraver"
     minimumVerticalExtent = #'(-1.2 . 2.4)
     extraVerticalExtent = ##f
     verticalExtent = ##f
@@ -333,13 +329,14 @@ printing of a single line of lyrics.  "
     \consists "Vocal_name_engraver"
     \consists "Skip_event_swallow_translator"
     \consists "Font_size_engraver"
+    \consists "Hara_kiri_engraver"
     \override SeparationItem #'padding = #0.2
 }
 
 \context {
     \type "Engraver_group_engraver"
     \name NoteNames
-    \consistsend "Axis_group_engraver"
+    \consists "Axis_group_engraver"
 
     minimumVerticalExtent = ##f
     extraVerticalExtent = ##f
@@ -357,14 +354,17 @@ 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"       
     \consists "Separating_line_group_engraver"
     \consists "Chord_name_engraver"
     \consists "Skip_event_swallow_translator"
-    \consistsend "Hara_kiri_engraver"
+    \consists "Hara_kiri_engraver"
     
+    voltaOnThisStaff = ##f
     minimumVerticalExtent = #'(0 . 2.5)
     extraVerticalExtent = ##f
     \override SeparatingGroupSpanner #'padding = #0.8
@@ -373,9 +373,9 @@ printing of a single line of lyrics.  "
 
 
 RemoveEmptyStaffContext= \context {
-    \StaffContext
+    \Staff
     \remove "Axis_group_engraver"
-    \consistsend "Hara_kiri_engraver"
+    \consists "Hara_kiri_engraver"
     \override Beam #'auto-knee-gap = #'()
 }
 
@@ -390,7 +390,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
@@ -475,6 +474,8 @@ AncientRemoveEmptyStaffContext = \context {
     pedalSostenutoStrings = #'("Sost. Ped." "*Sost. Ped." "*") 
     pedalSostenutoStyle = #'mixed
 
+
+    harmonicAccidentals = ##t 
     fingeringOrientations = #'(up down)
     tupletNumberFormatFunction = #denominator-tuplet-formatter
     markFormatter = #format-mark-letters
@@ -531,17 +532,16 @@ AncientRemoveEmptyStaffContext = \context {
     metronomeMarkFormatter = #format-metronome-markup
     graceSettings = #`#(
        (Voice Stem direction 1)
-
        ;; TODO: should take from existing definition.
        ;; c&p from define-grobs.scm
        
        (Voice Stem lengths ,(map (lambda (x) (* 0.8 x)) '(3.5 3.5 3.5 4.5 5.0)))
-       (Voice Stem stem-shorten (0.4 0))
+       (Voice Stem stem-shorten (0.4 0.4))
        (Voice Stem  font-size -3)
        (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  
@@ -552,21 +552,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 = #'()
@@ -583,7 +576,7 @@ EasyNotation = \context {
        \consists "Skip_event_swallow_translator"
        \consists "Separating_line_group_engraver"
        
-       \consistsend "Hara_kiri_engraver"
+       \consists "Hara_kiri_engraver"
 }
 
 \context {
@@ -598,7 +591,7 @@ EasyNotation = \context {
     }
 
 \context {
-      \VoiceContext
+      \Voice
       \name "TabVoice"
       \consists "Tab_note_heads_engraver"
       \remove "Note_heads_engraver"
@@ -620,7 +613,7 @@ EasyNotation = \context {
 }
 
 \context {
-      \StaffContext
+      \Staff
       \alias "Staff"
       \name "TabStaff"
       \denies "Voice"
@@ -650,14 +643,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."
@@ -686,7 +679,7 @@ EasyNotation = \context {
 }
 
 \context {
-  \StaffContext
+  \Staff
   \name "VaticanaStaff"
   \alias "Staff"
   \denies "Voice"
@@ -725,7 +718,7 @@ EasyNotation = \context {
 }
 
 \context {
-  \VoiceContext
+  \Voice
   \name "GregorianTranscriptionVoice"
   \alias "Voice"
 
@@ -750,7 +743,7 @@ EasyNotation = \context {
   \override TextSpanner #'edge-text = #'("" . "")
 }
  \context {
-  \StaffContext
+  \Staff
   \name "GregorianTranscriptionStaff"
   \alias "Staff"
   \denies "Voice"