X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flexer.ll;h=8dd76671456cebaf4341527c55254fe61844b494;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=9ce0da012d5faf14f5eff0fc00beb63e5cd3d6fd;hpb=e42585017a01fd02f6353b994cf0c87b03a7bb2e;p=lilypond.git

diff --git a/lily/lexer.ll b/lily/lexer.ll
index 9ce0da012d..8dd7667145 100644
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -4,7 +4,7 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1996--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1996--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
            Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -62,6 +62,7 @@ void strip_trailing_white (string&);
 void strip_leading_white (string&);
 string lyric_fudge (string s);
 SCM lookup_markup_command (string s);
+SCM lookup_markup_list_command (string s);
 bool is_valid_version (string s);
 
 
@@ -170,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 ());
@@ -334,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)
 	{
@@ -516,7 +519,7 @@ BOM_UTF8	\357\273\277
 	{MARKUPCOMMAND} {
 		string str (YYText () + 1);
 		SCM s = lookup_markup_command (str);
-
+		SCM s2 = lookup_markup_list_command (str);
 		if (scm_is_pair (s) && scm_is_symbol (scm_cdr (s)) ) {
 			yylval.scm = scm_car(s);
 			SCM tag = scm_cdr(s);
@@ -536,6 +539,10 @@ 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"))
 				return MARKUP_HEAD_SCM0_SCM1_SCM2;
 			else {
@@ -543,6 +550,24 @@ BOM_UTF8	\357\273\277
 				ly_display_scm (s);
 				assert(false);
 			}
+		} else if (scm_is_pair (s2) && scm_is_symbol (scm_cdr (s2))) {
+		        yylval.scm = scm_car(s2);
+			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"))
+				return MARKUP_LIST_HEAD_SCM0_LIST1;
+			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 list signature"); 
+				ly_display_scm (s);
+				assert(false);
+			}
 		} else
 			return scan_escaped_word (str);
 	}
@@ -799,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;
@@ -944,6 +970,13 @@ lookup_markup_command (string s)
 	return scm_call_1 (proc, ly_string2scm (s));
 }
 
+SCM
+lookup_markup_list_command (string s)
+{
+	SCM proc = ly_lily_module_constant ("lookup-markup-list-command");
+	return scm_call_1 (proc, ly_string2scm (s));
+}
+
 /* Shut up lexer warnings.  */
 #if YY_STACK_USED