X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fkortjakje.ly;h=01512d288e94abf1f23bbd1e8fb7ffc144d41e26;hb=194ef0e7e19c7a7c0836b6bd3ed2788a56220d2f;hp=6cc689c326560da06b8246564a8f36853e5a6ff3;hpb=d26c30dd2a0d7de66ed4d3ce5a98fed475833e54;p=lilypond.git

diff --git a/input/kortjakje.ly b/input/kortjakje.ly
index 6cc689c326..01512d288e 100644
--- a/input/kortjakje.ly
+++ b/input/kortjakje.ly
@@ -1,67 +1,64 @@
-%{MudelaHeader
-
- filename: kortjakje.ly
- title: Ah,  vous dirais-je, maman (variations)
- description:  bare bones version. (written down from memory :-)
- composers:Mozart, KV 265
- entered-by: HWN
- copyright: none
+\header{
+filename =	 "kortjakje.ly";
+title =	 "Ah  vous dirais-je maman (variations)";
+description =	 "bare bones version. (written down from memory :-)";
+composer =	 "Mozart KV 265";
+enteredby =	 "HWN";
+copyright =	 "public domain";
+}
+%{
+Tested Features: example file with comments
 
- Tested Features: example file with comments
-EndMudelaHeader
 %}
-\version "0.0.57";
+\version "1.0.16";
 
 
 % the % is a comment.
 
 
 % declare melody (which will be in *one* staff ) for the lead voice
-melodie = \melodic {
+melodie = \notes \relative c' {
 	 			% switch Lilypond in note-mode
-	\clef\violin;
-	\meter 2/4 ;
-	\octave  c'; 		% set the default octave
-	% the default note duratino is 4
+	\clef"violin";
+	\time 2/4 ;
 	%%% theme
-	c c |			% the '|' checks if there is a new measure here.
-	g g|
+	c4 c |			% the | checks if there is a new measure here.
+	g' g|
 	a a|
 
 	g2|	% g2 means a "g-1" pitched half-note 
-	f f|	e e|	d d|  c2
-	g g|	f f|	e e| 	d d|	g g|	f f|	e e| 	d d|
+	f4 f|	e e|	d d|  c2
+	g'4 g|	f f|	e e| 	d d|	g g|	f f|	e e| 	d d|
  	%%% var 1
-	  c r8 c8		% r8 means an 8th rest.
+	  c4 r8 c		% r8 means an 8th rest.
 		  (|		% start a slur
 				% NOTE: the slurstart should be directly after the note
 			) 	% end a slur.
-			  g r8 g8 () 	 a r8 a8 () 	 g r4 
-	  f r8 f8 () 	 e4 r8 e8 (|)  d4 r8 d8 () 	 c4 r4 
+			  g'4 r8 g8 () 	 a4 r8 a8 () 	 g4 r4 
+	  f4 r8 f8 () 	 e4 r8 e8 (|)  d4 r8 d8 () 	 c4 r4 
 }
 
 				% more of this.
-begeleiding = \melodic{ 
+begeleiding = \notes \relative c { 
 	\clef "bass";
-	\meter 2/4 ;
-	\octave  c'; 		% default octave: 1 below the first octave.
+	\time 2/4 ;
 
 	%%% theme
-	'c			% ' before note means one octave lower.
-				% Similarly: ' after means one higher.
-	   c	e c	f c	e c	d 'b	c 'a	'f 'g	'c2
-	\octave  'c ;
-	e 'g	d 'g	c 'g	'b 'g	e 'g	d 'g	c 'g	'b 'g
+	c4			%  before note means one octave lower.
+				% Similarly:  after means one higher.
+	   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 g	b g
 	%%%% var 1
-	r8 e8()  c  	r8 e8()  c  	r8 f8() c 	r8 e8() c
-	r8 d8() 'b 	r8 c8() 'a 	r8 'a8() 'f 	r8 'e8() 'c
+	r8 e'8()  c4  	r8 e8()  c4  	r8 f8() c4 	r8 e8() c4
+	r8 d8() b4 	r8 c8() a4 	r8 a8() f4 	r8 e8() c4
 }
 
 \score{
-	\staff{ melodicregs melodie }
-	\staff{ melodicregs begeleiding }
-	\paper{
-		\unitspace 2.5\cm	% a whole note takes 2.5 \cm ideally.
-	}
+	\context GrandStaff <
+		\melodie
+		\begeleiding 
+	>
+	\paper{}
+	\midi{}
 }