X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Ftwinkle.ly;h=17d3515621b7a165bc1e3ad8fbea8e92e87d0cd8;hb=69b9cead5afe7164b9053d26eba582fec3825ef8;hp=c54fdea03957736f4c38cfe8ddd20c8bf8cf17c4;hpb=01ddcb81463d7a68530971100469d3e2baf8c94b;p=lilypond.git

diff --git a/input/twinkle.ly b/input/twinkle.ly
index c54fdea039..17d3515621 100644
--- a/input/twinkle.ly
+++ b/input/twinkle.ly
@@ -1,162 +1,179 @@
-%  "Ah, vous dirais-je, maman" 
-%  "Altijd is Kortjakje ziek"
-%  "Twinkle twinkle little star"
-% 
-% Copyright: none
-
-melodie = \music {
-	\clef\violin
-	c c | g g | a a | g g |
+\header{
+filename =	 "twinkle.ly";
+title =	 "Twinkle Twinkle Little Star";
+description =	 "traditional song in various languages."
+  "Ah, vous dirais-je, maman" 
+  "Altijd is Kortjakje ziek"
+  "Twinkle twinkle little star";
+
+composer =	 "Traditional";
+enteredby =	 "HWN & JCN";
+copyright =	 "public domain";
+}
+
+%{
+Tested Features: lyrics, interleaving lyrics and staffs
+%}
+
+\version "0.1.10";
+
+melody = \melodic{
+	\clef violin;
+	\octave c';
+	\property Staff.instrument = "alto sax"
+	
+	c4 c | g g | a a | g g |
 	f f | e e | d d8.( e16 | )c2 | % :|
 
-	g g | f f | e e | d d |
-	g g | f f | e( e8. f16 | e )d |
+	g4 g | f f | e e | d d |
+	g g | f f | e( e8. f16 | e4 )d |
 
 	c c | g g | a a | g g |
 	f f | e e | d d8.( e16 | )c2 % :|
-	\bar ":|"
-	
+	\bar ":|";
 }
 
-begeleiding = \music {
-	\clef \bass
-	\octave{`}
-	c c' | e' c' | f' c' | e' c' | 
+accompany = \melodic {
+	\clef "bass";
+	\octave 'c;
+	c4 c' | e' c' | f' c' | e' c' | 
 	d' b | c' a | f g | c2 | 
 
-	e' g | d g | c' g | b g | 
-	e' g | d' g | c' c'8.( d'16 | c' )b |
+	e'4 g | d g | c' g | b g | 
+	e' g | d' g | c' c'8.( d'16 | c'4 )b |
 
 	c c' | e' c' | f' c' | e' c' | 
 	d' b | c' a | f g | c2 
-	\bar ":|"
-	
+	\bar ":|";
 }
-globalmusic=\music{
-		\meter {2 / 4}
-		\skip {24*2}
-		\bar "||"
+
+global = \melodic {
+		\meter 2 / 4;
+		\skip 2*24;
+%		\bar "|.";
 	}
-tekst = \lyrics { 
- 	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
+
+tekst = \lyric{ 
+ 	Al-4 tijd is Kort- jak- je ziek,2
+%	midden4 in_de week maar 's_zon- dags niet.2
+% ugly hack: insertion of  empty syllables creates columns on extra 
+% moments.  The net result is more spacing.
+%
+	midden8 _8 in_de8 _8 week4 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
 }
 
-hegedraagjetekst = \lyrics { 
- 	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
+%{
+
+Ja inderdaad. Dit is geen educatieve danwel muzikaal verantwoorde
+tekst. Mogen wij ook af en toe ergens op afgeven?
+
+%}
+hegedraagjetekst = \lyric{ 
+ 	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
 }
 
-texte = \lyrics { 
+texte = \lyric{ 
 	 
-	\textstyle "italic" 
- 	Ah! vous dir- ai_- je ma man2
-	Ce qui cau- se mon tour- ment2
-	Pa- pa veut que je rai- sonne2
-	Co\mme un- e grand- e per- sonne2
-	Moi je dis que les bon- bons2
-	Val- ent mieux que la rai- son2
+%	\textstyle "italic" ;
+	\textstyle "roman" ;
+ 	Ah!4 vous dir- ai_- je ma man2
+	Ce4 qui cau- se mon tour- ment2
+	Pa-4 pa veut que je rai- sonne2
+	Comme4 un- e grand- e per- sonne2
+	Moi4 je dis que les bon- bons2
+	Val-4 ent mieux que la rai- son2
 	
 }
 
-textI = \lyrics {
-	
-	\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
+texti = \lyric{
 	
+	\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
 }
 
-textII = \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
+textii = \lyric{
+	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
 	
 }
 
-textIII = \lyrics{
+textiii = \lyric{
 	
-	\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
+	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
 	
 }
 
-mstaf = \staff {
-	\melodic
-	\music { melodie }
-	\music { globalmusic }
-}
-
-bassstaf = \staff {
-	\melodic	
-	\music { begeleiding }
-	\music { globalmusic }
-}
-
-
-dutchstaf = \staff {
- 	lyric 
-	\music { tekst }
-	\music {hegedraagjetekst}
-	\music { globalmusic }
-}
-
-frenchstaf = \staff {
- 	lyric 
-	\music { texte }
-	\music { globalmusic }
-}
-
-englishstaf = \staff {
- 	lyric 
-	\music { textI }
-	\music { textII }
-	\music { textIII }
-	\music { globalmusic }
-}
-
-tstaf = \staff { 
-	lyric 
-	\music { tekst }
-	\music { texte }
-	\music { globalmusic }
-}
-
-
-\score {
-	\staff { mstaf }
-	\staff { dutchstaf }
-	\staff { frenchstaf }
-	\staff { englishstaf }
-	\staff { bassstaf }
-	\paper {
-		\unitspace 2.5\cm
+$top_lyrics = \type Lyrics = top <
+	\global 
+	\tekst
+>
+
+$treble_staff = \type Staff = treble <
+	\global
+	\melody 
+>
+
+$bass_staff = \type Staff = bass <
+	\global
+	\accompany
+>
+
+$middle_lyrics = \type Lyrics = middle <
+	\global
+	\texte
+>
+
+$bottom_lyrics = \type Lyrics = bottom <
+	\global
+	\texti
+	\textii
+	\textiii
+>
+
+$grand_staff = \type Staff_group <
+	\$treble_staff
+	\$middle_lyrics
+	\$bass_staff
+>
+
+\score{
+	< 
+		\$treble_staff
+		\$middle_lyrics
+		\$top_lyrics
+		\$grand_staff
+		\$bottom_lyrics
+	>
+	\paper{
+		% use a lot of space, to avoid clashing syllables
+%		arithmetic_multiplier = 8.\pt;
+		gourlay_maxmeasures = 14.0;
 	}
-	
-	\midi { 
-		\tempo 4:120 
+	\midi{ 
+		\tempo 4 = 120 ;
 	}
 }