release: 1.1.41

[lilypond.git] / input / kortjakje.ly

diff --git a/input/kortjakje.ly b/input/kortjakje.ly
index b3707432802e59ed96b5341847ef0a626ce0c96a..01512d288e94abf1f23bbd1e8fb7ffc144d41e26 100644 (file)
--- a/input/kortjakje.ly
+++ b/input/kortjakje.ly
@@ -1,9 +1,8 @@
-
 \header{
 filename =      "kortjakje.ly";
-title =         "Ah,  vous dirais-je, maman (variations)";
+title =         "Ah  vous dirais-je maman (variations)";
 description =   "bare bones version. (written down from memory :-)";
-composer =      "Mozart, KV 265";
+composer =      "Mozart KV 265";
 enteredby =     "HWN";
 copyright =     "public domain";
 }
@@ -11,55 +10,51 @@ copyright =  "public domain";
 Tested Features: example file with comments
 
 %}
-\version "0.1.7";
+\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
+       \time 2/4 ;
        %%% theme
-       c4 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 
        f4 f|   e e|    d d|  c2
-       g4 g|   f f|    e e|    d d|    g g|    f f|    e e|    d d|
+       g'4 g|  f f|    e e|    d d|    g g|    f f|    e e|    d d|
        %%% var 1
          c4 r8 c               % r8 means an 8th rest.
                  (|            % start a slur
                                % NOTE: the slurstart should be directly after the note
                        )       % end a slur.
-                         g4 r8 g8 ()    a4 r8 a8 ()     g4 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
-       '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   'c2 |
-       \octave  c ;
-       e4 '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()  c4     r8 e8()  c4     r8 f8() c4      r8 e8() c4
-       r8 d8() 'b4     r8 c8() 'a4     r8 'a8() 'f4    r8 'e8() 'c4
+       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{
-       \melodic \type Grandstaff <
+       \context GrandStaff <
                \melodie
                \begeleiding 
        >