X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flexer.ll;h=1ad6b667da93a9b11e896be7958ab735a04738eb;hb=acbfb15a23e77008e8052d52fa65291ca4ac67ed;hp=71fb56b385c6d86205a735ed18c2ff0d75afb95c;hpb=52c47ff08943021305e5d40bf5a4963e3e520af8;p=lilypond.git

diff --git a/lily/lexer.ll b/lily/lexer.ll
index 71fb56b385..1ad6b667da 100644
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -4,7 +4,7 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1996--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1996--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
            Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -171,7 +171,9 @@ BOM_UTF8	\357\273\277
   return type;
 }
 
-<INITIAL,chords,lyrics,figures,notes>{BOM_UTF8} {
+   /* Use the trailing context feature. Otherwise, the BOM will not be
+      found if the file starts with an identifier definition. */
+<INITIAL,chords,lyrics,figures,notes>{BOM_UTF8}/.* {
   if (this->lexloc->line_number () != 1 || this->lexloc->column_number () != 0)
     {
       LexerError (_ ("stray UTF-8 BOM encountered").c_str ());
@@ -335,7 +337,7 @@ BOM_UTF8	\357\273\277
 	Input hi = here_input();
 	hi.step_forward ();
 	SCM sval = ly_parse_scm (hi.start (), &n, hi,
-		be_safe_global && is_main_input_);
+		be_safe_global && is_main_input_, parser_);
 
 	if (sval == SCM_UNDEFINED)
 	{
@@ -537,6 +539,8 @@ BOM_UTF8	\357\273\277
 				return MARKUP_HEAD_SCM0_MARKUP1;
 			else if (tag == ly_symbol2scm ("scheme0-scheme1-markup2"))
 				return MARKUP_HEAD_SCM0_SCM1_MARKUP2;
+			else if (tag == ly_symbol2scm ("scheme0-scheme1-markup2-markup3"))
+				return MARKUP_HEAD_SCM0_SCM1_MARKUP2_MARKUP3;
 			else if (tag == ly_symbol2scm ("scheme0-markup1-markup2"))
 				return MARKUP_HEAD_SCM0_MARKUP1_MARKUP2;
 			else if (tag == ly_symbol2scm ("scheme0-scheme1-scheme2"))
@@ -551,6 +555,8 @@ BOM_UTF8	\357\273\277
 			SCM tag = scm_cdr(s2);
 			if (tag == ly_symbol2scm("empty"))
 				return MARKUP_LIST_HEAD_EMPTY;
+			else if (tag == ly_symbol2scm ("scheme0"))
+				return MARKUP_LIST_HEAD_SCM0;
 			else if (tag == ly_symbol2scm ("markup-list0"))
 				return MARKUP_LIST_HEAD_LIST0;
 			else if (tag == ly_symbol2scm ("scheme0-markup-list1"))
@@ -558,7 +564,7 @@ BOM_UTF8	\357\273\277
 			else if (tag == ly_symbol2scm ("scheme0-scheme1-markup-list2"))
 				return MARKUP_LIST_HEAD_SCM0_SCM1_LIST2;
 			else {
-				programming_error ("no parser tag defined for this markup signature"); 
+				programming_error ("no parser tag defined for this markup list signature"); 
 				ly_display_scm (s);
 				assert(false);
 			}
@@ -818,7 +824,8 @@ Lily_lexer::scan_bare_word (string str)
 			else if (scm_is_symbol (yylval.scm))
 			    return DRUM_PITCH;
 		}
-		else if ((handle = scm_hashq_get_handle (chordmodifier_tab_, sym))!= SCM_BOOL_F)
+		else if ((YYSTATE == chords)
+		     	&& (handle = scm_hashq_get_handle (chordmodifier_tab_, sym))!= SCM_BOOL_F)
 		{
 		    yylval.scm = scm_cdr (handle);
 		    return CHORD_MODIFIER;