use sourcefilename iso. renameinput.

diff --git a/ChangeLog b/ChangeLog
index 93b1772d7bc599cbccbc5fb78e158933e55603a6..90575b0292dccc088eecd13bf299b086bdf6b829 100644 (file)
--- 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 0c710bcf95b65b03cb0017becf5698f9cb405c4d..075074394cac13268cec4c21ef8eb2e434f94192 100644 (file)
--- 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>{