lilypond-0.0.7

diff --git a/lexer.l b/lexer.l
index 008f813bf5410f65759143025a62cf91d733542f..220b07ccf862406585a359b13e53bc59f80404ff 100644 (file)
--- a/lexer.l
+++ b/lexer.l
@@ -36,7 +36,7 @@ PITCH         ['`]*{OPTSIGN}{NOTENAME}
 DURNAME                1|2|4|8|16|32
 DURATION       {DURNAME}\.*
 FULLNOTE       {PITCH}{DURATION}?
-WORD           [a-zA-Z]+
+WORD           [a-zA-Z][a-zA-Z0-9_]+
 REAL           [0-9]+(\.[0-9]*)?
 
 %%

diff --git a/parser.y b/parser.y
index 7e2be63a68bb279c649508c531ab22ddb4b37964..4ca199bb7702399edab1befb8ac2e8c01fbc5da2 100644 (file)
--- a/parser.y
+++ b/parser.y
@@ -130,7 +130,7 @@ staff_block:
        | melodicstaff_block
        ;
 
-staffdecl: STAFF '{' IDENTIFIER '}' { $$ = $3->staff(); }
+staffdecl: STAFF '{' IDENTIFIER '}' { $$ = $3->staff()->clone(); }
        ;
 
 rhythmstaff_block: