X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Ftwinkle.ly;h=8df196bb11f1cf247c9b0946e2b0a2aeff4e526c;hb=ea8506894a420e3393858a3ee284ab6b2f12c6d6;hp=a356386099a97ecee73492ba95dd9ac12fe40a12;hpb=389fcb53035ac07383abf597eb86c55e18d34891;p=lilypond.git

diff --git a/input/twinkle.ly b/input/twinkle.ly
index a356386099..8df196bb11 100644
--- a/input/twinkle.ly
+++ b/input/twinkle.ly
@@ -1,164 +1,148 @@
-%  "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 |
-	f f | e e | d d8.( e16 | )c2 | % :|
-
-	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 |
-
-	c c | g g | a a | g g |
-	f f | e e | d d8.( e16 | )c2 % :|
-	\bar ":|"
-	$
+\version "1.7.18"
+\header{
+filename = 	"twinkle.ly"
+title = 		"Twinkle Twinkle Little Star"
+composer = 	"Traditional"
+enteredby = 	"hwn and jcn"
+copyright = 	"public domain"
 }
 
-begeleiding = music {
-	$\clef \bass
-	\octave{`}
-	c 'c | 'e 'c | 'f 'c | 'e 'c | 
-	'd b | 'c a | f g | c2 | 
+%{
+DESCRIPTION
 
-	'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 |
+traditional song in various languages.
+  "Ah, vous dirais-je, maman" 
+  "Altijd is Kortjakje ziek"
+  "Twinkle twinkle little star"
+%}
 
-	c 'c | 'e 'c | 'f 'c | 'e 'c | 
-	'd b | 'c a | f g | c2 
-	\bar ":|"
-	$
-}
+%{
+Tested Features: lyrics, interleaving lyrics and staves, repeats,
+	auto beaming, adding lyrics to notes, hyphens
+%}
 
-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
-	@
-}
 
-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
-	@
-}
 
-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
-	@
-}
+melody =  \notes \relative c'' {
+	\clef violin
+	\property Staff.midiInstrument = "alto sax"
+	
+	c4 c | g' g | a a | g g |
+	f f | e e | d d8.( e16 | )c2 |
 
-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
-	@
-}
+	g'4 g | f f | e e | d d |
+	g g | f f | e( e8. f16 | e4 )d |
 
-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
-	@
+	c c | g' g | a a | g g |
+	f f | e e | d d8.( e16 | )c2 |
 }
 
-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
-	@
-}
+accompany =  \notes \relative c {
+	\clef "bass"
+	c4 c' | e c | f c | e c | 
+	d b | c a | f g | c,2 | 
 
-mstaf = staff {
-	melodic
-	music { melodie }
+	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 | c,2 
 }
 
-bass_staf = staff {
-	melodic	
-	music { begeleiding }
+
+tekst =  \lyrics{ 
+ 	Al -- tijd is Kort -- jak -- je ziek, " "
+	midden "in de" week maar "'s zon" -- dags  " " niet.
+	"'s Zon" -- dags gaat ze naar de kerk, " "
+	met een boek vol zil -- ver  " " werk. " "
+	Al -- tijd is Kort -- jak -- je ziek, " "
+	midden  "in de" week maar "'s zon" -- dags  " " niet.
 }
 
 
-dutch_staf = staff {
- 	lyric 
-	music { tekst }
-	music {he_gedraagje_tekst}
+%{
+Ja inderdaad. Dit is geen educatieve danwel muzikaal verantwoorde
+tekst. Mogen wij ook af en toe ergens op afgeven?
+%}
+
+hegedraagjetekst =  \lyrics{ 
+ 	Al -- tijd zuigt Bill Gates mijn piek, " "
+	"\TeX" is slecht -- ser dan mu --  " " ziek.
+	"'s Zon" -- dags gaat het door een raam, " "
+	Weet dat ik me er -- voor  " " schaam.
+ 	Al -- tijd zuigt Bill Gates mijn piek, " "
+	"\TeX" is slecht -- ser dan mu --  " " ziek.
 }
 
-french_staf = staff {
- 	lyric 
-	music { texte }
+texte =  \lyrics{ 
+	\property Lyrics . LyricText \set #'font-shape = #'italic
+ 	Ah! vous dir -- ai -- je ma -- man " "
+	Ce qui cau -- se mon tour --  " " ment
+	Pa -- pa veut que je rai -- son -- ne
+	Comm' u -- ne gran -- de per -- " " son -- ne
+	Moi je dis que les bon -- bons " "
+	Va -- lent mieux que la rai --  " " son
 }
 
-english_staf = staff {
- 	lyric 
-	music { text1 }
-	music { text2 }
-	music { text3 }
+texti =  \lyrics{
+
+	Twin -- kle, twin -- kle, lit -- tle star, " "
+	How I won -- der what you  " " are.
+	Up a -- bove the world so high, " "
+	Like a dia -- mond in the  " " sky. " "
+	Twin -- kle, twin -- kle, lit -- tle star, " "
+	How I won -- der what you  " " are!
 }
 
-tstaf = staff { 
-	lyric 
-	music { tekst }
-	music { texte }
+textii =  \lyrics{
+	When the bla -- zing sun is gone, " "
+	When he no -- thing shines up --  " " on,
+	Then you show your lit -- tle light, " "
+	Twin -- kle, twin -- kle, all the  " " night. " "
+	Twin -- kle, twin -- kle, lit -- tle star, " "
+	How I won -- der what you  " " are!
 }
 
+textiii =  \lyrics{
+	Then the tra -- veler in the dark " "
+	Thanks you for your ti -- ny  " " spark
+	He could not see which way to go,
+	If you did not twin -- kle  " " so. " "
+	Twin -- kle, twin -- kle, lit -- tle star, " "
+	How I won -- der what you  " " are!
+}
 
-score {
-	staff { mstaf }
-	staff { dutch_staf }
-	staff { french_staf }
-	staff { english_staf }
-	staff { bass_staf }
-	paper {
-		unitspace 2.5cm
-	}
-	commands {
-		meter {2 * 4}
-%		skip 24*2
-%		bar "||"
-	}
-	staff { midi_track music { melodie } }
-	staff { midi_track music { begeleiding } }
-	midi { 
-		tempo 4:120 
-	}
+\score{
+	\notes <
+	        \property Score.automaticMelismata = ##f
+		\context Staff=i s1
+		\context Lyrics=top s1
+		\context GrandStaff <
+			\context Staff=ii \repeat volta 2 <
+			  \time 2/4
+			  \melody >
+			\context Staff=iii \repeat volta 2 <
+			  \accompany >
+		>
+		\context Lyrics=bottom s1
+		% ugh, \repeat in \addlyrics dumps core
+		\addlyrics
+			\context Staff = i < \melody>
+			< 
+				%\repeat fold 2 {} 
+				%\alternative { 
+					\context Lyrics = top \tekst
+					\context Lyrics = top \texte
+				%}
+				%\repeat fold 3 {} 
+				%\alternative { 
+					\context Lyrics = bottom \texti
+					\context Lyrics = bottom \textii
+					\context Lyrics = bottom \textiii
+				%}
+			>
+	>
+	\paper{ }
+	\midi{ \tempo 4 = 120 }
 }