X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=input%2Ftwinkle.ly;h=82a509a8a1f3c8f1b5877c5829bb3c91499851e7;hb=44d3318feb59f81439c0edc5116ae61fe407c226;hp=17d3515621b7a165bc1e3ad8fbea8e92e87d0cd8;hpb=69b9cead5afe7164b9053d26eba582fec3825ef8;p=lilypond.git

diff --git a/input/twinkle.ly b/input/twinkle.ly
index 17d3515621..82a509a8a1 100644
--- a/input/twinkle.ly
+++ b/input/twinkle.ly
@@ -1,102 +1,93 @@
 \header{
-filename =	 "twinkle.ly";
-title =	 "Twinkle Twinkle Little Star";
-description =	 "traditional song in various languages."
+filename =	"twinkle.ly";
+title =		"Twinkle Twinkle Little Star";
+composer =	"Traditional";
+enteredby =	"hwn and jcn";
+copyright =	"public domain";
+}
+
+%{
+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";
-}
+  "Twinkle twinkle little star"
+%}
 
 %{
-Tested Features: lyrics, interleaving lyrics and staffs
+Tested Features: lyrics, interleaving lyrics and staffs, repeats
 %}
 
-\version "0.1.10";
+\version "1.0.14";
 
-melody = \melodic{
+melody = \notes \relative c'' {
 	\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 | % :|
+	c4 c | g' g | a a | g g |
+	f f | e e | d d8.( e16 | )c2 |
 
-	g4 g | f f | e e | d d |
+	g'4 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 ":|";
+	c c | g' g | a a | g g |
+	f f | e e | d d8.( e16 | )c2 |
 }
 
-accompany = \melodic {
+accompany = \notes \relative c {
 	\clef "bass";
-	\octave 'c;
-	c4 c' | e' c' | f' c' | e' c' | 
-	d' b | c' a | f g | c2 | 
+	c4 c' | e c | f c | e c | 
+	d b | c a | f g | c,2 | 
 
-	e'4 g | d g | c' g | b g | 
-	e' g | d' g | c' c'8.( d'16 | c'4 )b |
+	e'4 g, | d' g, | c g | b g | 
+	e' g, | d' g, | c c8.( d16 | c4 )b |
 
-	c c' | e' c' | f' c' | e' c' | 
-	d' b | c' a | f g | c2 
-	\bar ":|";
+	c, c' | e c | f c | e c | 
+	d b | c a | f g | c,2 
 }
 
-global = \melodic {
-		\meter 2 / 4;
-		\skip 2*24;
-%		\bar "|.";
-	}
+global = \notes {
+	\time 2/4;
+}
 
-tekst = \lyric{ 
+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.
-%
-	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
+	midden8 _8  in_de8 _8 week4 maar s,_zon- dags niet.2
 }
 
-%{
 
+%{
 Ja inderdaad. Dit is geen educatieve danwel muzikaal verantwoorde
 tekst. Mogen wij ook af en toe ergens op afgeven?
-
 %}
-hegedraagjetekst = \lyric{ 
+
+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 = \lyric{ 
-	 
-%	\textstyle "italic" ;
-	\textstyle "roman" ;
- 	Ah!4 vous dir- ai_- je ma man2
+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- sonne2
-	Comme4 un- e grand- e per- sonne2
-	Moi4 je dis que les bon- bons2
-	Val-4 ent mieux que la rai- son2
-	
+	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
 }
 
-texti = \lyric{
-	
-	\textstyle "roman";
+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
@@ -105,7 +96,7 @@ texti = \lyric{
 	How4 I won- der what you are!2
 }
 
-textii = \lyric{
+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
@@ -115,61 +106,27 @@ textii = \lyric{
 	
 }
 
-textiii = \lyric{
-	
+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
-	
 }
 
-$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
+	<
+		\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{
-		% use a lot of space, to avoid clashing syllables
-%		arithmetic_multiplier = 8.\pt;
 		gourlay_maxmeasures = 14.0;
 	}
 	\midi{