update syntax in .ly files.

[lilypond.git] / input / rhythm.ly

diff --git a/input/rhythm.ly b/input/rhythm.ly
index 897770ad637aa3ff6e47ea99170f2d59857f323c..4ae370ef1ec349da729e8788caac3758b2f68949 100644 (file)
--- a/input/rhythm.ly
+++ b/input/rhythm.ly
@@ -1,32 +1,32 @@
+\version "1.7.6"
 \header{
-filename =      "rhythm.ly";
-enteredby =     "HWN";
-copyright =     "public domain";
-TestedFeatures =        "multiple meters, beaming, unsynced bars, userdefd engravers";
+filename =      "rhythm.ly"
+enteredby =     "HWN"
+copyright =     "public domain"
+TestedFeatures =        "multiple meters, beaming, unsynced bars, userdefd engravers"
 }
 
 
 
-\version "0.1.7";
 
-ritme = \melodic{ %\octave ;
-       \partial 8;
-       \octave c';
-       \meter  4/4;
+
+ritme =  \notes\transpose c c' {
+       \time  4/4
+       \partial 8
        c8                                      |
        
        [a8~  a8. a8 a16 a16 a16] c4.           |       % watch the beams!
         r32 r32 r16 r8 r4 r2                   |
-       \meter   5/16;
+       \time   5/16
 
        % divide measure in 5 equal parts. Usually it 2+3 or 3+2
-       \grouping  16*5 ;       
+               
        [c8 c16 c8 ]                            |       % watch THIS!
-        [5/4 c16 c16 c16 c16]1/1 |
-       \meter   2/8;
+        \times 5/4 { [ c16 c16 c16 c16] } |
+       \time   2/8
        c4                              |
        c4      c4      c4      c4
-       \meter 4/4;
+       \time 4/4
        c1 c1 c1
        
 %      [c16 c16 c16 c16 ]                      |
@@ -36,63 +36,41 @@ ritme = \melodic{ %\octave ;
         }
        
 
-another = 
-       \melodic{ \meter 4/4; 
-               c1.  c1. c4 c4 c4 c4  \meter  4/4; c1 c1 c1
+another =  
+       \notes \relative c'' { \time 6/4 
+               c1.  c1. \time 4/4c4 c4 c4 c4  c1 c1 c1
         }
 
 
-yanother = 
-       \melodic{ \meter 4/4; 
+yanother =  
+       \notes{ \time 4/4 
                c1 c1 c1 c4 c4 c4 c4  c1 c1 c1
         }
 
 
 \score{
-       \type Staff_group <
+       \context StaffGroup <
                \ritme
                \another
-               \yanother
+               \context RhythmicStaff {
+                       \yanother
+               }
        >
        
        \paper{
 
        %% remove Timing_engraver and Bar_number_engraver
-       Score = \translator {
-       \type Score_engraver;
-
-       \consists "Bar_align_engraver";
-       \consists "Clef_align_engraver";
-       \consists "Key_align_engraver";
-       \consists "Meter_align_engraver";
-       \consists "Score_horizontal_align_engraver";
-       \consists "Vertical_align_engraver";
-       \consists "Span_score_bar_engraver";
-
-
-       \accepts "Staff_group";
-       \accepts "Staff";
-       \accepts "Lyrics";
-       \accepts "Grandstaff";
-       }
-
-       %% add Timing_engraver to the staff
-       Staff = \translator {
-         \type "Engraver_group_engraver";
-       defaultclef=    violin;
-
-       \consists "Timing_engraver";
-         \consists "Bar_engraver";
-         \consists "Clef_engraver";
-         \consists "Key_engraver";
-         \consists "Meter_engraver";
-         \consists "Local_key_engraver";
-         \consists "Staff_sym_engraver";
-         \consists "Collision_engraver";
-         \consists "Rest_collision_engraver";
-
-         \consists "Line_group_engraver";
-         \accepts "Voice";
-       }
+ \translator {
+ \ScoreContext
+ \remove "Timing_engraver"
+  }
+  \translator {
+  \RhythmicStaffContext
+  \consists "Timing_engraver"
+  }
+  \translator{
+  \StaffContext
+  \consists "Timing_engraver"
+  }
        }
 }