X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Ftwinkle.ly;h=df4cf9a0cd4201564be1b26fdeb7a2e3f2f1306f;hb=04f01c7e890bd4f1b358378e5911fb7c117c3802;hp=14f6030cc70e7c45a804e3c64d1cfe0172a30004;hpb=dbed556ca13bc2371e83774890eaa06bc8b04def;p=lilypond.git

diff --git a/input/twinkle.ly b/input/twinkle.ly
index 14f6030cc7..df4cf9a0cd 100644
--- a/input/twinkle.ly
+++ b/input/twinkle.ly
@@ -1,12 +1,25 @@
-%  "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 |
+%{MudelaHeader
+
+ filename: twinkle.ly
+ title: twinkle twinkle little star
+ description: 
+  "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
+%}
+\version "0.0.57";
+
+melody = \melodic{
+	\clef\violin;
+	\octave c';
+	c4 c | g g | a a | g g |
 	f f | e e | d d8.( e16 | )c2 | % :|
 
 	g g | f f | e e | d d |
@@ -14,14 +27,14 @@ melodie = \music {
 
 	c c | g g | a a | g g |
 	f f | e e | d d8.( e16 | )c2 % :|
-	\bar ":|"
-	
+	\bar ":|";
 }
 
-begeleiding = \music {
-	\clef \bass
-	\octave{`}
-	c c' | e' c' | f' c' | e' c' | 
+accompany = \melodic {
+	\clef \bass;
+	\octave'c;
+	\duration 4;
+	c4 c' | e' c' | f' c' | e' c' | 
 	d' b | c' a | f g | c2 | 
 
 	e' g | d g | c' g | b g | 
@@ -29,15 +42,16 @@ begeleiding = \music {
 
 	c c' | e' c' | f' c' | e' c' | 
 	d' b | c' a | f g | c2 
-	\bar ":|"
-	
+	\bar ":|";
 }
-globalmusic=\music{
-		\meter {2 / 4}
-		\skip {24*2}
-%		\bar "||"
+
+global = \melodic {
+		\meter 2 / 4;
+		\skip 2*24;
+%		\bar "|.";
 	}
-tekst = \lyrics { 
+
+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
@@ -46,7 +60,7 @@ tekst = \lyrics {
 	midden in_de week maar s'_zon- dags niet.2
 }
 
-hegedraagjetekst = \lyrics { 
+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
@@ -55,9 +69,9 @@ hegedraagjetekst = \lyrics {
 	"\TeX" is slecht- ser dan mu- ziek.2
 }
 
-texte = \lyrics { 
+texte = \lyric{ 
 	 
-	\textstyle "italic" 
+	\textstyle "italic" ;
  	Ah! vous dir- ai_- je ma man2
 	Ce qui cau- se mon tour- ment2
 	Pa- pa veut que je rai- sonne2
@@ -67,9 +81,9 @@ texte = \lyrics {
 	
 }
 
-textI = \lyrics {
+texti = \lyric{
 	
-	\textstyle "roman"
+	\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
@@ -78,8 +92,7 @@ textI = \lyrics {
 	How I won- der what you are!2
 }
 
-textII = \lyrics {
-	\textstyle "roman"
+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
@@ -89,9 +102,8 @@ textII = \lyrics {
 	
 }
 
-textIII = \lyrics{
+textiii = \lyric{
 	
-	\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
@@ -101,59 +113,16 @@ textIII = \lyrics{
 	
 }
 
-mstaf = \staff {
-	\melodic
-	\music { melodie }
-	\music { globalmusic }
-}
-
-bassstaf = \staff {
-	\melodic	
-	\music { begeleiding }
-	\music { globalmusic }
-}
-
-
-dutchstaf = \staff {
- 	lyric 
-	\music { tekst }
-	\music {hegedraagjetekst}
-	\music { globalmusic }
-}
-
-frenchstaf = \staff {
- 	lyric 
-	\music { texte }
-	\music { globalmusic }
-}
-
-englishstaf = \staff {
- 	lyric 
-	\music { textI }
-	\music { textII }
-	\music { textIII }
-	\music { globalmusic }
-}
-
-tstaf = \staff { 
-	lyric 
-	\music { tekst }
-	\music { texte }
-	\music { globalmusic }
-}
-
-
-\score {
-	\staff { mstaf }
-	\staff { dutchstaf }
-	\staff { frenchstaf }
-	\staff { englishstaf }
-	\staff { bassstaf }
-	\paper {
+\score{
+	\staff{ melodicregs global melody }
+	\staff{ lyricregs global tekst hegedraagjetekst }
+	\staff{ lyricregs global texte }
+	\staff{ lyricregs global texti textii textiii }
+	\staff{ melodicregs global accompany }
+	\paper{
 		\unitspace 2.5\cm
 	}
-	
-	\midi { 
+	\midi{ 
 		\tempo 4:120 
 	}
 }