lilypond-0.0.25

diff --git a/NEWS b/NEWS
index 696755258eb9c08a1b82f486acefb2632da8217f..fd677144a694f73072355661f4d14b6634d7d803 100644 (file)
--- 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 771734025be4db62c1f02b82e4dcd13742138556..aa3b4f2f3792cbd560a1ed1d302f779972845955 100644 (file)
--- 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
 */