Fix #362 (2)

[lilypond.git] / input / test / engraver-one-by-one.ly

diff --git a/input/test/engraver-one-by-one.ly b/input/test/engraver-one-by-one.ly
index 67ae79b46b2904afe98c0cb4074cc5a4d88aa219..1fdb502d1cf0e68098bf78b5375e03b4f6a386e6 100644 (file)
--- a/input/test/engraver-one-by-one.ly
+++ b/input/test/engraver-one-by-one.ly
@@ -1,8 +1,8 @@
 
 

-\version "2.7.14"
+\version "2.10.0"

 \header {
 \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 are switched on one by one, in the following order:
 
     is handled by plugins. Each plugin is called Engraver. In this example,
 engravers are switched on one by one, in the following order:
 


@@ -21,8 +21,8 @@ Staff context.
 
 "
 
 
 "
 

-    }
-\layout { raggedright = ##t }
+}
+\layout { ragged-right = ##t }

 
 \include "engraver-example.ily"
 
 
 \include "engraver-example.ily"
 


@@ -32,51 +32,53 @@ Staff context.
 %
 
 MyStaff =\context {
 %
 
 MyStaff =\context {

-       \type "Engraver_group"
-       \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."
 
 @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"
-       \consists "Axis_group_engraver"
-\consists "Pitch_squash_engraver"
+  \consists "Pitch_squash_engraver"

 
 

-       \override VerticalAxisGroup #'minimum-Y-extent = #'(-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 {
 }
 
 
 MyVoice = \context {

-       \type "Engraver_group"
-       \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.
     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."
 
     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
   \layout {
 }
 
 
 \score {
   \topVoice
   \layout {

-      \context { \MyStaff }
-      \context { \MyVoice }
-      }
+    \context { \MyStaff }
+    \context { \MyVoice }
+  }

 }
 
 
 }
 
 


@@ -150,84 +151,83 @@ MyStaff = \context {
 
 MyStaff = \context {
     \MyStaff
 
 MyStaff = \context {
     \MyStaff

-      \consists "Clef_engraver"
+    \consists "Clef_engraver"

     \remove "Pitch_squash_engraver"
 }
 
 \score {
   \topVoice
   \layout {
     \remove "Pitch_squash_engraver"
 }
 
 \score {
   \topVoice
   \layout {

-      \context { \MyStaff }
-      \context { \MyVoice }
-            }
+    \context { \MyStaff }
+    \context { \MyVoice }
+  }

 }
 
 MyVoice = \context {
 }
 
 MyVoice = \context {

-    \MyVoice
-    \consists "Stem_engraver"
-    }
+  \MyVoice
+  \consists "Stem_engraver"
+}

 
 \score {
   \topVoice
   \layout {
 
 \score {
   \topVoice
   \layout {

-      \context { \MyStaff }
-      \context { \MyVoice }
-            }
+    \context { \MyStaff }
+    \context { \MyVoice }
+  }

 }
 
 MyVoice = \context {
 }
 
 MyVoice = \context {

-    \MyVoice
-       \consists "Beam_engraver"
+  \MyVoice
+  \consists "Beam_engraver"

 }
 
 \score {
   \topVoice
   \layout {
 }
 
 \score {
   \topVoice
   \layout {

-      \context { \MyStaff }
-      \context { \MyVoice }
-            }
+    \context { \MyStaff }
+    \context { \MyVoice }
+  }

 }
 
 MyVoice= \context {
 }
 
 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
   \layout {
 }
 
 
 \score {
   \topVoice
   \layout {

-      \context { \MyStaff }
-      \context { \MyVoice }
-            }
+    \context { \MyStaff }
+    \context { \MyVoice }
+  }

 }
 
 MyStaff = \context {
 }
 
 MyStaff = \context {

-    \MyStaff
- \consists "Bar_engraver"
-    \consists "Time_signature_engraver"
-      
+  \MyStaff
+  \consists "Bar_engraver"
+  \consists "Time_signature_engraver"

 }
 
 \score {
   \topVoice
   \layout {
 }
 
 \score {
   \topVoice
   \layout {

-      \context { \MyStaff }
-      \context { \MyVoice }
-            }
+    \context { \MyStaff }
+    \context { \MyVoice }
+  }

 }
 
 MyStaff = \context {
 }
 
 MyStaff = \context {

-    \MyStaff
-    \consists "Accidental_engraver"    
-    \consists "Key_engraver"
+  \MyStaff
+  \consists "Accidental_engraver"    
+  \consists "Key_engraver"

 }
 \score {
   \topVoice
   \layout {
 }
 \score {
   \topVoice
   \layout {

-      \context { \MyStaff }
-      \context { \MyVoice }
-            }
+    \context { \MyStaff }
+    \context { \MyVoice }
+  }

 }
 }