X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flexer.ll;h=ccc8dee80b7a1e1a1094f5889e5aa4d39c15e5c8;hb=769db98e2a43d69e00282311f1450448e3cc1a01;hp=ec17fb399e03963fb9dcdf1ec8753d345d82c8dc;hpb=291f1d623e2ceb9916532622ba02b02807c4b22d;p=lilypond.git

diff --git a/lily/lexer.ll b/lily/lexer.ll
index ec17fb399e..ccc8dee80b 100644
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -1,13 +1,23 @@
 %{ // -*-Fundamental-*-
 /*
-  lexer.ll -- implement the Flex lexer
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the LilyPond music typesetter
+  Copyright (C) 1996--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+                 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 1996--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
-           Jan Nieuwenhuizen <janneke@gnu.org>
-*/
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 /*
   backup rules
@@ -62,6 +72,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 +181,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 +347,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 +529,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 +549,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"))
@@ -545,6 +560,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);
 	}
@@ -801,11 +834,15 @@ 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;
 		}
+		if ((chord_repetition_.repetition_symbol_ != SCM_EOL)
+		    && to_boolean (scm_equal_p (chord_repetition_.repetition_symbol_, sym)))
+			return CHORD_REPETITION;
 	}
 
 	yylval.scm = ly_string2scm (str);
@@ -946,6 +983,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