lilypond-1.1.39

diff --git a/Documentation/links.yo b/Documentation/links.yo
index b829b76be330f72dfaf598cbc7db8fe0ba66a10b..3617caae075e29b2f9eca649feadd3cf13109627 100644 (file)
--- a/Documentation/links.yo
+++ b/Documentation/links.yo
@@ -35,7 +35,7 @@ dit(lurl(http://www.iat.unc.edu/technology/music/music.html))
 dit(lurl(http://www.ram.org/ramblings/philosophy/fmp.html))
     Musings on free music, plus hints how to record your own (free) music.
 
-dit(lurl(http://www.cyberus.ca/~jdsankey/harpsichord.html))
+dit(lurl(http://www.geocities.com/Vienna/Studio/1714/))
        John Sankey has taken up the task of recording classical
 music, and distributing the results at no cost.
 )
@@ -101,6 +101,8 @@ dit(lurl(http://www.ssc.com/linux/))
     The Number One Free Operating System Kernel: Linux 
 dit(lurl( http://sound.condorow.net))
     Dave Philips' Linux sound applications page
+dit(lurl(http://www4.smart.net/~jcovey/scores.html))
+       Jeff Covey's guitar music=
 dit(lurl(http://www.home.fh-karlsruhe.de/~rost0001/web/musik/musik.html))
     Stochastic composing using LilyPond 
 dit(lurl(http://www.medieval.org/emfaq/scores/software.html))

diff --git a/lily/parser.yy b/lily/parser.yy
index 6ad7ffdb16ebcdd795a40bad0005d83464c3ab74..300834a24872042779e92c7028826121cb59a738 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -40,7 +40,7 @@
 #include "scope.hh"
 #include "relative-music.hh"
 #include "transposed-music.hh"
-#include "compressed-music.hh"
+#include "time-scaled-music.hh"
 #include "repeated-music.hh"
 
 // mmm
@@ -707,7 +707,13 @@ Music:
        ;
 
 Alternative_music:
-       ALTERNATIVE Simultaneous_music {
+       /* empty */ {
+
+               /* UGH*/
+               Music_list* m = new Music_list;
+               $$ = new Sequential_music (m);
+       }
+       | ALTERNATIVE Simultaneous_music {
                $$ = $2;
        }
        | ALTERNATIVE Sequential_music {
@@ -739,10 +745,10 @@ Simple_music:
        | translator_change
        | Simple_music '*' unsigned '/' unsigned        {
                /* urg */
-               $$ = new Compressed_music ($3, $5, $1);
+               $$ = new Time_scaled_music ($3, $5, $1);
        }
        | Simple_music '*' unsigned              {
-               $$ = new Compressed_music ($3, 1, $1);
+               $$ = new Time_scaled_music ($3, 1, $1);
        }
        ;
 
@@ -767,7 +773,7 @@ Composite_music:
                unsigned '/' unsigned Music     
 
        {
-               $$ = new Compressed_music ($3, $5, $6);
+               $$ = new Time_scaled_music ($3, $5, $6);
                $$->set_spot (THIS->pop_spot ());
        }
        | Repeated_music                { $$ = $1; }
@@ -1308,8 +1314,8 @@ simple_element:
                delete $1;
                n->duration_ = *$4;
                delete $4;
-               n->forceacc_b_ = $2 % 2;
                n->cautionary_b_ = $3 % 2;
+               n->forceacc_b_ = $2 % 2 || n->cautionary_b_;
 
                Simultaneous_music*v = new Request_chord;
                v->set_spot (THIS->here_input ());