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

diff --git a/lily/lexer.ll b/lily/lexer.ll
index ef419634bb..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
@@ -824,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);