Re: cautionary natural sign

[Mats Bengtsson]

> So what happened to the cautionary natural sign?  The cautionary sharp 
> and flat still seem to work.  Is there a quick fix for this?
> 
> John

Here's a patch. Han-Wen had cleaned up a bit too much. The patch
also solves the problem with repeats without voltas.

     /Mats

-------------------------
diff -urN ../lilypond-1.1.38/lily/parser.yy lily/parser.yy
--- ../lilypond-1.1.38/lily/parser.yy  Tue Apr  6 10:23:51 1999
+++ lily/parser.yy      Fri Apr  9 22:06:52 1999
@@ -706,8 +706,11 @@
        | Composite_music
        ;
 
-Alternative_music:
-       ALTERNATIVE Simultaneous_music {
+Alternative_music:{
+                Music_list* m = new Music_list;
+                $$ = new Sequential_music (m);
+        }
+       | ALTERNATIVE Simultaneous_music {
                $$ = $2;
        }
        | ALTERNATIVE Sequential_music {
@@ -1308,7 +1311,7 @@
                delete $1;
                n->duration_ = *$4;
                delete $4;
-               n->forceacc_b_ = $2 % 2;
+               n->forceacc_b_ = $2 % 2 || $3 % 2;
                n->cautionary_b_ = $3 % 2;
 
                Simultaneous_music*v = new Request_chord;