From 1ecf0e56fbd44cef9f02ee7ccbdde335bc5db2cf Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Tue, 26 Mar 2002 21:44:37 +0000
Subject: [PATCH] lilypond-1.1.8

---
 NEWS           | 19 +++++++++++++++++++
 lily/parser.yy | 14 ++++++++++----
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 129bd32d4f..a1f5cf865f 100644
--- 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 e3622cdf4f..9b27b9a120 100644
--- 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; }
 	;
 
-- 
2.39.5