From a7652498efc45ff26dfb3a85dd4d8d1517621391 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Sun, 24 Mar 2002 19:28:33 +0000
Subject: [PATCH] lilypond-0.0.25

---
 NEWS         |  5 ++++-
 src/parser.y | 10 +++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/NEWS b/NEWS
index 696755258e..fd677144a6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
+pl 25
+	- other clefs added, keys typeset properly (MB)
+
 pl 24:
-	- Lyrics
+	- Lyrics (JCN)
 	- Commands in music-mode (an input feature) (there you are, Mats)
 
 pl 23:
diff --git a/src/parser.y b/src/parser.y
index 771734025b..aa3b4f2f37 100644
--- a/src/parser.y
+++ b/src/parser.y
@@ -63,7 +63,7 @@ Paperdef*default_paper();
 %token VOICE STAFF SCORE TITLE  BAR NOTENAME OUTPUT
 %token CM IN PT MM PAPER WIDTH METER UNITSPACE SKIP COMMANDS COMMAND
 %token GEOMETRIC START_T DURATIONCOMMAND OCTAVECOMMAND
-%token KEY CLEF VIOLIN BASS MULTI TABLE CHORD VOICES
+o%token KEY CLEF MULTI TABLE CHORD VOICES
 %token PARTIAL RHYTHMIC MELODIC MUSIC LYRIC GROUPING CADENZA
 %token END SYMBOLTABLES TEXID TABLE NOTENAMES SCRIPT TEXTSTYLE PLET
 %token MARK GOTO
@@ -94,7 +94,7 @@ Paperdef*default_paper();
 %type <commandvec> score_commands_block score_commands_body
 %type <commandvec> staff_commands_block staff_commands_body
 %type <request> post_request pre_request 
-%type <string> clef_id pitchmod
+%type <string> pitchmod
 %type <music> music 
 %type <chord> music_chord music_chord_body
 
@@ -238,7 +238,7 @@ staff_command:
 		$$ = get_key_interpret_command(*$2);
 		delete $2;
 	}
-	| CLEF clef_id			{
+	| CLEF STRING			{
 		$$ = get_clef_interpret_command(*$2);
 		delete $2;
 	}
@@ -588,10 +588,6 @@ unit:	CM		{ $$ = "cm"; }
 	|PT		{ $$ = "pt"; }
 	;
 	
-clef_id:
-	VIOLIN		{ $$ = new String("violin"); }
-	| BASS		{ $$ = new String("bass"); }
-	;
 /*
 	symbol tables
 */
-- 
2.39.5