X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=input%2Frhythm.ly;h=109ead0cc38b2d6d762f6eeb1794b69904231fde;hb=f5d88b8b3b09ac724d7f2234b25fcbde4bc1b072;hp=a321ca34a74da7cf90e4a9a3a62f1c859e717f9d;hpb=6ce61146edb1c36647b514778c29cdc9beedab6a;p=lilypond.git

diff --git a/input/rhythm.ly b/input/rhythm.ly
index a321ca34a7..109ead0cc3 100644
--- a/input/rhythm.ly
+++ b/input/rhythm.ly
@@ -1,39 +1,32 @@
-%{MudelaHeader
-
- filename:rhythm.ly
- title:
- description: 
- composers:
- entered-by:HWN
- copyright:public domain
-
- Tested Features: multiple meters, beaming
-	unsynced bars
-EndMudelaHeader
-%}
+\header{
+filename =	 "rhythm.ly";
+enteredby =	 "HWN";
+copyright =	 "public domain";
+TestedFeatures =	 "multiple meters, beaming, unsynced bars, userdefd engravers";
+}
 
 
 
-\version "0.1.0";
+\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 ]			|
@@ -44,26 +37,80 @@ 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{
-	 < \multi 3;
+	\type StaffGroup <
 		\ritme
 		\another
-		\yanother
+		\type RhythmicStaff {
+			\yanother
+		}
 	>
 	
 	\paper{
-		unitspace =2.0\cm;
-		geometric =1.6;
+
+	%% remove Timing_engraver and Bar_number_engraver
+	Score = \translator {
+	\type Score_engraver;
+
+	%\consists "Timing_engraver";
+
+	\consists "Span_score_bar_engraver";
+	\consists "Score_priority_engraver";
+	\consists "Priority_horizontal_align_engraver";
+	\consists "Vertical_align_engraver";
+
+
+	\accepts "StaffGroup";
+	\accepts "Staff";
+	\accepts "Lyrics";
+	\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";
+	  \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";
+	}
 	}
 }