X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Ftwinkle.ly;h=1f5c15fa1b59ecdc90c9efe36afa56e915f7dfdc;hb=fa3658f6c5e9fc51f6ae9286c65486975077c05c;hp=b1cd29253d5bccfa23e7716d1df21d1a5428429f;hpb=fc81e281674f9d3cb627ef84e8597f14ac78a046;p=lilypond.git

diff --git a/input/twinkle.ly b/input/twinkle.ly
index b1cd29253d..1f5c15fa1b 100644
--- a/input/twinkle.ly
+++ b/input/twinkle.ly
@@ -1,10 +1,9 @@
 \header{
-filename =	 "twinkle.ly";
-title =	 "Twinkle Twinkle Little Star";
-
-composer =	 "Traditional";
-enteredby =	 "HWN & JCN";
-copyright =	 "public domain";
+filename =	"twinkle.ly";
+title =		"Twinkle Twinkle Little Star";
+composer =	"Traditional";
+enteredby =	"hwn and jcn";
+copyright =	"public domain";
 }
 
 %{
@@ -17,10 +16,10 @@ traditional song in various languages.
 %}
 
 %{
-Tested Features: lyrics, interleaving lyrics and staffs
+Tested Features: lyrics, interleaving lyrics and staffs, repeats
 %}
 
-\version "1.0.10";
+\version "1.1.52";
 
 melody = \notes \relative c'' {
 	\clef violin;
@@ -50,22 +49,15 @@ accompany = \notes \relative c {
 
 global = \notes {
 	\time 2/4;
-	\skip 2*24;
-	\bar ":|";
 }
 
 tekst = \lyrics{ 
  	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.
-%
-% probably not necessary anymore
-%	midden8 _8 in_de8 _8 week4 maar s,_zon- dags niet.2
-	s,_Zon-4 dags gaat ze naar de kerk,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
+	mid-8 den  in de week4 maar "'s zon-" dags niet.2
 }
 
 
@@ -77,16 +69,16 @@ tekst. Mogen wij ook af en toe ergens op afgeven?
 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
+	"'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{ 
-	\property Lyrics . textstyle" =  "italic" 
-%	\property Lyrics . textstyle" =  "roman" 
- 	Ah!4 vous dir- ai_- je ma- man2
+	\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
@@ -95,7 +87,7 @@ texte = \lyrics{
 }
 
 texti = \lyrics{
-	\property "Lyrics"."textstyle" =  "roman"
+	\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
@@ -117,50 +109,22 @@ textii = \lyrics{
 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
+	He4 could not see which way8 to8 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
 }
 
-$top_lyrics = \type Lyrics = top <
-	\tekst
->
-
-$treble_staff = \type Staff = treble <
-	\global
-	\melody 
->
-
-$bass_staff = \type Staff = bass <
-	\global
-	\accompany
->
-
-$middle_lyrics = \type Lyrics = middle <
-	\texte
->
-
-$bottom_lyrics = \type Lyrics = bottom <
-%	\global
-	\texti
-	\textii
-	\textiii
->
-
-$grand_staff = \type GrandStaff <
-	\$treble_staff
-	\$middle_lyrics
-	\$bass_staff
->
-
 \score{
-	< 
-		\$treble_staff
-		\$middle_lyrics
-		\$top_lyrics
-		\$grand_staff
-		\$bottom_lyrics
+	<
+		\context Staff=i \repeat semi 2 < \global\melody >
+		\context Lyrics=top \context LyricVoice \repeat fold 2 {} \alternative { \tekst \texte }
+		\context GrandStaff <
+			\context Staff=ii \repeat semi 2 < \global\melody >
+			\context Staff=iii \repeat semi 2 < \global\accompany >
+		>
+		\context Lyrics =bottom \context LyricVoice \repeat fold 3 {} 
+			\alternative { \texti \textii \textiii }
 	>
 	\paper{
 		gourlay_maxmeasures = 14.0;