X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=ly%2Fengraver-init.ly;h=e46bf7f89c03d85bd2ad6f7fd4bf119c439d1618;hb=bf7b9929425e6a60cc24f1de18e5f1cdc9055703;hp=7798bc31458bc473bd4a5fae2ff7f27c386304c4;hpb=1bcba0490ef7ad8671d221844b16b95da22ce9a0;p=lilypond.git

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 7798bc3145..e46bf7f89c 100644
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -46,13 +46,14 @@
   verticalExtent = ##f 
   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"
@@ -93,7 +94,7 @@
   \consists "System_start_delimiter_engraver"
   systemStartDelimiter = #'SystemStartBracket
   vocalName = #'()
-  vocNam = #'()
+  shortVocalName = #'()
 
   \accepts "Staff"
   \accepts "DrumStaff"
@@ -191,6 +192,7 @@ contained staves are not connected vertically."
   \consists "Ligature_bracket_engraver"
   \consists "Breathing_sign_engraver"
   \consists "Note_heads_engraver"
+  \consists "Dots_engraver"
   \consists "Rest_engraver"
 
   %% switch on to make stem directions interpolate for the
@@ -201,20 +203,23 @@ contained staves are not connected vertically."
   \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 "Fall_engraver"
+  \consists "Bend_after_engraver"
 
   \consists "Script_engraver"
   \consists "Script_column_engraver"
+  \consists "Script_row_engraver"
   \consists "Rhythmic_column_engraver"
   \consists "Phrasing_slur_engraver"
   \consists "Cluster_spanner_engraver"
@@ -222,7 +227,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"
 }
 
@@ -277,6 +282,7 @@ contained staves are not connected vertically."
   systemStartDelimiter = #'SystemStartBrace
 
   \accepts "Staff"
+  \accepts "FiguredBass"
 }
 
 \context{
@@ -294,8 +300,8 @@ contained staves are not connected vertically."
   \consists "Vertical_align_engraver"
   \consists "Instrument_name_engraver"
   
-  instrument = #'()
-  instr = #'()
+  instrumentName = #'()
+  shortInstrumentName = #'()
 }
 
 \context {
@@ -347,7 +353,7 @@ staffs, with a bracket in front and spanning bar lines. "
   \description " Corresponds to a voice with lyrics.  Handles the
 printing of a single line of lyrics.  "
   
-  \name Lyrics 
+  \name "Lyrics" 
   \consists "Lyric_engraver"
   \consists "Extender_engraver"
   \consists "Hyphen_engraver"
@@ -526,6 +532,8 @@ AncientRemoveEmptyStaffContext = \context {
   harmonicAccidentals = ##t 
   fingeringOrientations = #'(up down)
   stringNumberOrientations = #'(up down)
+  stringFingerOrientations = #'(right)
+  
   markFormatter = #format-mark-letters
   rehearsalMark = #1
   subdivideBeams = ##f
@@ -720,10 +728,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"
@@ -760,6 +764,7 @@ AncientRemoveEmptyStaffContext = \context {
   \override Custos #'style = #'vaticana
   \override Custos #'neutral-position = #3
   \override Custos #'neutral-direction = #DOWN
+  \override Dots #'style = #'vaticana
 }
 
 \context {
@@ -862,6 +867,13 @@ AncientRemoveEmptyStaffContext = \context {
   \override Custos #'style = #'mensural
   \override Custos #'neutral-position = #3
   \override Custos #'neutral-direction = #DOWN
+
+  %% Accidentals are valid only once (same as
+  %% #(set-accidental-style 'forget))
+  extraNatural = ##f
+  autoAccidentals = #'(Staff (same-octave . -1))
+  autoCautionaries = #'()  
+  printKeyCancellation = ##f
 }