X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Ftwinkle.ly;h=f8f86913d07e569593750fd0e0e6bd0d5ce6ad70;hb=697e7037a1828b5b4418f587f50248b0966ea426;hp=8a1772795958cd5262b33b152319b2657129f764;hpb=0d2593e4ef1f3d1eb6994223f1de8f6c8fbcd066;p=lilypond.git

diff --git a/input/twinkle.ly b/input/twinkle.ly
index 8a17727959..f8f86913d0 100644
--- a/input/twinkle.ly
+++ b/input/twinkle.ly
@@ -1,129 +1,172 @@
-%{MudelaHeader
+\header{
+filename =	 "twinkle.ly";
+title =	 "Twinkle Twinkle Little Star";
 
- filename: twinkle.ly
- title: twinkle twinkle little star
- description: 
+composer =	 "Traditional";
+enteredby =	 "HWN & JCN";
+copyright =	 "public domain";
+}
+
+%{
+DESCRIPTION
+
+traditional song in various languages.
   "Ah, vous dirais-je, maman" 
   "Altijd is Kortjakje ziek"
   "Twinkle twinkle little star"
+%}
 
- composers: ?
- entered-by: HWN & JCN
- copyright: public domain
-
- Tested Features: lyrics
-EndMudelaHeader
+%{
+Tested Features: lyrics, interleaving lyrics and staffs
 %}
-\version "0.0.58";
 
-melody = \melodic{
-	\clef\violin;
-	\octave c';
-	c4 c | g g | a a | g g |
-	f f | e e | d d8.( e16 | )c2 | % :|
+\version "1.0.14";
 
-	g g | f f | e e | d d |
-	g g | f f | e( e8. f16 | e )d |
+melody = \notes \relative c'' {
+	\clef violin;
+	\property Staff.instrument = "alto sax"
+	
+	c4 c | g' g | a a | g g |
+	f f | e e | d d8.( e16 | )c2 |
 
-	c c | g g | a a | g g |
-	f f | e e | d d8.( e16 | )c2 % :|
-	\bar ":|";
+	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 |
 }
 
-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' 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 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;
+	\skip 2*24;
+	\bar ":|";
+}
 
-tekst = \lyric{ 
- 	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 = \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
+	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 = \lyric{ 
- 	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 = \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
+	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" ;
- 	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
+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- son- ne
+	Comm' u- ne gran- de per- son- ne
 	Moi je dis que les bon- bons2
-	Val- ent mieux que la rai- son2
-	
+	Va-4 lent mieux que la rai- son2
 }
 
-texti = \lyric{
-	
-	\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 = \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
+	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 = \lyric{
-	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 = \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
+	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 = \lyric{
-	
-	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
-	
+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 <
+	\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{
-	\staff{ melodicregs global melody }
-	\staff{ lyricregs global tekst hegedraagjetekst }
-	\staff{ lyricregs global texte }
-	\staff{ lyricregs global texti textii textiii }
-	\staff{ melodicregs global accompany }
+	< 
+		\$treble_staff
+		\$middle_lyrics
+		\$top_lyrics
+		\$grand_staff
+		\$bottom_lyrics
+	>
 	\paper{
-		\unitspace 2.5\cm
+		gourlay_maxmeasures = 14.0;
 	}
 	\midi{ 
-		\tempo 4:120 
+		\tempo 4 = 120 ;
 	}
 }