From 6fad6124121d88fd1a1bb390ca427838ded11ade Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 2 Jan 2006 00:19:37 +0000
Subject: [PATCH] use sourcefilename iso. renameinput.

---
 ChangeLog     |  4 ++++
 lily/lexer.ll | 12 ++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 93b1772d7b..90575b0292 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-02  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+	* lily/lexer.ll: use sourcefilename iso. renameinput.
+
 2006-01-01  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
 	* mf/GNUmakefile ($(NCSB_TTFS)): revise rule. Create
diff --git a/lily/lexer.ll b/lily/lexer.ll
index 0c710bcf95..075074394c 100644
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -112,7 +112,7 @@ SCM (* scm_parse_error_handler) (void *);
 %x markup
 %x notes
 %x quote
-%x renameinput
+%x sourcefilename
 %x version
 
 A		[a-zA-Z]
@@ -180,8 +180,8 @@ BOM_UTF8	\357\273\277
 <INITIAL,chords,lyrics,notes,figures>\\version{WHITE}*	{
 	yy_push_state (version);
 }
-<INITIAL,chords,lyrics,notes,figures>\\renameinput{WHITE}*	{
-	yy_push_state (renameinput);
+<INITIAL,chords,lyrics,notes,figures>\\sourcefilename{WHITE}*	{
+	yy_push_state (sourcefilename);
 }
 <version>\"[^"]*\"     { /* got the version number */
 	String s (YYText () + 1);
@@ -195,7 +195,7 @@ BOM_UTF8	\357\273\277
 	scm_module_define (top_scope, ly_symbol2scm ("version-seen?"), SCM_BOOL_T);
 
 }
-<renameinput>\"[^"]*\"     {
+<sourcefilename>\"[^"]*\"     {
 	String s (YYText () + 1);
 	s = s.left_string (s.index_last ('\"'));
 
@@ -212,8 +212,8 @@ BOM_UTF8	\357\273\277
 	LexerError (_ ("quoted string expected after \\version").to_str0 ());
 	yy_pop_state ();
 }
-<renameinput>. 	{
-	LexerError (_ ("quoted string expected after \\renameinput").to_str0 ());
+<sourcefilename>>. 	{
+	LexerError (_ ("quoted string expected after \\sourcefilename").to_str0 ());
 	yy_pop_state ();
 }
 <longcomment>{
-- 
2.39.5