Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lily / parser.yy

diff --git a/lily/parser.yy b/lily/parser.yy
index d93a1767e1502e294dd48abe215496e48fb8531a..d2f3a8c4dc9e9f0eae7f1512c673fbeabadcdf6d 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -1,10 +1,21 @@
 /*
-  parser.yy -- Bison/C++ parser for LilyPond
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
-
-  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2009 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/>.
 */
 
 %{
@@ -1002,9 +1013,7 @@ simultaneous_music:
        ;
 
 simple_music:
-       event_chord {
-                PARSER->lexer_->chord_repetition_.last_chord_ = $$;
-       }
+       event_chord
        | MUSIC_IDENTIFIER
        | music_property_def
        | context_change
@@ -1277,7 +1286,7 @@ property_operation:
                $$ = scm_list_2 (ly_symbol2scm ("unset"),
                        scm_string_to_symbol ($2));
        }
-       | OVERRIDE simple_string property_path '=' embedded_scm {
+       | OVERRIDE simple_string property_path '=' scalar {
                $$ = scm_append (scm_list_2 (scm_list_3 (ly_symbol2scm ("push"),
                                                        scm_string_to_symbol ($2), $5),
                                             $3));
@@ -1431,7 +1440,13 @@ event_chord:
                $$ = MAKE_SYNTAX ("multi-measure-rest", i, $2, $3);
        }
        | command_element
-       | note_chord_element
+       /* note chord elements are memorized into
+          PARSER->lexer_->chord_repetition_ so that the chord repetition
+          mechanism copy them when a chord repetition symbol is found
+       */
+       | note_chord_element    {
+               PARSER->lexer_->chord_repetition_.last_chord_ = $$;
+       }
        ;