]> git.donarmstrong.com Git - lilypond.git/commitdiff
Fix #93.
authorHan-Wen Nienhuys <hanwen@xs4all.nl>
Mon, 1 Jan 2007 18:18:58 +0000 (19:18 +0100)
committerHan-Wen Nienhuys <hanwen@xs4all.nl>
Mon, 1 Jan 2007 18:18:58 +0000 (19:18 +0100)
If no running notehead is found, then stop the lyric extender.

input/regression/lyric-extender-no-heads.ly [new file with mode: 0644]
lily/extender-engraver.cc

diff --git a/input/regression/lyric-extender-no-heads.ly b/input/regression/lyric-extender-no-heads.ly
new file mode 100644 (file)
index 0000000..958805a
--- /dev/null
@@ -0,0 +1,24 @@
+\header
+{
+  texidoc = "Extender engraver also notices the lack of note heads.
+Here the extender ends on the 2nd quarter note, despite the grace note
+without a lyric attached." 
+  
+}
+
+\version "2.10.7"
+
+\layout {
+  ragged-right = ##t
+}
+
+\relative c'' {
+  \time 3/4
+  d4~ d4 r4
+  \grace es8
+
+  d4
+  
+}
+\addlyrics { x __ x  }
+
index efea867822abf2b12ebab55865b6d5a5b266a2e1..c6998c5dde2c2025b677e250f82cd99d08c7a593 100644 (file)
@@ -98,7 +98,15 @@ Extender_engraver::stop_translation_timestep ()
                                                 ly_symbol2scm ("heads"), h);
            }
        }
-
+      else
+       {
+         if (pending_extender_)
+           {
+             completize_extender (pending_extender_);
+             pending_extender_ = 0;
+           }
+         
+       }
       if (extender_)
        {
          pending_extender_ = extender_;