X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Ftest%2Fhara-kiri.ly;h=79131779561b1a70118dff12095903cbc1102a5e;hb=1cf3d59c1559fb9774c4c1c8cae155cfe54a927c;hp=4a63bd93674d402b970a7f31e22858a568673119;hpb=1e95a0be01466d1c98644f7705c8e07e41cc645c;p=lilypond.git

diff --git a/input/test/hara-kiri.ly b/input/test/hara-kiri.ly
index 4a63bd9367..7913177956 100644
--- a/input/test/hara-kiri.ly
+++ b/input/test/hara-kiri.ly
@@ -1,36 +1,85 @@
+
+toeter_i = \melodic\relative c {
+	\property Staff.instrument = "Toeters"
+	\property Staff.instr = "Ttr."
+	c'''4 c c c \break
+	d d d d \break
+	R1 \break
+	\voiceone
+	e4 e e e \break
+	\onevoice
+	f f f f \break
+	g g g g
+}
+
+toeter_ii = \melodic \relative c {
+	c''4 c c c \break
+	d d d d \break
+	R1 \break
+	\voicetwo
+	e4 e e e \break
+	\onevoice
+	f f f f \break
+	g g g g
+}
+
+toeters = \type StaffGroup = xtoeters <
+	\type Staff = toeters <
+	\toeter_i
+	\toeter_ii
+	>
+>
+ 
+zager = \type Staff = zager \melodic \relative c {
+	\clef bass;
+	\property Staff.instrument = "Zager"
+	\property Staff.instr = "Zag."
+	c4 d e f \break
+	\property Staff.instr = "Zag. \& Zog."
+	f e d c \break
+	c d e f \break
+	\property Staff.instr = "Zag."
+	\voiceone
+	f e d c \break
+	\onevoice
+	c d e f \break
+	f e d c
+}
+
+zoger = \type Staff = zoger \melodic \relative c {
+	\clef bass;
+	\property Staff.instrument = "Zoger"
+	\property Staff.instr = "Zog."
+	c4 d e f \break
+	\skip 1*2;
+%	\staffone
+	\translator Staff=zager
+	\voicetwo
+	c2 g2\break
+	\onevoice
+	a4 b c d \break
+	\skip 1*1;
+}
+
+default_paper = \include "score-paper.ly";
+
+zagers = \type GrandStaff <
+	\zager
+	\zoger
+>
+ 
 \score{
-	\melodic{
-		c4 c c c \break
-		d d d d \break
-		R1*4 \break
-		e4 e e e \break
-		f f f f \break
-	}
+	<
+		\type StaffGroup = toeters <
+			\toeters
+		>
+		\type StaffGroup = zagers <
+			\zagers
+		>
+	>
 	\paper{
 		linewidth = 40.0\mm;
-
-% this is broken: edit init/engraver.ly
-%
-%{
-Staff = \translator {
-	\type "Engraver_group_engraver";
-	defaultclef = violin;
-
-	\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 "Bar_column_engraver";
-	\consists "Bar_number_engraver";
-
-	\consists "Separating_line_group_engraver";
-%	\consists "Line_group_engraver";
-	\consists "Hara_kiri_line_group_engraver";
-%}
-	}
 	}
 }
+
+