lilypond-0.0.49

diff --git a/input/coriolan-alto.ly b/input/coriolan-alto.ly
index 2a59761f005d225256c8dc3113e1cdc657dd560e..c2b8ed5da3c9d020f0291eae898a635136f6e7b8 100644 (file)
--- a/input/coriolan-alto.ly
+++ b/input/coriolan-alto.ly
@@ -13,16 +13,16 @@
 
 alto = \melodic{ 
        
-       \meter {4/4} 
-       \duration{ 8 }
-       \key {bes es as}
+       \meter 4/4; 
+       \duration  8 ;
+       \key bes es as;
                
-       \clef "alto"
+       \clef "alto";
        % these are chords (i.e. non-divisi)
        
 %30     
        <       
-               { \octave{ c }
+               { \octave  c ;
                        
                        [ c c-. ] c2.( | 
 %31
@@ -31,39 +31,40 @@ alto = \melodic{
                        [ ) c c-. ] c4. c-. c4( |
 %33
                        [ ) c c-. ] c4. c-. c4 
-               \group "+bla"
-                \stem{ 1 }[ c16^"div." c16 c16 c16 ] c4 c2 
-               \group "-"
+               \group "+bla";
+                \stem  1 ;[ c16^"div." c16 c16 c16 ] c4 c2 
+               \group "-";
                }
 %30:2
                { 
-                       \octave{ 'c }
-                       \textstyle "italic"
+                       \octave  'c ;
+                       \textstyle "italic";
                        % this should be a \dynamic, rather than text
                        [ c c_"cresc. \ \ - \ \ \ \ - \ \ \ \ - \ \ \ \
                                - \ \ \ \ - \ \ \ \ - \ \ \ \ - \ \ \ \
                                - \ \ \ \ - \ \ \ \ - \ \ \ \ - \ \ \ \
                                - \ \ \ \ - \ \ \ \ -" ] c2.( |  
-                       \textstyle "roman"
+                       \textstyle "roman";
 %31:2
                        [ ) c c-. ] c2.( | 
 %32:2
                        [ ) c c-. ] c4. c-. c4( | 
 %33:2
                        [ ) c c-. ] c4. c-. c4 |
-                       \octave{c }
+                       \octave c ;
 
 %34            
-                       \group "+b"
+                       \group "+b";
        % these are two \voices (i.e. divisi)
        % the c4 and c2, however are really 16th...
        % we-ll say "simile" for now...
        % 
-                       \octave{ 'c }
-                       \textstyle "italic"
-                       \stem{ -1 } [ as16 ff as16 as16 as16 ] as4_"simile" as2
-                       \textstyle "roman"
-                       \group "-"
+                       \octave  'c ;
+                       \textstyle "italic";
+                       \stem  -1 ;
+                       [ as16 \ff as16 as16 as16 ] as4_"simile" as2
+                       \textstyle "roman";
+                       \group "-";
                }
        >
        

diff --git a/input/martien.ly b/input/martien.ly
index 17fdb9895c43a2b65bbb07688cd1d1b11280c344..b1920e411cdcf2a037bd8a1fe720b19df52411af 100644 (file)
--- a/input/martien.ly
+++ b/input/martien.ly
@@ -1,3 +1,4 @@
+%% BUG in MIDI!
 %
 % Viola Quartet
 % Martien Lohman (194x-????) 
@@ -13,15 +14,15 @@
 % \barnumberstyle\boxed
 
 globalmusic= \melodic{
-               \meter {2/4}
+               \meter 2/4;
 %              \key fis
-               \skip {2*56}
+               \skip 2*56;
 %              \key bes es as
-               \skip {2*8}
-               \meter {6/8}
-               \skip{ 8*48}
-               \meter {2/4}
-               \skip {2*16}
+               \skip 2*8;
+               \meter 6/8;
+               \skip 8*48;
+               \meter 2/4;
+               \skip 2*16;
 %              \key fis
 }
 

diff --git a/input/mlalt.ly b/input/mlalt.ly
index 0e78987584628cb5994b9049313470616601d1a6..4fdba3a715d6f4cfa160bb7fa660fb19958fcc20 100644 (file)
--- a/input/mlalt.ly
+++ b/input/mlalt.ly
@@ -11,11 +11,11 @@
 % The purpose of this file is to demonstrate features of LilyPond;
 % respect the copyright.
 %
-alto = \melodic{ 
-       \duration{16}
-       \clef\alto
-       \octave{c}
-       \key{fis}
+alto = \melodic  {
+       \duration 16;
+       \clef\alto;
+       \octave c;
+       \key fis;
 %1
         [ 'b8. 'a ] [ 'g8 'b c ] |
 %2
@@ -47,10 +47,10 @@ alto = \melodic{
 %15
        [ e8 fis8 ] [ g8 d8 ] |
 %16
-       \textstyle "italic"
+       \textstyle "italic";
        [ c 'a 'fis 'd ] 'g4_"fine" |
-       \textstyle "roman"
-% \scoreverb{\mulooseness=-1}
+       \textstyle "roman";
+% \scoreverb \mulooseness=-1;
 % \newline
 %17
 %=1
@@ -120,7 +120,7 @@ alto = \melodic{
 %48
        [ d e d d 'b 'g ]4/6  [ 'a8 'g8 ] |
 %theme 2
-       \duration{8}
+       \duration 8;
 %49
        [ f e d ]2/3  f4 |
 %50
@@ -136,7 +136,7 @@ alto = \melodic{
 %55
        [ d g 'g ]2/3   [ 'g 'a 'b ]2/3  |
 %56
-        'b4 c4 \key{bes es as} | % || \key\Es
+        'b4 c4 \key bes es as; | % || \key\Es
 %57
        [ 'b d ] [ 'g 'b ] |
 %58
@@ -152,7 +152,7 @@ alto = \melodic{
 %63
        [ 'g 'b ] [ es d ] |
 %64
-       [ c8. 'g32 'es32 ] 'c4 | % || \meter{6/8}
+       [ c8. 'g32 'es32 ] 'c4 | % || \meter 6/8;
 %65
        es4.( [ )es d c ] |
 %66
@@ -170,9 +170,9 @@ alto = \melodic{
 %71
         d2.  |
 %72
-        c r4 r4. | % || \meter{2/4}
+        c r4 r4. | % || \meter 2/4;
 %73
-       \duration{8}
+       \duration 8;
        [ 'b d ] [ 'g 'b ] |
 %74
        [ c es ] [ 'g c ] |
@@ -191,7 +191,7 @@ alto = \melodic{
 %81
         g4 [ as g ] |
 %82
-       \duration{16}
+       \duration 16;
        [ g f es f ] g4 |
 %83
        [ g f e f ] g4 |
@@ -204,10 +204,10 @@ alto = \melodic{
 %87
         'b2 |
 %88
-       \textstyle "italic"
-        c2_"dacapo" \key{fis} |
-       \textstyle "roman"
-%\scoreverb{\mulooseness=1}
+       \textstyle "italic";
+        c2_"dacapo" \key fis; |
+       \textstyle "roman";
+%\scoreverb \mulooseness=1;
 %      \key\G ||
        
 }

diff --git a/input/mlcello.ly b/input/mlcello.ly
index ad9f3126b657f2b79d96cf497564bfe4cf5b581d..9ce94ae171d92ae7b089d36c37d97083e2134696 100644 (file)
--- a/input/mlcello.ly
+++ b/input/mlcello.ly
@@ -11,11 +11,11 @@
 % The purpose of this file is to demonstrate features of LilyPond;
 % respect the copyright.
 %
-cello = \melodic{ 
-       \clef"bass"
-       \octave{'c}
-       \duration{4}
-       \key{fis}
+cello = \melodic  {
+       \clef"bass";
+       \octave 'c;
+       \duration 4;
+       \key fis;
 %%1
        g 'g |
 %%2
@@ -47,9 +47,9 @@ cello = \melodic{
 %%15
        [ c8 e8 ] [ g8 'g8 ] |
 %%16
-       \textstyle "italic"
+       \textstyle "italic";
        [ d8 c'8 ] b_"fine"
-       \textstyle "roman" |
+       \textstyle "roman" ;|
 % \newline
 %%17=1
        g 'g |
@@ -77,7 +77,7 @@ cello = \melodic{
 %%28
        ) 'a d |
 %%29
-       \duration{8}
+       \duration 8;
        [ 'a a ] d4 |
 %%30
        [ 'a a ] d4 |
@@ -87,7 +87,7 @@ cello = \melodic{
        [ 'a a ] d4 |
 %%variant a
 %%33
-       \duration{16}
+       \duration 16;
        [ 'g8 'g 'g ] [ 'g8 'g 'g ] |
 %%34
        [ 'g8 'g 'g ] g4 |
@@ -104,10 +104,10 @@ cello = \melodic{
 %%40
        'd4 'g4 |
 %%41
-       \duration{8}
-       \textstyle "italic"
+       \duration 8;
+       \textstyle "italic";
        r_"pizz"
-       \textstyle "roman"
+       \textstyle "roman";
        g r 'g |
 %%42
        r g e4 |
@@ -126,10 +126,10 @@ cello = \melodic{
        [ 'd 'g ] |
 %%theme 2
 %%49
-       \textstyle "italic"
+       \textstyle "italic";
        r4_"arco"
         [ 'g 'g 'g ]2/3  |
-       \textstyle "roman"
+       \textstyle "roman";
 %%50
        r4  [ c c c ]2/3  |
 %%51
@@ -143,7 +143,7 @@ cello = \melodic{
 %%55
        g2 |
 %%56
-       'g4 'c4 \key{bes es as}|
+       'g4 'c4 \key bes es as;|
 % \key\'es ||
 %%57
        g r g r |
@@ -161,7 +161,7 @@ cello = \melodic{
        g4 'g4 |
 %%64
        c4 'c4 |
-% \meter{6/8} ||
+% \meter 6/8; ||
 %%65
        [ c c c ] c4.  |
 %%66
@@ -180,7 +180,7 @@ cello = \melodic{
 %%72
        c' r4 r4. |
 %%73
-% \meter{2/4} ||
+% \meter 2/4; ||
        g r g r |
 %%74
        c r c r |
@@ -197,7 +197,7 @@ cello = \melodic{
 %%80
        c4 'c4 |
 %%81
-       \duration{2}
+       \duration 2;
        'c |
 %%82
        'c |
@@ -212,9 +212,9 @@ cello = \melodic{
 %%87
        d |
 %%88
-       \textstyle "italic"
-       d_"dacapo" \key{fis} |
-       \textstyle "roman"
+       \textstyle "italic";
+       d_"dacapo" \key fis; |
+       \textstyle "roman";
 % \key\'g ||
        
 }

diff --git a/input/mlvio1.ly b/input/mlvio1.ly
index bd0aea34ab411c24b0658f1d0b620ae3d902862f..2d59b71ab309ded2046bc893186bec88b3b1a81e 100644 (file)
--- a/input/mlvio1.ly
+++ b/input/mlvio1.ly
@@ -11,11 +11,11 @@
 % The purpose of this file is to demonstrate features of LilyPond;
 % respect the copyright.
 %
-violinI = \melodic{ 
-       \clef "violin"
-       \octave{c}
-       \duration{4}
-       \key{fis}
+violinI = \melodic  {
+       \clef "violin";
+       \octave c;
+       \duration 4;
+       \key fis;
 %1
        g [ b8. a16 ] |
 %2
@@ -47,9 +47,10 @@ violinI = \melodic{
 %15
        c' b |
 %16
-       \textstyle "italic"
+       \textstyle "italic";
        a g_"fine"
-       \textstyle "roman" |
+       \textstyle "roman" ;
+       |
 %\newline
 %17=1
        g [ b8. a16 ] |
@@ -86,7 +87,7 @@ violinI = \melodic{
        cis' c' |
 %variant a'
 %33
-       \duration{16} [ b8 d' d' ] [ d'8 d' d' ] |
+       \duration 16; [ b8 d' d' ] [ d'8 d' d' ] |
 %34
        [ g'8 d' d' ] b4 |
 %35
@@ -102,10 +103,10 @@ violinI = \melodic{
 %40
        c'4 < b4 d'4 > |
 %41
-       \textstyle "italic"
-       \duration{8}
+       \textstyle "italic";
+       \duration 8;
        r_"pizz" d r g
-       \textstyle "roman" |
+       \textstyle "roman" ;|
 %42
        r d e4 |
 %43
@@ -122,9 +123,9 @@ violinI = \melodic{
        r d' [ d' b ] |
 %theme 2
 %49
-       \textstyle "italic"
+       \textstyle "italic";
        r4_"arco"  [ b8  b  b ]2/3 
-       \textstyle "roman" |
+       \textstyle "roman" ;|
 %50
        r4  [ g g g ]2/3  |
 %51
@@ -138,7 +139,7 @@ violinI = \melodic{
 %55
        b2 |
 %56
-       g2 \key{bes es as}|
+       g2 \key bes es as;|
 % \key\Es ||
 %57
        f r f r |
@@ -149,16 +150,16 @@ violinI = \melodic{
 %60
        c' r c'4 |
 %61
-       \duration{16}
+       \duration 16;
         [ as f d f as d' ]4/6   [ as f d 'as d f ]4/6  |
 %62
         [ g es c 'g c es ]4/6   [ g c' es' c' g es ]4/6  |
 %63
         [ g d g bes d' g' ]4/6   [ f' d' bes g f d ]4/6  |
 %64
-       \duration{8}
+       \duration 8;
        [ c g ] g4 |
-% \meter{6/8} ||
+% \meter 6/8; ||
 %65
        [ g g g ] g4.  |
 %66
@@ -175,7 +176,7 @@ violinI = \melodic{
        [ f' d' b ] [ g a8 b ] |
 %72
        c' r4 r4. |
-% \meter{2/4} ||
+% \meter 2/4; ||
 %73
        f r f r |
 %74
@@ -185,7 +186,7 @@ violinI = \melodic{
 %76
        c' r c'4 |
 %77
-       \duration{16}
+       \duration 16;
         [ as f d f as d' ]4/6   [ as f d 'as d f ]4/6  |
 %78
         [ g es c 'g c es ]4/6   [ f c' es' c' g es ]4/6  |
@@ -194,7 +195,7 @@ violinI = \melodic{
 %80
        [ c8 g8 ] g4 |
 %81
-       \duration{2}
+       \duration 2;
        c' |
 %82
        c' |
@@ -209,10 +210,10 @@ violinI = \melodic{
 %87
        d |
 %88
-       \textstyle "italic"
+       \textstyle "italic";
        a_"dacapo"
-       \textstyle "roman"
-       \key{fis} |
+       \textstyle "roman";
+       \key fis; |
 % \key\G ||
        
 }

diff --git a/input/mlvio2.ly b/input/mlvio2.ly
index 33a376e9204b86b628900b1445817d2156e8d63c..8a0ada446a7760c4a565b4800a3957612b4f1b77 100644 (file)
--- a/input/mlvio2.ly
+++ b/input/mlvio2.ly
@@ -11,11 +11,11 @@
 % The purpose of this file is to demonstrate features of LilyPond;
 % respect the copyright.
 %
-violinII = \melodic{ 
-       \clef "violin"
-       \octave{c}
-       \duration{4}
-       \key{fis}
+violinII = \melodic  {
+       \clef "violin";
+       \octave c;
+       \duration 4;
+       \key fis;
 %1
        d2 |
 %2
@@ -47,9 +47,9 @@ violinII = \melodic{
 %15
        c d |
 %16
-       \textstyle "italic"
+       \textstyle "italic";
        d2_"fine" |
-       \textstyle "roman"
+       \textstyle "roman";
 % \newline
 %17=1
        d2 |
@@ -86,7 +86,7 @@ violinII = \melodic{
        a fis |
 %variant a
 %33
-       \duration{16}
+       \duration 16;
        [ g8 b b ] [ b8 g a ] |
 %34
        [ b8 b b ] f4 |
@@ -103,10 +103,10 @@ violinII = \melodic{
 %40
        fis4 g4 |
 %41
-       \duration{8}
-       \textstyle "italic"
+       \duration 8;
+       \textstyle "italic";
        r_"pizz"
-       \textstyle "roman"
+       \textstyle "roman";
        'b r 'b |
 %42
        r 'b 'g4 |
@@ -124,9 +124,9 @@ violinII = \melodic{
        r fis [ fis d ] |
 %theme 2
 %49
-       \textstyle "italic"
+       \textstyle "italic";
        r4_"arco"
-       \textstyle "roman"
+       \textstyle "roman";
        [ d8 d d ]2/3  |
 %50
        r4  [ g8 g g ]2/3  |
@@ -141,7 +141,7 @@ violinII = \melodic{
 %55
        d2 |
 %56
-       f4 e4 \key{bes es as}|
+       f4 e4 \key bes es as;|
 % \key\Es ||
 %57
        d r 'b r |
@@ -159,9 +159,9 @@ violinII = \melodic{
        'b d4.  |
 %64
        es2 |
-% \meter{6/8} ||
+% \meter 6/8; ||
 %65
-       \duration{8}
+       \duration 8;
        [ c c c ] c4.  |
 %66
        [ 'g 'g 'g ] 'g4.  |
@@ -178,7 +178,7 @@ violinII = \melodic{
 %72
        es r4 r4. |
 %73
-% \meter{2/4} ||
+% \meter 2/4; ||
        d r 'b r |
 %74
        'g r es r |
@@ -187,7 +187,7 @@ violinII = \melodic{
 %76
        g r es4 |
 %77
-       \duration{2}
+       \duration 2;
        f |
 %78
        es |
@@ -210,9 +210,9 @@ violinII = \melodic{
 %87
 %      = g |
 %88
-       \textstyle "italic"
-       fis_"dacapo" \key{fis}|
-       \textstyle "roman"
+       \textstyle "italic";
+       fis_"dacapo" \key fis;|
+       \textstyle "roman";
 % \key\G ||
        
 }

diff --git a/input/scales.ly b/input/scales.ly
index 04e2abc10b381f9df19451d9b43fbd8f341c4856..2b6aa54c2907f0246d3b2fca77e76bbfa5a23d5c 100644 (file)
--- a/input/scales.ly
+++ b/input/scales.ly
@@ -4,36 +4,47 @@
 
 blah = \staff{  melodicregs
        \melodic {
-               \duration { 8 }           \meter {6/8}  
-               
-               \octave{ c }
-                        |[ a cr a a a a a a a rc a ff decr ]6/9 
-                       \octave{ c }
-                        |[ a  a a a a a a a rc a ]6/9 
-                       \octave { c' } 
-                        [ 'c 'g d a e' b' f'' c''' g''' ]6/9
-                        [ g''' c''' f'' b' e' a d 'g 'c ]6/9
-                       \octave{ c'' }
-                        [ 'c 'g d a e' b' f'' c''' g''' ]6/9
-                        [ g''' c''' f'' b' e' a d 'g 'c ]6/9
-                       \octave { ''c}   
-                        [ c g d' ]2/3 
-                        [ d' g c ]2/3  
-                        [ f c' g' ]2/3 
-                        [ g' c' f ]2/3  
-                       \octave{ c }
-                        [ c g d' ]2/3 
-                        [ d' g c ]2/3  
-                        [ f c' g' ]2/3 
-                        [ g' c' f ]2/3 
-                        [ g' c' f ]2/3 
-  \meter {4/4}
+               \meter 6/8;     
+               \duration 4.;
+               \octave  'c ;
+       \clef "bass";
+                       c d
+               \octave  c ;
+                       c d 
+               \clef "violin" ;
+               \octave  c' ;
+                       c d
+               \octave  c'' ;
+                       c d 
+               \duration  8 ;
+       %ugr
+                |[ a \< a a a a a a  \! a a \ff \> ]6/9 
+               \octave  c' ;
+                |[ a  a a a a a a a \! a ]6/9 
+               \octave  c'' ; 
+                [ 'c 'g d a e' b' f'' c''' g''' ]6/9
+                [ g''' c''' f'' b' e' a d 'g 'c ]6/9
+               \octave  c' ;
+                [ 'c 'g d a e' b' f'' c''' g''' ]6/9
+                [ g''' c''' f'' b' e' a d 'g 'c ]6/9
+               \octave  c' ;   
+                [ c g d' ]2/3 
+                [ d' g c ]2/3  
+                [ f c' g' ]2/3 
+                [ g' c' f ]2/3  
+               \octave  c ;
+                [ c g d' ]2/3 
+                [ d' g c ]2/3  
+                [ f c' g' ]2/3 
+                [ g' c' f ]2/3 
+                [ g' c' f ]2/3 
+  \meter 4/4;
        
 c1
-       \duration { 8}
+       \duration  8;
        [c-> d-> e-> f->][g-> a-> b-> c'->] % 1
-\octave{c'}    [c'-^ b-^ a-^ g-^][f-^ e-^ d-^ c-^]
-\octave{c}     [c'-^ b-^ a-^ g-^][f-^ e-^ d-^ c-^]
+\octave c';    [c'-^ b-^ a-^ g-^][f-^ e-^ d-^ c-^]
+\octave c;     [c'-^ b-^ a-^ g-^][f-^ e-^ d-^ c-^]
        [c-. d-. e-. f-.][g-. a-. b-. c'-.]
        [c'-- b-- a-- g][f-- e-- d c--] % 5
        [c-portato d-portato e-portato f-portato]

diff --git a/input/scsii-menuetto.ly b/input/scsii-menuetto.ly
index d6d189c95c5d9d1110ea8b39b80e3097ae5e066c..a2cd75861896fe823a3e5eb2755169ea1880ce21 100644 (file)
--- a/input/scsii-menuetto.ly
+++ b/input/scsii-menuetto.ly
@@ -24,13 +24,13 @@
 %              % because piece is set very tightly
 
 ii_menuetto = \melodic{
-       \clef"alto"
-       \meter{3/4}
-       \key {bes}
-       \octave{c}
+       \clef"alto";
+       \meter 3/4;
+       \key bes;
+       \octave c';
 
-       \duration{8}
-       < a2 f2 d2 df > bes4-.  |
+       \duration 8;
+               < a2 f2 d2 \f > bes4-.  |
 %%2
        < [ bes^"1" e c_"2"_"4" >
                a bes-. g-. ] a4-.^"4" |
@@ -39,38 +39,39 @@ ii_menuetto = \melodic{
 %%4
        < [ f 'a > e d cis-. 'b-. 'a-. ]
 %%5
-       < a2 f2 d2 > bes4-. | %   @bes4-. |
+       < a2 f2 d2 > bes!4-. |
 %%6
        < [ bes e > a bes-. g-. ]
-       c'4-. | % =c'4-. |
+       c'!4-. |
 %%7
        < a4-. f4>
        < d'4-.-upbow f4 'bes4 >
        < e'4-.-downbow g4 'g4 > |
 %%8
-       < cis'2.-upbow e2. 'a2. > \bar ":|:"%%!! sorry!
+       < cis'2.-upbow e2. 'a2. > 
+               \bar ":|:";
 %%9
-       \clef "violin"
-       < e'2 a2 df >
+       \clef "violin";
+       < e'2 a2 \f >
        [ d'( e'16 )f'16 ] |
 %%10
        < [ e' g > d' cis'_"2" e' a( )g ] |
 %%11
        < \multivoice  
-               {\stem{1} a4(\stem{1}) d'4 cis'4-. }
-               { \stem{-1} f2 e4 } > |
+               {\stem 1; a4(\stem 1;) d'4 cis'4-. }
+               { \stem -1; f2 e4 } > |
 %%12
        < [ g'^"4" d > f' e' f' d'^"3"( ) c' ] |
 %%13
-       \clef "alto"% 
+       \clef "alto";
        < \multivoice
-                { \stem{1} bes2 c'4 }
-                { \stem{-1} g4(\stem{-1}) f4 e4 }% ugh
+                { \stem 1; bes2 c'4 }
+                { \stem -1; g4(\stem -1;) f4 e4 }% ugh
        > |
 %%14
-       < [ a f > g a f ] < d'4-upbow e4 'bes4 > |
+       < [ a f > g a f ] < d'4-$upbow e4 'bes4 > |
 %%15
-       < c'4-\downbow f4 'a4 > [ bes( )a g a ] |
+       < c'4-$downbow f4 'a4 > [ bes( )a g a ] |
 %%16
        [ f( e )f a-. g-. bes-. ] |
 %%17
@@ -82,13 +83,14 @@ ii_menuetto = \melodic{
 %%20
        < { [ c'( bes a )bes g( )bes ] } { [ d ] } { [ g ] } > |
 %%21
-       < \multivoice  {\stem{1}  d'4(\stem{1} ) cis'4 d'4 }  { \stem{-1} g2 f4 } > |
+       < \multivoice  {\stem 1;  d'4(\stem 1; ) cis'4 d'4 }  { \stem -1; g2 f4 } > |
 %%22
        < { [ g( )f g e ] } { [ cis ] } > < f4 d4 > |
 %%23
-       [ 'g g ] < e4. 'a4. > d-upbow |
+       [ 'g g ] < e4. 'a4. > d-\upbow |
 %%24
-       < d2.^"fine" 'a2. 'd2._"3 mins."> \bar ":|" % \bar ":||"
+       < d2.^"fine" 'a2. 'd2._"3 mins."> 
+       \bar ":|";
 %% \tighten            % use one line less
        
 }

diff --git a/input/twinkle.ly b/input/twinkle.ly
index 158095c36f3007d2d3247a2acdf9611dd2507694..5d29a8ca9887dfef7c28f6821da80082f8d5b327 100644 (file)
--- a/input/twinkle.ly
+++ b/input/twinkle.ly
@@ -5,7 +5,7 @@
 % Copyright: none
 
 melody = \melodic{
-       \clef\violin
+       \clef\violin;
        c4 c | g g | a a | g g |
        f f | e e | d d8.( e16 | )c2 | % :|
 
@@ -14,12 +14,13 @@ melody = \melodic{
 
        c c | g g | a a | g g |
        f f | e e | d d8.( e16 | )c2 % :|
-       \bar ":|"
+       \bar ":|";
 }
 
-accompany = \melodic{
-       \clef \bass
-       \octave{'c}\duration{4}
+accompany = \melodic {
+       \clef \bass;
+       \octave'c;
+       \duration 4;
        c4 c' | e' c' | f' c' | e' c' | 
        d' b | c' a | f g | c2 | 
 
@@ -28,13 +29,13 @@ accompany = \melodic{
 
        c c' | e' c' | f' c' | e' c' | 
        d' b | c' a | f g | c2 
-       \bar ":|"
+       \bar ":|";
 }
 
-global = \melodic{
-               \meter {2 / 4}
-               \skip {2*24}
-%              \bar "||"
+global = \melodic {
+               \meter 2 / 4;
+               \skip 2*24;
+%              \bar "||";
        }
 
 tekst = \lyric{ 
@@ -57,7 +58,7 @@ hegedraagjetekst = \lyric{
 
 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
@@ -69,7 +70,7 @@ texte = \lyric{
 
 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
@@ -79,7 +80,6 @@ texti = \lyric{
 }
 
 textii = \lyric{
-       \textstyle "roman"
        When the bla- zing sun is gone,2
        When he no- thing shines up- on,2
        Then you show your lit- tle light,2
@@ -91,7 +91,6 @@ textii = \lyric{
 
 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