X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fengraver-init.ly;h=ada3cf8bf804eefaac74be2a4309e6e35f7f9b1d;hb=9e69cb84d6ee5b0a861cd97869b10e3bdf0c833c;hp=3c59a45e4507be2cf00752ceef9adb25ee3248d0;hpb=0923e4b23adf151bb673bb6727fd9e6a2458d029;p=lilypond.git

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 3c59a45e45..ada3cf8bf8 100644
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -1,18 +1,32 @@
-\version "2.7.6"
+\version "2.10.0"
 
 \context {
-  \name Global
+  \name "Global"
 
-  \accepts Score
+  \accepts "Score"
 
-  \defaultchild Score
+  \defaultchild "Score"
   \description "Hard coded entry point for LilyPond. Cannot be tuned."
   \grobdescriptions #all-grob-descriptions
 }
 
+
+\context {
+  \type "Engraver_group"
+  \name "FretBoards"
+
+  \consists "Output_property_engraver"	
+
+  \consists "Axis_group_engraver" 
+  \consists "Fretboard_engraver"
+  \consists "Separating_line_group_engraver"
+  \consists "Font_size_engraver"
+  \consists "Instrument_name_engraver"
+}
+
 \context {
   \type "Engraver_group"
-  \name Staff
+  \name "Staff"
   
   \consists "Output_property_engraver"	
   \consists "Bar_engraver"
@@ -24,7 +38,7 @@
   \consists "Separating_line_group_engraver"	
   \consists "Dot_column_engraver"
 
-  %% perhaps move to Voice context?
+ %% perhaps move to Voice context?
   \consists "Ottava_spanner_engraver"
   \consists "Clef_engraver"
   \consists "Key_engraver"
@@ -35,22 +49,25 @@
   \consists "Rest_collision_engraver"
   \consists "Accidental_engraver"
   \consists "Piano_pedal_engraver"
+  \consists "Piano_pedal_align_engraver"
   \consists "Instrument_name_engraver"
   \consists "String_number_engraver"
   \consists "Axis_group_engraver"
+  \consists "Figured_bass_engraver"
+  \consists "Figured_bass_position_engraver"
+  \consists "Script_row_engraver"
 
-  minimumVerticalExtent = #'(-4 . 4)
-  extraVerticalExtent = ##f
-  verticalExtent = ##f 
+  \override VerticalAxisGroup #'minimum-Y-extent = #'(-4 . 4)
   localKeySignature = #'()
   createSpacing = ##t
+  ignoreFiguredBassRest = ##t 
   
   %% explicitly set instrument, so we don't get 
   %% weird effects when doing instrument names for
   %% piano staves
 
-  instrument = #'()
-  instr = #'()
+  instrumentName = #'()
+  shortInstrumentName = #'()
   
   \defaultchild "Voice"
   \accepts "Voice"
@@ -64,8 +81,9 @@
 \context {
   \Staff
   \type "Engraver_group"
-  \name DrumStaff
-  \alias Staff
+  \name "DrumStaff"
+  \alias "Staff"
+  
   \remove "Accidental_engraver"
   \remove "Ottava_spanner_engraver"
   \remove "Key_engraver" 
@@ -74,9 +92,9 @@
   
   \description "Handles typesetting for percussion."
 
-  \denies Voice
-  \accepts DrumVoice
-  \defaultchild DrumVoice
+  \denies "Voice"
+  \accepts "DrumVoice"
+  \defaultchild "DrumVoice"
 
   clefGlyph = #"clefs.percussion"
   clefPosition = #0
@@ -86,9 +104,11 @@
 
 \context {
   \type "Engraver_group"
-  \name InnerChoirStaff
+  \name "InnerChoirStaff"
   \consists "System_start_delimiter_engraver"
   systemStartDelimiter = #'SystemStartBracket
+  vocalName = #'()
+  shortVocalName = #'()
 
   \accepts "Staff"
   \accepts "DrumStaff"
@@ -109,16 +129,13 @@
   \accepts "InnerStaffGroup"
   \description "Identical to @code{StaffGroup} except that the
 contained staves are not connected vertically."
-  
-}
 
+}
 
 \context{
   \type "Engraver_group"
   
-  minimumVerticalExtent = ##f
-  extraVerticalExtent = ##f
-  verticalExtent = ##f 
+  \override VerticalAxisGroup #'minimum-Y-extent = ##f
   localKeySignature = #'()
   createSpacing = ##t
 
@@ -139,12 +156,12 @@ contained staves are not connected vertically."
   \consists "Separating_line_group_engraver"	
   \consists "Dot_column_engraver"
   \consists "Bar_engraver"
-  \consists "Ledger_line_engraver" 
   \consists "Staff_symbol_engraver"
   \consists "Pitch_squash_engraver"
   \consists "Time_signature_engraver"
   \consists "Instrument_name_engraver"
   \consists "Axis_group_engraver"
+  \consists "Ledger_line_engraver" 
   
   \accepts "Voice"
   \accepts "CueVoice"
@@ -159,7 +176,7 @@ contained staves are not connected vertically."
 
 \context {
   \type "Engraver_group"
-  \name Voice
+  \name "Voice"
 
   \description "
     Corresponds to a voice on a staff.  This context handles the
@@ -181,28 +198,36 @@ contained staves are not connected vertically."
   \consists "Grob_pq_engraver"
   \consists "Forbid_line_break_engraver"
   \consists "Laissez_vibrer_engraver"
+  \consists "Repeat_tie_engraver"
   \consists "Note_head_line_engraver"
   \consists "Glissando_engraver"
   \consists "Ligature_bracket_engraver"
   \consists "Breathing_sign_engraver"
-  %% \consists "Rest_engraver"
   \consists "Note_heads_engraver"
+  \consists "Dots_engraver"
   \consists "Rest_engraver"
 
+  %% switch on to make stem directions interpolate for the
+  %% center line.
+  %  \consists "Melody_engraver"
+
   \consists "Stem_engraver"
   \consists "Beam_engraver"
   \consists "Grace_beam_engraver"
   \consists "Auto_beam_engraver"
+
+  %% must come before Script_column_engraver.
   \consists "New_fingering_engraver"
+  
   \consists "Chord_tremolo_engraver"
   \consists "Percent_repeat_engraver"
   \consists "Slash_repeat_engraver"
-  \consists "Melisma_translator"
   \consists "Part_combine_engraver"
 
   \consists "Text_engraver"
   \consists "Dynamic_engraver"
   \consists "Fingering_engraver"
+  \consists "Bend_after_engraver"
 
   \consists "Script_engraver"
   \consists "Script_column_engraver"
@@ -213,7 +238,7 @@ contained staves are not connected vertically."
   \consists "Tie_engraver"
   \consists "Tuplet_engraver"
   \consists "Grace_engraver"
-
+  \consists "Instrument_switch_engraver"
   \consists "Skip_event_swallow_translator"
 }
 
@@ -223,7 +248,8 @@ contained staves are not connected vertically."
   \name CueVoice
   \alias Voice
   fontSize = #-4
-  \override Stem #'lengths = #'(2.5 2.5 3.0 3.0)
+  \override Stem #'length-fraction = #(magstep -4)
+  \override Beam #'length-fraction = #(magstep -4)
 }
 
 \context {
@@ -267,6 +293,7 @@ contained staves are not connected vertically."
   systemStartDelimiter = #'SystemStartBrace
 
   \accepts "Staff"
+  \accepts "FiguredBass"
 }
 
 \context{
@@ -284,8 +311,8 @@ contained staves are not connected vertically."
   \consists "Vertical_align_engraver"
   \consists "Instrument_name_engraver"
   
-  instrument = #'()
-  instr = #'()
+  instrumentName = #'()
+  shortInstrumentName = #'()
 }
 
 \context {
@@ -318,7 +345,8 @@ contained staves are not connected vertically."
 
   "Groups staffs while adding a bracket on the left side, grouping
 the staves together.  The bar lines of the contained staves are
-connected vertically.  "
+connected vertically.  StaffGroup only consists of a collection of
+staffs, with a bracket in front and spanning bar lines. "
   
   \accepts "InnerChoirStaff"
   \accepts "ChoirStaff"
@@ -329,25 +357,32 @@ connected vertically.  "
 
 \context{
   \type "Engraver_group"
-  minimumVerticalExtent = #'(-1.2 . 2.4)
-  extraVerticalExtent = ##f
-  verticalExtent = ##f
+  \override VerticalAxisGroup #'minimum-Y-extent = #'(-1.2 . 2.4)
 
   \description " Corresponds to a voice with lyrics.  Handles the
 printing of a single line of lyrics.  "
   
-  \name Lyrics 
-  \consists "Separating_line_group_engraver"
+  \name "Lyrics" 
   \consists "Lyric_engraver"
   \consists "Extender_engraver"
   \consists "Hyphen_engraver"
   \consists "Stanza_number_engraver"
-  \consists "Vocal_name_engraver"
+  \consists "Instrument_name_engraver"
   \consists "Skip_event_swallow_translator"
   \consists "Font_size_engraver"
   \consists "Hara_kiri_engraver"
-  \override RemoveEmptyVerticalGroup #'remove-first = ##t
+  \override VerticalAxisGroup #'remove-first = ##t
+  \override VerticalAxisGroup #'remove-empty = ##t
   \override SeparationItem #'padding = #0.2
+  \override InstrumentName #'self-alignment-Y = ##f
+
+  %% sync with define-grobs.scm ;
+  \override InstrumentName #'font-size = #1.0
+
+  %% make sure that barlines aren't collapsed, when
+  %% Bar_engraver is there.
+  \override BarLine #'bar-size = #0.1 
+  
 }
 
 \context {
@@ -355,9 +390,7 @@ printing of a single line of lyrics.  "
   \name NoteNames
   \consists "Axis_group_engraver"
 
-  minimumVerticalExtent = ##f
-  extraVerticalExtent = ##f
-  verticalExtent = ##f 
+  \override VerticalAxisGroup #'minimum-Y-extent = ##f
 
   
   \consists "Rest_swallow_translator" 
@@ -382,11 +415,10 @@ printing of a single line of lyrics.  "
   \consists "Hara_kiri_engraver"
   
   voltaOnThisStaff = ##f
-  minimumVerticalExtent = #'(0 . 2.5)
-  extraVerticalExtent = ##f
+  \override VerticalAxisGroup #'minimum-Y-extent = #'(0 . 2.5)
   \override SeparatingGroupSpanner #'padding = #0.8
-  \override RemoveEmptyVerticalGroup #'remove-first = ##t
-  verticalExtent = ##f 
+  \override VerticalAxisGroup #'remove-first = ##t
+  \override VerticalAxisGroup #'remove-empty = ##t
 }
 
 
@@ -395,6 +427,7 @@ RemoveEmptyStaffContext= \context {
   \remove "Axis_group_engraver"
   \consists "Hara_kiri_engraver"
   \override Beam #'auto-knee-gap = #'()
+  \override VerticalAxisGroup #'remove-empty = ##t
 }
 
 AncientRemoveEmptyStaffContext = \context {
@@ -407,9 +440,9 @@ AncientRemoveEmptyStaffContext = \context {
 }
 
 \context {
-  \type Score_engraver
+  \type "Score_engraver"
   \name "Score"
-
+  
   \description "This is the top level notation context.  No
     other context can contain a @code{Score} context.  This context
     handles the administration of time signatures.  It also makes sure
@@ -437,12 +470,16 @@ AncientRemoveEmptyStaffContext = \context {
   \consists "Metronome_mark_engraver"	
   \consists "Break_align_engraver"
   \consists "Spacing_engraver"
+  \consists "Grace_spacing_engraver"
   \consists "Vertical_align_engraver"
   \consists "Stanza_number_align_engraver"
   \consists "Bar_number_engraver"
-  \consists "Span_arpeggio_engraver"
-
+  \consists "Tweak_engraver"
+  \consists "Parenthesis_engraver"
+  
   \defaultchild "Staff"
+
+  \accepts "FretBoards"
   \accepts "Staff"
   \accepts "RhythmicStaff"
   \accepts "TabStaff"
@@ -460,6 +497,8 @@ AncientRemoveEmptyStaffContext = \context {
   \accepts "NoteNames"
   \accepts "FiguredBass"
 
+
+  noteToFretFunction = #determine-frets
   soloText = #"Solo"
   soloIIText = #"Solo II"
   aDueText = #"a2"
@@ -498,13 +537,13 @@ AncientRemoveEmptyStaffContext = \context {
   pedalSostenutoStrings = #'("Sost. Ped." "*Sost. Ped." "*") 
   pedalSostenutoStyle = #'mixed
 
-
   harmonicAccidentals = ##t 
   fingeringOrientations = #'(up down)
   stringNumberOrientations = #'(up down)
-  tupletNumberFormatFunction = #denominator-tuplet-formatter
+  strokeFingerOrientations = #'(right)
+  
   markFormatter = #format-mark-letters
-  rehearsalMark = #1 
+  rehearsalMark = #1
   subdivideBeams = ##f
   allowBeamBreak = ##f
   extraNatural = ##t
@@ -546,10 +585,10 @@ AncientRemoveEmptyStaffContext = \context {
   tablatureFormat = #fret-number-tablature-format
 
 %%
-  newFiguredBassFormatter = #format-new-bass-figure
+  figuredBassFormatter = #format-bass-figure
   metronomeMarkFormatter = #format-metronome-markup
   graceSettings = #`(
-    (Voice Stem direction 1)
+    (Voice Stem direction ,UP)
     (Voice Stem font-size -3)
     (Voice NoteHead font-size -3)
     (Voice Dots font-size -3)
@@ -558,15 +597,25 @@ AncientRemoveEmptyStaffContext = \context {
     (Voice Beam thickness 0.384)
     (Voice Beam length-fraction 0.8)
     (Voice Accidental font-size -4)
-    (Voice Slur direction -1)
+    (Voice Slur direction ,DOWN)
   )
 
-  keepAliveInterfaces = #'(rhythmic-grob-interface lyric-interface percent-repeat-interface)
-  quotedEventTypes = #'(note-event rest-event time-scaled-music tie-event)
+  keepAliveInterfaces = #'(
+    rhythmic-grob-interface
+    lyric-interface
+    percent-repeat-interface)
+  quotedEventTypes = #'(
+    note-event
+    rest-event
+    tie-event
+    beam-event
+    tuplet-span-event)
   instrumentTransposition = #(ly:make-pitch 0 0 0)
 
   verticallySpacedContexts = #'(Staff)
 
+  hairpinToBarline = ##t 
+  
   timing = ##t
 }
 
@@ -577,14 +626,15 @@ AncientRemoveEmptyStaffContext = \context {
   \type "Engraver_group"
   \name "FiguredBass"
 
-%%  \consists "Figured_bass_engraver"
-  \consists "New_figured_bass_engraver"
+  \consists "Figured_bass_engraver"
   \consists "Note_swallow_translator"
   \consists "Skip_event_swallow_translator"
   \consists "Separating_line_group_engraver"
   \consists "Hara_kiri_engraver"
-  \override RemoveEmptyVerticalGroup #'remove-first = ##t
-  minimumVerticalExtent = #'(-0.5 . 2.5)
+
+  \override VerticalAxisGroup #'remove-empty = ##t
+  \override VerticalAxisGroup #'remove-first = ##t
+  \override VerticalAxisGroup #'minimum-Y-extent = #'(-0.5 . 2.5)
 }
 
 \context {
@@ -603,26 +653,25 @@ AncientRemoveEmptyStaffContext = \context {
   \name "TabVoice"
   \alias "Voice"
   \consists "Tab_note_heads_engraver"
+  \consists "Tab_harmonic_engraver"
+  
   \remove "Note_heads_engraver"
   \remove "Fingering_engraver"
   \remove "New_fingering_engraver"
 
   \description "Context for drawing notes in a Tab staff. "
 
-  %% Draws all stems/beams out of the staff (and not in the middle of the staff !)
-  %% This feature is now disabled because most of the tab does not use it.
-  %%\override Beam #'damping = #100000
-  %%\override Stem #'up-to-staff = ##t
-
   %% TabStaff increase the staff-space, which in turn
   %% increases beam thickness and spacing; beams are
   %% too big. We have to adjust the beam settings:
   \override Beam #'thickness = #0.32
-  \override Beam #'space-function =
-  #(lambda (beam mult) (* 0.62 (Beam::space_function beam mult)))
+  \override Beam #'length-fraction = #0.62
 
   %% No accidental in tablature !
   \remove Accidental_engraver
+
+  \override Glissando #'extra-dy = #0.75
+  \override Glissando #'gap = #0.2
 }
 
 \context {
@@ -630,7 +679,6 @@ AncientRemoveEmptyStaffContext = \context {
   \alias "Staff"
   \name "TabStaff"
   \denies "Voice"
-  \remove "Staff_symbol_engraver"
   \consists "Tab_staff_symbol_engraver"
   
   \description "Context for generating tablature. [DOCME]"
@@ -701,10 +749,6 @@ AncientRemoveEmptyStaffContext = \context {
   \override TextSpanner #'edge-text = #'("" . "")
 }
 
-%% FIXME: need something like
-%%  \remove "Bar_number_engraver" (which lives on score level)
-%% for vaticana and gregorian transcription staves
-
 \context {
   \Staff
   \name "VaticanaStaff"
@@ -741,9 +785,7 @@ AncientRemoveEmptyStaffContext = \context {
   \override Custos #'style = #'vaticana
   \override Custos #'neutral-position = #3
   \override Custos #'neutral-direction = #DOWN
-
-  %% Score.timing = ##f
-  %% Score.barAlways = ##t
+  \override Dots #'style = #'vaticana
 }
 
 \context {
@@ -847,13 +889,18 @@ AncientRemoveEmptyStaffContext = \context {
   \override Custos #'neutral-position = #3
   \override Custos #'neutral-direction = #DOWN
 
-  %% Score.timing = ##f
-  %% Score.barAlways = ##t
+  %% Accidentals are valid only once (same as
+  %% #(set-accidental-style 'forget))
+  extraNatural = ##f
+  autoAccidentals = #'(Staff (same-octave . -1))
+  autoCautionaries = #'()  
+  printKeyCancellation = ##f
 }
 
 
 RemoveEmptyRhythmicStaffContext= \context {
   \RhythmicStaff
   \remove "Axis_group_engraver"
+  \override VerticalAxisGroup #'remove-empty = ##t
   \consists "Hara_kiri_engraver"
 }