lilypond-0.0.49

diff --git a/input/kortjakje.ly b/input/kortjakje.ly
index a7637f4d4a7ce09d5211feb0521789bd444acea6..47624c49361821a71ee0911d5aea53eb1a08d61b 100644 (file)
--- a/input/kortjakje.ly
+++ b/input/kortjakje.ly
@@ -9,11 +9,11 @@
 %
 % declare melody (which will be in *one* staff ) for the lead voice
 
-melodie = \melodic{
+melodie = \melodic 
                                % switch Lilypond in note-mode
        \clef\violin
-       \meter{ 2/4 }
-       \octave{ c }            % set the default octave
+       \meter{ 2/4 ;
+       \octave  c ;            % set the default octave
        % the default note duratino is 4
        %%% theme
        c c |                   % the '|' checks if there is a new measure here.
@@ -33,16 +33,16 @@ melodie = \melodic{
 }
 
                                % more of this.
-begeleiding = \melodic{
+begeleiding = \melodic 
        \clef "bass"
-       \meter{ 2/4 }
-       \octave{ c }            % default octave: 1 below the first octave.
+       \meter{ 2/4 ;
+       \octave  c ;            % default octave: 1 below the first octave.
 
        %%% 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 }
+       \octave  'c ;
        e '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

diff --git a/input/maartje.ly b/input/maartje.ly
index f816bb734e95a415891ad1985015e11a2d0b247b..ddce8ee770d4ecb228a1a921673f92b54af46bbf 100644 (file)
--- a/input/maartje.ly
+++ b/input/maartje.ly
@@ -4,17 +4,17 @@
 %
 %
 globals=\melodic{
-               \meter {4/ 4}
-               \partial {8}
-               \skip {1*8}
-               \skip {3*2 }
+               \meter 4/ 4;
+               \partial 8;
+               \skip 8*1;
+               \skip 2*3 ;
                \bar ":|:"
-               \skip {1*2}
-               \meter {2/4}
+               \skip 2*1;
+               \meter 2/4;
 }
 
-ritme = \staff{melodicregs
-       globals
+%ritme = \staff{melodicregs
+%      globals
 % rhythmic broken for  now
 %      \rhytmic{
 %      c8
@@ -29,17 +29,17 @@ ritme = \staff{melodicregs
 % 
 %       c2 c2 c2 c2 c2 c2 c2 c2 c2 c2
 %      }
-}
+%}
 
 melody= \staff{melodicregs
        globals
-       \melodic{
-       c8\key{fis cis gis}
+       \melodic \octave  {c;
+       c8\key fis cis gis;
        |r4 r4 r4 r4
        |cis'2..        r8
        | r4 r8 r16 r32 r32 
 
-       \duration {4}
+       \duration 4;
        <
                 { c () 'bes [c8 c8] }
                 { fis' ()gisis' fis8 fis8 }
@@ -53,7 +53,7 @@ melody= \staff{melodicregs
        [d8 e8 f'8 g8]  d8 e8 f8 g8
        |fis''2
        | a8 b8 c'8 d'8 |c''8 '''c8 c4 |c4  c4 |c4
-       \duration{ 16 } 'b 'a 'g 'f \duration{ 4}
+       \duration  16 ; 'b 'a 'g 'f \duration  4;
        \clef\bass      
 
        |c 'b 'a 'g 'f 'e 'd 'c ''b ''a ''g ''f ''e ''d ''c
@@ -66,7 +66,7 @@ melody= \staff{melodicregs
                \geometric 1.4
                \unitspace 3.0 \cm
        }
-       ritme
-       melody
+
+       \staff{  melody}
 }