lilypond-0.0.14

diff --git a/.dstreamrc b/.dstreamrc
index 2eb8e1df6702934508e6af32f0098214173b8fbc..64944330bc2350a1f3c36e0a863c10e34b54ecda 100644 (file)
--- a/.dstreamrc
+++ b/.dstreamrc
@@ -1,27 +1,27 @@
 #class name            silence?
 
 yyFlexLexer            1
-PCol                   1
-Score                  1
+PCol                   0
 Score_column           1
 Ineq_constrained_qp    1
 Spacing_problem        1
 Colinfo                        1
 Mixed_qp               1
 PScore                 1
-Parser                 1
+Parser                 0
 Lexer                  1
 parse_duration         1
 parse_pitch            1
 Col_configuration      1
-Command                        1
-Score_commands         1
 Note_req               1
 Rhythmic_req           1
 Rest_req               1
 delete_identifiers     1
+Command                        0
+Staff_commands         0
 Staff                  0
+Score                  0
 Voice                  0
 Voice_element          0
-Request                        1
+Request                        0
 Input_cursor           1
\ No newline at end of file

diff --git a/kortjakje.ly b/kortjakje.ly
index 86835bf3b55bb7fda17b11603b1ae238fe4caa12..967d2632c19b5fd01c0521cbb3e90a9fbad04784 100644 (file)
--- a/kortjakje.ly
+++ b/kortjakje.ly
@@ -2,16 +2,16 @@
 % 
 % bare bones version. (written down from memory :-)
 
-melodie = $ \octave {c}
+melodie = music {$ \octave {c}
        %%% theme
          c c g g       a a     g2      f f     e e     d d  c2
          g g   f f     e e     d d     g g     f f     e e     d d
        %%% var 1
          c r8 c8 (     ) g r8 g8 (     ) a r8 a8 (     ) g r4 
          f r8 f8 (     ) e4 r8 e8 (    ) d4 r8 d8 (    ) c4 r4
-$
+$}
 
-begeleiding = $
+begeleiding = $\music {
        \octave {`c}
        %%% theme
        `c c    e c     f c     e c     d `b    c `a    `f `g   `c2
@@ -20,17 +20,19 @@ begeleiding = $
        %%%% 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
-$
+}$
 
 
-bstaf = melodicstaff {
-               voices { begeleiding }
+bstaf = staff {
+       melodic
+       music { begeleiding }
                commands {
                        clef bass
                }
        }
-vstaf = melodicstaff {
-               voices { melodie }
+vstaf = staff {
+       melodic
+               music { melodie }
        }
 
 
@@ -38,7 +40,7 @@ score {
        staff { vstaf }
        staff { bstaf }
        paper {
-%              unitspace 2.5cm
+               unitspace 2.5cm
        }
        commands {
                meter 2 4 

diff --git a/pavane.ly b/pavane.ly
index e58508cb984b8439f78f51594a7a572c32932d43..529ffce9437d8a207f97278ae9ac63b39a636f33 100644 (file)
--- a/pavane.ly
+++ b/pavane.ly
@@ -1,12 +1,13 @@
 % pavane pour une Infante d\'efunte
 % 
-% M. Ravel
+% Maurice Ravel
 %
 % (Ravel has been dead for over 50 years. This does not have copyright)
 %
 
-horn = melodicstaff {
-       $
+horn =
+staff {melodic
+       music{  $
        \octave { 'c }
        \duration { 8}
 
@@ -21,11 +22,11 @@ horn = melodicstaff {
        cis4 d4()[d cis d e]
 \octave { c }
                                        a4 gis2.
-       a4 b4()[b a b cis]              fis4 e4 cis2
+       a4 b4()[b a b 'cis]             fis4 e4 cis2
        e4 fis4 () [fis e fis gis]      cis4 `b4()`b8 r8 r4
 
        r4 r4                           'cis4 'd4 () ['d 'cis 'd 'e]
-       a4 gis2.                        a4 b4()[b a b cis]
+       a4 gis2.                        a4 b4()[b a b 'cis]
        fis4 e4 cis2                    e4 fis4()[fis e fis gis]
        cis4 `b4()`b8 r8 r4             r1
        r2 r4 r4                        
@@ -37,16 +38,19 @@ horn = melodicstaff {
        r4 fis2 fis4                    fis2()[fis e a fis]
        fis4 e4 d4 e4                   `b2() [`b `a d cis]
        `b [`fis `a `b] cis4 `b4        `fis2 r2
-       $
-       commands {
+       $}
+       commands {      
                key  $fis cis $
        }
 }
 
 score {
-       staff { horn }
-       paper { unitspace 2.2 cm
-               geometric 1.5
+       staff {
+               horn
+       }
+       paper {
+               unitspace 1.5 cm
+               geometric 1.4
        }
        commands { meter 4 4
                skip 18:0