X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Ftwinkle.ly;h=82a509a8a1f3c8f1b5877c5829bb3c91499851e7;hb=44d3318feb59f81439c0edc5116ae61fe407c226;hp=8664faed17c2b3723e423091f3dcda2efd05450f;hpb=37a590823d3e84d379493e0e9f54952d67a67c05;p=lilypond.git

diff --git a/input/twinkle.ly b/input/twinkle.ly
index 8664faed17..82a509a8a1 100644
--- a/input/twinkle.ly
+++ b/input/twinkle.ly
@@ -1,161 +1,136 @@
-%  "Ah, vous dirais-je, maman" 
-%  "Altijd is Kortjakje ziek"
-%  "Twinkle twinkle little star"
-% 
+\header{
+filename =	"twinkle.ly";
+title =		"Twinkle Twinkle Little Star";
+composer =	"Traditional";
+enteredby =	"hwn and jcn";
+copyright =	"public domain";
+}
 
+%{
+DESCRIPTION
 
-melodie = music {
-	$
-	c c | g g | a a | g g |
-	f f | e e | d d8.( e16 | )c2 | % :|
+traditional song in various languages.
+  "Ah, vous dirais-je, maman" 
+  "Altijd is Kortjakje ziek"
+  "Twinkle twinkle little star"
+%}
 
-	g g | f f | e e | d d |
-%	g g | f f | e( [f0*32 e0*32 d0*32] e8. f16 | e )d | c c | 
-	g g | f f | e( e8. f16 | e )d |
+%{
+Tested Features: lyrics, interleaving lyrics and staffs, repeats
+%}
 
-	c c | g g | a a | g g |
-	f f | e e | d d8.( e16 | )c2 % :|
-	$
-}
+\version "1.0.14";
 
-begeleiding = music {
-	$
-	\octave{`}
-	c 'c | 'e 'c | 'f 'c | 'e 'c | 
-	'd b | 'c a | f g | c2 | 
+melody = \notes \relative c'' {
+	\clef violin;
+	\property Staff.instrument = "alto sax"
+	
+	c4 c | g' g | a a | g g |
+	f f | e e | d d8.( e16 | )c2 |
 
-	'e g | d g | 'c g | b g | 
-%	'e g | 'd g | 'c 'c8.( 'd16 | \voice{ 'c )b } \voice{ g2 } |
-	'e g | 'd g | 'c 'c8.( 'd16 | 'c )b |
+	g'4 g | f f | e e | d d |
+	g g | f f | e( e8. f16 | e4 )d |
 
-	c 'c | 'e 'c | 'f 'c | 'e 'c | 
-	'd b | 'c a | f g | c2 
-	$
+	c c | g' g | a a | g g |
+	f f | e e | d d8.( e16 | )c2 |
 }
 
-tekst = music { 
-	@ 
- 	Al- tijd is Kort- jak- je ziek,2
-	midden in_de week maar 's_zon- dags niet.2
-	's_Zon- dags gaat ze naar de kerk,2
-	met een boek vol zil- ver werk.2
-	Al- tijd is Kort- jak- je ziek,2
-	midden in_de week maar 's_zon- dags niet.2
-	@
-}
+accompany = \notes \relative c {
+	\clef "bass";
+	c4 c' | e c | f c | e c | 
+	d b | c a | f g | c,2 | 
 
-he_gedraagje_tekst = music { 
-	@ 
- 	Al- tijd zuigt Bill Gates mijn piek,2
-	"\TeX" is slecht- ser dan mu- ziek.2
-	's_Zon- dags gaat het door een raam,2
-	Weet dat ik me er- voor schaam.2
- 	Al- tijd zuigt Bill Gates mijn piek,2
-	"\TeX" is slecht- ser dan mu- ziek.2
-	@
-}
+	e'4 g, | d' g, | c g | b g | 
+	e' g, | d' g, | c c8.( d16 | c4 )b |
 
-texte = music { 
-	@ 
-	\textstyle "italic" 
- 	Ah! vous dir- ai_- je ma man2
-	Ce qui cau- se mon tour- ment2
-	Pa- pa veut que je rai- sonne2
-	Comme un- e grand- e per- sonne2
-	Moi je dis que les bon- bons2
-	Val- ent mieux que la rai- son2
-	@
+	c, c' | e c | f c | e c | 
+	d b | c a | f g | c,2 
 }
 
-text1 = music {
-	@
-	\textstyle "roman"
-	Twin- kle, twin- kle, lit- tle star,2
-	How I won- der what you are.2
-	Up a- bove the world so high,2
-	Like a dia- mond in the sky.2
-	Twin- kle, twin- kle, lit- tle star,2
-	How I won- der what you are!2
-	@
+global = \notes {
+	\time 2/4;
 }
 
-text2 = music {
-	@
-	\textstyle "roman"
-	When the bla- zing sun is gone,2
-	When he no- thing shines up- on,2
-	Then you show your lit- tle light,2
-	Twin- kle, twin- kle, all the night.2
-	Twin- kle, twin- kle, lit- tle star,2
-	How I won- der what you are!2
-	@
+tekst = \lyrics{ 
+ 	Al-4 tijd is Kort- jak- je ziek,2
+	midden4 in_de week maar s,_zon- dags niet.2
+	s,_Zon-4 dags gaat ze naar de kerk,2
+	met4 een boek vol zil- ver werk.2
+	Al-4 tijd is Kort- jak- je ziek,2
+	midden8 _8  in_de8 _8 week4 maar s,_zon- dags niet.2
 }
 
-text3 = music {
-	@
-	\textstyle "roman"
-	Then the tra- veler in the dark2
-	Thanks you for your ti- ny spark;2
-	He_could not see which way to go,2
-	If you did not twin- kle so.2
-	Twin- kle, twin- kle, lit- tle star,2
-	How I won- der what you are!2
-	@
-}
 
-mstaf = staff {
-%	melodic
-	complex
-	music { melodie }
-	commands { clef "violin" }
-}
+%{
+Ja inderdaad. Dit is geen educatieve danwel muzikaal verantwoorde
+tekst. Mogen wij ook af en toe ergens op afgeven?
+%}
 
-bass_staf = staff {
-%	melodic
-	complex
-	music { begeleiding }
-	commands { clef "bass" }
+hegedraagjetekst = \lyrics{ 
+ 	Al-4 tijd zuigt Bill Gates mijn piek,2
+	"\TeX"4 is slecht- ser dan mu- ziek.2
+	s,_Zon-4 dags gaat het door een raam,2
+	Weet4 dat ik me er- voor schaam.2
+ 	Al-4 tijd zuigt Bill Gates mijn piek,2
+	"\TeX"4 is slecht- ser dan mu- ziek.2
 }
 
-
-dutch_staf = staff {
- 	lyric 
-	music { tekst }
-	music {he_gedraagje_tekst}
+texte = \lyrics{ 
+	\property Lyrics . textstyle" =  "italic" 
+%	\property Lyrics . textstyle" =  "roman" 
+ 	Ah!4 vous dir- ai_- je ma- man2
+	Ce4 qui cau- se mon tour- ment2
+	Pa-4 pa veut que je rai- son- ne
+	Comm' u- ne gran- de per- son- ne
+	Moi je dis que les bon- bons2
+	Va-4 lent mieux que la rai- son2
 }
 
-french_staf = staff {
- 	lyric 
-	music { texte }
+texti = \lyrics{
+	\property "Lyrics"."textstyle" =  "roman"
+	Twin-4 kle, twin- kle, lit- tle star,2
+	How4 I won- der what you are.2
+	Up4 a- bove the world so high,2
+	Like4 a dia- mond in the sky.2
+	Twin-4 kle, twin- kle, lit- tle star,2
+	How4 I won- der what you are!2
 }
 
-english_staf = staff {
- 	lyric 
-	music { text1 }
-	music { text2 }
-	music { text3 }
+textii = \lyrics{
+	When4 the bla- zing sun is gone,2
+	When4 he no- thing shines up- on,2
+	Then4 you show your lit- tle light,2
+	Twin-4 kle, twin- kle, all the night.2
+	Twin-4 kle, twin- kle, lit- tle star,2
+	How4 I won- der what you are!2
+	
 }
 
-tstaf = staff { 
-	lyric 
-	music { tekst }
-	music { texte }
+textiii = \lyrics{
+	Then4 the tra- veler in the dark2
+	Thanks4 you for your ti- ny spark;2
+	He_could4 not see which way to go,2
+	If4 you did not twin- kle so.2
+	Twin-4 kle, twin- kle, lit- tle star,2
+	How4 I won- der what you are!2
 }
 
-
-score {
-	staff { mstaf }
-	staff { dutch_staf }
-	staff { french_staf }
-	staff { english_staf }
-	staff { bass_staf }
-	paper {
-		unitspace 2.5cm
+\score{
+	<
+		\type Staff=i \repeat 2 < \global\melody >
+		\type Lyrics=top \repeat 2 {} \alternative < \tekst \texte >
+		\type GrandStaff <
+			\type Staff=ii \repeat 2 < \global\melody >
+			\type Staff=iii \repeat 2 < \global\accompany >
+		>
+		\type Lyrics=bottom \repeat 3 {} 
+			\alternative < \texti \textii \textiii >
+	>
+	\paper{
+		gourlay_maxmeasures = 14.0;
 	}
-	commands {
-		meter 2 * 4
-		skip 24:0
-		bar "||"
+	\midi{ 
+		\tempo 4 = 120 ;
 	}
 }