Merge commit 'origin/dev/jneeman' into systems-per-page

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

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 0c5b7e6db5830e226615b86dcaab1e7e0c2e3997..e32d94498e73cfb0f8487bf731173a3c1a5aec79 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -15,10 +15,12 @@
   \type "Engraver_group"
   \name "FretBoards"
 
-  \consists "Output_property_engraver" 
 
-  \consists "Axis_group_engraver" 
   \consists "Fretboard_engraver"
+  \consists "Rest_swallow_translator" 
+  \consists "Output_property_engraver" 
+  \consists "Skip_event_swallow_translator"
+  \consists "Hara_kiri_engraver"
   \consists "Separating_line_group_engraver"
   \consists "Font_size_engraver"
   \consists "Instrument_name_engraver"
@@ -48,6 +50,7 @@
   \consists "Ledger_line_engraver" 
   \consists "Staff_symbol_engraver"
   \consists "Collision_engraver"
+  \consists "Grob_pq_engraver"
   \consists "Rest_collision_engraver"
   \consists "Accidental_engraver"
   \consists "Piano_pedal_engraver"
@@ -793,7 +796,7 @@ of Editio Vaticana."
   \Voice
   \name "GregorianTranscriptionVoice"
   \alias "Voice"
-  
+
   %% Removing ligature bracket engraver without replacing it by some
   %% other ligature engraver would cause a "Junking event: `LigatureEvent'"
   %% warning for every "\[" and "\]".  Therefore, we make the grob
@@ -847,7 +850,8 @@ accommodated for typesetting a piece in mensural style."
   \consists "Mensural_ligature_engraver"
 
   %% Set default head for notes outside of \[ \].
-  \override NoteHead #'style = #'petrucci
+  \override NoteHead #'style = #'mensural
+  \override Rest #'style = #'mensural
 
   %% There are no beams in mensural notation.
   autoBeaming = ##f
@@ -875,8 +879,8 @@ accommodated for typesetting a piece in mensural style."
   %% FIXME: unit on StaffSymbol's width should be \linewidth.
   %% \override StaffSymbol #'width = #60.0
 
-  %% Choose petrucci g clef on 2nd line as default.
-  clefGlyph = #"clefs.petrucci.g"
+  %% Choose mensural g clef on 2nd line as default.
+  clefGlyph = #"clefs.mensural.g"
   middleCClefPosition = #-6
   middleCPosition = #-6
   clefPosition = #-2
@@ -894,7 +898,7 @@ accommodated for typesetting a piece in mensural style."
   %% #(set-accidental-style 'forget))
   extraNatural = ##f
   autoAccidentals = #`(Staff ,(make-accidental-rule 'same-octave -1))
-  autoCautionaries = #'()  
+  autoCautionaries = #'()
   printKeyCancellation = ##f
 }