lilypond-0.1.64

diff --git a/.dstreamrc b/.dstreamrc
index 7d088d518ce6570f6213ec826841b152ed5fc16f..253955b01ddfbf9e49e04d7ea969f6df3d07348f 100644 (file)
--- a/.dstreamrc
+++ b/.dstreamrc
@@ -8,6 +8,7 @@ InitParser              1
 Parser                 1
 InitDeclarations       1
 Declarations           1
+yyparse                        1
 # FlexLexer debug
 InitLexer              1
 Lexer                  1
@@ -22,10 +23,11 @@ Matrix                      1
 Vector                 1
 
 # lily
+Absolute_dynamic_req   1
 Atom                   1
 Axis_group_administration      1
 Bar                    1
-Beam                   1
+Beam                   0
 Bow                    1
 Bezier_bow             1
 Change_iterator                1
@@ -38,15 +40,19 @@ Colinfo                     1
 Colinfo                        1
 Collision              1
 Column_rod             1
+Duration_identifier    1
 Engraver               1
 Engraver_group_engraver 1
+General_script_def     1
 Graphical_element      1
 Group_change_req       1
 Head_column            1
 Horizontal_align_item  1
 Idealspacing           1
+Identifier             1
 Ineq_constrained_qp    1
 Input_translator       1
+int_identifier         1
 Item                   1
 Key_item               1
 Lookup                 1
@@ -55,26 +61,28 @@ Melodic_req         1
 Midi_def               1
 Midistrings            1
 Mixed_qp               1
-Music                  0
+Music                  1
 Music_iterator         1
 Music_output_def       1
 Note_column            1
 Note_head              1
 Note_performer         1
-Note_req               0
+Note_req               1
 Paper_column           1
 Paper_score                    1
 Paper_def              1
 Performer              1
 Performer_group_performer      1
+Real_identifier                1
 Request                        1
 Request_iterator       1
 Rest_collision         1
 Rest_collision_engraver 1
 Rest_req               1
-Rhythmic_head  0
-Rhythmic_req           0
-Score                  0
+Rhythmic_head  1
+Rhythmic_req           1
+Scope                  1
+Score                  1
 Score_column           1
 Score_elem             1
 Score_engraver         1
@@ -86,13 +94,16 @@ Single_malt_grouping_item   1
 Slur                   1
 Spacer_rod             1
 Spacing_problem        1
+Span_req               1
+Span_dynamic_req       1
 Spanner                        1
 Spring_spacer          1
+Skip_req               1
 Staff                  1
 Staff_commands         1
 Staff_symbol           1
 Stem                   1
-Stem_info              1
+Stem_info              0
 Stem_req               1
 Symtable               1
 Symtables              1

diff --git a/mutopia/J.S.Bach/allemande-urtext.ly b/mutopia/J.S.Bach/allemande-urtext.ly
index b3ec3ef1d189bdb174d4b1dab113394733d43062..2b1631b41c21e6b4f42579edbf1d6cee2056ae3a 100644 (file)
--- a/mutopia/J.S.Bach/allemande-urtext.ly
+++ b/mutopia/J.S.Bach/allemande-urtext.ly
@@ -7,61 +7,96 @@ Well, there are still some scripts in this "urtext".
 But merging music and scripts doen't work too well yet (see alto_scripts).
 %}
 
-\version "0.1.14";
 n = { \slurnormal }
 d = { \slurdotted }
 comma = "\\sethuge,";
 
-% write as two voices?
-allemande = \melodic{
-       a,16 |
-       <[''d8 g' f' a> bes16()a][g()f e()d][d()cis d()e]['g8 \d bes16()g] |
-       [f( a )d f,] [e8 cis'] <[''d8. a' d> e16] [f g a bes!] |
+allemande_a = \melodic{
+       \voiceone a,16 | 
+       [a8 bes16()a] \onevoice
+       [g()f e()d][d()cis d()e][g,8 \d bes16()g] |
+       [f( a )d f,] [e8 cis']\voiceone[d8. e16]\onevoice[f g a bes!] |
        %3
-       <['d8 a' fis' c,> \n d16()es][d()c bes()a][c()bes a()g][d'8. f,16] |
-       [e( g )bes d][c()bes a()g]\n[bes()a g()f]<[f8. a> <f16 a]> |
+       \voiceone[c8 \n d16()es]\onevoice[d()c bes()a][c()bes a()g][d'8. f,16] |
+       [e( g )bes d][c()bes a()g]\n[bes()a g()f]
+       <[f8. a> <f16 a]> |
        % urg fix
-       [b \n f,( e )d][e \d cis'( d )cis]<'d8. {[d'( )e16]}>\n[f( e d)e] |
+       [b \n f,( e )d][e \d cis'( d )cis]\voiceone[d'8.( )e16]\onevoice
+       \n[f( e d)e] |
        %6
        [d( c b )c][b( a gis)a][g8-\prall fis16()e][e' c( a )g] |
-       <[f! e'> a, f d]<\voiceone d {\voicetwo[b f' d b]}>\onevoice
+       \voiceone [e' a, f d] [d f d b]\onevoice
        [fis( b e )gis] \d [b( d c )b] |
        %8
        \n[c( a f )d][d( f e )d][gis'8.-\trill()a16]\d[b d e,()d] |
        % urg
-       [c( e a')d']< {\voiceone [b8.-\trill a16] a8 } 
-       {\voicetwo e,4 ['dis8 ~ dis32 e( fis gis][a b c d c b c )a]}> |
-       \onevoice
+       % check [c( e a')d']\voiceone [b8.-\trill a16] a8 \onevoice |
+       [c( e a')d']\voiceone [b8.-\trill a16] a8 s4 s8 \onevoice |
        %10
-       [d'!16 gis'( a b a gis fis )e]<[c8 e a'> f16()e] [d()c b!()a] |
-       <[gis8 d' b'> e'16()f]\d[e()d c()b]<\voicetwo a8 e' 
-       {\voiceone[d'16()b c()a]}> \onevoice e8 gis |
-       ['a8. cis16][e g!( f! )e][f( a )d gis,] a8.
+       [d,!16 gis'( a b a gis fis )e] \voiceone [d8 f16()e]\onevoice
+       [d()c b!()a] |
+       \voiceone[d'8 e16()f]\onevoice\d[e()d c()b]
+       \voiceone[d''16()b c()a] \onevoice [e8 gis] |
+       [a,8. cis16][e g!( f! )e][f( a )d gis,] a8.
        %13
-       e,16 <\voicetwo a, cis'' {\voiceone ['e8. f16]}> \onevoice
-       \n[g!()e fis()a]\n['cis( d )e bes,][a8.-\trill()g16] |
+       e,16 \voiceone [e8. f16] \onevoice
+       \n[g!()e fis()a]\n[cis,( d )e bes,][a8.-\trill()g16] |
        [f a''(f)d][g' \n b,()cis a'][g(f e)d][fis d()es c(] |
        %15
-       [)bes g'('a )g][fis a d c'][bes('fis)g bes][d()a bes()g] |
-       [es(d)es g][c()a bes()g]\d['d(c)d g]\n[bes()'fis g()es] |
+       [)bes g'(a, )g][fis a d c'][bes(fis,)g bes][d()a bes()g] |
+       [es(d)es g][c()a bes()g]\d[d,(c)d g]\n[bes()fis, g()es] |
        %17
-       \n[c(bes)c bes'][a(c)es g,]<['c8-\trill fis'>\d g16()a] ['d8 es16()c] |
-       [bes(d )g bes,]['d8 fis]<['g8. g'> a16][bes d g, f] |
+       \n[c(bes)c bes'][a(c)es g,]\voiceone[fis8-\trill\d g16()a]\onevoice
+       [d,8 es16()c] |
+       [bes(d )g bes,][d,8 fis][g8. a16][bes d g, f] |
        %19
-       <\voicetwo bes,8. {\voicetwo[e'-\trill()f16]}> [g()e c()bes]
-       \n[a()f' g,()f][e g'( a )bes] |
+       \voiceone[e'8.-\trill()f16]\onevoice [g()e c()bes]
+       \n[a()f' g,()f][e g''( a )bes] |
        % :-(
        % [bes( a g )f^\comma]
        [bes( a g )f^"\\sethuge{\\ '}"]
-       [a()'e f()d][bes d(f)a][d'()a bes()g] |
+       [a()e, f()d][bes d(f)a][d'()a bes()g] |
        %21
-       ['a(\n)g'(\n cis'())d][e()'g a()'es][f()d bes()d]\d['gis f'(e)d] |
+       [a,(\n)g'(\n cis'())d][e()g, a()es,][f()d bes()d]\d[gis, f'(e)d] |
        % \n[d( cis b )a^\comma][c(a)fis d'][c a( b )d]
        \n[d( cis b )a^"\\sethuge\\ ,"]
        [c(a)fis d'][c a( b )d]
-       [f!(d )'gis d'] |
+       [f!(d )gis, d'] |
        %23
-       [cis(e g!)bes][e'()a bes()g][f()'cis d()'gis][a8 cis!] |
-       ['d16 d''(c!)a][bes!(g)e cis'][d a f d] d'8.
+       [cis(e g!)bes][e'()a, bes()g][f()cis, d()gis,][a8 cis!] |
+       % knee
+       \stemup [d,16 \stemboth d''(c!)a][bes!(g)e cis'][d a f d] d,8.
+       \octave c';
 }
 
+allemande_b = \melodic{
+       \voicetwo
+       s16 |
+       <d,8 g' f'> s8 s2. |
+       s2 <d,,8. a'> s16 s4 |
+       <d,8 a' fis'> s8 s2. |
+       s1 | 
+       s2 d,,8. s16 s4 |
+       s1 |
+       f''!16 s16*3 b, s16*3 s2 |
+       s1 |
+       s4 e [dis,8 ~ dis32 e( fis gis][a b c d! c b c )a] |
+       s2 <c,8 a'> s8 s4 |
+       % check <gis,,8 bes''> s8 s4 <a,,8 e'> s8. s16 |
+       <gis,,8 bes''> s8 s4 <a,,8 e'> s8 s4 |
+       s1 |
+       % check
+%      s16
+       <g,8 cis''> s8 s2. |
+       s1*3 |
+       s2 c,,8 s8 s4 |
+       s2 g,8. s16 s4 |
+       bes'8. 
+       \octave c;
+}
+
+allemande = \type Voice \melodic<
+       \$allemande_a
+       \$allemande_b
+>
+

diff --git a/mutopia/J.S.Bach/courante-cello.ly b/mutopia/J.S.Bach/courante-cello.ly
index f855077b0bb204e81d9d0231b60f1601692c6221..2ecb5ba0072a01e34d7481b6cd4a65626c9586e1 100644 (file)
--- a/mutopia/J.S.Bach/courante-cello.ly
+++ b/mutopia/J.S.Bach/courante-cello.ly
@@ -4,6 +4,7 @@ title =  "Solo Cello Suites";
 subtitle = "Suite II";
 piece = "Courante";
 % opus =        "BWV 1008";
+opus =  "";
 composer =      "Johann Sebastian Bach(1685-1750)";
 enteredby =     "JCN";
 copyright =     "public domain";
@@ -27,10 +28,12 @@ courante_cello_global = \melodic{
        \meter 3/4;
        \key bes;
        \partial 16;
-       \clef alto;
-       \skip 2.*16;
+       \clef bass;
+       \skip 2.*15;
+       s2 s8.
        \bar ":|:";
-       \skip 2.*16;
+       \skip 2.*15;
+       s2 s8
        \bar ":|";
 }