X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Ftest%2Fengraver-one-by-one.ly;h=1fdb502d1cf0e68098bf78b5375e03b4f6a386e6;hb=95890ee80ae464e70e425dbd39b9798ff27d2bb7;hp=9ae1ddc752764863ed70dc59db7e49e814975f6f;hpb=85e9ceb9c59b0a7cbae250f22d7ae7b7fbef29f1;p=lilypond.git

diff --git a/input/test/engraver-one-by-one.ly b/input/test/engraver-one-by-one.ly
index 9ae1ddc752..1fdb502d1c 100644
--- a/input/test/engraver-one-by-one.ly
+++ b/input/test/engraver-one-by-one.ly
@@ -1,10 +1,10 @@
 
-\version "2.3.2"
+\version "2.10.0"
 \header {
-    
-texidoc = "The notation problem, creating a certain symbol,
+  
+  texidoc = "The notation problem, creating a certain symbol,
     is handled by plugins. Each plugin is called Engraver. In this example,
-engravers is switched on one by one, in the following order:
+engravers are switched on one by one, in the following order:
 
 @itemize
 @item note heads,
@@ -21,10 +21,10 @@ Staff context.
 
 "
 
-    }
-\paper { raggedright = ##t }
+}
+\layout { ragged-right = ##t }
 
-\include "engraver-example.lyinc"
+\include "engraver-example.ily"
 
 
 %
@@ -32,51 +32,53 @@ Staff context.
 %
 
 MyStaff =\context {
-	\type "Engraver_group_engraver"
-	\name Staff
+  \type "Engraver_group"
+  \name Staff
 
-	\description "Handles clefs, bar lines, keys, accidentals.  It can contain
+  \description "Handles clefs, bar lines, keys, accidentals.  It can contain
 @code{Voice} contexts."
 
-	
-	\consists "Output_property_engraver"	
-	
-	\consists "Font_size_engraver"
+  
+  \consists "Output_property_engraver"	
+  
+  \consists "Font_size_engraver"
+
+  \consists "Volta_engraver"
+  \consists "Separating_line_group_engraver"	
+  \consists "Dot_column_engraver"
 
-	\consists "Volta_engraver"
-	\consists "Separating_line_group_engraver"	
-	\consists "Dot_column_engraver"
+  \consists "Ottava_spanner_engraver"
+  \consists "Rest_collision_engraver"
+  \consists "Piano_pedal_engraver"
+  \consists "Piano_pedal_align_engraver"
+  \consists "Instrument_name_engraver"
+  \consists "Grob_pq_engraver"
+  \consists "Forbid_line_break_engraver"
+  \consists "Axis_group_engraver"
 
-	\consists "Ottava_spanner_engraver"
-	\consists "Rest_collision_engraver"
-	\consists "Piano_pedal_engraver"
-	\consists "Instrument_name_engraver"
-	\consists "Grob_pq_engraver"
-	\consists "Forbid_line_break_engraver"
-	\consistsend "Axis_group_engraver"
-\consists "Pitch_squash_engraver"
+  \consists "Pitch_squash_engraver"
 
-	minimumVerticalExtent = #'(-6 . 6)
-	extraVerticalExtent = ##f
-	verticalExtent = ##f 
-	localKeySignature = #'()
+  \override VerticalAxisGroup #'minimum-Y-extent = #'(-6 . 6)
+  extraVerticalExtent = ##f
+  verticalExtent = ##f 
+  localKeySignature = #'()
 
-	% explicitly set instrument, so we don't get 
-	% weird effects when doing instrument names for
-	% piano staves
+				% explicitly set instrument, so we don't get 
+				% weird effects when doing instrument names for
+				% piano staves
 
-	instrument = #'()
-	instr = #'()
-	  
-	\accepts "Voice"
+  instrumentName = #'()
+  shortInstrumentName = #'()
+  
+  \accepts "Voice"
 }
 
 
 MyVoice = \context {
-	\type "Engraver_group_engraver"
-	\name Voice
+  \type "Engraver_group"
+  \name Voice
 
-\description "
+  \description "
     Corresponds to a voice on a staff.  This context handles the
     conversion of dynamic signs, stems, beams, super- and subscripts,
     slurs, ties, and rests.
@@ -84,54 +86,53 @@ MyVoice = \context {
     You have to instantiate this explicitly if you want to have
     multiple voices on the same staff."
 
-	localKeySignature = #'()
-	\consists "Font_size_engraver"
-	
-	% must come before all
-	\consists "Output_property_engraver"	
-	\consists "Arpeggio_engraver"
-	\consists "Multi_measure_rest_engraver"
-	\consists "Text_spanner_engraver"
-	\consists "Grob_pq_engraver"
-	\consists "Note_head_line_engraver"
-	\consists "Glissando_engraver"
-	\consists "Ligature_bracket_engraver"
-	\consists "Breathing_sign_engraver"
- 	% \consists "Rest_engraver"
-	\consists "Grace_beam_engraver"
-	\consists "New_fingering_engraver"
-	\consists "Chord_tremolo_engraver"
-	\consists "Percent_repeat_engraver"
-	\consists "Slash_repeat_engraver"
-	\consists "Melisma_translator"
+  localKeySignature = #'()
+  \consists "Font_size_engraver"
+  
+				% must come before all
+  \consists "Output_property_engraver"	
+  \consists "Arpeggio_engraver"
+  \consists "Multi_measure_rest_engraver"
+  \consists "Text_spanner_engraver"
+  \consists "Grob_pq_engraver"
+  \consists "Note_head_line_engraver"
+  \consists "Glissando_engraver"
+  \consists "Ligature_bracket_engraver"
+  \consists "Breathing_sign_engraver"
+				% \consists "Rest_engraver"
+  \consists "Grace_beam_engraver"
+  \consists "New_fingering_engraver"
+  \consists "Chord_tremolo_engraver"
+  \consists "Percent_repeat_engraver"
+  \consists "Slash_repeat_engraver"
 
 %{
- Must come before text_engraver, but after note_column engraver.
+  Must come before text_engraver, but after note_column engraver.
 
 %}
-	\consists "Text_engraver"
-	\consists "Dynamic_engraver"
-	\consists "Fingering_engraver"
+  \consists "Text_engraver"
+  \consists "Dynamic_engraver"
+  \consists "Fingering_engraver"
 
-	\consists "Script_column_engraver"
-	\consists "Rhythmic_column_engraver"
-	\consists "Cluster_spanner_engraver"
-	\consists "Tie_engraver"
-	\consists "Tie_engraver"
-	\consists "Tuplet_engraver"
-	\consists "Note_heads_engraver"
-	\consists "Rest_engraver"
+  \consists "Script_column_engraver"
+  \consists "Rhythmic_column_engraver"
+  \consists "Cluster_spanner_engraver"
+  \consists "Tie_engraver"
+  \consists "Tie_engraver"
+  \consists "Tuplet_engraver"
+  \consists "Note_heads_engraver"
+  \consists "Rest_engraver"
 
-	\consists "Skip_event_swallow_translator"
+  \consists "Skip_event_swallow_translator"
 }
 
 
 \score {
   \topVoice
-  \paper {
-      \context { \MyStaff }
-      \context { \MyVoice }
-      }
+  \layout {
+    \context { \MyStaff }
+    \context { \MyVoice }
+  }
 }
 
 
@@ -142,7 +143,7 @@ MyStaff = \context {
 
 \score {
   \topVoice
-  \paper {
+  \layout {
       \context { \MyStaff }
       \context { \MyVoice }
             }
@@ -150,84 +151,83 @@ MyStaff = \context {
 
 MyStaff = \context {
     \MyStaff
-      \consists "Clef_engraver"
+    \consists "Clef_engraver"
     \remove "Pitch_squash_engraver"
 }
 
 \score {
   \topVoice
-  \paper {
-      \context { \MyStaff }
-      \context { \MyVoice }
-            }
+  \layout {
+    \context { \MyStaff }
+    \context { \MyVoice }
+  }
 }
 
 MyVoice = \context {
-    \MyVoice
-    \consists "Stem_engraver"
-    }
+  \MyVoice
+  \consists "Stem_engraver"
+}
 
 \score {
   \topVoice
-  \paper {
-      \context { \MyStaff }
-      \context { \MyVoice }
-            }
+  \layout {
+    \context { \MyStaff }
+    \context { \MyVoice }
+  }
 }
 
 MyVoice = \context {
-    \MyVoice
-    	\consists "Beam_engraver"
+  \MyVoice
+  \consists "Beam_engraver"
 }
 
 \score {
   \topVoice
-  \paper {
-      \context { \MyStaff }
-      \context { \MyVoice }
-            }
+  \layout {
+    \context { \MyStaff }
+    \context { \MyVoice }
+  }
 }
 
 MyVoice= \context {
-    \MyVoice
-    \consists "Phrasing_slur_engraver"
-    \consists "Slur_engraver"
-    \consists "Script_engraver"
+  \MyVoice
+  \consists "Phrasing_slur_engraver"
+  \consists "Slur_engraver"
+  \consists "Script_engraver"
 }
 
 
 \score {
   \topVoice
-  \paper {
-      \context { \MyStaff }
-      \context { \MyVoice }
-            }
+  \layout {
+    \context { \MyStaff }
+    \context { \MyVoice }
+  }
 }
 
 MyStaff = \context {
-    \MyStaff
- \consists "Bar_engraver"
-    \consists "Time_signature_engraver"
-      
+  \MyStaff
+  \consists "Bar_engraver"
+  \consists "Time_signature_engraver"
 }
 
 \score {
   \topVoice
-  \paper {
-      \context { \MyStaff }
-      \context { \MyVoice }
-            }
+  \layout {
+    \context { \MyStaff }
+    \context { \MyVoice }
+  }
 }
 
 MyStaff = \context {
-    \MyStaff
-    \consists "Accidental_engraver"    
-    \consists "Key_engraver"
+  \MyStaff
+  \consists "Accidental_engraver"    
+  \consists "Key_engraver"
 }
 \score {
   \topVoice
-  \paper {
-      \context { \MyStaff }
-      \context { \MyVoice }
-            }
+  \layout {
+    \context { \MyStaff }
+    \context { \MyVoice }
+  }
 }