release: 1.0.6

[lilypond.git] / input / rhythm.ly

diff --git a/input/rhythm.ly b/input/rhythm.ly
index 8b6ecb031a5104e708c7d95890df04296d1de92e..109ead0cc38b2d6d762f6eeb1794b69904231fde 100644 (file)
--- a/input/rhythm.ly
+++ b/input/rhythm.ly
@@ -7,26 +7,26 @@ TestedFeatures =       "multiple meters, beaming, unsynced bars, userdefd engravers";
 
 
 
-\version "0.1.7";
+\version "1.0.1";
 
-ritme = \melodic{ %\octave ;
+ritme = \melodic\transpose c'' {
        \partial 8;
-       \octave c';
-       \meter  4/4;
+
+       \time  4/4;
        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;
+       \time   2/8;
        c4                              |
        c4      c4      c4      c4
-       \meter 4/4;
+       \time 4/4;
        c1 c1 c1
        
 %      [c16 c16 c16 c16 ]                      |
@@ -37,22 +37,24 @@ ritme = \melodic{ %\octave ;
        
 
 another = 
-       \melodic{ \meter 4/4; 
-               c1.  c1. c4 c4 c4 c4  \meter  4/4; c1 c1 c1
+       \melodic{ \time 4/4; 
+               c1.  c1. c4 c4 c4 c4  \time  4/4; c1 c1 c1
         }
 
 
 yanother = 
-       \melodic{ \meter 4/4; 
+       \melodic{ \time 4/4; 
                c1 c1 c1 c4 c4 c4 c4  c1 c1 c1
         }
 
 
 \score{
-       \type Staff_group <
+       \type StaffGroup <
                \ritme
                \another
-               \yanother
+               \type RhythmicStaff {
+                       \yanother
+               }
        >
        
        \paper{
@@ -62,8 +64,6 @@ yanother =
        \type Score_engraver;
 
        %\consists "Timing_engraver";
-       %\consists "Bar_column_engraver";
-       %\consists "Bar_number_engraver";
 
        \consists "Span_score_bar_engraver";
        \consists "Score_priority_engraver";
@@ -71,17 +71,34 @@ yanother =
        \consists "Vertical_align_engraver";
 
 
-       \accepts "Staff_group";
+       \accepts "StaffGroup";
        \accepts "Staff";
        \accepts "Lyrics";
-       \accepts "Grandstaff";
+       \accepts "GrandStaff";
 }
 
+RhythmicStaff = \translator
+{
+         \type "Engraver_group_engraver";
+       nolines  = "1";
+         \consists "Pitch_squash_engraver";
+
+       \consists "Bar_column_engraver";
+       \consists "Bar_number_engraver";
+         \consists "Bar_engraver";
+         \consists "Meter_engraver";
+         \consists "Staff_sym_engraver";
+         \consists "Line_group_engraver";
+         \consists "Timing_engraver";
+         \accepts "Voice";
+}
        %% add Timing_engraver to the staff
        Staff = \translator {
          \type "Engraver_group_engraver";
        defaultclef=    violin;
 
+       \consists "Bar_column_engraver";
+       \consists "Bar_number_engraver";
        \consists "Timing_engraver";
          \consists "Bar_engraver";
          \consists "Clef_engraver";