-\version "2.12.0"
+\version "2.13.19"
#(use-modules (srfi srfi-13)
(ice-9 format))
\test "" ##[ \lyricmode { a -- b } #] % HyphenEvent
\test "" ##[ \lyricmode { a __ b } #] % ExtenderEvent
\test "" ##[ \lyricmode { "a " } #] % LyricEvent
-\test "" ##[ \lyricsto "foo" { bla bla } #] % LyricCombineMusic
+\test "" ##[ \lyricsto "foo" { bla bla } #] % LyricCombineMusic
\test "" ##[ { { c d }
- \addlyrics { bla bla } } #]
+ \addlyrics { bla bla } } #]
%% Drums
\test "" ##[ \drums { hihat } #]
You should have received a copy of the GNU General Public License
along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
*/
+
#include "context.hh"
#include "engraver.hh"
#include "international.hh"
#include "stream-event.hh"
#include "warn.hh"
#include "spanner.hh"
-#include "paper-column.hh"
-
#include "translator.icc"
void completize_extender (Spanner *sp);
Stream_event *ev_;
Spanner *extender_;
Spanner *pending_extender_;
- bool current_lyric_is_skip_;
public:
TRANSLATOR_DECLARATIONS (Extender_engraver);
protected:
DECLARE_TRANSLATOR_LISTENER (extender);
+ DECLARE_TRANSLATOR_LISTENER (completize_extender);
DECLARE_ACKNOWLEDGER (lyric_syllable);
virtual void finalize ();
Extender_engraver::Extender_engraver ()
{
- current_lyric_is_skip_ = false;
extender_ = 0;
pending_extender_ = 0;
ev_ = 0;
ASSIGN_EVENT_ONCE (ev_, ev);
}
+
+/*
+ A CompletizeExtenderEvent is sent at the end of each lyrics block
+ to ensure any pending extender can be correctly terminated if the lyrics
+ end before the associated voice (this prevents the right bound being extended
+ to the next note-column if no lyric follows the extender)
+*/
+IMPLEMENT_TRANSLATOR_LISTENER (Extender_engraver, completize_extender);
+void
+Extender_engraver::listen_completize_extender (Stream_event * /* ev */)
+{
+ if (pending_extender_)
+ {
+ completize_extender (pending_extender_);
+ pending_extender_ = 0;
+ }
+}
+
void
Extender_engraver::process_music ()
{
if (extender_)
extender_->set_bound (LEFT, item);
- SCM text = item->get_property ("text");
- current_lyric_is_skip_ = ly_is_equal (text, scm_from_locale_string (" "));
-
- if (pending_extender_ && !current_lyric_is_skip_)
+ if (pending_extender_)
{
pending_extender_->set_object ("next", item->self_scm ());
completize_extender (pending_extender_);
ly_symbol2scm ("heads"), h);
}
- if (pending_extender_)
- {
- Pointer_group_interface::add_grob (pending_extender_,
- ly_symbol2scm ("heads"), h);
- /*
- The following check addresses the case where the lyrics end before
- the associated voice. The current_lyric_is_skip_ check is
- necessary to handle manual melismata, which should not result in
- extenders being completized. We also need to make sure that we're not
- in the middle of a note (happens when this function is called because
- of an event in a voice other than our associated one).
- */
- if (!melisma_busy (voice) && !current_lyric_is_skip_)
- {
- Moment now = voice->now_mom ();
- Paper_column *column = (dynamic_cast<Item *> (h))->get_column ();
- Moment *start_mom = column ? unsmob_moment (column->get_property ("when")) : 0;
- if (!column || (start_mom->main_part_ == now.main_part_))
- {
- completize_extender (pending_extender_);
- pending_extender_ = 0;
- }
- }
- }
- }
+ if (pending_extender_)
+ {
+ Pointer_group_interface::add_grob (pending_extender_,
+ ly_symbol2scm ("heads"), h);
+ }
+ }
else
{
if (pending_extender_
completize_extender (pending_extender_);
pending_extender_ = 0;
}
-
}
if (extender_)
{
Spanner *hyphen_;
Spanner *finished_hyphen_;
- bool current_lyric_is_skip_;
public:
TRANSLATOR_DECLARATIONS (Hyphen_engraver);
Hyphen_engraver::Hyphen_engraver ()
{
- current_lyric_is_skip_ = false;
hyphen_ = 0;
finished_hyphen_ = 0;
finished_ev_ = 0;
Hyphen_engraver::acknowledge_lyric_syllable (Grob_info i)
{
Item *item = i.item ();
- SCM text = item->get_property ("text");
- current_lyric_is_skip_ = ly_is_equal (text, scm_from_locale_string (" "));
-
- if (!hyphen_ && !current_lyric_is_skip_)
+
+ if (!hyphen_)
hyphen_ = make_spanner ("LyricSpace", item->self_scm ());
if (hyphen_)
hyphen_->set_bound (LEFT, item);
-
- if (finished_hyphen_ && !current_lyric_is_skip_)
+
+ if (finished_hyphen_)
finished_hyphen_->set_bound (RIGHT, item);
}
finished_hyphen_ = 0;
finished_ev_ = 0;
}
-
- if (finished_hyphen_ && hyphen_ && !current_lyric_is_skip_)
+
+ if (finished_hyphen_ && hyphen_)
{
programming_error ("hyphen not finished yet");
finished_hyphen_ = 0;
finished_hyphen_ = hyphen_;
finished_ev_ = ev_;
}
-
+
hyphen_ = 0;
ev_ = 0;
}
if (last_text_)
last_text_->set_property ("self-alignment-X", scm_from_int (LEFT));
}
- /*
- "Empty" LyricText objects are needed to allow the Extender_engraver to
- distinguish between the end of a lyrics block and manual melismata.
- */
- text_ = make_item ("LyricText", event_->self_scm ());
+ else
+ text_ = make_item ("LyricText", event_->self_scm ());
}
}
if (melisma_busy (voice)
&& !to_boolean (get_property ("ignoreMelismata")))
text_->set_property ("self-alignment-X",
- get_property("lyricMelismaAlignment"));
+ get_property ("lyricMelismaAlignment"));
}
else
{
harmonic-event hyphen-event laissez-vibrer-event mark-event
multi-measure-text-event note-grouping-event
pes-or-flexa-event repeat-tie-event spacing-section-event
- layout-instruction-event))
+ layout-instruction-event completize-extender-event))
(layout-instruction-event . (apply-output-event ))
(script-event . (articulation-event text-script-event))
(music->lily-string ?lyric-sequence parser)))
#f)))
-
+;; Silence internal event sent at end of each lyrics block
+(define-display-method CompletizeExtenderEvent (expr parser)
+ "")
rhythmic-event event))
))
+ (CompletizeExtenderEvent
+ . ((description . "Used internally to signal the end of a lyrics block to
+ensure extenders are completed correctly when a @code{Lyrics} context ends
+before its associated @code{Voice} context.")
+ (types . (general-music completize-extender-event event))
+ ))
+
(ContextChange
. ((description . "Change staves in Piano staff.
(call-with-output-string (lambda (p) (format p "uniqueContext~s" unique-counter))))
(define (lyric-combine-music sync music loc)
+ ;; CompletizeExtenderEvent is added following the last lyric in MUSIC
+ ;; to signal to the Extender_engraver that any pending extender should
+ ;; be completed if the lyrics end before the associated voice.
+ (append! (ly:music-property music 'elements)
+ (list (make-music 'CompletizeExtenderEvent)))
(make-music 'LyricCombineMusic
'element music
'associated-context sync
projects / lilypond.git / commitdiff