Pango: Skip glyph lookups for zero-width characters.

[lilypond.git] / lily / parser.yy

diff --git a/lily/parser.yy b/lily/parser.yy
index 48117a3a091a4fc9264b1c493066f06ebebd1d3a..2ddc2c815f31b65c2c582e2e82de35de114d2803 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
@@ -1408,6 +1417,11 @@ event_chord:
        /* TODO: Create a special case that avoids the creation of
           EventChords around simple_elements that have no post_events?
         */
+       /* event_chords like simple notes, note chords, etc, are
+          saved into PARSER->lexer_->chord_repetition_ so that
+          the chord repetition mechanism can copy them when a
+          chord repetition symbol is found
+       */
        simple_chord_elements post_events       {
                SCM elts = ly_append2 ($1, scm_reverse_x ($2, SCM_EOL));
 
@@ -1416,6 +1430,7 @@ event_chord:
                 * i = @$; */
                i.set_location (@1, @2);
                $$ = MAKE_SYNTAX ("event-chord", i, elts);
+               PARSER->lexer_->chord_repetition_.last_chord_ = $$;
        }
        | CHORD_REPETITION optional_notemode_duration post_events {
                Input i;
@@ -1431,7 +1446,9 @@ event_chord:
                $$ = MAKE_SYNTAX ("multi-measure-rest", i, $2, $3);
        }
        | command_element
-       | note_chord_element
+       | note_chord_element    {
+               PARSER->lexer_->chord_repetition_.last_chord_ = $$;
+       }
        ;