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

diff --git a/input/twinkle.ly b/input/twinkle.ly
index 2ec9b40ee0..8df196bb11 100644
--- a/input/twinkle.ly
+++ b/input/twinkle.ly
@@ -1,147 +1,148 @@
+\version "1.7.18"
 \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"
-
-composers	Traditional
-enteredby	HWN & JCN
-copyright	public domain
+filename = 	"twinkle.ly"
+title = 		"Twinkle Twinkle Little Star"
+composer = 	"Traditional"
+enteredby = 	"hwn and jcn"
+copyright = 	"public domain"
 }
+
 %{
-Tested Features: lyrics
+DESCRIPTION
 
+traditional song in various languages.
+  "Ah, vous dirais-je, maman" 
+  "Altijd is Kortjakje ziek"
+  "Twinkle twinkle little star"
 %}
-\version "0.1.6";
 
-melody = \melodic{
-	\clef violin;
-	\octave c';
+%{
+Tested Features: lyrics, interleaving lyrics and staves, repeats,
+	auto beaming, adding lyrics to notes, hyphens
+%}
+
+
+
+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 | % :|
+	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 {
-	\clef "bass";
-	\octave 'c;
-	\duration 4;
-	c4 c' | e' c' | f' c' | e' c' | 
-	d' b | c' a | f g | c2 | 
+accompany =  \notes \relative c {
+	\clef "bass"
+	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 "|.";
-	}
-
-tekst = \lyric{ 
- 	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
-	midden4 in_de week maar s'_zon- dags niet.2
+
+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.
 }
 
-%{
 
+%{
 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
+
+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.
 }
 
-texte = \lyric{ 
-	 
-	\textstyle "italic" ;
- 	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
-	
+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
 }
 
-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
+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!
 }
 
-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
-	
+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 = \lyric{
-	
-	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
-	
+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{
-	< 
-		\type Grandstaff <
-			< \global 
+	\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 >
-			< \global 
-			\accompany >
+			\context Staff=iii \repeat volta 2 <
+			  \accompany >
 		>
-		
-		% ugh
-		\lyric \type Lyrics < 
-			\global \tekst >
-		\lyric \type Lyrics <  \global
-			\texte >
-		\lyric \type Lyrics < \global
-			\texti \textii \textiii >
-		
+		\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 ;
-	}
+	\paper{ }
+	\midi{ \tempo 4 = 120 }
 }