From ed89e7849bfddf9a6975347645a02f5541a5653f Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Mon, 4 Nov 1996 16:33:05 +0000
Subject: [PATCH] lilypond-0.0.7

---
 lexer.l  | 2 +-
 parser.y | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lexer.l b/lexer.l
index 008f813bf5..220b07ccf8 100644
--- 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 7e2be63a68..4ca199bb77 100644
--- 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:
-- 
2.39.5