lilypond-1.1.8

diff --git a/NEWS b/NEWS
index 129bd32d4fa70ef4b48b30f4adf47d78ca819426..a1f5cf865f432a4b3a8e86a55ffc79219908dea0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,22 @@
+pl 8
+
+pl7.jcn3
+       - bf's: spanner/volta
+       - volta-support: via Note, Bar, and Paper-column to Bar (item)
+
+pl7.jcn2
+       - note repeats
+
+pl7.jcn1
+       - configure/guile fixes (still no check for 1.2/1.3)
+
+pl7.hwn1
+       - tutorial fixes
+       - tuplets over beams.
+
+*****************
+pl 7
+
 pl6.jcn5
        - repeatbars, volta-spanner work, alternative iteration still broken
        - volta symbol

diff --git a/lily/parser.yy b/lily/parser.yy
index e3622cdf4f3dee5e74c05955f98d0c0532916df2..9b27b9a12008eafcf08652c22efa4693072decb6 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -47,7 +47,7 @@
 
 // mmm
 Mudela_version oldest_version ("1.0.7");
-Mudela_version version ("1.0.9");
+Mudela_version version ("1.0.10");
 
 
 // needed for bison.simple's malloc() and free()
@@ -782,9 +782,15 @@ Composite_music:
                delete $2;
                delete $4;
        }
-       | TIMES int '/' int Music       {
-               $$ = new Compressed_music ($2, $4, $5);
+       | TIMES {
+               THIS->remember_spot ();
+       }
+       /* CONTINUED */ 
+               int '/' int Music       
 
+       {
+               $$ = new Compressed_music ($3, $5, $6);
+               $$->set_spot (THIS->pop_spot ());
        }
        | Repeated_music                { $$ = $1; }
        | Simultaneous_music            { $$ = $1; }
@@ -806,7 +812,7 @@ Composite_music:
                {
                  $$ = $3;
                  THIS->lexer_p_->pop_state ();
-               }
+       }
        | relative_music        { $$ = $1; }
        ;