From 1be17ac358e3e1286a80624c4cd4024b98f11377 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 1 Jan 2007 19:18:58 +0100 Subject: [PATCH] Fix #93. If no running notehead is found, then stop the lyric extender. --- input/regression/lyric-extender-no-heads.ly | 24 +++++++++++++++++++++ lily/extender-engraver.cc | 10 ++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 input/regression/lyric-extender-no-heads.ly diff --git a/input/regression/lyric-extender-no-heads.ly b/input/regression/lyric-extender-no-heads.ly new file mode 100644 index 0000000000..958805ab85 --- /dev/null +++ b/input/regression/lyric-extender-no-heads.ly @@ -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 } + diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc index 3fb0d43033..46d43e0907 100644 --- a/lily/extender-engraver.cc +++ b/lily/extender-engraver.cc @@ -97,7 +97,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_; -- 2.39.5